admin/qingcheng-xiaochengxu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了禅道的一系列bug

Browse Source
This commit is contained in:
chen-xin-zhi
2025-08-09 01:21:59 +08:00
parent c1817b6255
commit f871831cbc
16 changed files with 60 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pages/course/courseDetail/courseDetail.wxss
View File

@ -90,7 +90,8 @@
font-size: 28.13rpx; font-size: 28.13rpx;
} }
.section_3 { .section_3 {
height: 791.25rpx; height: auto;
padding-bottom: 40rpx;
/* 以下是新增 */ /* 以下是新增 */
white-space: normal; /* 允许换行 */ white-space: normal; /* 允许换行 */
word-break: break-all; /* 在任意字符处断行，数字也会换行 */ word-break: break-all; /* 在任意字符处断行，数字也会换行 */

2
pages/course/courseOrderList/courseOrderList.wxml
View File

@ -12,7 +12,7 @@
> >
<view class="flex-row self-stretch group"> <view class="flex-row self-stretch group">
<text class="font text">订单号：{{item.orderNumber}}</text> <text class="font text">订单号：{{item.orderNumber}}</text>
<text class="font_2 ml-37">{{ item.orderStatus }}</text> <text class="font_2">{{ item.orderStatus }}</text>
</view> </view>
<text class="self-stretch font_3 text_2">{{ item.name }}</text> <text class="self-stretch font_3 text_2">{{ item.name }}</text>

4
pages/course/courseOrderList/courseOrderList.wxss
View File

@ -39,8 +39,10 @@
margin-top: 0; margin-top: 0;
} }
.group { .group {
padding: 32.51rpx 0 25.82rpx; padding: 32.51rpx 15rpx 25.82rpx 0;
border-bottom: solid 1.88rpx #e3e3e3; border-bottom: solid 1.88rpx #e3e3e3;
display: flex;
justify-content: space-between;
} }
.font { .font {
font-size: 26.25rpx; font-size: 26.25rpx;

4
pages/course/homepage/homepage.wxss
View File

@ -17,7 +17,7 @@
padding-right: 28.13rpx; padding-right: 28.13rpx;
} }
.section { .section {
padding: 11.25rpx 0; padding: 15.25rpx 0;
background-color: #f2f2f2; background-color: #f2f2f2;
border-radius: 93.75rpx; border-radius: 93.75rpx;
} }
@ -27,7 +27,7 @@
} }
.text { .text {
color: #a8a8a8; color: #a8a8a8;
font-size: 22.5rpx; font-size: 26.5rpx;
font-family: SourceHanSerifCN; font-family: SourceHanSerifCN;
line-height: 20.83rpx; line-height: 20.83rpx;
} }

8
pages/course/searchCourses/searchCourses.wxss
View File

@ -25,9 +25,13 @@
width: 35.63rpx; width: 35.63rpx;
height: 35.63rpx; height: 35.63rpx;
} }
input {
height: 50rpx;
width: 95%;
}
.text { .text {
color: #a8a8a8; color: #333333;
font-size: 22.5rpx; font-size: 26.5rpx;
font-family: SourceHanSerifCN; font-family: SourceHanSerifCN;
line-height: 20.83rpx; line-height: 20.83rpx;
} }

2
pages/dashboardModule/performanceRanking/performanceRanking.js
View File

