diff --git a/pages/user/coupons/coupons.js b/pages/user/coupons/coupons.js index 55d36dd..6f08bb1 100644 --- a/pages/user/coupons/coupons.js +++ b/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; @@ -185,8 +186,8 @@ Page({ for(var i in b_arr){ b_arr[i].isby=1; if(b_arr[i].isuse==0){ - if(b_arr[i].use_end_time{ + 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) }) @@ -311,7 +334,7 @@ Page({ var big_arr= this.data.details; //可用券加入包邮券 if(big_arr.length==0 && this.data.b_out_arr){ - big_arr=this.data.b_can_arr; + big_arr=this.data.b_out_arr; } init_num=this.data.b_out_arr.length;