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:
#	newPages/examinationList/index.vue
This commit is contained in:
Lx 2025-04-09 10:57:49 +08:00
commit 1747d849cf
12 changed files with 715 additions and 641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
newPages/appointment/index.vue
View File

@ -9,7 +9,7 @@
<u-subsection :list="list" :current="curNow" @change="sectionChange"></u-subsection>
</view>
<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_4 flex-col" v-for="item in appointmentList" @click="goDetail(item,'')" :key="item.id">
@ -82,6 +82,13 @@
</view>
</view>
</scroll-view>
<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()">
<text class="text_19">预约</text>
@ -138,10 +145,10 @@
},
getList() {
request({
url: '/app-api/drivingSchool/system/reservationCourse/list',
url: '/app-api/reservation-course/page',
method: 'GET',
params: {
pageNum: this.pageNo,
pageNo: this.pageNo,
pageSize: this.pageSize,
ifCancel: false
},
@ -165,7 +172,7 @@
params: {
pageNum: this.pageNo,
pageSize: this.pageSize,
selectType: 'all'
selectType: 'my'
},
tenantIdFlag: false
}).then(res => {
@ -279,4 +286,11 @@
margin: 8rpx 0 0 12rpx;
}
}
.empty-container {
display: flex;
justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */
height: 100vh; /* 或者你需要撑满的高度 */
}
</style>

105
newPages/appointmentAdd/index.vue
View File

@ -9,20 +9,20 @@
<view class="" style="background-color: white;padding: 10rpx 15rpx;border-radius: 15rpx">
<u-form labelPosition="left" labelWidth="auto" labelAlign="center" :model="appointmentInfo"
: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"
placeholder="请选择课程" border="none"></u-input>
<u-icon slot="right" name="arrow-right"></u-icon>
</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"
placeholder="请选择训练类型" border="none"></u-input>
</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"
placeholder="请选择科目" border="none"></u-input>
</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"
placeholder="请选择教练" border="none"></u-input>
</u-form-item>
@ -33,17 +33,17 @@
<view class="form_">
<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-item label="累计训练时长" prop="userInfo.name" ref="item1">
<u-form-item label="累计训练时长" prop="name" ref="item1">
<u-input v-model="appointmentInfo.trainTime" disabled disabledColor="#ffffff"
border="none"></u-input>
</u-form-item>
<u-form-item label="日期选择" prop="userInfo.sex" @click="showDate = true;"
<u-form-item label="日期选择" prop="dateStr" @click="showDate = true;"
ref="item1">
<u-input v-model="appointmentInfo.dateStr" disabled disabledColor="#ffffff"
placeholder="请选择日期" border="none"></u-input>
<u-icon slot="right" name="arrow-right"></u-icon>
</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">
<u-input v-model="appointmentInfo.time" disabled disabledColor="#ffffff"
placeholder="请选择时间范围" border="none"></u-input>
@ -65,26 +65,26 @@
</view>
</template>
<script>
import headers from "@/components/header/headers.vue";
import request from "@/utils/request";
import {getDictDataByType} from "@/utils/utils";
import headers from "@/components/header/headers.vue";
import request from "@/utils/request";
import {getDictDataByType} from "@/utils/utils";
import {getLocalUserInfo} from "@/utils/auth";
export default {
export default {
components: {
headers
},
data() {
return {
rules: {}, // 确保 rules 至少是一个空对象
constants: {},
appointmentInfo: {
subjectStr: '',
courseName: '',
coachName: '',
trainTime: '',
dateStr:'',
dateStr: '',
time: '',
coachId:'',
coachId: '',
}, // 预约信息
showCourse: false,
courseList: [], //报名的课程信息
@ -102,7 +102,34 @@
],
//时间段数组 查询字典
timeColumns: '',
showSubject: false
showSubject: false,
rules: {
time: [{
required: true,
message: '请选择时间',
trigger: 'change'
}],
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() {
@ -110,6 +137,10 @@
this.timeColumns = await getDictDataByType('school_reserv_time');
console.log('字典', this.timeColumns)
},
onReady() {
//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
this.$refs.uForm.setRules(this.rules)
},
methods: {
goback() {
uni.navigateBack()
@ -157,7 +188,7 @@
title: '提示',
content: '请先报名课程',
showCancel: false,
success: function(res) {
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
uni.navigateBack()
@ -190,10 +221,8 @@
// 找出正在训练中的科目并且科目不是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.subjectStr = this.subjectColumns.find(item => item.value == subject).label
})
this.appointmentInfo.coachName = progress[0].coachName
this.appointmentInfo.coachId = progress[0].coachId
@ -205,7 +234,7 @@
title: '提示',
content: '只能预约训练科目二和科目三',
showCancel: false,
success: function(res) {
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
uni.navigateBack()
@ -230,17 +259,23 @@
console.log(res)
})
},
submit(){
request({
url: '/app-api/drivingSchool/system/reservationCourse',
method: 'POST',
data: {
submit() {
// 获取当前登陆人
this.$refs.uForm.validate().then(res => {
const userInfo = getLocalUserInfo()
const data = {
...this.appointmentInfo,
userId: userInfo.id,
userName: userInfo.nickname,
tenantId: this.tenantId,
reservDay: this.appointmentInfo.dateStr,
reservTime: this.appointmentInfo.time,
subject: this.appointmentInfo.subject,
}
request({
url: '/app-api/reservation-course/create',
method: 'PUT',
data: data
}).then(res => {
console.log(res)
uni.showToast({
@ -253,27 +288,29 @@
uni.navigateBack()
}, 2000)
})
}).catch(errors => {
})
},
}
};
};
</script>
<style lang='scss'>
@import '../common/common.scss';
@import './assets/style/index.rpx.scss';
@import '../common/common.scss';
@import './assets/style/index.rpx.scss';
.bottom_ {
.bottom_ {
position: fixed;
bottom: 0;
}
}
.header {
.header {
width: 100%;
background: #f4f5f6;
box-sizing: border-box;
padding-top: 88px;
}
}
.form_ {
.form_ {
padding: 10rpx 20rpx;
}
}
</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 class="text-wrapper_5 flex-row justify-between" v-if="!isTrain">
<text class="text_12">累计训练时长</text>
<text class="text_13">{{ appointmentInfo.allDriveTime }}分钟</text>
<text class="text_13">{{ appointmentInfo.trainTime }}分钟</text>
</view>
<view class="text-wrapper_6 flex-row justify-between" v-if="isTrain">
<text class="text_14">训练地址</text>
@ -56,7 +56,7 @@
<view class="text-wrapper_9 flex-col" v-if="!isTrain">
<text class="text_20">审核意见</text>
<text class="text_21">
{{ appointmentInfo.remark == null ? '暂无' : appointmentInfo.remark }}
{{ appointmentInfo.refuseReason == null ? '暂无' : appointmentInfo.refuseReason }}
</text>
</view>
</view>
@ -112,11 +112,11 @@ export default {
console.log("匹配的训练时间数据:", data);
this.appointmentInfo.allDriveTime = data ? data.trainTime || "0" : "0";
this.appointmentInfo.trainTime = data ? data.trainTime || "0" : "0";
console.log(
"this.appointmentInfo.allDriveTime",
this.appointmentInfo.allDriveTime
"this.appointmentInfo.trainTime",
this.appointmentInfo.trainTime
);
} catch (error) {
console.error("获取训练时间失败:", error);

4
newPages/courseDetail/assets/style/index.rpx.scss
View File

@ -2,7 +2,7 @@
background-color: rgba(242, 244, 248, 1);
position: relative;
width: 750rpx;
height: 4112rpx;
//height: 4112rpx;
overflow: hidden;
.group_1 {
background-color: rgba(255, 255, 255, 1);
@ -247,7 +247,7 @@
.group_5 {
background-color: rgba(255, 255, 255, 1);
border-radius: 8px;
height: 2870rpx;
//height: 2870rpx;
width: 686rpx;
position: relative;
margin: -30rpx 0 0 32rpx;

37
newPages/courseDetail/index.vue
View File

@ -1,17 +1,9 @@
<template>
<view class="page flex-col">
<view class="group_1 flex-row">
</view>
<view class="group_2 flex-row">
<image
class="label_1"
referrerpolicy="no-referrer"
src="/static/lanhu_kechengxiangqing/FigmaDDSSlicePNG53ddee177d4f9800624b95a9ec941112.png"
@click="goBack()"
/>
<text class="text_2">课程详情</text>
<view style="width: 100%;background: #f4f5f6;box-sizing: border-box;padding-top: 88px;">
<headers titles="课程详情">
<uni-icons type="left" color="#000000" size="22px"></uni-icons>
</headers>
</view>
<view class="group_3 flex-col">
<image
@ -41,20 +33,11 @@
<view class="group_5 flex-col">
<view class="section_4 flex-row justify-between">
<view class="block_3 flex-col"></view>
<text class="text_10">报名类型</text>
<text class="text_10">课程介绍</text>
</view>
<view class="image-wrapper_2 flex-row">
<image
class="image_2"
referrerpolicy="no-referrer"
src="/static/lanhu_kechengxiangqing/FigmaDDSSlicePNG156254d307fe40d6e67828fbe5adb90f.png"
/>
<view class="u-content">
<u-parse :content="courseDetails.remark"></u-parse>
</view>
<image
class="image_3"
referrerpolicy="no-referrer"
src="/static/lanhu_kechengxiangqing/FigmaDDSSlicePNG40a433e56593a25193fc18c2d385444f.png"
/>
</view>
<view class="group_6 flex-row">
<view class="image-text_1 flex-col justify-between" @click="zxkf()">
@ -75,8 +58,10 @@
import request from "@/utils/request";
import config from "@/config.js"
import {getLocalUserInfo, getUserInfo} from "@/utils/auth";
import headers from "@/components/header/headers.vue";
export default {
components: {headers},
data() {
return {
courseId: undefined,
@ -149,4 +134,8 @@ export default {
<style lang='scss'>
@import '../common/common.scss';
@import './assets/style/index.rpx.scss';
.u-content{
margin-top: 20rpx;
padding: 10rpx;
}
</style>

22
newPages/evaluate/index.vue
View File

@ -6,7 +6,7 @@
</headers>
</view>
<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"
@scrolltolower="onReachBottomCus" refresher-enabled @refresherrefresh="onRefresherrefresh"
:refresher-triggered="isTriggered">
@ -38,6 +38,12 @@
</view>
</scroll-view>
</view>
<view class="empty-container" v-else>
<u-empty
mode="data"
text="评价为空"
/>
</view>
</view>
</view>
</template>
@ -148,4 +154,18 @@
<style lang='scss'>
@import '../common/common.scss';
@import './assets/style/index.rpx.scss';
.empty-container {
display: flex;
justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */
height: 100vh; /* 或者你需要撑满的高度 */
}
.text-group_1 {
display: inline-block;
max-width: 4em; /* 一个汉字大概占1em，3em就是三个字 */
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
</style>

14
newPages/evaluateAdd/index.vue
View File

@ -111,8 +111,13 @@
} else if (options.type === 'kaoshi') {
this.title = '考试'
//评价类型为考试
this.info.evaluateType = 0
this.info.evaluateType = 1
this.info.busiId = data.batchItemId
}
this.info.createTime = undefined
this.info.updataTime = undefined
this.info.creator = undefined
this.info.updater = undefined
} else {
Object.assign(this.info, data);
}
@ -171,4 +176,11 @@
justify-content: center;
/* 新增：水平居中 */
}
.text-group_2 {
display: inline-block;
max-width: 4em; /* 一个汉字大概占1em，3em就是三个字 */
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
</style>

56
newPages/examinationList/index.vue
View File

@ -25,11 +25,14 @@
<view
class="box_5 flex-col" v-for="(item, index) in examList"
:key="index"
:style="{ height: (item.subject != 2 && item.subject != 3) ? '210rpx' : 'auto' }">
:style="{ height: ((item.subject != 2 && item.subject != 3) || getButtonInfo(item).text === '1') ? '230rpx' : 'auto' }">
<view class="block_3 flex-row justify-between">
<view class="text-group_1 flex-col justify-between">
<text class="text_2" v-if="item.subject == 1 || item.subject == 4">{{ formatDate(item.examTime) }}</text>
<text class="text_2" v-if="item.subject == 1 || item.subject == 4">{{
formatDate(item.examTime)
}}
</text>
<text class="text_2" v-else>{{ formatDate(item.startTime) }}</text>
<text class="text_3">{{ item.courseName }}</text>
@ -42,7 +45,7 @@
</view>
<view class="block_4 flex-row justify-between">
<view class="text-wrapper_1 flex-col">
<text class="text_6">{{getCourseTypeText(item.subject)}}</text>
<text class="text_6">{{ getCourseTypeText(item.subject) }}</text>
</view>
<view class="text-wrapper_2 flex-col">
<text class="text_7">{{ item.courseType }}</text>
@ -52,8 +55,8 @@
<text class="text_8">考试地址：</text>
<text class="text_9">{{ item.addr }}</text>
</view>
<view class="block_5 flex-row" v-if="item.subject == 2 || item.subject == 3">
<view class="text-wrapper_4 flex-col" @click="handleButtonClick(item)">
<view class="block_5 flex-row" v-if="(item.subject == 2 || item.subject == 3) && getButtonInfo(item).text !== '1'">
<view class="text-wrapper_4 flex-col" @click="handleButtonClick(item)" >
<!-- <text class="text_10" v-if="item.fraction != null && item.ifPass">开始评价</text>
<text class="text_10" v-else-if="item.fraction == null && (item.ifPass == null || item.ifPass == 0)">成绩录入</text>
<text class="text_10" v-else-if="!item.ifEvaluate">查看评价</text> -->
@ -113,8 +116,9 @@
</template>
<script>
import { getLocalUserInfo } from '../../utils/auth';
import {getLocalUserInfo} from '../../utils/auth';
import request from '@/utils/request.js'
export default {
data() {
return {
@ -156,7 +160,7 @@ export default {
isTriggered: false,
};
},
onLoad(){
onLoad() {
this.userInfo = getLocalUserInfo()
this.getExamList()
this.getCourseList()
@ -267,10 +271,10 @@ export default {
});
},
getExamList(){
getExamList() {
request({
url: '/app-api/process/getExamListByUserId',
method:'GET',
method: 'GET',
params: {
userId: this.userInfo.id,
}
@ -278,11 +282,11 @@ export default {
this.examList = res.data
this.getExamTwoList()
console.log('examList', this.examList)
console.log('res',res)
console.log('res', res)
this.isTriggered = false
})
},
getExamTwoList(){
getExamTwoList() {
request({
url: '/app-api/examBatch/selectExamByUserIdAndCoachId',
method: 'GET',
@ -292,16 +296,16 @@ export default {
}).then(res => {
this.examTwoList = res.data
console.log('examTwoList', this.examTwoList)
console.log('resTwo',res)
console.log('resTwo', res)
})
},
getCourseList(){
getCourseList() {
request({
url:'/app-api/small/drive/school-course-order/getCourseByLoginUser',
url: '/app-api/small/drive/school-course-order/getCourseByLoginUser',
method: 'GET'
}).then(res => {
this.courseList = res.data
console.log('res111',res)
console.log('res111', res)
})
},
getStatusText(status) {
@ -345,21 +349,24 @@ export default {
getButtonInfo(item) {
console.log('item', item)
if (item.fraction == null ) {
return { text: '成绩录入', type: 'input' }
if (item.fraction == null) {
return {text: '成绩录入', type: 'input'}
} else if (!item.ifPass) {
return { text: '成绩录入', type: 'input' }
} else if (item.ifEvaluate) {
return { text: '查看评价', type: 'view' }
} else {
return { text: '开始评价', type: 'evaluate' }
return {text: '考试未通过', type: 'failed'}
} else if (!item.ifEvaluate) {
return {text: '开始评价', type: 'evaluate'}
}else {
return {text: '1', type: 'evaluate'}
}
// else if (item.ifEvaluate) {
// return { text: '查看评价', type: 'view' }
// }
},
handleButtonClick(item) {
const buttonInfo = this.getButtonInfo(item)
switch(buttonInfo.type) {
switch (buttonInfo.type) {
case 'input':
this.goScoreInput(item)
break
@ -382,8 +389,9 @@ export default {
},
// 跳转到开始评价页面
goEvaluate(item) {
item = JSON.stringify(item)
uni.navigateTo({
url: `/newPages/evaluation/index?batchId=${item.batchId}&evaluateId=${item.evaluateId || ''}`
url: `/newPages/evaluateAdd/index?data=${item}&type=kaoshi&controls=add`
})
},

10
newPages/newIndex/index.vue
View File

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

16
newPages/register/index.vue
View File

@ -104,7 +104,7 @@
<view @click="changeStartPay(2)" class="dj-list">
<view class="dj-list-left">
<image class="dj-list-left-img" src="../../static/imgs/yfk.png" mode=""></image>
<image class="dj-list-left-img" src="../../static/imgs/yfk2.png" mode=""></image>
<view class="dj-list-left-name">线下支付</view>
</view>
<view class="dj-list-right">
@ -116,7 +116,7 @@
</view>
<view @click="changeStartPay(1)" class="dj-list">
<view class="dj-list-left">
<image class="dj-list-left-img" src="../../static/imgs/qbdd.png" mode=""></image>
<image class="dj-list-left-img" src="../../static/imgs/qbdd2.png" mode=""></image>
<view class="dj-list-left-name">微信</view>
</view>
<view class="dj-list-right">
@ -753,7 +753,7 @@ export default {
.bm-page-button-main {
border-radius: 50rpx;
background-color: #4aa76f;
background-color: #2C78F5;
color: #fff;
}
}
@ -866,7 +866,7 @@ export default {
font-size: 22rpx;
.bm-page-right-zd {
background-color: rgba(94, 255, 153, 0.2);
background-color: #dfebff;
}
.bm-page-right-c2 {
@ -921,8 +921,8 @@ export default {
height: 18px;
border-radius: 50%;
overflow: hidden;
border: 1px solid #4aa76f;
background: #4aa76f;
border: 1px solid #2C78F5;
background: #2C78F5;
display: flex;
align-items: center;
justify-content: center;
@ -938,7 +938,7 @@ export default {
width: 120px;
height: 35px;
border-radius: 4px;
background: #4aa76f;
background: #2C78F5;
color: #fff;
display: flex;
align-items: center;
@ -961,7 +961,7 @@ export default {
.clv {
color: #fff;
background: #4aa76f;
background: #2C78F5;
width: 26px;
height: 26px;
border-radius: 50%;

BIN
static/imgs/qbdd2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 660 B

BIN
static/imgs/yfk2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 580 B