From 15ae4a0daffaa7fdec2566a2fc96409b90822a09 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 12 十一月 2024 13:13:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-2.0' into master-2.0
---
sub_pages/customer/coupon/good-self.vue | 63 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/sub_pages/customer/coupon/good-self.vue b/sub_pages/customer/coupon/good-self.vue
index e336979..99322d7 100644
--- a/sub_pages/customer/coupon/good-self.vue
+++ b/sub_pages/customer/coupon/good-self.vue
@@ -6,38 +6,42 @@
</top-tabs>
</view>
<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
-
+
<view class="p10">
<view v-for="(item,index) of list" :key="index" class="good-item" :class="[query.status]">
- <view class="flex container img100">
+ <view class="flex container img100 flex-wrap-normal" @click="selectItem(item)">
<view class="info-price">
<image :lazy-load="true" :src="item.cover" class="cover" mode="scaleToFill"></image>
</view>
- <view class="info flex1">
- <view class="title flex">
- {{item.name||''}}
+ <view class="info flex1 ">
+ <view class="title flex description">
+ <view style="max-width: 420rpx;word-break: break-all;" class="word-e" >{{item.name||''}}</view>
<!-- <radio :checked="isIngood(item)" @click.stop="updateSelectGood(item)" v-if="source==='shopping'" class="select-coupon"></radio> -->
-
- <view :style="{ 'margin-right': '20rpx'}" @click.stop="updateSelectGood(item)"
- class="component-radio m-l-a" :class="[isIngood(item)?'cur':'']" v-if="source==='shopping'">
-
+
+ <view :style="{ 'margin-right': '20rpx'}" class="component-radio m-l-a "
+ :class="[isIngood(item)?'cur':'']" v-if="source==='shopping'">
+
</view>
-
+
</view>
- <view class="time word-e">
+ <view class="time word-e" style="word-break: break-all;max-width: 360rpx;">
{{item.description||''}}
</view>
- <view class="button m-l-a m-r-10" @click="getPointGood(item)" v-if="source!=='shopping'">
+ <view class="time word-e" style="font-size: 22rpx;" v-if="item.expireTime">
+ 截止:{{item.expireTime||'-'}}
+ </view>
+
+ <view class="button m-l-a m-r-10" v-if="source!=='shopping'">
查看详情
</view>
- <!-- <view class="button" @click="updateSelectGood(item)" v-if="source=='shopping'">
+ <!-- <view class="button" @click="updateSelectGood(item)" v-if="source=='shopping'">
{{isIngood(item)?'移除':'添加'}}
</view> -->
</view>
</view>
<!-- <view class="tip">
- <span class="t-red">*</span>此券每人限领1张。仅限用于花满芜鲜花交易平台鲜切花花款满额使用，不可与其他优惠同享、不可叠加使用
+ <span class="t-red">*</span>此券每人限领1张。仅限用于花满芫鲜花交易平台鲜切花花款满额使用，不可与其他优惠同享、不可叠加使用
</view> -->
</view>
</view>
@@ -110,6 +114,15 @@
},
methods: {
+ selectItem(item) {
+ if (this.source === 'shopping') {
+ //选择
+ this.updateSelectGood(item)
+ } else {
+ //详情
+ this.getPointGood(item)
+ }
+ },
isIngood(item) {
for (var tmp of this.cache_goods) {
if (tmp.id == item.id) {
@@ -186,33 +199,37 @@
height: unset;
padding: 20rpx;
margin-top: 0rpx;
+
.container {
background-color: #fff;
+
.info-price {
.cover {
- width: 150rpx;
- height: 150rpx;
+ width: 160rpx;
+ height: 160rpx;
}
}
.info {
margin-left: 20rpx;
position: relative;
+
.title {
font-weight: 600;
- font-size: 36rpx;
+ font-size: 32rpx;
color: #333333;
- line-height: 50rpx;
+ line-height: 40rpx;
text-align: left;
position: relative;
- margin-top: 20rpx;
- .select-coupon{
+ margin-top: 10rpx;
+
+ .select-coupon {
position: absolute;
right: 10rpx;
top: -6rpx;
}
}
-
+
.time {
font-weight: 400;
font-size: 28rpx;
@@ -222,8 +239,8 @@
margin-top: 10rpx;
word-break: break-all;
}
-
-
+
+
.button {
width: 150rpx;
--
Gitblit v1.9.3