Ver Fonte

产品名称 下单时间

yuhongqi há 2 semanas atrás
pai
commit
894f936c58

+ 8 - 0
src/views/live/liveConsole/index.vue

@@ -1242,6 +1242,14 @@ export default {
               this.$refs.manageRightRef.wrap.scrollTop = this.$refs.manageRightRef.wrap.scrollHeight - this.$refs.manageRightRef.wrap.clientHeight
             }, 200)
           })
+        } else if (cmd === 'deleteMsg') {
+          const msgId = data.msgId != null ? data.msgId : (data.msg != null ? Number(data.msg) : null)
+          if (msgId != null) {
+            const index = this.msgList.findIndex(item => item.msgId == msgId)
+            if (index !== -1) {
+              this.msgList.splice(index, 1)
+            }
+          }
         }
         else if (cmd === 'entry' || cmd === 'out') {
           const user = data;

+ 11 - 13
src/views/live/liveOrder/liveOrderDetails.vue

@@ -179,7 +179,7 @@
         </el-table-column>
       </el-table>
       <div style="float: right;margin: 20px" v-if="item.totalPrice!=null">
-        合计:<span class="color-danger">¥{{item.totalPrice.toFixed(2)}}</span>
+        商品总价:<span class="color-danger">¥{{(parseFloat(item.totalPrice)).toFixed(2)}}</span>
       </div>
     </div>
     <div class="contentx" v-if="item!=null" style="padding-bottom: 70px;">
@@ -190,15 +190,12 @@
         <el-button size="mini" circle icon="el-icon-search" @click="showListD()" />
       </el-tooltip>
       <el-descriptions :column="3" border  >
-        <el-descriptions-item label="商品合计"  ><span v-if="item!=null">{{(
-          parseFloat(item.totalPrice || 0) +
-          parseFloat(item.discountMoney || 0) -
-          parseFloat(item.payDelivery || 0)).toFixed(2)}}</span></el-descriptions-item>
-        <el-descriptions-item label="应付金额"><span v-if="item!=null">{{item.totalPrice}}</span></el-descriptions-item>
-        <el-descriptions-item label="运费"><span v-if="item.payDelivery!=null">{{item.payDelivery}}</span></el-descriptions-item>
+        <el-descriptions-item label="商品合计"  ><span v-if="item!=null">{{(parseFloat(item.totalPrice || 0)).toFixed(2)}}</span></el-descriptions-item>
+        <el-descriptions-item label="应付金额"><span v-if="item!=null">{{(parseFloat(item.payPrice || 0)).toFixed(2)}}</span></el-descriptions-item>
+        <el-descriptions-item label="邮费"><span v-if="item!=null">{{(parseFloat(item.payPostage || 0)).toFixed(2)}}</span></el-descriptions-item>
         <el-descriptions-item label="优惠券"  ><span v-if="item.discountMoney!=null">{{item.discountMoney}}</span></el-descriptions-item>
         <el-descriptions-item label="积分抵扣" >  <span v-if="item!=null">{{item.payIntegral}}</span>  </el-descriptions-item>
-        <el-descriptions-item label="实付金额" >  <span v-if="item!=null">{{item.payMoney}}</span>  </el-descriptions-item>
+        <el-descriptions-item label="实付金额" >  <span v-if="item!=null">{{(parseFloat(item.payMoney || 0)).toFixed(2)}}</span>  </el-descriptions-item>
         <el-descriptions-item label="代收金额" >  <span v-if="item!=null">{{item.payRemain}}</span>  </el-descriptions-item>
         <el-descriptions-item label="服务费" >  <span v-if="item!=null">{{0.00}}</span>  </el-descriptions-item>
         <el-descriptions-item label="折扣率"  >
@@ -211,8 +208,8 @@
         </el-descriptions-item>
         <el-descriptions-item label=""/>
       </el-descriptions>
-      <div style="float: right;margin: 20px" v-if="item.totalPrice!=null">
-        合计:<span class="color-danger">¥{{item.totalPrice.toFixed(2)}}</span>
+      <div style="float: right;margin: 20px" v-if="item.payMoney!=null">
+        实付合计:<span class="color-danger">¥{{(parseFloat(item.payMoney)).toFixed(2)}}</span>
       </div>
     </div>
 
@@ -573,13 +570,14 @@ export default {
       }
       return total;
     },
-    /** 折扣率百分比(四舍五入保留两位小数) */
+    /** 折扣率百分比:实付 / 商品总价(totalPrice) */
     discountRatePercent() {
-      if (!this.item || this.productTotal <= 0) {
+      if (!this.item || !this.item.totalPrice || parseFloat(this.item.totalPrice) <= 0) {
         return '0.00';
       }
       const payMoney = parseFloat(this.item.payMoney) || 0;
-      const rate = parseFloat((payMoney / this.productTotal).toFixed(2));
+      const totalPrice = parseFloat(this.item.totalPrice) || 0;
+      const rate = parseFloat((payMoney / totalPrice).toFixed(2));
       return (rate * 100).toFixed(2);
     }
   },