From dd2922d3facbfba5add501f35de5649b80b6cf05 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 10 九月 2024 18:22:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/v2' into v2
---
sub_pages/customer/coupon/good-all.vue | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index 24d6818..c8803dc 100644
--- a/sub_pages/customer/coupon/good-all.vue
+++ b/sub_pages/customer/coupon/good-all.vue
@@ -1,24 +1,26 @@
<template>
<view class="good-list-container">
<view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
- <image class="component-bg" src="../../../static/images/customer/coupon/good-top-bg.png"
+ <!-- ../../../static/images/customer/coupon/good-top-bg.png -->
+ <image class="component-bg"
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a9/a9731b0037924324a3d3318dfa7d10c5LZk6JsSC33ua754767bf8c714154f06bbd5b4d905174.png"
mode="scaleToFill" />
<view class="title">
- <uni-icons class="icon" type="left" size="24"></uni-icons>
+ <uni-icons class="icon" type="left" size="24" @click="backpage()"></uni-icons>
积分兑换
</view>
<view class="flex point-info">
<view class="point-record m-r-a">
<view class="text-center title">我的积分</view>
- <view class="flex">
+ <view class="flex" @click="goto('/sub_pages/customer/coupon/point-history',true)">
<image src="../../../static/images/customer/coupon/icon-point.png" class="point-icon">
</image>
- 1552
+ {{currentInfo.currentPoint || 0}}
<uni-icons class="icon" type="right" size="32"></uni-icons>
</view>
</view>
- <view class="m-l-a m-r-0 rule">
+ <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">
@@ -101,6 +103,7 @@
changeTab(flg) {
this.flg = '' + flg
this.listApi = this.tabs[flg].api
+ this.list = []
this.refreshList()
},
async exchange(type, item) {
@@ -120,11 +123,15 @@
data: {
couponId: item.id,
goodsId: item.id, //兼容2个
+ num: 1
}
})
this.$message.hideLoading()
if (code == 0) {
- this.$message.showToast('兑换成功')
+ //刷新积分
+ this.$store.dispatch('getCurrentInfo');
+ await this.$message.showToast('兑换成功')
+
}
},
toDetail(item) {
@@ -132,9 +139,9 @@
url: '/sub_pages/customer/coupon/good-detail?id=' + item.id
})
},
- changeScore(item){
- this.query.pointLower = item.min || undefined
- this.query.pointUpper = item.max || undefined
+ changeScore(item) {
+ this.query.pointLower = item.min || 0
+ this.query.pointUpper = item.max || 990000
this.refreshList()
}
},
@@ -151,13 +158,14 @@
},
{
name: '优惠券',
- api: '/api/v2/coupon/app/activy/list',
+ // api: '/api/v2/coupon/app/activy/list',
+ api: '/api/v2/coupon/point/active/list',
},
],
query: {
- pointLower: 1001,
- pointUpper: 3000
+ pointLower: 0,
+ pointUpper: 1000
},
scores: [{
min: 0,
@@ -184,6 +192,13 @@
},
onLoad() {
this.listApi = '/api/customer/point/goods/list'
+ this.getList()
+ },
+ onPullDownRefresh() {
+ //刷新积分和刷新商品
+ this.$store.dispatch('getCurrentInfo');
+ // this.list = []
+ this.refreshList()
},
onReachBottom() {
@@ -208,13 +223,12 @@
}
.title {
- padding-top: 18rpx;
- padding-bottom: 18rpx;
+ padding: 18rpx 18rpx 0rpx 18rpx;
font-weight: 600;
font-size: 32rpx;
color: #000000;
line-height: 44rpx;
- text-align: center;
+ text-align: left;
}
.score-info {
@@ -223,6 +237,7 @@
font-weight: 400;
font-size: 24rpx;
color: #44775A;
+ padding: 18rpx;
padding-bottom: 28rpx;
.score {
@@ -240,6 +255,8 @@
font-weight: 400;
font-size: 24rpx;
color: #44775A;
+ text-align: center;
+ line-height: 46rpx;
}
}
@@ -256,8 +273,10 @@
.query-scores {
overflow-x: scroll;
- width: max-content;
+
+ // width: max-content;
.item {
+ min-width: fit-content;
padding-left: 16rpx;
padding-right: 16rpx;
text-align: center;
@@ -268,7 +287,7 @@
height: 50rpx;
border-radius: 26rpx;
// width: fit-content;
-
+
}
.item.active {
@@ -345,7 +364,7 @@
.icon {
position: absolute;
- left: 20rpx;
+ left: 0rpx;
z-index: 1;
}
}
--
Gitblit v1.9.3