diff --git a/config/api.js b/config/api.js index 088a4c4..ff930c6 100644 --- a/config/api.js +++ b/config/api.js @@ -130,6 +130,13 @@ export const cancelSimulation = (data) => http.put(`business/exam-simulation-rec export const scheduleClass = (params) => http.get('business/booking/schedule-class/get', {params}) // 2,创建预约记录 export const masterCreate = (data) => http.post('business/booking/master/create', data) +// 3,获取实操预约记录 +export const masterPage = (params) => http.get('business/booking/master/page', {params}) +// 4,实操预约详情 +export const masterDetail = (params) => http.get('business/booking/master/get', {params}) +// 5实操取消预约 +export const masterCancelBooking = (data) => http.put('business/booking/master/cancelBooking', data) + diff --git a/config/request.js b/config/request.js index b31d288..e4c48b2 100644 --- a/config/request.js +++ b/config/request.js @@ -26,8 +26,8 @@ module.exports = (vm) => { // 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{} config.data = config.data || {} // 根据custom参数中配置的是否需要token，添加对应的请求头 - console.log('--------------') - console.log(config) + // console.log('--------------') + // console.log(config) let token = vm.$store.state.user.vuex_loginInfo.accessToken if(token) { config.header.Authorization = 'Bearer ' + token @@ -36,7 +36,6 @@ module.exports = (vm) => { if(noToken&&config.header.Authorization) { delete config.header.Authorization } - console.log(config) return config }, config => { // 可使用async await 做异步操作 return Promise.reject(config) @@ -45,9 +44,8 @@ module.exports = (vm) => { // 响应拦截 uni.$u.http.interceptors.response.use(async (response) => { /* 对响应成功做点什么 可使用async await 做异步操作*/ const data = response.data - console.log(response.config) - console.log('请求结果') - console.log(data) + // console.log('请求结果') + // console.log(data) if(data.code==406&&response.config.url!='member/auth/refresh-token'&&response.config.url!=='member/auth/logout') { await vm.$store.dispatch('refreshToken') // uni.$u.toast('登录过期，请重新登录') @@ -56,12 +54,11 @@ module.exports = (vm) => { // },1500) // console.log(response.config) let obj = response.config - if(obj.method=='GET') { - return uni.$u.http.get(obj.url, {params: obj.params}) - }else if(obj.method=='PUT'){ - return uni.$u.http.put(obj.url, obj.data ) - }else if(obj.method=='POST'){ - return uni.$u.http.post(obj.url, obj.data ) + let method = obj.method.toLowerCase() + if(method=='get') { + return uni.$u.http.method(obj.url, {params: obj.params}) + }else{ + return uni.$u.http.method(obj.url, obj.data ) } } if(data.code==401) { diff --git a/pages/carEntry/examineAppointment/comp/pickDate.vue b/pages/carEntry/examineAppointment/comp/pickDate.vue index 0dbbf45..59a5108 100644 --- a/pages/carEntry/examineAppointment/comp/pickDate.vue +++ b/pages/carEntry/examineAppointment/comp/pickDate.vue @@ -190,6 +190,7 @@ this.chooseDay = this.dateArr[this.currentDay][0].date }, chooseCourse(item) { + if(item.status!=0) return this.FormData.courseIds = this.courseIds = item.id this.FormData.classDate = item.classDate this.FormData.classTime = item.classTime diff --git a/pages/carEntry/operaAppointment/comp/pickDate.vue b/pages/carEntry/operaAppointment/comp/pickDate.vue index 376f0ec..cab0b50 100644 --- a/pages/carEntry/operaAppointment/comp/pickDate.vue +++ b/pages/carEntry/operaAppointment/comp/pickDate.vue @@ -14,11 +14,16 @@ - - - {{ item.week }} - {{ item.num }} - + + + + + {{ item.week }} + {{ item.num }} + + + + @@ -186,6 +191,7 @@ this.scheduleClassFn() }, chooseCourse(item) { + if(item.status!=0) return this.FormData.courseIds = this.courseIds = item.id this.FormData.classDate = item.classDate this.FormData.classTime = item.classTime diff --git a/pages/carEntry/simulateAppointment/comp/pickDate.vue b/pages/carEntry/simulateAppointment/comp/pickDate.vue index fc8206c..07be56b 100644 --- a/pages/carEntry/simulateAppointment/comp/pickDate.vue +++ b/pages/carEntry/simulateAppointment/comp/pickDate.vue @@ -192,6 +192,7 @@ this.chooseDay = this.dateArr[this.currentDay][0].date }, chooseCourse(item) { + if(item.status!=0) return this.FormData.courseIds = this.courseIds = item.id this.FormData.classDate = item.classDate this.FormData.classTime = item.classTime diff --git a/pages/carEntry/simulateAppointment/comp/step1 - 副本.vue b/pages/carEntry/simulateAppointment/comp/step1 - 副本.vue deleted file mode 100644 index aa79498..0000000 --- a/pages/carEntry/simulateAppointment/comp/step1 - 副本.vue +++ /dev/null @@ -1,251 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/carEntry/simulateAppointment/comp/step2.vue b/pages/carEntry/simulateAppointment/comp/step2.vue index 4bfdff3..2fc2cdc 100644 --- a/pages/carEntry/simulateAppointment/comp/step2.vue +++ b/pages/carEntry/simulateAppointment/comp/step2.vue @@ -28,6 +28,7 @@ methods: { changeStep(val) { + if(!this.FormData.courseIds) return this.$toast('请选择预约时间段') this.$emit('changeStep', val) }, diff --git a/pages/mineEntry/myAppointment/comp/comp.scss b/pages/mineEntry/myAppointment/comp/comp.scss index bfe0a65..150c60f 100644 --- a/pages/mineEntry/myAppointment/comp/comp.scss +++ b/pages/mineEntry/myAppointment/comp/comp.scss @@ -8,7 +8,10 @@ border-bottom: 2rpx dashed #E8E9EC; justify-content: space-between; align-items: center; - + .flex { + width: 0; + flex: 1; + } .tag { // width: 176rpx; height: 60rpx; @@ -18,6 +21,7 @@ font-size: 28rpx; color: #FA7919; margin-right: 24rpx; + white-space: nowrap; padding: 10rpx 18rpx; } @@ -25,15 +29,19 @@ font-size: 28rpx; color: #333; margin-left: 20rpx; + flex: 1; } .status { display: flex; align-items: center; - + width: 140rpx; + flex-shrink: 0; + text-align: right; .text { font-size: 28rpx; color: $themC; + white-space: nowrap; } } } diff --git a/pages/mineEntry/myAppointment/comp/opera.vue b/pages/mineEntry/myAppointment/comp/opera.vue index bbd39ed..b75bc8e 100644 --- a/pages/mineEntry/myAppointment/comp/opera.vue +++ b/pages/mineEntry/myAppointment/comp/opera.vue @@ -3,11 +3,12 @@ - 科目二实操 - xx模拟驾驶馆 + {{item.subject==2?'科目二实操':item.subject==3?'科目三实操':'不限科目'}} + {{item.siteName}} - 待处理 + 已取消 + {{statusTxt[item.loginStatus]}} @@ -21,7 +22,7 @@ 所选择车辆 - 000001 + {{item.carNumber}} @@ -30,19 +31,27 @@ 预约时间 - 2023/08/08 10:00:00 + {{$u.timeFormat(item.startTime, 'yyyy-mm-dd ')}} - - - 完成时间：2022-01-04 + + + 完成时间：{{$u.timeFormat(item.signOutTime, 'yyyy-mm-dd hh:MM:ss')}} - + 去评价