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

Compare commits

base: dianliang:b0e2af62e365fe75d7ab4b73ae25b7e7bea32c19
Branches Tags
dianliang:master
...
compare: dianliang:457b9530463e698ba927ce8170f28376ecdd92e4
Branches Tags
dianliang:master

3 Commits
b0e2af62e3 ... 457b953046

Author SHA1 Message Date
Lx
457b953046 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	pagesA/courseDetail/index.vue
#	pagesA/register/index.vue
 2025-04-17 10:38:06 +08:00
Lx
d8970bab48 0417-2 2025-04-17 10:32:04 +08:00
Lx
6fb394ef18 0417-1 2025-04-17 10:01:13 +08:00
5 changed files with 340 additions and 297 deletions
Show Stats Expand all files Collapse all files

35
newPages/messageCenter/index.vue
View File

@ -1,16 +1,19 @@
<template>
<view class="container">
<VNavigationBar background-color="#fff" title-color="#333" title="消息中心" :showClear="showClear" @clearNoRead="clearNoReadFun"></VNavigationBar>
<VNavigationBar background-color="#fff" title-color="#333" title="消息中心" :showClear="showClear"
@clearNoRead="clearNoReadFun"></VNavigationBar>
<view class="body">
<view class="messageList">
<scroll-view scroll-y="true" class="itemContent" @scrolltolower="onReachBottomCus"
refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
<view v-for="(item, index) in messageList" :key="index" class="messageItem" @click="readNotice(item)">
<scroll-view scroll-y="true" class="itemContent" @scrolltolower="onReachBottomCus" refresher-enabled
@refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
<view v-for="(item, index) in messageList" :key="index" class="messageItem"
@click="readNotice(item)">
<image class="messageIcon" src="@/static/imgs/message-icon1.png" mode="aspectFit"></image>
<view class="messageContent">
<view :class="{'messageTitle':item.readStatus,'noReadTitle':!item.readStatus}">系统通知</view>
<view class="messageContent_content">{{item.templateContent}}</view>
<view class="messageContent_content" style="text-align: right">{{formatTime(item.createTime)}}</view>
<view class="messageContent_content" style="text-align: right">
{{formatTime(item.createTime)}}</view>
</view>
</view>
<view style="text-align: center" v-if="messageList.length==0">
@ -72,7 +75,9 @@
await request({
url: "/app-api/system/notify-message/update-read",
method: "PUT",
params:{ids:this.nowReadItem.id},
params: {
ids: this.nowReadItem.id
},
tenantIdFlag: false
}).then((res) => {
if (res.code == 200) {
@ -178,12 +183,14 @@
height: 100vh;
display: flex;
flex-direction: column;
.body {
flex: 1;
display: flex;
flex-direction: column;
overflow: hidden;
}
.messageList {
flex: 1;
display: flex;
@ -198,6 +205,7 @@
}
}
.messageItem {
padding: 30rpx 0;
display: flex;
@ -209,17 +217,22 @@
width: 80rpx;
height: 80rpx;
}
.noReadTitle {
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.noReadTitle:after {
content: "*";
color: red;
display: block; /* 或者其他的块级显示类型，比如 inline-block, table 等 */
position: absolute; /* 或者 absolute 或者 fixed，取决于你的布局需求 */
z-index: 1; /* 确保它在元素的上方 */
display: block;
/* 或者其他的块级显示类型，比如 inline-block, table 等 */
position: absolute;
/* 或者 absolute 或者 fixed，取决于你的布局需求 */
z-index: 1;
/* 确保它在元素的上方 */
right: 0;
}
@ -227,10 +240,12 @@
flex: 1;
width: 0;
}
.messageTitle {
font-size: 32rpx;
color: #333333;
}
.messageContent_content {
font-weight: 500;
font-size: 28rpx;
@ -242,6 +257,7 @@
margin-top: 20rpx;
}
}
.popup-content {
padding: 15px;
height: auto;
@ -249,6 +265,7 @@
width: 80%;
background-color: #fff;
}
.popup-content-text {
display: flex;
align-items: center;

5
newPages/newIndex/index.vue
View File

@ -55,6 +55,7 @@
getCoachId,
getInviteId,
getLocalUserInfo,
getStaffType,
getToken,
removeCoachId,
removeInviteId,
@ -150,6 +151,8 @@
if (res.data != null) {
this.qTenantId = res.data.tenantId
this.qCoachId = res.data.userId
console.log('tenantId', this.qTenantId)
console.log('coachId', this.qCoachId)
setTenantId(res.data.tenantId)
this.getList()
if (res.data.type == 'jl') {
@ -160,6 +163,8 @@
setCoachId(res.data.userId)
setStaffType('01')
}
console.log('getCoachId', getCoachId())
console.log('getStaffType', getStaffType())
}
})
},

2
pages.json
View File

@ -3,7 +3,7 @@
{
"path": "newPages/newIndex/index",
"style": {
"enablePullDownRefresh": true,
"enablePullDownRefresh": false,
"navigationBarTitleText": "首页",
"navigationStyle": "custom"
}

19
pagesA/courseDetail/index.vue
View File

@ -5,12 +5,12 @@
<uni-icons type="left" color="#000000" size="22px"></uni-icons>
</headers>
</view>
<scroll-view :style="{ height: scrollHeight + 'px' }" scroll-y="true" class="scroll-view">
<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 class="group_4 flex-col">
<view class="section_2 flex-row justify-between">
@ -44,6 +44,7 @@
</u-empty>
</view>
</view>
</scroll-view>
<view class="group_6 flex-row">
<view class="image-text_1 flex-col justify-between" @click="zxkf()">
<image class="label_2" referrerpolicy="no-referrer"
@ -78,6 +79,7 @@
driveSchoolPhone: [],
imagesUrl: config.imagesUrl,
userDetails: [],
scrollHeight: 0,
};
},
onLoad(options) {
@ -87,6 +89,10 @@
this.userDetails = getLocalUserInfo();
this.getServicePhone()
},
onReady() {
// 动态计算滚动区域高度
this.calculateScrollHeight();
},
methods: {
goBack() {
uni.navigateBack({
@ -123,6 +129,15 @@
})
},
calculateScrollHeight() {
// 获取屏幕高度
const screenHeight = uni.getSystemInfoSync().windowHeight;
// 获取顶部区域高度
const topHeight = 166;
// 计算滚动区域高度
this.scrollHeight = screenHeight - topHeight;
},
goRegisterNow() {
console.log('token', getToken())
if (!getToken()) {

10
pagesA/register/index.vue
View File

@ -221,6 +221,7 @@
loading: false,
localStaffType: null,
localCoachId: null,
userDetails: [],
columns: [
[{
label: '全款',
@ -235,6 +236,7 @@
}
},
onLoad(option) {
console.log('option', option)
uni.showToast({
title: '请完善个人信息',
icon: 'none'
@ -243,11 +245,15 @@
this.hideTeacher = 1
}
this.jlId = uni.getStorageSync('jlId');
this.userDetails = getLocalUserInfo();
this.courseId = option.courseId,
this.userId = option.userId,
this.tenantId = option.tenantId
this.tenantId = option.tenantId,
this.userId = this.userDetails.id,
this.userinfo = getLocalUserInfo()
this.localStaffType = getStaffType()
this.localCoachId = getCoachId()
console.log('localCoachId', this.localCoachId);
console.log('userId', this.userId);
if (this.localStaffType === '02') {
this.localCoachId = getCoachId()
console.log('localCoachId', this.localCoachId);