1

src/views/selfShop/order/detail_order.vue

@@ -50,11 +50,17 @@
           <el-col :span="24" class="goods_total">
             <el-col :span="6">商品金额</el-col>
             <el-col :span="18" class="other">
-              <p>￥{{ total_detail }}</p>
+              <p>￥{{ total_detail.goods_total }}</p>
             </el-col>
           </el-col>
           <el-col :span="24" class="goods_total">
-            <el-col :span="6">应付金额</el-col>
+            <el-col :span="6">快递费</el-col>
+            <el-col :span="18" class="other">
+              <p>￥{{ total_detail.freight_total }}</p>
+            </el-col>
+          </el-col>
+          <el-col :span="24" class="goods_total">
+            <el-col :span="6">优惠后应付金额</el-col>
             <el-col :span="18" class="other">
               <p>￥{{ pay.pay_money }}</p>
             </el-col>
@@ -87,7 +93,7 @@ export default {
       info: {},
       address: {},
       list: [],
-      total_detail: '',
+      total_detail: {},
       typeList: [],
       statusList: [],
       pay: {},
@@ -108,14 +114,7 @@ export default {
         // 商品
         this.$set(this, `list`, res.data.goods);
         // 实付金额
-        // this.$set(this, `total_detail`, res.data.total_detail);
-        let total_detail = 0;
-        let total = res.data.total_detail;
-        if (res.data.total_detail) {
-          total_detail = total.freight_total + total.goods_total;
-        }
-        this.$set(this, `total_detail`, total_detail);
-
+        this.$set(this, `total_detail`, res.data.total_detail);
         this.$set(this, `pay`, res.data.pay);
       }
     },

src/views/selfShop/order/detail_orderDetail.vue

@@ -48,11 +48,17 @@
           <el-col :span="24" class="goods_total">
             <el-col :span="6">商品金额</el-col>
             <el-col :span="18" class="other">
-              <p>￥{{ total_detail }}</p>
+              <p>￥{{ total_detail.goods_total }}</p>
             </el-col>
           </el-col>
           <el-col :span="24" class="goods_total">
-            <el-col :span="6">实付金额</el-col>
+            <el-col :span="6">快递费</el-col>
+            <el-col :span="18" class="other">
+              <p>￥{{ total_detail.freight_total }}</p>
+            </el-col>
+          </el-col>
+          <el-col :span="24" class="goods_total">
+            <el-col :span="6">优惠后实付金额</el-col>
             <el-col :span="18" class="other">
               <p>￥{{ pay.pay_money }}</p>
             </el-col>
@@ -145,7 +151,7 @@ export default {
       // 地址
       address: {},
       // 实付金额
-      total_detail: '',
+      total_detail: {},
       // 商铺
       shop: {},
       // 运单号
@@ -187,13 +193,7 @@ export default {
         // 商品
         this.$set(this, `list`, res.data.goods);
         // 应付金额
-        // this.$set(this, `total_detail`, res.data.total_detail);
-        let total_detail = 0;
-        let total = res.data.total_detail;
-        if (res.data.total_detail) {
-          total_detail = total.freight_total + total.goods_total;
-        }
-        this.$set(this, `total_detail`, total_detail);
+        this.$set(this, `total_detail`, res.data.total_detail);
         this.$set(this, `pay`, res.data.order.pay);
       }
       let activities = [

src/views/system/order/detail_order.vue

@@ -50,11 +50,17 @@
           <el-col :span="24" class="goods_total">
             <el-col :span="6">商品金额</el-col>
             <el-col :span="18" class="other">
-              <p>￥{{ total_detail }}</p>
+              <p>￥{{ total_detail.goods_total }}</p>
             </el-col>
           </el-col>
           <el-col :span="24" class="goods_total">
-            <el-col :span="6">应付金额</el-col>
+            <el-col :span="6">快递费</el-col>
+            <el-col :span="18" class="other">
+              <p>￥{{ total_detail.freight_total }}</p>
+            </el-col>
+          </el-col>
+          <el-col :span="24" class="goods_total">
+            <el-col :span="6">优惠后应付金额</el-col>
             <el-col :span="18" class="other">
               <p>￥{{ pay.pay_money }}</p>
             </el-col>
@@ -87,7 +93,7 @@ export default {
       info: {},
       address: {},
       list: [],
-      total_detail: '',
+      total_detail: {},
       typeList: [],
       statusList: [],
       pay: {},
@@ -108,14 +114,7 @@ export default {
         // 商品
         this.$set(this, `list`, res.data.goods);
         // 实付金额
-        // this.$set(this, `total_detail`, res.data.total_detail);
-        let total_detail = 0;
-        let total = res.data.total_detail;
-        if (res.data.total_detail) {
-          total_detail = total.freight_total + total.goods_total;
-        }
-        this.$set(this, `total_detail`, total_detail);
-
+        this.$set(this, `total_detail`, res.data.total_detail);
         this.$set(this, `pay`, res.data.pay);
       }
     },

src/views/system/order/detail_orderDetail.vue

@@ -48,11 +48,17 @@
           <el-col :span="24" class="goods_total">
             <el-col :span="6">商品金额</el-col>
             <el-col :span="18" class="other">
-              <p>￥{{ total_detail }}</p>
+              <p>￥{{ total_detail.goods_total }}</p>
             </el-col>
           </el-col>
           <el-col :span="24" class="goods_total">
-            <el-col :span="6">实付金额</el-col>
+            <el-col :span="6">快递费</el-col>
+            <el-col :span="18" class="other">
+              <p>￥{{ total_detail.freight_total }}</p>
+            </el-col>
+          </el-col>
+          <el-col :span="24" class="goods_total">
+            <el-col :span="6">优惠后实付金额</el-col>
             <el-col :span="18" class="other">
               <p>￥{{ pay.pay_money }}</p>
             </el-col>
@@ -145,7 +151,7 @@ export default {
       // 地址
       address: {},
       // 实付金额
-      total_detail: '',
+      total_detail: {},
       // 商铺
       shop: {},
       // 运单号
@@ -187,13 +193,7 @@ export default {
         // 商品
         this.$set(this, `list`, res.data.goods);
         // 应付金额
-        // this.$set(this, `total_detail`, res.data.total_detail);
-        let total_detail = 0;
-        let total = res.data.total_detail;
-        if (res.data.total_detail) {
-          total_detail = total.freight_total + total.goods_total;
-        }
-        this.$set(this, `total_detail`, total_detail);
+        this.$set(this, `total_detail`, res.data.total_detail);
         this.$set(this, `pay`, res.data.order.pay);
       }
       let activities = [