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

src/pages/home/index.vue

@@ -86,8 +86,19 @@ export default {
       }
     };
   },
-  onLoad() {
+  onLoad(options) {
     let that = this;
+    // 来源
+    if (options.from == "logout") {
+      //来自用户登出
+      wx.removeStorage({
+        key: "sessionid"
+      });
+      wx.removeStorage({
+        key: "openid"
+      });
+    }
+    // 获取页面数据
     if (this.mpApp.globalData.pageList) {
       that.init(this.mpApp.globalData.pageList);
     } else {

src/pages/index/index.vue

@@ -133,7 +133,8 @@ export default {
       if(this.page.includes("?")){
         this.params="&mixid=" + this.shopId;
       }
-      options.params && (this.params += "&" + serialize(options.params));
+      options.params && (this.params += "&" + serialize(decodeURIComponent(options.params)));
+        console.log(this.page,this.params)
     } else if (options.from && options.from == "livedBackShop") {
       //直播页back到商城
       this.page = decodeURIComponent(options.backpath);

src/pages/tabBar1/index.vue

@@ -19,7 +19,7 @@ export default {
     return {
       link: process.env.BASE_URL,
       page: "/",
-      params: "?mixid=" + this.$store.state.mixid,
+      params: "?mixid=" + this.$store.state.mixid + "&tabbar=1",
       index: 1,
       ss: "",
     };
@@ -35,7 +35,7 @@ export default {
 
     // tabbar 跳转
     let homeIndex = checkTabbarPage("/");
-    homeIndex != 0 && homeIndex==this.index && (this.index = 0);
+    homeIndex != 0 && homeIndex == this.index && (this.index = 0);
     if (this.mpApp.globalData.footerVal.componentData.list[this.index].link) {
       this.page = getUrlofLink(
         this.mpApp.globalData.footerVal.componentData.list[this.index].link

src/pages/tabBar2/index.vue

@@ -19,7 +19,7 @@ export default {
     return {
       link: process.env.BASE_URL,
       page: "/",
-      params: "?mixid=" + this.$store.state.mixid,
+      params: "?mixid=" + this.$store.state.mixid + "&tabbar=1",
       index: 2,
       ss: "",
     };

src/pages/tabBar3/index.vue

@@ -19,7 +19,7 @@ export default {
     return {
       link: process.env.BASE_URL,
       page: "/",
-      params: "?mixid=" + this.$store.state.mixid,
+      params: "?mixid=" + this.$store.state.mixid + "&tabbar=1",
       index: 3,
       ss: "",
     };

src/pages/tabbar4/index.vue

@@ -19,7 +19,7 @@ export default {
     return {
       link: process.env.BASE_URL,
       page: "/",
-      params: "?mixid=" + this.$store.state.mixid,
+      params: "?mixid=" + this.$store.state.mixid + "&tabbar=1",
       index: 4,
       ss: "",
     };