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

更新

Browse Source
This commit is contained in:
许允枞 2025-04-08 17:00:07 +08:00
parent 58c3b759bf
commit ca09addd0b
5 changed files with 328 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
newPages/appointment/index.vue
View File

@ -9,7 +9,7 @@
<u-subsection :list="list" :current="curNow" @change="sectionChange"></u-subsection> <u-subsection :list="list" :current="curNow" @change="sectionChange"></u-subsection>
</view> </view>
<scroll-view style="height: 1200rpx;" scroll-y="true" class="itemContent" @scrolltolower="onReachBottomCus" <scroll-view style="height: 1200rpx;" scroll-y="true" class="itemContent" @scrolltolower="onReachBottomCus"
refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered"> refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered" v-if="appointmentList.length > 0">
<!-- 新增内容容器 --> <!-- 新增内容容器 -->
<view class="box_2 flex-col" v-if="curNow === 0"> <view class="box_2 flex-col" v-if="curNow === 0">
<view class="box_4 flex-col" v-for="item in appointmentList" @click="goDetail(item,'')" :key="item.id"> <view class="box_4 flex-col" v-for="item in appointmentList" @click="goDetail(item,'')" :key="item.id">
@ -82,7 +82,14 @@
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<view class="box_6 flex-col bottom_"> <view class="empty-container" v-else>
<u-empty
mode="data"
/>
</view>
<view class="box_6 flex-col bottom_">
<view class="text-wrapper_12 flex-col " @click="goAppointment()"> <view class="text-wrapper_12 flex-col " @click="goAppointment()">
<text class="text_19">预约</text> <text class="text_19">预约</text>
</view> </view>
@ -138,10 +145,10 @@
}, },
getList() { getList() {
request({ request({
url: '/app-api/drivingSchool/system/reservationCourse/list', url: '/app-api/reservation-course/page',
method: 'GET', method: 'GET',
params: { params: {
pageNum: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
ifCancel: false ifCancel: false
}, },
@ -165,7 +172,7 @@
params: { params: {
pageNum: this.pageNo, pageNum: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
selectType: 'all' selectType: 'my'
}, },
tenantIdFlag: false tenantIdFlag: false
}).then(res => { }).then(res => {
@ -279,4 +286,11 @@
margin: 8rpx 0 0 12rpx; margin: 8rpx 0 0 12rpx;
} }
} }
.empty-container {
display: flex;
justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */
height: 100vh; /* 或者你需要撑满的高度 */
}
</style> </style>

541
newPages/appointmentAdd/index.vue
View File

@ -1,246 +1,281 @@
<template> <template>
<view class="page flex-col"> <view class="page flex-col">
<view class="header"> <view class="header">
<headers titles="预约"> <headers titles="预约">
<uni-icons type="left" color="#000000" size="22px"></uni-icons> <uni-icons type="left" color="#000000" size="22px"></uni-icons>
</headers> </headers>
</view> </view>
<view class="form_"> <view class="form_">
<view class="" style="background-color: white;padding: 10rpx 15rpx;border-radius: 15rpx"> <view class="" style="background-color: white;padding: 10rpx 15rpx;border-radius: 15rpx">
<u-form labelPosition="left" labelWidth="auto" labelAlign="center" :model="appointmentInfo" <u-form labelPosition="left" labelWidth="auto" labelAlign="center" :model="appointmentInfo"
:rules="rules" ref="uForm"> :rules="rules" ref="uForm">
<u-form-item label="课程名称" prop="userInfo.name" @click="showCourse = true" ref="item1"> <u-form-item label="课程名称" prop="courseName" @click="showCourse = true" ref="item1">
<u-input v-model="appointmentInfo.courseName" disabled disabledColor="#ffffff" <u-input v-model="appointmentInfo.courseName" disabled disabledColor="#ffffff"
placeholder="请选择课程" border="none"></u-input> placeholder="请选择课程" border="none"></u-input>
<u-icon slot="right" name="arrow-right"></u-icon> <u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item> </u-form-item>
<u-form-item label="训练类型" prop="userInfo.sex" ref="item1"> <u-form-item label="训练类型" prop="courseType" ref="item1">
<u-input v-model="appointmentInfo.courseType" disabled disabledColor="#ffffff" <u-input v-model="appointmentInfo.courseType" disabled disabledColor="#ffffff"
placeholder="请选择训练类型" border="none"></u-input> placeholder="请选择训练类型" border="none"></u-input>
</u-form-item> </u-form-item>
<u-form-item label="选择科目" prop="userInfo.sex" ref="item1"> <u-form-item label="选择科目" prop="subject" ref="item1">
<u-input v-model="appointmentInfo.subjectStr" disabled disabledColor="#ffffff" <u-input v-model="appointmentInfo.subjectStr" disabled disabledColor="#ffffff"
placeholder="请选择科目" border="none"></u-input> placeholder="请选择科目" border="none"></u-input>
</u-form-item> </u-form-item>
<u-form-item label="教练名称" prop="userInfo.sex" ref="item1"> <u-form-item label="教练名称" prop="coachName" ref="item1">
<u-input v-model="appointmentInfo.coachName" disabled disabledColor="#ffffff" <u-input v-model="appointmentInfo.coachName" disabled disabledColor="#ffffff"
placeholder="请选择教练" border="none"></u-input> placeholder="请选择教练" border="none"></u-input>
</u-form-item> </u-form-item>
</u-form> </u-form>
</view> </view>
</view> </view>
<view class="form_"> <view class="form_">
<view class="" style="background-color: white;padding: 10rpx 15rpx;border-radius: 15rpx"> <view class="" style="background-color: white;padding: 10rpx 15rpx;border-radius: 15rpx">
<u-form labelPosition="left" labelWidth="auto" :model="appointmentInfo" :rules="rules" ref="uForm"> <u-form labelPosition="left" labelWidth="auto" :model="appointmentInfo" :rules="rules" ref="uForm">
<u-form-item label="累计训练时长" prop="userInfo.name" ref="item1"> <u-form-item label="累计训练时长" prop="name" ref="item1">
<u-input v-model="appointmentInfo.trainTime" disabled disabledColor="#ffffff" <u-input v-model="appointmentInfo.trainTime" disabled disabledColor="#ffffff"
border="none"></u-input> border="none"></u-input>
</u-form-item> </u-form-item>
<u-form-item label="日期选择" prop="userInfo.sex" @click="showDate = true;" <u-form-item label="日期选择" prop="dateStr" @click="showDate = true;"
ref="item1"> ref="item1">
<u-input v-model="appointmentInfo.dateStr" disabled disabledColor="#ffffff" <u-input v-model="appointmentInfo.dateStr" disabled disabledColor="#ffffff"
placeholder="请选择日期" border="none"></u-input> placeholder="请选择日期" border="none"></u-input>
<u-icon slot="right" name="arrow-right"></u-icon> <u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item> </u-form-item>
<u-form-item label="时间范围" prop="userInfo.sex" borderBottom @click="showTime = true;" <u-form-item label="时间范围" prop="time" borderBottom @click="showTime = true;"
ref="item1" :borderBottom="false"> ref="item1" :borderBottom="false">
<u-input v-model="appointmentInfo.time" disabled disabledColor="#ffffff" <u-input v-model="appointmentInfo.time" disabled disabledColor="#ffffff"
placeholder="请选择时间范围" border="none"></u-input> placeholder="请选择时间范围" border="none"></u-input>
<u-icon slot="right" name="arrow-right"></u-icon> <u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item> </u-form-item>
</u-form> </u-form>
</view> </view>
</view> </view>
<u-picker :show="showCourse" @close="showCourse = false" keyName="courseName" @cancel="showCourse = false" <u-picker :show="showCourse" @close="showCourse = false" keyName="courseName" @cancel="showCourse = false"
@confirm="confirmCourse" :columns="[courseList]"></u-picker> @confirm="confirmCourse" :columns="[courseList]"></u-picker>
<u-picker :show="showTime" @close="showTime = false" keyName="label" @cancel="showTime = false" <u-picker :show="showTime" @close="showTime = false" keyName="label" @cancel="showTime = false"
@confirm="confirmTime" :columns="[timeColumns]"></u-picker> @confirm="confirmTime" :columns="[timeColumns]"></u-picker>
<u-calendar :show="showDate" @confirm="confirmDate" @close="showDate = false"></u-calendar> <u-calendar :show="showDate" @confirm="confirmDate" @close="showDate = false"></u-calendar>
<view class="section_4 flex-col bottom_"> <view class="section_4 flex-col bottom_">
<view class="text-wrapper_5 flex-col" @click="submit"> <view class="text-wrapper_5 flex-col" @click="submit">
<text class="text_10">开始预约</text> <text class="text_10">开始预约</text>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import headers from "@/components/header/headers.vue"; import headers from "@/components/header/headers.vue";
import request from "@/utils/request"; import request from "@/utils/request";
import {getDictDataByType} from "@/utils/utils"; import {getDictDataByType} from "@/utils/utils";
import {getLocalUserInfo} from "@/utils/auth";
export default { export default {
components: { components: {
headers headers
}, },
data() { data() {
return { return {
rules: {}, // 确保 rules 至少是一个空对象 constants: {},
constants: {}, appointmentInfo: {
appointmentInfo: { subjectStr: '',
subjectStr: '', courseName: '',
courseName: '', coachName: '',
coachName: '', trainTime: '',
trainTime: '', dateStr: '',
dateStr:'', time: '',
time: '', coachId: '',
coachId:'', }, // 预约信息
}, // 预约信息 showCourse: false,
showCourse: false, courseList: [], //报名的课程信息
courseList: [], //报名的课程信息 showDate: false,
showDate: false, showTime: false,
showTime: false, tenantId: '',
tenantId: '', subjectColumns: [{
subjectColumns: [{ label: '科目二',
label: '科目二', value: 2
value: 2 },
}, {
{ label: '科目三',
label: '科目三', value: 3
value: 3 },
}, ],
], //时间段数组 查询字典
//时间段数组 查询字典 timeColumns: '',
timeColumns: '', showSubject: false,
showSubject: false rules: {
}; time: [{
}, required: true,
async onLoad() { message: '请选择时间',
this.getLoginUserCourseInfoList() trigger: 'change'
this.timeColumns = await getDictDataByType('school_reserv_time'); }],
console.log('字典', this.timeColumns) courseName: [{
required: true,
message: '请选择课程',
trigger: 'change'
}],
dateStr: [{
required: true,
message: '请选择日期',
trigger: 'change'
}],
coachName: [{
required: true,
message: '请选择教练',
trigger: 'change'
}],
subject: [{
required: true,
message: '请选择科目',
trigger: 'change'
}],
}
};
},
async onLoad() {
this.getLoginUserCourseInfoList()
this.timeColumns = await getDictDataByType('school_reserv_time');
console.log('字典', this.timeColumns)
},
onReady() {
//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
this.$refs.uForm.setRules(this.rules)
},
methods: {
goback() {
uni.navigateBack()
}, },
methods: { confirmCourse(e) {
goback() { this.restForm()
uni.navigateBack() this.appointmentInfo.courseId = e.value[0].courseId
}, this.appointmentInfo.courseName = e.value[0].courseName
confirmCourse(e) { this.appointmentInfo.courseType = e.value[0].courseType
this.restForm() this.tenantId = e.value[0].tenantId
this.appointmentInfo.courseId = e.value[0].courseId this.appointmentInfo.userName = e.value[0].userName
this.appointmentInfo.courseName = e.value[0].courseName this.appointmentInfo.userId = e.value[0].userId
this.appointmentInfo.courseType = e.value[0].courseType this.getAllByCourseId(e.value[0].courseId)
this.tenantId = e.value[0].tenantId console.log(e)
this.appointmentInfo.userName = e.value[0].userName this.showCourse = false
this.appointmentInfo.userId = e.value[0].userId },
this.getAllByCourseId(e.value[0].courseId) confirmDate(e) {
console.log(e) console.log(e)
this.showCourse = false this.appointmentInfo.dateStr = e[0]
}, console.log(this.appointmentInfo)
confirmDate(e) { this.showDate = false
console.log(e) },
this.appointmentInfo.dateStr = e[0] confirmTime(e) {
console.log(this.appointmentInfo) console.log(e)
this.showDate = false this.appointmentInfo.time = e.value[0].label
}, console.log(this.appointmentInfo)
confirmTime(e) { this.showTime = false
console.log(e) },
this.appointmentInfo.time = e.value[0].label restForm() {
console.log(this.appointmentInfo) this.appointmentInfo = {
this.showTime = false subjectStr: '',
}, courseName: '',
restForm() { coachName: '',
this.appointmentInfo = { trainTime: '',
subjectStr: '', }
courseName: '', },
coachName: '', // 查询所有报名科目
trainTime: '', getLoginUserCourseInfoList() {
} request({
}, url: '/app-api/small/drive/school-course-order/getCourseByLoginUser',
// 查询所有报名科目 method: 'GET'
getLoginUserCourseInfoList() { }).then(res => {
request({ if (res.data.length == 0) {
url: '/app-api/small/drive/school-course-order/getCourseByLoginUser', uni.showModal({
method: 'GET' title: '提示',
}).then(res => { content: '请先报名课程',
if (res.data.length == 0) { showCancel: false,
uni.showModal({ success: function (res) {
title: '提示', if (res.confirm) {
content: '请先报名课程', console.log('用户点击确定');
showCancel: false, uni.navigateBack()
success: function(res) { } else if (res.cancel) {
if (res.confirm) { console.log('用户点击取消');
console.log('用户点击确定');
uni.navigateBack()
} else if (res.cancel) {
console.log('用户点击取消');
}
} }
}); }
});
}
this.courseList = res.data
})
},
//根据课程id查询报名进度
async getAllByCourseId(courseId) {
console.log('courseId', courseId)
const res = await request({
url: '/app-api/process/getAllByCourseId',
method: 'GET',
params: {
courseId: courseId
}
})
// 找出正在训练中的科目并且科目不是1和4
// && item.subject != 1 && item.subject != 4
const progress = res.data.filter(item => {
return item.status == 1 && item.subject != 1 && item.subject != 4
})
if (progress.length > 0) {
console.log('正在训练中的科目', progress)
// 找出正在训练中的科目并且科目不是1和4
const subject = progress[0].subject
this.$nextTick(() => {
this.appointmentInfo.subject = subject
this.appointmentInfo.subjectStr = this.subjectColumns.find(item => item.value == subject).label
})
this.appointmentInfo.coachName = progress[0].coachName
this.appointmentInfo.coachId = progress[0].coachId
this.appointmentInfo.trainTime = progress[0].trainTime
console.log('subject', this.appointmentInfo)
} else {
// 弹窗只能预约训练科目二
uni.showModal({
title: '提示',
content: '只能预约训练科目二和科目三',
showCancel: false,
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
uni.navigateBack()
} else if (res.cancel) {
console.log('用户点击取消');
}
} }
this.courseList = res.data });
}) }
}, },
//根据课程id查询报名进度 // 查询训练地址
async getAllByCourseId(courseId) { getTrainAddress() {
console.log('courseId', courseId) request({
const res = await request({ url: '/app-api/small/address/getList',
url: '/app-api/process/getAllByCourseId', method: 'GET',
method: 'GET', params: {
params: { type: 0,
courseId: courseId subject: this.appointmentInfo.subject,
} tenantId: this.tenantId
}) }
// 找出正在训练中的科目并且科目不是1和4 }).then(res => {
// && item.subject != 1 && item.subject != 4 console.log(res)
const progress = res.data.filter(item => { })
return item.status == 1 && item.subject != 1 && item.subject != 4 },
}) submit() {
if (progress.length > 0) { // 获取当前登陆人
console.log('正在训练中的科目', progress) this.$refs.uForm.validate().then(res => {
// 找出正在训练中的科目并且科目不是1和4 const userInfo = getLocalUserInfo()
const subject = progress[0].subject const data = {
this.$nextTick(() => { ...this.appointmentInfo,
userId: userInfo.id,
this.appointmentInfo.subject = subject userName: userInfo.nickname,
this.appointmentInfo.subjectStr = this.subjectColumns.find(item => item.value == tenantId: this.tenantId,
subject).label reservDay: this.appointmentInfo.dateStr,
}) reservTime: this.appointmentInfo.time,
this.appointmentInfo.coachName = progress[0].coachName subject: this.appointmentInfo.subject,
this.appointmentInfo.coachId = progress[0].coachId }
this.appointmentInfo.trainTime = progress[0].trainTime
console.log('subject', this.appointmentInfo)
} else {
// 弹窗只能预约训练科目二
uni.showModal({
title: '提示',
content: '只能预约训练科目二和科目三',
showCancel: false,
success: function(res) {
if (res.confirm) {
console.log('用户点击确定');
uni.navigateBack()
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
}
},
// 查询训练地址
getTrainAddress() {
request({
url: '/app-api/small/address/getList',
method: 'GET',
params: {
type: 0,
subject: this.appointmentInfo.subject,
tenantId: this.tenantId
}
}).then(res => {
console.log(res)
})
},
submit(){
request({ request({
url: '/app-api/drivingSchool/system/reservationCourse', url: '/app-api/reservation-course/create',
method: 'POST', method: 'PUT',
data: { data: data
...this.appointmentInfo,
tenantId: this.tenantId,
reservDay: this.appointmentInfo.dateStr,
reservTime: this.appointmentInfo.time,
subject: this.appointmentInfo.subject,
}
}).then(res => { }).then(res => {
console.log(res) console.log(res)
uni.showToast({ uni.showToast({
@ -253,27 +288,29 @@
uni.navigateBack() uni.navigateBack()
}, 2000) }, 2000)
}) })
}, }).catch(errors => {
} })
}; },
}
};
</script> </script>
<style lang='scss'> <style lang='scss'>
@import '../common/common.scss'; @import '../common/common.scss';
@import './assets/style/index.rpx.scss'; @import './assets/style/index.rpx.scss';
.bottom_ { .bottom_ {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
} }
.header { .header {
width: 100%; width: 100%;
background: #f4f5f6; background: #f4f5f6;
box-sizing: border-box; box-sizing: border-box;
padding-top: 88px; padding-top: 88px;
} }
.form_ { .form_ {
padding: 10rpx 20rpx; padding: 10rpx 20rpx;
} }
</style> </style>

10
newPages/appointmentDetail/index.vue
View File

@ -37,7 +37,7 @@
<view style="width: 90%; height: 1px; background-color: #e0e0e0; margin: 20px 10rpx auto;"></view> <view style="width: 90%; height: 1px; background-color: #e0e0e0; margin: 20px 10rpx auto;"></view>
<view class="text-wrapper_5 flex-row justify-between" v-if="!isTrain"> <view class="text-wrapper_5 flex-row justify-between" v-if="!isTrain">
<text class="text_12">累计训练时长</text> <text class="text_12">累计训练时长</text>
<text class="text_13">{{ appointmentInfo.allDriveTime }}分钟</text> <text class="text_13">{{ appointmentInfo.trainTime }}分钟</text>
</view> </view>
<view class="text-wrapper_6 flex-row justify-between" v-if="isTrain"> <view class="text-wrapper_6 flex-row justify-between" v-if="isTrain">
<text class="text_14">训练地址</text> <text class="text_14">训练地址</text>
@ -56,7 +56,7 @@
<view class="text-wrapper_9 flex-col" v-if="!isTrain"> <view class="text-wrapper_9 flex-col" v-if="!isTrain">
<text class="text_20">审核意见</text> <text class="text_20">审核意见</text>
<text class="text_21"> <text class="text_21">
{{ appointmentInfo.remark == null ? '暂无' : appointmentInfo.remark }} {{ appointmentInfo.refuseReason == null ? '暂无' : appointmentInfo.refuseReason }}
</text> </text>
</view> </view>
</view> </view>
@ -112,11 +112,11 @@ export default {
console.log("匹配的训练时间数据:", data); console.log("匹配的训练时间数据:", data);
this.appointmentInfo.allDriveTime = data ? data.trainTime || "0" : "0"; this.appointmentInfo.trainTime = data ? data.trainTime || "0" : "0";
console.log( console.log(
"this.appointmentInfo.allDriveTime", "this.appointmentInfo.trainTime",
this.appointmentInfo.allDriveTime this.appointmentInfo.trainTime
); );
} catch (error) { } catch (error) {
console.error("获取训练时间失败:", error); console.error("获取训练时间失败:", error);

14
newPages/evaluate/index.vue
View File

@ -6,7 +6,7 @@
</headers> </headers>
</view> </view>
<view class="group_4 flex-col"> <view class="group_4 flex-col">
<view class="list_1 flex-col"> <view class="list_1 flex-col" v-if="evaluate.length > 0">
<scroll-view style="height: 1400rpx;" scroll-y="true" class="itemContent" <scroll-view style="height: 1400rpx;" scroll-y="true" class="itemContent"
@scrolltolower="onReachBottomCus" refresher-enabled @refresherrefresh="onRefresherrefresh" @scrolltolower="onReachBottomCus" refresher-enabled @refresherrefresh="onRefresherrefresh"
:refresher-triggered="isTriggered"> :refresher-triggered="isTriggered">
@ -38,6 +38,12 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<view class="empty-container" v-else>
<u-empty
mode="data"
text="评价为空"
/>
</view>
</view> </view>
</view> </view>
</template> </template>
@ -148,4 +154,10 @@
<style lang='scss'> <style lang='scss'>
@import '../common/common.scss'; @import '../common/common.scss';
@import './assets/style/index.rpx.scss'; @import './assets/style/index.rpx.scss';
.empty-container {
display: flex;
justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */
height: 100vh; /* 或者你需要撑满的高度 */
}
</style> </style>

10
newPages/newIndex/index.vue
View File

@ -22,14 +22,7 @@
</view> </view>
<view class="box_4 flex-row justify-between"> <view class="box_4 flex-row justify-between">
<view class="image-text_2 flex-row justify-between"> <view class="image-text_2 flex-row justify-between">
<image <u-notice-bar direction="column" duration="10000" bgColor="#e9f1ff" color="black" :text="announcement" icon="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png"></u-notice-bar>
class="label_2"
referrerpolicy="no-referrer"
src="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png"
/>
<text class="text-group_2">
“高科技”驾考作弊团伙被抓，驾校校长教练负责介绍学员
</text>
</view> </view>
<view class="group_3 flex-col justify-between"> <view class="group_3 flex-col justify-between">
<view class="block_5 flex-col"></view> <view class="block_5 flex-col"></view>
@ -92,6 +85,7 @@ export default {
], ],
swiperList: [], swiperList: [],
msg: "1", msg: "1",
announcement:['ceshi1111','测试111111111111111111111111111111111111111111'],
constants: {}, constants: {},
schoolList: [ schoolList: [
// { // {