diff --git a/components/cancelReservation/cancelReservation.vue b/components/cancelReservation/cancelReservation.vue
index c769b6e..d4b15ae 100644
--- a/components/cancelReservation/cancelReservation.vue
+++ b/components/cancelReservation/cancelReservation.vue
@@ -1,7 +1,7 @@
+
+ 暂无预约排课
+
-
- 暂无预约排课
-
+
diff --git a/pages/carEntry/simulateAppointment/comp/step3.vue b/pages/carEntry/simulateAppointment/comp/step3.vue
index 1aebbd0..2e74bc2 100644
--- a/pages/carEntry/simulateAppointment/comp/step3.vue
+++ b/pages/carEntry/simulateAppointment/comp/step3.vue
@@ -2,7 +2,7 @@
-
+
{{ item.seq }}
@@ -30,7 +30,7 @@
预约模拟器
- {{ FormData.deviceName}}
+ {{ FormData.deviceNum}}
@@ -67,8 +67,8 @@
},
chooseDevice(item) {
- this.FormData.deviceNum = item.id
- this.FormData.deviceName = item.seq
+ this.FormData.deviceNum = item.seq
+ // this.FormData.deviceName = item.seq
},
confirmClick(item) {
diff --git a/pages/carEntry/simulateAppointment/simulateAppointment.vue b/pages/carEntry/simulateAppointment/simulateAppointment.vue
index 29e509e..0ea25ad 100644
--- a/pages/carEntry/simulateAppointment/simulateAppointment.vue
+++ b/pages/carEntry/simulateAppointment/simulateAppointment.vue
@@ -56,7 +56,7 @@
created() {
this.simulationPointFn()
this.FormData.trainType = this.vuex_userInfo.trainType
- this.FormData.studentId = this.userId
+ this.FormData.studentId = this.vuex_userInfo.id
},
methods: {
changeStep(num) {
diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue
index 65c7a9a..419aa13 100644
--- a/pages/indexEntry/enroll/enroll.vue
+++ b/pages/indexEntry/enroll/enroll.vue
@@ -94,7 +94,7 @@
this.showType = false
},
async getpersonfaceFn() {
- const {data: res} = await getpersonface({ ruleId: 1, RedirectUrl: 'http://192.168.1.44:8001/h5/#/pages/indexEntry/enroll/realName/realName'})
+ const {data: res} = await getpersonface({ ruleId: 1, RedirectUrl: 'http://192.168.1.44:8003/h5/#/pages/indexEntry/enroll/realName/realName'})
let obj = JSON.parse(res)
this.link = obj.Url
this.$store.commit('updateBizToken', obj.BizToken)
diff --git a/pages/indexEntry/enroll/realName/realName.vue b/pages/indexEntry/enroll/realName/realName.vue
index cb07e03..63bb0dd 100644
--- a/pages/indexEntry/enroll/realName/realName.vue
+++ b/pages/indexEntry/enroll/realName/realName.vue
@@ -21,7 +21,7 @@
})
let obj = {
ruleId: 1,
- redirectUrl: 'http://192.168.1.44:8001/h5/#/pages/indexEntry/enroll/registInfo/registInfo',
+ redirectUrl: 'http://192.168.1.44:8003/h5/#/pages/indexEntry/enroll/registInfo/registInfo',
bizToken: this.$store.state.school.BizToken,
userId: this.userId
}
@@ -34,8 +34,9 @@
}
// console.log(obj2)
- // alert('请求结果来了')
- // alert(obj2.Text.name)
+ alert('请求结果来了')
+ alert(obj2.Text.ErrMsg)
+ alert(obj2.Text.name)
// uni.setStorageSync(obj2)
},
}
diff --git a/pages/mineEntry/myAppointment/comp/comp.scss b/pages/mineEntry/myAppointment/comp/comp.scss
index 34523db..bfe0a65 100644
--- a/pages/mineEntry/myAppointment/comp/comp.scss
+++ b/pages/mineEntry/myAppointment/comp/comp.scss
@@ -39,7 +39,7 @@
}
.target {
- border-bottom: 2rpx dashed #E8E9EC;
+ // border-bottom: 2rpx dashed #E8E9EC;
}
.row {
diff --git a/pages/mineEntry/myAppointment/comp/examin.vue b/pages/mineEntry/myAppointment/comp/examin.vue
index b40e6e3..0204d36 100644
--- a/pages/mineEntry/myAppointment/comp/examin.vue
+++ b/pages/mineEntry/myAppointment/comp/examin.vue
@@ -35,11 +35,11 @@
{{item.classTime}}
-
+
- 取消时间:{{ item.cancelTime }}
+ 取消时间:{{ $u.timeFormat(item.cancelTime, 'yyyy-mm-dd hh:MM:ss')}}
去评价
diff --git a/pages/mineEntry/myAppointment/comp/imitate.vue b/pages/mineEntry/myAppointment/comp/imitate.vue
index 3e45ed1..16060fc 100644
--- a/pages/mineEntry/myAppointment/comp/imitate.vue
+++ b/pages/mineEntry/myAppointment/comp/imitate.vue
@@ -4,10 +4,11 @@
模拟器
- xxx模拟驾驶馆
+ {{item.name}}
- 待处理
+ 已取消
+ {{statusTxt[item.recordStatus]}}
@@ -21,7 +22,7 @@
模拟器编号
- 000001
+ {{item.deviceNum}}
@@ -30,13 +31,12 @@
预约时间
- 2023/08/08 10:00:00
+ {{item.classTime}}
-
+
- 完成时间:2022-01-04
-
+ 完成时间:{{$u.timeFormat(item.signOutTime, 'yyyy-mm-dd hh:MM:ss')}}
去评价
@@ -44,6 +44,14 @@