From e7254d5ef6ed1bed7a070f9501c0838fb745b811 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Mon, 8 Aug 2022 11:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20js=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Services/CurrencyService.php            |   8 +
 public/build/beike/shop/default/js/app.js     | 196 ++++++++++--------
 .../pages/design/builder/index.blade.php      |  11 +-
 resources/beike/shop/default/js/app.js        |   3 +-
 resources/beike/shop/default/js/common.js     |  82 ++++++++
 resources/beike/shop/default/js/global.js     |  71 -------
 6 files changed, 203 insertions(+), 168 deletions(-)
 create mode 100644 resources/beike/shop/default/js/common.js
 delete mode 100644 resources/beike/shop/default/js/global.js

diff --git a/beike/Services/CurrencyService.php b/beike/Services/CurrencyService.php
index 54feb664..a74e4a30 100644
--- a/beike/Services/CurrencyService.php
+++ b/beike/Services/CurrencyService.php
@@ -1,4 +1,12 @@
 <?php
+/*
+ * @copyright     2022 opencart.cn - All Rights Reserved.
+ * @link          https://www.guangdawangluo.com
+ * @Author        Pu Shuo <pushuo@opencart.cn>
+ * @Date          2022-08-02 19:19:52
+ * @LastEditTime  2022-08-06 12:52:21
+ */
+
 /**
  * CurrencyService.php
  *
diff --git a/public/build/beike/shop/default/js/app.js b/public/build/beike/shop/default/js/app.js
index 0469a502..f19978a3 100644
--- a/public/build/beike/shop/default/js/app.js
+++ b/public/build/beike/shop/default/js/app.js
@@ -2054,98 +2054,118 @@ module.exports = {
 
 /***/ }),
 
-/***/ "./resources/beike/shop/default/js/global.js":
+/***/ "./resources/beike/shop/default/js/common.js":
 /*!***************************************************!*\
-  !*** ./resources/beike/shop/default/js/global.js ***!
+  !*** ./resources/beike/shop/default/js/common.js ***!
   \***************************************************/
