|
|
@@ -111,13 +111,13 @@ Page({ |
|
|
|
} |
|
|
|
var tmpArr = that.data.merchantVoList; |
|
|
|
tmpArr.push.apply(tmpArr, res.data.list); |
|
|
|
console.log(tmpArr) |
|
|
|
// console.log(tmpArr) |
|
|
|
that.setData({ |
|
|
|
merchantVoList: tmpArr, |
|
|
|
isFirstPage: res.data.isFirstPage, |
|
|
|
isLastPage: res.data.isLastPage |
|
|
|
}) |
|
|
|
console.log(that.data.merchantVoList) |
|
|
|
// console.log(that.data.merchantVoList) |
|
|
|
}) |
|
|
|
.catch(err => { |
|
|
|
wx.hideLoading(); |
|
|
|