dianliang/driverSchool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	pagesA/courseDetail/index.vue
#	pagesA/register/index.vue
This commit is contained in:
Lx 2025-04-17 10:38:06 +08:00
commit 457b953046
3 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
newPages/schoolDetail/index.vue
View File

@ -7,7 +7,7 @@
</view> </view>
<view class="group_4 flex-col"> <view class="group_4 flex-col">
<image style="width: 100%; height: 100%;" referrerpolicy="no-referrer" <image style="width: 100%; height: 100%;" referrerpolicy="no-referrer"
:src="imagesUrl + '/' + schoolInfo.photo" /> :src="imagesUrl + '/' + schoolInfo.photo" v-if="schoolInfo.photo" />
<!-- src="/static/lanhu_jiaxiaoxiangqing/FigmaDDSSlicePNGcd54efcc9a8c89af0ef99c8275464828.png" --> <!-- src="/static/lanhu_jiaxiaoxiangqing/FigmaDDSSlicePNGcd54efcc9a8c89af0ef99c8275464828.png" -->
</view> </view>
<view class="group_5 flex-col"> <view class="group_5 flex-col">
@ -276,7 +276,9 @@
// 对数据进行排序 // 对数据进行排序
const sortedList = res.data.records.sort((a, b) => b.seniority - a.seniority); const sortedList = res.data.records.sort((a, b) => b.seniority - a.seniority);
const coachId = auth.getCoachId() const coachId = auth.getCoachId()
const staffType = auth.getStaffType()
console.log(coachId, 'coachId'); console.log(coachId, 'coachId');
if (coachId && staffType === '02') {
const coach = res.data.records.find(item => item.userId == coachId) const coach = res.data.records.find(item => item.userId == coachId)
console.log(coach, 'coach'); console.log(coach, 'coach');
if (coach) { if (coach) {
@ -286,6 +288,11 @@
this.schoolCoachList = sortedList.slice(0, 3); this.schoolCoachList = sortedList.slice(0, 3);
this.total = res.data.total; this.total = res.data.total;
} }
} else {
// 取排序后的前三条数据
this.schoolCoachList = sortedList.slice(0, 3);
this.total = res.data.total;
}
}).catch(e => { }).catch(e => {
console.log(e); console.log(e);
}) })

3
pagesA/courseDetail/index.vue
View File

@ -8,6 +8,9 @@
<scroll-view :style="{ height: scrollHeight + 'px' }" scroll-y="true" class="scroll-view"> <scroll-view :style="{ height: scrollHeight + 'px' }" scroll-y="true" class="scroll-view">
<view class="group_3 flex-col"> <view class="group_3 flex-col">
<image style="width: 100%; height: 100%;" :src="imagesUrl + '/' + courseDetails.photo" /> <image style="width: 100%; height: 100%;" :src="imagesUrl + '/' + courseDetails.photo" />
v-if="courseDetails.photo" />
<u-empty mode="data" text='暂无图片' v-else>
</u-empty>
</view> </view>
<view class="group_4 flex-col"> <view class="group_4 flex-col">
<view class="section_2 flex-row justify-between"> <view class="section_2 flex-row justify-between">

6
pagesA/register/index.vue
View File

@ -4,7 +4,7 @@
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<headers :titles="titles"> <headers :titles="titles">
<uni-icons @click="goback()" type="left" color="#000000" size="22px"></uni-icons> <uni-icons type="left" color="#000000" size="22px"></uni-icons>
</headers> </headers>
<!-- #endif --> <!-- #endif -->
<!-- #endif --> <!-- #endif -->
@ -254,6 +254,10 @@
this.localCoachId = getCoachId() this.localCoachId = getCoachId()
console.log('localCoachId', this.localCoachId); console.log('localCoachId', this.localCoachId);
console.log('userId', this.userId); console.log('userId', this.userId);
if (this.localStaffType === '02') {
this.localCoachId = getCoachId()
console.log('localCoachId', this.localCoachId);
}
}, },
onShow() { onShow() {
this.getListAll() this.getListAll()