@ -12,6 +12,7 @@ Page({
sortOrders: ['升序', '降序'], sortOrders: ['升序', '降序'],
items: [], // 用于存储查询结果 items: [], // 用于存储查询结果
role: '', // 假设初始为主管角色，可以根据实际情况动态设置 role: '', // 假设初始为主管角色，可以根据实际情况动态设置
k: 1
}, },
// 主管名称输入 // 主管名称输入
@ -175,6 +176,7 @@ Page({
onLoad(options) { onLoad(options) {
// 根据身份确定角色 // 根据身份确定角色
const role = options.role; const role = options.role;
this.setData({k: options.k})
if (role === 'staff') this.setData({selectedSortField: '推广人数'}) if (role === 'staff') this.setData({selectedSortField: '推广人数'})
console.log('角色---->',options.role); console.log('角色---->',options.role);
this.setData({ role }); this.setData({ role });

7
pages/dashboardModule/performanceRanking/performanceRanking.wxml
View File

@ -15,7 +15,8 @@
<!-- 手机号 --> <!-- 手机号 -->
<text class="self-start font text_5">手机号</text> <text class="self-start font text_5">手机号</text>
<view class="flex-col justify-start items-start self-start text-wrapper_1"> <view class="flex-col justify-start items-start self-start text-wrapper_1">
<input class="text_3 font text_6" placeholder="请输入手机号" bindinput="onPhoneInput"/> <input class="text_3 font text_6" placeholder="请输入手机号" bindinput="onPhoneInput"
maxLength="11" type="number"/>
</view> </view>
<!-- 排序条件选择 --> <!-- 排序条件选择 -->
@ -71,10 +72,10 @@
<!-- 绩效数据 --> <!-- 绩效数据 -->
<view class="flex-row mt-14"> <view class="flex-row mt-14">
<view class="flex-col justify-start items-center text-wrapper_5" wx:if="{{role === 'supervisor'}}"> <view class="flex-col justify-start items-center text-wrapper_5" wx:if="{{k === '1'}}">
<text class="font_5 text_11">员工：{{item.empCount}}</text> <text class="font_5 text_11">员工：{{item.empCount}}</text>
</view> </view>
<view class="flex-col justify-start items-center text-wrapper_6 ml-8"> <view class="flex-col justify-start items-center text-wrapper_6">
<text class="font_5 text_12">推广：{{item.promoCount}}</text> <text class="font_5 text_12">推广：{{item.promoCount}}</text>
</view> </view>
<view class="flex-col justify-start items-center text-wrapper_7 ml-8"> <view class="flex-col justify-start items-center text-wrapper_7 ml-8">

14
pages/dashboardModule/performanceRanking/performanceRanking.wxss
View File

@ -12,9 +12,10 @@
background-color: #fefbf6; background-color: #fefbf6;
box-shadow: 0rpx 3.75rpx 7.5rpx #00000040; box-shadow: 0rpx 3.75rpx 7.5rpx #00000040;
width: 100%; width: 100%;
overflow-y: auto; position: fixed;
overflow-x: hidden; bottom: 0;
height: 100%; overflow: auto;
height: calc(100vh - 1rpx);
} }
.text { .text {
color: #e67e22; color: #e67e22;
@ -165,6 +166,7 @@
width: 146.25rpx; width: 146.25rpx;
height: 56.25rpx; height: 56.25rpx;
border: solid 1.88rpx #ffa400; border: solid 1.88rpx #ffa400;
margin-right: 15rpx;
} }
.font_5 { .font_5 {
font-size: 26.25rpx; font-size: 26.25rpx;
@ -202,8 +204,7 @@
border: solid 1.88rpx #ffa400; border: solid 1.88rpx #ffa400;
} }
.text_13 { .text_13 {
margin-left: 16.86rpx; margin: 0 16.86rpx;
margin-right: 11.27rpx;
line-height: 24.23rpx; line-height: 24.23rpx;
} }
.text-wrapper_9 { .text-wrapper_9 {
@ -214,7 +215,6 @@
border: solid 1.88rpx #ffa400; border: solid 1.88rpx #ffa400;
} }
.text_14 { .text_14 {
margin-left: 18.86rpx; margin: 0 18.86rpx;
margin-right: 9.26rpx;
line-height: 24.56rpx; line-height: 24.56rpx;
} }

1
pages/dashboardModule/staffPerformance/staffPerformance.wxml
View File

@ -28,6 +28,7 @@
placeholder="请输入手机号" placeholder="请输入手机号"
bindinput="onPhoneInput" bindinput="onPhoneInput"
value="{{phoneNumber}}" value="{{phoneNumber}}"
type="number"
maxLength="11" maxLength="11"
/> />
</view> </view>

7
pages/dashboardModule/staffPerformance/staffPerformance.wxss
View File

@ -18,9 +18,10 @@
background-color: #fefbf6; background-color: #fefbf6;
box-shadow: 0rpx 3.75rpx 7.5rpx #00000040; box-shadow: 0rpx 3.75rpx 7.5rpx #00000040;
width: 100%; width: 100%;
overflow-y: auto; position: fixed;
overflow-x: hidden; bottom: 0;
height: 100%; overflow: auto;
height: calc(100vh - 1rpx);
} }
.text { .text {
color: #e67e22; color: #e67e22;

1
pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxml
View File

@ -28,6 +28,7 @@
placeholder="请输入手机号" placeholder="请输入手机号"
bindinput="onPhoneInput" bindinput="onPhoneInput"
value="{{phoneNumber}}" value="{{phoneNumber}}"
type="number"
maxLength="11" maxLength="11"
/> />
</view> </view>

7
pages/dashboardModule/supervisorPerformance/supervisorPerformance.wxss
View File

@ -18,9 +18,10 @@
background-color: #fefbf6; background-color: #fefbf6;
box-shadow: 0rpx 3.75rpx 7.5rpx #00000040; box-shadow: 0rpx 3.75rpx 7.5rpx #00000040;
width: 100%; width: 100%;
overflow-y: auto; position: fixed;
overflow-x: hidden; bottom: 0;
height: 100%; overflow: auto;
height: calc(100vh - 1rpx);
} }
.text { .text {
color: #e67e22; color: #e67e22;

17
pages/dashboardModule/userOrderPerformance/userOrderPerformance.wxml
View File

@ -11,6 +11,7 @@
class="text_3 font text_1" class="text_3 font text_1"
placeholder="请输入订单号" placeholder="请输入订单号"
value="{{orderNumber}}" value="{{orderNumber}}"
type="number"
bindinput="onOrderNumberInput" bindinput="onOrderNumberInput"
/> />
</view> </view>
@ -34,9 +35,9 @@
wx:for-index="index" wx:for-index="index"
wx:key="id" wx:key="id"
> >
<view class="flex-row items-baseline"> <view class="flex-row items-baseline" style="display: flex; justify-content: space-between;">
<text class="font_2 text_8">订单号：</text> <text class="font_2 text_8">订单号：</text>
<text class="font_3 ml-26">{{item.orderNumber}}</text> <text class="font_3">{{item.orderNumber}}</text>
</view> </view>
<view class="flex-row justify-between mt-19"> <view class="flex-row justify-between mt-19">
@ -54,22 +55,20 @@
<text class="font_3 text_24">￥{{item.totalAmount}}</text> <text class="font_3 text_24">￥{{item.totalAmount}}</text>
</view> </view>
<view class="flex-row justify-between mt-19"> <view class="flex-row justify-between items-center mt-19">
<text class="font_2 text_15">状态：</text> <text class="font_2 text_15">状态：</text>
<text class="font_4 text_16">{{item.orderStatus}}</text> <text class="font_4 text_16">{{item.orderStatus}}</text>
</view> </view>
<view class="flex-row justify-between mt-19"> <view class="flex-row justify-between items-center mt-19">
<text class="font_2 text_17">抽成：</text> <text class="font_2 text_17">抽成：</text>
<text class="font_4 text_18"> <text class="font_4 text_18">主管：{{item.firstRate * 100}}%，员工：{{item.secondRate * 100}}%
主管：{{item.firstRate * 100}}%，员工：{{item.secondRate * 100}}%
</text> </text>
</view> </view>
<view class="flex-row justify-between mt-19"> <view class="flex-row justify-between items-center mt-19">
<text class="font_2 text_19">奖励：</text> <text class="font_2 text_19">奖励：</text>
<text class="font_4 text_20"> <text class="font_4 text_20">主管：¥{{item.firstReward}}，员工：¥{{item.secondReward}}
主管：¥{{item.firstReward}}，员工：¥{{item.secondReward}}
</text> </text>
</view> </view>

22
pages/dashboardModule/userOrderPerformance/userOrderPerformance.wxss
View File

@ -9,9 +9,10 @@
background-color: #fefbf6; background-color: #fefbf6;
box-shadow: 0rpx 3.75rpx 7.5rpx #00000040; box-shadow: 0rpx 3.75rpx 7.5rpx #00000040;
width: 100%; width: 100%;
overflow-y: auto; position: fixed;
overflow-x: hidden; bottom: 0;
height: 100%; overflow: auto;
height: calc(100vh - 1rpx);
} }
.text { .text {
color: #e67e22; color: #e67e22;
@ -118,6 +119,7 @@
font-size: 30rpx; font-size: 30rpx;
font-family: SourceHanSansCN; font-family: SourceHanSansCN;
line-height: 22.76rpx; line-height: 22.76rpx;
margin-right: 15rpx;
color: #444444; color: #444444;
} }
.text_9 { .text_9 {
@ -130,45 +132,45 @@
color: #444444; color: #444444;
} }
.text_10 { .text_10 {
margin-right: 19.69rpx; margin-right: 15rpx;
line-height: 27.84rpx; line-height: 27.84rpx;
} }
.text_11 { .text_11 {
line-height: 27.81rpx; line-height: 27.81rpx;
} }
.text_12 { .text_12 {
margin-right: 15.06rpx; margin-right: 15rpx;
} }
.text_13 { .text_13 {
line-height: 28.29rpx; line-height: 28.29rpx;
} }
.text_24 { .text_24 {
margin-right: 6.41rpx; margin-right: 15rpx;
} }
.text_15 { .text_15 {
line-height: 28.01rpx; line-height: 28.01rpx;
} }
.text_16 { .text_16 {
margin-right: 18.77rpx; margin-right: 15rpx;
line-height: 28.09rpx; line-height: 28.09rpx;
} }
.text_17 { .text_17 {
line-height: 28.16rpx; line-height: 28.16rpx;
} }
.text_18 { .text_18 {
margin-right: 11.44rpx; margin-right: 15rpx;
} }
.text_19 { .text_19 {
line-height: 28.2rpx; line-height: 28.2rpx;
} }
.text_20 { .text_20 {
margin-right: 7.76rpx; margin-right: 15rpx;
} }
.text_21 { .text_21 {
line-height: 28.31rpx; line-height: 28.31rpx;
} }
.text_23 { .text_23 {
margin-right: 19.31rpx; margin-right: 15rpx;
margin-bottom: 2.04rpx; margin-bottom: 2.04rpx;
line-height: 27.79rpx; line-height: 27.79rpx;
} }

4
pages/personCenter/mine/mine.js
View File

@ -276,7 +276,7 @@ Page({
return ; return ;
} }
wx.navigateTo({ wx.navigateTo({
url: `/pages/dashboardModule/performanceRanking/performanceRanking?role=manager`, url: `/pages/dashboardModule/performanceRanking/performanceRanking?role=manager&k=1`,
}) })
}, },
@ -293,7 +293,7 @@ Page({
return ; return ;
} }
wx.navigateTo({ wx.navigateTo({
url: `/pages/dashboardModule/performanceRanking/performanceRanking?role=staff`, url: `/pages/dashboardModule/performanceRanking/performanceRanking?role=staff&k=0`,
}) })
}, },

2
pages/welcome/homePage/homePage.js
View File

@ -20,7 +20,7 @@ Page({
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad() {
let token = wx.getStorageSync('token') let token = wx.getStorageSync('token')
if (token) { if (token) {
wx.switchTab({ wx.switchTab({