From 4f1e0fb646ddfd7ae9162379efa14e4d0d1dfd51 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 05 九月 2024 15:48:34 +0800
Subject: [PATCH] update
---
sub_pages/customer/coupon/coupon-self.vue | 13 ++++++++-----
sub_pages/customer/coupon/good-all.vue | 10 ++++++----
pages/login/supplier-reg.vue | 2 +-
pages/user/supplier-user.vue | 2 +-
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/pages/login/supplier-reg.vue b/pages/login/supplier-reg.vue
index cd30f05..4d8ec72 100644
--- a/pages/login/supplier-reg.vue
+++ b/pages/login/supplier-reg.vue
@@ -197,7 +197,7 @@
success: async function(res) {
console.log('条码内容：' + res.result);
if (!res.result) {
- that.$message.showToast('未识别出信息，如果是微信小程序二维码，请微信扫码打开')
+ that.$message.showToast('未识别出信息，请用微信扫码打开')
return
}
var dto = undefined
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index bc63022..ca17d7d 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -490,7 +490,7 @@
success: async function(res) {
console.log('条码内容：' + res.result);
if (!res.result) {
- that.$message.showToast('未识别出合伙人信息，如果是微信小程序二维码，请微信扫码打开')
+ that.$message.showToast('未识别出合伙人信息，请微信扫码打开')
return
}
var dto = undefined
diff --git a/sub_pages/customer/coupon/coupon-self.vue b/sub_pages/customer/coupon/coupon-self.vue
index 086df04..dacb1f9 100644
--- a/sub_pages/customer/coupon/coupon-self.vue
+++ b/sub_pages/customer/coupon/coupon-self.vue
@@ -7,7 +7,7 @@
</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">
@@ -21,12 +21,13 @@
{{item.couponName||'-'}}
</view>
<view class="time">
- 有效期至{{item.usageEndDate||'-'}}
+ {{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>
@@ -100,7 +101,7 @@
</script>
<style lang="scss" scoped>
- @import './coupon.scss';
+ @import './coupon.scss';
.coupon-container {
@@ -114,7 +115,7 @@
}
}
-
+
.bottom-button {
width: 690rpx;
height: 90rpx;
@@ -129,6 +130,8 @@
color: #20613D;
text-align: center;
line-height: 90rpx;
+ z-index: 99;
+ background-color: #fbfbfb;
}
}
</style>
\ No newline at end of file
diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index 52c2c1a..1e4a572 100644
--- a/sub_pages/customer/coupon/good-all.vue
+++ b/sub_pages/customer/coupon/good-all.vue
@@ -135,7 +135,7 @@
},
changeScore(item){
this.query.pointLower = item.min || 0
- this.query.pointUpper = item.max || 10000000000
+ this.query.pointUpper = item.max || 990000
this.refreshList()
}
},
@@ -157,8 +157,8 @@
},
],
query: {
- pointLower: 1001,
- pointUpper: 3000
+ pointLower: 0,
+ pointUpper: 1000
},
scores: [{
min: 0,
@@ -242,6 +242,7 @@
font-size: 24rpx;
color: #44775A;
text-align: center;
+ line-height: 46rpx;
}
}
@@ -258,8 +259,9 @@
.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;
--
Gitblit v1.9.3