Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

src/pages/changeAdr/index.vue

@@ -52,13 +52,16 @@
                 reLocationStatus: true,
                 systemInfo : null,
                 tabbarHeight : 0,
-                noLocation : ''
+                noLocation : '',
+                areaGroupId : ''
             }
         },
         onLoad(options){
 
           this.noLocation = options.noLocation
 
+          this.areaGroupId = options.areaGroupId
+
           this.systemInfo = wx.getSystemInfoSync()
 
           let menuButtonInfo = wx.getMenuButtonBoundingClientRect()
@@ -105,14 +108,13 @@
             this.locationStatus = true
 
           
-
             if(type == 1){
               wx.setStorageSync('location',JSON.stringify({
                 id : item.operatingAreaAreaId,
                 regionName : item.regionName,
                 regionType : item.regionType,
                 systemRegionId : item.systemRegionId,
-                areaGroupId : item.groupId,
+                areaGroupId : this.areaGroupId,
                 outId : item.outId
               }))
             }else{
@@ -121,7 +123,7 @@
                 regionName : item.regionName,
                 regionType : item.regionType,
                 systemRegionId : item.systemRegionId,
-                areaGroupId : item.areaGroupId,
+                areaGroupId : this.areaGroupId,
                 outId : item.outId
               }))
             }

static/nativeComponents/AreaNavigation/index.js

@@ -37,6 +37,8 @@ Component({
       designateAreaObj: this.data.datas.componentData.designateAreaObj
     })
 
+    console.log(this.data.datas.componentData.designateAreaObj,'2222')
+
     if (!wx.getStorageSync('location')) {
       wx.navigateTo({
         url: `/pages/changeAdr/main?areaGroupId=${this.data.datas.componentData.designateAreaObj.areaGroupId}&noLocation=1`
@@ -306,7 +308,7 @@ Component({
 
     },
     continueBrowser(){
-      console.log(this.data.designateAreaObj)
+      console.log(this.data.designateAreaObj,'this.data.designateAreaObj')
       wx.setStorageSync('location', JSON.stringify(this.data.designateAreaObj))
       this.setData({
         positionName: this.data.designateAreaObj.regionName,