Commit b155965f55e25ecc0e8197bae29528fc829616e2
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test
Showing
2 changed files
with
3 additions
and
2 deletions
packageC/pages/presell/list/list.js
| @@ -141,7 +141,8 @@ Page({ | @@ -141,7 +141,8 @@ Page({ | ||
| 141 | page: this.data.page, | 141 | page: this.data.page, |
| 142 | pageSize: 10, | 142 | pageSize: 10, |
| 143 | // timetype: self.data.type, | 143 | // timetype: self.data.type, |
| 144 | - isuse:1 | 144 | + isuse:1, |
| 145 | + timetype:3 | ||
| 145 | } | 146 | } |
| 146 | if(getApp().globalData.userInfo){ | 147 | if(getApp().globalData.userInfo){ |
| 147 | req.user_id=getApp().globalData.userInfo.user_id; | 148 | req.user_id=getApp().globalData.userInfo.user_id; |
pages/index/index/index.js
| @@ -418,7 +418,7 @@ Page({ | @@ -418,7 +418,7 @@ Page({ | ||
| 418 | 418 | ||
| 419 | if (!this.data.isTemplate) { | 419 | if (!this.data.isTemplate) { |
| 420 | // timetype: 1 仅查询已预售 置空查询全部, | 420 | // timetype: 1 仅查询已预售 置空查询全部, |
| 421 | - var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1 }; | 421 | + var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1,timetype:3 }; |
| 422 | if (user_id) { | 422 | if (user_id) { |
| 423 | pre_data.user_id = user_id; | 423 | pre_data.user_id = user_id; |
| 424 | } | 424 | } |