From 61745901e9c479eb38103f783921cf1c1f628657 Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Fri, 12 Jan 2024 18:38:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A2=84=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/searchRow/searchRow.vue | 3 +-- config/api.js | 3 +++ manifest.json | 2 +- pages/indexEntry/enroll/enroll.vue | 15 +++++++++------ pages/indexEntry/enroll/registInfo/registInfo.vue | 8 ++++++-- pages/mineEntry/myForecastName/myForecastName.vue | 11 ++++++++++- pages/tabbar/index/index.vue | 11 +++-------- 7 files changed, 33 insertions(+), 20 deletions(-) diff --git a/components/searchRow/searchRow.vue b/components/searchRow/searchRow.vue index 1a3b6a1..a10a454 100644 --- a/components/searchRow/searchRow.vue +++ b/components/searchRow/searchRow.vue @@ -6,7 +6,7 @@ - + @@ -26,7 +26,6 @@ }, clearSearchFn() { this.keyword = '' - this.$emit('searchFn', '') } } } diff --git a/config/api.js b/config/api.js index ba2b909..30c8ecf 100644 --- a/config/api.js +++ b/config/api.js @@ -166,6 +166,9 @@ export const getAgreement = (params={}) => http.get('app/student-record/getAgree export const getDriveProcessDetails = (params={}) => http.get('app/student-record/getDriveProcessDetails', {params}) // 学时查询 export const getStudentProcess = (params={}) => http.get('app/student-process/getStudentProcess', {params}) +// 获得预报名记录列表 +export const trainingApplyList = (params={}) => http.get('app/training-apply/list', {params}) + diff --git a/manifest.json b/manifest.json index bdc33c0..3650b3e 100644 --- a/manifest.json +++ b/manifest.json @@ -96,7 +96,7 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://192.168.1.15:48080/", + "target" : "http://192.168.1.36:48080/", // "target" : "http://192.168.1.36:48080/", "changeOrigin" : true, "secure" : true, diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue index f6bf3cf..a82a1af 100644 --- a/pages/indexEntry/enroll/enroll.vue +++ b/pages/indexEntry/enroll/enroll.vue @@ -191,14 +191,14 @@ // uni.setStorageSync(obj2) }, async goNext() { - // return this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo') // if(!this.form.value) return this.$u.toast('请选择证件类型') // this.$goPage('/pages/indexEntry/enroll/signContract/signContract?schoolId='+this.vuex_userInfo.schoolId) // return // 去签约 - if(this.vuex_userInfo.applyStep==3) { - return this.$goPage('/pages/indexEntry/enroll/signContract/signContract') - } + // if(this.vuex_userInfo.applyStep==3) { + // return this.$goPage('/pages/indexEntry/enroll/signContract/signContract') + // } + // return this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo') // 去填表 if(this.vuex_userInfo.applyStep==2) { if(this.title=='学员信息') { @@ -208,8 +208,11 @@ return this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo') } // 去支付 - if(this.vuex_userInfo.applyStep==4||this.vuex_userInfo.applyStep==5) { - return this.$goPage('/pages/indexEntry/enroll/payment/payment') + // if(this.vuex_userInfo.applyStep==4||this.vuex_userInfo.applyStep==5) { + // return this.$goPage('/pages/indexEntry/enroll/payment/payment') + // } + if(this.vuex_userInfo.applyStep>1&&this.vuex_userInfo.applyStep<5) { + return this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo') } // 不是身份证 if(this.form.value!=1) { diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue index 51bd7ad..972eecc 100644 --- a/pages/indexEntry/enroll/registInfo/registInfo.vue +++ b/pages/indexEntry/enroll/registInfo/registInfo.vue @@ -115,7 +115,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -319,6 +319,7 @@ totalAmount: 0, radiovalue2: 2, //是否异地 businessType: 0, + fromArea: '',//异地城市 }, showSchool: false, @@ -433,6 +434,9 @@ // 回调参数为包含columnIndex、value、values confirmCity(e) { console.log('confirm', e) + this.form.fromArea = e.value.map((item)=>{ + return item.name + }).join(',').replace(/,/g, '-') this.showCity = false }, // 获取地区 diff --git a/pages/mineEntry/myForecastName/myForecastName.vue b/pages/mineEntry/myForecastName/myForecastName.vue index 564923b..d7937cc 100644 --- a/pages/mineEntry/myForecastName/myForecastName.vue +++ b/pages/mineEntry/myForecastName/myForecastName.vue @@ -25,6 +25,7 @@ diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue index 86bfab4..f4b96bf 100644 --- a/pages/tabbar/index/index.vue +++ b/pages/tabbar/index/index.vue @@ -305,18 +305,13 @@ } // this.$goPage(item.url) this.$store.commit('updateNonPlatformStudent', false) - - if(this.vuex_userInfo.applyStep==3) { - return this.$goPage('/pages/indexEntry/enroll/signContract/signContract') + if(this.vuex_userInfo.applyStep<2) { + this.$goPage('/pages/indexEntry/enroll/enroll') } // 去填表 - if(this.vuex_userInfo.applyStep==2) { + if(this.vuex_userInfo.applyStep>1&&this.vuex_userInfo.applyStep6<5) { return this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo') } - // 去支付 - if(this.vuex_userInfo.applyStep==4||this.vuex_userInfo.applyStep==5) { - return this.$goPage('/pages/indexEntry/enroll/payment/payment') - } } if(item.text=='找驾驶馆') { const res = await this.$store.dispatch('checkLogin')