From 111d58b81eb34eda1f14e6e005a399595f8932cf Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Wed, 2 Jun 2021 16:53:43 +0800 Subject: [PATCH] 优惠券和中心的显示 --- pages/user/coupons/coupons.js | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------- pages/user/index/index.js | 51 +++++++++++++++++++++++++++------------------------ 2 files changed, 161 insertions(+), 155 deletions(-) diff --git a/pages/user/coupons/coupons.js b/pages/user/coupons/coupons.js index d2603dd..9c48532 100644 --- a/pages/user/coupons/coupons.js +++ b/pages/user/coupons/coupons.js @@ -178,37 +178,40 @@ Page({ data.cashcount = parseInt(data.CashCount); getApp().globalData.Integral = data.Integral; - getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea",{data:{user_id: user_id, store_id: os.stoid, pageSize:200}}).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.total>0 ){ - var b_arr=res.data.data.pageData; - var b_can_arr=[]; //未使用 - var b_out_arr=[]; //已过期 - var b_isuse_arr=[]; //已过期 - for(var i in b_arr){ - b_arr[i].isby=1; - if(b_arr[i].isuse==0){ - if(b_arr[i].use_end_time<=ut.gettimestamp()){ - b_out_arr.push(b_arr[i]); - }else{ - b_can_arr.push(b_arr[i]); - } - - }else{ - b_isuse_arr.push(b_arr[i]); - } - } - data.cashcount= data.cashcount+b_can_arr.length; //加上包邮券的数量 - th.data.b_can_arr=b_can_arr; //可使用 - th.data.b_out_arr=b_out_arr; //过期 - th.data.b_isuse_arr=b_isuse_arr; //已使用 - th.setData({ udata: data}); - func();s_guoqi(); - - }else{ - th.setData({ udata: data}); - func();s_guoqi(); - } - }) + getApp().request.get("/api/weshop/userfeemail/pageAndArea",{ + data:{user_id: user_id, store_id: os.stoid, pageSize:200}, + success:function(res){ + if(res.data.code==0 && res.data.data && res.data.data.total>0 ){ + var b_arr=res.data.data.pageData; + var b_can_arr=[]; //未使用 + var b_out_arr=[]; //已过期 + var b_isuse_arr=[]; //已过期 + for(var i in b_arr){ + b_arr[i].isby=1; + if(b_arr[i].isuse==0){ + if(b_arr[i].use_end_time<=ut.gettimestamp()){ + b_out_arr.push(b_arr[i]); + }else{ + b_can_arr.push(b_arr[i]); + } + + }else{ + b_isuse_arr.push(b_arr[i]); + } + } + data.cashcount= data.cashcount+b_can_arr.length; //加上包邮券的数量 + th.data.b_can_arr=b_can_arr; //可使用 + th.data.b_out_arr=b_out_arr; //过期 + th.data.b_isuse_arr=b_isuse_arr; //已使用 + th.setData({ udata: data}); + func();s_guoqi(); + + }else{ + th.setData({ udata: data}); + func();s_guoqi(); + } + } + }) } }) @@ -227,23 +230,21 @@ Page({ page: 1 }; - getApp().request.promiseGet("/api/weshop/users/listQuan", { - data:get_data - }).then(res=>{ - - if(res.data.code==0 && res.data){ - 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; - if(th.data.b_out_arr) all_length+=th.data.b_out_arr.length; - th.setData({ number: all_length}); - } - - + getApp().request.get("/api/weshop/users/listQuan", { + data:get_data, + success:function(res){ + if(res.data.code==0 && res.data){ + 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; + if(th.data.b_out_arr) all_length+=th.data.b_out_arr.length; + th.setData({ number: all_length}); + } + } }) }, @@ -272,47 +273,48 @@ Page({ if(this.data.b_can_arr) init_num=this.data.b_can_arr.length; wx.showLoading(); th.data.isloading=1; - getApp().request.promiseGet("/api/weshop/users/listQuan", { + getApp().request.get("/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}); - - //没有找到优惠券的时候 - if (details.length == 0 && th.data.current_page==1) { - this.setData({sheng:0}); - getApp().showWarning("未找更多数据"); - if(big_arr.length>0) { - th.setData({ details: big_arr, }); - th.setData({ val: init_num}); - setTimeout(function(){ - details=big_arr; - for (var i = 0; i < details.length; i++) { - var no = i + len; - qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); - } - },1000) - } - return false; - } - - th.setData({ val: val+init_num }); - //数组合并 - big_arr=big_arr.concat(details); - //设置数组 - th.setData({ details: big_arr, }); - //延迟显示二维码的内容 - setTimeout(function () { - if(th.data.current_page==1) details=big_arr; - for (var i = 0; i < details.length; i++) { - var no = i + len; - qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); - } - wx.hideLoading(); - }, 1200) + success:function(res){ + 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}); + getApp().showWarning("未找更多数据"); + if(big_arr.length>0) { + th.setData({ details: big_arr, }); + th.setData({ val: init_num}); + setTimeout(function(){ + details=big_arr; + for (var i = 0; i < details.length; i++) { + var no = i + len; + qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); + } + },1000) + } + return false; + } + + th.setData({ val: val+init_num }); + //数组合并 + big_arr=big_arr.concat(details); + //设置数组 + th.setData({ details: big_arr, }); + //延迟显示二维码的内容 + setTimeout(function () { + if(th.data.current_page==1) details=big_arr; + for (var i = 0; i < details.length; i++) { + var no = i + len; + qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); + } + wx.hideLoading(); + }, 1200) + } }) @@ -341,54 +343,55 @@ Page({ if(big_arr.length==0 && this.data.b_out_arr){ big_arr=this.data.b_out_arr; } - init_num=this.data.b_out_arr.length; + if(this.data.b_out_arr) + init_num=this.data.b_out_arr.length; wx.showLoading();th.data.isloading=1; - getApp().request.promiseGet("/api/weshop/users/listQuan" + getApp().request.get("/api/weshop/users/listQuan" , { data: get_data, - }).then(res => { - - th.data.isloading=0; - var a = res.data; - number = a.data.total; - var details = a.data.pageData; - - if (details.length == 0) { - this.setData({overdue_sheng:0}); - getApp().showWarning("未找更多数据"); - if( big_arr.length>0 && th.data.current_page==1) { - th.setData({ details: big_arr, }); - th.setData({ number: init_num}); - setTimeout(function(){ - details=big_arr; - for (var i = 0; i < details.length; i++) { - var no = i + len; - qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); - } - },1000) - - } - return false; - } - - big_arr=big_arr.concat(details); - - this.setData({ - details: big_arr, number:number+init_num, - }); - - - setTimeout(function () { - if(th.data.current_page==1) details=big_arr; - for (var i = 0; i < details.length; i++) { - var no = i + len; - qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); - - } - wx.hideLoading(); - }, 800) + success:function(res){ + th.data.isloading=0; + var a = res.data; + number = a.data.total; + var details = a.data.pageData; + + if (details.length == 0) { + this.setData({overdue_sheng:0}); + getApp().showWarning("未找更多数据"); + if( big_arr.length>0 && th.data.current_page==1) { + th.setData({ details: big_arr, }); + th.setData({ number: init_num}); + setTimeout(function(){ + details=big_arr; + for (var i = 0; i < details.length; i++) { + var no = i + len; + qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); + } + },1000) + + } + return false; + } + + big_arr=big_arr.concat(details); + + this.setData({ + details: big_arr, number:number+init_num, + }); + + + setTimeout(function () { + if(th.data.current_page==1) details=big_arr; + for (var i = 0; i < details.length; i++) { + var no = i + len; + qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); + + } + wx.hideLoading(); + }, 800) + } }) }, diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 7793a2d..5d4724e 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -60,33 +60,36 @@ Page({ onLoad: function(options) { var th=this; //-- 读取会员中心按钮列表 -- - getApp().request.promiseGet("/api/weshop/userTool/page?pageSize=100", { - }).then(res => { - if(res.data.code==0 ){ - var d_list=res.data.data.pageData; - getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ - var dis=rs.data.data; - for(var i in d_list){ - if(d_list[i].name=='我的分销' && dis && dis.switch==0){ - d_list.splice(i,1); - } - } - th.setData({user_tool:d_list}); - }) - } - }) + getApp().request.get("/api/weshop/userTool/page?pageSize=100", { + success:function(res){ + if(res.data.code==0 ){ + var d_list=res.data.data.pageData; + getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ + var dis=rs.data.data; + for(var i in d_list){ + if(d_list[i].name=='我的分销' && dis && dis.switch==0){ + d_list.splice(i,1); + } + } + th.setData({user_tool:d_list}); + }) + } + } + }) this.birthday(); - getApp().request.promiseGet("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, { + getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, { data: { enabled: 1 - } - }).then(res => { - if(res.data.code==0 && res.data.data){ - var item=res.data.data.pageData[0]; - if (item && item.ad_code) - th.setData({ad_img:item.ad_code}) - } - }) + }, + success:function(res){ + if(res.data.code==0 && res.data.data){ + var item=res.data.data.pageData[0]; + if (item && item.ad_code) th.setData({ad_img:item.ad_code}) + } + } + }) + + app.getUserFir(); }, -- libgit2 0.21.4