change: uk站调整(部分).

components/CategoryFilter.vue

@@ -62,7 +62,7 @@
           <div class="flex column">
             <div class="price-input-label">Price Min</div>
             <div class="flex">
-              <div class="dollar-sign">$</div>
+              <div class="dollar-sign">£</div>
               <el-input
                 style="width: 120px"
                 v-model.number="priceRange[0]"

components/product/ProductRight.vue

@@ -277,7 +277,7 @@
       </div>
       <div
         class="stock"
-        v-show="typeTab == 2">
+        v-show="false">
         <div v-if="stockData.length > 0">
           <stock-table
           :data="stockData"></stock-table>
@@ -395,7 +395,7 @@ export default {
         {
           name: 'Stock',
           isClick: false,
-          isShow: true,
+          isShow: false,
         },
         {
           name: 'Resources',

components/product/Quote.vue

@@ -80,10 +80,10 @@
         </div>
 
       </div>
-      <section>
+      <!-- <section>
         <p class="title1">
           <span></span>
-          <span>Currency AUD($)</span>
+          <span>Currency GBP(£)</span>
         </p>
         <total-table
           :comLocationNum="comLocationNum"
@@ -159,17 +159,15 @@
           @click="openMailDialog">
           Enquiry
         </el-button>
-        <!-- 需求隐藏 加入car project弹框 -->
-        <!-- <el-button  class="button-white" @click="openProjectdDialog"><img src="@/assets/img/car.png"/><span> to my project</span></el-button> -->
-      </section>
-      <section>
+      </section> -->
+      <!-- <section>
         <unit-table
           :tableData="unitData"
           :tableColumns="[
             ...unit_columns,
             ...comCurBaseTotalColumns
           ]"></unit-table>
-          <!-- 直接用comMergeColumns会出现summary数值问题，改用v-show="comLocationNum"控制 -->
+          直接用comMergeColumns会出现summary数值问题，改用v-show="comLocationNum"控制
         <total-table
           v-show="comLocationNum == 1"
           :tableData="comSellData"
@@ -192,7 +190,7 @@
           size="medium"
           @click="openDownloadDialog(1)"
           >Send Order Enquiry</el-button>
-      </section>
+      </section> -->
     </div>
     <div
       v-else
@@ -520,7 +518,7 @@ export default {
       this.comCurBaseTotalColumns?.forEach(item => {
         obj[item.prop] = item.label
       })
-        obj['summary'] = this.comTotalLabel;
+        obj.summary = this.comTotalLabel;
       return obj
     },
     // 当前已选基础价
@@ -540,7 +538,7 @@ export default {
               if (idx === 0) {
                 // 首个打印价要取附加价计算
                 const keyArr = i.split('_')
-                let supplier_val = item[`supplier_${keyArr[1]}`]
+                const supplier_val = item[`supplier_${keyArr[1]}`]
                 if (this.POA_Config.includes(supplier_val)) {
                   obj[`${i}`] = supplier_val
                 } else {
@@ -1136,7 +1134,7 @@ export default {
             const a = npPlus(this.unitData[2][key] / 100, 1)
             this.sellData[3][i] = npTimes(buyFright[i], a).toFixed(2)
             // freight_switch会使qty的运费=0无法计算，故用了initFrightObj
-            let fa = npTimes(this.initFrightObj[i], a)
+            const fa = npTimes(this.initFrightObj[i], a)
             frightSummary = npPlus(frightSummary,fa).toFixed(2)
           } else {
             this.sellData[3][i] = buyFright[i]
@@ -1152,16 +1150,16 @@ export default {
         }
       }
       // 迭代加了Total列，需要统计qty的运费后才能合计运费
-      if (this.sellData[2]['summary'] !== '-' && this.sellData[2]['summary'] !== 'POA') {
+      if (this.sellData[2].summary !== '-' && this.sellData[2].summary !== 'POA') {
         if (this.freight_switch) {
-          const num = Math.ceil((frightSummary / this.comAttributeList['summary']) * 100) / 100
-          this.sellData[2]['summary'] = npPlus(this.sellData[2]['summary'], num).toFixed(2)
-          this.sellData[3]['summary'] = 0.00
-          let a = npTimes(this.sellData[2]['summary'],this.comAttributeList['summary'])
-          this.sellData[4]['summary'] = npPlus(this.sellData[1]['summary'],a).toFixed(2)
+          const num = Math.ceil((frightSummary / this.comAttributeList.summary) * 100) / 100
+          this.sellData[2].summary = npPlus(this.sellData[2].summary, num).toFixed(2)
+          this.sellData[3].summary = 0.00
+          const a = npTimes(this.sellData[2].summary,this.comAttributeList.summary)
+          this.sellData[4].summary = npPlus(this.sellData[1].summary,a).toFixed(2)
         } else {
-          this.sellData[3]['summary'] = frightSummary
-          this.sellData[4]['summary'] = npPlus(frightSummary,this.sellData[4]['summary']).toFixed(2)
+          this.sellData[3].summary = frightSummary
+          this.sellData[4].summary = npPlus(frightSummary,this.sellData[4].summary).toFixed(2)
         }
       }
     },
@@ -1384,4 +1382,4 @@ button {
     font-size: 13px !important;
   }
 }
-</style>
+</style>

components/table/NewPriceTable.vue

@@ -87,13 +87,13 @@
               <div v-if="item.prop === 'website_setup'">
                 <!-- 打印表用supplier -->
                 <div v-if="$index === 0 && tableType == 'Decoration'">
-                  <span v-if="row['supplier_setup_id'] < 5 || row['supplier_setup_id'] == 7">$ {{ row['supplier_setup']? parseFloat(row['supplier_setup']).toFixed(2) : "0.00" }}</span>
+                  <span v-if="row['supplier_setup_id'] < 5 || row['supplier_setup_id'] == 7">£ {{ row['supplier_setup']? parseFloat(row['supplier_setup']).toFixed(2) : "0.00" }}</span>
                   <span>{{
                     $_setupPriceFilter(row['supplier_setup_id'])
                   }}</span>
                 </div>
                 <div v-else>
-                  <span v-if="row['website_setup_id'] < 5 || row['website_setup_id'] == 7">$ {{ row['website_setup']? parseFloat(row['website_setup']).toFixed(2) : "0.00" }}</span>
+                  <span v-if="row['website_setup_id'] < 5 || row['website_setup_id'] == 7">£ {{ row['website_setup']? parseFloat(row['website_setup']).toFixed(2) : "0.00" }}</span>
                   <span>{{
                     $_setupPriceFilter(row['website_setup_id'])
                   }}</span>
@@ -120,7 +120,7 @@
                     isNumber(judgeProp(row, item.prop, $index)) &&
                     !item.isFirstColumn
                   "
-                  >$</span
+                  >£</span
                 >
                 <span>{{ judgeProp(row, item.prop, $index) }}</span>
               </div>
@@ -510,4 +510,4 @@ $deep-blue: #1d4992;
     color: #fff;
     font-size: 10px;
   }
-</style>
+</style>

components/table/TotalTable.vue

@@ -44,7 +44,7 @@
           <template v-else>
             <span
                 v-if="(typeof scope.row[item.prop]=='string' && scope.row[item.prop].includes('.') || typeof scope.row[item.prop]=='number') &&
-                !item.isFirstColumn">$</span>
+                !item.isFirstColumn">£</span>
             <span>{{
               scope.row[item.prop] ? scope.row[item.prop] : '0.00'
             }}</span>
@@ -75,9 +75,9 @@ export default {
       } else if (curDecoVal === indexDecoVal) {
           return 0;
       } else if (+curDecoVal > +indexDecoVal) {
-        return `-$ ${npMinus(curDecoVal, indexDecoVal)}`;
+        return `-£ ${npMinus(curDecoVal, indexDecoVal)}`;
       } else if (+curDecoVal < +indexDecoVal) {
-        return `+$ ${npMinus(indexDecoVal, curDecoVal)}`;
+        return `+£ ${npMinus(indexDecoVal, curDecoVal)}`;
       } else {
         return 'Waived';
       }
@@ -197,4 +197,4 @@ pre {
   padding-right: 0;
   text-align: center;
 }
-</style>
+</style>

utils/price.js

@@ -5,9 +5,9 @@ import { times, plus, minus, divide } from 'number-precision'
 export function formatPrice(value, needSymbol = true) {
   // 不能在最后一步显示之前格式化999 111, 否则可能出现单价1买999个得到999价格被格式化成poa的情况
   if (value === 0) {
-    return needSymbol ? '$0.00' : '0.00'
+    return needSymbol ? '£0.00' : '0.00'
   } else {
-    return needSymbol ? `$${value}` : `${value}`
+    return needSymbol ? `£${value}` : `${value}`
   }
 }