From c7febf5ad7c95150ed9fcf07935155451e381818 Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Sat, 12 Mar 2022 14:54:36 +0800
Subject: [PATCH] 联系客服修改

---
 app.wxss                                                      | 10 +++++-----
 components/com_servicer/com_servicer.wxml                     |  2 --
 components/com_servicer/com_servicer.wxss                     |  1 +
 packageA/pages/goodsInfo/goodsInfo.js                         | 32 +++++++++++++++++++++-----------
 packageA/pages/goodsInfo/goodsInfo.wxss                       | 51 ---------------------------------------------------
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js | 32 +++++++++++++++++++++-----------
 packageC/pages/presell/goodsInfo/goodsInfo.js                 | 32 +++++++++++++++++++++-----------
 pages/goods/goodsInfo/goodsInfo.js                            | 32 +++++++++++++++++++++-----------
 pages/index/index/index.wxml                                  |  4 ++--
 pages/user/index/index.js                                     | 32 +++++++++++++++++++++-----------
 10 files changed, 113 insertions(+), 115 deletions(-)

diff --git a/app.wxss b/app.wxss
index d1339e3..a02ca49 100644
--- a/app.wxss
+++ b/app.wxss
@@ -744,17 +744,17 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* Project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_qbvqi1zioy.woff2?t=1646731629521') format('woff2'),
-       url('//at.alicdn.com/t/font_2054717_qbvqi1zioy.woff?t=1646731629521') format('woff'),
-       url('//at.alicdn.com/t/font_2054717_qbvqi1zioy.ttf?t=1646731629521') format('truetype');
+  src: url('//at.alicdn.com/t/font_2054717_aefpqs97v86.woff2?t=1647056245887') format('woff2'),
+       url('//at.alicdn.com/t/font_2054717_aefpqs97v86.woff?t=1647056245887') format('woff'),
+       url('//at.alicdn.com/t/font_2054717_aefpqs97v86.ttf?t=1647056245887') format('truetype');
 }
 
 .icon-kefu1:before {
-  content: "\e666";
+  content: "\e651";
 }
 
 .icon-dianhua:before {
-  content: "\e623";
+  content: "\e64b";
 }
 
 
diff --git a/components/com_servicer/com_servicer.wxml b/components/com_servicer/com_servicer.wxml
index 2fedc1f..81c8f82 100644
--- a/components/com_servicer/com_servicer.wxml
+++ b/components/com_servicer/com_servicer.wxml
@@ -1,5 +1,3 @@
-
-
 <!-- 联系客服操作菜单 -->
 <view class="action {{!hiddenCS ? 'active':''}}" hidden="{{hiddenCS}}">
 	<view class="pd20 t-c pr">
diff --git a/components/com_servicer/com_servicer.wxss b/components/com_servicer/com_servicer.wxss
index ea0dc42..4f60bc7 100644
--- a/components/com_servicer/com_servicer.wxss
+++ b/components/com_servicer/com_servicer.wxss
@@ -12,6 +12,7 @@
  	position: absolute;
  	left: 20rpx !important;
  	right: auto !important;
