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

src/api/application.js

@@ -80,4 +80,13 @@ export function getWaterRecord(params){
     method:"get",
     params
   })
+}
+
+//  通联查询
+export function getTonglian(data){
+  return request({
+    url:"/buyer_withdrawal/getByAllinpay",
+    method:"post",
+    data
+  })
 }

src/views/finance/application/index.vue

@@ -30,7 +30,7 @@
       <!--  表格 -->
       <div class="content_table">
         <div class="table">
-          <el-table :data="tableData" border :header-cell-style="{ background: '#EEF3FF', color: '#333333' }"
+          <el-table :data="tableData" v-loading="tableLoading" border :header-cell-style="{ background: '#EEF3FF', color: '#333333' }"
             style="width: 100%">
             >
             <el-table-column prop="orderSn" label="流水号"></el-table-column>
@@ -54,6 +54,7 @@
                   <el-button v-if="scope.row.state == 1" type="text" @click="del(scope.row)">处理</el-button>
                   <el-button v-else-if="scope.row.state !== 0" type="text" @click="seeMore(scope.row)">查看</el-button>
                   <el-button v-else type="text" @click="del(scope.row)">处理</el-button>
+                  <el-button v-if="scope.row.state !== 3" type="text" @click="confirmTong(scope.row)">通联确认</el-button>
                 </div>
               </template>
             </el-table-column>
@@ -143,7 +144,8 @@ import {
   applicationGetById,
   applicationHandle,
   getUserWater,
-  getWaterRecord
+  getWaterRecord,
+  getTonglian
 } from '@/api/application'
 export default {
   data() {
@@ -157,6 +159,8 @@ export default {
       },
       total: 1,
       tableData: [],
+      //  控制表格的加载
+      tableLoading:true,
       infoList: [
         { name: '手机号码', value: '', fields: 'phone' },
         { name: '银行名称', value: '', fields: 'bankName' },
@@ -311,9 +315,30 @@ export default {
         this.infoList.push({ name: "拒绝打款理由", value: res.data.rejectReason, fields: 'rejectReason' })
       }
     },
+
+    //  通联确认
+    async confirmTong(item){
+      let obj = {
+        orderSn:item.orderSn,
+        withdrawalId:item.withdrawalId
+      }
+      try {
+        let res = await getTonglian(obj);
+        if (res.code === '') {
+          this.$message.success('通联确认成功')
+          this.getAll(this.formInline)
+        }
+      } catch (error) {
+        
+      }
+    },
     // 初始化查询所有数据
     async getAll(formInline) {
+      //  加载状态
+      this.tableLoading = true
       const res = await applicationGetAll(formInline)
+      //  清除加载状态
+      this.tableLoading = false
       this.tableData = res.data.list
       this.tableData.forEach((item) => {
         item.phone = hidden(item.phone, 3, 4)

vue.config.js

@@ -41,8 +41,8 @@ module.exports = {
     // before: require('./mock/mock-server.js'),
     proxy: {
       '/api': {
-        target: 'https://nsadminapi.tuanfengkeji.cn', // 测试
-        // target: 'http://192.168.0.91:9103', // 平台端
+        // target: 'https://nsadminapi.tuanfengkeji.cn', // 测试
+        target: 'http://192.168.0.91:9103', // 平台端
         // target: 'http://192.168.0.91:9003', // 商家端
         changeOrigin: true,
         pathRewrite: {