From c2910d258fd92ff40a6d23d94c186f11d78a5fd5 Mon Sep 17 00:00:00 2001 From: xuxueyang <xuxy@fengyuntec.com> Date: 星期六, 14 九月 2024 15:02:44 +0800 Subject: [PATCH] update 花店端一些细节 --- sub_pages/customer/coupon/good-all.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 44 insertions(+), 13 deletions(-) diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue index 31afb33..0257aec 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"> @@ -15,11 +16,11 @@ <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> - <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"> @@ -47,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="[dto.stock===0?'component-stock-zero':'']"> </image> <view class="title"> @@ -77,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> @@ -98,10 +100,25 @@ <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 this.listApi = this.tabs[flg].api + this.list = [] this.refreshList() }, async exchange(type, item) { @@ -121,12 +138,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 +154,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() @@ -153,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', }, ], @@ -186,6 +207,13 @@ }, onLoad() { this.listApi = '/api/customer/point/goods/list' + this.getList() + }, + onPullDownRefresh() { + //刷新积分和刷新商品 + this.$store.dispatch('getCurrentInfo'); + // this.list = [] + this.refreshList() }, onReachBottom() { @@ -195,6 +223,8 @@ </script> <style lang="scss" scoped> + @import './coupon.scss'; + .good-list-container { .good-container { .good-item { @@ -210,7 +240,7 @@ } .title { - padding:18rpx 18rpx 0rpx 18rpx; + padding: 18rpx 18rpx 0rpx 18rpx; font-weight: 600; font-size: 32rpx; color: #000000; @@ -224,7 +254,7 @@ font-weight: 400; font-size: 24rpx; color: #44775A; - padding:18rpx; + padding: 18rpx; padding-bottom: 28rpx; .score { @@ -260,6 +290,7 @@ .query-scores { overflow-x: scroll; + // width: max-content; .item { min-width: fit-content; @@ -273,7 +304,7 @@ height: 50rpx; border-radius: 26rpx; // width: fit-content; - + } .item.active { -- Gitblit v1.9.3