Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test

WXD-SEASON\season
2 parents afbd854e aa41a548
Showing 2 changed files with 3 additions and 2 deletions
packageC/pages/presell/list/list.js
pages/index/index/index.js
@@ -141,7 +141,8 @@ Page({
             page: this.data.page,
             pageSize: 10,
             // timetype: self.data.type,
-            isuse:1
+            isuse:1,
+            timetype:3
         }
         if(getApp().globalData.userInfo){
             req.user_id=getApp().globalData.userInfo.user_id;
@@ -418,7 +418,7 @@ Page({
  
 		if (!this.data.isTemplate) {
       // timetype: 1 仅查询已预售 置空查询全部,
-			var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1 };
+			var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1,timetype:3 };
 			if (user_id) {
 				pre_data.user_id = user_id;
 			}