diff --git a/newPages/appointment/index.vue b/newPages/appointment/index.vue index 3185e3d..021e062 100644 --- a/newPages/appointment/index.vue +++ b/newPages/appointment/index.vue @@ -9,7 +9,7 @@ + refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered" v-if="appointmentList.length > 0"> @@ -82,7 +82,14 @@ - + + + + + + 预约 @@ -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; /* 或者你需要撑满的高度 */ + } + diff --git a/newPages/appointmentAdd/index.vue b/newPages/appointmentAdd/index.vue index b110f29..1d256b2 100644 --- a/newPages/appointmentAdd/index.vue +++ b/newPages/appointmentAdd/index.vue @@ -1,246 +1,281 @@ diff --git a/newPages/appointmentDetail/index.vue b/newPages/appointmentDetail/index.vue index fe379a0..41dc561 100644 --- a/newPages/appointmentDetail/index.vue +++ b/newPages/appointmentDetail/index.vue @@ -37,7 +37,7 @@ 累计训练时长 - {{ appointmentInfo.allDriveTime }}分钟 + {{ appointmentInfo.trainTime }}分钟 训练地址 @@ -56,7 +56,7 @@ 审核意见 - {{ appointmentInfo.remark == null ? '暂无' : appointmentInfo.remark }} + {{ appointmentInfo.refuseReason == null ? '暂无' : appointmentInfo.refuseReason }} @@ -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); diff --git a/newPages/evaluate/index.vue b/newPages/evaluate/index.vue index 1f33fcc..1f01ef4 100644 --- a/newPages/evaluate/index.vue +++ b/newPages/evaluate/index.vue @@ -6,7 +6,7 @@ - + @@ -38,6 +38,12 @@ + + + @@ -148,4 +154,10 @@ diff --git a/newPages/newIndex/index.vue b/newPages/newIndex/index.vue index f67731b..99ae040 100644 --- a/newPages/newIndex/index.vue +++ b/newPages/newIndex/index.vue @@ -22,14 +22,7 @@ - - - “高科技”驾考作弊团伙被抓,驾校校长教练负责介绍学员 - + @@ -92,6 +85,7 @@ export default { ], swiperList: [], msg: "1", + announcement:['ceshi1111','测试111111111111111111111111111111111111111111'], constants: {}, schoolList: [ // {