From f4fd489475500b0d41dde019963307d217321d50 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 20 十月 2024 20:30:49 +0800
Subject: [PATCH] update 定位
---
pages/home/home.vue | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index a2bdcb6..0ce708d 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -15,7 +15,7 @@
<view class="picker flex" @click.stop="goToAddress">
<uni-icons type="location" class="m-r-5" size="18"></uni-icons>
<view>
- {{ address&&address.id?address.address: '选择地址' }}
+ {{ addressDesc || (address&&address.id?address.address: '选择地址') }}
</view>
</view>
</view>
@@ -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}`)}}
@@ -105,7 +116,7 @@
</view>
<view class="tip">
- <span class="t-red">*</span>此券每人限领1张。仅限用于花满芫鲜花交易平台鲜切花花款满额使用，不可与其他优惠同享、不可叠加使用
+ <span class="t-red">*</span>{{dto_home_coupon.couponDescription || '此券每人限领1张。仅限用于花满芫鲜花交易平台鲜切花花款满额使用，不可与其他优惠同享、不可叠加使用'}}
</view>
</view>
</view>
@@ -130,6 +141,9 @@
...mapState({
address: state => {
return state.defaultaddress || {}
+ },
+ addressDesc: state=>{
+ return state.addressDesc || ''
},
currentInfo: state => {
return state.currentInfo || {}
--
Gitblit v1.9.3