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

src/pages/tabBar1/index.vue

@@ -22,14 +22,14 @@ export default {
     return {
       link: process.env.BASE_URL,
       page: "/",
-      params: "?mixid=" + this.$store.state.mixid + `&tabbar=1&location_obj=${wx.getStorageSync("location")}`,
+      params: "?mixid=" + this.$store.state.mixid,
       index: 1,
       ss: "",
     };
   },
   computed: {
     pageUrl() {
-      return this.link + this.page + this.params + this.ss;
+      return this.link + this.page + this.params + `&tabbar=1&location_obj=${wx.getStorageSync("location")}` + this.ss;
     },
   },
   onLoad(options) {
@@ -50,11 +50,15 @@ export default {
     let ss = wx.getStorageSync("sessionid");
     if (!this.ss && ss) {
       this.ss = `&sessionid=${ss}`;
+    }else if(!ss){
+      !this.params.includes('logOut=true') && (this.params+="&logOut=true")
     }else{
       this.params+=`&timestamp=${new Date().getTime()}`
     }
 
     setTabBarActive.bind(this)(this.index);
+
+    console.log('----',this.pageUrl)
   },
   methods: {
     handleError(data) {

src/pages/tabBar2/index.vue

@@ -21,14 +21,14 @@ export default {
     return {
       link: process.env.BASE_URL,
       page: "/",
-      params: "?mixid=" + this.$store.state.mixid + `&tabbar=2&location_obj=${wx.getStorageSync("location")}`,
+      params: "?mixid=" + this.$store.state.mixid ,
       index: 2,
       ss: "",
     };
   },
   computed: {
     pageUrl() {
-      return this.link + this.page + this.params + this.ss;
+      return this.link + this.page + this.params+ `&tabbar=2&location_obj=${wx.getStorageSync("location")}` + this.ss;
     },
   },
   onLoad(options) {
@@ -49,11 +49,15 @@ export default {
     let ss = wx.getStorageSync("sessionid");
     if (!this.ss && ss) {
       this.ss = `&sessionid=${ss}`;
+    }else if(!ss){
+      this.params+="&logOut=true"
     }else{
       this.params+=`&timestamp=${new Date().getTime()}`
     }
 
     setTabBarActive.bind(this)(this.index);
+    console.log('----',this.pageUrl)
+
   },
   methods: {
     handleError(data) {

src/pages/tabBar3/index.vue

@@ -21,14 +21,14 @@ export default {
     return {
       link: process.env.BASE_URL,
       page: "/",
-      params: "?mixid=" + this.$store.state.mixid + `&tabbar=3&location_obj=${wx.getStorageSync("location")}`,
+      params: "?mixid=" + this.$store.state.mixid,
       index: 3,
       ss: "",
     };
   },
   computed: {
     pageUrl() {
-      return this.link + this.page + this.params + this.ss;
+      return this.link + this.page + this.params + `&tabbar=3&location_obj=${wx.getStorageSync("location")}` + this.ss;
     },
   },
   onLoad(options) {
@@ -55,11 +55,15 @@ export default {
     let ss = wx.getStorageSync("sessionid");
     if (!this.ss && ss) {
       this.ss = `&sessionid=${ss}`;
+    }else if(!ss){
+      this.params+="&logOut=true"
     }else{
       this.params+=`&timestamp=${new Date().getTime()}`
     }
 
     setTabBarActive.bind(this)(this.index);
+    console.log('----',this.pageUrl)
+
   },
   methods: {
     handleError(data) {

src/pages/tabBar4/index.vue

@@ -21,14 +21,14 @@ export default {
     return {
       link: process.env.BASE_URL,
       page: "/",
-      params: "?mixid=" + this.$store.state.mixid + `&tabbar=4&location_obj=${wx.getStorageSync("location")}`,
+      params: "?mixid=" + this.$store.state.mixid,
       index: 4,
       ss: "",
     };
   },
   computed: {
     pageUrl() {
-      return this.link + this.page + this.params + this.ss;
+      return this.link + this.page + this.params + `&tabbar=4&location_obj=${wx.getStorageSync("location")}` + this.ss;
     },
   },
   onLoad(options) {
@@ -55,11 +55,15 @@ export default {
     let ss = wx.getStorageSync("sessionid");
     if (!this.ss && ss) {
       this.ss = `&sessionid=${ss}`;
+    }else if(!ss){
+      this.params+="&logOut=true"
     }else{
       this.params+=`&timestamp=${new Date().getTime()}`
     }
 
     setTabBarActive.bind(this)(this.index);
+    console.log('----',this.pageUrl)
+
   },
   methods: {
     handleError(data) {