diff --git a/components/searchRow/searchRow.vue b/components/searchRow/searchRow.vue index fb5f5c3..5cdd943 100644 --- a/components/searchRow/searchRow.vue +++ b/components/searchRow/searchRow.vue @@ -8,7 +8,7 @@ {{ placeholder }} - + @@ -25,6 +25,10 @@ methods: { searchFn() { this.$emit('searchFn', this.keyword) + }, + clearSearchFn() { + this.keyword = '' + this.$emit('searchFn', '') } } } diff --git a/pages.json b/pages.json index 053bd83..c7c41d7 100644 --- a/pages.json +++ b/pages.json @@ -424,6 +424,25 @@ } }, { + "path": "personaInfo/myInfo", + "style": { + "navigationBarTitleText": "个人信息", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "myForecastName/myForecastName", + "style": { + "navigationBarTitleText": "我的报名", + "navigationStyle": "custom", + "enablePullDownRefresh": true, + "backgroundTextStyle": "dark" + } + }, + + { "path": "myAppointment/myAppointment", "style": { "navigationBarTitleText": "我的预约", diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue index fedafa6..830daa1 100644 --- a/pages/indexEntry/enroll/enroll.vue +++ b/pages/indexEntry/enroll/enroll.vue @@ -208,7 +208,7 @@ this.vuex_userInfo.idcard = this.form.idcard this.vuex_userInfo.nationality = (this.form.value==7||this.form.value==2)?'外国':'中国' this.vuex_userInfo.cardType = this.form.value - return this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo') + return this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo?realNameNo=1') } // 去实名 diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue index 42ccf51..90ccb77 100644 --- a/pages/indexEntry/enroll/registInfo/registInfo.vue +++ b/pages/indexEntry/enroll/registInfo/registInfo.vue @@ -304,7 +304,6 @@ cardType: 1, idcard: '', nationality: '中国', - businessType: '',//业务类型 certificateCodeShow: '原驾驶证号xxx', driveLicence: '',//原驾驶证号 给后端的 firstDriveDate: '',//原驾驶证初领日期 @@ -331,7 +330,10 @@ cityArr3: [] } }, - onLoad() { + onLoad(options) { + if(options.realNameNo) { + this.realNameNo = options.realNameNo + } this.initUserInfo() uni.$on('upDateCoachItem',(item)=>{ @@ -369,7 +371,10 @@ }, methods: { async initUserInfo() { - await this.$store.dispatch('getUserInfo') + // 如果不是实名 + if(!this.realNameNo) { + await this.$store.dispatch('getUserInfo') + } this.form.userId = this.userId this.form.accountId = this.vuex_userInfo.accountId this.form.address = this.vuex_userInfo.address diff --git a/pages/mineEntry/myForecastName/myForecastName.vue b/pages/mineEntry/myForecastName/myForecastName.vue new file mode 100644 index 0000000..564923b --- /dev/null +++ b/pages/mineEntry/myForecastName/myForecastName.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/pages/mineEntry/personaInfo/myInfo.vue b/pages/mineEntry/personaInfo/myInfo.vue new file mode 100644 index 0000000..e274590 --- /dev/null +++ b/pages/mineEntry/personaInfo/myInfo.vue @@ -0,0 +1,47 @@ + + + + \ No newline at end of file diff --git a/pages/mineEntry/personaInfo/personaInfo.vue b/pages/mineEntry/personaInfo/personaInfo.vue index cd815f3..eb861ee 100644 --- a/pages/mineEntry/personaInfo/personaInfo.vue +++ b/pages/mineEntry/personaInfo/personaInfo.vue @@ -12,30 +12,43 @@ 我的驾校 - 江西海正驾校 + {{ vuex_userInfo.schoolName }} 我的教练 - xxx + {{ vuex_userInfo.coachName }} 所学车型 - xxx + {{ vuex_userInfo.trainType }} 报名时间 - xxx + {{ $u.timeFormat(vuex_userInfo.applyDate, 'yyyy-mm-dd hh:MM:ss')}} - + + + 个人信息 + + 查看 + + + + + + + + + 实名认证 已完成 - + 拍照&体检&面签 已完成 diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue index 43c95ce..37ee68e 100644 --- a/pages/tabbar/index/index.vue +++ b/pages/tabbar/index/index.vue @@ -320,6 +320,7 @@ if(item.text=='找驾驶馆') { const res = await this.$store.dispatch('checkLogin') if(!res) return + if(!this.vuex_userInfo.schoolId) return this.$u.toast('您不是平台学员') } this.$goPage(item.url) }, diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index fd62062..9c630ea 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -42,7 +42,8 @@ - + + {{ item.text }} @@ -71,6 +72,11 @@ myPageEntry: [ { + text: '我的报名', + icon: require('../../../static/images/userCenter/yubaoming.png'), + url: '/pages/mineEntry/myForecastName/myForecastName', + }, + { text: '我的预约', icon: require('../../../static/images/userCenter/ic_yuyue.png'), url: '/pages/mineEntry/myAppointment/myAppointment' @@ -152,13 +158,16 @@ }, async goBusinessEntry(item) { const res = await this.$store.dispatch('checkLogin') - console.log('res') - console.log(res) if(!res) return + if(!this.vuex_userInfo.schoolId) return this.$u.toast('您不是平台学员') this.$goPage(item.url) }, async myPageEntryClick(item) { - await this.$store.dispatch('checkLogin') + const res = await this.$store.dispatch('checkLogin') + if(!res) return + let arr = ['我的收藏','本地生活'] + console.log(arr.includes(item.text)) + if(!this.vuex_userInfo.schoolId&&!arr.includes(item.text)) return this.$u.toast('您不是平台学员') this.$goPage(item.url) } } diff --git a/static/images/userCenter/yubaoming.png b/static/images/userCenter/yubaoming.png new file mode 100644 index 0000000..e5595c9 Binary files /dev/null and b/static/images/userCenter/yubaoming.png differ