From cec26bef3a2d396504f7690437d6df7187733efb Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Thu, 19 Aug 2021 17:34:12 +0800
Subject: [PATCH] 包邮券修改

---
 packageB/pages/coupons/query/index.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packageB/pages/coupons/query/index.js b/packageB/pages/coupons/query/index.js
index 7c59ffb..b4163d3 100644
--- a/packageB/pages/coupons/query/index.js
+++ b/packageB/pages/coupons/query/index.js
@@ -328,7 +328,7 @@ Page({
   async wjquery() { 
     if(this.data.isloading) return;
 		if(this.data.is_no_more) return;
-		this.data.islading=1;
+		this.data.isloading=1;
 		var th=this;
 	
     var len = this.data.details.length;
@@ -384,7 +384,7 @@ Page({
 	var by_list=[];
 	if(th.data.current_page==1){
 		  //先拿包邮券
-		  await getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea", {
+		  await getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea?pageSize=100", {
 		      data: dd,   
 		  }).then(res => {
 				
@@ -400,9 +400,9 @@ Page({
 				   for(var i in by_list){
 					    by_list[i].isby=1;
 						//过滤是时间的范围
-					    if(get_data.IsUse == 2 && by_list[i].use_end_time>=ut.gettimestamp()){
+					    if(get_data.IsUse == 2 && by_list[i].use_end_time<=ut.gettimestamp()){
 					    	 th.data.by_list.push(by_list[i]);										   
-					    }else if(get_data.IsUse == 0 && by_list[i].use_end_time<ut.gettimestamp()){
+					    }else if(get_data.IsUse == 0){
 							 th.data.by_list.push(by_list[i]);
 						}else if(get_data.IsUse==1){
 							 th.data.by_list.push(by_list[i]);
@@ -426,7 +426,7 @@ Page({
       
     }).then(res => {
      
-	  th.data.islading=0; 
+	  th.data.isloading=0; 
       var a = res.data;
       var len = e.data.details.length;
       var details = a.data.pageData;
@@ -437,7 +437,6 @@ Page({
 			});
          
       if (details.length == 0) {
-        // this.data.is_no_more = 1;
 				this.setData({
 					is_no_more: 1,
 				});
@@ -500,7 +499,7 @@ Page({
 				user_id: getApp().globalData.user_id,
 				store_id: os.stoid,
 			}, function() {
-				console.log('!!!!!', _this.data.list.pageData);
+				// console.log('!!!!!', _this.data.list.pageData);
 				_this.setData({
 					result: _this.data.list.pageData,
 				});
--
libgit2 0.21.4