From 52336690d6d2287b1203874a9116e08907a6c4c3 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 19 Sep 2024 21:41:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http.api.js | 12 +++++++++--- packages/booksubmit/index.vue | 10 +++++----- packages/mybook/index.vue | 6 +++--- packages/schoolmate/index.vue | 19 ++++++++++++++++--- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/common/http.api.js b/common/http.api.js index 9d8e358..80aeba6 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -27,7 +27,9 @@ let apiApp = { scheduleIndex: '/api/mobile/schedule/index', scheduleSave: '/api/mobile/schedule/save', scheduleDetail: '/api/mobile/schedule/detail', - scheduleCheck: '/api/mobile/schedule/check', + scheduleCheck: '/api/mobile/schedule/check', + scheduleCancel: '/api/mobile/schedule/cancel', + // 其他 otherConfig: '/api/mobile/other/config', otherBanner: '/api/mobile/other/banner', @@ -68,7 +70,10 @@ const install = (Vue, vm) => { let scheduleIndex = (params = {}) => vm.$u.get(apiApp.scheduleIndex, params); let scheduleSave = (params = {}) => vm.$u.post(apiApp.scheduleSave, params); let scheduleDetail = (params = {}) => vm.$u.get(apiApp.scheduleDetail, params); - let scheduleCheck = (params = {}) => vm.$u.get(apiApp.scheduleCheck, params); + let scheduleCheck = (params = {}) => vm.$u.get(apiApp.scheduleCheck, params); + let scheduleCancel = (params = {}) => vm.$u.get(apiApp.scheduleCancel, params); + + // 其他 let otherConfig = (params = {}) => vm.$u.get(apiApp.otherConfig, params); @@ -104,7 +109,8 @@ const install = (Vue, vm) => { scheduleIndex, scheduleSave, scheduleDetail, - scheduleCheck, + scheduleCheck, + scheduleCancel, // 资讯 courseNews, // 其他 diff --git a/packages/booksubmit/index.vue b/packages/booksubmit/index.vue index cac3523..46c6fe1 100644 --- a/packages/booksubmit/index.vue +++ b/packages/booksubmit/index.vue @@ -475,19 +475,20 @@ const endTime = this.$moment(endTime1); const currentTime = this.$moment(); const todayHMax = this.$moment().hours(this.hMax).minutes(this.mEnd).seconds(0).milliseconds(0); - // 获取初始日期 明天的 - const startDay = this.$moment(this.startTime).format('YYYY-MM-DD'); + // 获取初始日期 明天的 + + const startDay = this.$moment(startTime).format('YYYY-MM-DD'); const endDay = this.$moment(endTime).format('YYYY-MM-DD'); // 验证开始时间和结束时间 // 如果开始日期不是今天 const startDayHMin = this.$moment(startDay + ' ' + this.hMin + ':' + this.mStart) const startDayHMax = this.$moment(startDay + ' ' + this.hMax + ':' + this.mEnd) const endDayHMin = this.$moment(endDay + ' ' + this.hMin + ':' + this.mStart) - const endDayHMax = this.$moment(endDay + ' ' + this.hMax + ':' + this.mEnd) + const endDayHMax = this.$moment(endDay + ' ' + this.hMax + ':' + this.mEnd) if (startTime.isBefore(startDayHMin)) { this.base.toast('预约开始时间不能早于明日的' + this.bookStartTime) return false; - } + } if (startTime.isAfter(startDayHMax)) { this.base.toast('预约开始时间不能晚于每天的' + this.bookEndTime) return false; @@ -505,7 +506,6 @@ this.base.toast('预约结束时间不能晚于每天的' + this.bookEndTime) return false; } - // 如果所有条件都满足，则显示验证通过的信息 result = '时间验证通过'; return true diff --git a/packages/mybook/index.vue b/packages/mybook/index.vue index 743d619..aed2e8a 100644 --- a/packages/mybook/index.vue +++ b/packages/mybook/index.vue @@ -129,9 +129,9 @@ title: '确认要取消该预约？', success: function(res) { if (res.confirm){ - item.status = 3 - item.content = '123' - that.$u.api.scheduleSave(item).then(res => { + that.$u.api.scheduleCancel({ + id:item.id + }).then(res => { that.base.toast("取消成功") that.current_page = 1 that.book_list = [] diff --git a/packages/schoolmate/index.vue b/packages/schoolmate/index.vue index 728b880..130011f 100644 --- a/packages/schoolmate/index.vue +++ b/packages/schoolmate/index.vue @@ -22,8 +22,9 @@ - - 按照姓名首字母顺序排列,排名不分先后 + + 按照姓名首字母顺序排列,排名不分先后 + 如需校友联系方式,可咨询班主任 @@ -37,6 +38,13 @@ {{mess['company_name']||''}} {{mess['company_position']||''}} + + + + 班级：{{mess['course_signs'][0].course.year||''}}{{mess['course_signs'][0].course.type_detail?mess['course_signs'][0].course.type_detail.name+'|':''}}{{mess['course_signs'][0].course.name||''}} + + @@ -261,7 +269,12 @@ this.hasData = true this.getMyCourseTxl() }, - confirmSearch() { + confirmSearch() { + this.current = 0 + this.current_page = 1 + this.total_page = 0 + this.list = [] + this.hasData = true this.getMyCourseTxl() } }