Browse Source

change: new product排序同步au的逻辑. 商品价格计算逻辑修正.

peter 5 months ago
parent
commit
01a7de6711
36 changed files with 2485 additions and 2295 deletions
  1. 3 3
      .nuxt/components/index.js
  2. 3 3
      .nuxt/components/readme.md
  3. 0 0
      .nuxt/dist/client/853b644.js
  4. 0 0
      .nuxt/dist/client/853b644.js.map
  5. 0 0
      .nuxt/dist/client/8683e90.js.map
  6. 0 0
      .nuxt/dist/client/921b408.js
  7. 0 0
      .nuxt/dist/client/921b408.js.map
  8. 7 7
      .nuxt/dist/client/LICENSES
  9. 0 0
      .nuxt/dist/client/css/a2634e7.css
  10. 0 0
      .nuxt/dist/client/d69321e.js
  11. 0 0
      .nuxt/dist/client/d69321e.js.map
  12. 0 0
      .nuxt/dist/client/e18f6f8.js
  13. 0 0
      .nuxt/dist/client/e18f6f8.js.map
  14. 0 0
      .nuxt/dist/client/ea2e716.js
  15. 0 0
      .nuxt/dist/client/ea2e716.js.map
  16. 2169 2169
      .nuxt/dist/server/client.manifest.json
  17. 64 29
      .nuxt/dist/server/components/product-quote.js
  18. 0 0
      .nuxt/dist/server/components/product-quote.js.map
  19. 64 29
      .nuxt/dist/server/components/product-right.js
  20. 0 0
      .nuxt/dist/server/components/product-right.js.map
  21. 1 1
      .nuxt/dist/server/index.spa.html
  22. 19 2
      .nuxt/dist/server/pages/category/_firstCategory/_secondCategory/_thirdCategory/index.js
  23. 0 0
      .nuxt/dist/server/pages/category/_firstCategory/_secondCategory/_thirdCategory/index.js.map
  24. 19 2
      .nuxt/dist/server/pages/category/_firstCategory/_secondCategory/index.js
  25. 0 0
      .nuxt/dist/server/pages/category/_firstCategory/_secondCategory/index.js.map
  26. 19 2
      .nuxt/dist/server/pages/category/_firstCategory/index.js
  27. 0 0
      .nuxt/dist/server/pages/category/_firstCategory/index.js.map
  28. 19 2
      .nuxt/dist/server/pages/category/index.js
  29. 0 0
      .nuxt/dist/server/pages/category/index.js.map
  30. 19 2
      .nuxt/dist/server/pages/category/searchResult/index.js
  31. 0 0
      .nuxt/dist/server/pages/category/searchResult/index.js.map
  32. 64 29
      .nuxt/dist/server/pages/product/_code.js
  33. 0 0
      .nuxt/dist/server/pages/product/_code.js.map
  34. 6 6
      .nuxt/dist/server/server.js
  35. 0 0
      .nuxt/dist/server/server.js.map
  36. 9 9
      .nuxt/vetur/tags.json

+ 3 - 3
.nuxt/components/index.js

@@ -40,9 +40,6 @@ export const TinymceToolbar = () => import('../../components/Tinymce/toolbar.js'
 export const ProductLeft = () => import('../../components/product/ProductLeft.vue' /* webpackChunkName: "components/product-left" */).then(c => wrapFunctional(c.default || c))
 export const ProductRight = () => import('../../components/product/ProductRight.vue' /* webpackChunkName: "components/product-right" */).then(c => wrapFunctional(c.default || c))
 export const ProductQuote = () => import('../../components/product/Quote.vue' /* webpackChunkName: "components/product-quote" */).then(c => wrapFunctional(c.default || c))
-export const CustomElSliderButton = () => import('../../components/custom-el-slider/button.vue' /* webpackChunkName: "components/custom-el-slider-button" */).then(c => wrapFunctional(c.default || c))
-export const CustomElSlider = () => import('../../components/custom-el-slider/index.vue' /* webpackChunkName: "components/custom-el-slider" */).then(c => wrapFunctional(c.default || c))
-export const CustomElSliderMarker = () => import('../../components/custom-el-slider/marker.vue' /* webpackChunkName: "components/custom-el-slider-marker" */).then(c => wrapFunctional(c.default || c))
 export const TableChangeTable = () => import('../../components/table/ChangeTable.vue' /* webpackChunkName: "components/table-change-table" */).then(c => wrapFunctional(c.default || c))
 export const TableMailTable = () => import('../../components/table/MailTable.vue' /* webpackChunkName: "components/table-mail-table" */).then(c => wrapFunctional(c.default || c))
 export const TableNewPriceTable = () => import('../../components/table/NewPriceTable.vue' /* webpackChunkName: "components/table-new-price-table" */).then(c => wrapFunctional(c.default || c))
@@ -55,6 +52,9 @@ export const ProductBuilderStep1 = () => import('../../components/product-builde
 export const ProductBuilderStep2 = () => import('../../components/product-builder/step-2.vue' /* webpackChunkName: "components/product-builder-step2" */).then(c => wrapFunctional(c.default || c))
 export const ProductBuilderStep3 = () => import('../../components/product-builder/step-3.vue' /* webpackChunkName: "components/product-builder-step3" */).then(c => wrapFunctional(c.default || c))
 export const ProductBuilderStepMixin = () => import('../../components/product-builder/stepMixin.vue' /* webpackChunkName: "components/product-builder-step-mixin" */).then(c => wrapFunctional(c.default || c))
+export const CustomElSliderButton = () => import('../../components/custom-el-slider/button.vue' /* webpackChunkName: "components/custom-el-slider-button" */).then(c => wrapFunctional(c.default || c))
+export const CustomElSlider = () => import('../../components/custom-el-slider/index.vue' /* webpackChunkName: "components/custom-el-slider" */).then(c => wrapFunctional(c.default || c))
+export const CustomElSliderMarker = () => import('../../components/custom-el-slider/marker.vue' /* webpackChunkName: "components/custom-el-slider-marker" */).then(c => wrapFunctional(c.default || c))
 export const TinymceComponentsEditorImage = () => import('../../components/Tinymce/components/EditorImage.vue' /* webpackChunkName: "components/tinymce-components-editor-image" */).then(c => wrapFunctional(c.default || c))
 
 // nuxt/nuxt.js#8607

+ 3 - 3
.nuxt/components/readme.md

@@ -48,9 +48,6 @@ You can directly use them in pages and other components without the need to impo
 - `<ProductLeft>` | `<product-left>` (components/product/ProductLeft.vue)
 - `<ProductRight>` | `<product-right>` (components/product/ProductRight.vue)
 - `<ProductQuote>` | `<product-quote>` (components/product/Quote.vue)
-- `<CustomElSliderButton>` | `<custom-el-slider-button>` (components/custom-el-slider/button.vue)
-- `<CustomElSlider>` | `<custom-el-slider>` (components/custom-el-slider/index.vue)
-- `<CustomElSliderMarker>` | `<custom-el-slider-marker>` (components/custom-el-slider/marker.vue)
 - `<TableChangeTable>` | `<table-change-table>` (components/table/ChangeTable.vue)
 - `<TableMailTable>` | `<table-mail-table>` (components/table/MailTable.vue)
 - `<TableNewPriceTable>` | `<table-new-price-table>` (components/table/NewPriceTable.vue)
@@ -63,4 +60,7 @@ You can directly use them in pages and other components without the need to impo
 - `<ProductBuilderStep2>` | `<product-builder-step2>` (components/product-builder/step-2.vue)
 - `<ProductBuilderStep3>` | `<product-builder-step3>` (components/product-builder/step-3.vue)
 - `<ProductBuilderStepMixin>` | `<product-builder-step-mixin>` (components/product-builder/stepMixin.vue)
+- `<CustomElSliderButton>` | `<custom-el-slider-button>` (components/custom-el-slider/button.vue)
+- `<CustomElSlider>` | `<custom-el-slider>` (components/custom-el-slider/index.vue)
+- `<CustomElSliderMarker>` | `<custom-el-slider-marker>` (components/custom-el-slider/marker.vue)
 - `<TinymceComponentsEditorImage>` | `<tinymce-components-editor-image>` (components/Tinymce/components/EditorImage.vue)

File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/client/853b644.js


File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/client/853b644.js.map


File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/client/8683e90.js.map


File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/client/921b408.js


File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/client/921b408.js.map


+ 7 - 7
.nuxt/dist/client/LICENSES

@@ -117,13 +117,6 @@
  */
 
 
-/*!
- * vue-infinite-loading v2.4.5
- * (c) 2016-2020 PeachScript
- * MIT License
- */
-
-
 /**
  * @license
  * Lodash <https://lodash.com/>
@@ -156,6 +149,13 @@
     ***************************************************************************** */
 
 
+/*!
+ * vue-infinite-loading v2.4.5
+ * (c) 2016-2020 PeachScript
+ * MIT License
+ */
+
+
 /*!
  * clipboard.js v2.0.11
  * https://clipboardjs.com/

File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/client/css/a2634e7.css


File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/client/d69321e.js


File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/client/d69321e.js.map


File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/client/e18f6f8.js


File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/client/e18f6f8.js.map


File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/client/ea2e716.js


File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/client/ea2e716.js.map


File diff suppressed because it is too large
+ 2169 - 2169
.nuxt/dist/server/client.manifest.json


+ 64 - 29
.nuxt/dist/server/components/product-quote.js

@@ -2127,9 +2127,9 @@ var component = Object(componentNormalizer["a" /* default */])(
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(187);
-/* harmony import */ var _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony import */ var _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(187);
+/* harmony import */ var _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 
 
 /***/ }),
