Merge branch 'dev' of http://159.75.201.17:3000/zwq/tuanfeng-pc-admin into dev

src/api/withdrawal.js

@@ -82,3 +82,13 @@ export function getWithdrawalCommissionList(data) {
     data
   })
 }
+
+
+//  获取提现的账户信息
+export function getWithdrawalAccount(params) {
+  return request({
+    url: '/idcard/listByShopIds',
+    method: 'get',
+    params
+  })
+}

src/views/finance/withdrawal/components/DetailModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="visible" v-bind="modalOptions">
+  <el-dialog :visible.sync="visible" v-bind="modalOptions" @close="cardData = {}">
     <div>
       <el-descriptions title="" :column="2" border>
         <el-descriptions-item label="店铺名称：">
@@ -60,6 +60,15 @@
         <el-descriptions-item label="非惠市宝订单的相关提现金额：">
           {{ formData.summaryNotHsbAmount }}
         </el-descriptions-item>
+        <el-descriptions-item label="已认证身份姓名">
+          {{ cardData.name || "未认证" }}
+        </el-descriptions-item>
+        <el-descriptions-item label="已认证身份证">
+          {{ cardData.idCard || "未认证" }}
+        </el-descriptions-item>
+        <el-descriptions-item label="已认证电话号码">
+          {{ cardData.phone || "未认证"}}
+        </el-descriptions-item>
       </el-descriptions>
     </div>
 
@@ -141,7 +150,7 @@
 <script>
 import RelatedOrders from './RelatedOrders'
 import LedgerInformation from './LedgerInformation'
-import { withdrawalGetById, withdrawalGetById2 } from '@/api/withdrawal'
+import { withdrawalGetById, withdrawalGetById2,getWithdrawalAccount } from '@/api/withdrawal'
 
 export default {
   name: 'DetailModal',
@@ -180,7 +189,9 @@ export default {
         summaryHsbSplitedAmount: '',
         summaryHsbSplitRemainAmount: '',
         summaryNotHsbAmount: ''
-      }
+      },
+      //  身份证信息
+      cardData:{}
     }
   },
   methods: {
@@ -191,6 +202,7 @@ export default {
       this.formData = Object.assign(this.$options.data().formData, params)
       if (params.withdrawalId) {
         this.getInfo(params.withdrawalId)
+        this.getWithdrawalInfo(params.shopId)
       }
       this.visible = true
     },
@@ -234,6 +246,11 @@ export default {
       } finally {
         loading.close()
       }
+    },
+    // 单独用来请求提现的身份证以及手机号姓名等
+    async getWithdrawalInfo(id){
+      let {data} = await getWithdrawalAccount({ shopIds: id })
+      this.cardData = data[0]
     }
   }
 }

src/views/finance/withdrawal/components/WithdrawalProcessing.vue

@@ -2,6 +2,7 @@
   <el-dialog
     :visible.sync="visible"
     v-bind="modalOptions"
+    @close="cardData = {}"
   >
     <div>
       <el-descriptions title="" :column="2" border>
@@ -63,9 +64,18 @@
         <el-descriptions-item label="非惠市宝订单的相关提现金额：">
           {{ formData.summaryNotHsbAmount }}
         </el-descriptions-item>
+        <el-descriptions-item label="已认证身份姓名">
+          {{ cardData.name || "未认证" }}
+        </el-descriptions-item>
+        <el-descriptions-item label="已认证身份证">
+          {{ cardData.idCard || "未认证" }}
+        </el-descriptions-item>
+        <el-descriptions-item label="已认证电话号码">
+          {{ cardData.phone || "未认证"}}
+        </el-descriptions-item>
       </el-descriptions>
     </div>
-    <div style="color: red;font-size: 16px;text-align: center;">* 请确认您已转账成功，再点击确认。说明：分账金额代表已打款，T+1到账</div>
+    <div style="color: red;font-size: 16px;text-align: center; margin-top:20px;">* 请确认您已转账成功，再点击确认。说明：分账金额代表已打款，T+1到账</div>
     <el-input v-show="formData.state == 3" v-model="formData.cause" type="textarea" autosize placeholder="请输入拒绝打款理由">
     </el-input>
     <div v-show="formData.state == 2" style="margin-top: 30px;">
@@ -86,7 +96,7 @@
 </template>
 
 <script>
-import { withdrawalGetById, withdrawalHandle } from '@/api/withdrawal'
+import { withdrawalGetById, withdrawalHandle,getWithdrawalAccount } from '@/api/withdrawal'
 
 export default {
   name: 'WithdrawalProcessing',
@@ -120,7 +130,9 @@ export default {
         summaryNotHsbAmount: ''
       },
       formRules: {
-      }
+      },
+      //  身份证信息
+      cardData:{}
     }
   },
   methods: {
@@ -136,6 +148,7 @@ export default {
       this.initList()
       if (params.withdrawalId) {
         this.getInfo(params.withdrawalId)
+        this.getWithdrawalInfo(params.shopId)
       } else {
         this.$refs.formData && this.$refs.formData.resetFields()
       }
@@ -170,6 +183,11 @@ export default {
         loading.close()
       }
     },
+        // 单独用来请求提现的身份证以及手机号姓名等
+        async getWithdrawalInfo(id){
+      let {data} = await getWithdrawalAccount({ shopIds: id })
+      this.cardData = data[0]
+    },
     //  拒绝打款
     async handleRefuse() {
       if (this.formData.state == 3) {