From fcc9e21a7b65f70ada57fa3453651c4daeb5a39b Mon Sep 17 00:00:00 2001 From: yuanteng0011 <1876787513@qq.com> Date: Thu, 29 May 2025 09:02:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 2 +- .../accountSetting/accountSetting.js | 57 +++++++++++++++++- .../accountSetting/accountSetting.wxml | 6 +- pages/personCenter/mine/mine.js | 59 +++++++++++++++++++ pages/personCenter/mine/mine.wxml | 14 ++--- .../projectModule/projectList/projectList.js | 5 ++ project.private.config.json | 2 +- 7 files changed, 132 insertions(+), 13 deletions(-) diff --git a/app.json b/app.json index 0242c81..129ea8a 100644 --- a/app.json +++ b/app.json @@ -1,8 +1,8 @@ { "pages": [ + "pages/loginModule/pwdLogin/pwdLogin", "pages/personCenter/mine/mine", "pages/personCenter/subCommissionSetting/subCommissionSetting", - "pages/loginModule/pwdLogin/pwdLogin", "pages/test/testVideo/testVideo", "pages/personCenter/withdrawal/withdrawal", "pages/personCenter/withdrawalAccount/withdrawalAccount", diff --git a/pages/personCenter/accountSetting/accountSetting.js b/pages/personCenter/accountSetting/accountSetting.js index b64f51e..bde9c36 100644 --- a/pages/personCenter/accountSetting/accountSetting.js +++ b/pages/personCenter/accountSetting/accountSetting.js @@ -1,18 +1,73 @@ // pages/personCenter/accountSetting/accountSetting.js +const { baseUrl } = require("../../../request"); + Page({ /** * 页面的初始数据 */ data: { - + nickName: "", + userAvatar: "", + phoneNumber: "" }, + logOut() { + wx.request({ + url: baseUrl + '/userInfo/mini/logout', + method: 'GET', + header: { + Authorization: wx.getStorageSync('token') + }, + success: res => { + if (res.data.code === 1) { + wx.showToast({ + title: '退出登录', + icon: 'success' + }) + wx.reLaunch({ + url: '/pages/loginModule/pwdLogin/pwdLogin', + }) + } else { + wx.showToast({ + title: res.data.message, + icon: 'error' + }) + } + }, + fail: () => { + wx.showToast({ title: '网络错误，请重试', icon: 'none' }); + } + }) + }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + const token = wx.getStorageSync('token'); + // 获取用户信息 + 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 + }) + } + }, + fail: () => { + wx.showToast({ title: '网络错误，请重试', icon: 'none' }); + } + }) }, /** diff --git a/pages/personCenter/accountSetting/accountSetting.wxml b/pages/personCenter/accountSetting/accountSetting.wxml index e899f62..921ec45 100644 --- a/pages/personCenter/accountSetting/accountSetting.wxml +++ b/pages/personCenter/accountSetting/accountSetting.wxml @@ -6,8 +6,8 @@ src="./images/logo.png" /> - user - 15888610253 + {{ nickName }} + {{ phoneNumber }} 平台服务 @@ -45,5 +45,5 @@ - 退出登录 + 退出登录 \ No newline at end of file diff --git a/pages/personCenter/mine/mine.js b/pages/personCenter/mine/mine.js index 6a30c18..201afc8 100644 --- a/pages/personCenter/mine/mine.js +++ b/pages/personCenter/mine/mine.js @@ -1,4 +1,6 @@ // pages/personCenter/mine/mine.js +const { baseUrl } = require("../../../request"); + Page({ /** @@ -6,6 +8,15 @@ Page({ */ data: { items: [null], + nickName: "", + userAvatar: "", + phoneNumber: "", + userAccount: "", + invitationCode: "", + currentBalance: "", // 当前余额 + withdrawalAmount: "", // 提现中的余额 + withdrawnAmount: "", // 已提现的余额 + totalIncome:"" // 累计收入 }, myteam(){ wx.navigateTo({ @@ -61,7 +72,55 @@ Page({ * 生命周期函数--监听页面加载 */ 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) { + this.setData({ + currentBalance: res.data.data.currentBalance, // 当前余额 + withdrawalAmount: res.data.data.withdrawalAmount, // 提现中的余额 + withdrawnAmount: res.data.data.withdrawnAmount, // 已提现的余额 + totalIncome: res.data.data.totalIncome // 累计收入 + }) + } 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 + }) + } + } + }) }, /** diff --git a/pages/personCenter/mine/mine.wxml b/pages/personCenter/mine/mine.wxml index 1a38341..a83989e 100644 --- a/pages/personCenter/mine/mine.wxml +++ b/pages/personCenter/mine/mine.wxml @@ -2,14 +2,14 @@ - qingcheng + {{ nickName }} - 15214547473 + {{ phoneNumber }} - 邀请码：123445 + 邀请码：{{ invitationCode }} @@ -33,7 +33,7 @@ 当前金额： - ￥5.00 + ￥{{ currentBalance }} 提现中 - ￥0.00 + ￥{{ withdrawalAmount }} 已提现 - ￥0.00 + ￥{{ withdrawnAmount }} 累计收入 - ￥0.00 + ￥{{ totalIncome }} diff --git a/pages/projectModule/projectList/projectList.js b/pages/projectModule/projectList/projectList.js index 2715d2f..a3bcdc6 100644 --- a/pages/projectModule/projectList/projectList.js +++ b/pages/projectModule/projectList/projectList.js @@ -31,9 +31,14 @@ Page({ Authorization: token // 带上授权头 }, success: res => { + console.log(res.data); if (res.data.code === 1) { // 渲染项目数据 this.setData({ items: res.data.data }); + } else if(res.data.code === 40101) { + wx.reLaunch({ + url: '/pages/loginModule/pwdLogin/pwdLogin', + }) } else { wx.showToast({ title: res.data.message || '获取项目列表失败', diff --git a/project.private.config.json b/project.private.config.json index 22647f6..8255393 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -1,6 +1,6 @@ { "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "projectname": "%E9%9D%92%E6%A9%99", + "projectname": "qingcheng-xiaochengxu", "setting": { "compileHotReLoad": true, "urlCheck": false,