From 4b68b41822b8da02c9a9ceba3bc6e30d4445d324 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 26 九月 2024 08:54:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

---
 pages/home/home.vue |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index a2bdcb6..6f4c711 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -77,11 +77,22 @@
 
 		<uni-popup ref="coupon_home" type="center" border-radius="10px 10px 0 0">
 			<view class="coupon-container" style="width: 690rpx;">
-				<view class="coupont-item all">
-					<!-- <view class="flex container img100"> -->
-					<!-- <view class="flex container img100"	:style="{ backgroundImage: `url(${dto_home_coupon.imageUrl})`, backgroundSize: 'cover', backgroundPosition: 'center', backgroundRepeat: 'no-repeat' }"> -->
-					<view class="flex container img100"	:style="{ backgroundImage: `url(${dto_home_coupon.imageUrl})`, backgroundSize: 'contain', backgroundPosition: 'center', backgroundRepeat: 'no-repeat' }">
-						<!-- <view class="flex container img100"	:style="{ backgroundImage: `url(${dto_home_coupon.imageUrl})`, backgroundSize: '100%', backgroundPosition: 'center', backgroundRepeat: 'no-repeat' }"> -->
+				<view v-if="dto_home_coupon.imageUrl"  class="coupont-item all" style="display: flex; justify-content: center; align-items: center; height: 100vh;">
+					<view   @click="getCoupon(dto_home_coupon)"
+						:style="{ 
+							backgroundImage: `url(${dto_home_coupon.imageUrl})`, 
+							backgroundSize: 'contain', 
+							backgroundPosition: 'center', 
+							backgroundRepeat: 'no-repeat' ,
+							width: '600px',           // 设置宽度
+							height: '600px'           // 设置高度
+						}">
+					</view>
+				</view>
+				
+				<view class="coupont-item all" v-else>
+					<view class="flex container img100">
+						
 						<view class="info-price">
 							<view class="price1">
 								{{dto_home_coupon.maxDiscountAmount?(`${dto_home_coupon.maxDiscountAmount}折`):(`¥${dto_home_coupon.couponDiscountValue}`)}}

--
Gitblit v1.9.3