diff --git a/config/api.js b/config/api.js index f9d279c..6adcfc1 100644 --- a/config/api.js +++ b/config/api.js @@ -15,6 +15,9 @@ export const updateRefundStatusOpend = (params) => http.get('app/refund/updateRefundStatusPass', {params}) // 学员学费退款审核不通过 export const updateRefundStatusOut = (params) => http.get('app/refund/updateRefundStatusOut', {params}) + // 学车数据 + export const getDrivingLearningData = () => http.get('business/coach/getDrivingLearningData', ) + diff --git a/manifest.json b/manifest.json index 3e98f23..f25e218 100644 --- a/manifest.json +++ b/manifest.json @@ -86,7 +86,7 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://192.168.1.43:8318/", + "target" : "http://192.168.1.40:8318/", // "target" : "http://123.6.232.1:8099", "changeOrigin" : true, "secure" : true, diff --git a/pages/indexEntry/settlement/settlement.vue b/pages/indexEntry/settlement/settlement.vue index 1991f24..4e6f141 100644 --- a/pages/indexEntry/settlement/settlement.vue +++ b/pages/indexEntry/settlement/settlement.vue @@ -35,7 +35,7 @@ - @@ -54,7 +54,7 @@ date3: '', date2: '', date1: '', - value1: '', + searchMonth: '', showDatePicker: false, show: false, tabData: [{ @@ -94,7 +94,8 @@ } }, onLoad() { - this.params.searchMonth = uni.$u.timeFormat(Date.now(), 'yyyy/mm'); + this.searchMonth = this.params.searchMonth = uni.$u.timeFormat(Date.now(), 'yyyy/mm'); + console.log(this.params.searchMonth) this.initList() }, onPullDownRefresh() { @@ -126,7 +127,8 @@ confirmDatePicker(val) { this.showDatePicker = false let date = uni.$u.date(val.value, 'yyyy/mm') - this.params.searchMonth = date + this.searchMonth = this.params.searchMonth = date + console.log(this.params.searchMonth) this.initList() }, // 请求数据 diff --git a/pages/tabbar/operateTrain/index.vue b/pages/tabbar/operateTrain/index.vue index a5707ac..77eeab5 100644 --- a/pages/tabbar/operateTrain/index.vue +++ b/pages/tabbar/operateTrain/index.vue @@ -33,10 +33,11 @@ - - {{screen.timer}} + + {{screen.timer}} - + + diff --git a/pages/tabbar/student/index.vue b/pages/tabbar/student/index.vue index 4b05c8b..44bc38e 100644 --- a/pages/tabbar/student/index.vue +++ b/pages/tabbar/student/index.vue @@ -57,10 +57,11 @@ - - {{screen.timer}} + + {{screen.timer}} - + + @@ -176,7 +177,7 @@ cancelDate() { this.showDatePicker=false this.params.applyDateTime = '' - this.screen.timer = '预约时间' + this.screen.timer = '报名时间' this.listInit() }, confirmDatePicker(val) { diff --git a/pages/userCenter/teachingData/teachingData.vue b/pages/userCenter/teachingData/teachingData.vue index 3867235..2483427 100644 --- a/pages/userCenter/teachingData/teachingData.vue +++ b/pages/userCenter/teachingData/teachingData.vue @@ -10,15 +10,15 @@ 历史服务学员 - 100人 + {{info.historyStudentTotal}}人 结业人数 - 130人 + {{info.finishStudentTotal}}人 服务中人数 - 13人 + {{info.inServiceStudentTotal}}人 @@ -26,29 +26,29 @@ 结业率高达 - 90% + {{info.finishRate}} - + 科目一平均通过时间 - 12天 + {{info.finishSubjectOneTime}}天 科目二平均通过时间 - 12天 + {{info.finishSubjectTowTime ||'暂无'}}天 科目三平均通过时间 - 12天 + {{info.finishSubjectThreeTime || '暂无'}}天 - + 科目四平均通过时间 - 12天 + {{info.finishSubjectFourTime}}天 平均拿证时间 - 47天 + {{info.averageFinishTime || '暂无'}}天