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 |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 6f4c711..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>
@@ -116,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>
@@ -141,6 +141,9 @@
 			...mapState({
 				address: state => {
 					return state.defaultaddress || {}
+				},
+				addressDesc: state=>{
+					return state.addressDesc || ''
 				},
 				currentInfo: state => {
 					return state.currentInfo || {}

--
Gitblit v1.9.3