预售、商品、个人中心、幸运购、服务卡客服修改

后端研发-苏泰源
1 parent 0542df7a
Showing 12 changed files with 247 additions and 53 deletions
app.wxss
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/user/index/index.js
pages/user/index/index.wxml
pages/user/index/index.wxss
@@ -744,11 +744,20 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* Project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_o34jrbrtxpk.woff2?t=1645781927179') format('woff2'),
-       url('//at.alicdn.com/t/font_2054717_o34jrbrtxpk.woff?t=1645781927179') format('woff'),
-       url('//at.alicdn.com/t/font_2054717_o34jrbrtxpk.ttf?t=1645781927179') format('truetype');
+  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');
 }
+.icon-kefu1:before {
+  content: "\e666";
+}
+
+.icon-dianhua:before {
+  content: "\e623";
+}
+
+
 .icon-infofill:before {
   content: "\e6e6";
 }
@@ -208,6 +208,8 @@ Page({
 		// 秒杀
 		prom_st: 1,
 		prom_r_null: 0,
+		
+		hiddenCS: true,
   },
   //------初始化加载----------
@@ -1105,29 +1107,13 @@ Page({
         });
       }
     }
-<<<<<<< HEAD
   },	
+	
 	//---------联系客服------------
 	contactService: function () {
-	  this.getTel()
-		.then(() => {
-			if(self.data.store_tel) {
-				wx.showModal({
-					title: '联系客服',
-					content: '客服热线:' + self.data.store_tel,
-					confirmText: '拨打',
-					success(res) {
-						if(res.confirm) {
-							getApp().globalData.no_clear = 1;
-							wx.makePhoneCall({
-								phoneNumber: self.data.store_tel,
-							});
-						};
-					},
-				});
-			};
-		});
+	  getApp().com_call(this);
 	},
+	
 	// 获取客服电话
 	getTel() {
 		return new Promise((resolve, reject) => {
@@ -1158,14 +1144,8 @@ Page({
 			});
 		});
 	},
-=======
-  },
-  //---------联系客服------------
-  contactService: function() {
-      getApp().con_Service();
-  },
->>>>>>> 6cc9871992b5529c4963f34338001ebc04f1af34
+
   //-------获取购物车数量----------
   requestCardNum: function() {
     var t = this;
@@ -3224,7 +3204,35 @@ Page({
     click_contact:function () {
         getApp().globalData.no_clear=1;
-    }
+    },
+		
+		//打开客服操作菜单
+		openCS() {
+			// 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,
+					});
+				});
+				
+			};
+		},
+		
+		//关闭客服操作菜单
+		closeCS() {
+			this.setData({
+				hiddenCS: true,
+			});
+		},
@@ -506,7 +506,7 @@
 	<view class="join-cart jc_sb ai_c">
 		<view class="flex">
-			<button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split pdh20" open-type="contact"  bindtap="click_contact"
+			<!-- <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split pdh20" open-type="contact"  bindtap="click_contact"
 			 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
 				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
 				<view>客服</view>
@@ -521,6 +521,11 @@
 			<view wx:else class="custom-service cart-ico new_split pdh20" bindtap="contactService" style="text-align: center">
 				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
 				<view>客服</view>
+			</view> -->
+			
+			<view class="custom-service cart-ico new_split pdh20" bindtap="openCS" style="text-align: center">
+				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+				<view>客服</view>
 			</view>
 			<view bindtap="collectGoods" class="custom-service cart-ico new_split t-c pdh20">
@@ -902,7 +907,7 @@
 		</view>
 	</view>
 </view>
-<<<<<<< HEAD
+
 <!-- 弹起来,购买预热商品的普通购买 -->
 <view hidden="{{!openSpecModal_flash_normal}}">
@@ -913,5 +918,4 @@
 <include src="../../../components/com_servicer/com_servicer.wxml"/>
-=======
->>>>>>> 6cc9871992b5529c4963f34338001ebc04f1af34
+
@@ -8,6 +8,7 @@ var t = require(&quot;../../../../utils/util.js&quot;),
   oo = s.globalData,
   o = s.globalData.setting,
   os = o;
