From 24f4a36082ff602c40a6057840acc747b4b66852 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Tue, 26 Apr 2022 11:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E4=BF=A1=E6=81=AF=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E5=8D=95=E4=B8=AD=E5=B1=95=E7=A4=BA=E6=9B=B4=E5=A4=9A?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/seller/bill/bill-detail.vue | 16 +++++++++-----
 seller/src/views/shop/bill/billDetail.vue     | 22 +++++++++++++------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue
index f4f641d2..bba01586 100644
--- a/manager/src/views/seller/bill/bill-detail.vue
+++ b/manager/src/views/seller/bill/bill-detail.vue
@@ -38,7 +38,7 @@
             <p>退单金额</p>
             <p class="theme_color">-{{bill.refundPrice || 0 | unitPrice('￥')}}</p>
           </span>
-		  
+
           <span>
             <p>平台收取佣金</p>
             <p class="theme_color">-{{bill.commissionPrice || 0 | unitPrice('￥')}}</p>
@@ -47,7 +47,7 @@
 		    <p>退单产生退还佣金金额</p>
 		    <p class="increase-color">+{{bill.refundCommissionPrice || 0  | unitPrice('￥')}}</p>
 		  </span>
-		  
+
           <span>
             <p>分销返现支出</p>
             <p class="theme_color">-{{bill.distributionCommission || 0  | unitPrice('￥')}}</p>
@@ -56,7 +56,7 @@
 		    <p>退单分销返现返还</p>
 		    <p class="increase-color">+{{bill.distributionRefundCommission || 0  | unitPrice('￥')}}</p>
 		  </span>
-		  
+
           <span>
             <p>退单平台优惠券补贴返还</p>
             <p class="theme_color">-{{bill.siteCouponRefundCommission || 0  | unitPrice('￥')}}</p>
@@ -66,7 +66,7 @@
             <p>平台优惠券补贴</p>
             <p class="increase-color">+{{bill.siteCouponCommission || 0  | unitPrice('￥')}}</p>
           </span>
-         
+
           <span>
             <p>积分结算金额</p>
             <p class="increase-color">+{{bill.pointSettlementPrice || 0  | unitPrice('￥')}}</p>
@@ -304,7 +304,13 @@ export default {
         },
         {
           title: "订单编号",
-          key: "sn",
+          key: "orderSn",
+          minWidth: 120,
+          tooltip: true
+        },
+        {
+          title: "售后编号",
+          key: "refundSn",
           minWidth: 120,
           tooltip: true
         },
diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue
index ab9b016d..c2e086c9 100644
--- a/seller/src/views/shop/bill/billDetail.vue
+++ b/seller/src/views/shop/bill/billDetail.vue
@@ -37,7 +37,7 @@
               <p>退单金额</p>
               <p class="theme_color">-{{bill.refundPrice || 0 | unitPrice('￥')}}</p>
             </span>
-        		  
+
             <span>
               <p>平台收取佣金</p>
               <p class="theme_color">-{{bill.commissionPrice || 0 | unitPrice('￥')}}</p>
@@ -46,7 +46,7 @@
         		    <p>退单产生退还佣金金额</p>
         		    <p class="increase-color">+{{bill.refundCommissionPrice || 0  | unitPrice('￥')}}</p>
         		  </span>
-        		  
+
             <span>
               <p>分销返现支出</p>
               <p class="theme_color">-{{bill.distributionCommission || 0  | unitPrice('￥')}}</p>
@@ -55,17 +55,17 @@
         		    <p>退单分销返现返还</p>
         		    <p class="increase-color">+{{bill.distributionRefundCommission || 0  | unitPrice('￥')}}</p>
         		  </span>
-        		  
+
             <span>
               <p>退单平台优惠券补贴返还</p>
               <p class="theme_color">-{{bill.siteCouponRefundCommission || 0  | unitPrice('￥')}}</p>
             </span>
-        
+
             <span>
               <p>平台优惠券补贴</p>
               <p class="increase-color">+{{bill.siteCouponCommission || 0  | unitPrice('￥')}}</p>
             </span>
-           
+
             <span>
               <p>积分结算金额</p>
               <p class="increase-color">+{{bill.pointSettlementPrice || 0  | unitPrice('￥')}}</p>
@@ -295,12 +295,20 @@ export default {
         {
           title: "退款流水编号",
           key: "sn",
-          minWidth: 130,
+          minWidth: 120,
+          tooltip: true
         },
         {
           title: "订单编号",
-          key: "sn",
+          key: "orderSn",
           minWidth: 120,
+          tooltip: true
+        },
+        {
+          title: "售后编号",
+          key: "refundSn",
+          minWidth: 120,
+          tooltip: true
         },
         {
           title: "退款金额",