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

src/pages/home/index.vue

@@ -210,6 +210,7 @@ export default {
     }
   },
   onLoad(options) {
+    Object.assign(this.$data, this.$options.data());
     if (options.from && options.from == "logout") {
       //来自用户登出
       wx.removeStorage({
@@ -228,12 +229,24 @@ export default {
       app.getThemePage(this.$store.state.extConfig);
     }
     let that = this;
-    //获取个人名片入口
-    getHomePageQuickAccess().then(res=>{
-      that.showMyCard = res;
-    })
-    //获取分销信息
-    this.getSpokesmanInit(options)
+    if(wx.getStorageSync("sessionid")) {
+      //获取个人名片入口
+      getHomePageQuickAccess().then(res=>{
+        that.showMyCard = res;
+      })
+      //获取分销信息
+      this.getSpokesmanInit(options)
+    }else {
+      app.globalData.spokesmanInfo = {};
+      let footerVal = {...app.globalData.footerVal};
+      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();
+    }
     // 来源
     if (options.from == "logout") {
       //来自用户登出
@@ -268,6 +281,7 @@ export default {
     
   },
   onShow() {
+    //分销隔流
     if(this.toHomePage) {
       let linkVal = '/personalCenter/spokesmanCenter/mine/spokesmanHomePage?from=_goodsInfo'
       app.$themeToLink({
@@ -299,38 +313,42 @@ export default {
       wx.setNavigationBarTitle({title : app.globalData.shopInfo.shopName})
 
       wx.stopPullDownRefresh()
-      query_isEntry().then((data)=>{
-        //分销弹框信息
-        app.globalData.applySucessEntry = data;
-        console.log(app.globalData.applySucessEntry,3333444)
-        if (
-          data.applyRemind == "true" &&
-          data.displayEntry == "true"
-        ) {
-          this.applySucessEntry = true;
+      if(wx.getStorageSync("sessionid")) {
+        query_isEntry().then((data)=>{
+          //分销弹框信息
+          app.globalData.applySucessEntry = data;
+          console.log(app.globalData.applySucessEntry,3333444)
+          if (
+            data.applyRemind == "true" &&
+            data.displayEntry == "true"
+          ) {
+            this.applySucessEntry = true;
 
-        }else if (
-          data.applyRemindByDistributor == "true" &&
-          data.displayEntryByDistributor == "true"
-        ) {
-          this.applySucessEntry = true
-        }
-        let footerVal = {...app.globalData.footerVal};
-        footerVal.componentData.list.forEach(res=>{
-          if(res.link.name=="分销员中心"&&data.displayEntry == 'true') {
-            res.show = true
-          }else if(res.link.name=="分销员中心"&&data.displayEntry == 'false') {
-            res.show = false
-          }else if(res.link.name=="分销商中心"&&data.displayEntryByDistributor == 'true') {
-            res.show = true
-          }else if(res.link.name=="分销商中心"&&data.displayEntryByDistributor == 'false') {
-            res.show = false
+          }else if (
+            data.applyRemindByDistributor == "true" &&
+            data.displayEntryByDistributor == "true"
+          ) {
+            this.applySucessEntry = true
           }
+          let footerVal = {...app.globalData.footerVal};
+          footerVal.componentData.list.forEach(res=>{
+            if(res.link.name=="分销员中心"&&data.displayEntry == 'true') {
+              res.show = true
+            }else if(res.link.name=="分销员中心"&&data.displayEntry == 'false') {
+              res.show = false
+            }else if(res.link.name=="分销商中心"&&data.displayEntryByDistributor == 'true') {
+              res.show = true
+            }else if(res.link.name=="分销商中心"&&data.displayEntryByDistributor == 'false') {
+              res.show = false
+            }
+          })
+          app.globalData.footerVal = footerVal;
+          this.$mp.page.selectComponent(".custom-tab-bar").init();
+          // that.applySucessEntry = res;
         })
-        app.globalData.footerVal = footerVal;
-        this.$mp.page.selectComponent(".custom-tab-bar").init();
-        // that.applySucessEntry = res;
-      })
+      }else {
+        app.globalData.applySucessEntry = {}
+      }
     },
     async getSpokesmanInit(extConfig) {
       //绑定上下级关系