+let self = null;
 //评价加载更多
 var more = function (e) {
@@ -281,11 +282,13 @@ Page({
     surplus: 0,
     canBuy: false,
     btnHidden: false,
+		
+		hiddenCS: true,
   },
   //------初始化加载----------
   onLoad: function (t) {
-
+		self = this;
     // console.log('onload');		
     if (t && t.group_id) {
       this.data.group_id = t.group_id;
@@ -6491,7 +6494,35 @@ Page({
     click_contact:function () {
         getApp().globalData.no_clear=1;
-    }
+    },
+		
+	//打开客服操作菜单
+	openCS() {
+		// 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,
+				});
+			});
+			
+		};
+	},
+	
+	//关闭客服操作菜单
+	closeCS() {
+		this.setData({
+			hiddenCS: true,
+		});
+	},
 });
@@ -871,7 +871,7 @@
   <!-- -----------------底部按钮------------------ -->
   <view class="join-cart">
     <!-- bindtap="contactService" -->
-    <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+    <!-- <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
       <view>客服</view>
     </button>
@@ -884,7 +884,12 @@
     <view wx:else class="custom-service cart-ico new_split" bindtap="contactService">
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
       <view>客服</view>
-    </view>
+    </view> -->
+		
+		<view class="custom-service cart-ico new_split" bindtap="openCS">
+		  <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+		  <view>客服</view>
+		</view>
     <view bindtap="collectGoods" class="custom-service cart-ico new_split">
       <image hidden="{{is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart.png"></image>
@@ -17,6 +17,8 @@ var more = function (e) {
 var utils = require('../../../../utils/util.js');
 var regeneratorRuntime = require('../../../../utils/runtime.js');
+let self = null;
+
 Page({
   data: {
     start_stop: 2, //秒杀开始 结束 的控制(1正在进行，2即将开始)
@@ -248,10 +250,13 @@ Page({
     share_hidden: false,
     pre_arr: null,
+		
+		hiddenCS: true,
   },
   //------初始化加载----------
   onLoad: function (t) {
+		self = this;
     var ee = this, that = ee, th = ee,
       pre_id = t.pre_id,
       gid = t.goods_id,
@@ -1432,6 +1437,38 @@ Page({
   contactService: function () {
     getApp().com_call(this);
   },
+	
+	// 获取客服电话
+	getTel() {
+		return new Promise((resolve, reject) => {
+			s.getConfig(function (t) {
+			    if (t.store_tel == undefined) {
+			        getApp().request.get("/api/weshop/store/get/" + os.stoid, {
+			            isShowLoading: 1,
+			            data: {},
+			            success: function (rs) {
+			                getApp().globalData.config = rs.data.data;
+			                if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
+			                    getApp().my_warnning("商家未设置电话", 0, th);
+			                    return false;
+			                }
+											self.setData({
+												store_tel: rs.data.data.store_tel,
+											});
+			                // s.confirmBox("请联系客服：" + rs.data.data.store_tel);
+			            }
+			        })
+			    } else {
+						self.setData({
+							store_tel: t.store_tel,
+						});
+			        // s.confirmBox("请联系客服：" + t.store_tel);
+			    };
+					resolve();
+			});
+		});
+	},
+	
   //-------获取购物车数量----------
   requestCardNum: function () {
     var t = this;
@@ -3999,6 +4036,34 @@ Page({
     click_contact:function () {
         getApp().globalData.no_clear=1;
-    }
+    },
+		
+		//打开客服操作菜单
+		openCS() {
+			// 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,
+					});
+				});
+				
+			};
+		},
+		
+		//关闭客服操作菜单
+		closeCS() {
+			this.setData({
+				hiddenCS: true,
+			});
+		},
 });
@@ -495,7 +495,7 @@
 <!-- -----------------底部按钮------------------ -->
 <view class="join-cart">
   <!-- bindtap="contactService" -->
-  <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+  <!-- <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
     <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
     <view>客服</view>
   </button>
@@ -508,7 +508,13 @@
   <view wx:else class="custom-service cart-ico new_split" bindtap="contactService">
     <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
     <view>客服</view>
-  </view>
+  </view> -->
+	
+	<view class="custom-service cart-ico new_split" bindtap="openCS">
+	  <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+	  <view>客服</view>
+	</view>
+	
   <view bindtap="collectGoods" class="custom-service cart-ico new_split">
     <image hidden="{{is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart.png"></image>
     <image hidden="{{!is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart-h.png"></image>
@@ -949,9 +955,6 @@
   </view>
 </view>
-
-
-
 <include src="../../../../components/com_servicer/com_servicer.wxml"/>
@@ -255,6 +255,7 @@ Page({
         share_hidden: false,
         all_activity_list: null,  //所有活动的列表
+				hiddenCS: true,
     },
     //------初始化加载----------
@@ -6643,7 +6644,35 @@ Page({
     click_contact:function () {
         getApp().globalData.no_clear=1;
-    }
+    },
+		
+		//打开客服操作菜单
+		openCS() {
+			// 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,
+					});
+				});
+				
+			};
+		},
+		
+		//关闭客服操作菜单
+		closeCS() {
+			this.setData({
+				hiddenCS: true,
+			});
+		},
@@ -1011,7 +1011,7 @@
   <!-- -----------------底部按钮------------------ -->
   <view class="join-cart">
     <!-- bindtap="contactService" -->
