diff --git a/manifest.json b/manifest.json index 894dedc..f85a08f 100644 --- a/manifest.json +++ b/manifest.json @@ -18,27 +18,29 @@ }, /* 模块配置 */ "modules" : { - "Share" : {} + "Share" : {}, + "Geolocation" : {} }, /* 应用发布信息 */ "distribute" : { /* android打包配置 */ "android" : { "permissions" : [ - "", - "", - "", - "", - "", + "", "", "", + "", "", + "", + "", + "", "", + "", + "", + "", "", - "", + "", "", - "", - "", "" ] }, @@ -54,7 +56,23 @@ "UniversalLinks" : "" } }, - "ad" : {} + "ad" : {}, + "maps" : { + "amap" : { + "appkey_ios" : "", + "appkey_android" : "" + } + }, + "geolocation" : { + "system" : { + "__platform__" : [ "ios", "android" ] + }, + "amap" : { + "__platform__" : [ "ios", "android" ], + "appkey_ios" : "", + "appkey_android" : "" + } + } } } }, diff --git a/pages/indexEntry/consult/record/record.vue b/pages/indexEntry/consult/record/record.vue index aa2bc8d..537c8fd 100644 --- a/pages/indexEntry/consult/record/record.vue +++ b/pages/indexEntry/consult/record/record.vue @@ -142,7 +142,7 @@ } .recordTotal { font-size: 24rpx; - padding: 0rpx 0 28rpx 0; + padding: 28rpx 0 28rpx 0; text-align: right; } \ No newline at end of file diff --git a/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach.vue b/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach.vue index eb3820c..7f8a107 100644 --- a/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach.vue +++ b/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach.vue @@ -36,6 +36,7 @@ }, onLoad(options) { this.params.schoolId = options.schoolId + this.params.teachCarType = options.trainType this.coachPageFn() }, diff --git a/pages/indexEntry/enroll/registInfo/comp/comfigPopup.vue b/pages/indexEntry/enroll/registInfo/comp/comfigPopup.vue index da2c4ba..afb0bb6 100644 --- a/pages/indexEntry/enroll/registInfo/comp/comfigPopup.vue +++ b/pages/indexEntry/enroll/registInfo/comp/comfigPopup.vue @@ -24,20 +24,12 @@ 是否异地转入 - 暂时没对接 + {{ info.transfer==1? '是': '否'}} - 合计 + 学费 {{ $u.utils.priceTo(info.totalAmount) }} - - 支付形式 - {{ info.payType==1?'全款':'预付款'}} - - - 待支付金额 - xxx - 返回修改 diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue index cdd3b8a..3ad65a2 100644 --- a/pages/indexEntry/enroll/registInfo/registInfo.vue +++ b/pages/indexEntry/enroll/registInfo/registInfo.vue @@ -193,22 +193,12 @@ 学费 - ￥{{ $u.utils.priceTo(form.totalAmount) }} + ￥{{ $u.utils.priceTo(form.totalAmount) }} - - - 待支付金额 - - - ￥100 - - - - 确认 @@ -272,6 +262,7 @@ coach: '', cardType: 1, idcard: '', + trainType: '',//车型 nationality: '中国', certificateCodeShow: '原驾驶证号xxx', driveLicence: '',//原驾驶证号 给后端的 @@ -334,6 +325,7 @@ this.form.coachId = schoolCoach.id this.form.school = schoolCoach.schoolName this.form.schoolId = schoolCoach.schoolId + this.form.trainType = schoolCoach.teachCarType.slice(0,2) } if(this.form.schoolId) { this.getSchoolDetailFn() @@ -490,6 +482,8 @@ console.log(item) this.showCar = false this.form.trainType = item + this.form.coach = '' + this.form.coachId = '' }, showCarClick() { if(!this.form.school) return this.$u.toast('请先选择驾校') @@ -498,7 +492,8 @@ // 跳转到选择教练 goCoach() { if(!this.form.schoolId) return this.$u.toast('请先选择驾校') - this.$goPage('/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach?schoolId=' + this.form.schoolId) + if(!this.form.trainType) return this.$u.toast('请先选择车型') + this.$goPage('/pages/indexEntry/enroll/registInfo/chooseCoach/chooseCoach?schoolId=' + this.form.schoolId+ '&trainType='+ this.form.trainType) }, // 选择原驾驶证初领日期 confirmFirstLicenceTime(val) { @@ -554,12 +549,16 @@ }, // 点击确认 confirmClick() { + if(!this.form.schoolId) return this.$u.toast('请选择驾校') + if(!this.form.trainType) return this.$u.toast('请选择车型') + if(!this.form.schoolClassId) return this.$u.toast('请选择班型') this.showPopup = true }, async comfigClick(val) { console.log(val) this.showPopup = false + if(!val) return false const {data: res} = await applyOnline(this.form) // 报名成功 console.log(res) diff --git a/pages/indexEntry/findShcool/coachComment/coachInfo.vue b/pages/indexEntry/findShcool/coachComment/coachInfo.vue index 906d5b8..689e616 100644 --- a/pages/indexEntry/findShcool/coachComment/coachInfo.vue +++ b/pages/indexEntry/findShcool/coachComment/coachInfo.vue @@ -30,9 +30,9 @@ // 使用正则表达式进行匹配 return imageExtensions.test(path); }, - async goSign(item) { - this.$store.commit('upDateSchoolCoach', {}) - this.$store.commit('upDateSchoolClass', item) + async goSign() { + this.$store.commit('upDateSchoolCoach', this.item) + this.$store.commit('upDateSchoolClass', {}) this.$u.utils.clickSignUp() } }, diff --git a/pages/indexEntry/findShcool/searchShcool/searchShcool.vue b/pages/indexEntry/findShcool/searchShcool/searchShcool.vue index 3e0a729..84d1dda 100644 --- a/pages/indexEntry/findShcool/searchShcool/searchShcool.vue +++ b/pages/indexEntry/findShcool/searchShcool/searchShcool.vue @@ -9,7 +9,7 @@ - + @@ -151,8 +151,8 @@ .ul { width: 100%; padding-top: 20rpx; - .li { - + .card { + padding: 0 20rpx; } } diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue index 99a5475..52c6608 100644 --- a/pages/tabbar/index/index.vue +++ b/pages/tabbar/index/index.vue @@ -66,7 +66,7 @@ 推荐教练 - + @@ -308,7 +308,9 @@ }, async entrySectionClick(item) { if(item.text=='学车报名') { - return this.$u.utils.clickSignUp() + this.$store.commit('upDateSchoolCoach', {}) + this.$store.commit('upDateSchoolClass', {}) + return this.$u.utils.clickSignUp() } this.$goPage(item.url) }, diff --git a/pages/tabbar/learnCar/index.vue b/pages/tabbar/learnCar/index.vue index 506cb8d..16e8903 100644 --- a/pages/tabbar/learnCar/index.vue +++ b/pages/tabbar/learnCar/index.vue @@ -16,6 +16,38 @@ return { } + }, + onShow() { + this.getProviderFn() + }, + methods: { + getProviderFn() { + // uni.getProvider({ + // serviceType: 'location', + // success(res) { + // // res.providerList包含了所有支持的定位服务类型列表 + // if (res.providerList && res.providerList[0] === 'gps') { + // // 只有GPS定位才能保证返回真实的物理位置信息 + // // startRealLocation(); + // } else { + // console.log('无法获取真实的物理位置'); + // } + // }, + // fail(err) { + // console.error('获取定位服务类型失败', err); + // } + // }); + + uni.startGPS({ + success(res) { + console.log('已成功开始获取真实的物理位置'); + getUserPosition(); + }, + fail(err) { + console.error('开始获取真实的物理位置失败', err); + } + }); + } } } diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index 010d754..49aa0b5 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -81,6 +81,9 @@ }, goPage(item) { if(item.name!='关于我们') { + if(this.vuex_userInfo.applyStep>2&&this.vuex_userInfo.applyStep<6) { + return this.$goPage('/pages/mineEntry/myForecastName/myForecastName') + } if(this.vuex_userInfo.applyStep!=6) { return this.$u.toast('您还未报名驾校') } diff --git a/pages/userCenter/login/login - 副本.vue b/pages/userCenter/login/login - 副本.vue new file mode 100644 index 0000000..ba39bc5 --- /dev/null +++ b/pages/userCenter/login/login - 副本.vue @@ -0,0 +1,227 @@ + + + + + \ No newline at end of file diff --git a/pages/userCenter/login/login.vue b/pages/userCenter/login/login.vue index ba39bc5..21dc72f 100644 --- a/pages/userCenter/login/login.vue +++ b/pages/userCenter/login/login.vue @@ -1,227 +1,192 @@ \ No newline at end of file diff --git a/static/images/icon/箭头 拷贝 2(1).png b/static/images/icon/箭头 拷贝 2(1).png deleted file mode 100644 index ee2f860..0000000 Binary files a/static/images/icon/箭头 拷贝 2(1).png and /dev/null differ diff --git a/static/images/icon/箭头(1).png b/static/images/icon/箭头(1).png deleted file mode 100644 index db9f2d6..0000000 Binary files a/static/images/icon/箭头(1).png and /dev/null differ diff --git a/static/images/mineIcon/二维码.png b/static/images/mineIcon/二维码.png deleted file mode 100644 index 4a66065..0000000 Binary files a/static/images/mineIcon/二维码.png and /dev/null differ diff --git a/static/images/tabbar/btn_xueche_nor - 副本.png b/static/images/tabbar/byd.png similarity index 100% rename from static/images/tabbar/btn_xueche_nor - 副本.png rename to static/images/tabbar/byd.png