diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css index 9321d160..4e0c1422 100644 --- a/public/build/beike/admin/css/app.css +++ b/public/build/beike/admin/css/app.css @@ -147,43 +147,43 @@ min-height: 1000px; } -.h-min-100 { +.s-min-100 { min-width: 100px; } -.h-min-200 { +.s-min-200 { min-width: 200px; } -.h-min-300 { +.s-min-300 { min-width: 300px; } -.h-min-400 { +.s-min-400 { min-width: 400px; } -.h-min-500 { +.s-min-500 { min-width: 500px; } -.h-min-600 { +.s-min-600 { min-width: 600px; } -.h-min-700 { +.s-min-700 { min-width: 700px; } -.h-min-800 { +.s-min-800 { min-width: 800px; } -.h-min-900 { +.s-min-900 { min-width: 900px; } -.h-min-1000 { +.s-min-1000 { min-width: 1000px; } diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index aa6425e1..ed3d6192 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -168,43 +168,43 @@ body[class^=page-account-] { min-height: 1000px; } -.h-min-100 { +.w-min-100 { min-width: 100px; } -.h-min-200 { +.w-min-200 { min-width: 200px; } -.h-min-300 { +.w-min-300 { min-width: 300px; } -.h-min-400 { +.w-min-400 { min-width: 400px; } -.h-min-500 { +.w-min-500 { min-width: 500px; } -.h-min-600 { +.w-min-600 { min-width: 600px; } -.h-min-700 { +.w-min-700 { min-width: 700px; } -.h-min-800 { +.w-min-800 { min-width: 800px; } -.h-min-900 { +.w-min-900 { min-width: 900px; } -.h-min-1000 { +.w-min-1000 { min-width: 1000px; } @@ -869,16 +869,13 @@ body.page-product .peoduct-info .rating-wrap .rating i { color: #fd560f; } body.page-product .peoduct-info .price-wrap { - margin-bottom: 2rem; + margin-bottom: 2.4rem; } body.page-product .peoduct-info .price-wrap .new-price { margin-right: 0.6rem; font-size: 1.6rem; line-height: 1; } -body.page-product .peoduct-info .attribute-wrap { - margin-bottom: 2rem; -} body.page-product .peoduct-info .quantity-btns .quantity-input { max-width: 5rem; text-align: center; diff --git a/public/build/beike/shop/default/js/app.js b/public/build/beike/shop/default/js/app.js index df61bd0b..7f9cd8a4 100644 --- a/public/build/beike/shop/default/js/app.js +++ b/public/build/beike/shop/default/js/app.js @@ -2176,6 +2176,28 @@ __webpack_require__.r(__webpack_exports__); /***/ }), +/***/ "./resources/beike/shop/default/js/header.js": +/*!***************************************************!*\ + !*** ./resources/beike/shop/default/js/header.js ***! + \***************************************************/ +/***/ (() => { + +// offcanvas-search-top +$(function () { + var myOffcanvas = document.getElementById('offcanvas-search-top'); + myOffcanvas.addEventListener('shown.bs.offcanvas', function () { + $('#offcanvas-search-top input').focus(); + $('#offcanvas-search-top input').keydown(function (e) { + if (e.keyCode == 13) { + console.log('enter'); + $('#offcanvas-search-top .btn-search').click(); + } + }); + }); +}); + +/***/ }), + /***/ "./resources/beike/shop/default/js/product.js": /*!****************************************************!*\ !*** ./resources/beike/shop/default/js/product.js ***! @@ -2631,11 +2653,14 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./common */ "./resources/beike/shop/default/js/common.js"); /* harmony import */ var _product__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./product */ "./resources/beike/shop/default/js/product.js"); /* harmony import */ var _product__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_product__WEBPACK_IMPORTED_MODULE_2__); +/* harmony import */ var _header__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./header */ "./resources/beike/shop/default/js/header.js"); +/* harmony import */ var _header__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_header__WEBPACK_IMPORTED_MODULE_3__); window.bk = _common__WEBPACK_IMPORTED_MODULE_1__["default"]; window.$http = _js_http__WEBPACK_IMPORTED_MODULE_0__["default"]; + bk.getCarts(); // 页面初始加载购物车数据 bk.slidingFixed(); diff --git a/resources/beike/admin/css/_global.scss b/resources/beike/admin/css/_global.scss index 1995eb63..e1193002 100644 --- a/resources/beike/admin/css/_global.scss +++ b/resources/beike/admin/css/_global.scss @@ -40,7 +40,7 @@ // 生成 100 200 300 ... 1000 的最小宽度 @for $i from 1 through 10 { - .h-min-#{$i}00 { + .s-min-#{$i}00 { min-width: #{$i}00px; } } 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 index f18c9166..1688b496 100644 --- 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 @@ -101,35 +101,17 @@ }, selectButtonClicked() { - let that = this; this.loading = true; - layer.open({ - type: 2, - title: '图片管理器', - shadeClose: false, - skin: 'file-manager-box', - scrollbar: false, - shade: 0.4, - area: ['1060px', '680px'], - content: '/{{ admin_name() }}/file_manager', - success: function(layerInstance, index) { - var iframeWindow = window[layerInstance.find("iframe")[0]["name"]]; - iframeWindow.callback = function(images) { - // if (images.length < 1) { - // return; - // } - that.loading = false; + bk.fileManagerIframe(images => { + this.loading = false; - if (that.isLanguage) { - that.src[that.tabActiveId] = images[0].path; - } else { - that.src = images[0].path; - } - // console.log(that.src); - } + if (this.isLanguage) { + this.src[this.tabActiveId] = images[0].path; + } else { + this.src = images[0].path; } - }); + }) } } }); diff --git a/resources/beike/admin/views/pages/design/builder/footer.blade.php b/resources/beike/admin/views/pages/design/builder/footer.blade.php index a859d7b3..357aa852 100644 --- a/resources/beike/admin/views/pages/design/builder/footer.blade.php +++ b/resources/beike/admin/views/pages/design/builder/footer.blade.php @@ -258,9 +258,9 @@ }, saveButtonClicked() { - $http.put('design/builder', this.form).then((res) => { - layer.msg(res.message) - }) + // $http.put('design/builder', this.form).then((res) => { + // layer.msg(res.message) + // }) }, selectorShow(index) { 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 d655ce79..3aa0ef16 100644 --- a/resources/beike/admin/views/pages/design/builder/index.blade.php +++ b/resources/beike/admin/views/pages/design/builder/index.blade.php @@ -62,7 +62,7 @@ diff --git a/resources/beike/shop/default/css/global.scss b/resources/beike/shop/default/css/global.scss index 54088030..44968079 100644 --- a/resources/beike/shop/default/css/global.scss +++ b/resources/beike/shop/default/css/global.scss @@ -40,7 +40,7 @@ body[class^="page-account-"] { // 生成 100 200 300 ... 1000 的最小宽度 @for $i from 1 through 10 { - .h-min-#{$i}00 { + .w-min-#{$i}00 { min-width: #{$i}00px; } } diff --git a/resources/beike/shop/default/css/page-product.scss b/resources/beike/shop/default/css/page-product.scss index 279897f2..d58e52bd 100644 --- a/resources/beike/shop/default/css/page-product.scss +++ b/resources/beike/shop/default/css/page-product.scss @@ -125,7 +125,7 @@ body.page-product { } .price-wrap { - margin-bottom: 2rem; + margin-bottom: 2.4rem; .new-price { margin-right: .6rem; @@ -134,14 +134,6 @@ body.page-product { } } - .attribute-wrap { - margin-bottom: 2rem; - - .table { - - } - } - .quantity-btns { .quantity-input { max-width: 5rem; diff --git a/resources/beike/shop/default/js/app.js b/resources/beike/shop/default/js/app.js index 2daf5b22..6fe2d4a3 100644 --- a/resources/beike/shop/default/js/app.js +++ b/resources/beike/shop/default/js/app.js @@ -4,6 +4,7 @@ window.bk = common; window.$http = http; import './product'; +import './header' bk.getCarts(); // 页面初始加载购物车数据 bk.slidingFixed(); \ No newline at end of file diff --git a/resources/beike/shop/default/js/header.js b/resources/beike/shop/default/js/header.js index 8ff85728..b65c4dfd 100644 --- a/resources/beike/shop/default/js/header.js +++ b/resources/beike/shop/default/js/header.js @@ -1,11 +1,13 @@ // offcanvas-search-top -var myOffcanvas = document.getElementById('offcanvas-search-top') -myOffcanvas.addEventListener('shown.bs.offcanvas', function () { - $('#offcanvas-search-top input').focus(); - $('#offcanvas-search-top input').keydown(function (e) { - if (e.keyCode == 13) { - console.log('enter'); - $('#offcanvas-search-top .btn-search').click(); - } +$(function() { + var myOffcanvas = document.getElementById('offcanvas-search-top') + myOffcanvas.addEventListener('shown.bs.offcanvas', function () { + $('#offcanvas-search-top input').focus(); + $('#offcanvas-search-top input').keydown(function (e) { + if (e.keyCode == 13) { + console.log('enter'); + $('#offcanvas-search-top .btn-search').click(); + } + }) }) -}) \ No newline at end of file +}); \ No newline at end of file diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php index 1105e109..95f297cf 100644 --- a/themes/default/product.blade.php +++ b/themes/default/product.blade.php @@ -18,7 +18,7 @@ {{ Diglactic\Breadcrumbs\Breadcrumbs::render('product', $product) }}
-
+
@@ -44,9 +44,15 @@
-
+
-

{{ $product['name'] }}

+

{{ $product['name'] }}

+
+ @{{ product.quantity > 0 ? 'In Stock' : 'Out Stock' }} + SKU: @{{ product.sku }} + MODEL: @{{ product.model }} +
+ @if (0)
@for ($i = 0; $i < 5; $i++) @@ -55,14 +61,15 @@
132 reviews
+ @endif
@{{ product.price_format }}
@{{ product.origin_price_format }}
-
+
-

@{{ variable.name }}

+

@{{ variable.name }}

-
- - - - - - - - - - - -
型号@{{ product.model }}
Sku@{{ product.sku }}
-
-
@@ -290,9 +282,8 @@ }); $(document).ready(function () { - $('#zoom').trigger('zoom.destroy'); - $('#zoom').zoom({url: $('#swiper a').attr('data-zoom-image')}); + $('#zoom').trigger('zoom.destroy'); + $('#zoom').zoom({url: $('#swiper a').attr('data-zoom-image')}); }); - @endpush