From e0fb7fa514741d4c886f6ceb20c40ca3d2e3017c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Mon, 4 Mar 2024 15:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BB=91=E5=AE=9A=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=AE=9D=20=20=E5=88=87=E6=8D=A2=E6=88=90=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 src/views/login/login.vue                     |  4 +-
 .../total_earnings/total_earnings_list.vue    | 49 +++++++++++++------
 src/views/withdraw/withdraw_list.vue          |  5 +-
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index f0dab38..63af35d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vue-admin",
 	"private": true,
-	"version": "1.3.23",
+	"version": "1.3.25",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 47c735f..cfe8a27 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -68,8 +68,8 @@ function getCode(code) {
 }
 
 const form = reactive({
-  loginName: "15619297569",
-  password: "123456",
+  loginName: "",
+  password: "",
   userType: 'MG',
   code: "",
 });
diff --git a/src/views/total_earnings/total_earnings_list.vue b/src/views/total_earnings/total_earnings_list.vue
index 29e16f1..91ea61d 100644
--- a/src/views/total_earnings/total_earnings_list.vue
+++ b/src/views/total_earnings/total_earnings_list.vue
@@ -8,7 +8,8 @@
                 <div class="info">
                     <div class="title">总收益</div>
                     <div class="num">
-                        <count-to :start-val="0" :end-val="earnings.sumProfit" :duration="1000" :decimals="2" prefix="￥" />
+                        <count-to :start-val="0" :end-val="earnings.sumProfit" :duration="1000" :decimals="2"
+                            prefix="￥" />
                     </div>
                 </div>
             </div>
@@ -35,7 +36,7 @@
                     <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>
+                                @click="showWithdzfb = true">绑定账号</el-button>
                         </div>
                     </div>
                 </div>
@@ -47,7 +48,8 @@
                 <div class="info">
                     <div class="title">提现中收益</div>
                     <div class="num">
-                        <count-to :start-val="0" :end-val="earnings.fronZenAmt" :duration="1000" :decimals="2" prefix="￥" />
+                        <count-to :start-val="0" :end-val="earnings.fronZenAmt" :duration="1000" :decimals="2"
+                            prefix="￥" />
                     </div>
                 </div>
             </div>
@@ -73,6 +75,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="createDt" label="时间">
+
                         <template #default="scope">
                             {{ scope.row.create_time }}
                         </template>
@@ -87,21 +90,27 @@
                 @size-change="paginationChange" @current-change="paginationChange" />
         </div>
     </div>
-    <el-dialog v-model="showWithdzfb" title="绑定支付宝" width="600" @closed="formRefzfb.resetFields()">
+    <el-dialog v-model="showWithdzfb" title="绑定账号" width="600" @closed="formRefzfb.resetFields()">
         <el-space>
             <el-form ref="formRefzfb" :model="formzfb">
-                <el-form-item label="支付宝账号" prop="alipay_username">
+                <el-form-item label="账号名" prop="alipay_fullname">
                     <el-space>
-                        <el-input v-model="formzfb.alipay_username" placeholder="请输入支付宝账号" style="width: 450px;" />
+                        <el-input v-model="formzfb.alipay_fullname" placeholder="请输入姓名" style="width: 450px;" />
                     </el-space>
                 </el-form-item>
-                <el-form-item label="支付宝姓名" prop="alipay_fullname">
+                <el-form-item label="账号" prop="alipay_username">
                     <el-space>
-                        <el-input v-model="formzfb.alipay_fullname" placeholder="请输入支付宝姓名" style="width: 450px;" />
+                        <el-input v-model="formzfb.alipay_username" placeholder="请输入账号" style="width: 450px;" />
+                    </el-space>
+                </el-form-item>
+                <el-form-item label="备注" >
+                    <el-space>
+                        <el-input v-model="formzfb.notes" placeholder="支付宝/对公账号/银行卡" style="width: 450px;" />
                     </el-space>
                 </el-form-item>
             </el-form>
         </el-space>
+
         <template #footer>
             <span class="dialog-footer">
                 <el-button @click="showWithdzfb = false">取消</el-button>
@@ -116,13 +125,15 @@
                     <el-space>
                         <el-input placeholder="请输入提现金额" clearable style="width: 300px;" :model-value="form.num"
                             @input="numInput" />
-                        <el-button type="primary" @click="form.num = ((earnings.availableBalance / 100) * 100).toFixed(2)">
+                        <el-button type="primary"
+                            @click="form.num = ((earnings.availableBalance / 100) * 100).toFixed(2)">
                             全部提现(￥{{ ((earnings.availableBalance / 100) * 100).toFixed(2) }})
                         </el-button>
                     </el-space>
                 </el-form-item>
             </el-form>
         </el-space>
