diff --git a/config/api.js b/config/api.js index 8e3a982..824cf77 100644 --- a/config/api.js +++ b/config/api.js @@ -163,7 +163,7 @@ export const deleteTest = (params) => http.get('app/student-record/deleteTest', // 用户协议和隐私协议 export const getAgreement = (params={}) => http.get('app/student-record/getAgreement', {params}) // 学车流程 -export const getDriveProcessDetails = (params={}) => http.get('app/inform/manage/getDriveProcessDetails.do', {params}) +export const getDriveProcessDetails = (params={}) => http.get('app/student-record/getDriveProcessDetails', {params}) diff --git a/config/site.config.js b/config/site.config.js index 84173db..8e4bba3 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -3,7 +3,8 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM; module.exports = { H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.36:48080/',//非代理地址 - website: 'http://192.168.1.37:90/h5/#', + // website: 'http://192.168.1.37:90/h5/#', + website: 'http://192.168.1.37', httpPrefix: 'app-api/', imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/' }; diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue index 830daa1..4fdaa41 100644 --- a/pages/indexEntry/enroll/enroll.vue +++ b/pages/indexEntry/enroll/enroll.vue @@ -83,6 +83,7 @@ diff --git a/pages/indexEntry/parse/parse.vue b/pages/indexEntry/parse/parse.vue index edef899..76d9e28 100644 --- a/pages/indexEntry/parse/parse.vue +++ b/pages/indexEntry/parse/parse.vue @@ -3,11 +3,11 @@ 第 {{step}} {{title}} - 查看体检地点 + - + - + {{item.text}} @@ -57,14 +57,15 @@ this.CarLearningTraining() }, methods: { - change(index) { - this.currentTab = index + change(curItem) { + this.currentTab = curItem.index + console.log(this.currentTab) let arr = [this.contentTemp,this.content1,this.content2] - this.content = arr[index] + this.content = arr[this.currentTab] }, // 学车培训 async CarLearningTraining() { - const res = await getDriveProcessDetails({driveProcessId: this.step}) + const res = await getDriveProcessDetails({id: this.step}) if(this.step==6) { this.content1 = res.data.content1 this.content2 = res.data.content2 @@ -74,7 +75,7 @@ this.content = res.data.content this.title = res.data.title } - console.log(res) + console.log(this.content) }, changeStep(step) { this.step = step diff --git a/pages/indexEntry/theory/theory.vue b/pages/indexEntry/theory/theory.vue index 1f0dcfc..c230b3b 100644 --- a/pages/indexEntry/theory/theory.vue +++ b/pages/indexEntry/theory/theory.vue @@ -18,6 +18,7 @@