-    <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact"  open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+    <!-- <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact"  open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
       <view>客服</view>
     </button>
@@ -1024,7 +1024,12 @@
     <view wx:else class="custom-service cart-ico new_split" bindtap="contactService">
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
       <view>客服</view>
-    </view>
+    </view> -->
+		
+		<view class="custom-service cart-ico new_split" bindtap="openCS">
+		  <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+		  <view>客服</view>
+		</view>
     <view bindtap="collectGoods" class="custom-service cart-ico new_split">
       <image hidden="{{is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart.png"></image>
@@ -11,6 +11,7 @@ const {
   qrcode
 } = require('../../../utils/index.js');
 var ut = require("../../../utils/util.js");
+let self = null;
 Page({
   /**
@@ -44,7 +45,7 @@ Page({
     ad_img:"",
     add_card_data:'',  //等级卡的内容
-    
+    hiddenCS: true,
   },
   goto_nav: function(e) {
     var th = this;
@@ -60,7 +61,8 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {	  
+  onLoad: function(options) {	
+			self = this;
       var th=this;
       getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, {
           data: {
@@ -919,7 +921,35 @@ Page({
     click_contact:function () {
         getApp().globalData.no_clear=1;
-    }
+    },
+		
+		//打开客服操作菜单
+		openCS() {
+			// 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,
+					});
+				});
+				
+			};
+		},
+		
+		//关闭客服操作菜单
+		closeCS() {
+			this.setData({
+				hiddenCS: true,
+			});
+		},
@@ -261,7 +261,7 @@
             <!-- 没有链接地址的时候 -->
             <block wx:else>
               <block wx:if="{{item.name=='联系客服'}}">
-                <button class="item t-c" wx:if="{{sys_switch.weapp_customertype==1}}" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+                <!-- <button class="item t-c" wx:if="{{sys_switch.weapp_customertype==1}}" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
                   <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
                   <view class="fs26">联系客服</view>
                 </button>
@@ -274,7 +274,12 @@
                 <view class="item t-c" bindtap="contactService" wx:else>
                   <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
                   <view class="fs26">联系客服</view>
-                </view>
+                </view> -->
+								
+								<view class="item t-c" bindtap="openCS">
+								  <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+								  <view class="fs26">联系客服</view>
+								</view>
               </block>
               <block wx:elif="{{item.name=='收入卡包'}}">
@@ -744,7 +744,7 @@ button::after{ border: 0}
 .action .icon-guan {
-	position: absolute;
+	left: auto !important;
 	right: 20rpx !important;
 }