|
|
|
@@ -294,7 +294,8 @@ Page({ |
|
|
|
sortOrder: that.data.sortOrder, |
|
|
|
userCredit: that.data.userCredit |
|
|
|
}; |
|
|
|
var url = config.api.couponChannelList; |
|
|
|
var url = config.api.creditProductList; |
|
|
|
// var url = config.api.couponChannelList; |
|
|
|
// 请求接口 |
|
|
|
Http.get({ |
|
|
|
url: url, |
|
|
|
@@ -305,7 +306,7 @@ Page({ |
|
|
|
* 加载完成 |
|
|
|
*/ |
|
|
|
if (pageNum >= res.data.pages) { |
|
|
|
if (res.data.pages == 0 || res.data.pages == 1) { |
|
|
|
if (res.data.pages == 0) { |
|
|
|
that.setData({ |
|
|
|
allow_load: true, |
|
|
|
loading: false, |
|
|
|
@@ -324,7 +325,7 @@ Page({ |
|
|
|
lists: [], |
|
|
|
}) |
|
|
|
} |
|
|
|
var tmpArr = that.data.lists; |
|
|
|
var tmpArr = that.data.lists || []; |
|
|
|
// tmpArr = [...tmpArr, ...res.data.list]; |
|
|
|
tmpArr.push.apply(tmpArr, res.data.list); |
|
|
|
that.setData({ |
|
|
|
|