From ffd31babcb3b1ba5bbd566c5cb007d4d7a5bf484 Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Tue, 28 Jun 2022 15:34:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/build/beike/shop/default/css/app.css | 72 ++++++ .../beike/shop/default/css/bootstrap.css | 34 +-- public/build/beike/shop/default/js/app.js | 220 ++++++++++++++++++ .../default/{ => css}/account/account.scss | 0 .../beike/shop/default/{ => css}/app.scss | 3 +- .../{ => css}/bootstrap/bootstrap-icons.scss | 0 .../{ => css}/bootstrap/bootstrap.scss | 8 + .../beike/shop/default/{ => css}/cart.scss | 0 .../beike/shop/default/{ => css}/footer.scss | 0 .../beike/shop/default/{ => css}/global.scss | 0 .../beike/shop/default/{ => css}/header.scss | 0 .../shop/default/{ => css}/iconfont.scss | 0 .../beike/shop/default/{ => css}/login.scss | 0 .../shop/default/{ => css}/module-brand.scss | 0 .../default/{ => css}/module-image-plus.scss | 0 .../default/{ => css}/module-tab-product.scss | 0 .../default/{ => css}/page-categories.scss | 0 .../beike/shop/default/css/page-checkout.scss | 89 +++++++ .../shop/default/{ => css}/product-style.scss | 0 .../beike/shop/default/{ => css}/product.scss | 0 resources/beike/shop/default/js/app.js | 3 + resources/css/app.scss | 4 - themes/default/layout/master.blade.php | 2 + themes/default/pages/cart.blade.php | 2 +- themes/default/pages/checkout.blade.php | 137 +++++++++++ themes/default/product.blade.php | 26 ++- webpack.mix.js | 5 +- 27 files changed, 575 insertions(+), 30 deletions(-) create mode 100644 public/build/beike/shop/default/js/app.js rename resources/beike/shop/default/{ => css}/account/account.scss (100%) rename resources/beike/shop/default/{ => css}/app.scss (87%) rename resources/beike/shop/default/{ => css}/bootstrap/bootstrap-icons.scss (100%) rename resources/beike/shop/default/{ => css}/bootstrap/bootstrap.scss (77%) rename resources/beike/shop/default/{ => css}/cart.scss (100%) rename resources/beike/shop/default/{ => css}/footer.scss (100%) rename resources/beike/shop/default/{ => css}/global.scss (100%) rename resources/beike/shop/default/{ => css}/header.scss (100%) rename resources/beike/shop/default/{ => css}/iconfont.scss (100%) rename resources/beike/shop/default/{ => css}/login.scss (100%) rename resources/beike/shop/default/{ => css}/module-brand.scss (100%) rename resources/beike/shop/default/{ => css}/module-image-plus.scss (100%) rename resources/beike/shop/default/{ => css}/module-tab-product.scss (100%) rename resources/beike/shop/default/{ => css}/page-categories.scss (100%) create mode 100644 resources/beike/shop/default/css/page-checkout.scss rename resources/beike/shop/default/{ => css}/product-style.scss (100%) rename resources/beike/shop/default/{ => css}/product.scss (100%) create mode 100644 resources/beike/shop/default/js/app.js delete mode 100644 resources/css/app.scss create mode 100644 themes/default/pages/checkout.blade.php diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index 70c0fa2b..fd441dea 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -450,3 +450,75 @@ body.page-cart .total-wrap .list-group li .total-price { font-size: 1.2rem; font-weight: bold; } + +body.page-checkout h4.title { + border-bottom: 1px solid #e5e5e5; + padding-bottom: 16px; + margin-bottom: 16px; +} +body.page-checkout .total-wrap { + padding: 1.4rem; + border: 3px solid #efefef; +} +body.page-checkout .total-wrap .card-body { + padding: 0; +} +body.page-checkout .total-wrap .card-header { + background-color: #fff; + padding: 0 0 0.8rem; + margin-bottom: 1rem; + border-color: #E6E6E6; +} +body.page-checkout .total-wrap .card-header h5 { + font-weight: bold; +} +body.page-checkout .total-wrap .products-wrap { + border-bottom: 1px solid #E6E6E6; + margin-bottom: 1.3rem; + padding-bottom: 0.3rem; +} +body.page-checkout .total-wrap .products-wrap .item { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 1rem; +} +body.page-checkout .total-wrap .products-wrap .item .image { + display: flex; + align-items: center; + padding-right: 4px; +} +body.page-checkout .total-wrap .products-wrap .item .image img { + width: 40px; + margin-right: 10px; +} +body.page-checkout .total-wrap .products-wrap .item .image .quantity { + margin-left: 3px; + color: #7a7a7a; +} +body.page-checkout .total-wrap .products-wrap .item .price { + color: #7a7a7a; +} +body.page-checkout .total-wrap .totals { + padding-left: 0; + list-style: none; + padding-bottom: 0.3rem; + margin-bottom: 1.5rem; + border-bottom: 1px solid #E6E6E6; +} +body.page-checkout .total-wrap .totals > li { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 14px; +} +body.page-checkout .total-wrap .totals > li > span { + font-weight: bold; +} +body.page-checkout .total-wrap .totals > li > span:first-of-type { + font-size: 0.8rem; + color: #3f3f3f; +} +body.page-checkout .total-wrap .totals > li > span:last-of-type { + color: #dc3545; +} diff --git a/public/build/beike/shop/default/css/bootstrap.css b/public/build/beike/shop/default/css/bootstrap.css index 50de0ee7..8088a9c2 100644 --- a/public/build/beike/shop/default/css/bootstrap.css +++ b/public/build/beike/shop/default/css/bootstrap.css @@ -8959,7 +8959,7 @@ progress { background-color: #fff; border-color: #feab87; outline: 0; - box-shadow: 0 0 0 0.25rem rgba(253, 86, 15, 0.25); + box-shadow: 0 0 11px 0 rgba(253, 86, 15, 0.1); } .form-control::-webkit-date-and-time-value { height: 1.5em; @@ -9174,7 +9174,7 @@ textarea.form-control-lg { .form-select:focus { border-color: #feab87; outline: 0; - box-shadow: 0 0 0 0.25rem rgba(253, 86, 15, 0.25); + box-shadow: 0 0 11px 0 rgba(253, 86, 15, 0.1); } .form-select[multiple], .form-select[size]:not([size="1"]) { padding-right: 0.75rem; @@ -9243,7 +9243,7 @@ textarea.form-control-lg { .form-check-input:focus { border-color: #feab87; outline: 0; - box-shadow: 0 0 0 0.25rem rgba(253, 86, 15, 0.25); + box-shadow: 0 0 11px 0 rgba(253, 86, 15, 0.1); } .form-check-input:checked { background-color: #fd560f; @@ -9322,10 +9322,10 @@ textarea.form-control-lg { outline: 0; } .form-range:focus::-webkit-slider-thumb { - box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(253, 86, 15, 0.25); + box-shadow: 0 0 0 1px #fff, 0 0 11px 0 rgba(253, 86, 15, 0.1); } .form-range:focus::-moz-range-thumb { - box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(253, 86, 15, 0.25); + box-shadow: 0 0 0 1px #fff, 0 0 11px 0 rgba(253, 86, 15, 0.1); } .form-range::-moz-focus-outer { border: 0; @@ -9404,7 +9404,7 @@ textarea.form-control-lg { } .form-floating > .form-control, .form-floating > .form-select { - height: calc(3.5rem + 2px); + height: 50px; line-height: 1.25; } .form-floating > label { @@ -9412,7 +9412,7 @@ textarea.form-control-lg { top: 0; left: 0; height: 100%; - padding: 1rem 0.75rem; + padding: 0.8rem 0.75rem; pointer-events: none; border: 1px solid transparent; transform-origin: 0 0; @@ -9424,7 +9424,7 @@ textarea.form-control-lg { } } .form-floating > .form-control { - padding: 1rem 0.75rem; + padding: 0.8rem 0.75rem; } .form-floating > .form-control::-moz-placeholder { color: transparent; @@ -9436,23 +9436,23 @@ textarea.form-control-lg { color: transparent; } .form-floating > .form-control:not(:-moz-placeholder-shown) { - padding-top: 1.625rem; + padding-top: 1.325rem; padding-bottom: 0.625rem; } .form-floating > .form-control:not(:-ms-input-placeholder) { - padding-top: 1.625rem; + padding-top: 1.325rem; padding-bottom: 0.625rem; } .form-floating > .form-control:focus, .form-floating > .form-control:not(:placeholder-shown) { - padding-top: 1.625rem; + padding-top: 1.325rem; padding-bottom: 0.625rem; } .form-floating > .form-control:-webkit-autofill { - padding-top: 1.625rem; + padding-top: 1.325rem; padding-bottom: 0.625rem; } .form-floating > .form-select { - padding-top: 1.625rem; + padding-top: 1.325rem; padding-bottom: 0.625rem; } .form-floating > .form-control:not(:-moz-placeholder-shown) ~ label { @@ -9761,7 +9761,7 @@ textarea.form-control-lg { } .btn-check:focus + .btn, .btn:focus { outline: 0; - box-shadow: 0 0 0 0.25rem rgba(253, 86, 15, 0.25); + box-shadow: 0 0 11px 0 rgba(253, 86, 15, 0.1); } .btn:disabled, .btn.disabled, fieldset:disabled .btn { pointer-events: none; @@ -11453,7 +11453,7 @@ textarea.form-control-lg { z-index: 3; border-color: #feab87; outline: 0; - box-shadow: 0 0 0 0.25rem rgba(253, 86, 15, 0.25); + box-shadow: 0 0 11px 0 rgba(253, 86, 15, 0.1); } .accordion-header { @@ -11562,7 +11562,7 @@ textarea.form-control-lg { color: #fd560f; background-color: #e9ecef; outline: 0; - box-shadow: 0 0 0 0.25rem rgba(253, 86, 15, 0.25); + box-shadow: 0 0 11px 0 rgba(253, 86, 15, 0.1); } .page-item:not(:first-child) .page-link { @@ -12144,7 +12144,7 @@ textarea.form-control-lg { } .btn-close:focus { outline: 0; - box-shadow: 0 0 0 0.25rem rgba(253, 86, 15, 0.25); + box-shadow: 0 0 11px 0 rgba(253, 86, 15, 0.1); opacity: 1; } .btn-close:disabled, .btn-close.disabled { diff --git a/public/build/beike/shop/default/js/app.js b/public/build/beike/shop/default/js/app.js new file mode 100644 index 00000000..548950f2 --- /dev/null +++ b/public/build/beike/shop/default/js/app.js @@ -0,0 +1,220 @@ +/******/ (() => { // webpackBootstrap +/******/ var __webpack_modules__ = ({ + +/***/ "./resources/beike/shop/default/js/app.js": +/*!************************************************!*\ + !*** ./resources/beike/shop/default/js/app.js ***! + \************************************************/ +/***/ (() => { + +$(document).ready(function ($) { + $.ajaxSetup({ + headers: { + 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') + } + }); +}); + +/***/ }), + +/***/ "./resources/beike/css/bootstrap/bootstrap.scss": +/*!******************************************************!*\ + !*** ./resources/beike/css/bootstrap/bootstrap.scss ***! + \******************************************************/ +/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +// extracted by mini-css-extract-plugin + + +/***/ }), + +/***/ "./resources/beike/admin/css/app.scss": +/*!********************************************!*\ + !*** ./resources/beike/admin/css/app.scss ***! + \********************************************/ +/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +// extracted by mini-css-extract-plugin + + +/***/ }), + +/***/ "./resources/beike/shop/default/css/bootstrap/bootstrap.scss": +/*!*******************************************************************!*\ + !*** ./resources/beike/shop/default/css/bootstrap/bootstrap.scss ***! + \*******************************************************************/ +/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +// extracted by mini-css-extract-plugin + + +/***/ }), + +/***/ "./resources/beike/shop/default/css/app.scss": +/*!***************************************************!*\ + !*** ./resources/beike/shop/default/css/app.scss ***! + \***************************************************/ +/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +// extracted by mini-css-extract-plugin + + +/***/ }) + +/******/ }); +/************************************************************************/ +/******/ // The module cache +/******/ var __webpack_module_cache__ = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ // Check if module is in cache +/******/ var cachedModule = __webpack_module_cache__[moduleId]; +/******/ if (cachedModule !== undefined) { +/******/ return cachedModule.exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = __webpack_module_cache__[moduleId] = { +/******/ // no module.id needed +/******/ // no module.loaded needed +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__); +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = __webpack_modules__; +/******/ +/************************************************************************/ +/******/ /* webpack/runtime/chunk loaded */ +/******/ (() => { +/******/ var deferred = []; +/******/ __webpack_require__.O = (result, chunkIds, fn, priority) => { +/******/ if(chunkIds) { +/******/ priority = priority || 0; +/******/ for(var i = deferred.length; i > 0 && deferred[i - 1][2] > priority; i--) deferred[i] = deferred[i - 1]; +/******/ deferred[i] = [chunkIds, fn, priority]; +/******/ return; +/******/ } +/******/ var notFulfilled = Infinity; +/******/ for (var i = 0; i < deferred.length; i++) { +/******/ var [chunkIds, fn, priority] = deferred[i]; +/******/ var fulfilled = true; +/******/ for (var j = 0; j < chunkIds.length; j++) { +/******/ if ((priority & 1 === 0 || notFulfilled >= priority) && Object.keys(__webpack_require__.O).every((key) => (__webpack_require__.O[key](chunkIds[j])))) { +/******/ chunkIds.splice(j--, 1); +/******/ } else { +/******/ fulfilled = false; +/******/ if(priority < notFulfilled) notFulfilled = priority; +/******/ } +/******/ } +/******/ if(fulfilled) { +/******/ deferred.splice(i--, 1) +/******/ var r = fn(); +/******/ if (r !== undefined) result = r; +/******/ } +/******/ } +/******/ return result; +/******/ }; +/******/ })(); +/******/ +/******/ /* webpack/runtime/hasOwnProperty shorthand */ +/******/ (() => { +/******/ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop)) +/******/ })(); +/******/ +/******/ /* webpack/runtime/make namespace object */ +/******/ (() => { +/******/ // define __esModule on exports +/******/ __webpack_require__.r = (exports) => { +/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { +/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); +/******/ } +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; +/******/ })(); +/******/ +/******/ /* webpack/runtime/jsonp chunk loading */ +/******/ (() => { +/******/ // no baseURI +/******/ +/******/ // object to store loaded and loading chunks +/******/ // undefined = chunk not loaded, null = chunk preloaded/prefetched +/******/ // [resolve, reject, Promise] = chunk loading, 0 = chunk loaded +/******/ var installedChunks = { +/******/ "/build/beike/shop/default/js/app": 0, +/******/ "build/beike/shop/default/css/app": 0, +/******/ "build/beike/shop/default/css/bootstrap": 0, +/******/ "build/beike/css/admin": 0, +/******/ "build/beike/css/bootstrap": 0 +/******/ }; +/******/ +/******/ // no chunk on demand loading +/******/ +/******/ // no prefetching +/******/ +/******/ // no preloaded +/******/ +/******/ // no HMR +/******/ +/******/ // no HMR manifest +/******/ +/******/ __webpack_require__.O.j = (chunkId) => (installedChunks[chunkId] === 0); +/******/ +/******/ // install a JSONP callback for chunk loading +/******/ var webpackJsonpCallback = (parentChunkLoadingFunction, data) => { +/******/ var [chunkIds, moreModules, runtime] = data; +/******/ // add "moreModules" to the modules object, +/******/ // then flag all "chunkIds" as loaded and fire callback +/******/ var moduleId, chunkId, i = 0; +/******/ if(chunkIds.some((id) => (installedChunks[id] !== 0))) { +/******/ for(moduleId in moreModules) { +/******/ if(__webpack_require__.o(moreModules, moduleId)) { +/******/ __webpack_require__.m[moduleId] = moreModules[moduleId]; +/******/ } +/******/ } +/******/ if(runtime) var result = runtime(__webpack_require__); +/******/ } +/******/ if(parentChunkLoadingFunction) parentChunkLoadingFunction(data); +/******/ for(;i < chunkIds.length; i++) { +/******/ chunkId = chunkIds[i]; +/******/ if(__webpack_require__.o(installedChunks, chunkId) && installedChunks[chunkId]) { +/******/ installedChunks[chunkId][0](); +/******/ } +/******/ installedChunks[chunkId] = 0; +/******/ } +/******/ return __webpack_require__.O(result); +/******/ } +/******/ +/******/ var chunkLoadingGlobal = self["webpackChunk"] = self["webpackChunk"] || []; +/******/ chunkLoadingGlobal.forEach(webpackJsonpCallback.bind(null, 0)); +/******/ chunkLoadingGlobal.push = webpackJsonpCallback.bind(null, chunkLoadingGlobal.push.bind(chunkLoadingGlobal)); +/******/ })(); +/******/ +/************************************************************************/ +/******/ +/******/ // 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/css/admin","build/beike/css/bootstrap"], () => (__webpack_require__("./resources/beike/shop/default/js/app.js"))) +/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/css/admin","build/beike/css/bootstrap"], () => (__webpack_require__("./resources/beike/css/bootstrap/bootstrap.scss"))) +/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/css/admin","build/beike/css/bootstrap"], () => (__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/css/admin","build/beike/css/bootstrap"], () => (__webpack_require__("./resources/beike/shop/default/css/bootstrap/bootstrap.scss"))) +/******/ var __webpack_exports__ = __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/css/admin","build/beike/css/bootstrap"], () => (__webpack_require__("./resources/beike/shop/default/css/app.scss"))) +/******/ __webpack_exports__ = __webpack_require__.O(__webpack_exports__); +/******/ +/******/ })() +; \ No newline at end of file diff --git a/resources/beike/shop/default/account/account.scss b/resources/beike/shop/default/css/account/account.scss similarity index 100% rename from resources/beike/shop/default/account/account.scss rename to resources/beike/shop/default/css/account/account.scss diff --git a/resources/beike/shop/default/app.scss b/resources/beike/shop/default/css/app.scss similarity index 87% rename from resources/beike/shop/default/app.scss rename to resources/beike/shop/default/css/app.scss index 32a91b93..0662f6fa 100644 --- a/resources/beike/shop/default/app.scss +++ b/resources/beike/shop/default/css/app.scss @@ -14,4 +14,5 @@ $primary: #fd560f; @import './login'; @import './account/account'; @import './product'; -@import './cart'; \ No newline at end of file +@import './cart'; +@import './page-checkout'; \ No newline at end of file diff --git a/resources/beike/shop/default/bootstrap/bootstrap-icons.scss b/resources/beike/shop/default/css/bootstrap/bootstrap-icons.scss similarity index 100% rename from resources/beike/shop/default/bootstrap/bootstrap-icons.scss rename to resources/beike/shop/default/css/bootstrap/bootstrap-icons.scss diff --git a/resources/beike/shop/default/bootstrap/bootstrap.scss b/resources/beike/shop/default/css/bootstrap/bootstrap.scss similarity index 77% rename from resources/beike/shop/default/bootstrap/bootstrap.scss rename to resources/beike/shop/default/css/bootstrap/bootstrap.scss index c878c833..b8fd28fc 100644 --- a/resources/beike/shop/default/bootstrap/bootstrap.scss +++ b/resources/beike/shop/default/css/bootstrap/bootstrap.scss @@ -34,6 +34,14 @@ $input-btn-font-size: 0.9rem; $link-decoration: none; $link-color: #1f1f1f; $link-hover-color: $primary; +$input-btn-focus-box-shadow: 0 0 11px 0 rgba($color: $primary, $alpha: .1); +$form-select-focus-box-shadow: 0 0 11px 0 rgba($color: $primary, $alpha: .1); +$btn-focus-box-shadow: 0 0 11px 0 rgba($color: $primary, $alpha: .1); + +$form-floating-input-padding-t: 1.325rem; +$form-floating-input-padding-b: .625rem; +$form-floating-padding-y: .8rem; +$form-floating-height: 50px; @import './bootstrap-icons'; @import 'node_modules/bootstrap-5.1.3/scss/bootstrap'; diff --git a/resources/beike/shop/default/cart.scss b/resources/beike/shop/default/css/cart.scss similarity index 100% rename from resources/beike/shop/default/cart.scss rename to resources/beike/shop/default/css/cart.scss diff --git a/resources/beike/shop/default/footer.scss b/resources/beike/shop/default/css/footer.scss similarity index 100% rename from resources/beike/shop/default/footer.scss rename to resources/beike/shop/default/css/footer.scss diff --git a/resources/beike/shop/default/global.scss b/resources/beike/shop/default/css/global.scss similarity index 100% rename from resources/beike/shop/default/global.scss rename to resources/beike/shop/default/css/global.scss diff --git a/resources/beike/shop/default/header.scss b/resources/beike/shop/default/css/header.scss similarity index 100% rename from resources/beike/shop/default/header.scss rename to resources/beike/shop/default/css/header.scss diff --git a/resources/beike/shop/default/iconfont.scss b/resources/beike/shop/default/css/iconfont.scss similarity index 100% rename from resources/beike/shop/default/iconfont.scss rename to resources/beike/shop/default/css/iconfont.scss diff --git a/resources/beike/shop/default/login.scss b/resources/beike/shop/default/css/login.scss similarity index 100% rename from resources/beike/shop/default/login.scss rename to resources/beike/shop/default/css/login.scss diff --git a/resources/beike/shop/default/module-brand.scss b/resources/beike/shop/default/css/module-brand.scss similarity index 100% rename from resources/beike/shop/default/module-brand.scss rename to resources/beike/shop/default/css/module-brand.scss diff --git a/resources/beike/shop/default/module-image-plus.scss b/resources/beike/shop/default/css/module-image-plus.scss similarity index 100% rename from resources/beike/shop/default/module-image-plus.scss rename to resources/beike/shop/default/css/module-image-plus.scss diff --git a/resources/beike/shop/default/module-tab-product.scss b/resources/beike/shop/default/css/module-tab-product.scss similarity index 100% rename from resources/beike/shop/default/module-tab-product.scss rename to resources/beike/shop/default/css/module-tab-product.scss diff --git a/resources/beike/shop/default/page-categories.scss b/resources/beike/shop/default/css/page-categories.scss similarity index 100% rename from resources/beike/shop/default/page-categories.scss rename to resources/beike/shop/default/css/page-categories.scss diff --git a/resources/beike/shop/default/css/page-checkout.scss b/resources/beike/shop/default/css/page-checkout.scss new file mode 100644 index 00000000..dd7c404c --- /dev/null +++ b/resources/beike/shop/default/css/page-checkout.scss @@ -0,0 +1,89 @@ +@charset "UTF-8"; + +body.page-checkout { + h4.title { + border-bottom: 1px solid #e5e5e5; + padding-bottom: 16px; + margin-bottom: 16px; + } + + .total-wrap { + padding: 1.4rem; + border: 3px solid #efefef; + + .card-body { + padding: 0; + } + + .card-header { + background-color: #fff; + padding: 0 0 .8rem; + margin-bottom: 1rem; + border-color: #E6E6E6; + h5 { + font-weight: bold; + } + } + + .products-wrap { + border-bottom: 1px solid #E6E6E6; + margin-bottom: 1.3rem; + padding-bottom: .3rem; + + .item { + display: flex; + align-items: center; // flex-start | center + justify-content: space-between; // flex-end | center | space-between + margin-bottom: 1rem; + + .image { + display: flex; + align-items: center; // flex-start | center + padding-right: 4px; + + img { + width: 40px; + margin-right: 10px; + } + + .quantity { + margin-left: 3px; + color: #7a7a7a; + } + } + + .price { + color: #7a7a7a; + } + } + } + + .totals { + padding-left: 0; + list-style: none; + padding-bottom: .3rem; + margin-bottom: 1.5rem; + border-bottom: 1px solid #E6E6E6; + + > li { + display: flex; + align-items: center; // flex-start | center + justify-content: space-between; // flex-end | center | space-between + margin-bottom: 14px; + // flex-wrap: wrap; + > span { + font-weight: bold; + + &:first-of-type { + font-size: .8rem; + color: #3f3f3f; + } + + &:last-of-type { + color: #dc3545; + } + } + } + } + } +} \ No newline at end of file diff --git a/resources/beike/shop/default/product-style.scss b/resources/beike/shop/default/css/product-style.scss similarity index 100% rename from resources/beike/shop/default/product-style.scss rename to resources/beike/shop/default/css/product-style.scss diff --git a/resources/beike/shop/default/product.scss b/resources/beike/shop/default/css/product.scss similarity index 100% rename from resources/beike/shop/default/product.scss rename to resources/beike/shop/default/css/product.scss diff --git a/resources/beike/shop/default/js/app.js b/resources/beike/shop/default/js/app.js new file mode 100644 index 00000000..cb08c365 --- /dev/null +++ b/resources/beike/shop/default/js/app.js @@ -0,0 +1,3 @@ +$(document).ready(function ($) { + $.ajaxSetup({ headers: {'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')} }); +}); diff --git a/resources/css/app.scss b/resources/css/app.scss deleted file mode 100644 index abcb76ce..00000000 --- a/resources/css/app.scss +++ /dev/null @@ -1,4 +0,0 @@ -body { - background: #f2f2f2; - // color: #fff; -} diff --git a/themes/default/layout/master.blade.php b/themes/default/layout/master.blade.php index c81921d3..7c2598e6 100644 --- a/themes/default/layout/master.blade.php +++ b/themes/default/layout/master.blade.php @@ -4,11 +4,13 @@ + 首页 + @stack('header') diff --git a/themes/default/pages/cart.blade.php b/themes/default/pages/cart.blade.php index ad4d2578..9bbe6f77 100644 --- a/themes/default/pages/cart.blade.php +++ b/themes/default/pages/cart.blade.php @@ -74,7 +74,7 @@
  • 总数20
  • 总价¥223.33
  • - + 去结账
    • diff --git a/themes/default/pages/checkout.blade.php b/themes/default/pages/checkout.blade.php new file mode 100644 index 00000000..7042b44c --- /dev/null +++ b/themes/default/pages/checkout.blade.php @@ -0,0 +1,137 @@ +@extends('layout.master') + +@section('body-class', 'page-checkout') + +@section('content') +
    + + +
    +
    @include('shared.steps', ['steps' => 2])
    +
    + +
    +
    +
    +
    +

    地址

    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    + +

    支付方式

    +
    +
    + + + + + +
    +
    + +

    配送方式

    +
    +
    + + + + + +
    +
    +
    +
    +
    +
    +
    +
    CART TOTALS
    +
    +
    + @for ($i = 0; $i < 4; $i++) +
    +
    + +
    + Camera Canon EOS M50 Kit + x2 +
    +
    +
    $1156.00
    +
    + @endfor +
    +
      +
    • 总数1120
      • +
    • 运费20
      • +
    • 总价2220
      • +
    +
    + +
    +
    +
    +
    +
    +
    +@endsection diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php index b247d86b..c2b4556d 100644 --- a/themes/default/product.blade.php +++ b/themes/default/product.blade.php @@ -23,6 +23,7 @@
    +

    {{ $product->description->name }}

    @@ -49,10 +50,6 @@ Sku {{ $product->master_sku->sku }} -{{-- - 型号 - product-222 - --}}
    @@ -61,7 +58,7 @@
    - +
    @@ -90,5 +87,24 @@
    + + @endsection diff --git a/webpack.mix.js b/webpack.mix.js index 497d909c..cd854230 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -22,8 +22,9 @@ mix.sass('resources/beike/css/bootstrap/bootstrap.scss', 'public/build/beike/css mix.sass('resources/beike/admin/css/app.scss', 'public/build/beike/css/admin.css'); // 前端 default 模版 -mix.sass('resources/beike/shop/default/bootstrap/bootstrap.scss', 'public/build/beike/shop/default/css/bootstrap.css'); -mix.sass('resources/beike/shop/default/app.scss', 'public/build/beike/shop/default/css/app.css'); +mix.sass('resources/beike/shop/default/css/bootstrap/bootstrap.scss', 'public/build/beike/shop/default/css/bootstrap.css'); +mix.sass('resources/beike/shop/default/css/app.scss', 'public/build/beike/shop/default/css/app.css'); +mix.js('resources/beike/shop/default/js/app.js', 'public/build/beike/shop/default/js/app.js'); if (mix.inProduction()) { mix.version();