Merge branch 'qa' into 'master'

Qa See merge request !267

Merge branch 'qa' into 'master'
Qa See merge request !267
后端研发-苏明海
2 parents 3c98ddac 51b0fdaf
Showing 1 changed file with 44 additions and 21 deletions
pages/user/coupons/coupons.js
@@ -159,12 +159,13 @@ Page({
       wx.navigateTo({ url: '/pages/getphone/getphone', })
       return false;
     }
-    this.init(th.myyhj);	
+    this.init(th.myyhj,th.s_guoqi);	
+	
   },
   //----------券的界面初始化-----------
-  init:function(func){
+  init:function(func,s_guoqi){
 	  var user_id = getApp().globalData.user_id;
 	  var store_id = os.stoid;
 	  var th=this;
@@ -200,11 +201,11 @@ Page({
 					 th.data.b_out_arr=b_out_arr;      //过期
 					 th.data.b_isuse_arr=b_isuse_arr;  //已使用
 					 th.setData({ udata: data}); 
-					 func();
+					 func();s_guoqi();
 			   }else{
 				   th.setData({ udata: data});   
-				   func();
+				   func();s_guoqi();
 			   }		       
 		   })	   	
@@ -212,11 +213,38 @@ Page({
 	   }) 
   },
-
+  s_guoqi:function(){
+	
+	  var th = this,  number=0;
+	  var user_id = getApp().globalData.user_id;
+	  var store_id = os.stoid;	        
+	  var get_data = {
+	    user_id: user_id,
+	    store_id: store_id,
+	    IsUse: 2,
+	    pageSize: 1,
+	    page: 1
+	  };
+	  
+	  getApp().request.promiseGet("/api/weshop/users/listQuan", {
+		  data:get_data
+	  }).then(res=>{
+		  var a = res.data,val = a.data.total; 
+		  var details = a.data.pageData;	 
+		  if (details.length == 0){
+			   if(th.data.b_out_arr)  th.setData({ number: th.data.b_out_arr.length});			   
+			   return false;
+		  } 
+	  
+		  var all_length=val+th.data.b_out_arr.length;
+		  th.setData({ number: all_length});		
+		  
+	  })
+  },
+ 
   //获取劵的数量
   myyhj:function() {
-        if(this.data.isloading) return;	
-		
+        if(this.data.isloading) return;			
 		var len = this.data.details.length;
 		this.data.current_page++;
 		var e = this, sum, val, number;
@@ -242,14 +270,12 @@ Page({
 	    getApp().request.promiseGet("/api/weshop/users/listQuan", {
 		  data: get_data,
 		}).then(res => {
-		   th.data.isloading=0;	
-		
-		   var a = res.data;
-		   val = a.data.total; 
-		   var details = a.data.pageData;
-		   
-		   th.setData({isset:1});
-		 
+		    th.data.isloading=0;	
+		    var a = res.data;
+		    val = a.data.total; 
+		    var details = a.data.pageData;	   
+		    th.setData({isset:1});
+	 
 		    //没有找到优惠券的时候
 		    if (details.length == 0 && th.data.current_page==1) {
 			   this.setData({sheng:0}); 
@@ -268,13 +294,11 @@ Page({
 			   return false;
 			}
-			th.setData({ val: val+init_num });	
-			
+			th.setData({ val: val+init_num });		
 			//数组合并  
 			big_arr=big_arr.concat(details);
 			//设置数组  		
-			th.setData({ details: big_arr, });	
-		  
+			th.setData({ details: big_arr, });			  
 		    //延迟显示二维码的内容
 		    setTimeout(function () {			
 				if(th.data.current_page==1) details=big_arr;	
@@ -283,8 +307,7 @@ Page({
 					qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460);      
 				}
 				wx.hideLoading();
-			 }, 1200)
-		 
+			 }, 1200)		 
 		})