Commit 526461dcb7c5801c5d9c5f571eec2c70349aa8e9

Authored by yvan.ni
1 parent 478a5451

优化

@@ -494,6 +494,17 @@ App({ @@ -494,6 +494,17 @@ App({
494 "/pages/cart/cart/cart", "/pages/user/index/index", 494 "/pages/cart/cart/cart", "/pages/user/index/index",
495 "/pages/distribution/distribution"]; 495 "/pages/distribution/distribution"];
496 496
  497 + //因为地址有参数
  498 + for(var i in arr_tabbar){
  499 + var ck_url=arr_tabbar[i];
  500 + if (("/"+url).indexOf(ck_url) != -1) {
  501 + if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1;
  502 + if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2;
  503 + wx.reLaunch({ url: url, }) //跳到tabbar页
  504 + return;
  505 + }
  506 + }
  507 +
497 if (arr_tabbar.indexOf(url) != -1) { 508 if (arr_tabbar.indexOf(url) != -1) {
498 if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1; 509 if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1;
499 if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2; 510 if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2;
pages/cart/cart/cart.js
@@ -1164,7 +1164,9 @@ Page({ @@ -1164,7 +1164,9 @@ Page({
1164 } 1164 }
1165 }, 1165 },
1166 1166
1167 - //-------------加数量--------------------- 1167 + //-------------加减数量的时候,要把show_can_cx清理掉,
  1168 + // 同时应该记录一下当前是什么活动那个,如果切换后的活动有跟切换前的活动一样是,就要让切换后的活动的值匹配选中-------------
  1169 +
1168 clear_req: function () { 1170 clear_req: function () {
1169 var carr = this.data.requestData; 1171 var carr = this.data.requestData;
1170 for (var i = 0; i < carr.length; i++) { 1172 for (var i = 0; i < carr.length; i++) {