From aee5272d23ade39f178d6b3c2032a29db6752aca Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 21 十月 2024 13:18:52 +0800
Subject: [PATCH] update 首页定位

---
 pages/home/home.vue |   68 +++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 1695491..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,8 +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 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}`)}}
@@ -102,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>
@@ -127,6 +141,9 @@
 			...mapState({
 				address: state => {
 					return state.defaultaddress || {}
+				},
+				addressDesc: state=>{
+					return state.addressDesc || ''
 				},
 				currentInfo: state => {
 					return state.currentInfo || {}
@@ -244,6 +261,11 @@
 		},
 		methods: {
 			async getCoupon(item) {
+				if (!this.currentInfo.id) {
+					await this.$message.confirm('请先前往登录')
+					this.$storage.removeItem('cache_home_show_coupon')
+					return
+				}
 				this.$message.showLoading()
 				const {
 					code,
@@ -406,23 +428,33 @@
 					}
 				})
 
+
 				let tmp = this
-				var value = this.$storage.getItem('cache_home_show_coupon')
-				if (!value || true) {
-					//首页优惠券
-					this.$storage.setItem('cache_home_show_coupon', '1')
-					this.$http.request('get', '/api/v2/coupon/home/alert').then(res => {
-						if (res.code == 0) {
-							var list = res.data || []
-							var dto = list.length >= 1 ? list[0] : undefined
-							if (dto) {
-								// 显示弹窗图片
-								this.dto_home_coupon = dto
-								tmp.$refs.coupon_home.open()
-							}
+				//延迟2秒
+				setTimeout(() => {
+					if (tmp.currentInfo.id) {
+						var value = tmp.$storage.getItem('cache_home_show_coupon')
+						if (!value) {
+							//首页优惠券
+							tmp.$storage.setItem('cache_home_show_coupon', '1')
+							var u = '/api/v2/coupon/app/home/alert'
+							// u = '/api/v2/coupon/app/home/list'
+							tmp.$http.request('get', u).then(res => {
+								if (res.code == 0) {
+									// var list = res.data || {}
+									// var dto = list.length >= 1 ? list[0] : undefined
+									var dto = res.data || undefined
+									if (dto) {
+										// 显示弹窗图片
+										tmp.dto_home_coupon = dto
+										tmp.$refs.coupon_home.open()
+									}
+								}
+							})
 						}
-					})
-				}
+					}
+				}, 1200)
+
 			},
 
 			clickBanner(item) {

--
Gitblit v1.9.3