From 05b4f67bd30c01099e38df7d5d2aa0faa131994c Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Sat, 24 Jul 2021 11:46:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/home/memberCenter/Distribution.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/buyer/src/pages/home/memberCenter/Distribution.vue b/buyer/src/pages/home/memberCenter/Distribution.vue
index 7b9288b6..3d1e56d6 100644
--- a/buyer/src/pages/home/memberCenter/Distribution.vue
+++ b/buyer/src/pages/home/memberCenter/Distribution.vue
@@ -91,11 +91,15 @@
           </TabPane>
           <TabPane label="提现记录" name="log">
             <Table stripe :columns="logColumns" :data="logData.records">
+              <template slot-scope="{ row }" slot="sn">
+                <span>{{row.sn}}</span>
+              </template>
               <template slot-scope="{ row }" slot="time">
                 <span>{{row.createTime}}</span>
               </template>
               <template slot-scope="{ row }" slot="price">
-                <span> +￥{{ row.price | unitPrice }}</span>
+                <span v-if="row.distributionCashStatus == 'REFUSE'" style="color: green"> +￥{{ row.price | unitPrice }}</span>
+                <span v-else style="color: red"> -￥{{ row.price | unitPrice }}</span>
               </template>
               <template slot-scope="{ row }" slot="status">
                 <span> {{row.distributionCashStatus == "APPLY" ? "待处理" : row.distributionCashStatus == "PASS" ? "通过" : "拒绝"}}</span>
@@ -186,6 +190,7 @@ export default {
         {title: '操作', slot: 'action', width: 120}
       ],
       logColumns: [ // 日志表头
+        {title: '编号', slot: 'sn'},
         {title: '申请时间', slot: 'time'},
         {title: '提现金额', slot: 'price'},
         {title: '提现状态', slot: 'status'}
@@ -298,7 +303,7 @@ export default {
     },
     getLog () { // 提现历史
       distCashHistory(this.logParams).then(res => {
-        if (res.success) this.goodsData = res.result
+        if (res.success) this.logData = res.result
       })
     },
     distribution () { // 获取分销商信息

From 6a716fa531d1cb1bb9d2d895eaf5e781f03bdd90 Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Sat, 24 Jul 2021 17:38:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/home/userCenter/MoneyManagement.vue    |  5 +++--
 .../src/views/member/advance/withdrawApply.vue   | 16 ++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/buyer/src/pages/home/userCenter/MoneyManagement.vue b/buyer/src/pages/home/userCenter/MoneyManagement.vue
index 9ebd1f13..3b424286 100644
--- a/buyer/src/pages/home/userCenter/MoneyManagement.vue
+++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue
@@ -339,7 +339,7 @@ export default {
             } else if (params.row.applyStatus === 'VIA_AUDITING') {
               return h('div', [h('span', {}, '提现成功')]);
             } else {
-              return h('div', [h('span', {}, '审核未通过')]);
+              return h('div', [h('span', {}, '审核拒绝')]);
             }
           }
         },
@@ -350,7 +350,8 @@ export default {
         },
         {
           title: '审核备注',
-          key: 'inspectRemark'
+          key: 'inspectRemark',
+          tooltip: true
 
         }
       ],
diff --git a/manager/src/views/member/advance/withdrawApply.vue b/manager/src/views/member/advance/withdrawApply.vue
index 42dedd0e..eb5ea3c2 100644
--- a/manager/src/views/member/advance/withdrawApply.vue
+++ b/manager/src/views/member/advance/withdrawApply.vue
@@ -59,24 +59,27 @@
 
     <Modal :title="modalTitle" v-model="queryModalVisible" :mask-closable="false" :width="500">
       <Form :label-width="80">
-        <FormItem label="申请编号">
+        <FormItem label="申请编号：">
           <span>{{showList.sn}}</span>
         </FormItem>
-        <FormItem label="用户名称">
+        <FormItem label="用户名称：">
           <span>{{showList.memberName}}</span>
         </FormItem>
-        <FormItem label="申请金额">
+        <FormItem label="申请金额：">
           <span>{{showList.applyMoney}}</span>
         </FormItem>
-        <FormItem label="提现状态">
+        <FormItem label="提现状态：">
           <span>{{showList.applyStatus | paramTypeFilter}}</span>
         </FormItem>
-        <FormItem label="申请时间">
+        <FormItem label="申请时间：">
           <span>{{showList.createTime}}</span>
         </FormItem>
-        <FormItem label="审核时间">
+        <FormItem label="审核时间：">
           <span>{{showList.inspectTime}}</span>
         </FormItem>
+        <FormItem label="审核备注：">
+          <span>{{showList.inspectRemark}}</span>
+        </FormItem>
 
       </Form>
       <div slot="footer" v-if="showList.applyStatus == 'APPLY'">
@@ -202,6 +205,7 @@ export default {
                       this.showList = {};
                       this.roleModalVisible = true;
                       this.showList = params.row;
+                      this.audit =""
                     },
                   },
                 },