完善接口联调

src/api/relAgency/relAgency.js

@@ -88,9 +88,16 @@ export const agencyWithdrawExamineExport = query => {
     });
 };
 // 官方提现记录 结算
+// export const agencyWithdrawSet = query => {
+//     return request({
+//         url: '/agencyWithdrawExamine/settle',
+//         method: 'post',
+//         params: query
+//     });
+// };
 export const agencyWithdrawSet = query => {
     return request({
-        url: '/agencyWithdrawExamine/settle',
+        url: '/agencyWithdrawExamine/batchSettle',
         method: 'post',
         params: query
     });
@@ -144,6 +151,14 @@ export const excellentAnchorDetail = query => {
         params: query
     });
 };
+// 官方提现-国家
+export const adminCountry = query => {
+    return request({
+        url: '/admin/country/list',
+        method: 'get',
+        params: query
+    });
+};
 
 // =====================================钻石充值流水=======================================
 // 查询

src/views/guildOperationManagement/officialWithdrawRecord.vue

@@ -26,7 +26,7 @@
                 placeholder="请输入"
               ></el-input>
             </el-form-item>
-            <el-form-item label="状态" prop="status">
+            <el-form-item label="提现状态" prop="status">
               <el-select v-model="searchForm.status">
                 <el-option label="审核中" value="0"></el-option>
                 <el-option label="审核通过" value="1"></el-option>
@@ -42,6 +42,16 @@
                 <el-option label="Other" value="OTHER"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="国家" prop="country">
+              <el-select v-model="searchForm.country">
+                <el-option
+                  v-for="(item, index) in adminCountryArr"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="时间" class="large">
               <el-form-item prop="startTime">
                 <el-date-picker
@@ -73,10 +83,15 @@
               <el-button @click="handleChangeAll()" type="info" plain
                 >批量发放</el-button
               >
-              <el-button @click="centerDialogVisible = true" type="info" plain
+              <el-button
+                @click="
+                  centerDialogVisible = true;
+                  centerDialogVisibleType = 1;
+                "
+                type="info"
+                plain
                 >批量驳回</el-button
               >
-              <div class="text">汇总提现薪资US：0</div>
             </el-form-item>
           </div>
         </el-form>
@@ -94,23 +109,33 @@
           <el-table-column type="selection"> </el-table-column>
           <el-table-column align="center" prop="erbanNo" label="MoliStar ID" />
           <el-table-column align="center" prop="nick" label="昵称" />
+          <el-table-column align="center" prop="accountCountry" label="国家" />
           <el-table-column
             align="center"
-            prop="status"
+            prop="blocked"
             label="用户当前账户状态"
           >
+            <template v-slot="scope">
+              {{ scope.row.blocked ? "封禁" : "正常" }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="status" label="申请状态">
             <template v-slot="scope">
               {{
-                scope.row.x == 0
+                scope.row.status == 0
                   ? "审核中"
-                  : scope.row.x == 1
+                  : scope.row.status == 1
                   ? "通过"
                   : "未通过"
               }}
             </template>
           </el-table-column>
           <el-table-column align="center" prop="createTime" label="申请时间" />
-          <el-table-column align="center" prop="accountType" label="提现账户" />
+          <el-table-column
+            align="center"
+            prop="accountType"
+            label="提现类型  "
+          />
           <el-table-column
             align="center"
             prop="guildUsdNum"
@@ -120,16 +145,42 @@
           <el-table-column align="center" prop="currencyNum" label="发放金额" />
           <el-table-column align="center" prop="withdrawRate" label="手续费" />
           <el-table-column align="center" prop="withdrawNum" label="核销薪资" />
-          <el-table-column align="center" prop="remark" label="驳回理由" />
+          <el-table-column align="center" prop="remark" label="驳回理由">
+            <template v-slot="scope">
+              {{ scope.row.remark ? scope.row.remark : "/" }}
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="hallSalary" label="操作">
             <template v-slot="scope">
-              <el-button
+              <div v-if="scope.row.status == 0">
-                @click="handleChange(scope.row)"
+                <el-button
-                type="text"
+                  @click="handleChange(scope.row)"
-                size="mini"
+                  type="text"
-              >
+                  size="mini"
-                查看详情
+                >
-              </el-button>
+                  发放
+                </el-button>
+                <el-button
+                  @click="
+                    centerDialogVisible = true;
+                    centerDialogVisibleType = 2;
+                    centerDialogVisibleID = scope.row.id;
+                  "
+                  type="text"
+                  size="mini"
+                >
+                  驳回
+                </el-button>
+              </div>
+              <div v-else>
+                <el-button
+                  @click="accountInfosFun(scope.row)"
+                  type="text"
+                  size="mini"
+                >
+                  查看详情
+                </el-button>
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -146,8 +197,9 @@
       <el-dialog v-model="centerDialogVisible" title="提示" width="30%" center>
         <span> 请选择驳回理由:</span>
         <div class="boxs">
-          <el-radio class="radios" v-model="radio" label="1">备选项</el-radio>
+          <el-radio class="radios" v-model="radio" label="用户消息提供不足"
-          <el-radio class="radios" v-model="radio" label="2">备选项</el-radio>
+            >用户消息提供不足</el-radio
+          >
         </div>
         <template #footer>
           <span class="dialog-footer">
@@ -159,17 +211,21 @@
       <!-- 提现详情弹窗 -->
       <el-dialog v-model="centerDialogVisible2" title="提现详情">
         <div class="boxs2">
-          <div>申请提现时间：</div>
+          <div>申请提现时间：{{ accountDetails.createTime }}</div>
-          <div>申请ID：</div>
+          <div>申请ID：{{ accountDetails.erbanNo }}</div>
-          <div>提现账户：</div>
+          <div>country：{{ accountDetails.country }}</div>
-          <div>真实姓名：</div>
+          <div>payeeAccount：{{ accountDetails.bank_account }}</div>
-          <div>身份证号：</div>
+          <div>Bank Name：{{ accountDetails.bank_name }}</div>
-          <div>银行卡号：</div>
+          <div>SWIFT Code：{{ accountDetails.swift_code }}</div>
-          <div>手机号码：</div>
+          <div>payeeName:：{{ accountDetails.full_name }}</div>
-          <div>提现薪资US：</div>
+          <div>address：{{ accountDetails.address }}</div>
-          <div>发放金币：币种+数量</div>
+          <div>提现薪资US：{{ accountDetails.guildUsdNum }}</div>
-          <div>提现手续费：</div>
+          <div>
-          <div>核销薪资：</div>
+            发放金额：{{ accountDetails.currency }}
+            {{ accountDetails.currencyNum }}
+          </div>
+          <div>提现手续费：{{ accountDetails.withdrawRate }}</div>
+          <div>核销薪资：{{ accountDetails.withdrawNum }}</div>
         </div>
         <template #footer>
           <span class="dialog-footer">
@@ -188,6 +244,7 @@ import {
   agencyWithdrawSet,
   agencyWithdrawBatchSet,
   batchReject,
+  adminCountry,
 } from "@/api/relAgency/relAgency.js";
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate, formatDateYMD } from "@/utils/relDate";
@@ -214,16 +271,20 @@ export default {
         pageSize: 20,
       },
       centerDialogVisible: false, //驳回弹窗