@@ -2141,7 +2141,7 @@ __webpack_require__.r(__webpack_exports__);
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--2-0!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/@nuxt/components/dist/loader.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./components/product/Quote.vue?vue&type=template&id=e87b4ce2&scoped=true
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--2-0!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/@nuxt/components/dist/loader.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./components/product/Quote.vue?vue&type=template&id=0714c0ac&scoped=true
 var render = function render() {
   var _vm$comCurBaseColumns, _vm$enquiryConfig$3$s;
   var _vm = this,
@@ -2154,7 +2154,7 @@ var render = function render() {
       expression: "true"
     }],
     staticClass: "com-loading"
-  }) : _vm.quoteLoadState == 1 ? _vm._ssrNode("<div data-v-e87b4ce2>", "</div>", [_c('tab-nav', {
+  }) : _vm.quoteLoadState == 1 ? _vm._ssrNode("<div data-v-0714c0ac>", "</div>", [_c('tab-nav', {
     attrs: {
       "borderType": 'allBorder',
       "liWidth": 100,
@@ -2175,7 +2175,7 @@ var render = function render() {
     var _items$basePrice, _items$decoration, _items$basePrice2, _items$basePrice2$ite, _items$basePrice2$ite2, _items$basePrice3, _items$basePrice3$ite, _items$basePrice3$ite2;
     return _vm._ssrNode("<div" + _vm._ssrStyle(null, null, {
       display: _vm.curWeek == indexs ? '' : 'none'
-    }) + " data-v-e87b4ce2>", "</div>", [_vm._ssrNode("<div data-v-e87b4ce2>", "</div>", [_c('tab-nav', {
+    }) + " data-v-0714c0ac>", "</div>", [_vm._ssrNode("<div data-v-0714c0ac>", "</div>", [_c('tab-nav', {
       attrs: {
         "borderType": 'incompleteBorder',
         "currTab": items.curPrint,
@@ -2200,7 +2200,7 @@ var render = function render() {
       var _items$decorationOrig;
       return _vm._ssrNode("<div" + _vm._ssrStyle(null, null, {
         display: items.curPrint == index ? '' : 'none'
-      }) + " data-v-e87b4ce2>", "</div>", [_c('new-price-table', {
+      }) + " data-v-0714c0ac>", "</div>", [_c('new-price-table', {
         attrs: {
           "tableColumns": [..._vm.undecorated_columns, ...item.part_columns],
           "tableData": item.data,
@@ -2230,7 +2230,7 @@ var render = function render() {
     }) : _vm._e(), _vm._ssrNode(" "), _vm._l(items.basePrice, function (item, index) {
       return _vm._ssrNode("<div" + _vm._ssrStyle(null, null, {
         display: items.curPrint == index && item.decoration_addition.length ? '' : 'none'
-      }) + " data-v-e87b4ce2>", "</div>", [_c('new-price-table', {
+      }) + " data-v-0714c0ac>", "</div>", [_c('new-price-table', {
         attrs: {
           "tableData": item.decoration_addition,
           "tableColumns": [..._vm.addon_columns, ...item.part_columns],
@@ -2248,7 +2248,7 @@ var render = function render() {
         }
       })], 1);
     })], 2);
-  }), _vm._ssrNode(" "), _vm._ssrNode("<section data-v-e87b4ce2>", "</section>", [_vm._ssrNode("<p class=\"title1\" data-v-e87b4ce2><span data-v-e87b4ce2></span> <span data-v-e87b4ce2>Currency AUD($)</span></p> "), _c('total-table', {
+  }), _vm._ssrNode(" "), _vm._ssrNode("<section data-v-0714c0ac>", "</section>", [_vm._ssrNode("<p class=\"title1\" data-v-0714c0ac><span data-v-0714c0ac></span> <span data-v-0714c0ac>Currency AUD($)</span></p> "), _c('total-table', {
     attrs: {
       "comLocationNum": _vm.comLocationNum,
       "tableData": _vm.comBuyData,
@@ -2260,7 +2260,7 @@ var render = function render() {
     on: {
       "send-idx": _vm.getChildIdx
     }
-  }), _vm._ssrNode(" <p class=\"text-red\" data-v-e87b4ce2>Price is ex- gst</p> "), _vm._ssrNode("<ul data-v-e87b4ce2>", "</ul>", [_vm._ssrNode("<li class=\"entry\" data-v-e87b4ce2>", "</li>", [_vm._ssrNode("<div class=\"entry-l\" data-v-e87b4ce2>Delivery Locations</div> "), _c('el-input', {
+  }), _vm._ssrNode(" <p class=\"text-red\" data-v-0714c0ac>Price is ex- gst</p> "), _vm._ssrNode("<ul data-v-0714c0ac>", "</ul>", [_vm._ssrNode("<li class=\"entry\" data-v-0714c0ac>", "</li>", [_vm._ssrNode("<div class=\"entry-l\" data-v-0714c0ac>Delivery Locations</div> "), _c('el-input', {
     staticStyle: {
       "width": "130px"
     },
@@ -2281,11 +2281,11 @@ var render = function render() {
       },
       expression: "comCurBasePrice.locationNum"
     }
-  })], 2), _vm._ssrNode(" " + (_vm.comLocationNum > 1 ? "<li class=\"entry\" data-v-e87b4ce2><div class=\"entry-text\" data-v-e87b4ce2>Qty / Location</div></li>" : "<!---->") + " "), _vm._l(_vm.comCurBaseTotalColumns, function (i, k) {
+  })], 2), _vm._ssrNode(" " + (_vm.comLocationNum > 1 ? "<li class=\"entry\" data-v-0714c0ac><div class=\"entry-text\" data-v-0714c0ac>Qty / Location</div></li>" : "<!---->") + " "), _vm._l(_vm.comCurBaseTotalColumns, function (i, k) {
     var _vm$comCurBaseColumns2;
     return _vm._ssrNode("<li class=\"entry\"" + _vm._ssrStyle(null, null, {
       display: _vm.comLocationNum > k ? '' : 'none'
-    }) + " data-v-e87b4ce2>", "</li>", [_vm._ssrNode("<div class=\"entry-l\" data-v-e87b4ce2>Delivery Postcode</div> "), _c('el-input', {
+    }) + " data-v-0714c0ac>", "</li>", [_vm._ssrNode("<div class=\"entry-l\" data-v-0714c0ac>Delivery Postcode</div> "), _c('el-input', {
       staticStyle: {
         "width": "130px",
         "margin-right": "20px"
@@ -2331,7 +2331,7 @@ var render = function render() {
         },
         expression: "i.label"
       }
-    }) : _vm._e(), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry-r\" data-v-e87b4ce2>", "</div>", [_vm._ssrNode("<span data-v-e87b4ce2>Freight Method</span> "), _c('el-radio-group', {
+    }) : _vm._e(), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry-r\" data-v-0714c0ac>", "</div>", [_vm._ssrNode("<span data-v-0714c0ac>Freight Method</span> "), _c('el-radio-group', {
       on: {
         "change": function ($event) {
           return _vm.getFreight(k);
@@ -2353,7 +2353,7 @@ var render = function render() {
         "label": 2
       }
     }, [_vm._v("Air Freight")])], 1)], 2)], 2);
-  })], 2), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry\" data-v-e87b4ce2>", "</div>", [_vm._ssrNode("<div class=\"entry-l\" data-v-e87b4ce2>Setup</div> <div class=\"entry-l\" data-v-e87b4ce2>include in unit price</div> "), _c('pc-switch', {
+  })], 2), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry\" data-v-0714c0ac>", "</div>", [_vm._ssrNode("<div class=\"entry-l\" data-v-0714c0ac>Setup</div> <div class=\"entry-l\" data-v-0714c0ac>include in unit price</div> "), _c('pc-switch', {
     model: {
       value: _vm.setup_switch,
       callback: function ($$v) {
@@ -2361,7 +2361,7 @@ var render = function render() {
       },
       expression: "setup_switch"
     }
-  })], 2), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry\" data-v-e87b4ce2>", "</div>", [_vm._ssrNode("<div class=\"entry-l\" data-v-e87b4ce2>Freight</div> <div class=\"entry-l\" data-v-e87b4ce2>include in unit price</div> "), _vm._ssrNode("<div data-v-e87b4ce2>", "</div>", [_c('pc-switch', {
+  })], 2), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry\" data-v-0714c0ac>", "</div>", [_vm._ssrNode("<div class=\"entry-l\" data-v-0714c0ac>Freight</div> <div class=\"entry-l\" data-v-0714c0ac>include in unit price</div> "), _vm._ssrNode("<div data-v-0714c0ac>", "</div>", [_c('pc-switch', {
     model: {
       value: _vm.freight_switch,
       callback: function ($$v) {
@@ -2514,7 +2514,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./components/product/Quote.vue?vue&type=template&id=e87b4ce2&scoped=true
+// CONCATENATED MODULE: ./components/product/Quote.vue?vue&type=template&id=0714c0ac&scoped=true
 
 // EXTERNAL MODULE: external "vuex"
 var external_vuex_ = __webpack_require__(5);
@@ -2904,6 +2904,53 @@ var DIalogXXSuccess = __webpack_require__(30);
             }
           }
         }
+        // 把价格数据全部乘上margin比例.
+        for (const key in priceList) {
+          if (Object.hasOwn(priceList, key)) {
+            for (const k in priceList[key]) {
+              if (Object.hasOwn(priceList[key], k)) {
+                priceList[key][k] = priceList[key][k].map(item => {
+                  const temp = {
+                    ...item
+                  };
+                  for (let i = 1; i <= 8; i++) {
+                    if (temp[`website_qty${i}`] && !this.POA_Config.includes(temp[`website_qty${i}`])) {
+                      temp[`website_qty${i}`] = this.multiplyWithMargin(parseFloat(temp[`website_qty${i}`]) || 0, margin).toString();
+                    }
+                    if (temp[`supplier_qty${i}`] && !this.POA_Config.includes(temp[`supplier_qty${i}`])) {
+                      temp[`supplier_qty${i}`] = this.multiplyWithMargin(parseFloat(temp[`supplier_qty${i}`]) || 0, margin).toString();
+                    }
+                  }
+                  temp.website_setup = this.multiplyWithMargin(parseFloat(temp.website_setup) || 0, setupMargin).toString();
+                  if (temp.supplier_setup) {
+                    temp.supplier_setup = this.multiplyWithMargin(parseFloat(temp.supplier_setup) || 0, setupMargin).toString();
+                  }
+                  if (k === 'decoration') {
+                    temp.decoration_addition = temp.decoration_addition.map(deco => {
+                      const d = {
+                        ...deco
+                      };
+                      for (let i = 1; i <= 8; i++) {
+                        if (d[`website_qty${i}`] && !this.POA_Config.includes(d[`website_qty${i}`])) {
+                          d[`website_qty${i}`] = this.multiplyWithMargin(parseFloat(d[`website_qty${i}`]) || 0, margin).toString();
+                        }
+                        if (d[`supplier_qty${i}`] && !this.POA_Config.includes(d[`supplier_qty${i}`])) {
+                          d[`supplier_qty${i}`] = this.multiplyWithMargin(parseFloat(d[`supplier_qty${i}`]) || 0, margin).toString();
+                        }
+                      }
+                      d.website_setup = this.multiplyWithMargin(parseFloat(d.website_setup) || 0, setupMargin).toString();
+                      if (d.supplier_setup) {
+                        d.supplier_setup = this.multiplyWithMargin(parseFloat(d.supplier_setup) || 0, setupMargin).toString();
+                      }
+                      return d;
+                    });
+                  }
+                  return temp;
+                });
+              }
+            }
+          }
+        }
         // 格式化数据,对象改成数组
         for (const keys in priceList) {
           const vals = {};
@@ -2944,18 +2991,6 @@ var DIalogXXSuccess = __webpack_require__(30);
             var _remaining$k, _remaining$k2;
             const o = {};
             o.name = k;
-            remaining[k] = remaining[k].map(item => {
-              const temp = {
-                ...item
-              };
-              for (let i = 1; i <= 8; i++) {
-                if (item[`website_qty${i}`] && !this.POA_Config.includes(item[`website_qty${i}`])) {
-                  temp[`website_qty${i}`] = this.multiplyWithMargin(parseFloat(item[`website_qty${i}`]), margin).toString();
-                }
-              }
-              temp.website_setup = this.multiplyWithMargin(parseFloat(item.website_setup), setupMargin).toString();
-              return temp;
-            });
             o.data = remaining[k];
             o.attributeList = this.copyData(attributeList);
             if (((_remaining$k = remaining[k]) === null || _remaining$k === void 0 ? void 0 : _remaining$k.length) > 1) {
@@ -3494,7 +3529,7 @@ var component = Object(componentNormalizer["a" /* default */])(
   staticRenderFns,
   false,
   injectStyles,
-  "e87b4ce2",
+  "0714c0ac",
   "a7f86384"
   
 )

File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/server/components/product-quote.js.map


+ 64 - 29
.nuxt/dist/server/components/product-right.js

@@ -3841,9 +3841,9 @@ var component = Object(componentNormalizer["a" /* default */])(
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(187);
-/* harmony import */ var _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony import */ var _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(187);
+/* harmony import */ var _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 
 
 /***/ }),
@@ -3909,7 +3909,7 @@ __webpack_require__.r(__webpack_exports__);
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--2-0!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/@nuxt/components/dist/loader.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./components/product/Quote.vue?vue&type=template&id=e87b4ce2&scoped=true
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--2-0!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/@nuxt/components/dist/loader.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./components/product/Quote.vue?vue&type=template&id=0714c0ac&scoped=true
 var render = function render() {
   var _vm$comCurBaseColumns, _vm$enquiryConfig$3$s;
   var _vm = this,
@@ -3922,7 +3922,7 @@ var render = function render() {
       expression: "true"
     }],
     staticClass: "com-loading"
-  }) : _vm.quoteLoadState == 1 ? _vm._ssrNode("<div data-v-e87b4ce2>", "</div>", [_c('tab-nav', {
+  }) : _vm.quoteLoadState == 1 ? _vm._ssrNode("<div data-v-0714c0ac>", "</div>", [_c('tab-nav', {
     attrs: {
       "borderType": 'allBorder',
       "liWidth": 100,
@@ -3943,7 +3943,7 @@ var render = function render() {
     var _items$basePrice, _items$decoration, _items$basePrice2, _items$basePrice2$ite, _items$basePrice2$ite2, _items$basePrice3, _items$basePrice3$ite, _items$basePrice3$ite2;
     return _vm._ssrNode("<div" + _vm._ssrStyle(null, null, {
       display: _vm.curWeek == indexs ? '' : 'none'
-    }) + " data-v-e87b4ce2>", "</div>", [_vm._ssrNode("<div data-v-e87b4ce2>", "</div>", [_c('tab-nav', {
+    }) + " data-v-0714c0ac>", "</div>", [_vm._ssrNode("<div data-v-0714c0ac>", "</div>", [_c('tab-nav', {
       attrs: {
         "borderType": 'incompleteBorder',
         "currTab": items.curPrint,
@@ -3968,7 +3968,7 @@ var render = function render() {
       var _items$decorationOrig;
       return _vm._ssrNode("<div" + _vm._ssrStyle(null, null, {
         display: items.curPrint == index ? '' : 'none'
-      }) + " data-v-e87b4ce2>", "</div>", [_c('new-price-table', {
+      }) + " data-v-0714c0ac>", "</div>", [_c('new-price-table', {
         attrs: {
           "tableColumns": [..._vm.undecorated_columns, ...item.part_columns],
           "tableData": item.data,
@@ -3998,7 +3998,7 @@ var render = function render() {
     }) : _vm._e(), _vm._ssrNode(" "), _vm._l(items.basePrice, function (item, index) {
       return _vm._ssrNode("<div" + _vm._ssrStyle(null, null, {
         display: items.curPrint == index && item.decoration_addition.length ? '' : 'none'
-      }) + " data-v-e87b4ce2>", "</div>", [_c('new-price-table', {
+      }) + " data-v-0714c0ac>", "</div>", [_c('new-price-table', {
         attrs: {
           "tableData": item.decoration_addition,
           "tableColumns": [..._vm.addon_columns, ...item.part_columns],
@@ -4016,7 +4016,7 @@ var render = function render() {
         }
       })], 1);
     })], 2);
-  }), _vm._ssrNode(" "), _vm._ssrNode("<section data-v-e87b4ce2>", "</section>", [_vm._ssrNode("<p class=\"title1\" data-v-e87b4ce2><span data-v-e87b4ce2></span> <span data-v-e87b4ce2>Currency AUD($)</span></p> "), _c('total-table', {
+  }), _vm._ssrNode(" "), _vm._ssrNode("<section data-v-0714c0ac>", "</section>", [_vm._ssrNode("<p class=\"title1\" data-v-0714c0ac><span data-v-0714c0ac></span> <span data-v-0714c0ac>Currency AUD($)</span></p> "), _c('total-table', {
     attrs: {
       "comLocationNum": _vm.comLocationNum,
       "tableData": _vm.comBuyData,
@@ -4028,7 +4028,7 @@ var render = function render() {
     on: {
       "send-idx": _vm.getChildIdx
     }
-  }), _vm._ssrNode(" <p class=\"text-red\" data-v-e87b4ce2>Price is ex- gst</p> "), _vm._ssrNode("<ul data-v-e87b4ce2>", "</ul>", [_vm._ssrNode("<li class=\"entry\" data-v-e87b4ce2>", "</li>", [_vm._ssrNode("<div class=\"entry-l\" data-v-e87b4ce2>Delivery Locations</div> "), _c('el-input', {
+  }), _vm._ssrNode(" <p class=\"text-red\" data-v-0714c0ac>Price is ex- gst</p> "), _vm._ssrNode("<ul data-v-0714c0ac>", "</ul>", [_vm._ssrNode("<li class=\"entry\" data-v-0714c0ac>", "</li>", [_vm._ssrNode("<div class=\"entry-l\" data-v-0714c0ac>Delivery Locations</div> "), _c('el-input', {
     staticStyle: {
       "width": "130px"
     },
@@ -4049,11 +4049,11 @@ var render = function render() {
       },
       expression: "comCurBasePrice.locationNum"
     }
-  })], 2), _vm._ssrNode(" " + (_vm.comLocationNum > 1 ? "<li class=\"entry\" data-v-e87b4ce2><div class=\"entry-text\" data-v-e87b4ce2>Qty / Location</div></li>" : "<!---->") + " "), _vm._l(_vm.comCurBaseTotalColumns, function (i, k) {
+  })], 2), _vm._ssrNode(" " + (_vm.comLocationNum > 1 ? "<li class=\"entry\" data-v-0714c0ac><div class=\"entry-text\" data-v-0714c0ac>Qty / Location</div></li>" : "<!---->") + " "), _vm._l(_vm.comCurBaseTotalColumns, function (i, k) {
     var _vm$comCurBaseColumns2;
     return _vm._ssrNode("<li class=\"entry\"" + _vm._ssrStyle(null, null, {
       display: _vm.comLocationNum > k ? '' : 'none'
-    }) + " data-v-e87b4ce2>", "</li>", [_vm._ssrNode("<div class=\"entry-l\" data-v-e87b4ce2>Delivery Postcode</div> "), _c('el-input', {
+    }) + " data-v-0714c0ac>", "</li>", [_vm._ssrNode("<div class=\"entry-l\" data-v-0714c0ac>Delivery Postcode</div> "), _c('el-input', {
       staticStyle: {
         "width": "130px",
         "margin-right": "20px"
@@ -4099,7 +4099,7 @@ var render = function render() {
         },
         expression: "i.label"
       }
-    }) : _vm._e(), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry-r\" data-v-e87b4ce2>", "</div>", [_vm._ssrNode("<span data-v-e87b4ce2>Freight Method</span> "), _c('el-radio-group', {
+    }) : _vm._e(), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry-r\" data-v-0714c0ac>", "</div>", [_vm._ssrNode("<span data-v-0714c0ac>Freight Method</span> "), _c('el-radio-group', {
       on: {
         "change": function ($event) {
           return _vm.getFreight(k);
@@ -4121,7 +4121,7 @@ var render = function render() {
         "label": 2
       }
     }, [_vm._v("Air Freight")])], 1)], 2)], 2);
-  })], 2), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry\" data-v-e87b4ce2>", "</div>", [_vm._ssrNode("<div class=\"entry-l\" data-v-e87b4ce2>Setup</div> <div class=\"entry-l\" data-v-e87b4ce2>include in unit price</div> "), _c('pc-switch', {
+  })], 2), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry\" data-v-0714c0ac>", "</div>", [_vm._ssrNode("<div class=\"entry-l\" data-v-0714c0ac>Setup</div> <div class=\"entry-l\" data-v-0714c0ac>include in unit price</div> "), _c('pc-switch', {
     model: {
       value: _vm.setup_switch,
       callback: function ($$v) {
@@ -4129,7 +4129,7 @@ var render = function render() {
       },
       expression: "setup_switch"
     }
-  })], 2), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry\" data-v-e87b4ce2>", "</div>", [_vm._ssrNode("<div class=\"entry-l\" data-v-e87b4ce2>Freight</div> <div class=\"entry-l\" data-v-e87b4ce2>include in unit price</div> "), _vm._ssrNode("<div data-v-e87b4ce2>", "</div>", [_c('pc-switch', {
+  })], 2), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry\" data-v-0714c0ac>", "</div>", [_vm._ssrNode("<div class=\"entry-l\" data-v-0714c0ac>Freight</div> <div class=\"entry-l\" data-v-0714c0ac>include in unit price</div> "), _vm._ssrNode("<div data-v-0714c0ac>", "</div>", [_c('pc-switch', {
     model: {
       value: _vm.freight_switch,
       callback: function ($$v) {
@@ -4282,7 +4282,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./components/product/Quote.vue?vue&type=template&id=e87b4ce2&scoped=true
+// CONCATENATED MODULE: ./components/product/Quote.vue?vue&type=template&id=0714c0ac&scoped=true
 
 // EXTERNAL MODULE: external "vuex"
 var external_vuex_ = __webpack_require__(5);
@@ -4672,6 +4672,53 @@ var DIalogXXSuccess = __webpack_require__(30);
             }
           }
         }
+        // 把价格数据全部乘上margin比例.
+        for (const key in priceList) {
+          if (Object.hasOwn(priceList, key)) {
+            for (const k in priceList[key]) {
+              if (Object.hasOwn(priceList[key], k)) {
+                priceList[key][k] = priceList[key][k].map(item => {
+                  const temp = {
+                    ...item
+                  };
+                  for (let i = 1; i <= 8; i++) {
+                    if (temp[`website_qty${i}`] && !this.POA_Config.includes(temp[`website_qty${i}`])) {
+                      temp[`website_qty${i}`] = this.multiplyWithMargin(parseFloat(temp[`website_qty${i}`]) || 0, margin).toString();
+                    }
+                    if (temp[`supplier_qty${i}`] && !this.POA_Config.includes(temp[`supplier_qty${i}`])) {
+                      temp[`supplier_qty${i}`] = this.multiplyWithMargin(parseFloat(temp[`supplier_qty${i}`]) || 0, margin).toString();
+                    }
+                  }
+                  temp.website_setup = this.multiplyWithMargin(parseFloat(temp.website_setup) || 0, setupMargin).toString();
+                  if (temp.supplier_setup) {
+                    temp.supplier_setup = this.multiplyWithMargin(parseFloat(temp.supplier_setup) || 0, setupMargin).toString();
+                  }
+                  if (k === 'decoration') {
+                    temp.decoration_addition = temp.decoration_addition.map(deco => {
+                      const d = {
+                        ...deco
+                      };
+                      for (let i = 1; i <= 8; i++) {
+                        if (d[`website_qty${i}`] && !this.POA_Config.includes(d[`website_qty${i}`])) {
+                          d[`website_qty${i}`] = this.multiplyWithMargin(parseFloat(d[`website_qty${i}`]) || 0, margin).toString();
+                        }
+                        if (d[`supplier_qty${i}`] && !this.POA_Config.includes(d[`supplier_qty${i}`])) {
+                          d[`supplier_qty${i}`] = this.multiplyWithMargin(parseFloat(d[`supplier_qty${i}`]) || 0, margin).toString();
+                        }
+                      }
+                      d.website_setup = this.multiplyWithMargin(parseFloat(d.website_setup) || 0, setupMargin).toString();
+                      if (d.supplier_setup) {
+                        d.supplier_setup = this.multiplyWithMargin(parseFloat(d.supplier_setup) || 0, setupMargin).toString();
+                      }
+                      return d;
+                    });
+                  }
+                  return temp;
+                });
+              }
+            }
+          }
+        }
         // 格式化数据,对象改成数组
         for (const keys in priceList) {
           const vals = {};
@@ -4712,18 +4759,6 @@ var DIalogXXSuccess = __webpack_require__(30);
             var _remaining$k, _remaining$k2;
             const o = {};
             o.name = k;
-            remaining[k] = remaining[k].map(item => {
-              const temp = {
-                ...item
-              };
-              for (let i = 1; i <= 8; i++) {
-                if (item[`website_qty${i}`] && !this.POA_Config.includes(item[`website_qty${i}`])) {
-                  temp[`website_qty${i}`] = this.multiplyWithMargin(parseFloat(item[`website_qty${i}`]), margin).toString();
-                }
-              }
-              temp.website_setup = this.multiplyWithMargin(parseFloat(item.website_setup), setupMargin).toString();
-              return temp;
-            });
             o.data = remaining[k];
             o.attributeList = this.copyData(attributeList);
             if (((_remaining$k = remaining[k]) === null || _remaining$k === void 0 ? void 0 : _remaining$k.length) > 1) {
@@ -5262,7 +5297,7 @@ var component = Object(componentNormalizer["a" /* default */])(
   staticRenderFns,
   false,
   injectStyles,
-  "e87b4ce2",
+  "0714c0ac",
   "a7f86384"
   
 )

File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/server/components/product-right.js.map


+ 1 - 1
.nuxt/dist/server/index.spa.html

@@ -5,5 +5,5 @@
   <link href="/_nuxt/css/9b69cf1.css" rel="stylesheet"><link href="/_nuxt/css/e6fe802.css" rel="stylesheet"></head>
   <body {{ body_attrs }}>
     {{ APP }}
-  <script src="/_nuxt/35358fb.js"></script><script src="/_nuxt/81e88a2.js"></script><script src="/_nuxt/70bd80b.js"></script><script src="/_nuxt/1633b38.js"></script></body>
+  <script src="/_nuxt/921b408.js"></script><script src="/_nuxt/81e88a2.js"></script><script src="/_nuxt/70bd80b.js"></script><script src="/_nuxt/ea2e716.js"></script></body>
 </html>

+ 19 - 2
.nuxt/dist/server/pages/category/_firstCategory/_secondCategory/_thirdCategory/index.js

@@ -3885,6 +3885,7 @@ const defaultSortFunc = (a, b) => {
       return Object(number_precision__WEBPACK_IMPORTED_MODULE_19__["divide"])(Object(number_precision__WEBPACK_IMPORTED_MODULE_19__["times"])(o, 100 + parseFloat(m)), 100);
     },
     getList() {
+      let sortFunc = defaultSortFunc;
       let keyword = this.$route.params.thirdCategory || this.$route.params.secondCategory || this.$route.params.firstCategory || '';
       const config = {
         hitsPerPage: 1000
@@ -3910,6 +3911,14 @@ const defaultSortFunc = (a, b) => {
           keyword = 'new product';
           // config.facetFilters = ['filter:New product']
           config.restrictSearchableAttributes = 'filter';
+          sortFunc = (a, b) => {
+            if (a.hasNewProduct !== b.hasNewProduct) {
+              return b.hasNewProduct - a.hasNewProduct;
+            }
+            if (a.ranking !== b.ranking) {
+              return b.ranking - a.ranking;
+            }
+          };
         } else {
           config.restrictSearchableAttributes = 'cat_name';
         }
@@ -4033,11 +4042,11 @@ const defaultSortFunc = (a, b) => {
                 console.log('解析 collection 出错');
               }
               item.collection.forEach(a => {
+                result.collections.push(a);
                 if (!collectionsList.some(i => a === i.name)) {
                   collectionsList.push({
                     name: a
                   });
-                  result.collections.push(a);
                 }
               });
             }
@@ -4051,7 +4060,15 @@ const defaultSortFunc = (a, b) => {
         this.colourList = colorList;
         // this.decorationList = []
         // this.complianceList = []
-        temp.sort(defaultSortFunc);
+        if (this.$route.fullPath.includes('searchResult')) {
+          temp.sort((a, b) => {
+            if (a.hasBestSeller !== b.hasBestSeller) {
+              return b.hasBestSeller - a.hasBestSeller;
+            }
+          });
+        } else {
+          temp.sort(sortFunc);
+        }
         this.productsList = temp;
         this.loaded = true;
         this.listLoading = false;

File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/server/pages/category/_firstCategory/_secondCategory/_thirdCategory/index.js.map


+ 19 - 2
.nuxt/dist/server/pages/category/_firstCategory/_secondCategory/index.js

@@ -3885,6 +3885,7 @@ const defaultSortFunc = (a, b) => {
       return Object(number_precision__WEBPACK_IMPORTED_MODULE_19__["divide"])(Object(number_precision__WEBPACK_IMPORTED_MODULE_19__["times"])(o, 100 + parseFloat(m)), 100);
     },
     getList() {
+      let sortFunc = defaultSortFunc;
       let keyword = this.$route.params.thirdCategory || this.$route.params.secondCategory || this.$route.params.firstCategory || '';
       const config = {
         hitsPerPage: 1000
@@ -3910,6 +3911,14 @@ const defaultSortFunc = (a, b) => {
           keyword = 'new product';
           // config.facetFilters = ['filter:New product']
           config.restrictSearchableAttributes = 'filter';
+          sortFunc = (a, b) => {
+            if (a.hasNewProduct !== b.hasNewProduct) {
+              return b.hasNewProduct - a.hasNewProduct;
+            }
+            if (a.ranking !== b.ranking) {
+              return b.ranking - a.ranking;
+            }
+          };
         } else {
           config.restrictSearchableAttributes = 'cat_name';
         }
@@ -4033,11 +4042,11 @@ const defaultSortFunc = (a, b) => {
                 console.log('解析 collection 出错');
               }
               item.collection.forEach(a => {
+                result.collections.push(a);
                 if (!collectionsList.some(i => a === i.name)) {
                   collectionsList.push({
                     name: a
                   });
-                  result.collections.push(a);
                 }
               });
             }
@@ -4051,7 +4060,15 @@ const defaultSortFunc = (a, b) => {
         this.colourList = colorList;
         // this.decorationList = []
         // this.complianceList = []
-        temp.sort(defaultSortFunc);
+        if (this.$route.fullPath.includes('searchResult')) {
+          temp.sort((a, b) => {
+            if (a.hasBestSeller !== b.hasBestSeller) {
+              return b.hasBestSeller - a.hasBestSeller;
+            }
+          });
+        } else {
+          temp.sort(sortFunc);
+        }
         this.productsList = temp;
         this.loaded = true;
         this.listLoading = false;

File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/server/pages/category/_firstCategory/_secondCategory/index.js.map


+ 19 - 2
.nuxt/dist/server/pages/category/_firstCategory/index.js

@@ -3885,6 +3885,7 @@ const defaultSortFunc = (a, b) => {
       return Object(number_precision__WEBPACK_IMPORTED_MODULE_19__["divide"])(Object(number_precision__WEBPACK_IMPORTED_MODULE_19__["times"])(o, 100 + parseFloat(m)), 100);
     },
     getList() {
+      let sortFunc = defaultSortFunc;
       let keyword = this.$route.params.thirdCategory || this.$route.params.secondCategory || this.$route.params.firstCategory || '';
       const config = {
         hitsPerPage: 1000
@@ -3910,6 +3911,14 @@ const defaultSortFunc = (a, b) => {
           keyword = 'new product';
           // config.facetFilters = ['filter:New product']
           config.restrictSearchableAttributes = 'filter';
+          sortFunc = (a, b) => {
+            if (a.hasNewProduct !== b.hasNewProduct) {
+              return b.hasNewProduct - a.hasNewProduct;
+            }
+            if (a.ranking !== b.ranking) {
+              return b.ranking - a.ranking;
+            }
+          };
         } else {
           config.restrictSearchableAttributes = 'cat_name';
         }
@@ -4033,11 +4042,11 @@ const defaultSortFunc = (a, b) => {
                 console.log('解析 collection 出错');
               }
               item.collection.forEach(a => {
+                result.collections.push(a);
                 if (!collectionsList.some(i => a === i.name)) {
                   collectionsList.push({
                     name: a
                   });
-                  result.collections.push(a);
                 }
               });
             }
@@ -4051,7 +4060,15 @@ const defaultSortFunc = (a, b) => {
         this.colourList = colorList;
         // this.decorationList = []
         // this.complianceList = []
-        temp.sort(defaultSortFunc);
+        if (this.$route.fullPath.includes('searchResult')) {
+          temp.sort((a, b) => {
+            if (a.hasBestSeller !== b.hasBestSeller) {
+              return b.hasBestSeller - a.hasBestSeller;
+            }
+          });
+        } else {
+          temp.sort(sortFunc);
+        }
         this.productsList = temp;
         this.loaded = true;
         this.listLoading = false;

File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/server/pages/category/_firstCategory/index.js.map


+ 19 - 2
.nuxt/dist/server/pages/category/index.js

@@ -3885,6 +3885,7 @@ const defaultSortFunc = (a, b) => {
       return Object(number_precision__WEBPACK_IMPORTED_MODULE_19__["divide"])(Object(number_precision__WEBPACK_IMPORTED_MODULE_19__["times"])(o, 100 + parseFloat(m)), 100);
     },
     getList() {
+      let sortFunc = defaultSortFunc;
       let keyword = this.$route.params.thirdCategory || this.$route.params.secondCategory || this.$route.params.firstCategory || '';
       const config = {
         hitsPerPage: 1000
@@ -3910,6 +3911,14 @@ const defaultSortFunc = (a, b) => {
           keyword = 'new product';
           // config.facetFilters = ['filter:New product']
           config.restrictSearchableAttributes = 'filter';
+          sortFunc = (a, b) => {
+            if (a.hasNewProduct !== b.hasNewProduct) {
+              return b.hasNewProduct - a.hasNewProduct;
+            }
+            if (a.ranking !== b.ranking) {
+              return b.ranking - a.ranking;
+            }
+          };
         } else {
           config.restrictSearchableAttributes = 'cat_name';
         }
@@ -4033,11 +4042,11 @@ const defaultSortFunc = (a, b) => {
                 console.log('解析 collection 出错');
               }
               item.collection.forEach(a => {
+                result.collections.push(a);
                 if (!collectionsList.some(i => a === i.name)) {
                   collectionsList.push({
                     name: a
                   });
-                  result.collections.push(a);
                 }
               });
             }
@@ -4051,7 +4060,15 @@ const defaultSortFunc = (a, b) => {
         this.colourList = colorList;
         // this.decorationList = []
         // this.complianceList = []
-        temp.sort(defaultSortFunc);
+        if (this.$route.fullPath.includes('searchResult')) {
+          temp.sort((a, b) => {
+            if (a.hasBestSeller !== b.hasBestSeller) {
+              return b.hasBestSeller - a.hasBestSeller;
+            }
+          });
+        } else {
+          temp.sort(sortFunc);
+        }
         this.productsList = temp;
         this.loaded = true;
         this.listLoading = false;

File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/server/pages/category/index.js.map


+ 19 - 2
.nuxt/dist/server/pages/category/searchResult/index.js

@@ -3885,6 +3885,7 @@ const defaultSortFunc = (a, b) => {
       return Object(number_precision__WEBPACK_IMPORTED_MODULE_19__["divide"])(Object(number_precision__WEBPACK_IMPORTED_MODULE_19__["times"])(o, 100 + parseFloat(m)), 100);
     },
     getList() {
+      let sortFunc = defaultSortFunc;
       let keyword = this.$route.params.thirdCategory || this.$route.params.secondCategory || this.$route.params.firstCategory || '';
       const config = {
         hitsPerPage: 1000
@@ -3910,6 +3911,14 @@ const defaultSortFunc = (a, b) => {
           keyword = 'new product';
           // config.facetFilters = ['filter:New product']
           config.restrictSearchableAttributes = 'filter';
+          sortFunc = (a, b) => {
+            if (a.hasNewProduct !== b.hasNewProduct) {
+              return b.hasNewProduct - a.hasNewProduct;
+            }
+            if (a.ranking !== b.ranking) {
+              return b.ranking - a.ranking;
+            }
+          };
         } else {
           config.restrictSearchableAttributes = 'cat_name';
         }
@@ -4033,11 +4042,11 @@ const defaultSortFunc = (a, b) => {
                 console.log('解析 collection 出错');
               }
               item.collection.forEach(a => {
+                result.collections.push(a);
                 if (!collectionsList.some(i => a === i.name)) {
                   collectionsList.push({
                     name: a
                   });
-                  result.collections.push(a);
                 }
               });
             }
@@ -4051,7 +4060,15 @@ const defaultSortFunc = (a, b) => {
         this.colourList = colorList;
         // this.decorationList = []
         // this.complianceList = []
-        temp.sort(defaultSortFunc);
+        if (this.$route.fullPath.includes('searchResult')) {
+          temp.sort((a, b) => {
+            if (a.hasBestSeller !== b.hasBestSeller) {
+              return b.hasBestSeller - a.hasBestSeller;
+            }
+          });
+        } else {
+          temp.sort(sortFunc);
+        }
         this.productsList = temp;
         this.loaded = true;
         this.listLoading = false;

File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/server/pages/category/searchResult/index.js.map


+ 64 - 29
.nuxt/dist/server/pages/product/_code.js

@@ -4253,9 +4253,9 @@ module.exports = {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(187);
-/* harmony import */ var _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_e87b4ce2_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony import */ var _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(187);
+/* harmony import */ var _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_0_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_sass_loader_dist_cjs_js_ref_7_oneOf_1_2_node_modules_nuxt_components_dist_loader_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_Quote_vue_vue_type_style_index_0_id_0714c0ac_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 
 
 /***/ }),
@@ -4321,7 +4321,7 @@ __webpack_require__.r(__webpack_exports__);
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--2-0!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/@nuxt/components/dist/loader.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./components/product/Quote.vue?vue&type=template&id=e87b4ce2&scoped=true
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--2-0!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/@nuxt/components/dist/loader.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./components/product/Quote.vue?vue&type=template&id=0714c0ac&scoped=true
 var render = function render() {
   var _vm$comCurBaseColumns, _vm$enquiryConfig$3$s;
   var _vm = this,
@@ -4334,7 +4334,7 @@ var render = function render() {
       expression: "true"
     }],
     staticClass: "com-loading"
-  }) : _vm.quoteLoadState == 1 ? _vm._ssrNode("<div data-v-e87b4ce2>", "</div>", [_c('tab-nav', {
+  }) : _vm.quoteLoadState == 1 ? _vm._ssrNode("<div data-v-0714c0ac>", "</div>", [_c('tab-nav', {
     attrs: {
       "borderType": 'allBorder',
       "liWidth": 100,
@@ -4355,7 +4355,7 @@ var render = function render() {
     var _items$basePrice, _items$decoration, _items$basePrice2, _items$basePrice2$ite, _items$basePrice2$ite2, _items$basePrice3, _items$basePrice3$ite, _items$basePrice3$ite2;
     return _vm._ssrNode("<div" + _vm._ssrStyle(null, null, {
       display: _vm.curWeek == indexs ? '' : 'none'
-    }) + " data-v-e87b4ce2>", "</div>", [_vm._ssrNode("<div data-v-e87b4ce2>", "</div>", [_c('tab-nav', {
+    }) + " data-v-0714c0ac>", "</div>", [_vm._ssrNode("<div data-v-0714c0ac>", "</div>", [_c('tab-nav', {
       attrs: {
         "borderType": 'incompleteBorder',
         "currTab": items.curPrint,
@@ -4380,7 +4380,7 @@ var render = function render() {
       var _items$decorationOrig;
       return _vm._ssrNode("<div" + _vm._ssrStyle(null, null, {
         display: items.curPrint == index ? '' : 'none'
-      }) + " data-v-e87b4ce2>", "</div>", [_c('new-price-table', {
+      }) + " data-v-0714c0ac>", "</div>", [_c('new-price-table', {
         attrs: {
           "tableColumns": [..._vm.undecorated_columns, ...item.part_columns],
           "tableData": item.data,
@@ -4410,7 +4410,7 @@ var render = function render() {
     }) : _vm._e(), _vm._ssrNode(" "), _vm._l(items.basePrice, function (item, index) {
       return _vm._ssrNode("<div" + _vm._ssrStyle(null, null, {
         display: items.curPrint == index && item.decoration_addition.length ? '' : 'none'
-      }) + " data-v-e87b4ce2>", "</div>", [_c('new-price-table', {
+      }) + " data-v-0714c0ac>", "</div>", [_c('new-price-table', {
         attrs: {
           "tableData": item.decoration_addition,
           "tableColumns": [..._vm.addon_columns, ...item.part_columns],
@@ -4428,7 +4428,7 @@ var render = function render() {
         }
       })], 1);
     })], 2);
-  }), _vm._ssrNode(" "), _vm._ssrNode("<section data-v-e87b4ce2>", "</section>", [_vm._ssrNode("<p class=\"title1\" data-v-e87b4ce2><span data-v-e87b4ce2></span> <span data-v-e87b4ce2>Currency AUD($)</span></p> "), _c('total-table', {
+  }), _vm._ssrNode(" "), _vm._ssrNode("<section data-v-0714c0ac>", "</section>", [_vm._ssrNode("<p class=\"title1\" data-v-0714c0ac><span data-v-0714c0ac></span> <span data-v-0714c0ac>Currency AUD($)</span></p> "), _c('total-table', {
     attrs: {
       "comLocationNum": _vm.comLocationNum,
       "tableData": _vm.comBuyData,
@@ -4440,7 +4440,7 @@ var render = function render() {
     on: {
       "send-idx": _vm.getChildIdx
     }
-  }), _vm._ssrNode(" <p class=\"text-red\" data-v-e87b4ce2>Price is ex- gst</p> "), _vm._ssrNode("<ul data-v-e87b4ce2>", "</ul>", [_vm._ssrNode("<li class=\"entry\" data-v-e87b4ce2>", "</li>", [_vm._ssrNode("<div class=\"entry-l\" data-v-e87b4ce2>Delivery Locations</div> "), _c('el-input', {
+  }), _vm._ssrNode(" <p class=\"text-red\" data-v-0714c0ac>Price is ex- gst</p> "), _vm._ssrNode("<ul data-v-0714c0ac>", "</ul>", [_vm._ssrNode("<li class=\"entry\" data-v-0714c0ac>", "</li>", [_vm._ssrNode("<div class=\"entry-l\" data-v-0714c0ac>Delivery Locations</div> "), _c('el-input', {
     staticStyle: {
       "width": "130px"
     },
@@ -4461,11 +4461,11 @@ var render = function render() {
       },
       expression: "comCurBasePrice.locationNum"
     }
-  })], 2), _vm._ssrNode(" " + (_vm.comLocationNum > 1 ? "<li class=\"entry\" data-v-e87b4ce2><div class=\"entry-text\" data-v-e87b4ce2>Qty / Location</div></li>" : "<!---->") + " "), _vm._l(_vm.comCurBaseTotalColumns, function (i, k) {
+  })], 2), _vm._ssrNode(" " + (_vm.comLocationNum > 1 ? "<li class=\"entry\" data-v-0714c0ac><div class=\"entry-text\" data-v-0714c0ac>Qty / Location</div></li>" : "<!---->") + " "), _vm._l(_vm.comCurBaseTotalColumns, function (i, k) {
     var _vm$comCurBaseColumns2;
     return _vm._ssrNode("<li class=\"entry\"" + _vm._ssrStyle(null, null, {
       display: _vm.comLocationNum > k ? '' : 'none'
-    }) + " data-v-e87b4ce2>", "</li>", [_vm._ssrNode("<div class=\"entry-l\" data-v-e87b4ce2>Delivery Postcode</div> "), _c('el-input', {
+    }) + " data-v-0714c0ac>", "</li>", [_vm._ssrNode("<div class=\"entry-l\" data-v-0714c0ac>Delivery Postcode</div> "), _c('el-input', {
       staticStyle: {
         "width": "130px",
         "margin-right": "20px"
@@ -4511,7 +4511,7 @@ var render = function render() {
         },
         expression: "i.label"
       }
-    }) : _vm._e(), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry-r\" data-v-e87b4ce2>", "</div>", [_vm._ssrNode("<span data-v-e87b4ce2>Freight Method</span> "), _c('el-radio-group', {
+    }) : _vm._e(), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry-r\" data-v-0714c0ac>", "</div>", [_vm._ssrNode("<span data-v-0714c0ac>Freight Method</span> "), _c('el-radio-group', {
       on: {
         "change": function ($event) {
           return _vm.getFreight(k);
@@ -4533,7 +4533,7 @@ var render = function render() {
         "label": 2
       }
     }, [_vm._v("Air Freight")])], 1)], 2)], 2);
-  })], 2), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry\" data-v-e87b4ce2>", "</div>", [_vm._ssrNode("<div class=\"entry-l\" data-v-e87b4ce2>Setup</div> <div class=\"entry-l\" data-v-e87b4ce2>include in unit price</div> "), _c('pc-switch', {
+  })], 2), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry\" data-v-0714c0ac>", "</div>", [_vm._ssrNode("<div class=\"entry-l\" data-v-0714c0ac>Setup</div> <div class=\"entry-l\" data-v-0714c0ac>include in unit price</div> "), _c('pc-switch', {
     model: {
       value: _vm.setup_switch,
       callback: function ($$v) {
@@ -4541,7 +4541,7 @@ var render = function render() {
       },
       expression: "setup_switch"
     }
-  })], 2), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry\" data-v-e87b4ce2>", "</div>", [_vm._ssrNode("<div class=\"entry-l\" data-v-e87b4ce2>Freight</div> <div class=\"entry-l\" data-v-e87b4ce2>include in unit price</div> "), _vm._ssrNode("<div data-v-e87b4ce2>", "</div>", [_c('pc-switch', {
+  })], 2), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"entry\" data-v-0714c0ac>", "</div>", [_vm._ssrNode("<div class=\"entry-l\" data-v-0714c0ac>Freight</div> <div class=\"entry-l\" data-v-0714c0ac>include in unit price</div> "), _vm._ssrNode("<div data-v-0714c0ac>", "</div>", [_c('pc-switch', {
     model: {
       value: _vm.freight_switch,
       callback: function ($$v) {
@@ -4694,7 +4694,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./components/product/Quote.vue?vue&type=template&id=e87b4ce2&scoped=true
+// CONCATENATED MODULE: ./components/product/Quote.vue?vue&type=template&id=0714c0ac&scoped=true
 
 // EXTERNAL MODULE: external "vuex"
 var external_vuex_ = __webpack_require__(5);
@@ -5084,6 +5084,53 @@ var DIalogXXSuccess = __webpack_require__(30);
             }
           }
         }
+        // 把价格数据全部乘上margin比例.
+        for (const key in priceList) {
+          if (Object.hasOwn(priceList, key)) {
+            for (const k in priceList[key]) {
+              if (Object.hasOwn(priceList[key], k)) {
+                priceList[key][k] = priceList[key][k].map(item => {
+                  const temp = {
+                    ...item
+                  };
+                  for (let i = 1; i <= 8; i++) {
+                    if (temp[`website_qty${i}`] && !this.POA_Config.includes(temp[`website_qty${i}`])) {
+                      temp[`website_qty${i}`] = this.multiplyWithMargin(parseFloat(temp[`website_qty${i}`]) || 0, margin).toString();
+                    }
+                    if (temp[`supplier_qty${i}`] && !this.POA_Config.includes(temp[`supplier_qty${i}`])) {
+                      temp[`supplier_qty${i}`] = this.multiplyWithMargin(parseFloat(temp[`supplier_qty${i}`]) || 0, margin).toString();
+                    }
+                  }
+                  temp.website_setup = this.multiplyWithMargin(parseFloat(temp.website_setup) || 0, setupMargin).toString();
+                  if (temp.supplier_setup) {
+                    temp.supplier_setup = this.multiplyWithMargin(parseFloat(temp.supplier_setup) || 0, setupMargin).toString();
+                  }
+                  if (k === 'decoration') {
+                    temp.decoration_addition = temp.decoration_addition.map(deco => {
+                      const d = {
+                        ...deco
+                      };
+                      for (let i = 1; i <= 8; i++) {
+                        if (d[`website_qty${i}`] && !this.POA_Config.includes(d[`website_qty${i}`])) {
+                          d[`website_qty${i}`] = this.multiplyWithMargin(parseFloat(d[`website_qty${i}`]) || 0, margin).toString();
+                        }
+                        if (d[`supplier_qty${i}`] && !this.POA_Config.includes(d[`supplier_qty${i}`])) {
+                          d[`supplier_qty${i}`] = this.multiplyWithMargin(parseFloat(d[`supplier_qty${i}`]) || 0, margin).toString();
+                        }
+                      }
+                      d.website_setup = this.multiplyWithMargin(parseFloat(d.website_setup) || 0, setupMargin).toString();
+                      if (d.supplier_setup) {
+                        d.supplier_setup = this.multiplyWithMargin(parseFloat(d.supplier_setup) || 0, setupMargin).toString();
+                      }
+                      return d;
+                    });
+                  }
+                  return temp;
+                });
+              }
+            }
+          }
+        }
         // 格式化数据,对象改成数组
         for (const keys in priceList) {
           const vals = {};
@@ -5124,18 +5171,6 @@ var DIalogXXSuccess = __webpack_require__(30);
             var _remaining$k, _remaining$k2;
             const o = {};
             o.name = k;
-            remaining[k] = remaining[k].map(item => {
-              const temp = {
-                ...item
-              };
-              for (let i = 1; i <= 8; i++) {
-                if (item[`website_qty${i}`] && !this.POA_Config.includes(item[`website_qty${i}`])) {
-                  temp[`website_qty${i}`] = this.multiplyWithMargin(parseFloat(item[`website_qty${i}`]), margin).toString();
-                }
-              }
-              temp.website_setup = this.multiplyWithMargin(parseFloat(item.website_setup), setupMargin).toString();
-              return temp;
-            });
             o.data = remaining[k];
             o.attributeList = this.copyData(attributeList);
             if (((_remaining$k = remaining[k]) === null || _remaining$k === void 0 ? void 0 : _remaining$k.length) > 1) {
@@ -5674,7 +5709,7 @@ var component = Object(componentNormalizer["a" /* default */])(
   staticRenderFns,
   false,
   injectStyles,
-  "e87b4ce2",
+  "0714c0ac",
   "a7f86384"
   
 )

File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/server/pages/product/_code.js.map


+ 6 - 6
.nuxt/dist/server/server.js

@@ -71146,9 +71146,6 @@ __webpack_require__.d(components_namespaceObject, "TinymceToolbar", function() {
 __webpack_require__.d(components_namespaceObject, "ProductLeft", function() { return ProductLeft; });
 __webpack_require__.d(components_namespaceObject, "ProductRight", function() { return ProductRight; });
 __webpack_require__.d(components_namespaceObject, "ProductQuote", function() { return ProductQuote; });
-__webpack_require__.d(components_namespaceObject, "CustomElSliderButton", function() { return CustomElSliderButton; });
-__webpack_require__.d(components_namespaceObject, "CustomElSlider", function() { return CustomElSlider; });
-__webpack_require__.d(components_namespaceObject, "CustomElSliderMarker", function() { return CustomElSliderMarker; });
 __webpack_require__.d(components_namespaceObject, "TableChangeTable", function() { return TableChangeTable; });
 __webpack_require__.d(components_namespaceObject, "TableMailTable", function() { return TableMailTable; });
 __webpack_require__.d(components_namespaceObject, "TableNewPriceTable", function() { return TableNewPriceTable; });
@@ -71161,6 +71158,9 @@ __webpack_require__.d(components_namespaceObject, "ProductBuilderStep1", functio
 __webpack_require__.d(components_namespaceObject, "ProductBuilderStep2", function() { return ProductBuilderStep2; });
 __webpack_require__.d(components_namespaceObject, "ProductBuilderStep3", function() { return ProductBuilderStep3; });
 __webpack_require__.d(components_namespaceObject, "ProductBuilderStepMixin", function() { return ProductBuilderStepMixin; });
+__webpack_require__.d(components_namespaceObject, "CustomElSliderButton", function() { return CustomElSliderButton; });
+__webpack_require__.d(components_namespaceObject, "CustomElSlider", function() { return CustomElSlider; });
+__webpack_require__.d(components_namespaceObject, "CustomElSliderMarker", function() { return CustomElSliderMarker; });
 __webpack_require__.d(components_namespaceObject, "TinymceComponentsEditorImage", function() { return TinymceComponentsEditorImage; });
 
 // EXTERNAL MODULE: external "vue"
@@ -72810,9 +72810,6 @@ const TinymceToolbar = () => __webpack_require__.e(/* import() | components/tiny
 const ProductLeft = () => __webpack_require__.e(/* import() | components/product-left */ 31).then(__webpack_require__.bind(null, 324)).then(c => wrapFunctional(c.default || c));
 const ProductRight = () => __webpack_require__.e(/* import() | components/product-right */ 33).then(__webpack_require__.bind(null, 325)).then(c => wrapFunctional(c.default || c));
 const ProductQuote = () => __webpack_require__.e(/* import() | components/product-quote */ 32).then(__webpack_require__.bind(null, 241)).then(c => wrapFunctional(c.default || c));
-const CustomElSliderButton = () => __webpack_require__.e(/* import() | components/custom-el-slider-button */ 10).then(__webpack_require__.bind(null, 158)).then(c => wrapFunctional(c.default || c));
-const CustomElSlider = () => __webpack_require__.e(/* import() | components/custom-el-slider */ 9).then(__webpack_require__.bind(null, 161)).then(c => wrapFunctional(c.default || c));
-const CustomElSliderMarker = () => __webpack_require__.e(/* import() | components/custom-el-slider-marker */ 11).then(__webpack_require__.bind(null, 159)).then(c => wrapFunctional(c.default || c));
 const TableChangeTable = () => __webpack_require__.e(/* import() | components/table-change-table */ 42).then(__webpack_require__.bind(null, 243)).then(c => wrapFunctional(c.default || c));
 const TableMailTable = () => __webpack_require__.e(/* import() | components/table-mail-table */ 43).then(__webpack_require__.bind(null, 211)).then(c => wrapFunctional(c.default || c));
 const TableNewPriceTable = () => __webpack_require__.e(/* import() | components/table-new-price-table */ 44).then(__webpack_require__.bind(null, 208)).then(c => wrapFunctional(c.default || c));
@@ -72825,6 +72822,9 @@ const ProductBuilderStep1 = () => __webpack_require__.e(/* import() | components
 const ProductBuilderStep2 = () => __webpack_require__.e(/* import() | components/product-builder-step2 */ 29).then(__webpack_require__.bind(null, 321)).then(c => wrapFunctional(c.default || c));
 const ProductBuilderStep3 = () => __webpack_require__.e(/* import() | components/product-builder-step3 */ 30).then(__webpack_require__.bind(null, 322)).then(c => wrapFunctional(c.default || c));
 const ProductBuilderStepMixin = () => __webpack_require__.e(/* import() | components/product-builder-step-mixin */ 27).then(__webpack_require__.bind(null, 178)).then(c => wrapFunctional(c.default || c));
+const CustomElSliderButton = () => __webpack_require__.e(/* import() | components/custom-el-slider-button */ 10).then(__webpack_require__.bind(null, 158)).then(c => wrapFunctional(c.default || c));
+const CustomElSlider = () => __webpack_require__.e(/* import() | components/custom-el-slider */ 9).then(__webpack_require__.bind(null, 161)).then(c => wrapFunctional(c.default || c));
+const CustomElSliderMarker = () => __webpack_require__.e(/* import() | components/custom-el-slider-marker */ 11).then(__webpack_require__.bind(null, 159)).then(c => wrapFunctional(c.default || c));
 const TinymceComponentsEditorImage = () => __webpack_require__.e(/* import() | components/tinymce-components-editor-image */ 50).then(__webpack_require__.bind(null, 432)).then(c => wrapFunctional(c.default || c));
 
 // nuxt/nuxt.js#8607

File diff suppressed because it is too large
+ 0 - 0
.nuxt/dist/server/server.js.map


+ 9 - 9
.nuxt/vetur/tags.json

@@ -125,15 +125,6 @@
   "ProductQuote": {
     "description": "Auto imported from components/product/Quote.vue"
   },
-  "CustomElSliderButton": {
-    "description": "Auto imported from components/custom-el-slider/button.vue"
-  },
-  "CustomElSlider": {
-    "description": "Auto imported from components/custom-el-slider/index.vue"
-  },
-  "CustomElSliderMarker": {
-    "description": "Auto imported from components/custom-el-slider/marker.vue"
-  },
   "TableChangeTable": {
     "description": "Auto imported from components/table/ChangeTable.vue"
   },
@@ -170,6 +161,15 @@
   "ProductBuilderStepMixin": {
     "description": "Auto imported from components/product-builder/stepMixin.vue"
   },
+  "CustomElSliderButton": {
+    "description": "Auto imported from components/custom-el-slider/button.vue"
+  },
+  "CustomElSlider": {
+    "description": "Auto imported from components/custom-el-slider/index.vue"
+  },
+  "CustomElSliderMarker": {
+    "description": "Auto imported from components/custom-el-slider/marker.vue"
+  },
   "TinymceComponentsEditorImage": {
     "description": "Auto imported from components/Tinymce/components/EditorImage.vue"
   }

Some files were not shown because too many files changed in this diff