diff --git a/App.vue b/App.vue index 5f1dfab..357b292 100644 --- a/App.vue +++ b/App.vue @@ -76,14 +76,15 @@ onLaunch: function(option) { this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; this.globalData.uid = this.$store.state.app.uid; - let appkey = uni.getStorage({ - key: 'launchFlag' - }) - if (appkey) { - setTimeout(() => { - this.$store.dispatch('INIT_CONFIG'); - }, 6000) - } + // let appkey = uni.getStorage({ + // key: 'launchFlag' + // }) + // if (appkey) { + // setTimeout(() => { + // this.$store.dispatch('INIT_CONFIG'); + // }, 6000) + // } + this.$store.dispatch('INIT_CONFIG'); // #ifdef APP-PLUS //初始化uniMP小程序发送的事件以及其他操作 diff --git a/manifest.json b/manifest.json index 97963e6..2b679a9 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.7.5", - "versionCode" : 175, + "versionName" : "1.7.6", + "versionCode" : 176, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 63446bb..6714595 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -17,8 +17,8 @@ {{street||'定位中' }} - + diff --git a/pages/index/index.vue b/pages/index/index.vue index 85634f7..c2cce31 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -23,8 +23,8 @@ {{street||'定位中' }} - + @@ -263,16 +263,15 @@ import activityCard from "@/components/activityCard.vue" this.loadend = false; this.loading = false; this.list(true, this.street_id); - this.Area() + // this.Area() this.$u.sleep(1000).then(()=>{ uni.stopPullDownRefresh() }) }, onShow() { - this.$store.commit('INIT_CONFIG'); }, onLoad() { - this.Area() + // this.Area() // this.selfLocation() // this.openTongZhi() uni.$on('connectstatusChange', (connectstatus) => { @@ -619,10 +618,14 @@ import activityCard from "@/components/activityCard.vue" lat: this.latitude, long: this.longitude }).then(res => { - this.isshow = false - this.town = res.data.address_reference.town.title - this.street_id = res.data.address_reference.town.id + this.isshow = false; + this.town = res.data.address_reference.town.title; + this.street_id = res.data.address_reference.town.id; this.street = res.data.address_reference.town.title; + this.$store.commit('setAddress', { + street_id: this.street_id, + townName: this.town + }); this.list(true, this.street_id) this.$nextTick(() => { this.$bus.$emit('value-updated', this.street + ',' + this @@ -639,7 +642,6 @@ import activityCard from "@/components/activityCard.vue" }) } else uni.getLocation({ type: 'wgs84', - timeout: '10', success: (res) => { res = wgsToGcj(res); this.isshow = false diff --git a/pages/nongKe/cloud_entrepot/indexh.vue b/pages/nongKe/cloud_entrepot/indexh.vue index 0bd7c86..e9c95d2 100644 --- a/pages/nongKe/cloud_entrepot/indexh.vue +++ b/pages/nongKe/cloud_entrepot/indexh.vue @@ -11,7 +11,7 @@ 里海云仓 @@ -755,6 +755,7 @@ } else if(!this.merchantTow.pid) query.cate_pid = this.storeParam.category_id; // 全部是查询一级分类pid else query.cate_id = this.storeParam.category_id; // 否则查询二级分类 + console.log('参数', {...query}); cloudWarehouse(query).then(res => { // res.data.list = res.data.list.map(item=>{ // item.product = item;