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

0412

Browse Source
This commit is contained in:
Lx 2025-04-12 17:52:46 +08:00
parent bb3ab5753e
commit d218b00a76
11 changed files with 267 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
newPages/courseDetail/index.vue
View File

@ -64,7 +64,7 @@
<script> <script>
import request from "@/utils/request"; import request from "@/utils/request";
import config from "@/config.js" import config from "@/config.js"
import {getLocalUserInfo, getUserInfo} from "@/utils/auth"; import {getLocalUserInfo, getUserInfo, getToken} from "@/utils/auth";
import headers from "@/components/header/headers.vue"; import headers from "@/components/header/headers.vue";
export default { export default {
@ -123,6 +123,22 @@ export default {
}, },
goRegisterNow() { goRegisterNow() {
console.log('token',getToken())
if (!getToken()) {
uni.showModal({
title: '未登录',
content: '请先登录',
confirmText: '去登录',
success: (res) => {
if (res.confirm) {
uni.navigateTo({
url: '/pages/login/login'
});
}
}
});
return;
}
uni.navigateTo({ uni.navigateTo({
url: `/newPages/register/index?courseId=${this.courseDetails.id}&userId=${this.userDetails.id}&tenantId=${this.tenantId}`, url: `/newPages/register/index?courseId=${this.courseDetails.id}&userId=${this.userDetails.id}&tenantId=${this.tenantId}`,
// url: '/pages/index/bmPage' // url: '/pages/index/bmPage'

60
newPages/evaluate/assets/style/index.rpx.scss
View File

@ -4,48 +4,57 @@
width: 750rpx; width: 750rpx;
height: 1624rpx; height: 1624rpx;
overflow: hidden; overflow: hidden;
.group_1 { .group_1 {
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
width: 750rpx; width: 750rpx;
height: 92rpx; height: 92rpx;
.image_1 { .image_1 {
width: 64rpx; width: 64rpx;
height: 36rpx; height: 36rpx;
margin: 28rpx 0 0 60rpx; margin: 28rpx 0 0 60rpx;
} }
.group_2 { .group_2 {
background-color: rgba(0, 0, 0, 0.9); background-color: rgba(0, 0, 0, 0.9);
width: 36rpx; width: 36rpx;
height: 22rpx; height: 22rpx;
margin: 34rpx 0 0 462rpx; margin: 34rpx 0 0 462rpx;
} }
.group_3 { .group_3 {
background-color: rgba(0, 0, 0, 0.9); background-color: rgba(0, 0, 0, 0.9);
width: 32rpx; width: 32rpx;
height: 24rpx; height: 24rpx;
margin: 34rpx 0 0 10rpx; margin: 34rpx 0 0 10rpx;
} }
.image_2 { .image_2 {
width: 50rpx; width: 50rpx;
height: 24rpx; height: 24rpx;
margin: 34rpx 28rpx 0 8rpx; margin: 34rpx 28rpx 0 8rpx;
} }
} }
.group_4 { .group_4 {
width: 750rpx; width: 750rpx;
// height: 1534rpx; // height: 1534rpx;
height: 100%; height: 100%;
margin-bottom: 2rpx; margin-bottom: 2rpx;
.group_5 { .group_5 {
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
width: 750rpx; width: 750rpx;
height: 96rpx; height: 96rpx;
justify-content: flex-center; justify-content: flex-center;
.label_1 { .label_1 {
width: 48rpx; width: 48rpx;
height: 48rpx; height: 48rpx;
margin: 24rpx 0 0 24rpx; margin: 24rpx 0 0 24rpx;
} }
.text_1 { .text_1 {
width: 128rpx; width: 128rpx;
height: 52rpx; height: 52rpx;
@ -59,31 +68,37 @@
line-height: 52rpx; line-height: 52rpx;
margin: 22rpx 0 0 238rpx; margin: 22rpx 0 0 238rpx;
} }
.section_1 { .section_1 {
background-color: rgba(0, 0, 0, 0.2); background-color: rgba(0, 0, 0, 0.2);
border-radius: 16px; border-radius: 16px;
height: 64rpx; height: 64rpx;
width: 174rpx; width: 174rpx;
margin: 16rpx 24rpx 0 114rpx; margin: 16rpx 24rpx 0 114rpx;
.image-wrapper_1 { .image-wrapper_1 {
width: 40rpx; width: 40rpx;
height: 2rpx; height: 2rpx;
margin: 12rpx 0 0 90rpx; margin: 12rpx 0 0 90rpx;
.thumbnail_1 { .thumbnail_1 {
width: 40rpx; width: 40rpx;
height: 2rpx; height: 2rpx;
} }
} }
.box_1 { .box_1 {
width: 122rpx; width: 122rpx;
height: 32rpx; height: 32rpx;
margin: 2rpx 0 16rpx 26rpx; margin: 2rpx 0 16rpx 26rpx;
.block_1 { .block_1 {
background-color: rgba(255, 255, 255, 0.9); background-color: rgba(255, 255, 255, 0.9);
width: 36rpx; width: 36rpx;
height: 12rpx; height: 12rpx;
margin-top: 10rpx; margin-top: 10rpx;
} }
.block_2 { .block_2 {
background-color: rgba(255, 255, 255, 0.9); background-color: rgba(255, 255, 255, 0.9);
width: 32rpx; width: 32rpx;
@ -92,10 +107,12 @@
} }
} }
} }
.list_1 { .list_1 {
width: 686rpx; width: 686rpx;
justify-content: center; justify-content: center;
margin: 20rpx 0 0 32rpx; margin: 20rpx 0 0 32rpx;
.list-items_1 { .list-items_1 {
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
border-radius: 8px; border-radius: 8px;
@ -103,10 +120,12 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
width: 686rpx; width: 686rpx;
justify-content: flex-center; justify-content: flex-center;
.text-wrapper_1 { .text-wrapper_1 {
width: 160rpx; width: 160rpx;
height: 32rpx; height: 32rpx;
margin: 30rpx 0 0 20rpx; margin: 30rpx 0 0 20rpx;
.text_2 { .text_2 {
width: 160rpx; width: 160rpx;
height: 32rpx; height: 32rpx;
@ -120,15 +139,18 @@
line-height: 32rpx; line-height: 32rpx;
} }
} }
.group_6 { .group_6 {
width: 160rpx; width: 160rpx;
height: 36rpx; height: 36rpx;
margin: 20rpx 0 0 20rpx; margin: 20rpx 0 0 20rpx;
.text-wrapper_2 { .text-wrapper_2 {
background-color: rgba(223, 235, 255, 1); background-color: rgba(223, 235, 255, 1);
border-radius: 2px; border-radius: 2px;
height: 36rpx; height: 36rpx;
width: 92rpx; width: 92rpx;
.text_3 { .text_3 {
width: 72rpx; width: 72rpx;
height: 24rpx; height: 24rpx;
@ -143,11 +165,13 @@
margin: 6rpx 0 0 10rpx; margin: 6rpx 0 0 10rpx;
} }
} }
.text-wrapper_3 { .text-wrapper_3 {
background-color: rgba(255, 239, 229, 1); background-color: rgba(255, 239, 229, 1);
border-radius: 2px; border-radius: 2px;
height: 36rpx; height: 36rpx;
width: 52rpx; width: 52rpx;
.text_4 { .text_4 {
width: 32rpx; width: 32rpx;
height: 24rpx; height: 24rpx;
@ -163,17 +187,21 @@
} }
} }
} }
.group_7 { .group_7 {
width: 396rpx; width: 396rpx;
height: 48rpx; height: 48rpx;
margin: 26rpx 0 30rpx 20rpx; margin: 26rpx 0 30rpx 20rpx;
.image-text_1 { .image-text_1 {
width: 144rpx; width: 144rpx;
height: 48rpx; height: 48rpx;
.label_2 { .label_2 {
width: 48rpx; width: 48rpx;
height: 48rpx; height: 48rpx;
} }
.text-group_1 { .text-group_1 {
/* width: 84rpx; /* width: 84rpx;
height: 28rpx; height: 28rpx;
@ -186,50 +214,56 @@
white-space: nowrap; white-space: nowrap;
line-height: 28rpx; line-height: 28rpx;
margin-top: 10rpx; */ margin-top: 10rpx; */
width: 84rpx; width: 84rpx;
height: 28rpx; height: 28rpx;
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC-Regular; font-family: PingFang SC-Regular;
font-weight: NaN; font-weight: NaN;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
line-height: 28rpx; line-height: 28rpx;
margin-top: 0; margin-top: 0;
justify-content: center; justify-content: center;
} }
} }
.section_2 { .section_2 {
background-color: rgba(237, 162, 58, 1); background-color: rgba(237, 162, 58, 1);
width: 28rpx; width: 28rpx;
height: 28rpx; height: 28rpx;
margin: 10rpx 0 0 20rpx; margin: 10rpx 0 0 20rpx;
} }
.section_3 { .section_3 {
background-color: rgba(237, 162, 58, 1); background-color: rgba(237, 162, 58, 1);
width: 28rpx; width: 28rpx;
height: 28rpx; height: 28rpx;
margin: 10rpx 0 0 10rpx; margin: 10rpx 0 0 10rpx;
} }
.section_4 { .section_4 {
background-color: rgba(237, 162, 58, 1); background-color: rgba(237, 162, 58, 1);
width: 28rpx; width: 28rpx;
height: 28rpx; height: 28rpx;
margin: 10rpx 0 0 10rpx; margin: 10rpx 0 0 10rpx;
} }
.section_5 { .section_5 {
background-color: rgba(237, 162, 58, 1); background-color: rgba(237, 162, 58, 1);
width: 28rpx; width: 28rpx;
height: 28rpx; height: 28rpx;
margin: 10rpx 0 0 10rpx; margin: 10rpx 0 0 10rpx;
} }
.section_6 { .section_6 {
background-color: rgba(226, 226, 226, 1); background-color: rgba(226, 226, 226, 1);
width: 28rpx; width: 28rpx;
height: 28rpx; height: 28rpx;
margin: 10rpx 0 0 10rpx; margin: 10rpx 0 0 10rpx;
} }
.text_5 { .text_5 {
width: 42rpx; width: 42rpx;
height: 28rpx; height: 28rpx;

2
newPages/evaluateAdd/index.vue
View File

@ -87,12 +87,14 @@
busiId: '', busiId: '',
tenantId: '', tenantId: '',
subject: 0, subject: 0,
busiName: '',
}, },
subjectArr: ['科目一', '科目二', '科目三', '科目四'], subjectArr: ['科目一', '科目二', '科目三', '科目四'],
}; };
}, },
onLoad(options) { onLoad(options) {
const data = JSON.parse(options.data); const data = JSON.parse(options.data);
console.log('data',data)
// 判断新增还是查看 // 判断新增还是查看
if (options.controls) { if (options.controls) {
this.show = true this.show = true

30
newPages/examinationAdd/index.vue
View File

@ -44,6 +44,8 @@
:show="showTimePicker" :show="showTimePicker"
v-model="process.examTime" v-model="process.examTime"
mode="datetime" mode="datetime"
:minDate="minTime"
:maxDate="maxTime"
@confirm="onConfirmExamTime" @confirm="onConfirmExamTime"
@cancel="showTimePicker = false" @cancel="showTimePicker = false"
></u-datetime-picker> ></u-datetime-picker>
@ -151,7 +153,7 @@ export default {
examStatus: null, examStatus: null,
examScore: null, examScore: null,
remark: '', remark: '',
examTime: null, examTime: Date.now(),
images: null, images: null,
tenantId: null, tenantId: null,
courseId: null, courseId: null,
@ -159,6 +161,8 @@ export default {
batchId: null, batchId: null,
coachId: null, coachId: null,
}, },
minTime: 0,
maxTime: 0,
constants: {} constants: {}
}; };
}, },
@ -199,6 +203,14 @@ export default {
}); });
}, },
}, },
created() {
const now = new Date()
this.maxTime = now.getTime()
const min = new Date()
min.setFullYear(min.getFullYear() - 5)
this.minTime = min.getTime()
},
methods: { methods: {
handleBack() { handleBack() {
uni.navigateBack({ uni.navigateBack({
@ -232,8 +244,10 @@ export default {
onConfirmExamTime(value) { onConfirmExamTime(value) {
this.process.examTime = value; this.process.examTime = value;
this.showTimePicker = false; this.showTimePicker = false;
console.log('process', this.process)
}, },
// 格式化时间戳的方法
// 格式化时间
formatDate(timestamp) { formatDate(timestamp) {
const date = new Date(timestamp); const date = new Date(timestamp);
const year = date.getFullYear(); const year = date.getFullYear();
@ -362,16 +376,24 @@ export default {
return; return;
} }
this.process.images = this.fileList?.map(item => item.url).join(',') || ''; const postData = {
...this.process, // 先拷贝 process 原有数据
userName: this.userInfo.nickname,
remark: this.process.remark,
images: this.fileList?.map(item => item.url).join(',') || '',
}
// this.process.images = this.fileList?.map(item => item.url).join(',') || '';
if (!this.process.userId || !this.process.subject || !this.process.examScore || !this.process.examStatus || !this.process.examTime) { if (!this.process.userId || !this.process.subject || !this.process.examScore || !this.process.examStatus || !this.process.examTime) {
uni.showToast({title: '信息填写不完整', icon: 'none'}); uni.showToast({title: '信息填写不完整', icon: 'none'});
return; return;
} }
console.log('postData', postData)
request({ request({
url: '/app-api/process/updateProcess', url: '/app-api/process/updateProcess',
method: 'PUT', method: 'PUT',
data: this.process, data: postData,
// data: this.process,
}).then(res => { }).then(res => {
if (res.code === 0) { if (res.code === 0) {
uni.showToast({ uni.showToast({

22
newPages/messageCenter/index.vue
View File

@ -3,7 +3,7 @@
<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="body">
<view class="messageList"> <view class="messageList">
<scroll-view style="height: 100%;" scroll-y="true" class="itemContent" @scrolltolower="onReachBottomCus" <scroll-view scroll-y="true" class="itemContent" @scrolltolower="onReachBottomCus"
refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered"> refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
<view v-for="(item, index) in messageList" :key="index" class="messageItem" @click="readNotice(item)"> <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> <image class="messageIcon" src="@/static/imgs/message-icon1.png" mode="aspectFit"></image>
@ -174,17 +174,27 @@
<style lang="less" scoped> <style lang="less" scoped>
.container { .container {
height: 100%; height: 100vh;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.body { .body {
flex: 1; flex: 1;
height: calc(100vh - env(safe-area-inset-top)); display: flex;
overflow: auto; flex-direction: column;
overflow: hidden;
} }
.messageList { .messageList {
padding: 0 32rpx; flex: 1;
height: 100%; display: flex;
flex-direction: column;
.itemContent {
flex: 1; // 核心：scroll-view 占满剩余空间
display: flex;
flex-direction: column;
padding: 0 20rpx;
box-sizing: border-box;
}
} }
.messageItem { .messageItem {
padding: 30rpx 0; padding: 30rpx 0;

156
newPages/my/index.vue
View File

@ -76,109 +76,30 @@
</view> </view>
</view> </view>
</view> </view>
<view class="menu-list">
<!-- <view class="block_2 flex-row" @click="goMyInDetails()"> <!-- 1. 个人信息 -->
<view class="image-wrapper_4 flex-col"> <view class="menu-item" @click="goMyInDetails()">
<image <image class="menu-icon" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG1bb0cdc369203c305a42d848736e8f01.png" />
class="thumbnail_2" <text class="menu-text">个人信息</text>
referrerpolicy="no-referrer" <image class="menu-arrow" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG4f20daae79bb7c60189f8702897465d1.png" />
src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG1bb0cdc369203c305a42d848736e8f01.png" </view>
/>
</view> <view class="menu-item">
<text class="text_11">个人信息</text> <button open-type="contact" class="menu-item-btn">
<image <image class="menu-icon" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNGb5e90b5b4c1f154eb4e27313164118a4.png" />
class="thumbnail_3" <text class="menu-text">在线客服</text>
referrerpolicy="no-referrer" <image class="menu-arrow" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG4f20daae79bb7c60189f8702897465d1.png" />
src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG4f20daae79bb7c60189f8702897465d1.png" </button></view>
/>
</view> <!-- 3. 消息中心 -->
<button open-type="contact" style="display: flex; align-items: center; border: none;" hairline="false"> <view class="menu-item" @click="goFeedback">
<view class="block_3 flex-row" open-type="contact"> <image class="menu-icon" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNGa728895586dafec1bde5f90c89d05c48.png" />
<view class="image-wrapper_5 flex-col"> <text class="menu-text">消息中心</text>
<image <text class="message-num" v-if="noReadNum > 0">{{ noReadNum }}</text>
class="thumbnail_4" <image class="menu-arrow" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG4f20daae79bb7c60189f8702897465d1.png" />
referrerpolicy="no-referrer" </view>
src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNGb5e90b5b4c1f154eb4e27313164118a4.png" </view>
/>
</view>
<text class="text_12">在线客服</text>
<image
class="thumbnail_5"
referrerpolicy="no-referrer"
src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG4f20daae79bb7c60189f8702897465d1.png"
/>
</view></button>
<view class="block_4 flex-row" @click="goFeedback">
<view class="image-wrapper_6 flex-col">
<image
class="thumbnail_6"
referrerpolicy="no-referrer"
src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNGa728895586dafec1bde5f90c89d05c48.png"
/>
</view>
<text class="text_13">消息中心</text>
<text class="messageNum" v-if="noReadNum>0">
{{ noReadNum }}
</text>
<image
class="thumbnail_7"
referrerpolicy="no-referrer"
src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG4f20daae79bb7c60189f8702897465d1.png"
/>
</view> -->
<!-- <view class="menu-list">
<view class="menu-item" @click="goMyInDetails()">
<image class="menu-icon" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG1bb0cdc369203c305a42d848736e8f01.png" />
<text class="menu-text">个人信息</text>
<image class="menu-arrow" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG4f20daae79bb7c60189f8702897465d1.png" />
</view>
<view class="menu-item" @tap="goToService">
<image class="menu-icon" src="@/static/icon/service.png" />
<text class="menu-text">在线客服</text>
<image class="menu-arrow" src="@/static/icon/arrow-right.png" />
</view>
<button open-type="contact" class="menu-item" style="display: flex;">
<image class="menu-icon" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNGb5e90b5b4c1f154eb4e27313164118a4.png" />
<text class="menu-text">在线客服</text>
<image class="menu-arrow" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG4f20daae79bb7c60189f8702897465d1.png" />
</button>
<view class="menu-item" @tap="goToMessage">
<image class="menu-icon" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNGa728895586dafec1bde5f90c89d05c48.png" />
<text class="menu-text">消息中心</text>
<image class="menu-arrow" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG4f20daae79bb7c60189f8702897465d1.png" />
</view>
</view> -->
<view class="menu-list">
<!-- 1. 个人信息 -->
<view class="menu-item" @click="goMyInDetails()">
<image class="menu-icon" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG1bb0cdc369203c305a42d848736e8f01.png" />
<text class="menu-text">个人信息</text>
<image class="menu-arrow" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG4f20daae79bb7c60189f8702897465d1.png" />
</view>
<view class="menu-item">
<button open-type="contact" class="menu-item-btn">
<image class="menu-icon" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNGb5e90b5b4c1f154eb4e27313164118a4.png" />
<text class="menu-text">在线客服</text>
<image class="menu-arrow" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG4f20daae79bb7c60189f8702897465d1.png" />
</button></view>
<!-- 3. 消息中心 -->
<view class="menu-item" @click="goFeedback">
<image class="menu-icon" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNGa728895586dafec1bde5f90c89d05c48.png" />
<text class="menu-text">消息中心</text>
<text class="message-num" v-if="noReadNum > 0">{{ noReadNum }}</text>
<image class="menu-arrow" src="/static/lanhu_gerenzhongxin/FigmaDDSSlicePNG4f20daae79bb7c60189f8702897465d1.png" />
</view>
</view>
</view> </view>
<tabbar :msg='msg'></tabbar> <tabbar :msg='msg'></tabbar>
@ -293,6 +214,7 @@ export default {
this.showQrCode = false this.showQrCode = false
}, },
openQrCode(){ openQrCode(){
// 判断是否有二维码 有了不需要绘制 // 判断是否有二维码 有了不需要绘制
if (this.isCreateQrCode){ if (this.isCreateQrCode){
this.createQrCode(this.userDetails.uniqueCode) this.createQrCode(this.userDetails.uniqueCode)
@ -307,15 +229,40 @@ export default {
this.selfInfo = res this.selfInfo = res
},*/ },*/
toMyQrCode() { toMyQrCode() {
if (!getToken()) {
uni.showModal({
title: '未登录',
content: '请先登录',
confirmText: '去登录',
success: (res) => {
if (res.confirm) {
uni.navigateTo({
url: '/pages/login/login'
});
}
}
});
return;
}
this.showQrCode = true this.showQrCode = true
}, },
toOrderPage(orderType, type) { toOrderPage(orderType, type) {
if (!getToken()) {
uni.navigateTo({
url: "/pages/login/login"
})
}
uni.navigateTo({ uni.navigateTo({
url: `/newPages/orderList/index?orderType=${orderType}&type=${type}&userId=${this.selfInfo.id}` url: `/newPages/orderList/index?orderType=${orderType}&type=${type}&userId=${this.selfInfo.id}`
}) })
}, },
goMyInDetails() { goMyInDetails() {
if (!getToken()) {
uni.navigateTo({
url: "/pages/login/login"
})
}
uni.navigateTo({ uni.navigateTo({
url: `/newPages/information/index?userId=${this.selfInfo.id}` url: `/newPages/information/index?userId=${this.selfInfo.id}`
}) })
@ -328,6 +275,9 @@ export default {
getUserInfo() { getUserInfo() {
if (!getToken()) {
return;
}
request({ request({
url: '/app-api/small/dl-drive-school-student/getUsersInfo', url: '/app-api/small/dl-drive-school-student/getUsersInfo',
method: 'GET', method: 'GET',

60
newPages/newIndex/index.vue
View File

@ -58,7 +58,11 @@
<script> <script>
import SchoolInfo from './SchoolInfo.vue'; import SchoolInfo from './SchoolInfo.vue';
import request from "@/utils/request"; import request from "@/utils/request";
import {
getLocalUserInfo,
getToken,
setLocalUserInfo
} from '@/utils/auth'
export default { export default {
components: { components: {
SchoolInfo SchoolInfo
@ -81,7 +85,7 @@ export default {
{ {
url: '/static/lanhu_shouye2gai/pj.png', url: '/static/lanhu_shouye2gai/pj.png',
text: '评价' text: '评价'
} },
], ],
swiperList: [], swiperList: [],
msg: "1", msg: "1",
@ -141,7 +145,7 @@ export default {
}, },
getSwiperList() { getSwiperList() {
request({ request({
url: '/drivingSchool/applet/swiper/list', url: '/app-api/drivingSchool/text/swiper/list',
method: 'GET' method: 'GET'
}).then(res => { }).then(res => {
res.data.forEach(item => { res.data.forEach(item => {
@ -195,16 +199,66 @@ export default {
}); });
break; break;
case '预约训练': case '预约训练':
if (!getToken()) {
/* uni.showToast({
title: '请先登录',
icon: 'none',
duration: 2000
}); */
uni.showModal({
title: '未登录',
content: '请先登录',
confirmText: '去登录',
success: (res) => {
if (res.confirm) {
uni.navigateTo({
url: '/pages/login/login'
});
}
}
});
return;
}
uni.navigateTo({ uni.navigateTo({
url: '/newPages/appointment/index' url: '/newPages/appointment/index'
}); });
break; break;
case '考试结果录入': case '考试结果录入':
if (!getToken()) {
uni.showModal({
title: '未登录',
content: '请先登录',
confirmText: '去登录',
success: (res) => {
if (res.confirm) {
uni.navigateTo({
url: '/pages/login/login'
});
}
}
});
return;
}
uni.navigateTo({ uni.navigateTo({
url: '/newPages/examinationList/index' url: '/newPages/examinationList/index'
}); });
break; break;
case '评价': case '评价':
if (!getToken()) {
uni.showModal({
title: '未登录',
content: '请先登录',
confirmText: '去登录',
success: (res) => {
if (res.confirm) {
uni.navigateTo({
url: '/pages/login/login'
});
}
}
});
return;
}
uni.navigateTo({ uni.navigateTo({
url: '/newPages/evaluate/index' url: '/newPages/evaluate/index'
}); });

16
newPages/orderDetails/index.vue
View File

@ -21,8 +21,10 @@
<image :src="imageUrl + '/' + orderData.photo" class="course-image"></image> <image :src="imageUrl + '/' + orderData.photo" class="course-image"></image>
<view class="course-detail"> <view class="course-detail">
<text class="course-title">{{ orderData.courseName }}</text> <text class="course-title">{{ orderData.courseName }}</text>
<view class='course-twoType'>
<text class="course-type" >{{ orderData.courseType }}</text> <text class="course-type" >{{ getLicenseTypeDescription(orderData.courseType) }}</text>
<text class="course-type" >{{ orderData.courseType }}</text>
</view>
<text class="course-desc">{{ courseDetails.tittle }}</text> <text class="course-desc">{{ courseDetails.tittle }}</text>
</view> </view>
</view> </view>
@ -535,13 +537,19 @@ export default {
margin-bottom: 24rpx; margin-bottom: 24rpx;
} }
.course-twoType {
width: 90%;
display: flex;
justify-content: flex-start;
}
.course-type { .course-type {
width: 35rpx; font-size: 22rpx;
font-size: 24rpx;
padding: 4rpx 16rpx; padding: 4rpx 16rpx;
border-radius: 8rpx; border-radius: 8rpx;
color: #fff; color: #fff;
background-color: #2979ff; background-color: #2979ff;
margin-right: 10rpx;
} }
.type-C1 { .type-C1 {

41
newPages/register/index.vue
View File

@ -154,7 +154,7 @@ import headers from '../../components/header/headers.vue'
import request from '@/utils/request.js' import request from '@/utils/request.js'
import tabbar from '../../components/tabbar/tabbar.vue' import tabbar from '../../components/tabbar/tabbar.vue'
import upload from '@/utils/upload.js' import upload from '@/utils/upload.js'
import {getLocalUserInfo} from '../../utils/auth' import {getLocalUserInfo,getToken} from '../../utils/auth'
export default { export default {
data() { data() {
@ -220,7 +220,7 @@ export default {
], ],
} }
}, },
onLoad: function (option) { onLoad(option) {
uni.showToast({ uni.showToast({
title: '请完善个人信息', title: '请完善个人信息',
icon: 'none' icon: 'none'
@ -325,7 +325,10 @@ export default {
this.show = false this.show = false
}, },
goback() { goback() {
uni.navigateBack() // uni.navigateBack()
uni.navigateBack({
delta: 1
});
}, },
changeStartPay(id) { changeStartPay(id) {
this.startPay = id this.startPay = id
@ -817,7 +820,35 @@ export default {
}, },
// 插入学员信息 // 插入学员信息
insertSchoolStudent() { insertSchoolStudent() {
const studentData = {
avatar: this.userinfo.avatar,
name: this.name,
age: this.age,
sex: this.sex,
phone: this.phone,
idCard: this.identity,
registAddress: this.Address,
userId: this.userinfo.id,
tenantId: this.tenantId,
idPhoto: this.sfzimg,
};
// 如果选择了教练，添加source和sourceUserId
if (this.jlId) {
studentData.source = '02';
studentData.sourceUserId = this.jlId; // 设置来源用户ID为教练ID
}
request({
url: '/app-api/small/dl-drive-school-student/create',
method: 'post',
data: studentData
});
this.updateSysUsersNickName();
},
/* insertSchoolStudent() {
request({ request({
url: '/app-api/small/dl-drive-school-student/create', url: '/app-api/small/dl-drive-school-student/create',
method: 'post', method: 'post',
@ -835,7 +866,7 @@ export default {
} }
}) })
this.updateSysUsersNickName() this.updateSysUsersNickName()
}, }, */
// 修改users信息 // 修改users信息
updateSysUsersNickName(){ updateSysUsersNickName(){

2
newPages/schoolDetail/index.vue
View File

@ -180,7 +180,6 @@ export default {
}, },
onLoad(options) { onLoad(options) {
if (options.id) {
this.schoolId = options.id; this.schoolId = options.id;
this.tenantId = options.tenantId; this.tenantId = options.tenantId;
this.schoolName = options.schoolName; this.schoolName = options.schoolName;
@ -189,7 +188,6 @@ export default {
this.getSchoolClass(); this.getSchoolClass();
this.getSchoolAllClass() this.getSchoolAllClass()
this.getSchoolCoach() this.getSchoolCoach()
}
}, },
methods: { methods: {
handleBack() { handleBack() {

1
pages/login/login.vue
View File

@ -255,6 +255,7 @@ export default {
uni.reLaunch({ uni.reLaunch({
url: '/newPages/newIndex/index' url: '/newPages/newIndex/index'
}) })
// uni.navigateBack()
}) })
}, },