1850 商品选择合计修改

frontendEle/src/views/shop/index.vue

@@ -61,14 +61,14 @@
             </el-tabs>
             <div class="white-box-footer">
                 <el-row>
-                  <el-col :span="2">
+                  <el-col :span="3">
                       <el-button type="primary" size="small" @click="goToAccounts()">Check Out</el-button><!--去结算-->
                   </el-col>
-                  <el-col :span="16">
-                      <div class='flex data' style="flex:1; justify-content: center; line-height: 35px; font-size: 14px;">
-                          <div style="margin-right: 2rem;">Product price：₦ {{ sell_price_sum }}</div><!--商品价格-->
-                          <div style="margin-right: 2rem;">Product BV：{{ price_pv_sum }}</div><!--商品BV-->
-                          <div>Product Tax：₦ {{ tax_sum }}</div><!--商品BV-->
+                  <el-col :span="15">
+                      <div class='flex data' style="line-height: 35px; font-size: 14px;">
+                          <div style="margin-right: 2rem;">Price：₦ {{ sell_price_sum }}</div><!--商品价格-->
+                          <div style="margin-right: 2rem;">BV：{{ price_pv_sum }}</div><!--商品BV-->
+                          <div>Tax：₦ {{ tax_sum }}</div><!--商品BV-->
                       </div>
                   </el-col>
                   <el-col :span="6">
@@ -273,14 +273,13 @@
                                 if( pageList[j].ID === obj.tableData[i].ID ) {
                                     obj.numList[i] = pageList[j].chose_num;
                                     obj.tableData[i].chose_num = pageList[j].chose_num;
-                                    obj.$refs.multipleTable.toggleRowSelection(obj.tableData[i],true);
+                                    // obj.$refs.multipleTable.toggleRowSelection(obj.tableData[i],true);
                                     break;
                                 }
                             }
                         }
                         obj.selectLock = false;
                     })
-
                 })
             },
             // 获取商品类型,填充tabs页
@@ -295,6 +294,12 @@
                 this.goodsCategory = tab.name
                 // 查询商品列表
                 this.getData()
+                // 清空合计、已选商品
+                this.sell_price_sum = 0.00
+                this.price_pv_sum = 0.00
+                this.tax_sum = 0.00
+                this.numList = []
+                this.tableData.map(ele => ele.chose_num = 1)
             },
         }
 

frontendEle/src/views/user/dec.vue

@@ -115,9 +115,9 @@
                             <div class="white-box-footer flex">
                                 <el-button @click="getSum()">Total Calculation</el-button><!--计算合计-->
                                 <div class='flex data' style="flex:1;justify-content: flex-end;">
-                                    <div style="margin-right:2rem">Product price：₦{{sell_price_sum}}</div><!--商品价格-->
-                                    <div style="margin-right:2rem">Product BV：{{price_pv_sum}}</div><!--商品BV-->
-                                    <div>Product Tax：₦{{tax_sum}}</div><!--商品BV-->
+                                    <div style="margin-right:2rem">Price：₦{{sell_price_sum}}</div><!--商品价格-->
+                                    <div style="margin-right:2rem">BV：{{price_pv_sum}}</div><!--商品BV-->
+                                    <div>Tax：₦{{tax_sum}}</div><!--商品BV-->
                                 </div>
                             </div>