Merge branch 'dev' into 'test'

Dev See merge request !841

Merge branch 'dev' into 'test'
Dev See merge request !841
后端研发-苏明海
2 parents 318d6823 520dd9d2
Showing 19 changed files with 182 additions and 41 deletions
components/diy_seckill/diy_seckill.js
components/diy_seckill/diy_seckill.wxml
components/diy_seckill/diy_seckill.wxss
components/diy_service/diy_service.js
components/diy_service/diy_service.wxml
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsList/g_filter.wxs
pages/goods/search/g_filter.wxs
pages/user/index/index.js
pages/user/index/index.wxml
pages/user/order_detail/order_detail.js
pages/user/order_detail/order_detail.wxml
@@ -45,12 +45,12 @@ Component({
         var g_id = this.data.object;
         this.init(g_id);
         setTimeout(function () {
-            if (this.data.goods_array.length > 0) {
+            if (th.data.goods_array && th.data.goods_array.length > 0) {
                 th.data.timer = setInterval(function () {
                     th.countDown2(th);
                 }, 1000);
             }
-        },500)
+        },600)
     }
   },
@@ -132,7 +132,7 @@ Component({
       }
       for(let i in all_array){
-      	let item=data[i];
+      	let item=all_array[i];
       	if(item.user_price) item.price=item.user_price;
       }
@@ -15,29 +15,29 @@
     <view class='sp' wx:if="{{object.style==1}}">
       <swiper-item class="s_it" wx:for="{{goods_array}}">
         <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-          <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1">
+          <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=1&prom_id={{aitem.id}}" class="s1_gk_a1">
             <view class='one'>
               <view class='sp_top'>
                 <view class='po'></view>
                 <block wx:if="{{aitem.start_time>newTime}}">
-                  <view class="rob">
+                  <view class="rob" style="justify-content: flex-start">
                     <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span>
                   </view>
                 </block>
 				<block wx:if="{{aitem.end_time<=newTime}}">
-					<view class="rob">
+					<view class="rob" style="justify-content: flex-start">
 					  <span class='s_top_kill gray'>活动已结束</span>
 					</view>
 				</block>				
 				<block wx:else>
 					 <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
-					   <view class="rob">
+					   <view class="rob" style="justify-content: flex-start">
 					     <span class='s_top_kill'>火热进行</span>
 					   </view>
 					 </block>
 					 <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
-					   <view class="rob">
+					   <view class="rob" style="justify-content: flex-start">
 					     <span class='s_top_kill gray'>已抢光</span>
 					   </view>
 					 </block>
@@ -77,7 +77,7 @@
   <view class="sp2" wx:if="{{object.style==2}}">
     <block wx:for="{{goods_array}}">
       <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1">
+        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=1&prom_id={{aitem.id}}" class="s1_gk_a1">
           <view class='one1'>
             <view class="o1_img">
@@ -77,13 +77,12 @@ swiper {
   font-size: 24rpx;
   height: 38rpx;
   line-height: 38rpx;
-  left: 6rpx;
   padding: 4rpx 10rpx;
   border-radius: 10rpx;
   z-index: 999;
   position: relative;
-  top: -6rpx;
-  width: 210rpx;
+  top: 1rpx;
+  width: 110rpx;
   color: #fff;
   text-align: center;
 }
@@ -36,8 +36,8 @@ Component({
 	   	return false;
 	},
-	//---------联系客服------------
-	contactService: function() {
+	 //---------联系客服------------
+	  contactService: function() {
 	  getApp().getConfig(function(t) {
 	    if (t.store_tel == undefined) {
 	      getApp().request.get("/api/weshop/store/get/" + os.stoid, {
@@ -57,5 +57,16 @@ Component({
 	    }
 	  });
 	},
+
+      //---------联系微信客服------------
+      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) {}
+          })
+      }
   }
 })
 <!--有在线客户 和 打电话-->
-<block wx:if="{{sys_switch.weapp_customertype}}">
+<block wx:if="{{sys_switch.weapp_customertype==1}}">
    <!-- 判断是不是有登录  -->
    <view  wx:if="{{userInfo}}" class="custom-service" bindtap="go_user" >
 	    <view style="text-align: center;">
@@ -14,7 +14,16 @@
          <view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
 	   </view>	 
     </button>	
-</block>	
+</block>
+
+<block wx:elif="{{sys_switch.weapp_customertype==2}}">
+	<view class="custom-service cart-ico new_split" bindtap="con_weixin">
+		<view style="text-align: center;">
+			<image class="cs-img" src="{{object.img}}"></image>
+			<view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
+		</view>
+	</view>
+</block>
 <block wx:else>	
 	<view class="custom-service cart-ico new_split" bindtap="contactService">
@@ -2209,6 +2209,17 @@ Page({
 			flag: !this.data.flag,
 		})
 	},
+
+    //---------联系微信客服------------
+    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) {}
+        })
+    }
@@ -160,10 +160,16 @@
   <view class="join-cart jc_sb">
 			<view class="flex">
-				<button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split f1"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}" style="text-align: center">
+				<button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split f1"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}" style="text-align: center">
 				    <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
 				    <view>客服</view>
-				  </button>
+				</button>
+
+                <view wx:elif="{{sys_switch.weapp_customertype==2}}" class="custom-service cart-ico new_split f1" bindtap="con_weixin" style="text-align: center">
+                    <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+                    <view>客服</view>
+                </view>
+
 				<view wx:else class="custom-service cart-ico new_split f1" bindtap="contactService" style="text-align: center">
 					<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
 					<view>客服</view>
