diff --git a/config/site.config.js b/config/site.config.js index d728269..ee5210b 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -2,7 +2,7 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM; // localIp = false module.exports = { H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 - WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://123.6.232.1:8099/',//非代理地址 不要忘记加/ + WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://www.lyjppt.com/',//非代理地址 不要忘记加/ website: 'http://192.168.1.37', httpPrefix: 'app-api/', imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/', diff --git a/manifest.json b/manifest.json index ba181d9..50682b0 100644 --- a/manifest.json +++ b/manifest.json @@ -226,8 +226,8 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - // "target" : "http://192.168.1.43:8318/", - "target" : "http://123.6.232.1:8099/", + "target" : "http://www.lyjppt.com/", + // "target" : "http://123.6.232.1:8099/", "changeOrigin" : true, "secure" : true, "pathRewrite" : { diff --git a/pages/tabbar/learnCar/comp/subject2.vue b/pages/tabbar/learnCar/comp/subject2.vue index 2ea53cd..7fd74d6 100644 --- a/pages/tabbar/learnCar/comp/subject2.vue +++ b/pages/tabbar/learnCar/comp/subject2.vue @@ -8,7 +8,7 @@ 实操预约 + @click="$u.debounce(goAppointment, 800)"> 去预约 @@ -158,6 +158,14 @@ } }, methods: { + // 跳转到去预约 + async goAppointment() { + if(!this.vuex_userInfo.coachId) { + await this.$store.dispatch('getUserInfo') + if(!this.vuex_userInfo.coachId) return this.$u.toast('你还没有绑定教练,请联系驾校处理') + } + this.$goPage('/pages/carEntry/operaAppointment/operaAppointment?subject=2') + }, changeStep(type) { this.showAppointment = false, //预约状态 this.showAppointmentExam = false, //预约考试 diff --git a/pages/tabbar/learnCar/comp/subject3.vue b/pages/tabbar/learnCar/comp/subject3.vue index d698b72..3a9fc7b 100644 --- a/pages/tabbar/learnCar/comp/subject3.vue +++ b/pages/tabbar/learnCar/comp/subject3.vue @@ -7,7 +7,7 @@ 实操预约 - + 去预约 @@ -131,6 +131,14 @@ } }, methods: { + // 跳转到去预约 + async goAppointment() { + if(!this.vuex_userInfo.coachId) { + await this.$store.dispatch('getUserInfo') + if(!this.vuex_userInfo.coachId) return this.$u.toast('你还没有绑定教练,请联系驾校处理') + } + this.$goPage('/pages/carEntry/operaAppointment/operaAppointment?subject=3') + }, changeStep(type) { this.showAppointment = false,//预约状态 this.showAppointmentExam = false,//预约考试 @@ -174,4 +182,5 @@ \ No newline at end of file