From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug

---
 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js |   70 +++++++++++++----------------------
 1 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js
index 51f3981..a4effde 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js
@@ -25,42 +25,20 @@
                 return btn;
             }
         },
-        {title: '提现人', field: 'name', visible: true, align: 'center', valign: 'middle',
+        {title: '提现人', field: 'userName', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row) {
                 var btn = "";
-                if(row.name != '' && row.name != null) {
-                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>']
+                if(row.userName != '' && row.userName != null) {
+                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.userName + '" onfocus="TUser.tooltip()">' + row.userName + '</p>']
                 }
                 return btn;
             }
         },
-        {title: '银行卡号', field: 'code', visible: true, align: 'center', valign: 'middle',
+        {title: '提现手机号', field: 'userPhone', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row) {
                 var btn = "";
-                if(row.code != '' && row.code != null) {
-                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.code + '" onfocus="TUser.tooltip()">' + row.code + '</p>']
-                }
-                return btn;
-            }
-        },
-        {title: '开户行', field: 'bankName', visible: true, align: 'center', valign: 'middle',
-            formatter: function (value, row) {
-                var btn = "";
-                if(row.bankName != '' && row.bankName != null) {
-                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.bankName + '" onfocus="TUser.tooltip()">' + row.bankName + '</p>']
-                }
-                return btn;
-            }
-        },
-        {title: '提现方式', field: 'withdrawalType', visible: true, align: 'center', valign: 'middle',
-            formatter: function (value, row) {
-                var btn = "";
-                if(row.withdrawalType != '' && row.withdrawalType != null) {
-                    if (row.withdrawalType == 1){
-                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="银行卡" onfocus="TUser.tooltip()">银行卡</p>']
-                    } else if (row.withdrawalType == 2){
-                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="线下" onfocus="TUser.tooltip()">线下</p>']
-                    }
+                if(row.userPhone != '' && row.userPhone != null) {
+                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.userPhone + '" onfocus="TUser.tooltip()">' + row.userPhone + '</p>']
                 }
                 return btn;
             }
@@ -78,20 +56,7 @@
                 return btn;
             }
         },
-        {title: '提现类型', field: 'type', visible: true, align: 'center', valign: 'middle',
-            formatter: function (value, row) {
-                var btn = "";
-                if(row.type != '' && row.type != null) {
-                    if (row.type == 1){
-                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="活动收入提现" onfocus="TUser.tooltip()">活动收入提现</p>']
-                    } else if (row.type == 2){
-                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="业务收入提现" onfocus="TUser.tooltip()">业务收入提现</p>']
-                    }
-                }
-                return btn;
-            }
-        },
-        {title: '账户余额', field: 'balance', visible: true, align: 'center', valign: 'middle',
+        {title: '提现金额', field: 'money', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row) {
                 var btn = "";
                 if(row.money != '' && row.money != null) {
@@ -102,11 +67,26 @@
                 return btn;
             }
         },
-        {title: '提现金额', field: 'money', visible: true, align: 'center', valign: 'middle',
+        {title: '提现类型', field: 'type', visible: true, align: 'center', valign: 'middle',
+            formatter: function (value, row) {
+                var btn = "";
+                if(row.type != '' && row.type != null) {
+                    if (row.type == 1){
+                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="活动收入提现" onfocus="TUser.tooltip()">活动收入提现</p>']
+                    } else if (row.type == 2){
+                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="业务收入提现" onfocus="TUser.tooltip()">业务收入提现</p>']
+                    }
+                }else{
+                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="钱包余额提现" onfocus="TUser.tooltip()">钱包余额提现</p>']
+                }
+                return btn;
+            }
+        },
+        {title: '账户余额', field: 'balance', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row) {
                 var btn = "";
                 if(row.money != '' && row.money != null) {
-                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.money + '" onfocus="TUser.tooltip()">' + row.money + '</p>']
+                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + (row.balance - row.money).toFixed(2) + '" onfocus="TUser.tooltip()">' + (row.balance - row.money).toFixed(2) + '</p>']
                 }else if (row.withdrawalType == 2){
                     btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="0" onfocus="TUser.tooltip()">0</p>']
                 }
@@ -154,6 +134,8 @@
                         btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="已同意" onfocus="TUser.tooltip()">已同意</p>']
                     }else if (row.state == 3){
                         btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="已拒绝" onfocus="TUser.tooltip()">已拒绝</p>']
+                    }else if (row.state == 4){
+                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="待确认转账" onfocus="TUser.tooltip()">待确认转账</p>']
                     }
                 }
                 return btn;

--
Gitblit v1.7.1