@@ -2529,6 +2529,40 @@ Page({
     },
+    //---------联系客服------------
+    contactService: function() {
+        getApp().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;
+                        }
+                        wx.makePhoneCall({ phoneNumber: rs.data.data.store_tel, })
+                    }
+                })
+            } else {
+                wx.makePhoneCall({ phoneNumber: t.store_tel, })
+            }
+        });
+    },
+
+    //---------联系微信客服------------
+    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) {}
+        })
+    }
+
+
@@ -647,15 +647,20 @@
 <!-- 客服 -->
 <view class="kefu-container shadow-1">
-    <block wx:if="{{sys_switch.weapp_customertype}}">
-        <button wx:if="{{sys_switch.weapp_customertype}}" class="kefu-btn"
+    <block wx:if="{{sys_switch.weapp_customertype==1}}">
+        <button  class="kefu-btn"
                 open-type="contact"
                 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
             <text class="iconfont icon-kefu fs60 co-red"></text>
         </button>
     </block>
+
+    <block wx:elif="{{sys_switch.weapp_customertype==2}}">
+        <text bindtap="con_weixin" class="iconfont icon-kefu fs60 co-red"></text>
+    </block>
+
     <block wx:else>
-        <text class="iconfont icon-kefu fs60 co-red"></text>
+        <text  bindtap="contactService" class="iconfont icon-kefu fs60 co-red"></text>
     </block>
 </view>
@@ -3965,6 +3965,16 @@ Page({
         if (func) {
             func();
         }
+    },
+
+   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) {}
+        })
     }
 });
@@ -482,10 +482,16 @@
 <!-- -----------------底部按钮------------------ -->
 <view class="join-cart">
   <!-- bindtap="contactService" -->
-  <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split" 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" 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>
+
+  <view wx:elif="{{sys_switch.weapp_customertype==2}}" class="custom-service cart-ico new_split" bindtap="con_weixin">
+    <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+    <view>客服</view>
+  </view>
+
   <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>
@@ -2976,9 +2976,21 @@ Page({
       return false;
     }
+    if (prom_type == 1 && prom_id==0){
+        this.setData({
+            prom_type: 0,isshow: 1,
+        });
+
+        //获取门店
+        this.get_sto();
+        this.get_sku(o.stoid, this.data.data, gid);
+        this.check_has_flash();
+        return false;
+    }
+
     //if (prom_type != 3 && prom_type!=0){
     //---判断秒杀----
-    if (prom_type == 1) {
+    if (prom_type == 1 && prom_id>0) {
       //-------判断活动是否抢光---------
       await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
         1: 1
@@ -5754,6 +5766,16 @@ Page({
     close_pop_more:function () {
        this.setData({is_pop_more:0})
+    },
+
+    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) {}
+        })
     }
@@ -905,10 +905,16 @@
   <!-- -----------------底部按钮------------------ -->
   <view class="join-cart">
     <!-- bindtap="contactService" -->
-    <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split" 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" 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>
+
+    <view wx:elif="{{sys_switch.weapp_customertype==2}}" class="custom-service cart-ico new_split" bindtap="con_weixin">
+      <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+      <view>客服</view>
+    </view>
+
     <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>
@@ -85,7 +85,7 @@ var g_filters = {
         		   if(item.prom_type==8){
         		       url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
         		    }
-        		    if(item.prom_type==1){
+        		    if(item.prom_type==1 && item.prom_id>0 ){
                         url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1";
                     }
         		   return url1;
@@ -88,7 +88,7 @@ var g_filters = {
         		   if(item.prom_type==8){
         		      url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
         		   }
-        		   if(item.prom_type==1){
+        		   if(item.prom_type==1 && item.prom_id>0){
                        url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1";
                    }
         		   return url1;
@@ -840,8 +840,19 @@ 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) {}
+        })
+    }
+
+
+
+
 })
@@ -252,10 +252,16 @@
 					   <!-- 没有链接地址的时候 --> 
 					   <block wx:else>			   
 						   <block wx:if="{{item.name=='联系客服'}}">
-							   <button class="item t-c"  wx:if="{{sys_switch.weapp_customertype}}" 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}}" 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>							             
+							   </button>
+
+                               <view class="item t-c" bindtap="con_weixin" wx:elif="{{sys_switch.weapp_customertype==2}}">
+                                   <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+                                   <view class="fs26">联系客服</view>
+                               </view>
+
 							   <view class="item t-c" bindtap="contactService" wx:else>
 							      <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
 							      <view class="fs26">联系客服</view>
@@ -1431,7 +1431,17 @@ Page({
 			icon: 'none',
 			duration: 3000
 		})
-	}
+	},
+
+    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) {}
+        })
+    }
@@ -53,15 +53,10 @@
         <view class="order-operate">
             <view bindtap="checkTeam" class="contact-us check-btn" wx:if="{{optionIsGoup}}">查看拼团详情</view>
 						<view>
-							<!-- <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split"  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> -->
-								<button wx:if="{{sys_switch.weapp_customertype}}" class="contact-us goods-btn"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">联系客服</button>
-							<!-- <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> -->
+
+							<button wx:if="{{sys_switch.weapp_customertype==1}}" class="contact-us goods-btn"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">联系客服</button>
+
+                            <view wx:elif="{{sys_switch.weapp_customertype==2}}" bindtap="con_weixin" class="contact-us goods-btn">联系客服</view>
 							<view wx:else bindtap="contactService" class="contact-us goods-btn">联系客服</view>
 						</view>
             <!-- <view bindtap="contactService" class="contact-us goods-btn">联系客服</view> -->