+
         <template #footer>
             <span class="dialog-footer">
                 <el-button @click="showWithdraw = false">取消</el-button>
@@ -144,33 +155,40 @@
             <el-table :data="records.list" size="large" border height="100%" v-loading="records.loading">
                 <el-table-column prop="user_id" label="代理id"></el-table-column>
                 <el-table-column prop="username" label="代理账户" v-if="userInfo == 1">
+
                     <template #default="scope">
                         <el-text type="primary">{{ scope.row.user.username }}</el-text>
                     </template>
                 </el-table-column>
                 <el-table-column prop="nick_name" label="代理昵称" v-if="userInfo == 1">
+
                     <template #default="scope">
                         <el-text type="primary">{{ scope.row.user.nick_name }}</el-text>
                     </template>
                 </el-table-column>
                 <el-table-column prop="phone" label="代理手机号" v-if="userInfo == 1">
+
                     <template #default="scope">
                         <el-text type="primary">{{ scope.row.user.phone }}</el-text>
                     </template>
                 </el-table-column>
-                <el-table-column prop="alipay_username" label="支付宝账户"></el-table-column>
-                <el-table-column prop="alipay_fullname" label="支付宝姓名"></el-table-column>
+                <el-table-column prop="alipay_username" label="账户"></el-table-column>
+                <el-table-column prop="alipay_fullname" label="账号名"></el-table-column>
+                <el-table-column prop="alipay_notes" label="备注"></el-table-column>
                 <el-table-column prop="amount" label="提现金额">
+
                     <template #default="scope">
                         <el-text type="primary">{{ scope.row.amount }}元</el-text>
                     </template>
                 </el-table-column>
                 <el-table-column prop="create_time" label="提现时间" width="250">
+
                     <template #default="scope">
                         <el-text>{{ scope.row.create_time }}</el-text>
                     </template>
                 </el-table-column>
                 <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>
@@ -179,6 +197,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="转账状态">
+
                     <template #default="scope">
                         <el-tag type="success" disable-transitions
                             v-if="scope.row.status == 1 && scope.row.transfer_status == 3">转账成功</el-tag>
@@ -207,9 +226,9 @@
         </div>
         <div class="mt15">
             <el-pagination layout="prev, pager, next, total, sizes, jumper" background
-                v-model:current-page="records.pageNum" v-model:page-size="records.pageSize" :page-size="records.pageSize"
-                :page-sizes="[10, 20, 30, 50]" :total="records.total" @size-change="recordsPaginationChange"
-                @current-change="recordsPaginationChange" />
+                v-model:current-page="records.pageNum" v-model:page-size="records.pageSize"
+                :page-size="records.pageSize" :page-sizes="[10, 20, 30, 50]" :total="records.total"
+                @size-change="recordsPaginationChange" @current-change="recordsPaginationChange" />
         </div>
         <el-dialog v-model="records.showProgress" title="审核进度">
             <el-steps :active="rowProgressActive" align-center>
@@ -266,6 +285,7 @@ const form = reactive({
 const formzfb = reactive({
     alipay_username: '',
     alipay_fullname: '',
+    notes:'',
     loading: false
 })
 const rules = reactive({
@@ -296,6 +316,7 @@ async function submitHandlezfb() {
                 await agentalipay({
                     alipay_username: formzfb.alipay_username,
                     alipay_fullname: formzfb.alipay_fullname,
+                    notes:formzfb.notes,
                 })
                 formzfb.loading = false
                 showWithdzfb.value = false
diff --git a/src/views/withdraw/withdraw_list.vue b/src/views/withdraw/withdraw_list.vue
index b804e53..95ef434 100644
--- a/src/views/withdraw/withdraw_list.vue
+++ b/src/views/withdraw/withdraw_list.vue
@@ -30,8 +30,9 @@
                         <el-text type="primary">{{ scope.row.user.phone }}</el-text>
                     </template>
                 </el-table-column>
-                <el-table-column prop="alipay_username" label="支付宝账户"></el-table-column>
-                <el-table-column prop="alipay_fullname" label="支付宝姓名"></el-table-column>
+                <el-table-column prop="alipay_username" label="账户名"></el-table-column>
+                <el-table-column prop="alipay_fullname" label="账号"></el-table-column>
+                <el-table-column prop="alipay_notes" label="备注"></el-table-column>
 
                 <!-- <el-table-column prop="merchantCode" label="商户号"></el-table-column> -->
                 <!-- <el-table-column prop="userName" label="商户名称"></el-table-column>