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

---
 sub_pages/customer/trade/list.vue                        |   12 +++-
 pages/home/home.vue                                      |   15 ++++
 pages/user/user-customer.scss                            |   26 ++++++++
 sub_pages/supplier/customer_service/customer_service.vue |    2 
 pages/user/supplier-user.vue                             |   32 ++++++++++
 sub_pages/customer/trade/detail.vue                      |   45 +++++++++------
 6 files changed, 106 insertions(+), 26 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 0ce708d..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">
@@ -17,6 +17,9 @@
 				<view>
 					{{ 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)">
@@ -516,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
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index 2c87d6e..9f57d57 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -187,6 +187,34 @@
 				</view>
 			</view>
 		</view>
+		
+		<view class="user-utils kf-container  m-20 flex" v-if="selftype==='customer'||!selftype" 
+		@click="goto('/sub_pages/supplier/customer_service/customer_service',false)">
+			<view class="">
+				<image src="/static/common/icon-kf.png" class="icon-kf m-r-15 img100 icon"></image>
+			</view>
+			<view class="flex1" >
+				<view class="icon-view" style="font-weight: 600;">				
+					我的客服
+				</view>
+				<view class="flex m-t-12">
+					<view class="flex1 w-fit m-auto icon-view" @click.stop="callTel">
+						<image src="/static/common/icon-call.png" class="icon icon-call m-r-10  img100"></image>
+						{{tel}}
+					</view>
+					<view class="flex1 w-fit m-auto icon-view flex flex-wrap-normal" open-type="contact">
+						<image src="/static/common/icon-wx.png" class="icon icon-call m-t-2  m-r-10 img100"></image>
+						
+						<button open-type="contact" class="component-button-contact" @handleContact="handleContact">
+							在线客服
+						</button>
+					</view>
+						
+						
+				</view>
+			</view>
+		</view>
+		
 		<view class="user-utils m-20" v-if="selftype==='customer'||!selftype">
 			<view class="user-util m-t-12 user-customer-service-infos">
 				<view class="title flex">
@@ -371,14 +399,14 @@
 				</view>
 			</view>
 
-			<view class="user-util m-t-12 flex"
+			<!-- <view class="user-util m-t-12 flex"
 			v-if="selftype==='supplier'||selftype==='customer' || !selftype"
 			 @click="goto('/sub_pages/supplier/customer_service/customer_service',false)">
 				<view class="title">我的客服</view>
 				<view class="right-icon">
 					<uni-icons type="right"></uni-icons>
 				</view>
-			</view>
+			</view> -->
 
 
 
diff --git a/pages/user/user-customer.scss b/pages/user/user-customer.scss
index 4be1e24..3e1b97d 100644
--- a/pages/user/user-customer.scss
+++ b/pages/user/user-customer.scss
@@ -193,3 +193,29 @@
 		background-color:  #BBCCC2;
 	}
 }
