Compare commits

..

No commits in common. "0ffe6a54d7c1232f558303f1a48ca621a7e5d42b" and "51874e8daba918d1a7b5901cf309b542e7a06200" have entirely different histories.

2 changed files with 13 additions and 22 deletions

View File

@ -29,19 +29,10 @@
<view v-if="records.length > 0">
<view class="record-item" v-for="(record, index) in records" :key="index">
<view class="record-info">
<view class="record-name" v-if="topVal == '积分'">
<view v-if="record.change_reason == '积分商城购物'">
{{ record.change_reason }} - {{ record.commodity_order ?
record.commodity_order.order_no : '' }}
</view>
<view v-else>
{{ record.change_reason }} - {{ record.community_order_pay ?
record.community_order_pay.order_pay_no :
record.quick_payment_record.order_no }}
</view>
</view>
<view class="record-name" v-else>{{ record.change_reason }} - {{ record.related_order }}
</view>
<view class="record-name" v-if="topVal == '积分'">{{ record.change_reason }} - {{
record.community_order_pay ? record.community_order_pay.order_pay_no :
record.quick_payment_record.order_no }}</view>
<view class="record-name" v-else>{{ record.change_reason }} - {{ record.related_order }}</view>
<view class="record-time">{{ record.create_time }}</view>
</view>
<view class="record-amount">
@ -106,7 +97,7 @@ export default {
this.hasMore = true;
this.getWalletInfo();
},
//
onPullDownRefresh() {
this.page_num = 1;
@ -116,7 +107,7 @@ export default {
uni.stopPullDownRefresh();
});
},
//
onReachBottom() {
if (this.loading || !this.hasMore) return;
@ -132,13 +123,13 @@ export default {
//
getWalletInfo() {
if (this.loading) return Promise.resolve();
this.loading = true;
const params = {
page_num: this.page_num,
page_size: this.page_size,
}
const requestPromise = new Promise((resolve, reject) => {
if (this.itemType == 1) {
request(apiArr.getPoints, 'POST', params, { silent: false }).then(res => {
@ -158,14 +149,14 @@ export default {
resolve();
}
});
requestPromise.finally(() => {
this.loading = false;
});
return requestPromise;
},
//
handleResponse(res) {
if (res && res.rows) {
@ -176,7 +167,7 @@ export default {
//
this.records = [...this.records, ...res.rows];
}
//
this.hasMore = res.rows.length >= this.page_size;
}

View File

@ -487,7 +487,7 @@ export default {
onShow() {
this.getUserInfo();
// this.headerLoginClick();
this.headerLoginClick();
},
}
</script>