From e1ed755f972a9b6c1b67004840a2adbac4d2c7a7 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 19 九月 2024 16:12:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
sub_pages/customer/coupon/good-all.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index 7647cb4..79c975d 100644
--- a/sub_pages/customer/coupon/good-all.vue
+++ b/sub_pages/customer/coupon/good-all.vue
@@ -16,7 +16,7 @@
<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>
- {{currentInfo.currentPoint || 0}}
+ {{self_point}}
<uni-icons class="icon" type="right" size="32"></uni-icons>
</view>
</view>
@@ -48,7 +48,8 @@
<view class="good-container p15 flex">
<view v-for="(item,index) of list" :key="index" class="good-item" @click="toDetail(item)">
- <image class="cover" :src="item.cover" :lazy-load="true" mode="scaleToFill">
+ <image class="cover" :src="item.cover" :lazy-load="true" mode="scaleToFill"
+ :class="[item.stock===0?'component-stock-zero':'']">
</image>
<view class="title">
@@ -78,13 +79,13 @@
{{item.couponName||'-'}}
</view>
<view class="time">
- 领取后{{item.usageTimeNum||''}}{{item.usageTimeTypeName||''}}有效
+ {{item.getStartDate||'领取后'}}{{item.getEndDate&&(' 至 ' + item.getEndDate )||''}}有效
</view>
<view class="flex">
<view class="t-red">
{{item.point||'0'}}积分
</view>
- <view class="button m-l-a m-r-0" @click="exchange('coupon',item)">
+ <view class="button m-l-a m-r-15" @click="exchange('coupon',item)">
兑换
</view>
</view>
@@ -99,6 +100,20 @@
<script>
export default {
+ computed: {
+
+ self_point() {
+ if (this.currentInfo.currentPoint) {
+ if (this.currentInfo.currentPoint >= 10000) {
+ return (this.currentInfo.currentPoint / 10000 + '万')
+ } else {
+ return this.currentInfo.currentPoint
+ }
+ }
+
+ return 0
+ }
+ },
methods: {
changeTab(flg) {
this.flg = '' + flg
@@ -158,7 +173,8 @@
},
{
name: '优惠券',
- api: '/api/v2/coupon/app/activy/list',
+ // api: '/api/v2/coupon/app/activy/list',
+ api: '/api/v2/coupon/point/active/list',
},
],
@@ -207,6 +223,8 @@
</script>
<style lang="scss" scoped>
+ @import './coupon.scss';
+
.good-list-container {
.good-container {
.good-item {
--
Gitblit v1.9.3