From 79b196363a2a7fe0cc0b8d7aa176d9d930b408a1 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 22 十月 2024 11:18:49 +0800
Subject: [PATCH] update 首页、我的、商品列表和详情的客服样式功能变更

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

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 25ec768..2aa83e4 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -2,7 +2,7 @@
 	<view class="main-container user-home">
 		<view class="bg-top-green"></view>
 		<!-- 顶部,可能 -->
-		<view class="school" :style="{'padding-top':(StatusBar)+'px'
+		<view class="school flex" :style="{'padding-top':(StatusBar + 14)+'px'
 		,height:CustomBar+'rpx','line-height':CustomBar+'rpx' }">
 			<!--   <picker @change="PickerChangeSchool" :value="areaIndex" :range="schools" range-key="name">
         <view class="picker flex">
@@ -15,8 +15,11 @@
 			<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 class="m-l-a m-r-0" style="position: relative;" @click="goto('/sub_pages/supplier/customer_service/customer_service',false)">
+				<image src="@/static/common/icon-kf.png" class="icon-kf img100"></image>				
 			</view>
 		</view>
 		<view class="search-container m-t-12 flex" @click="goto('/pages/home/components/home-search',false)">
@@ -77,8 +80,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 +119,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 +144,9 @@
 			...mapState({
 				address: state => {
 					return state.defaultaddress || {}
+				},
+				addressDesc: state=>{
+					return state.addressDesc || ''
 				},
 				currentInfo: state => {
 					return state.currentInfo || {}
@@ -499,5 +519,13 @@
 
 	/* #ifdef PUB_CUSTOMER */
 	@import "@/sub_pages/customer/coupon/coupon.scss";
-	/* #endif */
+	/* #endif */
+	.icon-kf{
+		width: 44rpx;
+		height: 44rpx;
+		// margin-top: 12rpx;
+		position: absolute;
+		right: 0rpx;
+		bottom: 22rpx;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3