|
|
@ -5,7 +5,7 @@ var pageindex = 0; |
|
|
var pagesize = 10; |
|
|
var pagesize = 10; |
|
|
var year; |
|
|
var year; |
|
|
var month; |
|
|
var month; |
|
|
var method = '/MainSystem/B3MiniProgramRpc/Rpcs/CustomerRpc/GatheringRpc/GetGatheringList'; |
|
|
|
|
|
|
|
|
var method = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/AccountBalanceRpc/GetBalanceList'; |
|
|
|
|
|
|
|
|
Page({ |
|
|
Page({ |
|
|
data: { |
|
|
data: { |
|
|
@ -29,7 +29,7 @@ Page({ |
|
|
var that=this; |
|
|
var that=this; |
|
|
pageindex = 0; |
|
|
pageindex = 0; |
|
|
var params = [i1, i2, pageindex,pagesize]; |
|
|
var params = [i1, i2, pageindex,pagesize]; |
|
|
this.getGatheringList(that, params); |
|
|
|
|
|
|
|
|
this.getBalanceList(that, params); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
//滑动到底部加载
|
|
|
//滑动到底部加载
|
|
|
@ -39,7 +39,7 @@ Page({ |
|
|
var year = this.data.dates.split('-')[0]; |
|
|
var year = this.data.dates.split('-')[0]; |
|
|
var month = this.data.dates.split('-')[1]; |
|
|
var month = this.data.dates.split('-')[1]; |
|
|
var params = [year, month, pageindex, pagesize]; |
|
|
var params = [year, month, pageindex, pagesize]; |
|
|
this.getGatheringList(that, params); |
|
|
|
|
|
|
|
|
this.getBalanceList(that, params); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
onLoad: function (options) { |
|
|
onLoad: function (options) { |
|
|
@ -51,13 +51,14 @@ Page({ |
|
|
var year = this.data.dates.split('-')[0]; |
|
|
var year = this.data.dates.split('-')[0]; |
|
|
var month = this.data.dates.split('-')[1]; |
|
|
var month = this.data.dates.split('-')[1]; |
|
|
var params = [year, month, pageindex, pagesize]; |
|
|
var params = [year, month, pageindex, pagesize]; |
|
|
this.getGatheringList(that, params); |
|
|
|
|
|
|
|
|
this.getBalanceList(that, params); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
getGatheringList : function (that,params) { |
|
|
|
|
|
|
|
|
getBalanceList : function (that,params) { |
|
|
var reslut = []; |
|
|
var reslut = []; |
|
|
network.requestLoading(method, params, function (res) { |
|
|
network.requestLoading(method, params, function (res) { |
|
|
var array = res.result; |
|
|
|
|
|
|
|
|
console.log(res); |
|
|
|
|
|
var array = JSON.parse(res.result); |
|
|
if (array.length <= 0) { |
|
|
if (array.length <= 0) { |
|
|
wx.showToast({ |
|
|
wx.showToast({ |
|
|
title: '无数据更新', |
|
|
title: '无数据更新', |
|
|
@ -67,14 +68,11 @@ Page({ |
|
|
} |
|
|
} |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
for (var i = 0; i < array.length; i++) { |
|
|
|
|
|
let dmo = { |
|
|
|
|
|
GatheringTime: timechage.formatTimeTwo(res.result[i].GatheringTime.substring(6, 19), "Y/M/D"), |
|
|
|
|
|
GatheringMoney: res.result[i].GatheringMoney, |
|
|
|
|
|
} |
|
|
|
|
|
reslut.push(dmo) |
|
|
|
|
|
} |
|
|
|
|
|
let arrLast = that.data.list.concat(reslut); |
|
|
|
|
|
|
|
|
for (var i = 0; i < array.length; i++) { |
|
|
|
|
|
array[i].Date = timechage.formatTimeTwo(array[i].Date.substring(6, 19), "Y/M/D"); |
|
|
|
|
|
} |
|
|
|
|
|
console.log(array); |
|
|
|
|
|
let arrLast = that.data.list.concat(array); |
|
|
that.setData({ |
|
|
that.setData({ |
|
|
list: arrLast |
|
|
list: arrLast |
|
|
}) |
|
|
}) |
|
|
|