From 9051caba6c0246f3b2dd2bb149d26094184c41c9 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Fri, 21 Apr 2023 15:07:09 +0800
Subject: [PATCH] test2

---
 src/views/Ordermanagement/components/details.vue | 13 ++++++++++++-
 src/views/financeManagement/refundList.vue       | 14 +++++++++++++-
 src/views/financeManagement/refundListDetail.vue | 10 +++++++++-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/views/Ordermanagement/components/details.vue b/src/views/Ordermanagement/components/details.vue
index 48807b0..2ba73cb 100644
--- a/src/views/Ordermanagement/components/details.vue
+++ b/src/views/Ordermanagement/components/details.vue
@@ -25,9 +25,18 @@
       <el-form-item label="实付金额">
         <span>¥{{ form.payAmount }}</span>
       </el-form-item>
+
+      <!------------------------------------------------------------------------------>
       <el-form-item label="支付方式">
-        <span>{{ form.paytype==2?"礼品卡支付":"微信支付" }}</span>
+        <span>{{ form.paytype==2?"礼品卡支付":form.paytype=='1'?"微信支付":"组合支付" }}</span>
+      </el-form-item>
+      <el-form-item  label="微信付款"  v-if="form.paytype=='3' && form.wechatPayAmount">
+        <span>¥{{form.wechatPayAmount || 0}}</span>
+      </el-form-item>
+      <el-form-item label="礼品卡付款"  v-if="form.paytype=='3' && form.giftCardsPayAmount">
+        <span>¥{{form.giftCardsPayAmount || 0}}</span>
       </el-form-item>
+      <!------------------------------------------------------------------------------>
       <el-form-item label="订单状态">
         <span style="color: red">{{
           form.orderState | toState(form.orderState)
@@ -132,6 +141,8 @@ export default {
         phone: "",
         wxName: "",
         courierNum: "",
+        wechatPayAmount:"",
+        giftCardsPayAmount:""
       },
       title: "",
       dialogFormVisible: false,
diff --git a/src/views/financeManagement/refundList.vue b/src/views/financeManagement/refundList.vue
index ee3cfec..f53c537 100644
--- a/src/views/financeManagement/refundList.vue
+++ b/src/views/financeManagement/refundList.vue
@@ -100,12 +100,24 @@
           width="150"
           show-overflow-tooltip
         />
+        <el-table-column
+            prop="wechatPayAmount"
+            label="微信支付金额(元)"
+            width="150"
+            show-overflow-tooltip
+        />
+        <el-table-column
+            prop="giftCardsPayAmount"
+            label="礼品卡支付金额(元)"
+            width="150"
+            show-overflow-tooltip
+        />
         <el-table-column
           prop="state"
           label="支付方式"
         >
           <template slot-scope="scope">
-              {{ scope.row.paytype==2?"礼品卡支付":"微信支付" }}
+              {{ scope.row.paytype==2?"礼品卡支付":scope.row.paytype==3?"组合支付":"微信支付" }}
           </template>
         </el-table-column>
         <el-table-column
diff --git a/src/views/financeManagement/refundListDetail.vue b/src/views/financeManagement/refundListDetail.vue
index 015f71e..49fad55 100644
--- a/src/views/financeManagement/refundListDetail.vue
+++ b/src/views/financeManagement/refundListDetail.vue
@@ -28,9 +28,17 @@
       <el-form-item label="退款金额">
         <span>{{ form.payAmount }}元</span>
       </el-form-item>
+      <!------------------------------------------------------------------------------>
       <el-form-item label="支付方式">
-        <span>{{ form.paytype==2?"礼品卡支付":"微信支付" }}</span>
+      <span>{{ form.paytype==2?"礼品卡支付":form.paytype=='1'?"微信支付":"组合支付" }}</span>
       </el-form-item>
+      <el-form-item  label="微信付款"  v-if="form.paytype=='3' && form.wechatPayAmount">
+        <span>¥{{form.wechatPayAmount || 0}}</span>
+      </el-form-item>
+      <el-form-item label="礼品卡付款"  v-if="form.paytype=='3' && form.giftCardsPayAmount">
+        <span>¥{{form.giftCardsPayAmount || 0}}</span>
+      </el-form-item>
+      <!------------------------------------------------------------------------------>
       <el-form-item label="付款时间">
         <span>{{ form.payTime }}</span>
       </el-form-item>