+      centerDialogVisibleType: null, //驳回弹窗
       centerDialogVisibleID: null, //驳回弹窗
       centerDialogVisible2: false, //操作弹窗
-      radio: 1, //驳回原因
+      radio: "用户消息提供不足", //驳回原因
       // 搜索表单相关
       searchForm: {
         agencyOwnerErbanNo: null,
         status: null,
         startTime: null,
         endTime: null,
+        adminCountry: null,
+        country: null,
       },
+      adminCountryArr: [],
       searchRule: {
         startTime: [
           {
@@ -253,10 +314,29 @@ export default {
         ],
       },
       idStr: [], //批量删除ID
+      // 查看薪资弹窗数据存储
+      accountDetails: {
+        createTime: null,
+        erbanNo: null,
+        country: null,
+        bank_account: null,
+        bank_name: null,
+        swift_code: null,
+        full_name: null,
+        address: null,
+        guildUsdNum: null,
+        currency: null,
+        currencyNum: null,
+        withdrawRate: null,
+        withdrawNum: null,
+      },
     };
   },
   created() {
-    // this.getData();
+    adminCountry().then((res) => {
+      this.adminCountryArr = res.data;
+      this.getData();
+    });
   },
   methods: {
     getData() {
@@ -326,9 +406,38 @@ export default {
           });
         });
     },
+    // 查看详情处理函数
+    accountInfosFun(res) {
+      var obj = JSON.parse(res.accountInfos);
+      console.log(obj);
+      this.accountDetails.createTime = res.createTime ? res.createTime : "-";
+      this.accountDetails.erbanNo = res.erbanNo ? res.erbanNo : "-";
+      this.accountDetails.country = obj.country ? obj.country : "-";
+      this.accountDetails.bank_account = obj.bank_account
+        ? obj.bank_account
+        : "-";
+      this.accountDetails.bank_name = obj.bank_name ? obj.bank_name : "-";
+      this.accountDetails.swift_code = obj.swift_code ? obj.swift_code : "-";
+      this.accountDetails.full_name = obj.full_name ? obj.full_name : "-";
+      this.accountDetails.address = obj.address ? obj.address : "-";
+      this.accountDetails.guildUsdNum = res.guildUsdNum ? res.guildUsdNum : "-";
+      this.accountDetails.currency = res.currency ? res.currency : "-";
+      this.accountDetails.currencyNum = res.currencyNum ? res.currencyNum : "-";
+      this.accountDetails.withdrawRate = res.withdrawRate
+        ? res.withdrawRate
+        : "-";
+      this.accountDetails.withdrawNum = res.withdrawNum ? res.withdrawNum : "-";
+      this.centerDialogVisible2 = true;
+    },
     // 批量驳回
     dialogClick() {
-      batchReject({ ids: this.idStr, remark: this.radio })
+      batchReject({
+        ids:
+          this.centerDialogVisibleType == 1
+            ? this.idStr
+            : this.centerDialogVisibleID,
+        remark: this.radio,
+      })
         .then((res) => {
           if (res.code == 200) {
             ElMessage({
@@ -336,6 +445,7 @@ export default {
               message: "操作成功!",
             });
             this.getData();
+            this.centerDialogVisible = false;
             this.idStr = null;
           } else {
             ElMessage({
@@ -358,7 +468,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          agencyWithdrawSet({ id: row.id }).then((res) => {
+          agencyWithdrawSet({ ids: row.id }).then((res) => {
             if (res.success === true) {
               ElMessage({
                 type: "success",