From d1b4fa8ca3846df8ce1997ec3fb65265605588c7 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Thu, 7 Aug 2025 11:45:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=BB=8F=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../performanceRanking/performanceRanking.js | 57 ++++++++++--------- .../staffPerformance/staffPerformance.js | 14 +---- .../staffPerformance/staffPerformance.wxml | 2 +- .../supervisorPerformance.js | 13 +---- .../supervisorPerformance.wxml | 2 +- pages/loginModule/pwdLogin/pwdLogin.js | 2 + pages/loginModule/pwdLogin/pwdLogin.wxml | 2 +- .../accountSetting/accountSetting.js | 1 + pages/personCenter/mine/mine.js | 24 ++++---- pages/personCenter/mine/mine.wxml | 2 +- pages/welcome/homePage/homePage.js | 8 ++- 11 files changed, 61 insertions(+), 66 deletions(-) diff --git a/pages/dashboardModule/performanceRanking/performanceRanking.js b/pages/dashboardModule/performanceRanking/performanceRanking.js index 9b34e57..1983f24 100644 --- a/pages/dashboardModule/performanceRanking/performanceRanking.js +++ b/pages/dashboardModule/performanceRanking/performanceRanking.js @@ -5,7 +5,7 @@ Page({ // 用于存储输入框数据 nickName: '', phoneNumber: '', - selectedSortField: '待选择', // 默认选择"待选择" + selectedSortField: '员工数量', // 默认选择"待选择" selectedSortOrder: '升序', // 默认选择升序 sortFieldsByManager: ['员工数量', '推广人数', '下单数量', '总订单金额', '净成交金额'], sortFieldsBySupervisor: ['推广人数', '下单数量', '总订单金额', '净成交金额'], @@ -57,36 +57,36 @@ Page({ // 搜索按钮点击 onSearch() { - const { role } = this.data; - // —— 新增：校验主管名称 —— -const nameRegex = /^[\u4e00-\u9fa5]+$/; -if (!this.data.nickName) { - wx.showToast({ title: '主管名称不能为空', icon: 'none' }); - return; -} -if (!nameRegex.test(this.data.nickName)) { - wx.showToast({ title: '主管名称只能为汉字', icon: 'none' }); - return; -} + const { role } = this.data; +// // —— 新增：校验主管名称 —— +// const nameRegex = /^[\u4e00-\u9fa5]+$/; +// if (!this.data.nickName) { +// wx.showToast({ title: '主管名称不能为空', icon: 'none' }); +// return; +// } +// if (!nameRegex.test(this.data.nickName)) { +// wx.showToast({ title: '主管名称只能为汉字', icon: 'none' }); +// return; +// } -// —— 新增：校验手机号 —— -if (!this.data.phoneNumber) { - wx.showToast({ title: '手机号不能为空', icon: 'none' }); - return; -} -if (this.data.phoneNumber.length < 11) { - wx.showToast({ title: '手机号不够11位', icon: 'none' }); - return; -} +// // —— 新增：校验手机号 —— +// if (!this.data.phoneNumber) { +// wx.showToast({ title: '手机号不能为空', icon: 'none' }); +// return; +// } +// if (this.data.phoneNumber.length < 11) { +// wx.showToast({ title: '手机号不够11位', icon: 'none' }); +// return; +// } // 原排序条件校验，保持不变 -if (this.data.selectedSortField === '待选择') { - wx.showToast({ - title: '排序条件不能为空', - icon: 'none' - }); - return; -} +// if (this.data.selectedSortField === '待选择') { +// wx.showToast({ +// title: '排序条件不能为空', +// icon: 'none' +// }); +// return; +// } // 显示加载中 wx.showLoading({ @@ -187,5 +187,6 @@ if (this.data.selectedSortField === '待选择') { break; } this.setData({ showRole }); + this.onSearch() } }); \ No newline at end of file diff --git a/pages/dashboardModule/staffPerformance/staffPerformance.js b/pages/dashboardModule/staffPerformance/staffPerformance.js index 9b157c6..6a796cb 100644 --- a/pages/dashboardModule/staffPerformance/staffPerformance.js +++ b/pages/dashboardModule/staffPerformance/staffPerformance.js @@ -22,15 +22,6 @@ Page({ const phoneNumber = this.data.phoneNumber.trim(); const { supervisorUserId } = this.data; - if (!nickName) { - wx.showToast({ title: '请输入主管名称', icon: 'none' }); - return; - } - if (!/^1[3-9]\d{9}$/.test(phoneNumber)) { - wx.showToast({ title: '请输入正确的手机号', icon: 'none' }); - return; - } - wx.request({ url: baseUrl + '/perform/query/staff', method: 'POST', @@ -67,7 +58,7 @@ Page({ onSearchSupId() { const { supervisorUserId } = this.data; - + wx.request({ url: baseUrl + '/perform/query/staff', method: 'POST', @@ -107,9 +98,8 @@ Page({ }, onLoad(options) { - console.log('--->',options); this.setData({ - supervisorUserId: options.id, + supervisorUserId: options.supId, }) this.onSearchSupId(); }, diff --git a/pages/dashboardModule/staffPerformance/staffPerformance.wxml b/pages/dashboardModule/staffPerformance/staffPerformance.wxml index dc6ec86..5098647 100644 --- a/pages/dashboardModule/staffPerformance/staffPerformance.wxml +++ b/pages/dashboardModule/staffPerformance/staffPerformance.wxml @@ -57,7 +57,7 @@ - 编号：{{item.id}} + 编号：{{index + 1}} 员工：{{item.nickName}} diff --git a/pages/dashboardModule/supervisorPerformance/supervisorPerformance.js b/pages/dashboardModule/supervisorPerformance/supervisorPerformance.js index d3dac83..84ebd09 100644 --- a/pages/dashboardModule/supervisorPerformance/supervisorPerformance.js +++ b/pages/dashboardModule/supervisorPerformance/supervisorPerformance.js @@ -21,16 +21,6 @@ Page({ onSearch() { const nickName = this.data.nickName.trim(); const phoneNumber = this.data.phoneNumber.trim(); - const { id } = this.data - - if (!nickName) { - wx.showToast({ title: '请输入主管名称', icon: 'none' }); - return; - } - if (!/^1[3-9]\d{9}$/.test(phoneNumber)) { - wx.showToast({ title: '请输入正确的手机号', icon: 'none' }); - return; - } wx.request({ url: baseUrl + '/perform/query/supervisor', @@ -89,12 +79,13 @@ Page({ break; } this.setData({ showRole }); + this.onSearch() }, changeStaff(e) { const { id } = e.currentTarget.dataset; - + console.log(id) wx.navigateTo({ url: `/pages/dashboardModule/staffPerformance/staffPerformance?supId=${id}`, }) diff --git a/pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxml b/pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxml index 45a9356..86d6c26 100644 --- a/pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxml +++ b/pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxml @@ -57,7 +57,7 @@ - 编号：{{item.id}} + 编号：{{index + 1}} 主管：{{item.nickName}} diff --git a/pages/loginModule/pwdLogin/pwdLogin.js b/pages/loginModule/pwdLogin/pwdLogin.js index e1945ec..68ff0f2 100644 --- a/pages/loginModule/pwdLogin/pwdLogin.js +++ b/pages/loginModule/pwdLogin/pwdLogin.js @@ -21,12 +21,14 @@ Page({ passwordType: true, role: '', // 登录角色 showRole: '', + isShowRegister: true }, onLoad(options) { const role = options.role || '' const showRole = roleMap.get(role) || '' this.setData({ role, showRole }) + if (role === 'manager') this.setData({isShowRegister: false}) }, // 切换到“密码登录”，只清空表单字段 diff --git a/pages/loginModule/pwdLogin/pwdLogin.wxml b/pages/loginModule/pwdLogin/pwdLogin.wxml index 5c95537..12fc1fc 100644 --- a/pages/loginModule/pwdLogin/pwdLogin.wxml +++ b/pages/loginModule/pwdLogin/pwdLogin.wxml @@ -92,7 +92,7 @@ - + 没有账号？ 去注册→ diff --git a/pages/personCenter/accountSetting/accountSetting.js b/pages/personCenter/accountSetting/accountSetting.js index 7d8262f..f090c59 100644 --- a/pages/personCenter/accountSetting/accountSetting.js +++ b/pages/personCenter/accountSetting/accountSetting.js @@ -31,6 +31,7 @@ Page({ title: '退出成功', icon: 'success' }) + wx.removeStorageSync('token') setTimeout(() => { wx.reLaunch({ url: '/pages/welcome/homePage/homePage', diff --git a/pages/personCenter/mine/mine.js b/pages/personCenter/mine/mine.js index b1c5b26..503f4f6 100644 --- a/pages/personCenter/mine/mine.js +++ b/pages/personCenter/mine/mine.js @@ -15,7 +15,8 @@ Page({ userAccount: "", invitationCode: "", showPopup: false, // 控制弹窗显示与否 - qrcode: "https://img.picui.cn/free/2025/05/29/6837c53582068.gif", // 设置二维码图片的路径 + isShowOrder: true, + qrcode: "", // 设置二维码图片的路径 userRole: "", id: 0, }, @@ -111,8 +112,9 @@ Page({ success: res => { if (res.data.code === 1) { let result = res.data.data + console.log('====fdfs>', res) this.setData({ - // qrcode: globalImgUrl + result.inviteQrCode + qrcode: globalImgUrl + result.inviteQrCode }) } else { wx.showToast({ @@ -136,22 +138,24 @@ Page({ success: res => { console.log('用户信息---->',res.data); if (res.data.code === 1) { + let result = res.data.data this.setData({ - nickName: res.data.data.nickName, + nickName: result.nickName, // TODO 头像未连接 - userAvatar: res.data.data.userAvatar, - phoneNumber: res.data.data.phoneNumber, - userAccount: res.data.data.userAccount, - invitationCode: res.data.data.invitationCode, - userRole: res.data.data.userRole, - id: res.data.data.id, + userAvatar: result.userAvatar, + phoneNumber: result.phoneNumber, + userAccount: result.userAccount, + invitationCode: result.invitationCode, + userRole: result.userRole, + id: result.id, }) + if (result.userRole !== 'user') this.setData({ isShowOrder: false }); } } }) }, - onLoad(options) { + onLoad() { this.getUserMainInfo() }, diff --git a/pages/personCenter/mine/mine.wxml b/pages/personCenter/mine/mine.wxml index fe66a86..1b34076 100644 --- a/pages/personCenter/mine/mine.wxml +++ b/pages/personCenter/mine/mine.wxml @@ -271,7 +271,7 @@ - +