From 12c48f04f9ea1a57781a6e8c5c9ef901eaad8518 Mon Sep 17 00:00:00 2001 From: xuxueyang <xuxy@fengyuntec.com> Date: 星期四, 05 九月 2024 22:31:17 +0800 Subject: [PATCH] merge 1.小程序-花店:1.1-浏览记录建议改成显示30条数据; 1.2-增加一个一键清空已失效商品 2.小程序-花店:增加热区跳转进入店铺 及 点击头像和名字也可以跳转进入店铺 3.小程序-花店:轮播图指示点优化去掉 4.小程序-花店:登录,注册失去焦点验证手机号 --- sub_pages/customer/coupon/coupon-self.vue | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/sub_pages/customer/coupon/coupon-self.vue b/sub_pages/customer/coupon/coupon-self.vue index ab9131d..dacb1f9 100644 --- a/sub_pages/customer/coupon/coupon-self.vue +++ b/sub_pages/customer/coupon/coupon-self.vue @@ -6,23 +6,28 @@ </top-tabs> </view> <view class=""> + <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data> + <view v-for="(item,index) of list" :key="index" class="coupont-item" :class="[query.status]"> <view class="flex container img100"> <view class="info-price"> - <view class="price1">¥7.70</view> - <view class="price2">满¥100可用</view> + <view class="price1"> + {{item.maxDiscountAmount?(`${item.maxDiscountAmount}折`):(`¥${item.couponDiscountValue}`)}} + </view> + <view class="price2">{{item.minOrderAmount?(`满¥${item.minOrderAmount}可用`):'无门槛'}}</view> </view> <view class="info flex1"> <view class="title"> - 七夕专属福利券 + {{item.couponName||'-'}} </view> <view class="time"> - 有效期至2024-07-26 09:58:30 + {{item.usageEndDate&&('有效期至:'+item.usageEndDate) || '长久有效'}} </view> </view> </view> <view class="tip"> - <span class="t-red">*</span>此券每人限领1张。仅限用于花满芜鲜花交易平台鲜切花花款满额使用,不可与其他优惠同享、不可叠加使用 + <span + class="t-red">*</span>{{item.couponDescription || '此券每人限领1张。仅限用于花满芜鲜花交易平台鲜切花花款满额使用,不可与其他优惠同享、不可叠加使用'}} </view> </view> </view> @@ -70,6 +75,7 @@ methods: { changeTab(flg) { + this.flg = '' + flg this.query.status = this.tabs[flg].status this.listApi = '/api/v2/coupon/app' + `/mine/${this.query.status}/list` this.refreshList() @@ -95,7 +101,7 @@ </script> <style lang="scss" scoped> - @import './coupon.scss'; + @import './coupon.scss'; .coupon-container { @@ -109,7 +115,7 @@ } } - + .bottom-button { width: 690rpx; height: 90rpx; @@ -124,6 +130,8 @@ color: #20613D; text-align: center; line-height: 90rpx; + z-index: 99; + background-color: #fbfbfb; } } </style> \ No newline at end of file -- Gitblit v1.9.3