From f871831cbce6767cef53b2280b1681ac012aae5e Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Sat, 9 Aug 2025 01:21:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=A6=85=E9=81=93?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E7=B3=BB=E5=88=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/course/courseDetail/courseDetail.wxss | 3 ++- .../courseOrderList/courseOrderList.wxml | 2 +- .../courseOrderList/courseOrderList.wxss | 4 +++- pages/course/homepage/homepage.wxss | 4 ++-- pages/course/searchCourses/searchCourses.wxss | 8 +++++-- .../performanceRanking/performanceRanking.js | 2 ++ .../performanceRanking.wxml | 7 +++--- .../performanceRanking.wxss | 14 ++++++------ .../staffPerformance/staffPerformance.wxml | 1 + .../staffPerformance/staffPerformance.wxss | 7 +++--- .../supervisorPerformance.wxml | 1 + .../supervisorPerformance.wxss | 7 +++--- .../userOrderPerformance.wxml | 17 +++++++------- .../userOrderPerformance.wxss | 22 ++++++++++--------- pages/personCenter/mine/mine.js | 4 ++-- pages/welcome/homePage/homePage.js | 2 +- 16 files changed, 60 insertions(+), 45 deletions(-) diff --git a/pages/course/courseDetail/courseDetail.wxss b/pages/course/courseDetail/courseDetail.wxss index 5de41bd..ed3df8d 100644 --- a/pages/course/courseDetail/courseDetail.wxss +++ b/pages/course/courseDetail/courseDetail.wxss @@ -90,7 +90,8 @@ font-size: 28.13rpx; } .section_3 { - height: 791.25rpx; + height: auto; + padding-bottom: 40rpx; /* 以下是新增 */ white-space: normal; /* 允许换行 */ word-break: break-all; /* 在任意字符处断行，数字也会换行 */ diff --git a/pages/course/courseOrderList/courseOrderList.wxml b/pages/course/courseOrderList/courseOrderList.wxml index d68927b..d4fcef0 100644 --- a/pages/course/courseOrderList/courseOrderList.wxml +++ b/pages/course/courseOrderList/courseOrderList.wxml @@ -12,7 +12,7 @@ > 订单号：{{item.orderNumber}} - {{ item.orderStatus }} + {{ item.orderStatus }} {{ item.name }} diff --git a/pages/course/courseOrderList/courseOrderList.wxss b/pages/course/courseOrderList/courseOrderList.wxss index 650ad25..70512b8 100644 --- a/pages/course/courseOrderList/courseOrderList.wxss +++ b/pages/course/courseOrderList/courseOrderList.wxss @@ -39,8 +39,10 @@ margin-top: 0; } .group { - padding: 32.51rpx 0 25.82rpx; + padding: 32.51rpx 15rpx 25.82rpx 0; border-bottom: solid 1.88rpx #e3e3e3; + display: flex; + justify-content: space-between; } .font { font-size: 26.25rpx; diff --git a/pages/course/homepage/homepage.wxss b/pages/course/homepage/homepage.wxss index b3ac159..8d526db 100644 --- a/pages/course/homepage/homepage.wxss +++ b/pages/course/homepage/homepage.wxss @@ -17,7 +17,7 @@ padding-right: 28.13rpx; } .section { - padding: 11.25rpx 0; + padding: 15.25rpx 0; background-color: #f2f2f2; border-radius: 93.75rpx; } @@ -27,7 +27,7 @@ } .text { color: #a8a8a8; - font-size: 22.5rpx; + font-size: 26.5rpx; font-family: SourceHanSerifCN; line-height: 20.83rpx; } diff --git a/pages/course/searchCourses/searchCourses.wxss b/pages/course/searchCourses/searchCourses.wxss index 123018e..b17fb7b 100644 --- a/pages/course/searchCourses/searchCourses.wxss +++ b/pages/course/searchCourses/searchCourses.wxss @@ -25,9 +25,13 @@ width: 35.63rpx; height: 35.63rpx; } +input { + height: 50rpx; + width: 95%; +} .text { - color: #a8a8a8; - font-size: 22.5rpx; + color: #333333; + font-size: 26.5rpx; font-family: SourceHanSerifCN; line-height: 20.83rpx; } diff --git a/pages/dashboardModule/performanceRanking/performanceRanking.js b/pages/dashboardModule/performanceRanking/performanceRanking.js index feaee84..2828526 100644 --- a/pages/dashboardModule/performanceRanking/performanceRanking.js +++ b/pages/dashboardModule/performanceRanking/performanceRanking.js @@ -12,6 +12,7 @@ Page({ sortOrders: ['升序', '降序'], items: [], // 用于存储查询结果 role: '', // 假设初始为主管角色，可以根据实际情况动态设置 + k: 1 }, // 主管名称输入 @@ -175,6 +176,7 @@ Page({ onLoad(options) { // 根据身份确定角色 const role = options.role; + this.setData({k: options.k}) if (role === 'staff') this.setData({selectedSortField: '推广人数'}) console.log('角色---->',options.role); this.setData({ role }); diff --git a/pages/dashboardModule/performanceRanking/performanceRanking.wxml b/pages/dashboardModule/performanceRanking/performanceRanking.wxml index 7adaada..101e6a2 100644 --- a/pages/dashboardModule/performanceRanking/performanceRanking.wxml +++ b/pages/dashboardModule/performanceRanking/performanceRanking.wxml @@ -15,7 +15,8 @@ 手机号 - + @@ -71,10 +72,10 @@ - + 员工：{{item.empCount}} - + 推广：{{item.promoCount}} diff --git a/pages/dashboardModule/performanceRanking/performanceRanking.wxss b/pages/dashboardModule/performanceRanking/performanceRanking.wxss index 0c48462..5dd0ae8 100644 --- a/pages/dashboardModule/performanceRanking/performanceRanking.wxss +++ b/pages/dashboardModule/performanceRanking/performanceRanking.wxss @@ -12,9 +12,10 @@ background-color: #fefbf6; box-shadow: 0rpx 3.75rpx 7.5rpx #00000040; width: 100%; - overflow-y: auto; - overflow-x: hidden; - height: 100%; + position: fixed; + bottom: 0; + overflow: auto; + height: calc(100vh - 1rpx); } .text { color: #e67e22; @@ -165,6 +166,7 @@ width: 146.25rpx; height: 56.25rpx; border: solid 1.88rpx #ffa400; + margin-right: 15rpx; } .font_5 { font-size: 26.25rpx; @@ -202,8 +204,7 @@ border: solid 1.88rpx #ffa400; } .text_13 { - margin-left: 16.86rpx; - margin-right: 11.27rpx; + margin: 0 16.86rpx; line-height: 24.23rpx; } .text-wrapper_9 { @@ -214,7 +215,6 @@ border: solid 1.88rpx #ffa400; } .text_14 { - margin-left: 18.86rpx; - margin-right: 9.26rpx; + margin: 0 18.86rpx; line-height: 24.56rpx; } \ No newline at end of file diff --git a/pages/dashboardModule/staffPerformance/staffPerformance.wxml b/pages/dashboardModule/staffPerformance/staffPerformance.wxml index 5098647..cd00b9a 100644 --- a/pages/dashboardModule/staffPerformance/staffPerformance.wxml +++ b/pages/dashboardModule/staffPerformance/staffPerformance.wxml @@ -28,6 +28,7 @@ placeholder="请输入手机号" bindinput="onPhoneInput" value="{{phoneNumber}}" + type="number" maxLength="11" /> diff --git a/pages/dashboardModule/staffPerformance/staffPerformance.wxss b/pages/dashboardModule/staffPerformance/staffPerformance.wxss index 890e5d6..7f90532 100644 --- a/pages/dashboardModule/staffPerformance/staffPerformance.wxss +++ b/pages/dashboardModule/staffPerformance/staffPerformance.wxss @@ -18,9 +18,10 @@ background-color: #fefbf6; box-shadow: 0rpx 3.75rpx 7.5rpx #00000040; width: 100%; - overflow-y: auto; - overflow-x: hidden; - height: 100%; + position: fixed; + bottom: 0; + overflow: auto; + height: calc(100vh - 1rpx); } .text { color: #e67e22; diff --git a/pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxml b/pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxml index 86d6c26..6dbc366 100644 --- a/pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxml +++ b/pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxml @@ -28,6 +28,7 @@ placeholder="请输入手机号" bindinput="onPhoneInput" value="{{phoneNumber}}" + type="number" maxLength="11" /> diff --git a/pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxss b/pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxss index 890e5d6..7f90532 100644 --- a/pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxss +++ b/pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxss @@ -18,9 +18,10 @@ background-color: #fefbf6; box-shadow: 0rpx 3.75rpx 7.5rpx #00000040; width: 100%; - overflow-y: auto; - overflow-x: hidden; - height: 100%; + position: fixed; + bottom: 0; + overflow: auto; + height: calc(100vh - 1rpx); } .text { color: #e67e22; diff --git a/pages/dashboardModule/userOrderPerformance/userOrderPerformance.wxml b/pages/dashboardModule/userOrderPerformance/userOrderPerformance.wxml index ae4acc3..fbddf55 100644 --- a/pages/dashboardModule/userOrderPerformance/userOrderPerformance.wxml +++ b/pages/dashboardModule/userOrderPerformance/userOrderPerformance.wxml @@ -11,6 +11,7 @@ class="text_3 font text_1" placeholder="请输入订单号" value="{{orderNumber}}" + type="number" bindinput="onOrderNumberInput" /> @@ -34,9 +35,9 @@ wx:for-index="index" wx:key="id" > - + 订单号： - {{item.orderNumber}} + {{item.orderNumber}} @@ -54,22 +55,20 @@ ￥{{item.totalAmount}} - + 状态： {{item.orderStatus}} - + 抽成： - - 主管：{{item.firstRate * 100}}%，员工：{{item.secondRate * 100}}% + 主管：{{item.firstRate * 100}}%，员工：{{item.secondRate * 100}}% - + 奖励： - - 主管：¥{{item.firstReward}}，员工：¥{{item.secondReward}} + 主管：¥{{item.firstReward}}，员工：¥{{item.secondReward}} diff --git a/pages/dashboardModule/userOrderPerformance/userOrderPerformance.wxss b/pages/dashboardModule/userOrderPerformance/userOrderPerformance.wxss index 25b2341..c750606 100644 --- a/pages/dashboardModule/userOrderPerformance/userOrderPerformance.wxss +++ b/pages/dashboardModule/userOrderPerformance/userOrderPerformance.wxss @@ -9,9 +9,10 @@ background-color: #fefbf6; box-shadow: 0rpx 3.75rpx 7.5rpx #00000040; width: 100%; - overflow-y: auto; - overflow-x: hidden; - height: 100%; + position: fixed; + bottom: 0; + overflow: auto; + height: calc(100vh - 1rpx); } .text { color: #e67e22; @@ -118,6 +119,7 @@ font-size: 30rpx; font-family: SourceHanSansCN; line-height: 22.76rpx; + margin-right: 15rpx; color: #444444; } .text_9 { @@ -130,45 +132,45 @@ color: #444444; } .text_10 { - margin-right: 19.69rpx; + margin-right: 15rpx; line-height: 27.84rpx; } .text_11 { line-height: 27.81rpx; } .text_12 { - margin-right: 15.06rpx; + margin-right: 15rpx; } .text_13 { line-height: 28.29rpx; } .text_24 { - margin-right: 6.41rpx; + margin-right: 15rpx; } .text_15 { line-height: 28.01rpx; } .text_16 { - margin-right: 18.77rpx; + margin-right: 15rpx; line-height: 28.09rpx; } .text_17 { line-height: 28.16rpx; } .text_18 { - margin-right: 11.44rpx; + margin-right: 15rpx; } .text_19 { line-height: 28.2rpx; } .text_20 { - margin-right: 7.76rpx; + margin-right: 15rpx; } .text_21 { line-height: 28.31rpx; } .text_23 { - margin-right: 19.31rpx; + margin-right: 15rpx; margin-bottom: 2.04rpx; line-height: 27.79rpx; } \ No newline at end of file diff --git a/pages/personCenter/mine/mine.js b/pages/personCenter/mine/mine.js index fbcdc95..50bb043 100644 --- a/pages/personCenter/mine/mine.js +++ b/pages/personCenter/mine/mine.js @@ -276,7 +276,7 @@ Page({ return ; } wx.navigateTo({ - url: `/pages/dashboardModule/performanceRanking/performanceRanking?role=manager`, + url: `/pages/dashboardModule/performanceRanking/performanceRanking?role=manager&k=1`, }) }, @@ -293,7 +293,7 @@ Page({ return ; } wx.navigateTo({ - url: `/pages/dashboardModule/performanceRanking/performanceRanking?role=staff`, + url: `/pages/dashboardModule/performanceRanking/performanceRanking?role=staff&k=0`, }) }, diff --git a/pages/welcome/homePage/homePage.js b/pages/welcome/homePage/homePage.js index 0d2beb1..e24e36d 100644 --- a/pages/welcome/homePage/homePage.js +++ b/pages/welcome/homePage/homePage.js @@ -20,7 +20,7 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad(options) { + onLoad() { let token = wx.getStorageSync('token') if (token) { wx.switchTab({