Merge remote-tracking branch 'origin/master'

doum

10 天以前 2800434db8a3117cf4f1ccb119e7ac939f0511bb

 small-program/App.vue

@@ -61,7 +61,7 @@
               isHighAccuracy: true,
               success: function (addr) {
                  const locParam = { latitude: addr.latitude, longitude: addr.longitude };
                  uni.setStorageSync('address', locParam);
                  // uni.setStorageSync('address', locParam);
                  var address = null
                  var myAmapFun = new amapFile.AMapWX({ key: 'e4d46c87adf151dca20060317592b1b6' });
                  myAmapFun.getRegeo({
@@ -74,10 +74,13 @@
                        var ta = info.name || '地址获取失败';
                        locParam.address = ta
                        const resCity = await that.$u.api.getCityByName({ cityName: locParam.city })
                        if (resCity.code === 200) {
                        if (resCity.code === 200 && resCity.data) {
                           locParam.cityId = resCity.data.id
                        }	
                        that.$store.commit('setPosition', locParam)
                           that.$store.commit('setPosition', locParam)
                        } else {
                           that.$store.commit('setPosition', locParam)
                           that.$store.commit('clearCityId')
                        }
                        that.$isResolve()
                     },
                     fail: function(err) {