diff --git a/app.js b/app.js index e674963..5397c7e 100644 --- a/app.js +++ b/app.js @@ -494,6 +494,17 @@ App({ "/pages/cart/cart/cart", "/pages/user/index/index", "/pages/distribution/distribution"]; + //因为地址有参数 + for(var i in arr_tabbar){ + var ck_url=arr_tabbar[i]; + if (("/"+url).indexOf(ck_url) != -1) { + if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1; + if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2; + wx.reLaunch({ url: url, }) //跳到tabbar页 + return; + } + } + if (arr_tabbar.indexOf(url) != -1) { if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1; if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2; diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index baf06ec..a6a355e 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -1164,7 +1164,9 @@ Page({ } }, - //-------------加数量--------------------- + //-------------加减数量的时候,要把show_can_cx清理掉, + // 同时应该记录一下当前是什么活动那个,如果切换后的活动有跟切换前的活动一样是,就要让切换后的活动的值匹配选中------------- + clear_req: function () { var carr = this.data.requestData; for (var i = 0; i < carr.length; i++) {