diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css index fe69be08..7799b29c 100644 --- a/public/build/beike/admin/css/app.css +++ b/public/build/beike/admin/css/app.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; body { font-weight: 400; line-height: 1.6; @@ -430,8 +431,8 @@ table.table.table-striped > tbody > tr:nth-of-type(2n) { @font-face { font-family: "iconfont"; - /* Project id 2787822 */ - src: url("//at.alicdn.com/t/font_2787822_7mtbg56vojp.woff2?t=1634612961708") format("woff2"), url("//at.alicdn.com/t/font_2787822_7mtbg56vojp.woff?t=1634612961708") format("woff"), url("//at.alicdn.com/t/font_2787822_7mtbg56vojp.ttf?t=1634612961708") format("truetype"); + src: url("/vendor/iconfont/iconfont.woff") format("woff"), url("/vendor/iconfont/iconfont.ttf") format("truetype"); + /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ } .iconfont { font-family: "iconfont" !important; diff --git a/public/build/beike/admin/css/design.css b/public/build/beike/admin/css/design.css new file mode 100644 index 00000000..bb448c1b --- /dev/null +++ b/public/build/beike/admin/css/design.css @@ -0,0 +1,228 @@ +@charset "UTF-8"; +@font-face { + font-family: "iconfont"; + src: url("/vendor/iconfont/iconfont.woff") format("woff"), url("/vendor/iconfont/iconfont.ttf") format("truetype"); + /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ +} +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -webkit-text-stroke-width: 0; + -moz-osx-font-smoothing: grayscale; +} + +body.page-design { + background-color: #fff; + padding: 0; + margin: 0; + font-size: 14px; + height: 100vh; + overflow: hidden; +} +body.page-design .tag { + margin: 8px 0; + color: #777; + font-size: 12px; +} +body.page-design .icon-rank { + cursor: move; +} +body.page-design .design-box { + display: flex; + height: 100vh; +} +body.page-design .design-box .design-head { + display: flex; + align-items: center; + justify-content: space-between; +} +body.page-design .design-box .design-head > div { + flex: 1; + height: 40px; + color: #fff; + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + background-color: #0072ff; + text-align: center; + font-size: 0.8rem; + transition: all 0.2s ease-in-out; +} +body.page-design .design-box .design-head > div:hover { + background-color: #005bcc; +} +body.page-design .design-box .sidebar-edit-wrap { + width: 300px; + background-color: #fff; +} +body.page-design .design-box .sidebar-edit-wrap .module-edit { + padding: 0 10px 14px; +} +body.page-design .design-box .sidebar-edit-wrap .module-edit .module-editor-row { + height: 47px; + line-height: 47px; + background-color: #f5f5f5; + padding: 0 20px; + margin: 0 -14px 14px; + font-size: 16px; + color: #212121; +} +body.page-design .design-box .sidebar-edit-wrap .module-edit .module-edit-group { + margin-bottom: 20px; +} +body.page-design .design-box .sidebar-edit-wrap .module-edit .module-edit-group:last-of-type { + border-bottom: none; +} +body.page-design .design-box .sidebar-edit-wrap .module-edit .module-edit-group .module-edit-title { + margin-bottom: 10px; + position: relative; + padding-left: 6px; + display: flex; + justify-content: space-between; +} +body.page-design .design-box .sidebar-edit-wrap .module-edit .module-edit-group .module-edit-title:before { + content: ""; + position: absolute; + left: 0; + top: 3px; + width: 2px; + height: 14px; + background: #0072ff; +} +body.page-design .design-box .sidebar-edit-wrap .modules-list { + background: #e6e9ec; + height: 100%; + overflow-y: auto; + padding: 0 3px 30px; +} +body.page-design .design-box .sidebar-edit-wrap .module-list { + text-align: center; + padding: 4px; + cursor: pointer; +} +body.page-design .design-box .sidebar-edit-wrap .module-list .module-info { + background: #fff; + color: #556068; + transition: all 0.25s ease-in-out; +} +body.page-design .design-box .sidebar-edit-wrap .module-list .module-info:hover { + color: #0072ff; + box-shadow: 0 6px 23px rgba(0, 0, 0, 0.2); +} +body.page-design .design-box .sidebar-edit-wrap .module-list .icon { + padding: 12px 0 7px; + width: 36px; + height: 36px; + display: inline-block; +} +body.page-design .design-box .sidebar-edit-wrap .module-list .icon img { + max-width: 100%; + max-height: auto; +} +body.page-design .design-box .sidebar-edit-wrap .module-list .icon i { + font-size: 26px; +} +body.page-design .design-box .sidebar-edit-wrap .module-list .name { + font-size: 12px; + height: 27px; + overflow: hidden; +} +body.page-design .design-box .preview-iframe { + flex: 1; +} +body.page-design .pb-images-selector { + border: 1px solid #eee; + margin-bottom: 10px; + border-radius: 2px; +} +body.page-design .pb-images-selector:hover { + border-color: #ddd; +} +body.page-design .pb-images-selector:hover .selector-head { + background: #eee; +} +body.page-design .pb-images-selector .pb-images-selector-add { + width: 100%; + margin-top: 16px; + padding: 10px 20px; +} +body.page-design .pb-images-selector .selector-head { + display: flex; + align-items: center; + background-color: #f5f5f5; + padding: 4px 10px; + cursor: pointer; + justify-content: space-between; +} +body.page-design .pb-images-selector .selector-head > div.left { + display: flex; + align-items: center; +} +body.page-design .pb-images-selector .selector-head > div.left i { + margin-right: 10px; +} +body.page-design .pb-images-selector .selector-head > div.left img { + width: 24px; +} +body.page-design .pb-images-selector .selector-head > div.right { + display: flex; + align-items: center; +} +body.page-design .pb-images-selector .selector-head > div.right i { + color: #999; + font-size: 20px; +} +body.page-design .pb-images-selector .selector-head > div.right .remove-item { + margin-right: 8px; + padding-right: 8px; + position: relative; +} +body.page-design .pb-images-selector .selector-head > div.right .remove-item:after { + content: ""; + border-right: 1px solid #ccc; + position: absolute; + right: 1px; + top: 20%; + height: 60%; +} +body.page-design .pb-images-selector .selector-head > div.right .remove-item i { + font-size: 15px; +} +body.page-design .pb-images-selector .pb-images-list { + padding: 7px; + padding-bottom: 8px; + position: relative; + display: none; +} +body.page-design .pb-images-selector .pb-images-list.active { + display: block; +} +body.page-design .pb-images-selector .pb-images-list .remove-item { + margin-top: 20px; + background: #ffc8c8; + color: #c70000; + z-index: 9; + height: 20px; + line-height: 20px; + padding: 5px 10px; + text-align: center; + cursor: pointer; +} +body.page-design .pb-images-selector .pb-images-list .remove-item i { + font-size: 14px; +} +body.page-design .pb-images-selector .pb-images-list .pb-image-selector { + cursor: pointer; + min-width: 50px; + min-height: 50px; +} +body.page-design .pb-images-selector .pb-images-list .pb-images-btns button { + margin-left: 0 !important; + padding: 9px 10px; +} +body.page-design .pb-images-selector .pb-images-list .el-input-group__prepend { + padding: 0 10px; +} diff --git a/public/build/beike/admin/css/design/app.css b/public/build/beike/admin/css/design/app.css new file mode 100644 index 00000000..4ce4a924 --- /dev/null +++ b/public/build/beike/admin/css/design/app.css @@ -0,0 +1,227 @@ +@font-face { + font-family: "iconfont"; + /* Project id 2787822 */ + src: url("//at.alicdn.com/t/font_2787822_7mtbg56vojp.woff2?t=1634612961708") format("woff2"), url("//at.alicdn.com/t/font_2787822_7mtbg56vojp.woff?t=1634612961708") format("woff"), url("//at.alicdn.com/t/font_2787822_7mtbg56vojp.ttf?t=1634612961708") format("truetype"); +} +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -webkit-text-stroke-width: 0; + -moz-osx-font-smoothing: grayscale; +} + +body.page-design { + background-color: #fff; + padding: 0; + margin: 0; + font-size: 14px; + height: 100vh; + overflow: hidden; +} +body.page-design .tag { + margin: 8px 0; + color: #777; + font-size: 12px; +} +body.page-design .icon-rank { + cursor: move; +} +body.page-design .design-box { + display: flex; + height: 100vh; +} +body.page-design .design-box .design-head { + display: flex; + align-items: center; + justify-content: space-between; +} +body.page-design .design-box .design-head > div { + flex: 1; + height: 40px; + color: #fff; + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + background-color: #0072ff; + text-align: center; + font-size: 0.8rem; + transition: all 0.2s ease-in-out; +} +body.page-design .design-box .design-head > div:hover { + background-color: #005bcc; +} +body.page-design .design-box .sidebar-edit-wrap { + width: 300px; + background-color: #fff; +} +body.page-design .design-box .sidebar-edit-wrap .module-edit { + padding: 0 10px 14px; +} +body.page-design .design-box .sidebar-edit-wrap .module-edit .module-editor-row { + height: 47px; + line-height: 47px; + background-color: #f5f5f5; + padding: 0 20px; + margin: 0 -14px 14px; + font-size: 16px; + color: #212121; +} +body.page-design .design-box .sidebar-edit-wrap .module-edit .module-edit-group { + margin-bottom: 20px; +} +body.page-design .design-box .sidebar-edit-wrap .module-edit .module-edit-group:last-of-type { + border-bottom: none; +} +body.page-design .design-box .sidebar-edit-wrap .module-edit .module-edit-group .module-edit-title { + margin-bottom: 10px; + position: relative; + padding-left: 6px; + display: flex; + justify-content: space-between; +} +body.page-design .design-box .sidebar-edit-wrap .module-edit .module-edit-group .module-edit-title:before { + content: ""; + position: absolute; + left: 0; + top: 3px; + width: 2px; + height: 14px; + background: #0072ff; +} +body.page-design .design-box .sidebar-edit-wrap .modules-list { + background: #e6e9ec; + height: 100%; + overflow-y: auto; + padding: 0 3px 30px; +} +body.page-design .design-box .sidebar-edit-wrap .module-list { + text-align: center; + padding: 4px; + cursor: pointer; +} +body.page-design .design-box .sidebar-edit-wrap .module-list .module-info { + background: #fff; + color: #556068; + transition: all 0.25s ease-in-out; +} +body.page-design .design-box .sidebar-edit-wrap .module-list .module-info:hover { + color: #0072ff; + box-shadow: 0 6px 23px rgba(0, 0, 0, 0.2); +} +body.page-design .design-box .sidebar-edit-wrap .module-list .icon { + padding: 12px 0 7px; + width: 36px; + height: 36px; + display: inline-block; +} +body.page-design .design-box .sidebar-edit-wrap .module-list .icon img { + max-width: 100%; + max-height: auto; +} +body.page-design .design-box .sidebar-edit-wrap .module-list .icon i { + font-size: 26px; +} +body.page-design .design-box .sidebar-edit-wrap .module-list .name { + font-size: 12px; + height: 27px; + overflow: hidden; +} +body.page-design .design-box .preview-iframe { + flex: 1; +} +body.page-design .pb-images-selector { + border: 1px solid #eee; + margin-bottom: 10px; + border-radius: 2px; +} +body.page-design .pb-images-selector:hover { + border-color: #ddd; +} +body.page-design .pb-images-selector:hover .selector-head { + background: #eee; +} +body.page-design .pb-images-selector .pb-images-selector-add { + width: 100%; + margin-top: 16px; + padding: 10px 20px; +} +body.page-design .pb-images-selector .selector-head { + display: flex; + align-items: center; + background-color: #f5f5f5; + padding: 4px 10px; + cursor: pointer; + justify-content: space-between; +} +body.page-design .pb-images-selector .selector-head > div.left { + display: flex; + align-items: center; +} +body.page-design .pb-images-selector .selector-head > div.left i { + margin-right: 10px; +} +body.page-design .pb-images-selector .selector-head > div.left img { + width: 24px; +} +body.page-design .pb-images-selector .selector-head > div.right { + display: flex; + align-items: center; +} +body.page-design .pb-images-selector .selector-head > div.right i { + color: #999; + font-size: 20px; +} +body.page-design .pb-images-selector .selector-head > div.right .remove-item { + margin-right: 8px; + padding-right: 8px; + position: relative; +} +body.page-design .pb-images-selector .selector-head > div.right .remove-item:after { + content: ""; + border-right: 1px solid #ccc; + position: absolute; + right: 1px; + top: 20%; + height: 60%; +} +body.page-design .pb-images-selector .selector-head > div.right .remove-item i { + font-size: 15px; +} +body.page-design .pb-images-selector .pb-images-list { + padding: 7px; + padding-bottom: 8px; + position: relative; + display: none; +} +body.page-design .pb-images-selector .pb-images-list.active { + display: block; +} +body.page-design .pb-images-selector .pb-images-list .remove-item { + margin-top: 20px; + background: #ffc8c8; + color: #c70000; + z-index: 9; + height: 20px; + line-height: 20px; + padding: 5px 10px; + text-align: center; + cursor: pointer; +} +body.page-design .pb-images-selector .pb-images-list .remove-item i { + font-size: 14px; +} +body.page-design .pb-images-selector .pb-images-list .pb-image-selector { + cursor: pointer; + min-width: 50px; + min-height: 50px; +} +body.page-design .pb-images-selector .pb-images-list .pb-images-btns button { + margin-left: 0 !important; + padding: 9px 10px; +} +body.page-design .pb-images-selector .pb-images-list .el-input-group__prepend { + padding: 0 10px; +} diff --git a/public/build/beike/admin/js/app.js b/public/build/beike/admin/js/app.js index a5f1e1bd..4cdcfc8b 100644 --- a/public/build/beike/admin/js/app.js +++ b/public/build/beike/admin/js/app.js @@ -2099,25 +2099,20 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ __webpack_require__.d(__webpack_exports__, { /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__) /* harmony export */ }); -/* provided dependency */ var process = __webpack_require__(/*! process/browser.js */ "./node_modules/process/browser.js"); function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } window.axios = __webpack_require__(/*! axios */ "./node_modules/axios/index.js"); var instance = axios.create({ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') - } // baseURL: 'https://api.example.com' - -}); // import axios from "axios"; -// import {Message} from 'element-ui'; -// import QS from 'qs'; - + } +}); axios.defaults.timeout = 5000; // 请求超时 // axios.defaults.baseURL = process.env.NODE_ENV == 'production' ? process.env.VUE_APP_BASE_URL + '/' : '/'; +// console.log(process.env.VUE_APP_BASE_URL) -axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'; -// axios.defaults.headers.post['Content-Type'] = 'application/json'; - +console.log($('base').attr('href')); +axios.defaults.baseURL = $('base').attr('href'); /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ /** * get 请求 @@ -2236,10 +2231,10 @@ axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; // axios.defaults.headers /***/ }), -/***/ "./resources/beike/shop/default/css/design/app.scss": -/*!**********************************************************!*\ - !*** ./resources/beike/shop/default/css/design/app.scss ***! - \**********************************************************/ +/***/ "./resources/beike/admin/css/design/app.scss": +/*!***************************************************!*\ + !*** ./resources/beike/admin/css/design/app.scss ***! + \***************************************************/ /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => { "use strict"; @@ -2623,7 +2618,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P /******/ "build/beike/admin/css/filemanager": 0, /******/ "build/beike/admin/css/app": 0, /******/ "build/beike/admin/css/bootstrap": 0, -/******/ "build/beike/shop/default/css/design/app": 0 +/******/ "build/beike/admin/css/design": 0 /******/ }; /******/ /******/ // no chunk on demand loading @@ -2673,13 +2668,13 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P /******/ // startup /******/ // Load entry module and return exports /******/ // This entry module depends on other loaded chunks and execution need to be delayed -/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/shop/default/css/design/app"], () => (__webpack_require__("./resources/beike/admin/js/app.js"))) -/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/shop/default/css/design/app"], () => (__webpack_require__("./resources/beike/admin/css/bootstrap/bootstrap.scss"))) -/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/shop/default/css/design/app"], () => (__webpack_require__("./resources/beike/admin/css/app.scss"))) -/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/shop/default/css/design/app"], () => (__webpack_require__("./resources/beike/admin/css/filemanager/app.scss"))) -/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/shop/default/css/design/app"], () => (__webpack_require__("./resources/beike/shop/default/css/bootstrap/bootstrap.scss"))) -/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/shop/default/css/design/app"], () => (__webpack_require__("./resources/beike/shop/default/css/app.scss"))) -/******/ var __webpack_exports__ = __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/shop/default/css/design/app"], () => (__webpack_require__("./resources/beike/shop/default/css/design/app.scss"))) +/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/admin/js/app.js"))) +/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/admin/css/bootstrap/bootstrap.scss"))) +/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/admin/css/app.scss"))) +/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/admin/css/filemanager/app.scss"))) +/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/shop/default/css/bootstrap/bootstrap.scss"))) +/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/shop/default/css/app.scss"))) +/******/ var __webpack_exports__ = __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/admin/css/design/app.scss"))) /******/ __webpack_exports__ = __webpack_require__.O(__webpack_exports__); /******/ /******/ })() diff --git a/public/build/beike/shop/default/js/app.js b/public/build/beike/shop/default/js/app.js index b068165b..e2cbb81a 100644 --- a/public/build/beike/shop/default/js/app.js +++ b/public/build/beike/shop/default/js/app.js @@ -2065,25 +2065,20 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ __webpack_require__.d(__webpack_exports__, { /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__) /* harmony export */ }); -/* provided dependency */ var process = __webpack_require__(/*! process/browser.js */ "./node_modules/process/browser.js"); function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } window.axios = __webpack_require__(/*! axios */ "./node_modules/axios/index.js"); var instance = axios.create({ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') - } // baseURL: 'https://api.example.com' - -}); // import axios from "axios"; -// import {Message} from 'element-ui'; -// import QS from 'qs'; - + } +}); axios.defaults.timeout = 5000; // 请求超时 // axios.defaults.baseURL = process.env.NODE_ENV == 'production' ? process.env.VUE_APP_BASE_URL + '/' : '/'; +// console.log(process.env.VUE_APP_BASE_URL) -axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'; -// axios.defaults.headers.post['Content-Type'] = 'application/json'; - +console.log($('base').attr('href')); +axios.defaults.baseURL = $('base').attr('href'); /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ /** * get 请求 @@ -2488,7 +2483,7 @@ $(document).ready(function ($) { layer.closeAll('loading'); } }); - $http.get('/carts/mini', null, { + $http.get('carts/mini', null, { hload: true }).then(function (res) { $('.offcanvas-right-cart-amount').html(res.data.amount_format); diff --git a/public/catalog/demo/banner-1.png b/public/catalog/demo/banner-1.png deleted file mode 100644 index a4d01a3c..00000000 Binary files a/public/catalog/demo/banner-1.png and /dev/null differ diff --git a/public/catalog/demo/banner-2.png b/public/catalog/demo/banner-2.png deleted file mode 100644 index 6dd57b9c..00000000 Binary files a/public/catalog/demo/banner-2.png and /dev/null differ diff --git a/public/catalog/demo/footer-icon-1.png b/public/catalog/demo/footer-icon-1.png deleted file mode 100644 index 942ba9b5..00000000 Binary files a/public/catalog/demo/footer-icon-1.png and /dev/null differ diff --git a/public/catalog/demo/footer-payment.png b/public/catalog/demo/footer-payment.png deleted file mode 100644 index e9be781e..00000000 Binary files a/public/catalog/demo/footer-payment.png and /dev/null differ diff --git a/public/catalog/demo/image_plus_1.png b/public/catalog/demo/image_plus_1.png deleted file mode 100644 index a63f6e42..00000000 Binary files a/public/catalog/demo/image_plus_1.png and /dev/null differ diff --git a/public/catalog/demo/image_plus_2.png b/public/catalog/demo/image_plus_2.png deleted file mode 100644 index ae305b1a..00000000 Binary files a/public/catalog/demo/image_plus_2.png and /dev/null differ diff --git a/public/catalog/demo/image_plus_3.png b/public/catalog/demo/image_plus_3.png deleted file mode 100644 index a81630f9..00000000 Binary files a/public/catalog/demo/image_plus_3.png and /dev/null differ diff --git a/public/catalog/demo/image_plus_4.png b/public/catalog/demo/image_plus_4.png deleted file mode 100644 index 4555ef98..00000000 Binary files a/public/catalog/demo/image_plus_4.png and /dev/null differ diff --git a/resources/beike/admin/css/_iconfont.scss b/resources/beike/admin/css/_iconfont.scss index 4fc873a5..84275c61 100644 --- a/resources/beike/admin/css/_iconfont.scss +++ b/resources/beike/admin/css/_iconfont.scss @@ -9,11 +9,16 @@ // -@font-face { - font-family: 'iconfont'; /* Project id 2787822 */ - src: url('//at.alicdn.com/t/font_2787822_7mtbg56vojp.woff2?t=1634612961708') format('woff2'), - url('//at.alicdn.com/t/font_2787822_7mtbg56vojp.woff?t=1634612961708') format('woff'), - url('//at.alicdn.com/t/font_2787822_7mtbg56vojp.ttf?t=1634612961708') format('truetype'); +// @font-face { +// font-family: 'iconfont'; /* Project id 2787822 */ +// src: url('//at.alicdn.com/t/font_2787822_7mtbg56vojp.woff2?t=1634612961708') format('woff2'), +// url('//at.alicdn.com/t/font_2787822_7mtbg56vojp.woff?t=1634612961708') format('woff'), +// url('//at.alicdn.com/t/font_2787822_7mtbg56vojp.ttf?t=1634612961708') format('truetype'); +// } + +@font-face {font-family: 'iconfont'; + src: url('/vendor/iconfont/iconfont.woff') format('woff'), /* chrome、firefox */ + url('/vendor/iconfont/iconfont.ttf') format('truetype'); /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ } .iconfont { diff --git a/resources/beike/shop/default/css/design/app.scss b/resources/beike/admin/css/design/app.scss similarity index 97% rename from resources/beike/shop/default/css/design/app.scss rename to resources/beike/admin/css/design/app.scss index 5ea210ea..6a3aeff3 100644 --- a/resources/beike/shop/default/css/design/app.scss +++ b/resources/beike/admin/css/design/app.scss @@ -10,6 +10,16 @@ body.page-design { height: 100vh; overflow: hidden; + .tag { + margin: 8px 0; + color: #777; + font-size: 12px; + } + + .icon-rank { + cursor: move; + } + .design-box { display: flex; height: 100vh; diff --git a/resources/beike/admin/views/layouts/master.blade.php b/resources/beike/admin/views/layouts/master.blade.php index fc62a3ef..0a401ac0 100644 --- a/resources/beike/admin/views/layouts/master.blade.php +++ b/resources/beike/admin/views/layouts/master.blade.php @@ -3,7 +3,7 @@ - + diff --git a/resources/beike/admin/views/pages/design/builder/component/image_selector.blade.php b/resources/beike/admin/views/pages/design/builder/component/image_selector.blade.php new file mode 100644 index 00000000..b52e1444 --- /dev/null +++ b/resources/beike/admin/views/pages/design/builder/component/image_selector.blade.php @@ -0,0 +1,188 @@ + + + + + \ No newline at end of file diff --git a/resources/beike/admin/views/pages/design/builder/index.blade.php b/resources/beike/admin/views/pages/design/builder/index.blade.php index 7a8cb353..5593293e 100644 --- a/resources/beike/admin/views/pages/design/builder/index.blade.php +++ b/resources/beike/admin/views/pages/design/builder/index.blade.php @@ -7,17 +7,17 @@ content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> - + 首页编辑器 - + - + @stack('header') @@ -25,8 +25,8 @@