From 7971a93527a1ecc489c0a00aed0c66f832c73f7e Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Thu, 22 Feb 2024 18:46:54 +0800 Subject: [PATCH] 00 --- manifest.json | 38 ++- pages/indexEntry/consult/record/record.vue | 2 +- .../enroll/registInfo/chooseCoach/chooseCoach.vue | 1 + .../enroll/registInfo/comp/comfigPopup.vue | 12 +- pages/indexEntry/enroll/registInfo/registInfo.vue | 23 +- .../findShcool/coachComment/coachInfo.vue | 6 +- .../findShcool/searchShcool/searchShcool.vue | 6 +- pages/tabbar/index/index.vue | 6 +- pages/tabbar/learnCar/index.vue | 32 ++ pages/tabbar/mine/index.vue | 3 + pages/userCenter/login/login - 副本.vue | 227 ++++++++++++++ pages/userCenter/login/login.vue | 329 +++++++++------------ static/images/icon/箭头 拷贝 2(1).png | Bin 638 -> 0 bytes static/images/icon/箭头(1).png | Bin 669 -> 0 bytes static/images/mineIcon/二维码.png | Bin 1214 -> 0 bytes static/images/tabbar/btn_xueche_nor - 副本.png | Bin 1516 -> 0 bytes static/images/tabbar/byd.png | Bin 0 -> 1516 bytes 17 files changed, 462 insertions(+), 223 deletions(-) create mode 100644 pages/userCenter/login/login - 副本.vue delete mode 100644 static/images/icon/箭头 拷贝 2(1).png delete mode 100644 static/images/icon/箭头(1).png delete mode 100644 static/images/mineIcon/二维码.png delete mode 100644 static/images/tabbar/btn_xueche_nor - 副本.png create mode 100644 static/images/tabbar/byd.png 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 ee2f86034b59cb2065d393bfeb07112ffc6a7a6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 638 zcmV-^0)hRBP)Px%I7vi7R9Hvt*UM@YK@V6U5p^sFk3WJ1nbytbA$n1u$?(@xmrmCw5Gxnhw^I#X$)sf(Y zj4>|(Tq2@dN~w=s4<35G59l|5W44fpENHDi3@y6TeZio*uIEMM3xGZLfmxO<6h)C7 z6%4Y7s;Vv!(JFww?pI!6=JzR+>IJfeT~ccv)wb>8cszcW3e_8A3zua%pJmw=iij4K zQb|yQKpvIn`KpNQv)@yp27_Gt&I4GRLS0o#y^U#K6v!4f#+(CSXP-|h3Kb11m#J&4&Xsus_p#BNS7*hb)0C3bH9x(I6{{m{7hTFFN1>mp)+-K%TA(+ht zHgsUfIAhFl06zg7a;>_jwSF9OuOE{PRM+(h5&7XUM08gv^`s9bSwfS^oCfgSV~FUsQtH`IOjJT;SOC6`(c;Q#;t07*qoM6N<$f*h?E(EtDd diff --git a/static/images/icon/箭头(1).png b/static/images/icon/箭头(1).png deleted file mode 100644 index db9f2d6f17c9567a03640026472ff38a4c7abb9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 669 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6jKx9jP7LeL$-D%zbpm`sT!Df> z@c;k+hK2?pxoXuaAi014ejvGR+qT=cZv)xKjvc#r@#2vqM^2nLaRv-dojL`iA>`@P zr-5t;31pl*cMeFNJb4nr267=%XTbo-2GS5IAOo%oC<0_d0FVs|okE(l>G zD~1>a7l#>upyApPLP#u#EpP!i7fsh>Yp-5lU?rCX`2{mDGBPnSGqbR;vvY8A^YZbF zNJz@cDJiS#8kv||+Su8o$10IEF}E&b@e4 ztl5Ew^}No(rPJ<<;v sj{W%?d98WR)a!d44i~LW?yI;d|D;M%!+QHGMo_}?boFyt=akR{01H@(TmS$7 diff --git a/static/images/mineIcon/二维码.png b/static/images/mineIcon/二维码.png deleted file mode 100644 index 4a660659eb7d6485d48a285a61313cb74e132435..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1214 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 S9!CfO0000