From eca8370c7091f1fc3308f08499995728309a6ed5 Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Wed, 24 Jan 2024 14:58:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=B0=83=E4=BC=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/shop/bill/billDetail.vue | 46 +++++++++--------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue
index 9b92d307..bf439b8f 100644
--- a/seller/src/views/shop/bill/billDetail.vue
+++ b/seller/src/views/shop/bill/billDetail.vue
@@ -325,7 +325,7 @@ export default {
                   return h("div", this.$options.filters.unitPrice(params.row.billPrice, "￥")
                   );
                 }else{
-                  return h("priceColorScheme", {props: {value: (0-params.row.finalPrice), color: this.$mainColor}});
+                  return h("priceColorScheme", {props: {value: (0-params.row.billPrice), color: this.$mainColor}});
                 }
               },
             },
@@ -337,7 +337,7 @@ export default {
           align: 'center',
           children: [{
             title: "补贴",
-            key: "billPrice",
+            key: "subsidy",
             render: (h, params) => {
               if (params.row.pointSettlementPrice == 0) {
                 return h("div", "-");
@@ -351,25 +351,25 @@ export default {
           },
             {
               title: "用户实付",
-              key: "billPrice",
-              render: (h, params) => {
-                if(params.row.flowType == "PAY"){
-                  return h("div", this.$options.filters.unitPrice(params.row.siteCouponCommission, "￥")
-                  );
-                }else{
-                  return h("priceColorScheme", {props: {value: (0-params.row.siteCouponCommission)}});
-                }
-              },
-            },
-            {
-              title: "合计",
-              key: "billPrice",
+              key: "finalPrice",
               render: (h, params) => {
                 if(params.row.flowType == "PAY"){
                   return h("div", this.$options.filters.unitPrice(params.row.finalPrice, "￥")
                   );
                 }else{
-                  return h("priceColorScheme", {props: {value: (0-params.row.billPrice)}});
+                  return h("priceColorScheme", {props: {value: (0-params.row.finalPrice)}});
+                }
+              },
+            },
+            {
+              title: "合计",
+              key: "total",
+              render: (h, params) => {
+                if(params.row.flowType == "PAY"){
+                  return h("div", this.$options.filters.unitPrice((params.row.finalPrice+(params.row.pointSettlementPrice+params.row.kanjiaSettlementPrice+params.row.siteCouponCommission)), "￥")
+                  );
+                }else{
+                  return h("priceColorScheme", {props: {value: (0-(params.row.finalPrice+(params.row.pointSettlementPrice+params.row.kanjiaSettlementPrice+params.row.siteCouponCommission)))}});
                 }
               },
             },
@@ -381,7 +381,7 @@ export default {
           align: 'center',
           children: [{
             title: "平台服务费",
-            key: "billPrice",
+            key: "commissionPrice",
             render: (h, params) => {
               if (params.row.commissionPrice == 0) {
                 return h("div", "-");
@@ -405,18 +405,6 @@ export default {
                 }else{
                   return h("priceColorScheme", {props: {value: (0-params.row.distributionRebate)}});
                 }
-
-                // if (params.row.distributionRebate == null) {
-                //   return h("div", "-");
-                // } else {
-                //   return h(
-                //     "div",
-                //     this.$options.filters.unitPrice(
-                //       params.row.distributionRebate,
-                //       "￥"
-                //     )
-                //   );
-                // }
               },
             },
             {