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

src/pages/home/index.vue

@@ -105,6 +105,7 @@
         <apply-sucess-entry></apply-sucess-entry>
       </div>
       <!-- 底部栏 -->
+      {{active}}
       <custom-tab-bar class="custom-tab-bar" :selected="active"></custom-tab-bar>
   </div>
 </template>
@@ -407,7 +408,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/utils/mayi.js

@@ -26,6 +26,11 @@ export function getUrlofQuery(data) {
 }
 // 全局跳转  data:link数据    option:是否为底部栏触发
 export function $themeToLink(data, option) {
+   
+    // console.log(currentPage,'currentPage',getUrlofLink(data))
+    // if(getUrlofLink(data).includes(currentPage)) return
+
+    // 
     let app = getApp();
     let type = data.type;
     // 登录拦截和底部导航栏拦截（非功能项）
@@ -44,14 +49,21 @@ export function $themeToLink(data, option) {
         let isTabbarIndex = checkTabbarPage(parseLink);
         if (isTabbarIndex >= 0) {
             // 无底部栏h5页面
-            if (!containFooterPage.includes(parseLink)) {
-                toPage(getUrlofLink(data), getUrlofQuery(data))
-                return
-            }
-            isTabbarIndex = isTabbarIndex == 0 ? checkTabbarPage('/') : isTabbarIndex
-            let query=parseQuery?`?${parseQuery}`:''
+            // if (!containFooterPage.includes(parseLink)) {
+            //     toPage(getUrlofLink(data), getUrlofQuery(data))
+            //     return
+            // }
+
+
+            isTabbarIndex = isTabbarIndex == 0 ? checkTabbarPage('/') : isTabbarIndex;
+            let url=parseLink == '/' ? `/pages/home/main` : `/pages/tabBar${isTabbarIndex}/main`;
+            let routes = getCurrentPages();
+            let currentPage = routes[routes.length - 1].route;
+            if (currentPage==url) return
+
+            let query=parseQuery?`?${parseQuery}`:'';
             wx.reLaunch({
-                url: parseLink == '/' ? `/pages/home/main${query}` : `/pages/tabBar${isTabbarIndex}/main${query}`,
+                url:url+query
             })
             return
         }