|
|
@@ -5,6 +5,23 @@ function formatWithdrawStateText (state) {
|
|
|
}
|
|
|
return state || ''
|
|
|
}
|
|
|
+function uniqueWithdrawList (list) {
|
|
|
+ var result = []
|
|
|
+ var seen = {}
|
|
|
+ ;(list || []).forEach(function (item) {
|
|
|
+ var key = item.order_id || item.id
|
|
|
+ if (!key) {
|
|
|
+ result.push(item)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (seen[key]) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ seen[key] = true
|
|
|
+ result.push(item)
|
|
|
+ })
|
|
|
+ return result
|
|
|
+}
|
|
|
Page({
|
|
|
|
|
|
/**
|
|
|
@@ -75,12 +92,14 @@ Page({
|
|
|
getCashList () {
|
|
|
console.log(this.data.page)
|
|
|
var that = this
|
|
|
+ var requestPage = that.data.page
|
|
|
var url = 'v1/user/takecash/flow'
|
|
|
var params = {
|
|
|
- page: that.data.page,
|
|
|
+ page: requestPage,
|
|
|
per_page: that.data.per_page
|
|
|
}
|
|
|
var success = function (res) {
|
|
|
+ var shouldReplace = requestPage === 1 || that.data.cashList_change
|
|
|
if (that.data.cashList_change) {
|
|
|
that.setData({
|
|
|
cashList: [],
|
|
|
@@ -99,7 +118,7 @@ Page({
|
|
|
item.can_confirm_transfer = false
|
|
|
}
|
|
|
})
|
|
|
- var result = that.data.cashList.concat(list)
|
|
|
+ var result = uniqueWithdrawList((shouldReplace ? [] : that.data.cashList).concat(list))
|
|
|
var listMore = res.data.list_count > result.length
|
|
|
that.setData({
|
|
|
cashList: result,
|