From aa82f2ce6aabe78b47c927d7ae2d3ff08c59baaf Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 09 十月 2024 15:43:26 +0800
Subject: [PATCH] Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main into master-2.0
---
sub_pages/customer/coupon/good-all.vue | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index 79c975d..457da05 100644
--- a/sub_pages/customer/coupon/good-all.vue
+++ b/sub_pages/customer/coupon/good-all.vue
@@ -26,7 +26,10 @@
<image src="../../../static/images/customer/coupon/icon-rule.png" class="rule-icon">
</image>
</view>
- <image class="good-point-icon" src="../../../static/images/customer/coupon/good-point-icon.png"
+ <!-- src="../../../static/images/customer/coupon/good-point-icon.png" -->
+ <image class="good-point-icon"
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/db/db114326a52e4f6d92f1d6769748e8e6yHXbwXV7T1A38e325506998c85122d1e6a0a1328f7b0.png"
+
mode="scaleToFill" />
</view>
</view>
@@ -56,8 +59,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,8 +91,12 @@
<view class="t-red">
{{item.point||'0'}}积分
</view>
- <view class="button m-l-a m-r-15" @click="exchange('coupon',item)">
- 兑换
+ <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.couponAmount===0?'已售磬':'兑换'}}
</view>
</view>
</view>
@@ -101,7 +111,7 @@
<script>
export default {
computed: {
-
+
self_point() {
if (this.currentInfo.currentPoint) {
if (this.currentInfo.currentPoint >= 10000) {
@@ -110,7 +120,7 @@
return this.currentInfo.currentPoint
}
}
-
+
return 0
}
},
@@ -122,6 +132,10 @@
this.refreshList()
},
async exchange(type, item) {
+ if (item.stock === 0 || item.couponAmount === 0) {
+ this.$message.showToast('库存为0，无法兑换')
+ return
+ }
var api = ''
if (type == 'good') {
api = '/api/customer/point/goods/exchange'
@@ -146,7 +160,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) {
@@ -209,11 +230,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() {
@@ -275,6 +297,11 @@
text-align: center;
line-height: 46rpx;
}
+
+ .button.over {
+ color: #747374;
+ border: 2rpx solid #747374;
+ }
}
.good-item:nth-child(2n+1) {
--
Gitblit v1.9.3