Commit 5d30cbd80cdd96126589b1ca38463303c3499d81
Merge branch 'test' into 'qa'
Test See merge request !50
Showing
1 changed file
with
2 additions
and
1 deletions
pages/user/order_list/order_list.js
| @@ -30,7 +30,8 @@ Page({ | @@ -30,7 +30,8 @@ Page({ | ||
| 30 | is_get:0, | 30 | is_get:0, |
| 31 | }, | 31 | }, |
| 32 | onLoad: function(t) { | 32 | onLoad: function(t) { |
| 33 | - var e = void 0 === t.type ? this.data.activeCategoryId : t.type; | 33 | + //var e = void 0 === t.type ? this.data.activeCategoryId : t.type; |
| 34 | + if(t.type!=undefined) this.setData({activeCategoryId:t.type}) | ||
| 34 | s.init(this, "", "orderList"); | 35 | s.init(this, "", "orderList"); |
| 35 | //this.requestOrderList(e), wx.removeStorageSync("order:order_list:update"); | 36 | //this.requestOrderList(e), wx.removeStorageSync("order:order_list:update"); |
| 36 | }, | 37 | }, |