From f3ef286aa72768092a89b317c452cd090f336eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 8 Jul 2022 14:48:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=94=80=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/distribution/distributionOrder.vue  | 26 +++-------
 .../views/distribution/distributionOrder.vue  | 50 +++++--------------
 2 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/manager/src/views/distribution/distributionOrder.vue b/manager/src/views/distribution/distributionOrder.vue
index 058d6620..7e6fe9ab 100644
--- a/manager/src/views/distribution/distributionOrder.vue
+++ b/manager/src/views/distribution/distributionOrder.vue
@@ -102,19 +102,7 @@
             slot: 'goodsMsg',
             minWidth: 150
           },
-          {
-            title: "退款金额",
-            key: "returnMoney",
-            minWidth:80,
-            sortable: false,
-            render: (h, params) => {
-              if(params.row.sellBackRebate == null){
-                return h("div", this.$options.filters.unitPrice(0, '￥'));
-              }else{
-                return h("div", this.$options.filters.unitPrice(params.row.sellBackRebate, '￥'));
-              }
-            }
-          },
+
           {
             title: "分销商",
             key: "distributionName",
@@ -134,7 +122,7 @@
           },
           {
             title: "佣金金额",
-            key: "rebateGrade",
+            key: "rebate",
             minWidth:80,
             sortable: false,
             render: (h, params) => {
@@ -237,11 +225,11 @@
       },
       filterStatusColor (status) { // 状态tag标签颜色
         const arr = [
-          {status: 'WAIT_BILL', color: 'magenta'},
-          {status: 'WAIT_CASH', color: 'warning'},
-          {status: 'COMPLETE_CASH', color: 'success'},
-          {status: 'CANCEL', color: 'default'},
-          {status: 'REFUND', color: 'error'},
+          {status: 'WAIT_BILL', color: 'blue'},
+          {status: 'WAIT_CASH', color: 'orange'},
+          {status: 'COMPLETE_CASH', color: 'green'},
+          {status: 'CANCEL', color: 'red'},
+          {status: 'REFUND', color: 'magenta'},
         ]
         for (let i=0;i<arr.length;i++) {
           if (arr[i].status === status) {
diff --git a/seller/src/views/distribution/distributionOrder.vue b/seller/src/views/distribution/distributionOrder.vue
index 14ee5f38..6a531536 100644
--- a/seller/src/views/distribution/distributionOrder.vue
+++ b/seller/src/views/distribution/distributionOrder.vue
@@ -49,38 +49,7 @@ export default {
           tooltip: true,
         },
 
-        {
-          title: "实付金额",
-          key: "orderPrice",
-          width: 130,
-          sortable: false,
-          render: (h, params) => {
-            if (params.row.orderPrice == null) {
-              return h("div", this.$options.filters.unitPrice(0, "￥"));
-            } else {
-              return h(
-                "div",
-                this.$options.filters.unitPrice(params.row.orderPrice, "￥")
-              );
-            }
-          },
-        },
-        {
-          title: "退款金额",
-          key: "returnMoney",
-          width: 130,
-          sortable: false,
-          render: (h, params) => {
-            if (params.row.orderPrice == null) {
-              return h("div", this.$options.filters.unitPrice(0, "￥"));
-            } else {
-              return h(
-                "div",
-                this.$options.filters.unitPrice(params.row.returnMoney, "￥")
-              );
-            }
-          },
-        },
+
         {
           title: "商品名称",
           key: "goodsName",
@@ -94,27 +63,32 @@ export default {
           sortable: false,
           render: (h, params) => {
             if (params.row.distributionOrderStatus == "COMPLETE_CASH") {
-              return h("div", "提现完成");
+              return h("Tag", { props: { color: "green" } },"提现完成");
             } else if (params.row.distributionOrderStatus == "WAIT_BILL") {
-              return h("div", "待结算");
+              return h("Tag", { props: { color: "blue" } } ,"待结算");
             } else if (params.row.distributionOrderStatus == "WAIT_CASH") {
-              return h("div", "待提现");
+              return h("Tag", { props: { color: "orange" } }, "待提现");
+            } else if (params.row.distributionOrderStatus == "CANCEL") {
+              return h("Tag", { props: { color: "red" } }, "订单已取消");
+            }else if (params.row.distributionOrderStatus == "REFUND") {
+              return h("Tag", { props: { color: "magenta" } }, "退款");
             }
+
           },
         },
 
         {
           title: "佣金金额",
-          key: "rebateGrade",
+          key: "rebate",
           width: 120,
           sortable: false,
           render: (h, params) => {
-            if (params.row.rebateGrade == null) {
+            if (params.row.rebate == null) {
               return h("div", this.$options.filters.unitPrice(0, "￥"));
             } else {
               return h(
                 "div",
-                this.$options.filters.unitPrice(params.row.rebateGrade, "￥")
+                this.$options.filters.unitPrice(params.row.rebate, "￥")
               );
             }
           },