From 8a9ec7adc18a198a281f9d434b0f078f8f84ceac Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 10 九月 2024 15:00:39 +0800
Subject: [PATCH] Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into remote-v2
---
sub_pages/customer/coupon/good-all.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index 31afb33..55bc7f4 100644
--- a/sub_pages/customer/coupon/good-all.vue
+++ b/sub_pages/customer/coupon/good-all.vue
@@ -2,7 +2,8 @@
<view class="good-list-container">
<view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
<!-- ../../../static/images/customer/coupon/good-top-bg.png -->
- <image class="component-bg" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a9/a9731b0037924324a3d3318dfa7d10c5LZk6JsSC33ua754767bf8c714154f06bbd5b4d905174.png"
+ <image class="component-bg"
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a9/a9731b0037924324a3d3318dfa7d10c5LZk6JsSC33ua754767bf8c714154f06bbd5b4d905174.png"
mode="scaleToFill" />
<view class="title">
@@ -19,7 +20,7 @@
<uni-icons class="icon" type="right" size="32"></uni-icons>
</view>
</view>
- <view class="m-l-a m-r-0 rule" @click="goto('/pages/help/content?id=积分规则',false)">
+ <view class="m-l-a m-r-0 rule" @click="goto('/pages/help/content?id=积分规则',false)">
<view class="flex w-fit m-l-a m-r-15">
<view class="m-r-10">规则</view>
<image src="../../../static/images/customer/coupon/icon-rule.png" class="rule-icon">
@@ -102,6 +103,7 @@
changeTab(flg) {
this.flg = '' + flg
this.listApi = this.tabs[flg].api
+ this.list = []
this.refreshList()
},
async exchange(type, item) {
@@ -121,12 +123,15 @@
data: {
couponId: item.id,
goodsId: item.id, //兼容2个
- num:1
+ num: 1
}
})
this.$message.hideLoading()
if (code == 0) {
- this.$message.showToast('兑换成功')
+ //刷新积分
+ this.$store.dispatch('getCurrentInfo');
+ await this.$message.showToast('兑换成功')
+
}
},
toDetail(item) {
@@ -134,7 +139,7 @@
url: '/sub_pages/customer/coupon/good-detail?id=' + item.id
})
},
- changeScore(item){
+ changeScore(item) {
this.query.pointLower = item.min || 0
this.query.pointUpper = item.max || 990000
this.refreshList()
@@ -186,6 +191,7 @@
},
onLoad() {
this.listApi = '/api/customer/point/goods/list'
+ this.getList()
},
onReachBottom() {
@@ -210,7 +216,7 @@
}
.title {
- padding:18rpx 18rpx 0rpx 18rpx;
+ padding: 18rpx 18rpx 0rpx 18rpx;
font-weight: 600;
font-size: 32rpx;
color: #000000;
@@ -224,7 +230,7 @@
font-weight: 400;
font-size: 24rpx;
color: #44775A;
- padding:18rpx;
+ padding: 18rpx;
padding-bottom: 28rpx;
.score {
@@ -260,6 +266,7 @@
.query-scores {
overflow-x: scroll;
+
// width: max-content;
.item {
min-width: fit-content;
@@ -273,7 +280,7 @@
height: 50rpx;
border-radius: 26rpx;
// width: fit-content;
-
+
}
.item.active {
--
Gitblit v1.9.3