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

src/pages/home/index.vue

@@ -342,7 +342,7 @@ export default {
       })
     },
     scrolls(el){
-      // this.setFooterShow(el);
+      this.setFooterShow(el);
       if (this.pageData) {
         for (let i = 0; i < this.pageData.length; i++) {
           const element = this.pageData[i]

src/pages/login/index.vue

@@ -322,7 +322,7 @@ export default {
           // wx.navigateBack()
         // return
         if(isTabbarIndex>-1){
-          wx.switchTab({
+          wx.reLaung({
             url: parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`,
           })
         }else{