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

src/pages/home/index.vue

@@ -227,7 +227,7 @@ export default {
         key: "openid"
       });
     }
-    this.options = JSON.stringify(options);
+    this.options = wx.getStorageSync("becomeInfo");
     this.changeLocation = options.changeLocation || ''
 
     if(this.changeLocation == 1){
@@ -242,19 +242,7 @@ export default {
         that.showMyCard = res;
       })
       //获取分销信息
-      this.getSpokesmanInit(wx.getStorage("becomeInfo"))
-    }else {
-      let footerVal = {...app.globalData.footerVal};
-      console.log('"分销员中心"',footerVal)
-      if (footerVal.componentData) {
-        footerVal.componentData.list.forEach(res=>{
-          if(res.link.name=="分销员中心"||res.link.name=="分销商中心") {
-            res.show = false
-          }
-        })
-        app.globalData.footerVal = footerVal;
-        this.$mp.page.selectComponent(".custom-tab-bar").init();
-      }
+      this.getSpokesmanInit(wx.getStorageSync("becomeInfo")?JSON.parse(wx.getStorageSync("becomeInfo")):'')
     }
     // 来源
     if (options.from == "logout") {
@@ -355,12 +343,24 @@ export default {
           this.$mp.page.selectComponent(".custom-tab-bar").init();
           // that.applySucessEntry = res;
         })
+      }else {
+        let footerVal = {...app.globalData.footerVal};
+        console.log('"分销员中心"',footerVal)
+        if (footerVal.componentData) {
+          footerVal.componentData.list.forEach(res=>{
+            if(res.link.name=="分销员中心"||res.link.name=="分销商中心") {
+              res.show = false
+            }
+          })
+          app.globalData.footerVal = footerVal;
+          this.$mp.page.selectComponent(".custom-tab-bar").init();
+        }
       }
     },
     getSpokesmanInit(extConfig) {
       //绑定上下级关系
       app.fenxiaoModel.becomeRelation(extConfig).then(res=>{
-        if(!res) {
+        if(res) {
           wx.removeStorage({
             key: "becomeInfo"
           });

src/pages/login/index.vue

@@ -313,8 +313,8 @@ export default {
     // 是否跳转h5或小程序
     pushPageType(){
       //绑定上下级关系
-      app.fenxiaoModel.becomeRelation(wx.getStorage("becomeInfo")).then(res=>{
-        if(!res) {
+      app.fenxiaoModel.becomeRelation(wx.getStorageSync("becomeInfo")?JSON.parse(wx.getStorageSync("becomeInfo")):'').then(res=>{
+        if(res) {
           wx.removeStorage({
             key: "becomeInfo"
           });