From a51f9bdea8ce5089ecf230372420d145c1fbeae1 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Wed, 11 Jun 2025 11:32:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=9F=E8=83=BD=EF=BC=88?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=94=B3=E8=AF=B7=E6=8F=90=E7=8E=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../billingDetails/billingDetails.js | 2 +- .../billingDetails/billingDetails.wxss | 2 +- .../fundingDetails/fundingDetails.wxml | 5 +- .../fundingDetails/fundingDetails.wxss | 4 +- pages/personCenter/mine/mine.js | 108 +++++++++--------- 5 files changed, 63 insertions(+), 58 deletions(-) diff --git a/pages/personCenter/billingDetails/billingDetails.js b/pages/personCenter/billingDetails/billingDetails.js index 37fa07a..2816baf 100644 --- a/pages/personCenter/billingDetails/billingDetails.js +++ b/pages/personCenter/billingDetails/billingDetails.js @@ -8,7 +8,7 @@ Page({ */ data: { withdrawalList: [], - withdrawalStatus: ['审核中', '提现成功', '提现失败'] + withdrawalStatus: ['待审核', '提现成功', '提现失败'] }, getWithdrawalList() { diff --git a/pages/personCenter/billingDetails/billingDetails.wxss b/pages/personCenter/billingDetails/billingDetails.wxss index a2dd22b..ec74279 100644 --- a/pages/personCenter/billingDetails/billingDetails.wxss +++ b/pages/personCenter/billingDetails/billingDetails.wxss @@ -4,7 +4,7 @@ .page { background-color: #ffffff; width: 100%; - height: 100%; + overflow-y: auto; } .section { padding: 88.46rpx 0 87.85rpx; diff --git a/pages/personCenter/fundingDetails/fundingDetails.wxml b/pages/personCenter/fundingDetails/fundingDetails.wxml index c1c0eca..d1a4bf1 100644 --- a/pages/personCenter/fundingDetails/fundingDetails.wxml +++ b/pages/personCenter/fundingDetails/fundingDetails.wxml @@ -42,7 +42,10 @@ {{item.projectName}} - {{item.changeAmount}} + + + {{item.changeAmount >= 0 ? '+' : ''}}{{item.changeAmount}} + {{item.createTime}} diff --git a/pages/personCenter/fundingDetails/fundingDetails.wxss b/pages/personCenter/fundingDetails/fundingDetails.wxss index 4e96ada..7b49f2f 100644 --- a/pages/personCenter/fundingDetails/fundingDetails.wxss +++ b/pages/personCenter/fundingDetails/fundingDetails.wxss @@ -11,11 +11,9 @@ margin-left: 40.38rpx; } .page { - padding: 69.23rpx 38.46rpx 517.31rpx; + padding: 69.23rpx 38.46rpx 69.31rpx; background-image: linear-gradient(180deg, #ffc387 0%, #ffffff00 120.3%); width: 100%; - overflow: hidden; - height: 100%; } .section { margin-left: 11.54rpx; diff --git a/pages/personCenter/mine/mine.js b/pages/personCenter/mine/mine.js index 33611c1..2bb56cf 100644 --- a/pages/personCenter/mine/mine.js +++ b/pages/personCenter/mine/mine.js @@ -85,58 +85,62 @@ Page({ /** * 生命周期函数--监听页面加载 */ + getUserMainInfo() { + const token = wx.getStorageSync('token'); + + // 获取用户主要信息 + wx.request({ + url: baseUrl + '/userInfo/get/main/jwt', + method: 'GET', + header: { + Authorization: token + }, + success: res => { + if (res.data.code === 1) { + let result = res.data.data + this.setData({ + currentBalance: result.currentBalance, // 当前余额 + withdrawalingBalance: result.withdrawalAmount, // 提现中的余额 + withdrawaledAmount: result.withdrawnAmount, // 已提现的余额 + totalIncome: result.totalIncome, // 累计收入 + qrcode: globalImgUrl + result.inviteQrCode + }) + } else { + wx.showToast({ + title: '获取个人信息失败', + icon: 'none' + }) + } + }, + fail: () => { + wx.showToast({ title: '网络错误，请重试', icon: 'none' }); + } + }) + + // 获取用户信息 + wx.request({ + url: baseUrl + '/userInfo/get/jwt', + method: 'GET', + header: { + Authorization: token + }, + success: res => { + if (res.data.code === 1) { + this.setData({ + nickName: res.data.data.nickName, + // TODO 头像未连接 + userAvatar: res.data.data.userAvatar, + phoneNumber: res.data.data.phoneNumber, + userAccount: res.data.data.userAccount, + invitationCode: res.data.data.invitationCode + }) + } + } + }) + }, + onLoad(options) { - const token = wx.getStorageSync('token'); - - // 获取用户主要信息 - wx.request({ - url: baseUrl + '/userInfo/get/main/jwt', - method: 'GET', - header: { - Authorization: token - }, - success: res => { - if (res.data.code === 1) { - let result = res.data.data - this.setData({ - currentBalance: result.currentBalance, // 当前余额 - withdrawalingBalance: result.withdrawalAmount, // 提现中的余额 - withdrawaledAmount: result.withdrawnAmount, // 已提现的余额 - totalIncome: result.totalIncome, // 累计收入 - qrcode: globalImgUrl + result.inviteQrCode - }) - } else { - wx.showToast({ - title: '获取个人信息失败', - icon: 'none' - }) - } - }, - fail: () => { - wx.showToast({ title: '网络错误，请重试', icon: 'none' }); - } - }) - - // 获取用户信息 - wx.request({ - url: baseUrl + '/userInfo/get/jwt', - method: 'GET', - header: { - Authorization: token - }, - success: res => { - if (res.data.code === 1) { - this.setData({ - nickName: res.data.data.nickName, - // TODO 头像未连接 - userAvatar: res.data.data.userAvatar, - phoneNumber: res.data.data.phoneNumber, - userAccount: res.data.data.userAccount, - invitationCode: res.data.data.invitationCode - }) - } - } - }) + this.getUserMainInfo() }, // 复制邀请码到剪贴板 @@ -171,7 +175,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + this.getUserMainInfo() }, /**