Commit cec26bef3a2d396504f7690437d6df7187733efb
1 parent
628a35bb
包邮券修改
Showing
1 changed file
with
6 additions
and
7 deletions
packageB/pages/coupons/query/index.js
| ... | ... | @@ -328,7 +328,7 @@ Page({ |
| 328 | 328 | async wjquery() { |
| 329 | 329 | if(this.data.isloading) return; |
| 330 | 330 | if(this.data.is_no_more) return; |
| 331 | - this.data.islading=1; | |
| 331 | + this.data.isloading=1; | |
| 332 | 332 | var th=this; |
| 333 | 333 | |
| 334 | 334 | var len = this.data.details.length; |
| ... | ... | @@ -384,7 +384,7 @@ Page({ |
| 384 | 384 | var by_list=[]; |
| 385 | 385 | if(th.data.current_page==1){ |
| 386 | 386 | //先拿包邮券 |
| 387 | - await getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea", { | |
| 387 | + await getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea?pageSize=100", { | |
| 388 | 388 | data: dd, |
| 389 | 389 | }).then(res => { |
| 390 | 390 | |
| ... | ... | @@ -400,9 +400,9 @@ Page({ |
| 400 | 400 | for(var i in by_list){ |
| 401 | 401 | by_list[i].isby=1; |
| 402 | 402 | //过滤是时间的范围 |
| 403 | - if(get_data.IsUse == 2 && by_list[i].use_end_time>=ut.gettimestamp()){ | |
| 403 | + if(get_data.IsUse == 2 && by_list[i].use_end_time<=ut.gettimestamp()){ | |
| 404 | 404 | th.data.by_list.push(by_list[i]); |
| 405 | - }else if(get_data.IsUse == 0 && by_list[i].use_end_time<ut.gettimestamp()){ | |
| 405 | + }else if(get_data.IsUse == 0){ | |
| 406 | 406 | th.data.by_list.push(by_list[i]); |
| 407 | 407 | }else if(get_data.IsUse==1){ |
| 408 | 408 | th.data.by_list.push(by_list[i]); |
| ... | ... | @@ -426,7 +426,7 @@ Page({ |
| 426 | 426 | |
| 427 | 427 | }).then(res => { |
| 428 | 428 | |
| 429 | - th.data.islading=0; | |
| 429 | + th.data.isloading=0; | |
| 430 | 430 | var a = res.data; |
| 431 | 431 | var len = e.data.details.length; |
| 432 | 432 | var details = a.data.pageData; |
| ... | ... | @@ -437,7 +437,6 @@ Page({ |
| 437 | 437 | }); |
| 438 | 438 | |
| 439 | 439 | if (details.length == 0) { |
| 440 | - // this.data.is_no_more = 1; | |
| 441 | 440 | this.setData({ |
| 442 | 441 | is_no_more: 1, |
| 443 | 442 | }); |
| ... | ... | @@ -500,7 +499,7 @@ Page({ |
| 500 | 499 | user_id: getApp().globalData.user_id, |
| 501 | 500 | store_id: os.stoid, |
| 502 | 501 | }, function() { |
| 503 | - console.log('!!!!!', _this.data.list.pageData); | |
| 502 | + // console.log('!!!!!', _this.data.list.pageData); | |
| 504 | 503 | _this.setData({ |
| 505 | 504 | result: _this.data.list.pageData, |
| 506 | 505 | }); | ... | ... |