From e8ca54545781fa18ae2e911c8ba9770654715a8e Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Wed, 27 Sep 2023 13:42:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/searchRow/searchRow.vue | 2 +- config/site.config.js | 2 +- manifest.json | 11 +++++- .../enroll/registInfo/comp/searchSchool.vue | 6 ++++ pages/indexEntry/enroll/registInfo/registInfo.vue | 12 ++++--- pages/tabbar/index/index.vue | 42 ++++++++++++++-------- pages/tabbar/mine/index.vue | 12 +++++-- store/modules/user.js | 30 ++++++++++------ .../uview-ui/components/u-search/u-search.vue | 4 +-- 9 files changed, 84 insertions(+), 37 deletions(-) diff --git a/components/searchRow/searchRow.vue b/components/searchRow/searchRow.vue index e6da29a..1ff9eea 100644 --- a/components/searchRow/searchRow.vue +++ b/components/searchRow/searchRow.vue @@ -5,7 +5,7 @@ - + diff --git a/config/site.config.js b/config/site.config.js index bc7dc8b..64abf09 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -4,6 +4,6 @@ module.exports = { H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.26:48080/',//非代理地址 TEMP_HOST: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.26:48080/', - httpPrefix: '/app-api/', + httpPrefix: 'app-api/', imgUrl: 'http://jxtemp.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/' }; diff --git a/manifest.json b/manifest.json index 64b81c0..e015b22 100644 --- a/manifest.json +++ b/manifest.json @@ -59,7 +59,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wxae509f512c11c039", + "appid" : "wx2d71605af3b620e6", "setting" : { "urlCheck" : true, "es6" : true, @@ -108,6 +108,15 @@ "router" : { "mode" : "hash", "base" : "/h5" + }, + "sdkConfigs" : { + "maps" : { + "amap" : { + "key" : "2BTBZ-6BQRB-ZG4UG-NOYYG-KZMH7-B4BYN", + "securityJsCode" : "", + "serviceHost" : "" + } + } } } } diff --git a/pages/indexEntry/enroll/registInfo/comp/searchSchool.vue b/pages/indexEntry/enroll/registInfo/comp/searchSchool.vue index 8bddb9c..151f82d 100644 --- a/pages/indexEntry/enroll/registInfo/comp/searchSchool.vue +++ b/pages/indexEntry/enroll/registInfo/comp/searchSchool.vue @@ -42,11 +42,17 @@ pageSize: 20, lat: 30.27419537786047, lng: 120.20633397715788, + sercheType: '1' } } }, created() { + if(this.vuex_cityInfo.lat) { + this.params.lat = this.vuex_cityInfo.lat + this.params.lng = this.vuex_cityInfo.lng + } this.schoolPageFn() + }, methods: { // 选择驾校 diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue index 4075024..bd331b1 100644 --- a/pages/indexEntry/enroll/registInfo/registInfo.vue +++ b/pages/indexEntry/enroll/registInfo/registInfo.vue @@ -30,7 +30,7 @@ 选择车型 - + @@ -55,8 +55,8 @@ 选择教练 - - + + @@ -259,7 +259,7 @@ - + @@ -359,6 +359,10 @@ this.showCar = false this.form.car = item }, + showCarClick() { + if(!this.form.school) return this.$u.toast('请先选择驾校') + this.showCar = true + }, // 跳转到选择教练 goCoach() { if(!this.form.schoolId) return this.$u.toast('请先选择驾校') diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue index f12eaca..9a2aa92 100644 --- a/pages/tabbar/index/index.vue +++ b/pages/tabbar/index/index.vue @@ -40,7 +40,7 @@ - + @@ -128,15 +128,16 @@ text: '我要报名', icon: require('../../../static/images/index/ic_baoming.png'), url: '/pages/indexEntry/enroll/enroll', - click: (item)=>{ - this.$goPage(item.url) + goPage: function (){ + console.log(666) + // this.$goPage(item.url) } }, { text: '找驾校', icon: require('../../../static/images/index/ic_jiaxiao.png'), url: '/pages/indexEntry/findShcool/findShcool', - click: (item)=>{ + goPage: (item)=>{ this.$goPage(item.url) } }, @@ -144,32 +145,32 @@ text: '找考场', icon: require('../../../static/images/index/ic_kaochang.png'), url: '/pages/indexEntry/examines/examines', - click: (item)=>{ + goPage: ((item)=>{ this.$goPage(item.url) - } + }) }, { text: '找驾驶馆', icon: require('../../../static/images/index/ic_jsg.png'), url: '/pages/carEntry/simulateAppointment/simulateAppointment', - click: (item)=>{ + goPage: ((item)=>{ this.$goPage(item.url) - } + }) }, { text: '找陪练', icon: require('../../../static/images/index/ic_peilian.png'), - click: (item)=>{ + goPage: ((item)=>{ this.$u.toast('正在开发中，敬请期待...') - } + }) }, { text: '理论学习', icon: require('../../../static/images/index/ic_lilun.png'), url: '/pages/indexEntry/theory/theory', - click: (item)=>{ + goPage: ((item)=>{ this.$goPage(item.url) - } + }) }, ], moreSection: [{ @@ -276,9 +277,20 @@ } }, async onLoad() { - await this.$store.dispatch('getCity') - console.log('有 啦') - console.log(this.$store.state.user.vuex_cityInfo) + // uni.getLocation({ + // type: 'wgs84', + // success: function (res) { + // console.log('当前位置的经度：' + res.longitude); + // console.log('当前位置的纬度：' + res.latitude); + // }, + // fail(err) { + // console.log(err) + // } + // }); + if(!this.$store.state.user.vuex_cityInfo.lat) { + await this.$store.dispatch('getCity') + } + // console.log(this.$store.state.user.vuex_cityInfo) }, diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index cf5f09e..8bb8116 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -1,9 +1,9 @@ - +