diff --git a/pages/personCenter/billingDetails/billingDetails.wxss b/pages/personCenter/billingDetails/billingDetails.wxss
index b551d64..a2dd22b 100644
--- a/pages/personCenter/billingDetails/billingDetails.wxss
+++ b/pages/personCenter/billingDetails/billingDetails.wxss
@@ -4,11 +4,10 @@
.page {
background-color: #ffffff;
width: 100%;
- overflow: hidden;
height: 100%;
}
.section {
- padding: 88.46rpx 0 878.85rpx;
+ padding: 88.46rpx 0 87.85rpx;
background-image: linear-gradient(180deg, #ffa74f -29.4%, #ffffff1a 115.7%);
}
.section_2 {
diff --git a/pages/personCenter/bindBankCard/bindBankCard.js b/pages/personCenter/bindBankCard/bindBankCard.js
index dfb7383..a34c552 100644
--- a/pages/personCenter/bindBankCard/bindBankCard.js
+++ b/pages/personCenter/bindBankCard/bindBankCard.js
@@ -47,7 +47,9 @@ Page({
title: '更新成功',
icon: 'success',
});
- wx.navigateBack({});
+ setTimeout(() => {
+ wx.navigateBack({});
+ }, 1000)
}
},
fail(err) {
diff --git a/pages/personCenter/bindBankCard/bindBankCard.wxml b/pages/personCenter/bindBankCard/bindBankCard.wxml
index 7297381..aea1319 100644
--- a/pages/personCenter/bindBankCard/bindBankCard.wxml
+++ b/pages/personCenter/bindBankCard/bindBankCard.wxml
@@ -80,8 +80,8 @@
-
- 更新
+
+ 更新
保存
diff --git a/pages/personCenter/bindBankCard/bindBankCard.wxss b/pages/personCenter/bindBankCard/bindBankCard.wxss
index 00f5da0..c7c94da 100644
--- a/pages/personCenter/bindBankCard/bindBankCard.wxss
+++ b/pages/personCenter/bindBankCard/bindBankCard.wxss
@@ -11,7 +11,7 @@
.font_2 {
font-size: 30.53rpx;
font-family: SourceHanSansCN;
- line-height: 28.09rpx;
+ line-height: 30.53rpx;
color: #000000;
}
.text_2 {
@@ -95,12 +95,11 @@
}
.text-wrapper_3 {
margin-top: 57.25rpx;
- padding: 25.84rpx 0 20.5rpx;
+ padding: 26.25rpx 0;
background-color: #ff8d1a;
border-radius: 19.08rpx;
- width: 248.09rpx;
+ width: 243.75rpx;
}
.text_8 {
- line-height: 100%;
color: #ffffff;
}
\ No newline at end of file
diff --git a/pages/personCenter/withdrawal/withdrawal.js b/pages/personCenter/withdrawal/withdrawal.js
index d54b3f7..211332f 100644
--- a/pages/personCenter/withdrawal/withdrawal.js
+++ b/pages/personCenter/withdrawal/withdrawal.js
@@ -6,22 +6,26 @@ Page({
* 页面的初始数据
*/
data: {
- withdrawalAccount: '', // 这里保存提现账户信息
+ currentBalance: 0, // 当前可提现余额
+ withdrawalAccount: '', // 提现账户信息
+ withdrawnAmount: '', // 用户输入的提现金额
},
// 获取当前账户信息
getAccountInfo() {
wx.request({
- url: baseUrl + '/userAccount/queryById', // 替换为你的后端接口
+ url: baseUrl + '/withdrawalApply/query/condition', // 替换为你的后端接口
method: 'POST',
header: {
Authorization: wx.getStorageSync('token'),
},
success: (res) => {
- console.log('当前账户是---->',res.data.data);
+ console.log('当前账户是---->', res.data.data);
if (res.data.code === 1) {
+ let result = res.data.data;
this.setData({
- withdrawalAccount: res.data.data.bankCardNumber,
+ currentBalance: result.currentBalance.toFixed(2),
+ withdrawalAccount: result.bankCardNumber
});
} else {
wx.showToast({
@@ -39,11 +43,95 @@ Page({
});
},
+ // 输入框内容变化时更新数据
+ onInput(e) {
+ this.setData({
+ withdrawnAmount: e.detail.value, // 获取用户输入的金额
+ });
+ },
+
+ // 点击“全部提现”，填充当前可提现余额到输入框
+ onWithdrawAll() {
+ this.setData({
+ withdrawnAmount: this.data.currentBalance, // 将当前余额填入提现金额输入框
+ });
+ },
+
+ // 点击“立即提现”，发送请求
+ onSubmitWithdraw() {
+ const { withdrawnAmount, currentBalance } = this.data;
+
+ // 校验提现金额是否大于当前可提现余额
+ if (!withdrawnAmount) {
+ wx.showToast({
+ title: '请输入提现金额',
+ icon: 'none'
+ });
+ return;
+ }
+
+ // 校验提现金额是否大于当前可提现余额
+ if (parseFloat(withdrawnAmount) > parseFloat(currentBalance)) {
+ wx.showToast({
+ title: '提现金额不可大于余额',
+ icon: 'none'
+ });
+ return;
+ }
+
+ // 校验提现金额是否小于1元
+ if (parseFloat(withdrawnAmount) < 1) {
+ wx.showToast({
+ title: '最低提现金额为1元',
+ icon: 'none'
+ });
+ return;
+ }
+
+ // 发送提现请求
+ wx.request({
+ url: baseUrl + '/withdrawalApply/add', // 后端提现请求路径
+ method: 'POST',
+ header: {
+ Authorization: wx.getStorageSync('token'), // 请求头中加入token
+ },
+ data: {
+ withdrawnAmount: withdrawnAmount // 请求体携带提现金额
+ },
+ success: (res) => {
+ if (res.data.code === 1) {
+ wx.showToast({
+ title: '提现成功，等待后台审核',
+ icon: 'none',
+ });
+
+ // 1秒后跳转到账单详情页面
+ setTimeout(() => {
+ wx.redirectTo({
+ url: '/pages/personCenter/billingDetails/billingDetails',
+ });
+ }, 1000); // 延时1秒跳转
+ } else {
+ wx.showToast({
+ title: '提现失败，请重试',
+ icon: 'none'
+ });
+ }
+ },
+ fail: () => {
+ wx.showToast({
+ title: '请求失败，请稍后再试',
+ icon: 'none'
+ });
+ }
+ });
+ },
+
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- this.getAccountInfo()
+ this.getAccountInfo(); // 加载页面时获取账户信息
},
/**
@@ -89,4 +177,4 @@ Page({
* 用户点击右上角分享
*/
onShareAppMessage() {},
-});
\ No newline at end of file
+});
diff --git a/pages/personCenter/withdrawal/withdrawal.wxml b/pages/personCenter/withdrawal/withdrawal.wxml
index 9326a4b..b0777b2 100644
--- a/pages/personCenter/withdrawal/withdrawal.wxml
+++ b/pages/personCenter/withdrawal/withdrawal.wxml
@@ -22,14 +22,14 @@
class="shrink-0 image_2"
src="./images/money.png"
/>
-
+
- 全部提现
+ 全部提现
- 可提现：13.93元
+ 可提现：{{ currentBalance }}元
-
+
立即提现
-
\ No newline at end of file
+
diff --git a/pages/personCenter/withdrawal/withdrawal.wxss b/pages/personCenter/withdrawal/withdrawal.wxss
index f46d25b..8f626b2 100644
--- a/pages/personCenter/withdrawal/withdrawal.wxss
+++ b/pages/personCenter/withdrawal/withdrawal.wxss
@@ -41,10 +41,11 @@
font-size: 26.72rpx;
font-family: SourceHanSansCN;
line-height: 21.39rpx;
- color: #000000;
+ color: #323232;
}
.text {
- line-height: 20.29rpx;
+ font-size: 32.25rpx;
+ line-height: 32.25rpx;
}
.section_3 {
margin-top: 40.08rpx;
@@ -65,18 +66,19 @@
height: 41.98rpx;
}
.text_3 {
- color: #b0b0b0;
- line-height: 24.92rpx;
+ color: #323232;
+ line-height: 35.25rpx;
+ font-size: 35.25rpx;
}
.text_4 {
color: #ff8d1a;
- font-size: 22.9rpx;
+ font-size: 30.25rpx;
font-family: SourceHanSansCN;
- line-height: 21.39rpx;
+ line-height: 30.25rpx;
}
.text_5 {
- font-size: 24.81rpx;
- line-height: 22.88rpx;
+ font-size: 30.25rpx;
+ line-height: 30.25rpx;
}
.text-wrapper {
margin-top: 64.89rpx;
diff --git a/request.js b/request.js
index 7860d40..5637d26 100644
--- a/request.js
+++ b/request.js
@@ -1,6 +1,6 @@
export const local='http://localhost:9091';
export const ip = 'http://27.30.77.229:9091';
export const test = 'http://27.30.77.229:9092';
-export const baseUrl = ip;
+export const baseUrl = local;
export const globalImgUrl = baseUrl + '/file/download/'
\ No newline at end of file