+.kf-container{
+	padding: 28rpx;
+	
+	.icon-kf {
+		width: 44rpx;
+		height: 44rpx;
+		width: 90rpx;
+		height: 90rpx;
+		margin-top: 12rpx;
+	}
+		
+	.icon-call {
+		width: 32rpx;
+		height: 32rpx;
+	}
+		
+	.icon-view {
+		line-height: 40rpx;
+		
+		.icon {
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/sub_pages/customer/trade/detail.vue b/sub_pages/customer/trade/detail.vue
index 94e1c05..719e18e 100644
--- a/sub_pages/customer/trade/detail.vue
+++ b/sub_pages/customer/trade/detail.vue
@@ -71,10 +71,20 @@
 				}}
 				</view>
 			</view>
-			<view class="desc m-t-12">
-				<view class="m-r-15">已售:{{ ((dto.sales||0) +(dto.realSales||0)) || 0 }}</view>
-				<view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
-				<view class=" ">{{ dto.unit || '-' }}</view>
+			<view class="desc m-t-12 flex">
+				<view class="flex1">
+					<view class="m-r-15">已售:{{ ((dto.sales||0) +(dto.realSales||0)) || 0 }}</view>
+					<view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
+					<view class=" ">{{ dto.unit || '-' }}</view>
+				</view>
+				<view class="m-l-a m-r-15">
+					<button open-type="contact" class="component-button-contact">
+						<image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
+				
+					</button>
+				
+				</view>
+			
 			</view>
 			<view class="flex m-t-12">
 				<view>
@@ -93,16 +103,12 @@
 
 
 
-				<view class="m-l-a m-r-15">
-					<button open-type="contact" class="component-button-contact">
-						<image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
-
-					</button>
-
+				<view class="m-l-a">
+					<view class="m-r-0 gwc" @click="submitShopping(dto)" v-if="!dto.shopnum">
+						+ 购物车
+					</view>
 				</view>
-				<view class="m-r-0 gwc" @click="submitShopping(dto)" v-if="!dto.shopnum">
-					+ 购物车
-				</view>
+				
 				<view class="m-r-0 button-icons flex" v-if="dto.shopnum">
 					<uni-icons v-if="dto.shopnum&&dto.shopnum>=1" type="minus" size="32"
 						@click.stop="addnum(dto,-1)"></uni-icons>
@@ -254,7 +260,8 @@
 				// setTimeout(() => {
 				//并且当前用户没有绑定
 				if (tmp.currentInfo.id && tmp.currentInfo.customerDTO.partnerId) {
-
+					//如果已经绑定了,显示自己的合伙人价格
+					tmp.sharePartnerUserId = tmp.currentInfo.customerDTO.partnerId
 				} else {
 					if (tmp.currentInfo.id) {
 						await tmp.bindPartnerUser(options.partnerUserId, '')
@@ -296,8 +303,8 @@
 			var url =
 				`/sub_pages/customer/trade/detail?partnerUserId=${partnerUserId}&id=${this.id}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
 			return {
-				// 
-				title: this.dto.id ? (this.dto.name + " " + (this.dto.price || '-') + '元/扎 ' + (this.dto.unit || '')) :
+				// + (this.dto.price || '-') + '元/扎 '
+				title: this.dto.id ? (this.dto.name + " "  + (this.dto.unit || '')) :
 					"花满芫",
 				path: url,
 			}
@@ -315,8 +322,8 @@
 			var url =
 				`/sub_pages/customer/trade/detail?partnerUserId=${partnerUserId}&id=${this.id}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
 			return {
-				// 
-				title: this.dto.id ? (this.dto.name + " " + (this.dto.price || '-') + '元/扎 ' + (this.dto.unit || '')) :
+				// + (this.dto.price || '-') + '元/扎 '
+				title: this.dto.id ? (this.dto.name + " "  + (this.dto.unit || '')) :
 					"花满芫",
 				path: url,
 			}
@@ -679,6 +686,8 @@
 			.icon-kf {
 				width: 44rpx;
 				height: 44rpx;
+				width: 90rpx;
+				height: 90rpx;
 			}
 
 			.gwc {
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 6d5f97e..048e2e2 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -4,10 +4,9 @@
 		<view class="category-detail flex" v-if="query.category">
 			<view class="flex1 info">
 				<view class="title flex">
-					<button open-type="contact" class="component-button-contact">
+					<view class="component-button-contact">
 						{{categoryInfo.name||'-'}}
-						<image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
-					</button>
+					</view>
 				</view>
 				<view class="desc">
 					规格:{{categoryInfo.unit || '暂无'}}
@@ -18,6 +17,11 @@
 				<!-- 	<view class="desc">
 					包袋:棉袋
 				</view> -->
+			</view>
+			<view class="info">
+				<button open-type="contact" class="component-button-contact">
+					<image src="../../../static/common/icon-kf.png" class="icon-kf m-l-5 m-r-15 img100"></image>
+				</button>
 			</view>
 			<view class="info-price">
 				<view class="title">当日均价</view>
@@ -572,6 +576,8 @@
 				.icon-kf {
 					width: 44rpx;
 					height: 44rpx;
+					width: 90rpx;
+					height: 90rpx;
 				}
 
 				.desc {
diff --git a/sub_pages/supplier/customer_service/customer_service.vue b/sub_pages/supplier/customer_service/customer_service.vue
index f25e705..a8334a1 100644
--- a/sub_pages/supplier/customer_service/customer_service.vue
+++ b/sub_pages/supplier/customer_service/customer_service.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="main-container user-container">
+	<view class="main-container user-container bg-white">
 		
 		<view class="user-utils m-20">
 			

--
Gitblit v1.9.3