+	padding: 10rpx 20rpx 10rpx 10rpx;
  }
  
  .action .iconfont {
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 3147d58..66c37a0 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -3510,23 +3510,33 @@ Page({
 	
 	//打开客服操作菜单
 	openCS() {
+		// 判断会员状态
+		let user_info = getApp().globalData.userInfo;
+		if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
+			wx.navigateTo({
+					url: '/pages/togoin/togoin',
+			})
+			return false;
+		};
 		// csType/在线客服设置：
 		// 0关闭（如果有设置热线电话，则显示拨打热线电话）、
 		// 1小程序客服、
 		// 2企业微信客服
-		let csType = this.data.sys_switch.weapp_customertype;
-		if(csType == 0) {
-			// 获取电话号码
-			this.contactService();
-		} else {
-			this.getTel()
-			.then(() => {
-				self.setData({
-					hiddenCS: false,
+		if(this.data.sys_switch) {
+			let csType = this.data.sys_switch.weapp_customertype;
+			if(csType == 0) {
+				// 拨打电话号码
+				this.contactService();
+			} else {
+				this.getTel()
+				.then(() => {
+					self.setData({
+						hiddenCS: false,
+					});
 				});
-			});
-			
+			};
 		};
+		
 	},
 	
 	//关闭客服操作菜单
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxss b/packageA/pages/goodsInfo/goodsInfo.wxss
index c365d9a..d6ac50e 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxss
+++ b/packageA/pages/goodsInfo/goodsInfo.wxss
@@ -2970,54 +2970,3 @@ button.custom-service::after{
 }
 
 
-
-/* 联系客服操作菜单 */
-.action {
-	position: fixed;
-	bottom: 100rpx;
-	z-index: 1;
-	width: 100%;
-	background-color: white;
-	border-radius: 20rpx 20rpx 0 0;
-}
-
-.action .icon-guan {
-	position: absolute;
-	left: 20rpx !important;
-	right: auto !important;
-}
-
-.action .iconfont {
-	color: #ff7295;
-	margin-right: 10rpx;
-}
-
-.action button {
-	text-align: left;
-	line-height: normal;
-}
-
-.action button::after {
-	border-width: 0;
-}
-
-.action .btn2 {
-	box-sizing: border-box;
-	height: 100rpx;
-	display: flex;
-	align-items: center;
-}
-
-.mask2 {
-	display: none;
-	position: fixed;
-	left: 0;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	background-color: rgba(0,0,0,.5);
-}
-
-.action.active ~ .mask2 {
-	display: block;
-}
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index eebd0be..0a87cd1 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -6498,23 +6498,33 @@ Page({
 		
 	//打开客服操作菜单
 	openCS() {
+		// 判断会员状态
+		let user_info = getApp().globalData.userInfo;
+		if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
+			wx.navigateTo({
+					url: '/pages/togoin/togoin',
+			})
+			return false;
+		};
 		// csType/在线客服设置：
 		// 0关闭（如果有设置热线电话，则显示拨打热线电话）、
 		// 1小程序客服、
 		// 2企业微信客服
-		let csType = this.data.sys_switch.weapp_customertype;
-		if(csType == 0) {
-			// 获取电话号码
-			this.contactService();
-		} else {
-			this.getTel()
-			.then(() => {
-				self.setData({
-					hiddenCS: false,
+		if(this.data.sys_switch) {
+			let csType = this.data.sys_switch.weapp_customertype;
+			if(csType == 0) {
+				// 拨打电话号码
+				this.contactService();
+			} else {
+				this.getTel()
+				.then(() => {
+					self.setData({
+						hiddenCS: false,
+					});
 				});
-			});
-			
+			};
 		};
+		
 	},
 	
 	//关闭客服操作菜单
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index 14dbb70..6f0bbe2 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -4040,23 +4040,33 @@ Page({
 		
 		//打开客服操作菜单
 		openCS() {
+			// 判断会员状态
+			let user_info = getApp().globalData.userInfo;
+			if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
+				wx.navigateTo({
+						url: '/pages/togoin/togoin',
+				})
+				return false;
+			};
 			// csType/在线客服设置：
 			// 0关闭（如果有设置热线电话，则显示拨打热线电话）、
 			// 1小程序客服、
 			// 2企业微信客服
-			let csType = this.data.sys_switch.weapp_customertype;
-			if(csType == 0) {
-				// 获取电话号码
-				this.contactService();
-			} else {
-				this.getTel()
-				.then(() => {
-					self.setData({
-						hiddenCS: false,
+			if(this.data.sys_switch) {
+				let csType = this.data.sys_switch.weapp_customertype;
+				if(csType == 0) {
+					// 拨打电话号码
+					this.contactService();
+				} else {
+					this.getTel()
+					.then(() => {
+						self.setData({
+							hiddenCS: false,
+						});
 					});
-				});
-				
+				};
 			};
+			
 		},
 		
 		//关闭客服操作菜单
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index cce1c7e..4ad1b53 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -6648,23 +6648,33 @@ Page({
 		
 		//打开客服操作菜单
 		openCS() {
+			// 判断会员状态
+			let user_info = getApp().globalData.userInfo;
+			if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
+				wx.navigateTo({
+						url: '/pages/togoin/togoin',
+				})
+				return false;
+			};
 			// csType/在线客服设置：
 			// 0关闭（如果有设置热线电话，则显示拨打热线电话）、
 			// 1小程序客服、
 			// 2企业微信客服
-			let csType = this.data.sys_switch.weapp_customertype;
-			if(csType == 0) {
-				// 获取电话号码
-				this.contactService();
-			} else {
-				this.getTel()
-				.then(() => {
-					self.setData({
-						hiddenCS: false,
+			if(this.data.sys_switch) {
+				let csType = this.data.sys_switch.weapp_customertype;
+				if(csType == 0) {
+					// 拨打电话号码
+					this.contactService();
+				} else {
+					this.getTel()
+					.then(() => {
+						self.setData({
+							hiddenCS: false,
+						});
 					});
-				});
-				
+				};
 			};
+			
 		},
 		
 		//关闭客服操作菜单
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 2d0812a..6e7b9d0 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -177,8 +177,8 @@
 									<image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
 									
 									<image wx:if="{{aitem.status==0}}" class="status_img" src="{{url}}/miniapp/images/miao/yure.png"></image>
-									<image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image>
-									<image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image>
+									<image wx:elif="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image>
+									<image wx:else="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image>
 								</view>
 								<view class="ellipsis-2 mar-top10" style="height: 76rpx;">{{aitem.goods_name}}</view>
 								<!-- <view class="red-co mar-top10 is_seckill_height"> -->
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index dd2620b..6290ee2 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -925,23 +925,33 @@ Page({
 		
 		//打开客服操作菜单
 		openCS() {
+			// 判断会员状态
+			let user_info = getApp().globalData.userInfo;
+			if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
+				wx.navigateTo({
+						url: '/pages/togoin/togoin',
+				})
+				return false;
+			};
 			// csType/在线客服设置：
 			// 0关闭（如果有设置热线电话，则显示拨打热线电话）、
 			// 1小程序客服、
 			// 2企业微信客服
-			let csType = this.data.sys_switch.weapp_customertype;
-			if(csType == 0) {
-				// 获取电话号码
-				this.contactService();
-			} else {
-				this.getTel()
-				.then(() => {
-					self.setData({
-						hiddenCS: false,
+			if(this.data.sys_switch) {
+				let csType = this.data.sys_switch.weapp_customertype;
+				if(csType == 0) {
+					// 拨打电话号码
+					this.contactService();
+				} else {
+					this.getTel()
+					.then(() => {
+						self.setData({
+							hiddenCS: false,
+						});
 					});
-				});
-				
+				};
 			};
+			
 		},
 		
 		//关闭客服操作菜单
--
libgit2 0.21.4