解决冲突

season
2 parents d4334649 d7e6aac0
Showing 36 changed files with 379 additions and 181 deletions
app.js
app.json
components/add_purchase/add_purchase.js
components/com_servicer/com_servicer.wxml
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/prom_list/prom_list.js
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
packageB/pages/zuhegou/index/index.js
packageB/pages/zuhegou/preindex/index.js
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
packageC/pages/payForAnother/payForAnother.js
packageC/pages/presell/cardInfo/goodsInfo.js
packageC/pages/presell/cart/cart.js
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/pregoodsInfo/goodsInfo.js
packageD/pages/shop/order_detail/order_detail.js
@@ -312,8 +312,8 @@ App({
     },
-      //获取订阅消息模板id
-  async get_template_id(id){
+    //获取订阅消息模板id
+    async get_template_id(id){
     if (!id) { return ''}
     let os = this.globalData.setting;
     let res = await this.promiseGet("/api/wx/weappSendlist/page", {
@@ -1769,6 +1769,13 @@ App({
         }
     },
+    customer_chat(goods_id,type){
+        var url = "/packageG/pages/customer_chat/customer_chat?goods_id="+goods_id;
+        if(type)
+            url += "&type=1";
+        this.goto(url);
+    }
+
@@ -241,7 +241,8 @@
               "pages/team/team_show/team_show",              
               "pages/user/order_detail/order_detail",
               "pages/group_buy/goodsInfo/goodsInfo",
-              "pages/user/my_beauty_consultant/my_beauty_consultant"
+              "pages/user/my_beauty_consultant/my_beauty_consultant",
+              "pages/customer_chat/customer_chat"
           ]
       }
     ],
@@ -3131,7 +3131,8 @@ Component({
           data: {
             store_id: os.stoid,
             user_id: user_id,
-            goods_id: gd.goods_id, isnew: 1
+            goods_id: gd.goods_id, isnew: 1,
+            timetype:gd.viplimited_timetype
           },
           success: function (t) {
             if (t.data.code == 0) {
@@ -21,6 +21,13 @@
 			<text class="iconfont icon-kefu1"></text>在线客服
 		</view>
 	</block>
+	<!-- 商城客服 -->
+	<block wx:elif="{{sys_switch.weapp_customertype == 3}}">
+		<view class="pd20 bdt fs30 btn2" bindtap="customer_chat">
+			<text class="iconfont icon-kefu1"></text>在线客服
+		</view>
+	</block>
+
 </view>
 <view class="mask2" bindtap="closeCS"></view>
 \ No newline at end of file
@@ -227,7 +227,7 @@ Page({
   },
   //------初始化加载----------
-  onLoad:function(t) {
+  onLoad:async function(t) {
 		 self = this;
       this.setData({
@@ -317,7 +317,16 @@ Page({
 		getApp().getConfig(function(e) {
 			ee.setData({sto_sele_name_1:e.store_name})
-		})
+    })
+    
+    var is_chat=0;
+    await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, {
+
+    }).then(res => {
+        if(res && res.data.code==0 && res.data.data){
+          is_chat=1;
+        }
+    })
         //----获取系统参数-----
         getApp().getConfig2(function (e) {
@@ -343,6 +352,12 @@ Page({
           }
           // console.log(e);
           var json_d = JSON.parse(e.switch_list);
+
+          //如果商家未开通在线客服的话
+          if(json_d && json_d.weapp_customertype==3 && !is_chat){
+            json_d.weapp_customertype=0
+          }
+
           ee.setData({
             store_config: e,
             sys_switch: json_d,
@@ -2838,16 +2853,13 @@ Page({
 		})
 	},
-    //---------联系微信客服------------
-    con_weixin:function () {
-        var url=this.data.sys_switch.weapp_customertype_url;
-        var id=this.data.sys_switch.weapp_customertype_appid;
-        wx.openCustomerServiceChat({
-            extInfo: {url: url},
-            corpId: id,
-            success(res) {}
-        })
-    },
+  con_weixin: function () {
+    getApp().con_wx(this);
+  },
+
+  customer_chat:function(){
+    getApp().customer_chat(this.data.data.id,1);
+  },
 	//评论的调用
 	requestComments_new: async function () {
@@ -1017,30 +1017,7 @@
 <!-- 联系客服操作菜单 -->
-<view class="action {{!hiddenCS ? 'active':''}}" hidden="{{hiddenCS}}">
-	<view class="pd20 t-c pr">
-		<text class="bold">联系客服</text>
-		<text class="iconfont icon-guan" bindtap="closeCS"></text>
-	</view>
-	<!-- 客服热线 -->
-	<view class="pd20 bdt fs30 btn2" bindtap="contactService" wx:if="{{store_tel}}">
-		<text class="iconfont icon-dianhua"></text>客服热线：
-		<text class="c-red">{{store_tel}}</text>
-	</view>
-	<!-- 小程序客服 -->
-	<block wx:if="{{sys_switch.weapp_customertype == 1}}">
-		<button class="pd20 bdt fs30 btn2" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
-		  <text class="iconfont icon-kefu1"></text>在线客服
-		</button>
-	</block>
-	<!-- 微信客服 -->
-	<block wx:elif="{{sys_switch.weapp_customertype == 2}}">
-		<view class="pd20 bdt fs30 btn2" bindtap="con_weixin">
-			<text class="iconfont icon-kefu1"></text>在线客服
-		</view>
-	</block>
-</view>
+<include src="../../../components/com_servicer/com_servicer.wxml"></include>
-<view class="mask2" bindtap="closeCS"></view>
 <!-- 分享控件，底部弹出 -->
 <share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageFn" wx:if="{{share_hidden}}"></share>
@@ -783,7 +783,7 @@ Page({
           });
 		  var num= th.data.data.viplimited-gd_buy_num;
-		  if(num<0) num=0;		  
+		  if(num<=0) num=1
 		  th.setData({goodsInputNum:num})	
           return false;
         }
@@ -797,7 +797,7 @@ Page({
           });
 		  var num=th.data.prom_buy_limit- th.data.prom_buy_num ;
-		  if(num<0) num=0;		  
+		  if(num<=0) num=1;
 		  th.setData({goodsInputNum:num})	  		  
           return false;
         }
@@ -1472,7 +1472,8 @@ Page({
           store_id: os.stoid,
           user_id: user_id,
           goods_id: gd.goods_id,
-		  isnew:1
+		  isnew:1,
+		  timetype:gd.viplimited_timetype
         },
         success: function(t) {
           if (t.data.code == 0) {
@@ -310,6 +310,15 @@ Page({
             ee.setData({sto_sele_name_1: e.store_name})
         })
+        var is_chat=0;
+        await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, {
+
+        }).then(res => {
+            if(res && res.data.code==0 && res.data.data){
+                is_chat=1;
+            }
+        })
+
         //----获取系统参数-----
         getApp().getConfig2(function (e) {
             ee.setData({
@@ -334,6 +343,11 @@ Page({
             }
             var json_d = JSON.parse(e.switch_list);
+
+            //如果商家未开通在线客服的话
+            if(json_d && json_d.weapp_customertype==3 && !is_chat){
+                json_d.weapp_customertype=0
+            }
             ee.setData({
                 store_config: e,
                 sys_switch: json_d,
@@ -2620,16 +2634,12 @@ Page({
         })
     },
-    //---------联系微信客服------------
     con_weixin: function () {
-        var url = this.data.sys_switch.weapp_customertype_url;
-        var id = this.data.sys_switch.weapp_customertype_appid;
-        wx.openCustomerServiceChat({
-            extInfo: {url: url},
-            corpId: id,
-            success(res) {
-            }
-        })
+        getApp().con_wx(this);
+    },
+
+    customer_chat:function(){
+        getApp().customer_chat(this.data.data.id,1);
     },
     //评论的调用
@@ -826,32 +826,8 @@
 	</view>
 </view>
-<!-- 联系客服操作菜单 -->
-<view class="action {{!hiddenCS ? 'active':''}}" hidden="{{hiddenCS}}">
-	<view class="pd20 t-c pr">
-		<text class="bold">联系客服</text>
-		<text class="iconfont icon-guan" bindtap="closeCS"></text>
-	</view>
-	<!-- 客服热线 -->
-	<view class="pd20 bdt fs30 btn2" bindtap="contactService" wx:if="{{store_tel}}">
-		<text class="iconfont icon-dianhua"></text>客服热线：
-		<text class="c-red">{{store_tel}}</text>
-	</view>
-	<!-- 小程序客服 -->
-	<block wx:if="{{sys_switch.weapp_customertype == 1}}">
-		<button class="pd20 bdt fs30 btn2" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
-		  <text class="iconfont icon-kefu1"></text>在线客服
-		</button>
-	</block>
-	<!-- 微信客服 -->
-	<block wx:elif="{{sys_switch.weapp_customertype == 2}}">
-		<view class="pd20 bdt fs30 btn2" bindtap="con_weixin">
-			<text class="iconfont icon-kefu1"></text>在线客服
-		</view>
-	</block>
-</view>
-
-<view class="mask2" bindtap="closeCS"></view>
+		<!-- 联系客服操作菜单 -->
+<include src="../../../../components/com_servicer/com_servicer.wxml"></include>
 <!-- --弹起来,选择规格数量,拼单商品购买---- -->
 <view hidden="{{!openSpecModal_pt}}">
@@ -869,7 +869,7 @@ Page({
     //开始调用接口
     getApp().request.get(url, {
       data: req_data,
-      success: function (res) {
+      success: async function (res) {
         th.data.loading = 0;
         th.setData({
           is_get: 1
@@ -879,6 +879,16 @@ Page({
           var list = th.data.list;
           if (!list) list = [];
+          for (let it = 0; it < res.data.data.pageData.length; it++) {
+              var g_ite=res.data.data.pageData[it];
+              //获取单品的现在的活动状态
+              var rs_gd=await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + g_ite.goods_id, {});
+              if(rs_gd && rs_gd.data.code==0 && rs_gd.data.data){
+                g_ite.viplimited_timetype= rs_gd.data.data.viplimited_timetype;
+              }
+
+          }
+
           //当是下拉刷新的时候
           if (th.data.page > 1 && th.data.cart_list) {
             //下拉之后也要重新计算一下金额
@@ -2392,7 +2402,8 @@ Page({
           goods_id: gd.goods_id,
           prom_type: 7,         
           prom_id: th.data.act.id,
-          isnew:1
+          isnew:1,
+          timetype:gd.viplimited_timetype
         },
       }).then(res2 => {
         var g_buy_num = 0;
@@ -2887,7 +2898,8 @@ Page({
                     goods_id: item_j.goods_id,
                     prom_type: 7,
                     prom_id: th.data.act.id,
-                    isnew:1
+                    isnew:1,
+                    timetype:item_j.viplimited_timetype
                   },
                 }).then(res2 => {
                   if (res2.data.code == 0) {
@@ -2964,7 +2976,8 @@ Page({
               goods_id: item_j.goods_id,
               prom_type: 7,
               prom_id: th.data.act.id,
-              isnew:1
+              isnew:1,
+              timetype:item_j.viplimited_timetype
             },
           }).then(res2 => {
             if (res2.data.code == 0) {
@@ -1745,7 +1745,8 @@ Page({
                     goods_id: gd.goods_id,
                     prom_type: 7,
                     prom_id: th.data.act.id,
-                    isnew:1
+                    isnew:1,
+                    timetype:gd.viplimited_timetype
                 },
             }).then(res2 => {
                 var g_buy_num = 0;
@@ -2122,7 +2123,8 @@ Page({
                                         goods_id: item_j.goods_id,
                                         prom_type: 7,
                                         prom_id: th.data.act.id,
-                                        isnew:1
+                                        isnew:1,
+                                        timetype:item_j.viplimited_timetype
                                     },
                                 }).then(res2 => {
                                     if (res2.data.code == 0) {
@@ -2199,7 +2201,8 @@ Page({
                             goods_id: item_j.goods_id,
                             prom_type: 7,
                             prom_id: th.data.act.id,
-                            isnew:1
+                            isnew:1,
+                            timetype:item_j.viplimited_timetype
                         },
                     }).then(res2 => {
                         if (res2.data.code == 0) {
@@ -479,7 +479,8 @@ Page({
                             goods_id: item1.goods_id,
                             prom_type: item1.prom_type,
                             prom_id: item1.prom_id,
-                            isnew:1
+                            isnew:1,
+                            timetype:item1.viplimited_timetype
                         },
                     }).then(res => {
                         var buy_num_data = res.data.data;
@@ -306,7 +306,7 @@ Page({
   },
   //------初始化加载----------
-  onLoad: function (t) {
+  onLoad: async function (t) {
 		self = this;
     // console.log('onload');		
     if (t && t.group_id) {
@@ -459,6 +459,15 @@ Page({
       ee.setData({ sto_sele_name_1: e.store_name })
     })
+    var is_chat=0;
+    await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, {
+
+    }).then(res => {
+        if(res && res.data.code==0 && res.data.data){
+          is_chat=1;
+        }
+    })
+
     //----获取系统参数-----
     getApp().getConfig2(function (e) {
       ee.setData({
@@ -483,6 +492,12 @@ Page({
       }
       // console.log(e);
       var json_d = JSON.parse(e.switch_list);
+
+      //如果商家未开通在线客服的话
+      if(json_d && json_d.weapp_customertype==3 && !is_chat){
+        json_d.weapp_customertype=0
+      }
+
       ee.setData({
         store_config: e,
         sys_switch: json_d,
@@ -2141,11 +2156,11 @@ Page({
           // });
 					getApp().my_warnning('超出商品限购', 0, th);
           l_num = th.data.sele_g.viplimited - gd_buy_num;
-          if (l_num < 0) l_num = 0;
-          //th.setData({ goodsInputNum: num })
-          //return false;
-          is_show_bs=1;
+          if (l_num <= 0) l_num = 1;
+          th.setData({ goodsInputNum: l_num })
+          return false;
         }
+          is_show_bs=1;
       }
       //--判断商品是否超出活动限购--
@@ -4446,7 +4461,8 @@ Page({
           store_id: os.stoid,
           user_id: user_id,
           goods_id: gd.goods_id,
-          isnew:1
+          isnew:1,
+          timetype:gd.viplimited_timetype
         },
         success: function (t) {
           if (t.data.code == 0) {
@@ -4725,7 +4741,7 @@ Page({
               });
               var num = th.data.prom_buy_limit - th.data.prom_buy_num;
-              if (num < 0) num = 0;
+              if (num <= 0) num = 1;
               th.setData({goodsInputNum: num})
               return false;
             }
@@ -7146,6 +7162,10 @@ Page({
       getApp().con_wx(this);
   },
+  customer_chat:function(){
+    var gid=this.data.front_g.goods_id;
+    getApp().customer_chat(gid);
+  },
   // 显示幸运购规则
   showRules: function () {
@@ -768,6 +768,8 @@ Page({
 				      store_id: os.stoid,
 				      user_id: getApp().globalData.user_id,
 				      goods_id: good.goods_id,
+                      timetype:good.viplimited_timetype
+
 				  };
                   if(b_item.prom_type==7){
                       req_data.prom_type=7;
@@ -839,6 +841,7 @@ Page({
 			          store_id: os.stoid,
 			          user_id: getApp().globalData.user_id,
 			          goods_id: good.goods_id,
+                      timetype:good.viplimited_timetype
 			      };
 			      if(prom){
@@ -447,7 +447,8 @@ Page({
                             goods_id: item1.goods_id,
                             prom_type: item1.prom_type,
                             prom_id: item1.prom_id,
-                            isnew:1
+                            isnew:1,
+                            timetype:item1.viplimited_timetype
                         },
                     }).then(res => {
                         var buy_num_data = res.data.data;
@@ -229,7 +229,7 @@ Page({
   },
   //------初始化加载----------
-  onLoad:function(t) {
+  onLoad:async function(t) {
 		 self = this;
       this.setData({
@@ -338,6 +338,15 @@ Page({
 			ee.setData({sto_sele_name_1:e.store_name})
 		})
+          var is_chat=0;
+          await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, {
+
+          }).then(res => {
+              if(res && res.data.code==0 && res.data.data){
+                  is_chat=1;
+              }
+          })
+
         //----获取系统参数-----
         getApp().getConfig2(function (e) {
           ee.setData({
@@ -362,6 +371,12 @@ Page({
           }
           // console.log(e);
           var json_d = JSON.parse(e.switch_list);
+
+            //如果商家未开通在线客服的话
+            if(json_d && json_d.weapp_customertype==3 && !is_chat){
+                json_d.weapp_customertype=0
+            }
+
           ee.setData({
             store_config: e,
             sys_switch: json_d,
@@ -2596,15 +2611,12 @@ Page({
 		})
 	},
-    //---------联系微信客服------------
-    con_weixin:function () {
-        var url=this.data.sys_switch.weapp_customertype_url;
-        var id=this.data.sys_switch.weapp_customertype_appid;
-        wx.openCustomerServiceChat({
-            extInfo: {url: url},
-            corpId: id,
-            success(res) {}
-        })
+    con_weixin: function () {
+        getApp().con_wx(this);
+    },
+
+    customer_chat:function(){
+        getApp().customer_chat(this.data.data.id,1);
     },
 	//评论的调用
@@ -3333,7 +3333,8 @@ Page({
         goods_id: good.goods_id,
         prom_type: good.prom_type,
         prom_id: good.prom_id,
-        isnew: 1
+        isnew: 1,
+        timetype:good.viplimited_timetype
       },
     }).then(res => {
       var buy_num_data = res.data.data;
@@ -274,7 +274,7 @@ Page({
   },
   //------初始化加载----------
-  onLoad: function (t) {
+  onLoad: async function (t) {
     self = this;
     var ee = this, that = ee, th = ee,
       pre_id = t.pre_id,
@@ -389,6 +389,17 @@ Page({
       ee.setData({ sto_sele_name_1: e.store_name })
     })
+
+    var is_chat=0;
+    await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, {
+
+    }).then(res => {
+        if(res && res.data.code==0 && res.data.data){
+          is_chat=1;
+        }
+    })
+
+
     //----获取系统参数-----
     getApp().getConfig2(function (e) {
       ee.setData({
@@ -413,6 +424,12 @@ Page({
       }
       var json_d = JSON.parse(e.switch_list);
+
+      //如果商家未开通在线客服的话
+      if(json_d && json_d.weapp_customertype==3 && !is_chat){
+        json_d.weapp_customertype=0
+      }
+
       ee.setData({
         store_config: e,
         sys_switch: json_d,
@@ -1383,7 +1400,7 @@ Page({
           });
           var num = th.data.sele_g.viplimited - gd_buy_num;
-          if (num < 0) num = 0;
+          if (num <=0) num = 1;
           th.setData({ goodsInputNum: num })
           return false;
         }
@@ -2931,7 +2948,8 @@ Page({
           store_id: os.stoid,
           user_id: user_id,
           goods_id: gd.goods_id,
-          isnew:1
+          isnew:1,
+          timetype:gd.viplimited_timetype
         },
         success: function (t) {
           if (t.data.code == 0) {
@@ -4884,6 +4902,11 @@ Page({
     getApp().con_wx(this);
   },
+  customer_chat:function(){
+    var gid=this.data.sele_g.goods_id;
+    getApp().customer_chat(gid);
+},
+
   // 预览海报
   previewPoster() {
     getApp().globalData.no_clear = 1;
@@ -2570,7 +2570,8 @@ Page({
                     store_id: os.stoid,
                     user_id: user_id,
                     goods_id: gd.goods_id,
-                   isnew:1
+                    isnew:1,
+                    timetype:gd.viplimited_timetype
                 },
                 success: function (t) {
                     if (t.data.code == 0) {
@@ -341,7 +341,8 @@ Page({
 			    user_id: getApp().globalData.user_id,
 			    goods_id: good.goods_id,
 			    prom_type: good.prom_type,
-			    prom_id: good.prom_id
+			    prom_id: good.prom_id,
+                timetype:good.viplimited_timetype
 			  },
 			}).then(res => {
 			   var buy_num_data = res.data.data;
@@ -1283,6 +1284,7 @@ Page({
 				      store_id: os.stoid,
 				      user_id: getApp().globalData.user_id,
 				      goods_id: good.goods_id,
+                      timetype:good.viplimited_timetype
 				  };
                   if(b_item.prom_type==7){
                       req_data.prom_type=7;
@@ -1354,6 +1356,7 @@ Page({
 			          store_id: os.stoid,
 			          user_id: getApp().globalData.user_id,
 			          goods_id: good.goods_id,
+                      timetype:good.viplimited_timetype
 			      };
 			      if(prom){
@@ -2526,16 +2526,20 @@ Page({
   },
   //寻找活动在列表中的最后一个
-  is_has_gift(ord_goods, prom_id) {
+  is_has_gift(ord_goods, prom_id,get_data) {
     if (!ord_goods || ord_goods.length == 0) return false;
     var len = ord_goods.length;
+    var is_ck=false;
     for (var i = 0; i < len; i++) {
       var e = ord_goods[i];
       if (e.prom_type == 3 && e.prom_id == prom_id && e.is_gift == 1) {
-        return true;
+        if(get_data.zp_by>0){
+          ord_goods[i].is_past=1;
+        }
+        is_ck=true;
       }
     }
-    return false;
+    return is_ck;
   },
@@ -2550,7 +2554,7 @@ Page({
   cart_add_gift(item_map, pickid, i, ord_goods, get_data) {
     var th = this;
-    var is_has_gift = this.is_has_gift(ord_goods, item_map.prom_id)
+    var is_has_gift = this.is_has_gift(ord_goods, item_map.prom_id,get_data)
     //-- 没有赠品的时候才添加，避免购物车重复出现 --
     if (!is_has_gift) {
@@ -813,6 +813,7 @@ Page({
     //to.getwuliuprice(async function (rs) {
     console.log('calculatePrice2222');
     //console.log(rs);
+    let all_gd_price=allpice;
     var o_shipping_price = 0, goods_weight = -1, goods_piece = -1;
     var out_of_weight = null; //超出多少重量
@@ -1201,9 +1202,12 @@ Page({
     var total_m = parseFloat(allpice) + parseFloat(th.data.formData.shipping_price);
     total_m = parseFloat(total_m).toFixed(2);
+    all_gd_price = parseFloat(all_gd_price) + parseFloat(th.data.formData.shipping_price);
+    all_gd_price = parseFloat(all_gd_price).toFixed(2);
     var atxt = "formData.total_amount";
-    th.setData({ [atxt]: total_m, })
+    th.setData({ [atxt]: all_gd_price,})  ;  //因为allprice有减了券的钱，不能在用allprice了
+
     var order_m = total_m;
@@ -1516,7 +1520,6 @@ Page({
     }
-
     var gg = to.get_b_now();
     var goods = {
       'goods_id': gg.goods_id,
@@ -1589,6 +1592,12 @@ Page({
       goods.is_whsle_goods = 1;
     }
+    //组装优惠券的钱
+    if (parseFloat(th.data.formData.coupon_price) > 0) {
+      goods.quan_num = th.data.formData.coupon_price;
+      goods.quan_no = item.coupon_no;
+    }
+
     //--导购分享过来的id--
     if (gg.guide_id) {
       goods.guide_id = gg.guide_id;
@@ -422,6 +422,9 @@ Page({
             //res = res.data.data.result;
             //if (!res) return false;
+        this.setData({
+            getUserID: d.user_id || 0,
+        });
         getApp().check_can_share(this);
         getApp().is_Single_page(this, function () {
+// packageG/pages/customer_chat/customer_chat.js
+var os = getApp().globalData.setting;
+var ut = require("../../../utils/util.js");
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    chatUrl:'', // 聊天页面地址
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    let goods_id=options.goods_id;
+    let type=options.type;
+    let user_id=getApp().globalData.user_id;
+    if(!user_id){
+      ut.m_toast("请先登录")
+      setTimeout(()=> {
+          getApp().goto("/packageE/pages/togoin/togoin")
+      },2000)
+      return false;
+    }
+
+    let url= os.h5_host+"/mchat/mbchat/index?goods_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
+    if(type)
+      url= os.h5_host+"/mchat/mbchat/index?card_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
+
+    console.log("chat"+url);
+    this.setData({
+      chatUrl:url
+    })
+
+  },
+
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  }
+
+})
 \ No newline at end of file
+{
+  "navigationBarTitleText": "在线客服",
+  "usingComponents": {}
+}
 \ No newline at end of file
+<web-view src="{{chatUrl}}"></web-view>
+/* packageG/pages/customer_chat/customer_chat.wxss */
 \ No newline at end of file
@@ -226,7 +226,7 @@ Page({
     },
     //------初始化加载----------
-    onLoad: function (t) {
+    onLoad:async function (t) {
         self = this;
@@ -308,6 +308,15 @@ Page({
             ee.setData({sto_sele_name_1: e.store_name})
         })
+        var is_chat=0;
+        await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, {
+
+        }).then(res => {
+            if(res && res.data.code==0 && res.data.data){
+              is_chat=1;
+            }
+        })
+
         //----获取系统参数-----
         getApp().getConfig2(function (e) {
             ee.setData({
@@ -332,6 +341,10 @@ Page({
             }
             // console.log(e);
             var json_d = JSON.parse(e.switch_list);
+            //如果商家未开通在线客服的话
+            if(json_d && json_d.weapp_customertype==3 && !is_chat){
+              json_d.weapp_customertype=0
+            }
             ee.setData({
                 store_config: e,
                 sys_switch: json_d,
@@ -2568,18 +2581,14 @@ Page({
         })
     },
-    //---------联系微信客服------------
     con_weixin: function () {
-        var url = this.data.sys_switch.weapp_customertype_url;
-        var id = this.data.sys_switch.weapp_customertype_appid;
-        wx.openCustomerServiceChat({
-            extInfo: {url: url},
-            corpId: id,
-            success(res) {
-            }
-        })
+      getApp().con_wx(this);
     },
+   customer_chat:function(){
+       getApp().customer_chat(this.data.data.id,1);
+   },
+
     //评论的调用
     requestComments_new: async function () {
         var e = this, th = e, ee = e;
@@ -897,30 +897,7 @@
 <!-- 联系客服操作菜单 -->
-<view class="action {{!hiddenCS ? 'active':''}}" hidden="{{hiddenCS}}">
-	<view class="pd20 t-c pr">
-		<text class="bold">联系客服</text>
-		<text class="iconfont icon-guan" bindtap="closeCS"></text>
-	</view>
-	<!-- 客服热线 -->
-	<view class="pd20 bdt fs30 btn2" bindtap="contactService" wx:if="{{store_tel}}">
-		<text class="iconfont icon-dianhua"></text>客服热线：
-		<text class="c-red">{{store_tel}}</text>
-	</view>
-	<!-- 小程序客服 -->
-	<block wx:if="{{sys_switch.weapp_customertype == 1}}">
-		<button class="pd20 bdt fs30 btn2" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
-		  <text class="iconfont icon-kefu1"></text>在线客服
-		</button>
-	</block>
-	<!-- 微信客服 -->
-	<block wx:elif="{{sys_switch.weapp_customertype == 2}}">
-		<view class="pd20 bdt fs30 btn2" bindtap="con_weixin">
-			<text class="iconfont icon-kefu1"></text>在线客服
-		</view>
-	</block>
-</view>
+<include src="../../../../components/com_servicer/com_servicer.wxml"></include>
-<view class="mask2" bindtap="closeCS"></view>
 <!-- 分享控件，底部弹出 -->
 <share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageFn" wx:if="{{share_hidden}}"></share>
@@ -331,13 +331,14 @@ Page({
     var user_id=getApp().globalData.user_id;
     var promgoodsbuynum=0;
     var goodsbuynum=0;
-    getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+    await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
       data: {
         store_id: os.stoid,
         user_id: user_id,
         goods_id: gd.goods_id,
-        prom_type: gd.prom_type,
-        prom_id: gd.prom_id, isnew:1
+        prom_type: 6,
+        prom_id: th.data.teamlist.id, isnew:1,
+        timetype:gd.viplimited_timetype
       },
     }).then(res=>{
@@ -349,15 +350,18 @@ Page({
     //先判断限购
     if (num+goodsbuynum>gd.viplimited && gd.viplimited>0) {
       getApp().confirmBox("超出商品限购");
+      th.inp_val(gd.viplimited-goodsbuynum);
       return false;
     }
     if (num+promgoodsbuynum>th.data.teamlist.buy_limit && th.data.teamlist.buy_limit>0) {
       getApp().confirmBox("超出活动限购");
+      th.inp_val(th.data.teamlist.buy_limit-promgoodsbuynum);
       return false;
     }
     //判断库存
     if ( num>gd.store_count) {
       getApp().confirmBox("超出商品库存");
+      th.inp_val(gd.store_count);
       return false;
     }
     var r_num=0;
@@ -372,6 +376,7 @@ Page({
     //--判断库存---
     if ( num>r_num) {
       getApp().confirmBox("超出商品库存");
+      th.inp_val(r_num);
       return false;
     }
@@ -380,11 +385,12 @@ Page({
       minusStatus: minusStatus,
     })
+    return true;
+
   },
-  /*输入框事件*/
-  bindManual: function(e) {
-    var num = e.detail.value;
+  inp_val(num){
+    if(!num || num<1) num=1;
     var minusStatus = num > 1 ? 'normal' : 'disable';
     this.setData({
       num: num,
@@ -392,6 +398,17 @@ Page({
     })
   },
+  /*输入框事件*/
+  bindManual: async function(e) {
+    var num = e.detail.value;
+    var minusStatus = num > 1 ? 'normal' : 'disable';
+    // this.setData({
+    //   num: num,
+    //   minusStatus: minusStatus
+    // })
+    this.check_num(num,minusStatus);
+  },
+
   //---------------初始化代码----------------
   async init(tg_id) {
     var goods_id = 0, //商品ID,
@@ -898,6 +915,10 @@ Page({
   //购买前的判断redis
   async buy_check_redis(func){
+
+     var ck= await this.check_num(this.data.num,1);
+     if(!ck)  return false;
+
       //获取redis中的数量
       var r_num=0,prom_type=6,prom_id=this.data.teamlist.id;
       await  getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
@@ -495,7 +495,8 @@ Page({
                     user_id: user_id,
                     goods_id: good.goods_id,
                     prom_type: good.prom_type,
-                    prom_id: good.prom_id
+                    prom_id: good.prom_id,
+                    timetype:gg.viplimited_timetype
                 },
             }).then(res => {
                 var buy_num_data = res.data.data;
@@ -1768,11 +1769,8 @@ Page({
                       })
                       if (arr2.length == 1) {
-                          good.prom_type = 1;
-                          good.prom_id = item.act_id;
-
-
-
+                        good.prom_type = arr2[0].prom_type;
+                        good.prom_id = arr2[0].act_id;
                       }
                       else if (arr2.length > 1) {
                           good.prom_type = g_item.prom_type; good.prom_id = g_item.prom_id;
@@ -1978,6 +1976,7 @@ Page({
 				      store_id: os.stoid,
 				      user_id: getApp().globalData.user_id,
 				      goods_id: good.goods_id,
+                      timetype:good.viplimited_timetype
 				  };
                   if(b_item.prom_type==7){
                       req_data.prom_type=7;
@@ -2001,7 +2000,7 @@ Page({
 				  //---- 要计算商品的限购 -----
 				  if(good['viplimited']>0){ 				  												  
-					  if(cart_num+buynum>good['viplimited']){
+					  if(cart_num+buynum>=good['viplimited']){
 						   err_text+= good['goods_name']+"超出限购\n";
 						   continue;
 					  }				  
@@ -2049,6 +2048,7 @@ Page({
 			          store_id: os.stoid,
 			          user_id: getApp().globalData.user_id,
 			          goods_id: good.goods_id,
+                      timetype:good.viplimited_timetype
 			      };
 			      if(prom){
@@ -2829,7 +2829,8 @@ Page({
             goods_id: goodsinfo.goods_id,
             prom_type: goodsinfo.prom_type,
             prom_id: goodsinfo.prom_id,
-            isnew:1
+            isnew:1,
+            timetype:goodsinfo.viplimited_timetype
           },
         }).then(res => {
           var buy_num_data = res.data.data;
@@ -438,6 +438,18 @@ Page({
         }
+
+        var is_chat=0;
+        await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, {
+
+        }).then(res => {
+            if(res && res.data.code==0 && res.data.data){
+              is_chat=1;
+            }
+        })
+
+
+
         //先查看一下是不是系统会员
         getApp().waitfor_login(()=>{
           if (!getApp().globalData.user_id) {
@@ -469,6 +481,12 @@ Page({
             console.log('获取系统参数');
             console.log(e);
             var json_d = JSON.parse(e.switch_list);
+
+            //如果商家未开通在线客服的话
+            if(json_d && json_d.weapp_customertype==3 && !is_chat){
+              json_d.weapp_customertype=0
+            }
+
             ee.setData({
               store_config: e,
               sys_switch: json_d,
@@ -2480,11 +2498,11 @@ Page({
                   // s.my_warnning('超出商品限购', 0, th);
                   l_num = th.data.sele_g.viplimited - gd_buy_num;
-                  if (l_num < 0) l_num = 0;
-                  // th.setData({
-                  //   goodsInputNum: num
-                  // })
-                  // return false;
+                  if (l_num <= 0) l_num = 1;
+                  th.setData({
+                    goodsInputNum: l_num
+                  })
+                  return false;
                 }
               }
@@ -2631,7 +2649,6 @@ Page({
           checkCartNum_inte: function (t) {
             var th = this;
             this.get_buy_num(this.data.data, async function () {
-              ;
               //--判断商品是否超出限购--
               if (th.data.g_buy_num != null && th.data.data.viplimited > 0) {
@@ -2644,7 +2661,7 @@ Page({
                   });
                   // s.my_warnning('超出商品限购', 0, th);
                   var num = th.data.sele_g.viplimited - gd_buy_num;
-                  if (num < 0) num = 0;
+                  if (num <= 0) num = 1;
                   th.setData({
                     goodsInputNum: num
                   })
@@ -3485,7 +3502,7 @@ Page({
                   jieti_prom: null,
                   order_prom: null,
                   zh_act: null,
-                  more_flash: null,
+                  more_flash: null
                 })
               }
@@ -3530,7 +3547,7 @@ Page({
                 sele_g: item,
                 data: item,
                 //gid: gid,  //只去掉gid的更新
-
+                goodsInputNum:1
               });
@@ -5436,7 +5453,8 @@ Page({
                           data: {
                             store_id: os.stoid,
                             user_id: user_id,
-                            goods_id: gd.goods_id, isnew:1
+                            goods_id: gd.goods_id, isnew:1,
+                            timetype:gd.viplimited_timetype
                           },
                           success: function (t) {
                             if (t.data.code == 0) {
@@ -5753,7 +5771,7 @@ Page({
                             // s.my_warnning('超出商品限购', 0, th);
                             var num = 0;//th.data.prom_buy_limit - th.data.prom_buy_num;
-                            if (num < 0) num = 0;
+                            if (num <= 0) num = 1;
                             th.setData({
                               goodsInputNum: num
                             })
@@ -206,7 +206,7 @@ Page({
 		//先查看一下是不是系统会员
-		getApp().waitfor_login(()=> {
+		getApp().waitfor_login(async ()=> {
 			if (!getApp().globalData.user_id) {
 				if(!this.data.is_show_yq){
 					ut.new_user_go(os.stoid,  getApp().globalData.first_leader);
@@ -505,11 +505,25 @@ Page({
 					/*-- 获取 --*/
 					th.requestRecommend();
+					var is_chat=0;
+					await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, {
+					}).then(res => {
+						if(res && res.data.code==0 && res.data.data){
+							is_chat=1;
+						}
+					})
+
 					/*-------系统是否开通等级卡，会员是等级卡-----*/
 					getApp().getConfig2(function (e) {
 						var t_swi = e.switch_list;
 						if (t_swi) t_swi = JSON.parse(t_swi)
 						if (t_swi) {
+
+							//如果商家未开通在线客服的话
+							if(t_swi.weapp_customertype==3 && !is_chat){
+								json_dt_swi.weapp_customertype=0
+							}
+
 							th.setData({ sys_switch: t_swi });
 							var user_tool = [];
 							if (t_swi.usertool) user_tool = JSON.parse(t_swi.usertool);
@@ -1106,6 +1120,10 @@ Page({
 		getApp().con_wx(this);
 	},
+	customer_chat: function () {
+		getApp().customer_chat(0);
+	},
+
 	//初始话按钮图标
 	init_user_tool: async function () {
 		var d_list = null;
@@ -806,7 +806,8 @@ Page({
           user_id: user_id,
           goods_id: good.goods_id,
           prom_type: good.prom_type,
-          prom_id: good.prom_id
+          prom_id: good.prom_id,
+          timetype:gg.viplimited_timetype
         },
       }).then(res => {
         var buy_num_data = res.data.data;
@@ -2092,8 +2093,8 @@ Page({
           })
           if (arr2.length == 1) {
-             good.prom_type = item.prom_type;
-             good.prom_id = item.act_id;
+             good.prom_type = arr2[0].prom_type;
+             good.prom_id = arr2[0].act_id;
           }
           else if (arr2.length > 1) {
             good.prom_type = g_item.prom_type; good.prom_id = g_item.prom_id;
@@ -2130,7 +2131,7 @@ Page({
           case 2:
             var group = null;
-            await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + good.goods_id + "/" + good.prom_id, {}).then(res => {
+            await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getNewActInfo/" + os.stoid + "/" + good.goods_id + "/" + good.prom_id+"/"+ getApp().globalData.user_id, {}).then(res => {
               if (res.data.code == 0) {
                 group = res.data.data;
               }
@@ -2293,6 +2294,8 @@ Page({
           store_id: os.stoid,
           user_id: getApp().globalData.user_id,
           goods_id: good.goods_id,
+          timetype:good.viplimited_timetype
+
         };
         if (b_item.prom_type == 7) {
           req_data.prom_type = 7;
@@ -2366,6 +2369,7 @@ Page({
           store_id: os.stoid,
           user_id: getApp().globalData.user_id,
           goods_id: good.goods_id,
+          timetype:good.viplimited_timetype
         };
         if (prom) {
@@ -2404,7 +2408,7 @@ Page({
         //---- 要计算商品的限购 -----
         if (good['viplimited'] > 0) {
-          if (cart_num + buynum > good['viplimited']) {
+          if (cart_num + buynum >= good['viplimited']) {
             err_text += good['goods_name'] + "超出限购\n";
             continue;
           }
@@ -9,6 +9,7 @@ module.exports = {
     //url:"http://172.20.3.102:8085", //自己的网址
     banner_err:"../../../images/del/logo.png",
     imghost: "https://mshopimg.yolipai.net/",
+    h5_host: "https://mshop.yolipai.net/",   //客服聊天使用
     share: {},
     stoid:197,