-/***/ (() => {
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-// 创建 bk 对象
-window.bk = window.bk || {}; // 获取购物车数据
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
+  /**
+   * @description: 获取购物车数据
+   * @return {*}
+   */
+  getCarts: function getCarts() {
+    $http.get('carts/mini', null, {
+      hload: true
+    }).then(function (res) {
+      $('.offcanvas-right-cart-amount').html(res.data.amount_format);
 
-bk.getCarts = function () {
-  $http.get('carts/mini', null, {
-    hload: true
-  }).then(function (res) {
-    $('.offcanvas-right-cart-amount').html(res.data.amount_format);
-
-    if (res.data.carts.length) {
-      $('.navbar-icon-link-badge').html(res.data.carts.length > 99 ? '99+' : res.data.carts.length).show();
-      $('.offcanvas-right-cart-count').html(res.data.quantity);
-      var html = '';
-      res.data.carts.forEach(function (e) {
-        html += '<div class="product-list d-flex align-items-center">';
-        html += "<div class=\"left\"><img src=\"".concat(e.image, "\" calss=\"img-fluid\"></div>");
-        html += '<div class="right flex-grow-1">';
-        html += "<div class=\"name fs-sm fw-bold mb-2\">".concat(e.name, "</div>");
-        html += '<div class="product-bottom d-flex justify-content-between align-items-center">';
-        html += "<div class=\"price\">".concat(e.price_format, " <span class=\"text-muted\">x ").concat(e.quantity, "<span></div>");
-        html += "<span class=\"offcanvas-products-delete\" data-id=\"".concat(e.cart_id, "\"><i class=\"bi bi-x-lg\"></i> \u5220\u9664</span>");
-        html += '</div>';
-        html += '</div>';
-        html += '</div>';
-      });
-      $('.offcanvas-right-products').html(html);
-    }
-  });
-}; // 加入购物车
-
-
-bk.addCart = function (sku_id) {
-  var quantity = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-  var isBuyNow = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  $http.post('/carts', {
-    sku_id: sku_id,
-    quantity: quantity
-  }).then(function (res) {
-    bk.getCarts();
-    layer.msg(res.message);
-
-    if (isBuyNow) {
-      location.href = 'checkout';
-    }
-  });
-}; // 滑动固定顶部
-
-
-bk.slidingFixed = function () {
-  $(document).ready(function () {
-    if (!$('.fixed-top-line').length) return;
-    if ($(window).width() < 768) return;
-    var totalWrapTop = $('.fixed-top-line').offset().top;
-    var totalWrapWidth = $('.fixed-top-line').outerWidth();
-    var totalWrapHeight = $('.fixed-top-line').outerHeight();
-    var totalWrapLeft = $('.fixed-top-line').offset().left;
-    var footerTop = $('footer').offset().top;
-    var footerMarginTop = Math.abs(parseInt($('footer').css("marginTop")));
-    $(window).scroll(function () {
-      if ($(this).scrollTop() > totalWrapTop) {
-        $('.fixed-top-line').css({
-          position: 'fixed',
-          top: 0,
-          bottom: 'auto',
-          'width': totalWrapWidth
+      if (res.data.carts.length) {
+        $('.navbar-icon-link-badge').html(res.data.carts.length > 99 ? '99+' : res.data.carts.length).show();
+        $('.offcanvas-right-cart-count').html(res.data.quantity);
+        var html = '';
+        res.data.carts.forEach(function (e) {
+          html += '<div class="product-list d-flex align-items-center">';
+          html += "<div class=\"left\"><img src=\"".concat(e.image, "\" calss=\"img-fluid\"></div>");
+          html += '<div class="right flex-grow-1">';
+          html += "<div class=\"name fs-sm fw-bold mb-2\">".concat(e.name, "</div>");
+          html += '<div class="product-bottom d-flex justify-content-between align-items-center">';
+          html += "<div class=\"price\">".concat(e.price_format, " <span class=\"text-muted\">x ").concat(e.quantity, "<span></div>");
+          html += "<span class=\"offcanvas-products-delete\" data-id=\"".concat(e.cart_id, "\"><i class=\"bi bi-x-lg\"></i> \u5220\u9664</span>");
+          html += '</div>';
+          html += '</div>';
+          html += '</div>';
         });
-
-        if (!$('.total-old').length) {
-          $('.fixed-top-line').before('<div class="total-old" style="height:' + totalWrapHeight + 'px; width:100%;"></div>');
-        }
-
-        if ($(this).scrollTop() + totalWrapHeight > footerTop - footerMarginTop) {
-          $('.fixed-top-line').css({
-            position: 'absolute',
-            top: 'auto',
-            bottom: '0',
-            'width': totalWrapWidth
-          });
-        }
-      } else {
-        $('.total-old').remove();
-        $('.fixed-top-line').removeAttr('style');
+        $('.offcanvas-right-products').html(html);
       }
     });
-  });
-};
+  },
+
+  /**
+   * @description: 加入购物车
+   * @param {*} sku_id  商品id
+   * @param {*} quantity  商品数量
+   * @param {*} isBuyNow  是否立即购买
+   * @return {*}  返回Promise
+   */
+  addCart: function addCart(sku_id) {
+    var _this = this;
+
+    var quantity = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+    var isBuyNow = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    $http.post('/carts', {
+      sku_id: sku_id,
+      quantity: quantity
+    }).then(function (res) {
+      _this.getCarts();
+
+      layer.msg(res.message);
+
+      if (isBuyNow) {
+        location.href = 'checkout';
+      }
+    });
+  },
+
+  /**
+   * @description: 滑动固定顶部
+   * @return {*}
+   */
+  slidingFixed: function slidingFixed() {
+    $(document).ready(function () {
+      if (!$('.fixed-top-line').length) return;
+      if ($(window).width() < 768) return;
+      var totalWrapTop = $('.fixed-top-line').offset().top;
+      var totalWrapWidth = $('.fixed-top-line').outerWidth();
+      var totalWrapHeight = $('.fixed-top-line').outerHeight();
+      var totalWrapLeft = $('.fixed-top-line').offset().left;
+      var footerTop = $('footer').offset().top;
+      var footerMarginTop = Math.abs(parseInt($('footer').css("marginTop")));
+      $(window).scroll(function () {
+        if ($(this).scrollTop() > totalWrapTop) {
+          $('.fixed-top-line').css({
+            position: 'fixed',
+            top: 0,
+            bottom: 'auto',
+            'width': totalWrapWidth
+          });
+
+          if (!$('.total-old').length) {
+            $('.fixed-top-line').before('<div class="total-old" style="height:' + totalWrapHeight + 'px; width:100%;"></div>');
+          }
+
+          if ($(this).scrollTop() + totalWrapHeight > footerTop - footerMarginTop) {
+            $('.fixed-top-line').css({
+              position: 'absolute',
+              top: 'auto',
+              bottom: '0',
+              'width': totalWrapWidth
+            });
+          }
+        } else {
+          $('.total-old').remove();
+          $('.fixed-top-line').removeAttr('style');
+        }
+      });
+    });
+  }
+});
 
 /***/ }),
 
@@ -2601,13 +2621,13 @@ var __webpack_exports__ = {};
   \************************************************/
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _js_http__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../js/http */ "./resources/js/http.js");
-/* harmony import */ var _global__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./global */ "./resources/beike/shop/default/js/global.js");
-/* harmony import */ var _global__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_global__WEBPACK_IMPORTED_MODULE_1__);
+/* 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__);
 
-window.$http = _js_http__WEBPACK_IMPORTED_MODULE_0__["default"];
 
+window.bk = _common__WEBPACK_IMPORTED_MODULE_1__["default"];
+window.$http = _js_http__WEBPACK_IMPORTED_MODULE_0__["default"];
 
 bk.getCarts(); // 页面初始加载购物车数据
 
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 4291de74..d655ce79 100644
--- a/resources/beike/admin/views/pages/design/builder/index.blade.php
+++ b/resources/beike/admin/views/pages/design/builder/index.blade.php
@@ -26,14 +26,9 @@
   <div class="design-box">
     <div class="sidebar-edit-wrap" id="app" v-cloak>
       <div class="design-head">
-        <template v-if="design.editType == 'add'">
-          <div @click="exitDesign"><i class="el-icon-switch-button"></i>返回</div>
-          <div @click="viewHome"><i class="el-icon-view"></i>查看页面</div>
-          <div @click="saveButtonClicked"><i class="el-icon-check"></i>保存</div>
-        </template>
-        <template v-else>
-          <div @click="showAllModuleButtonClicked"><i class="el-icon-back"></i>返回</div>
-        </template>
+        <div v-if="design.editType != 'add'" @click="showAllModuleButtonClicked"><i class="el-icon-back"></i>返回</div>
+        <div @click="viewHome"><i class="el-icon-view"></i>查看页面</div>
+        <div @click="saveButtonClicked"><i class="el-icon-check"></i>保存</div>
       </div>
       <div class="module-edit" v-if="form.modules.length > 0 && design.editType == 'module'">
         <component
diff --git a/resources/beike/shop/default/js/app.js b/resources/beike/shop/default/js/app.js
index 6a35abb5..2daf5b22 100644
--- a/resources/beike/shop/default/js/app.js
+++ b/resources/beike/shop/default/js/app.js
@@ -1,7 +1,8 @@
 import http from "../../../../js/http";
+import common from "./common";
+window.bk = common;
 window.$http = http;
 
-import './global';
 import './product';
 
 bk.getCarts(); // 页面初始加载购物车数据
diff --git a/resources/beike/shop/default/js/common.js b/resources/beike/shop/default/js/common.js
new file mode 100644
index 00000000..3d3d006b
--- /dev/null
+++ b/resources/beike/shop/default/js/common.js
@@ -0,0 +1,82 @@
+export default {
+  /**
+   * @description: 获取购物车数据
+   * @return {*}
+   */
+  getCarts() {
+    $http.get('carts/mini', null, {hload: true}).then((res) => {
+      $('.offcanvas-right-cart-amount').html(res.data.amount_format);
+
+      if (res.data.carts.length) {
+        $('.navbar-icon-link-badge').html(res.data.carts.length > 99 ? '99+' : res.data.carts.length).show();
+        $('.offcanvas-right-cart-count').html(res.data.quantity);
+
+        let html = '';
+        res.data.carts.forEach(e => {
+          html += '<div class="product-list d-flex align-items-center">';
+            html += `<div class="left"><img src="${e.image}" calss="img-fluid"></div>`;
+            html += '<div class="right flex-grow-1">';
+              html += `<div class="name fs-sm fw-bold mb-2">${e.name}</div>`;
+              html += '<div class="product-bottom d-flex justify-content-between align-items-center">';
+                html += `<div class="price">${e.price_format} <span class="text-muted">x ${e.quantity}<span></div>`;
+                html += `<span class="offcanvas-products-delete" data-id="${e.cart_id}"><i class="bi bi-x-lg"></i> 删除</span>`;
+              html += '</div>';
+            html += '</div>';
+          html += '</div>';
+        })
+
+        $('.offcanvas-right-products').html(html)
+      }
+    })
+  },
+
+  /**
+   * @description: 加入购物车
+   * @param {*} sku_id  商品id
+   * @param {*} quantity  商品数量
+   * @param {*} isBuyNow  是否立即购买
+   * @return {*}  返回Promise
+   */
+  addCart(sku_id, quantity = 1, isBuyNow = false) {
+    $http.post('/carts', {sku_id, quantity}).then((res) => {
+      this.getCarts();
+      layer.msg(res.message)
+      if (isBuyNow) {
+        location.href = 'checkout'
+      }
+    })
+  },
+
+  /**
+   * @description: 滑动固定顶部
+   * @return {*}
+   */
+  slidingFixed() {
+    $(document).ready(() => {
+      if (!$('.fixed-top-line').length) return;
+      if ($(window).width() < 768) return;
+      const totalWrapTop = $('.fixed-top-line').offset().top;
+      const totalWrapWidth = $('.fixed-top-line').outerWidth();
+      const totalWrapHeight = $('.fixed-top-line').outerHeight();
+      const totalWrapLeft = $('.fixed-top-line').offset().left;
+      const footerTop = $('footer').offset().top;
+      const footerMarginTop = Math.abs(parseInt($('footer').css("marginTop")));
+
+      $(window).scroll(function () {
+        if ($(this).scrollTop() > totalWrapTop) {
+          $('.fixed-top-line').css({position: 'fixed', top: 0, bottom: 'auto', 'width': totalWrapWidth})
+          if (!$('.total-old').length) {
+            $('.fixed-top-line').before('<div class="total-old" style="height:' + totalWrapHeight + 'px; width:100%;"></div>');
+          }
+
+          if ($(this).scrollTop() + totalWrapHeight > footerTop - footerMarginTop) {
+            $('.fixed-top-line').css({position: 'absolute', top: 'auto', bottom: '0', 'width': totalWrapWidth})
+          }
+        } else {
+          $('.total-old').remove();
+          $('.fixed-top-line').removeAttr('style')
+        }
+      })
+    })
+  }
+}
\ No newline at end of file
diff --git a/resources/beike/shop/default/js/global.js b/resources/beike/shop/default/js/global.js
deleted file mode 100644
index 21e30d54..00000000
--- a/resources/beike/shop/default/js/global.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// 创建 bk 对象
-window.bk = window.bk || {};
-
-// 获取购物车数据
-bk.getCarts = () => {
-  $http.get('carts/mini', null, {hload: true}).then((res) => {
-    $('.offcanvas-right-cart-amount').html(res.data.amount_format);
-
-    if (res.data.carts.length) {
-      $('.navbar-icon-link-badge').html(res.data.carts.length > 99 ? '99+' : res.data.carts.length).show();
-      $('.offcanvas-right-cart-count').html(res.data.quantity);
-
-      let html = '';
-      res.data.carts.forEach(e => {
-        html += '<div class="product-list d-flex align-items-center">';
-          html += `<div class="left"><img src="${e.image}" calss="img-fluid"></div>`;
-          html += '<div class="right flex-grow-1">';
-            html += `<div class="name fs-sm fw-bold mb-2">${e.name}</div>`;
-            html += '<div class="product-bottom d-flex justify-content-between align-items-center">';
-              html += `<div class="price">${e.price_format} <span class="text-muted">x ${e.quantity}<span></div>`;
-              html += `<span class="offcanvas-products-delete" data-id="${e.cart_id}"><i class="bi bi-x-lg"></i> 删除</span>`;
-            html += '</div>';
-          html += '</div>';
-        html += '</div>';
-      })
-
-      $('.offcanvas-right-products').html(html)
-    }
-  })
-}
-
-// 加入购物车
-bk.addCart = (sku_id, quantity = 1, isBuyNow = false) => {
-  $http.post('/carts', {sku_id, quantity}).then((res) => {
-    bk.getCarts();
-    layer.msg(res.message)
-    if (isBuyNow) {
-      location.href = 'checkout'
-    }
-  })
-}
-
-// 滑动固定顶部
-bk.slidingFixed = () => {
-  $(document).ready(() => {
-    if (!$('.fixed-top-line').length) return;
-    if ($(window).width() < 768) return;
-    const totalWrapTop = $('.fixed-top-line').offset().top;
-    const totalWrapWidth = $('.fixed-top-line').outerWidth();
-    const totalWrapHeight = $('.fixed-top-line').outerHeight();
-    const totalWrapLeft = $('.fixed-top-line').offset().left;
-    const footerTop = $('footer').offset().top;
-    const footerMarginTop = Math.abs(parseInt($('footer').css("marginTop")));
-
-    $(window).scroll(function () {
-      if ($(this).scrollTop() > totalWrapTop) {
-        $('.fixed-top-line').css({position: 'fixed', top: 0, bottom: 'auto', 'width': totalWrapWidth})
-        if (!$('.total-old').length) {
-          $('.fixed-top-line').before('<div class="total-old" style="height:' + totalWrapHeight + 'px; width:100%;"></div>');
-        }
-
-        if ($(this).scrollTop() + totalWrapHeight > footerTop - footerMarginTop) {
-          $('.fixed-top-line').css({position: 'absolute', top: 'auto', bottom: '0', 'width': totalWrapWidth})
-        }
-      } else {
-        $('.total-old').remove();
-        $('.fixed-top-line').removeAttr('style')
-      }
-    })
-  })
-};
\ No newline at end of file