diff --git a/app.json b/app.json index 1608c75..e78de5e 100644 --- a/app.json +++ b/app.json @@ -60,12 +60,6 @@ "selectedColor": "#FC7E09", "backgroundColor": "#ffffff", "list": [ - { - "pagePath": "pages/projectModule/projectList/projectList", - "text": "接单", - "iconPath": "/static/jd1.png", - "selectedIconPath": "/static/jd2.png" - }, { "pagePath": "pages/course/homepage/homepage", "text": "课程", diff --git a/pages/course/courseOrderList/courseOrderList.js b/pages/course/courseOrderList/courseOrderList.js index b9efdab..f74f63b 100644 --- a/pages/course/courseOrderList/courseOrderList.js +++ b/pages/course/courseOrderList/courseOrderList.js @@ -117,7 +117,9 @@ Page({ }, // 取消订单 - cancelOrder() { + cancelOrder(e) { + // console.log(e); + const id = e.currentTarget.dataset.id; wx.showModal({ title: '取消订单', content: '是否要取消订单？', @@ -126,9 +128,9 @@ Page({ wx.request({ url: baseUrl + "/courseOrder/cancel", method: 'POST', - data: { courseId: this.data.orderId }, + data: { courseId: id }, header: { Authorization: wx.getStorageSync('token') }, - success: () => this.getOrderDetail() + success: () => this.fetchOrders() }); } } diff --git a/pages/course/courseOrderList/courseOrderList.wxml b/pages/course/courseOrderList/courseOrderList.wxml index 2e369c5..400b2f1 100644 --- a/pages/course/courseOrderList/courseOrderList.wxml +++ b/pages/course/courseOrderList/courseOrderList.wxml @@ -27,7 +27,7 @@ {{ item.createTime }} - + 取消订单 diff --git a/pages/course/createCourseOrder/createCourseOrder.wxml b/pages/course/createCourseOrder/createCourseOrder.wxml index ab57440..21f1b98 100644 --- a/pages/course/createCourseOrder/createCourseOrder.wxml +++ b/pages/course/createCourseOrder/createCourseOrder.wxml @@ -9,9 +9,9 @@ {{ courseObj.name }} - ￥{{ courseObj.originPrice }} + ￥{{ courseObj.discountPrice }} - ￥{{ courseObj.discountPrice }} + ￥{{ courseObj.originPrice }} diff --git a/pages/course/orderDetail/orderDetail.wxml b/pages/course/orderDetail/orderDetail.wxml index b672e6a..681de0f 100644 --- a/pages/course/orderDetail/orderDetail.wxml +++ b/pages/course/orderDetail/orderDetail.wxml @@ -55,15 +55,15 @@ 课程价格 - ￥{{ orderObj.totalAmount }} + ￥{{ orderObj.originPrice }} 价格折扣 - -￥{{ orderObj.totalAmount - orderObj.originPrice }} + -￥{{ orderObj.originPrice - orderObj.totalAmount }} 订单金额 - ￥{{ orderObj.originPrice }} + ￥{{ orderObj.totalAmount }} diff --git a/pages/course/searchCourses/searchCourses.wxml b/pages/course/searchCourses/searchCourses.wxml index 1623166..d61a63f 100644 --- a/pages/course/searchCourses/searchCourses.wxml +++ b/pages/course/searchCourses/searchCourses.wxml @@ -3,7 +3,7 @@ diff --git a/pages/dashboardModule/performanceRanking/performanceRanking.js b/pages/dashboardModule/performanceRanking/performanceRanking.js index fb5def1..9b34e57 100644 --- a/pages/dashboardModule/performanceRanking/performanceRanking.js +++ b/pages/dashboardModule/performanceRanking/performanceRanking.js @@ -58,22 +58,35 @@ Page({ // 搜索按钮点击 onSearch() { const { role } = this.data; - // 校验：确保主管名称、手机号和排序条件不能为空 - if (!this.data.nickName || !this.data.phoneNumber) { - wx.showToast({ - title: '主管名称和手机号不能为空', - icon: 'none' - }); - return; - } + // —— 新增：校验主管名称 —— +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.selectedSortField === '待选择') { - 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.selectedSortField === '待选择') { + wx.showToast({ + title: '排序条件不能为空', + icon: 'none' + }); + return; +} // 显示加载中 wx.showLoading({ diff --git a/pages/dashboardModule/staffPerformance/staffPerformance.js b/pages/dashboardModule/staffPerformance/staffPerformance.js index d534b16..9b157c6 100644 --- a/pages/dashboardModule/staffPerformance/staffPerformance.js +++ b/pages/dashboardModule/staffPerformance/staffPerformance.js @@ -20,7 +20,7 @@ Page({ onSearch() { const nickName = this.data.nickName.trim(); const phoneNumber = this.data.phoneNumber.trim(); - const supervisorUserId = this.data; + const { supervisorUserId } = this.data; if (!nickName) { wx.showToast({ title: '请输入主管名称', icon: 'none' }); @@ -37,7 +37,11 @@ Page({ header: { Authorization: wx.getStorageSync('token') }, - data: { nickName, phoneNumber, supervisorUserId}, + data: { + nickName: nickName, + phoneNumber: phoneNumber, + supervisorUserId: supervisorUserId, + }, success: (res) => { console.log('--->后端返回记录',res.data); if (res.data.code === 1) { @@ -105,7 +109,7 @@ Page({ onLoad(options) { console.log('--->',options); this.setData({ - supervisorUserId: options.supId, + supervisorUserId: options.id, }) this.onSearchSupId(); }, diff --git a/pages/dashboardModule/supervisorPerformance/supervisorPerformance.js b/pages/dashboardModule/supervisorPerformance/supervisorPerformance.js index 5d37cd1..d3dac83 100644 --- a/pages/dashboardModule/supervisorPerformance/supervisorPerformance.js +++ b/pages/dashboardModule/supervisorPerformance/supervisorPerformance.js @@ -8,6 +8,7 @@ Page({ showList: false, // 是否显示绩效列表 performanceList: [], // 绩效列表数据，含 ratePercent 字段 userRole: '', // 用户角色 + id: 0, }, onNameInput(e) { @@ -20,6 +21,7 @@ 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' }); @@ -36,7 +38,10 @@ Page({ header: { Authorization: wx.getStorageSync('token') }, - data: { nickName, phoneNumber }, + data: { + nickName: nickName, + phoneNumber: phoneNumber, + }, success: (res) => { console.log('--->后端返回记录',res.data); if (res.data.code === 1) { @@ -71,7 +76,8 @@ Page({ onLoad(options) { console.log('--->',options); this.setData({ - userRole: options.role + userRole: options.role, + id: options.id, }) let showRole = ''; switch (options.role) { diff --git a/pages/loginModule/employeeApplyQuery/employeeApplyQuery.wxml b/pages/loginModule/employeeApplyQuery/employeeApplyQuery.wxml index 7c52ab5..fb32ee0 100644 --- a/pages/loginModule/employeeApplyQuery/employeeApplyQuery.wxml +++ b/pages/loginModule/employeeApplyQuery/employeeApplyQuery.wxml @@ -8,7 +8,7 @@ - + 审核失败 diff --git a/pages/loginModule/forgetPwd/forgetPwd.js b/pages/loginModule/forgetPwd/forgetPwd.js index 35e9427..bf972fc 100644 --- a/pages/loginModule/forgetPwd/forgetPwd.js +++ b/pages/loginModule/forgetPwd/forgetPwd.js @@ -10,7 +10,15 @@ Page({ confirmPwd: '', countdown: 0, codeButtonText: '发送验证码', - _timer: null + _timer: null, + role: '', + }, + + onLoad(options) { + console.log(options); + this.setData({ + role: options.role + }) }, // 手机号输入 @@ -92,7 +100,7 @@ Page({ // 重置密码 resetPassword() { - const { phone, code, newPwd, confirmPwd } = this.data; + const { phone, code, newPwd, confirmPwd, role } = this.data; // 1. 非空校验 if (!validate(this.data, { phone: '请输入手机号', @@ -117,7 +125,8 @@ Page({ verificationCode: code, userPassword: newPwd, userConfirmPassword: confirmPwd, - sourceToken: null + sourceToken: null, + role: role }, success: res => { if (res.data.code === 1) { diff --git a/pages/loginModule/pwdLogin/pwdLogin.js b/pages/loginModule/pwdLogin/pwdLogin.js index 7e9daec..e1945ec 100644 --- a/pages/loginModule/pwdLogin/pwdLogin.js +++ b/pages/loginModule/pwdLogin/pwdLogin.js @@ -183,7 +183,7 @@ Page({ setTimeout(() => { wx.reLaunch({ - url: '/pages/projectModule/projectList/projectList', + url: '/pages/course/homepage/homepage', }) }, 1000); // 1000ms = 1秒 } else { @@ -201,8 +201,10 @@ Page({ // 跳转忘记密码 gotoForgetPwd() { + + const { role } = this.data; wx.navigateTo({ - url: '/pages/loginModule/forgetPwd/forgetPwd', + url: `/pages/loginModule/forgetPwd/forgetPwd?role=${role}`, }) }, diff --git a/pages/personCenter/mine/mine.js b/pages/personCenter/mine/mine.js index 3ff8b25..b1c5b26 100644 --- a/pages/personCenter/mine/mine.js +++ b/pages/personCenter/mine/mine.js @@ -17,6 +17,7 @@ Page({ showPopup: false, // 控制弹窗显示与否 qrcode: "https://img.picui.cn/free/2025/05/29/6837c53582068.gif", // 设置二维码图片的路径 userRole: "", + id: 0, }, // 跳转课程订单页面 @@ -143,6 +144,7 @@ Page({ userAccount: res.data.data.userAccount, invitationCode: res.data.data.invitationCode, userRole: res.data.data.userRole, + id: res.data.data.id, }) } } @@ -185,15 +187,16 @@ Page({ // 跳转查看绩效 checkPerformance() { - const { userRole } = this.data + const { userRole } = this.data; + const { id } = this.data; - if (userRole === 'manager' || userRole === 'supervisor') { + if (userRole === 'manager') { wx.navigateTo({ - url: `/pages/dashboardModule/supervisorPerformance/supervisorPerformance?role=${userRole}`, + url: `/pages/dashboardModule/supervisorPerformance/supervisorPerformance?role=${userRole}&id=${id}`, }) } else { wx.navigateTo({ - url: `/pages/dashboardModule/staffPerformance/staffPerformance?role=${userRole}`, + url: `/pages/dashboardModule/staffPerformance/staffPerformance?role=${userRole}&id=${id}`, }) } }, diff --git a/pages/personCenter/mine/mine.wxml b/pages/personCenter/mine/mine.wxml index 01e4baa..fe66a86 100644 --- a/pages/personCenter/mine/mine.wxml +++ b/pages/personCenter/mine/mine.wxml @@ -247,7 +247,7 @@ - +