我的预报名

components/searchRow/searchRow.vue

@@ -6,7 +6,7 @@
 			</view>
 			
 			<view class="inputBox">
-				<u-search :placeholder="placeholder" v-model="keyword" :color="'#fff'" :disabled="disable" placeholderColor="#fff"  :bgColor="'transparent'"  @change="$u.debounce(searchFn, 2000)" :showAction="false" @search="$u.debounce(searchFn, 500)" @clear="clearSearchFn"></u-search>
+				<u-search :placeholder="placeholder" v-model="keyword" :color="'#fff'" :disabled="disable" placeholderColor="#fff" style="pointer-events: none;" :bgColor="'transparent'"  @change="$u.debounce(searchFn, 1500)" :showAction="false" @search="$u.debounce(searchFn, 500)" @clear="clearSearchFn"></u-search>
 			</view>
 		</view>
 	</view>
@@ -26,7 +26,6 @@
 			},
 			clearSearchFn() {
 				this.keyword = ''
-				this.$emit('searchFn', '')
 			}
 		}
 	}

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})
+
 
 
 

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,

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) {

pages/indexEntry/enroll/registInfo/registInfo.vue

@@ -115,7 +115,7 @@
 					<view class="rightCon">
 						<view class="row" @click="showOldDriveModel=true" >
 							<view class="val">
-								<mySelect :value="form.oldDriveModel"/>
+								<mySelect :value="form.oldTrainType"/>
 							</view>
 							<view class="arrow">
 								<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
@@ -152,7 +152,7 @@
 					<view class="rightCon">
 						<view class="row">
 							<view class="val">
-								<mySelect :value="form.classModel"/>
+								<mySelect :value="form.fromArea"/>
 							</view>
 							<view class="arrow">
 								<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
@@ -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
 			},
 			// 获取地区

pages/mineEntry/myForecastName/myForecastName.vue

@@ -25,6 +25,7 @@
 </template>
 
 <script>
+	import { trainingApplyList } from "@/config/api.js"
 	export default {
 		data() {
 			return {
@@ -38,7 +39,15 @@
 				status: 'loadmore',
 			}
 		},
-		
+		onLoad() {
+			this.trainingApplyListFn()
+		},
+		methods: {
+			async trainingApplyListFn() {
+				const {data: res} = await trainingApplyList({studentId: this.studentId})
+				this.list = res
+			}
+		}
 	}
 </script>
 

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')