Commit b9c14d6d0fc6979e70ddfb086b4354e82fe2bb1b
1 parent
83074281
跳转链接
Showing
1 changed file
with
7 additions
and
5 deletions
pages/goods/categoryList/categoryList.js
@@ -99,8 +99,8 @@ Page({ | @@ -99,8 +99,8 @@ Page({ | ||
99 | //-- user_id代过来免登录 -- | 99 | //-- user_id代过来免登录 -- |
100 | getApp().globalData.first_leader=first_leader; | 100 | getApp().globalData.first_leader=first_leader; |
101 | } | 101 | } |
102 | - | ||
103 | - | 102 | + |
103 | + if(tt.type) this.data.type= parseInt(tt.type); | ||
104 | that.get_brand(); | 104 | that.get_brand(); |
105 | 105 | ||
106 | clearInterval(that.data.timer); | 106 | clearInterval(that.data.timer); |
@@ -267,14 +267,16 @@ Page({ | @@ -267,14 +267,16 @@ Page({ | ||
267 | else if (that.data.is_show_pp) {that.setData({ currentTab: 2 });that.get_brand(); } | 267 | else if (that.data.is_show_pp) {that.setData({ currentTab: 2 });that.get_brand(); } |
268 | else if (that.data.is_show_xm) {that.setData({ currentTab: 3 });that.getServiceCategory(); } | 268 | else if (that.data.is_show_xm) {that.setData({ currentTab: 3 });that.getServiceCategory(); } |
269 | 269 | ||
270 | + | ||
271 | + var t_type=this.data.type; | ||
270 | //----求传参过来的控制----- | 272 | //----求传参过来的控制----- |
271 | - if (getApp().globalData.cat_type == 1 && that.data.is_show_gb ) { | 273 | + if (t_type == 1 && that.data.is_show_gb ) { |
272 | that.setData({ currentTab: 1 }); | 274 | that.setData({ currentTab: 1 }); |
273 | that.get_nation(); | 275 | that.get_nation(); |
274 | - } else if (getApp().globalData.cat_type == 2 && that.data.is_show_pp ) { | 276 | + } else if (t_type == 2 && that.data.is_show_pp ) { |
275 | that.setData({ currentTab: 2 }); | 277 | that.setData({ currentTab: 2 }); |
276 | that.get_brand(); | 278 | that.get_brand(); |
277 | - } else if (getApp().globalData.cat_type == 3 && that.data.is_show_xm ) { | 279 | + } else if (t_type == 3 && that.data.is_show_xm ) { |
278 | that.setData({ currentTab: 3 }); | 280 | that.setData({ currentTab: 3 }); |
279 | that.getServiceCategory(); | 281 | that.getServiceCategory(); |
280 | } else if (that.data.is_show_pl) { | 282 | } else if (that.data.is_show_pl) { |