From b80274bc837ca922ebef20652687faa2366bf49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Fri, 23 Feb 2024 14:48:03 +0800
Subject: [PATCH] 11

---
 package.json                                  |  2 +-
 src/store/configure.js                        |  2 +-
 src/views/organization/shop_list.vue          |  4 +--
 .../total_earnings/total_earnings_list.vue    | 34 +++++++++++++------
 src/views/withdraw/withdraw_list.vue          | 23 +++++++++----
 vite.config.js                                |  1 +
 6 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 864c915..3c52988 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vue-admin",
 	"private": true,
-	"version": "1.3.20",
+	"version": "1.3.21",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
diff --git a/src/store/configure.js b/src/store/configure.js
index 71c85b6..0c28a64 100644
--- a/src/store/configure.js
+++ b/src/store/configure.js
@@ -4,7 +4,7 @@ import { ENUMS } from "@/utils/enums.js";
 export const useConfigure = defineStore("useConfigure", {
   state: () => {
     return {
-      projectName: '银收客机构管理端',
+      projectName: '银收客开放平台代理端',
       defaultActive: "/home", // 默认选中的菜单
       configure: {
         // ---------- 主题 ----------
diff --git a/src/views/organization/shop_list.vue b/src/views/organization/shop_list.vue
index dfcc123..042b15f 100644
--- a/src/views/organization/shop_list.vue
+++ b/src/views/organization/shop_list.vue
@@ -133,14 +133,14 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="inviteNum" label="邀请码"></el-table-column> -->
-                <el-table-column prop="agencyName" label="实名状态">
+                <!-- <el-table-column prop="agencyName" label="实名状态">
                     <template #default="scope">
                         <el-tag type="info" disable-transitions v-if="scope.row.status == 0">未实名</el-tag>
                         <el-tag type="warning" disable-transitions v-if="scope.row.status == 1">审核中</el-tag>
                         <el-tag type="danger" disable-transitions v-if="scope.row.status == 2">审核失败</el-tag>
                         <el-tag type="success" disable-transitions v-if="scope.row.status == 3">已审核</el-tag>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 <!--  <el-table-column prop="sumfansShareMoney" label="累计收款">
                     <template #default="scope">
                         <el-link type="primary" icon="search" @click="showTotalEarnings(scope.row.id)">
diff --git a/src/views/total_earnings/total_earnings_list.vue b/src/views/total_earnings/total_earnings_list.vue
index 83643e7..01bcb4a 100644
--- a/src/views/total_earnings/total_earnings_list.vue
+++ b/src/views/total_earnings/total_earnings_list.vue
@@ -32,7 +32,7 @@
                                 @click="getUserOutFlowHandleResize">提现记录</el-button>
                         </div>
                     </div>
-                    <div class="btn_wrap" v-else>
+                    <div class="btn_wrap" v-if="earnings.is_alipay == '0' && userInfo != 1">
                         <div class="btn">
                             <el-button type="primary" size="small" icon="CreditCard"
                                 @click="showWithdzfb = true">绑定支付宝</el-button>
@@ -91,15 +91,15 @@
     </div>
     <el-dialog v-model="showWithdzfb" title="绑定支付宝" width="600" @closed="formRefzfb.resetFields()">
         <el-space>
-            <el-form ref="formRefzfb" :model="formzfb" >
+            <el-form ref="formRefzfb" :model="formzfb">
                 <el-form-item label="支付宝账号" prop="alipay_username">
                     <el-space>
-                        <el-input  v-model="formzfb.alipay_username" placeholder="请输入支付宝账号"  style="width: 450px;"/>
+                        <el-input v-model="formzfb.alipay_username" placeholder="请输入支付宝账号" style="width: 450px;" />
                     </el-space>
                 </el-form-item>
                 <el-form-item label="支付宝姓名" prop="alipay_fullname">
                     <el-space>
-                        <el-input v-model="formzfb.alipay_fullname" placeholder="请输入支付宝姓名"  style="width: 450px;" />
+                        <el-input v-model="formzfb.alipay_fullname" placeholder="请输入支付宝姓名" style="width: 450px;" />
                     </el-space>
                 </el-form-item>
             </el-form>
@@ -133,15 +133,15 @@
         </template>
     </el-dialog>
     <el-dialog v-model="records.show" title="提现记录">
-        <el-row>
+        <!-- <el-row>
             <el-select v-model="records.status" @change="recordsPaginationChange">
                 <el-option label="全部" value="" key="" />
                 <el-option label="待审核" :value="0" :key="0" />
                 <el-option label="审核通过" :value="1" :key="1" />
                 <el-option label="提现失败" :value="2" :key="2" />
-                <!-- <el-option label="审核中" :value="3" :key="3" /> -->
+                <el-option label="审核中" :value="3" :key="3" />
             </el-select>
-        </el-row>
+        </el-row> -->
         <div class="records_table mt15">
             <el-table :data="records.list" size="large" border height="100%" v-loading="records.loading">
                 <el-table-column prop="id" label="机构id"></el-table-column>
@@ -155,11 +155,23 @@
                         <el-text>{{ scope.row.create_time }}</el-text>
                     </template>
                 </el-table-column>
-                <el-table-column label="状态">
+                <el-table-column label="待审状态">
                     <template #default="scope">
                         <el-tag type="info" disable-transitions v-if="scope.row.status == 0">待审核</el-tag>
-                        <el-tag type="success" disable-transitions v-if="scope.row.status == 1">提现成功</el-tag>
-                        <el-tag type="warning" disable-transitions v-if="scope.row.status == 2">提现失败</el-tag>
+                        <el-tag type="success" disable-transitions v-if="scope.row.status == 1">审核成功</el-tag>
+                        <el-tag type="warning" disable-transitions v-if="scope.row.status == 2">审核失败</el-tag>
+                        <!-- <el-tag type="info" disable-transitions v-if="scope.row.status == 3">审核中</el-tag> -->
+                    </template>
+                </el-table-column>
+                <el-table-column label="转账状态">
+                    <template #default="scope">
+                        <el-tag  type="warning" disable-transitions
+                            v-if="scope.row.status == 1 && scope.row.transfer_status == 3">转账成功</el-tag>
+                            <el-tooltip v-if="scope.row.status == 1 && scope.row.transfer_status == 4 && userInfo == 1"
+                            class="box-item" effect="dark" :content="scope.row.notes" placement="top-start">
+                            <el-tag type="danger" disable-transitions
+                            v-if="scope.row.status == 1 && scope.row.transfer_status == 4 && userInfo == 1">转账失败<el-icon><WarningFilled /></el-icon></el-tag>
+                        </el-tooltip>
                         <!-- <el-tag type="info" disable-transitions v-if="scope.row.status == 3">审核中</el-tag> -->
                     </template>
                 </el-table-column>
@@ -283,7 +295,7 @@ async function submitHandle() {
                 })
                 form.loading = false
                 showWithdraw.value = false
-                getUserBalanceHandle()
+                getTableDate()
             } catch (error) {
                 form.loading = false
             }
diff --git a/src/views/withdraw/withdraw_list.vue b/src/views/withdraw/withdraw_list.vue
index f394e4f..90455c6 100644
--- a/src/views/withdraw/withdraw_list.vue
+++ b/src/views/withdraw/withdraw_list.vue
@@ -35,13 +35,24 @@
                         <el-tag disable-transitions>{{ scope.row.user.nick_name }}</el-tag>
                     </template>
                 </el-table-column> -->
-                <el-table-column label="状态" v-if="userInfo == 1">
+                <el-table-column label="待审状态" v-if="userInfo == 1">
                     <template #default="scope">
-                        <el-tag type="info" v-if="scope.row.status == 0">待审核</el-tag>
-                        <el-tag type="success" v-if="scope.row.status == 1">通过</el-tag>
-                        <el-tag type="warning" v-if="scope.row.status == 2">拒绝</el-tag>
-
-                        <!-- <el-tag type="info" v-if="scope.row.status == 3">审核中</el-tag> -->
+                        <el-tag type="info" disable-transitions v-if="scope.row.status == 0">待审核</el-tag>
+                        <el-tag type="success" disable-transitions v-if="scope.row.status == 1">审核成功</el-tag>
+                        <el-tag type="warning" disable-transitions v-if="scope.row.status == 2">审核失败</el-tag>
+                        <!-- <el-tag type="info" disable-transitions v-if="scope.row.status == 3">审核中</el-tag> -->
+                    </template>
+                </el-table-column>
+                <el-table-column label="转账状态" v-if="userInfo == 1">
+                    <template #default="scope">
+                        <el-tag type="success" disable-transitions
+                            v-if="scope.row.status == 1 && scope.row.transfer_status == 3">转账成功</el-tag>
+                        <el-tooltip v-if="scope.row.status == 1 && scope.row.transfer_status == 4 && userInfo == 1"
+                            class="box-item" effect="dark" :content="scope.row.notes" placement="top-start">
+                            <el-tag type="danger" disable-transitions
+                            v-if="scope.row.status == 1 && scope.row.transfer_status == 4 && userInfo == 1">转账失败<el-icon><WarningFilled /></el-icon></el-tag>
+                        </el-tooltip>
+                        <!-- <el-tag type="info" disable-transitions v-if="scope.row.status == 3">审核中</el-tag> -->
                     </template>
                 </el-table-column>
                 <!-- <el-table-column prop="cashStatus" label="上级审核信息">
diff --git a/vite.config.js b/vite.config.js
index 00213a0..78cbcab 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -6,6 +6,7 @@ import AutoImport from "unplugin-auto-import/vite";
 export default defineConfig({
   server: {
     host: '0.0.0.0',
+    port: 1111,
     open: true,
     proxy: {
       '/api': {