From 5525ed0398c496b43a09377d0c59d143e7ff3e98 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 19:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
sub_pages/customer/coupon/good-all.vue | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index 48098c8..2bee1b6 100644
--- a/sub_pages/customer/coupon/good-all.vue
+++ b/sub_pages/customer/coupon/good-all.vue
@@ -56,8 +56,11 @@
{{item.name}}
</view>
<view class="flex score-info">
- <view><span class="score">{{item.point||'-'}}</span>积分</view>
- <view class="button m-l-a m-r-0" @click.stop="exchange('good',item)">兑换</view>
+ <view>
+ <view><span class="score">{{item.point||'-'}}</span> 积分</view>
+ <view class="desc-gray">库存：<span class="">{{item.stock||'0'}}</span></view>
+ </view>
+ <view class="button m-l-a m-r-0 m-t-20" @click.stop="exchange('good',item)">兑换</view>
</view>
</view>
</view>
@@ -85,9 +88,12 @@
<view class="t-red">
{{item.point||'0'}}积分
</view>
- <view class="button m-l-a m-r-15" :class="[item.stock===0?'over':'']"
+ <view class="m-l-10 desc-gray">
+ 库存：{{item.couponAmount||'0'}}
+ </view>
+ <view class="button m-l-a m-r-15" :class="[item.couponAmount===0?'over':'']"
@click="exchange('coupon',item)">
- {{item.stock===0?'已售磬':'兑换'}}
+ {{item.couponAmount===0?'已售磬':'兑换'}}
</view>
</view>
</view>
@@ -123,7 +129,7 @@
this.refreshList()
},
async exchange(type, item) {
- if (item.stock === 0) {
+ if (item.stock === 0 || item.couponAmount === 0) {
this.$message.showToast('库存为0，无法兑换')
return
}
@@ -151,7 +157,14 @@
//刷新积分
this.$store.dispatch('getCurrentInfo');
await this.$message.showToast('兑换成功')
-
+ if (type == 'good') {
+ item.stock -= 1
+ this.$forceUpdate()
+ }
+ if (type == 'coupon') {
+ item.couponAmount -= 1
+ this.$forceUpdate()
+ }
}
},
toDetail(item) {
@@ -214,11 +227,12 @@
this.listApi = '/api/customer/point/goods/list'
this.getList()
},
- onPullDownRefresh() {
+ async onPullDownRefresh() {
//刷新积分和刷新商品
this.$store.dispatch('getCurrentInfo');
// this.list = []
- this.refreshList()
+ await this.refreshList()
+ uni.stopPullDownRefresh()
},
onReachBottom() {
--
Gitblit v1.9.3