Commit 111d58b81eb34eda1f14e6e005a399595f8932cf
1 parent
4a3a5b8c
优惠券和中心的显示
Showing
2 changed files
with
161 additions
and
155 deletions
pages/user/coupons/coupons.js
@@ -178,37 +178,40 @@ Page({ | @@ -178,37 +178,40 @@ Page({ | ||
178 | data.cashcount = parseInt(data.CashCount); | 178 | data.cashcount = parseInt(data.CashCount); |
179 | getApp().globalData.Integral = data.Integral; | 179 | getApp().globalData.Integral = data.Integral; |
180 | 180 | ||
181 | - getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea",{data:{user_id: user_id, store_id: os.stoid, pageSize:200}}).then(res=>{ | ||
182 | - if(res.data.code==0 && res.data.data && res.data.data.total>0 ){ | ||
183 | - var b_arr=res.data.data.pageData; | ||
184 | - var b_can_arr=[]; //未使用 | ||
185 | - var b_out_arr=[]; //已过期 | ||
186 | - var b_isuse_arr=[]; //已过期 | ||
187 | - for(var i in b_arr){ | ||
188 | - b_arr[i].isby=1; | ||
189 | - if(b_arr[i].isuse==0){ | ||
190 | - if(b_arr[i].use_end_time<=ut.gettimestamp()){ | ||
191 | - b_out_arr.push(b_arr[i]); | ||
192 | - }else{ | ||
193 | - b_can_arr.push(b_arr[i]); | ||
194 | - } | ||
195 | - | ||
196 | - }else{ | ||
197 | - b_isuse_arr.push(b_arr[i]); | ||
198 | - } | ||
199 | - } | ||
200 | - data.cashcount= data.cashcount+b_can_arr.length; //加上包邮券的数量 | ||
201 | - th.data.b_can_arr=b_can_arr; //可使用 | ||
202 | - th.data.b_out_arr=b_out_arr; //过期 | ||
203 | - th.data.b_isuse_arr=b_isuse_arr; //已使用 | ||
204 | - th.setData({ udata: data}); | ||
205 | - func();s_guoqi(); | ||
206 | - | ||
207 | - }else{ | ||
208 | - th.setData({ udata: data}); | ||
209 | - func();s_guoqi(); | ||
210 | - } | ||
211 | - }) | 181 | + getApp().request.get("/api/weshop/userfeemail/pageAndArea",{ |
182 | + data:{user_id: user_id, store_id: os.stoid, pageSize:200}, | ||
183 | + success:function(res){ | ||
184 | + if(res.data.code==0 && res.data.data && res.data.data.total>0 ){ | ||
185 | + var b_arr=res.data.data.pageData; | ||
186 | + var b_can_arr=[]; //未使用 | ||
187 | + var b_out_arr=[]; //已过期 | ||
188 | + var b_isuse_arr=[]; //已过期 | ||
189 | + for(var i in b_arr){ | ||
190 | + b_arr[i].isby=1; | ||
191 | + if(b_arr[i].isuse==0){ | ||
192 | + if(b_arr[i].use_end_time<=ut.gettimestamp()){ | ||
193 | + b_out_arr.push(b_arr[i]); | ||
194 | + }else{ | ||
195 | + b_can_arr.push(b_arr[i]); | ||
196 | + } | ||
197 | + | ||
198 | + }else{ | ||
199 | + b_isuse_arr.push(b_arr[i]); | ||
200 | + } | ||
201 | + } | ||
202 | + data.cashcount= data.cashcount+b_can_arr.length; //加上包邮券的数量 | ||
203 | + th.data.b_can_arr=b_can_arr; //可使用 | ||
204 | + th.data.b_out_arr=b_out_arr; //过期 | ||
205 | + th.data.b_isuse_arr=b_isuse_arr; //已使用 | ||
206 | + th.setData({ udata: data}); | ||
207 | + func();s_guoqi(); | ||
208 | + | ||
209 | + }else{ | ||
210 | + th.setData({ udata: data}); | ||
211 | + func();s_guoqi(); | ||
212 | + } | ||
213 | + } | ||
214 | + }) | ||
212 | 215 | ||
213 | } | 216 | } |
214 | }) | 217 | }) |
@@ -227,23 +230,21 @@ Page({ | @@ -227,23 +230,21 @@ Page({ | ||
227 | page: 1 | 230 | page: 1 |
228 | }; | 231 | }; |
229 | 232 | ||
230 | - getApp().request.promiseGet("/api/weshop/users/listQuan", { | ||
231 | - data:get_data | ||
232 | - }).then(res=>{ | ||
233 | - | ||
234 | - if(res.data.code==0 && res.data){ | ||
235 | - var a = res.data,val = a.data.total; | ||
236 | - var details = a.data.pageData; | ||
237 | - if (details.length == 0){ | ||
238 | - if(th.data.b_out_arr) th.setData({ number: th.data.b_out_arr.length}); | ||
239 | - return false; | ||
240 | - } | ||
241 | - var all_length=val; | ||
242 | - if(th.data.b_out_arr) all_length+=th.data.b_out_arr.length; | ||
243 | - th.setData({ number: all_length}); | ||
244 | - } | ||
245 | - | ||
246 | - | 233 | + getApp().request.get("/api/weshop/users/listQuan", { |
234 | + data:get_data, | ||
235 | + success:function(res){ | ||
236 | + if(res.data.code==0 && res.data){ | ||
237 | + var a = res.data,val = a.data.total; | ||
238 | + var details = a.data.pageData; | ||
239 | + if (details.length == 0){ | ||
240 | + if(th.data.b_out_arr) th.setData({ number: th.data.b_out_arr.length}); | ||
241 | + return false; | ||
242 | + } | ||
243 | + var all_length=val; | ||
244 | + if(th.data.b_out_arr) all_length+=th.data.b_out_arr.length; | ||
245 | + th.setData({ number: all_length}); | ||
246 | + } | ||
247 | + } | ||
247 | }) | 248 | }) |
248 | }, | 249 | }, |
249 | 250 | ||
@@ -272,47 +273,48 @@ Page({ | @@ -272,47 +273,48 @@ Page({ | ||
272 | if(this.data.b_can_arr) init_num=this.data.b_can_arr.length; | 273 | if(this.data.b_can_arr) init_num=this.data.b_can_arr.length; |
273 | 274 | ||
274 | wx.showLoading(); th.data.isloading=1; | 275 | wx.showLoading(); th.data.isloading=1; |
275 | - getApp().request.promiseGet("/api/weshop/users/listQuan", { | 276 | + getApp().request.get("/api/weshop/users/listQuan", { |
276 | data: get_data, | 277 | data: get_data, |
277 | - }).then(res => { | ||
278 | - th.data.isloading=0; | ||
279 | - var a = res.data; | ||
280 | - val = a.data.total; | ||
281 | - var details = a.data.pageData; | ||
282 | - th.setData({isset:1}); | ||
283 | - | ||
284 | - //没有找到优惠券的时候 | ||
285 | - if (details.length == 0 && th.data.current_page==1) { | ||
286 | - this.setData({sheng:0}); | ||
287 | - getApp().showWarning("未找更多数据"); | ||
288 | - if(big_arr.length>0) { | ||
289 | - th.setData({ details: big_arr, }); | ||
290 | - th.setData({ val: init_num}); | ||
291 | - setTimeout(function(){ | ||
292 | - details=big_arr; | ||
293 | - for (var i = 0; i < details.length; i++) { | ||
294 | - var no = i + len; | ||
295 | - qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); | ||
296 | - } | ||
297 | - },1000) | ||
298 | - } | ||
299 | - return false; | ||
300 | - } | ||
301 | - | ||
302 | - th.setData({ val: val+init_num }); | ||
303 | - //数组合并 | ||
304 | - big_arr=big_arr.concat(details); | ||
305 | - //设置数组 | ||
306 | - th.setData({ details: big_arr, }); | ||
307 | - //延迟显示二维码的内容 | ||
308 | - setTimeout(function () { | ||
309 | - if(th.data.current_page==1) details=big_arr; | ||
310 | - for (var i = 0; i < details.length; i++) { | ||
311 | - var no = i + len; | ||
312 | - qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); | ||
313 | - } | ||
314 | - wx.hideLoading(); | ||
315 | - }, 1200) | 278 | + success:function(res){ |
279 | + th.data.isloading=0; | ||
280 | + var a = res.data; | ||
281 | + val = a.data.total; | ||
282 | + var details = a.data.pageData; | ||
283 | + th.setData({isset:1}); | ||
284 | + | ||
285 | + //没有找到优惠券的时候 | ||
286 | + if (details.length == 0 && th.data.current_page==1) { | ||
287 | + this.setData({sheng:0}); | ||
288 | + getApp().showWarning("未找更多数据"); | ||
289 | + if(big_arr.length>0) { | ||
290 | + th.setData({ details: big_arr, }); | ||
291 | + th.setData({ val: init_num}); | ||
292 | + setTimeout(function(){ | ||
293 | + details=big_arr; | ||
294 | + for (var i = 0; i < details.length; i++) { | ||
295 | + var no = i + len; | ||
296 | + qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); | ||
297 | + } | ||
298 | + },1000) | ||
299 | + } | ||
300 | + return false; | ||
301 | + } | ||
302 | + | ||
303 | + th.setData({ val: val+init_num }); | ||
304 | + //数组合并 | ||
305 | + big_arr=big_arr.concat(details); | ||
306 | + //设置数组 | ||
307 | + th.setData({ details: big_arr, }); | ||
308 | + //延迟显示二维码的内容 | ||
309 | + setTimeout(function () { | ||
310 | + if(th.data.current_page==1) details=big_arr; | ||
311 | + for (var i = 0; i < details.length; i++) { | ||
312 | + var no = i + len; | ||
313 | + qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); | ||
314 | + } | ||
315 | + wx.hideLoading(); | ||
316 | + }, 1200) | ||
317 | + } | ||
316 | }) | 318 | }) |
317 | 319 | ||
318 | 320 | ||
@@ -341,54 +343,55 @@ Page({ | @@ -341,54 +343,55 @@ Page({ | ||
341 | if(big_arr.length==0 && this.data.b_out_arr){ | 343 | if(big_arr.length==0 && this.data.b_out_arr){ |
342 | big_arr=this.data.b_out_arr; | 344 | big_arr=this.data.b_out_arr; |
343 | } | 345 | } |
344 | - init_num=this.data.b_out_arr.length; | 346 | + if(this.data.b_out_arr) |
347 | + init_num=this.data.b_out_arr.length; | ||
345 | 348 | ||
346 | 349 | ||
347 | wx.showLoading();th.data.isloading=1; | 350 | wx.showLoading();th.data.isloading=1; |
348 | - getApp().request.promiseGet("/api/weshop/users/listQuan" | 351 | + getApp().request.get("/api/weshop/users/listQuan" |
349 | , { | 352 | , { |
350 | data: get_data, | 353 | data: get_data, |
351 | - }).then(res => { | ||
352 | - | ||
353 | - th.data.isloading=0; | ||
354 | - var a = res.data; | ||
355 | - number = a.data.total; | ||
356 | - var details = a.data.pageData; | ||
357 | - | ||
358 | - if (details.length == 0) { | ||
359 | - this.setData({overdue_sheng:0}); | ||
360 | - getApp().showWarning("未找更多数据"); | ||
361 | - if( big_arr.length>0 && th.data.current_page==1) { | ||
362 | - th.setData({ details: big_arr, }); | ||
363 | - th.setData({ number: init_num}); | ||
364 | - setTimeout(function(){ | ||
365 | - details=big_arr; | ||
366 | - for (var i = 0; i < details.length; i++) { | ||
367 | - var no = i + len; | ||
368 | - qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); | ||
369 | - } | ||
370 | - },1000) | ||
371 | - | ||
372 | - } | ||
373 | - return false; | ||
374 | - } | ||
375 | - | ||
376 | - big_arr=big_arr.concat(details); | ||
377 | - | ||
378 | - this.setData({ | ||
379 | - details: big_arr, number:number+init_num, | ||
380 | - }); | ||
381 | - | ||
382 | - | ||
383 | - setTimeout(function () { | ||
384 | - if(th.data.current_page==1) details=big_arr; | ||
385 | - for (var i = 0; i < details.length; i++) { | ||
386 | - var no = i + len; | ||
387 | - qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); | ||
388 | - | ||
389 | - } | ||
390 | - wx.hideLoading(); | ||
391 | - }, 800) | 354 | + success:function(res){ |
355 | + th.data.isloading=0; | ||
356 | + var a = res.data; | ||
357 | + number = a.data.total; | ||
358 | + var details = a.data.pageData; | ||
359 | + | ||
360 | + if (details.length == 0) { | ||
361 | + this.setData({overdue_sheng:0}); | ||
362 | + getApp().showWarning("未找更多数据"); | ||
363 | + if( big_arr.length>0 && th.data.current_page==1) { | ||
364 | + th.setData({ details: big_arr, }); | ||
365 | + th.setData({ number: init_num}); | ||
366 | + setTimeout(function(){ | ||
367 | + details=big_arr; | ||
368 | + for (var i = 0; i < details.length; i++) { | ||
369 | + var no = i + len; | ||
370 | + qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); | ||
371 | + } | ||
372 | + },1000) | ||
373 | + | ||
374 | + } | ||
375 | + return false; | ||
376 | + } | ||
377 | + | ||
378 | + big_arr=big_arr.concat(details); | ||
379 | + | ||
380 | + this.setData({ | ||
381 | + details: big_arr, number:number+init_num, | ||
382 | + }); | ||
383 | + | ||
384 | + | ||
385 | + setTimeout(function () { | ||
386 | + if(th.data.current_page==1) details=big_arr; | ||
387 | + for (var i = 0; i < details.length; i++) { | ||
388 | + var no = i + len; | ||
389 | + qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); | ||
390 | + | ||
391 | + } | ||
392 | + wx.hideLoading(); | ||
393 | + }, 800) | ||
394 | + } | ||
392 | }) | 395 | }) |
393 | }, | 396 | }, |
394 | 397 |
pages/user/index/index.js
@@ -60,33 +60,36 @@ Page({ | @@ -60,33 +60,36 @@ Page({ | ||
60 | onLoad: function(options) { | 60 | onLoad: function(options) { |
61 | var th=this; | 61 | var th=this; |
62 | //-- 读取会员中心按钮列表 -- | 62 | //-- 读取会员中心按钮列表 -- |
63 | - getApp().request.promiseGet("/api/weshop/userTool/page?pageSize=100", { | ||
64 | - }).then(res => { | ||
65 | - if(res.data.code==0 ){ | ||
66 | - var d_list=res.data.data.pageData; | ||
67 | - getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ | ||
68 | - var dis=rs.data.data; | ||
69 | - for(var i in d_list){ | ||
70 | - if(d_list[i].name=='我的分销' && dis && dis.switch==0){ | ||
71 | - d_list.splice(i,1); | ||
72 | - } | ||
73 | - } | ||
74 | - th.setData({user_tool:d_list}); | ||
75 | - }) | ||
76 | - } | ||
77 | - }) | 63 | + getApp().request.get("/api/weshop/userTool/page?pageSize=100", { |
64 | + success:function(res){ | ||
65 | + if(res.data.code==0 ){ | ||
66 | + var d_list=res.data.data.pageData; | ||
67 | + getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ | ||
68 | + var dis=rs.data.data; | ||
69 | + for(var i in d_list){ | ||
70 | + if(d_list[i].name=='我的分销' && dis && dis.switch==0){ | ||
71 | + d_list.splice(i,1); | ||
72 | + } | ||
73 | + } | ||
74 | + th.setData({user_tool:d_list}); | ||
75 | + }) | ||
76 | + } | ||
77 | + } | ||
78 | + }) | ||
78 | this.birthday(); | 79 | this.birthday(); |
79 | - getApp().request.promiseGet("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, { | 80 | + getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, { |
80 | data: { | 81 | data: { |
81 | enabled: 1 | 82 | enabled: 1 |
82 | - } | ||
83 | - }).then(res => { | ||
84 | - if(res.data.code==0 && res.data.data){ | ||
85 | - var item=res.data.data.pageData[0]; | ||
86 | - if (item && item.ad_code) | ||
87 | - th.setData({ad_img:item.ad_code}) | ||
88 | - } | ||
89 | - }) | 83 | + }, |
84 | + success:function(res){ | ||
85 | + if(res.data.code==0 && res.data.data){ | ||
86 | + var item=res.data.data.pageData[0]; | ||
87 | + if (item && item.ad_code) th.setData({ad_img:item.ad_code}) | ||
88 | + } | ||
89 | + } | ||
90 | + }) | ||
91 | + | ||
92 | + | ||
90 | app.getUserFir(); | 93 | app.getUserFir(); |
91 | 94 | ||
92 | }, | 95 | }, |