1.分享的会员的user_id,分销的上下级关系的bug优化。打开相册，分享，预览图片，照相扫描，聊天，打电话，获取微信地址的时候。

2.自定义模板时候，首页分享空白页的OA单优化 3. 测肤的分享和生成海报的bug优化

1.分享的会员的user_id,分销的上下级关系的bug优化。打开相册，分享，预览图片，照相扫描，聊天，打电话，获取微信地址的时候。
2.自定义模板时候，首页分享空白页的OA单优化 3. 测肤的分享和生成海报的bug优化
yvan.ni
1 parent 07d0fe14
Showing 130 changed files with 532 additions and 2463 deletions
app.js
app.wxss
components/diy_scan/diy_scan.js
components/diy_service/diy_service.js
components/diy_service/diy_service.wxml
components/nav_b/nav_b.wxss
packageA/pages/activity_share/activity_share.js
packageA/pages/addCustomer/addCustomer.js
packageA/pages/cardDetails/cardDetails.js
packageA/pages/cardList/cardList.js
packageA/pages/chongzhi/chongzhi.js
packageA/pages/chongzhiDetails/chongzhiDetails.js
packageA/pages/choujiang/choujiang.js
packageA/pages/details_serviceCard/details_serviceCard.js
packageA/pages/details_serviceCard/details_serviceCard.wxml
packageA/pages/distribution/card/card.js
packageA/pages/distribution/commision/commision.js
packageA/pages/distribution/goods/goods.js
packageA/pages/distribution/myteam/myteam.js
packageA/pages/distribution/order/order.js
@@ -51,7 +51,7 @@ App({
         config: null,   //门店参数
         config2: null,  //门店配置
         code: null,
-        user_id: null,//1564704,// 10153869,// 6453964,//5682094,6520044,6520119   qa    4687  6519901
+        user_id: null,//5682094,6520044,6520119   qa    4687  6519901
         buy_now: null,
         picklist: null,    //门店列表
         wuliuprice: null, //物流价格表
@@ -61,6 +61,7 @@ App({
         getu: null,       //记录会员信息
         sessionKey: null,//记录会员信息
         openid: null,    //记录会员信息
+
         to_group: null,      //参团传递的数据
         wxapp_buy_obj: null, //微信小程序购买的Object
         pk_store: null,      //选择的门店
@@ -69,6 +70,7 @@ App({
         windowWidth: 0,        //整个窗体的宽度
         room_id: null,        //直播间分享的房间ID
         room_goods_id: null,  //直播间分享的商品ID
+
     },
     auth: o,
     request: a,
@@ -669,7 +671,6 @@ App({
     //清空登录时候缓存的值
     onHide: function () {
-
         if(!this.globalData.no_clear) {
             this.globalData.is_test = 0;
             this.globalData.guide_id = null;                     //导购清空
@@ -688,7 +689,6 @@ App({
         }else{
             this.globalData.no_clear=0;
         }
-
     },
     clear_word: function (word) {
@@ -828,6 +828,14 @@ App({
         }
     },
+    //重复函数，统一调用，
+    pre_img(path){
+        this.globalData.no_clear=1;
+        wx.previewImage({
+            //将图片预览出来
+            urls: [path]
+        });
+    },
     //b是数组，t是wxml元素返回的
     pre_img2(b,t){
@@ -836,48 +844,7 @@ App({
             current: b[t.currentTarget.dataset.id],
             urls: b
         });
-    },
-
-    con_wx(th){
-        var url=th.data.sys_switch.weapp_customertype_url;
-        var id=th.data.sys_switch.weapp_customertype_appid;
-        this.globalData.no_clear=1;
-        wx.openCustomerServiceChat({
-            extInfo: {url: url},
-            corpId: id,
-            success(res) {}
-        })
-    },
-
-    con_Service(){
-        var th=this;
-        var oss= this.globalData.setting;
-        this.getConfig(function(t) {
-            if (t.store_tel == undefined) {
-                th.request.get("/api/weshop/store/get/" + oss.stoid, {
-                    isShowLoading: 1,
-                    data: {},
-                    success: function(rs) {
-                        th.globalData.config = rs.data.data;
-                        if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-                            wx.showToast({
-                                title: "商家未设置电话",
-                                icon: 'none',
-                                duration: 3000
-                            })
-                            return false;
-                        }
-                        th.globalData.no_clear=1;
-                        wx.makePhoneCall({ phoneNumber: rs.data.data.store_tel, })
-                    }
-                })
-            } else {
-                th.globalData.no_clear=1;
-                wx.makePhoneCall({ phoneNumber: t.store_tel, })
-            }
-        });
     }
-
 });
@@ -743,17 +743,9 @@ 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');
-}
-
-.icon-kefu1:before {
-  content: "\e666";
-}
-
-.icon-dianhua:before {
-  content: "\e623";
+  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');
 }
 .icon-infofill:before {
@@ -26,6 +26,7 @@ Component({
 	   //-- 扫描成功之后 --
 	   getScancode:function(){
 		   var _this = this;
+           getApp().globalData.no_clear=1;
 		   //-- 允许从相机和相册扫码 --
 		   wx.scanCode({
 		     success: (res) => {
@@ -38,35 +38,16 @@ Component({
 	 //---------联系客服------------
 	  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, })
-	    }
-	  });
-	},
+	     getApp().con_Service();
+	  },
       //---------联系微信客服------------
       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);
+      },
+
+      click_contact:function () {
+          getApp().globalData.no_clear=1;
       }
   }
 })
@@ -8,7 +8,7 @@
 		</view>
    </view>
-   <button wx:else  class="custom-service"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+   <button wx:else  class="custom-service" bindtap="click_contact"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
 	   <view style="text-align: center;">
          <image class="cs-img" src="{{object.img}}"></image>
          <view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
@@ -26,6 +26,9 @@
   color: #ffff;
   font-size: 50rpx;
   background: none;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 .box_main .dian image {
@@ -141,9 +141,10 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-		console.log('abc');
-	  var th = this;	  
+   onShareAppMessage: function () {
+  	  getApp().globalData.no_clear=1;
+
+	  var th = this;
 	  //礼包的转发
 	  if(th.data.currentIndex==3) {
 		  var lbid=th.data.hui_active.lbId;
@@ -1054,10 +1055,8 @@ Page({
 	                  })
 	                  return false;
 	                }
-	                wx.previewImage({
-	                  //将图片预览出来
-	                  urls: [that.data.shareImgPath]
-	                });
+                    getApp().pre_img(that.data.shareImgPath);
+
 					//-- 将商品清空 --
 					th.setData({share_good:null});
@@ -60,7 +60,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-
-  }
+   onShareAppMessage: function () {
+     getApp().globalData.no_clear=1
+   }
 })
 \ No newline at end of file
@@ -92,7 +92,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   }
 })
 \ No newline at end of file
@@ -134,7 +134,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -106,7 +106,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -125,7 +125,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -60,7 +60,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   }
 })
 \ No newline at end of file
@@ -112,7 +112,7 @@ Page({
 	 * 用户点击右上角分享
 	 */
 	onShareAppMessage: function() {
-
+        getApp().globalData.no_clear=1
 	},
@@ -163,6 +163,7 @@ Page({
 	// 联系微信客服
 	contact_wx() {
+        getApp().globalData.no_clear=1;
 		var url = this.data.sys_switch.weapp_customertype_url;
 		var id = this.data.sys_switch.weapp_customertype_appid;
 		wx.openCustomerServiceChat({
@@ -177,24 +178,7 @@ Page({
 	// 联系电话客服
 	contactService() {
-		app.getConfig(function(t) {
-			if (t.store_tel == undefined) {
-				app.request.get('/api/weshop/store/get/' + os.stoid, {
-					isShowLoading: 1,
-					data: {},
-					success: function(rs) {
-						app.globalData.config = rs.data.data;
-						if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-							app.my_warnning('商家未设置电话', 0, self);
-							return false;
-						}
-						app.confirmBox('请联系客服:' + rs.data.data.store_tel);
-					}
-				})
-			} else {
-				app.confirmBox('请联系客服:' + t.store_tel);
-			}
-		});
+        getApp().con_Service();
 	},
@@ -478,9 +462,9 @@ Page({
 		});
 	},
-
-
-
+    click_contact:function () {
+        getApp().globalData.no_clear=1;
+    }
@@ -57,7 +57,7 @@
 		<view class="flex t-c bdt">
 			<!-- 客服 -->
 			<block>
-				<button class="f1" wx:if="{{sys_switch.weapp_customertype == 1}}" hover-class="none" open-type="contact"
+				<button class="f1" wx:if="{{sys_switch.weapp_customertype == 1}}" hover-class="none" open-type="contact" bindtap="click_contact"
 			 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</button>
 				<view class="f1 pd20" wx:elif="{{sys_switch.weapp_customertype== 2}}" bindtap="contact_wx"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</view>
 				<view class="f1 pd20" wx:else bindtap="contactService"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</view>
@@ -92,7 +92,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -149,7 +149,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -264,7 +264,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -157,7 +157,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -141,7 +141,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -151,7 +151,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -112,7 +112,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -316,7 +316,7 @@ Page({
    * 用户点击右上角分享
    *--点击分享事件--分享我的小店
    *--*/
-  onShareAppMessage: function (t) {
+  onShareAppMessage: function (t) {         getApp().globalData.no_clear=1;
     var th = this;
     var title = "我的小店";
-<view bindtap="closeSpecModal_flash_normal" class="cover-layer"></view>
-	 <view class="spec-model">
-		  <view class="pding"> 
-		            <icon bindtap="closeSpecModal_flash_normal" class="modal-close" color="black" size="22" type="cancel"></icon>
-		            <view class="spec-goods">
-		              <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{iurl + (data.image_url ? data.image_url:'miniapp/images/default_g_img.gif')}}" binderror="pop_err_img" data-errorimg="data.img_url"></image>
-		              <view class="spec-goods-info">
-		                <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>
-		                <view class="flex ai_end xc-val-money">            		                    
-		                        <text class="fs20">￥</text>{{data.shop_price}}
-		                        <!-- 如果是等级会员，且有等级价 -->
-		                     	<!-- <block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}} </block> --> 		 
-		                     	<!-- <block wx:else>{{sele_g.shop_price}}</block> -->		                    
-		                </view>
-		             		                  						 
-						<!-- <view class="flex">
-							<view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-							<block wx:if="{{sales_rules==2}}">		
-								 <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
-								 <view class="spec-goods-stock" wx:else>可售:0</view>
-							</block>
-							<block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>       
-						</view> -->
-						
-											     
-		              </view>
-		      
-		              <!-- 选择门店模块 -->
-		               <view  class="flex-space-between address ai_end xc-width ">
-		      
-		                           <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-		                             <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-		                               <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
-		                                距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-		                               
-		                                </view>
-		                           </view>
-		      
-		                           <!-- 没有门店的时候 -->
-		                           <view  class="flex" bindtap="choice_store" wx:else>
-		                                 <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-		                                 <view class="fs30" style="color:black;">选择门店</view>						  
-		                            </view>
-		      
-		                            <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
-		                         </view>
-		      				   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
-		      				   <block wx:else>
-		      				         <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
-		      						 <block wx:else>
-										  <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-		      					     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
-		      						 </block>				       
-		      				   </block>		      				   	   
-		                       <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
-		               
-		      
-		              <!--商品的属性项目-->
-		              <!-- <view  class="xc-goods-attribute">
-		                  <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
-		                  <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">
-		                   <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-nor="1" data-gid='{{item.goods_id}}' wx:for="{{sku_g_pt}}" wx:key="sku_g">
-		                      {{item.gg}}
-		                    </view>
-		                 </view>
-		              </view> -->
-		        
-		              <view class="b_num">
-		                <view>购买数量</view>
-		                <view class="count">
-		                  <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view>
-		                  <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
-		                  <view bindtap="addCartNum" class="add">+</view>
-		                </view>
-		              </view>		      	
-		          </view>
-				  
-				  
-				  <!-- 提示再买多少优惠 -->
-				  <view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition}}">
-				  	再买{{hui_condition.need}}
-				  	<text wx:if="{{hui_condition.money}}">，免{{hui_condition.money}}元</text>
-				  	<text wx:if="{{hui_condition.sale}}">，打{{hui_condition.sale}}折</text>
-				  	<text wx:if="{{hui_condition.past==1}}">，包邮</text>
-				  	<text wx:if="{{hui_condition.intValue>0}}">，送{{hui_condition.intValue}}积分</text>
-				  	<text wx:if="{{hui_condition.couponId>0}}">，送优惠券</text>
-				  	<text wx:if="{{hui_condition.gift_id>0}}">，送赠品</text>
-				  	<text wx:if="{{hui_condition.lb_id>0}}">，送礼包</text>
-				  	<text wx:if="{{hui_condition.zxlb_id>0}}">，送专享礼包</text>
-				  </view>
-				  
-				  
-				  <!-- 按钮部分 -->
-				  <view class="spec-cart-btns">	
-
-				     <!-- 根本就找不到门店 -->
-				     <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
-				     	   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>		   
-				     </block>
-					 <block wx:else> 				  
-				  	       <!-- 根本就找不到门店 -->
-				  	       <block wx:if="{{!only_pk && !def_pickpu_list}}">
-				  			   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>		   
-				  		   </block>		 
-				  		   <block wx:else>
-				  		   
-				  		 			  
-				  			  <block wx:if="{{only_pk.length && !only_pk.length}}">
-				  				   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
-				  			  </block>  	  
-				  			  <block wx:else>
-				  			      <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
-				  		  			   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
-				  				 </block>
-				  				 <block wx:else>
-				  					 <block wx:if="{{!def_pick_store}}">
-				  						 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
-				  					 </block>					 
-				  					 <block wx:else>	 						 						  																	
-				  							 <block wx:if="{{data.store_count<=0}}">
-				  								  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
-				  							 </block>
-				  							 <block wx:else>	
-												<view class="flex jc_sb">				  
-				  								  <view class="spec-cart-btn spec-buy w40"  bindtap="addCart"
-												        data-action="add" style="background-color: #ffb03f;">加入购物车</view>
-												  <view class="spec-cart-btn spec-buy w40"  bindtap="addCart"
-												        data-action="buy">立即购买</view> 
-												</view>		  
-				  							 </block>
-				  						 					 
-				  					 </block>									 
-				  				 </block>
-				  		  </block>  			
-				  		</block>		
-					</block>				   
-				   </view>
-
-		  </view>
-	 </view>	
-	 <view class="clear"></view> 
 \ No newline at end of file
@@ -8,7 +8,6 @@ var t = require(&quot;../../../utils/util.js&quot;),
     oo = s.globalData,
     o = s.globalData.setting,
     os = o;
-		
 let self = null;
 //评价加载更多
@@ -51,7 +50,7 @@ Page({
     supportPageScroll: !1,
     address: {
       address: "",
-      district: 0,
+      district: 0
     },
     shipping: "",
     shippingCost: 0,
@@ -200,17 +199,15 @@ Page({
     sales_rules:1,	       //默认是线上销售
     wait_for_user_store:null,
-		poster:null,      //自定义海报
-		share_b_img:'',   //自定义分享的背景	
-		showPoster: false,	
-		hui_condition:null,
-		sto_sele_name_1:'',//分享的门店名称
+	poster:null,      //自定义海报
+	share_b_img:'',   //自定义分享的背景	
+	showPoster: false,	
+	hui_condition:null,
+	sto_sele_name_1:'',//分享的门店名称
 		// 秒杀
-		prom_st: 0,
+		prom_st: 1,
 		prom_r_null: 0,
-		
-		hiddenCS: true, //控制客服操作菜单显示和控制
   },
   //------初始化加载----------
@@ -264,10 +261,10 @@ Page({
         first_leader=gid_str[1];
       }	  
 			//-- 如果有room_id的获取 --
-			if(gid_str.length>2 && gid_str[2]) {
+			if(gid_str.length>2 && gid_str[2]){
 				room_id=gid_str[2];
 				room_user_share=1;		  
-			};
+			}
     };
     ee.setData({ gid: gid});
@@ -312,7 +309,7 @@ Page({
           is_show_gb: 1
         });
       }
-      // console.log(e);
+      console.log(e);
       var json_d = JSON.parse(e.switch_list);
       ee.setData({
         store_config: e,
@@ -321,7 +318,6 @@ Page({
         is_newsales_rules: json_d.is_newsales_rules
       });
       ee.init(gid);
-			
       //------几人评价-------
       //n.init(th, "", "comments");
@@ -374,7 +370,7 @@ Page({
     //获取用户的默认门店
     getApp().get_user_store(function(e) { 
-			if(!e) {
+	  if(!e) {
         th.data.fir_def_store={}; //赋值空对象
         return false;
       }
@@ -435,7 +431,7 @@ Page({
             appd.lat=that.data.lat;
             appd.lon=that.data.lon;
-          } else {
+          }else{
             if (e) {
               e.distance = null;
               that.data.fir_def_store=e;
@@ -460,7 +456,7 @@ Page({
 		setTimeout(()=>{
 			wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
-
+				// console.log('node@@@@@@@', res);
 				if(res.length != 0) {
 					this.setData({
 						showFold: res[0].height < res[1].height,
@@ -521,9 +517,7 @@ Page({
 		if(prom_type) { // 进入商品详情页地址传参有带goods_id、prom_type、prom_id参数, 即从秒杀入口进入
 			let prom_id = this.data.options.prom_id;
-			// 检查活动是否开始
 			this.check_prom(goods_id, prom_type, prom_id);
-			
 		} else { // 从非秒杀入口进入,地址不带prom_type、prom_id参数
 			getApp().request.promiseGet('/api/weshop/activitylist/getGoodActInfo', {
 				data: {
@@ -543,16 +537,20 @@ Page({
 						let prom_id = result[0].act_id;
 						this.setData({
 							'options.prom_type': prom_type,
-							'options.prom_id': prom_id,
 						});
-						// 检查活动是否开始
 						this.check_prom(goods_id, prom_type, prom_id);
 					} else if(resLength > 1) { //如果数组长度大于1，表示当前商品参加多个活动，以列表形式显示多活动
 						this.setData({
 							actList: res.data.data,
 						});
 					};
-										
+					 
+					// console.log('!!!!!!~~~~~~~~~prom~~~~~~~~~~!!!!!!');
+					
+					// this.setData({
+					// 	prom,
+					// });
+					
 				};
 			});
 		};
@@ -671,6 +669,8 @@ Page({
+		
+		
     i.get("/api/weshop/serviceCard/get/" + o.stoid + "/" + ee.data.gid, {
       failRollback: !0,
@@ -700,7 +700,6 @@ Page({
 					that.setData({
 						'data.goods_name': t.data.data.serviceName,
 						'data.shop_price': t.data.data.money,
-						'data.show_price': t.data.data.show_price,
 						'data.validDays': t.data.data.validDays,
 						'data.serviceContent': t.data.data.serviceContent,
 						'data.image_url': t.data.data.imgUrl,
@@ -745,9 +744,6 @@ Page({
 				};
 			}
     });
-		
-				
-		
     this.data.enterAddressPage && (this.data.enterAddressPage = !1);
 		this.get_sto();
@@ -819,23 +815,8 @@ Page({
       activeCategoryId: 1
     });
   },
-	
-	//获取redis中的数量
-	async getactLen(func) {
-	    var r_num = 0,
-	        prom_type = this.data.prom_type,
-	        prom_id = this.data.prom_id;
-	    await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
-	        1: 1
-	    }).then(res => {
-	        var em = res;
-	        if (em.data.code == 0) {
-	            r_num = em.data.data;
-	        }
-	    })
-	    func(r_num);
-	},
-	
+
+ 
   //------------加入购物车--------------
   addCart: function(t) {
     var th = this;
@@ -847,61 +828,10 @@ Page({
       open_ind_store: ind
     });
-		if(!th.data.sto_sele_name) {
+	if(!th.data.sto_sele_name){
         getApp().my_warnning('请选择门店', 1, th, 450);
         return false;
     }
-		
-		
-		
-		//000000
-		//如果是秒杀的话，要看redis够不够
-		// if (this.data.prom_type == 1) {
-		
-		//     if (this.data.openSpecModal_flash_normal) {
-		//         this.data.is_normal=1; //是普通购买
-		//         return false;
-		//     }
-		
-		
-		//     this.getactLen(function (num) {
-		//         if (num < th.data.goodsInputNum) {
-		//             getApp().my_warnning("活动库存不足!", 0, th);
-		//             return false;
-		//         } else {
-		//             // th.add_cart_func(t);
-		//         }
-		//     });
-		// } else {
-		//     // th.add_cart_func(t);
-		// }
-		//000000
-		
-		
-		if(this.data.options.prom_type == 1 && !this.data.prom_act.is_shop_buy) { 
-			var t = th.data.goodsInputNum + 1;
-			th.data.sele_g.viplimited = th.data.sele_g.buy_limit;
-			if (th.data.sele_g.viplimited > 0) {
-			    var gd_buy_num = th.data.sele_g.buy_num;
-					
-			    if (t + gd_buy_num > th.data.sele_g.viplimited) {
-			        wx.showModal({
-			            title: '超出商品限购',
-			        });
-					
-			        let num = th.data.sele_g.viplimited - gd_buy_num;
-			        if (num < 0) num = 0;
-			        th.setData({goodsInputNum: num});
-			        return false;
-			    }
-			};
-		};
-		
-		
-		
-		
-		
-		
 	if(action=="buy"){
@@ -920,20 +850,12 @@ Page({
 			newd['prom_type'] = this.data.prom_type;
 			newd['prom_id'] = this.data.prom_id;
 			newd['prom_price'] = this.data.prom_price;
-		};
-		
-		if(this.data.prom_act.is_shop_buy) {
-			newd['prom_type'] = 0;
-			newd['prom_price'] = this.data.data.shop_price;
-		};
+		}
 		// console.log('newd++++++++', newd);
 		th.buyNow(newd);
 	} else {
-		    
-		
-			 
-				
+
         var newd = {
             service_id: th.data.data.id,
             service_sn:th.data.data.service_sn,
@@ -944,7 +866,7 @@ Page({
             store_id:os.stoid,
             money:th.data.data.shop_price
         };
-        if(getApp().globalData.guide_id) {
+        if(getApp().globalData.guide_id){
             newd['guide_id'] = getApp().globalData.guide_id;
             newd['guide_type']=0;
         }
@@ -1004,16 +926,14 @@ Page({
     }
-		
-	
   },
   //----------立即购买-----------
   buyNow: function(e) {   
-		getApp().globalData.service_now=e;	
-		wx.redirectTo({
-			 url: "/packageA/pages/cart2_ser/cart2_ser",
-		});	
+	getApp().globalData.service_now=e;	
+	wx.redirectTo({
+	   url: "/packageA/pages/cart2_ser/cart2_ser",
+	});	
   },
   //----------增加购买数量-----------
   addCartNum: function(t) {
@@ -1030,108 +950,9 @@ Page({
   //------检查数量是不是超出限购------
   checkCartNum: function(t) {
-		
-		var th = this;
-		
-		// if(this.data.prom_act.is_shop_buy && this.data.options.prom_type != 1) {
-		// if(th.data.is_normal) {
-
-			if(t<=0) return false;
-			th.setData({goodsInputNum:t});
-		// } else {
-		
-		if(this.data.options.prom_type == 1 && !this.data.openSpecModal_flash_normal) {	
-			
-			this.get_buy_num(this.data.sele_g, async function () {
-					th.data.sele_g.viplimited = th.data.sele_g.buy_limit;
-					
-			    //--判断商品是否超出限购--
-			    // if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
-					if(!th.data.prom_act.is_shop_buy) {
-						
-						if (th.data.sele_g.viplimited > 0) {
-						    var gd_buy_num = th.data.sele_g.buy_num;
-								
-						    if (t + gd_buy_num> th.data.sele_g.viplimited) {
-						        wx.showModal({
-						            title: '超出商品限购',
-						        });
-								
-						        var num = th.data.sele_g.viplimited - gd_buy_num;
-						        if (num < 0) num = 0;
-						        th.setData({goodsInputNum: num})
-						        return false;
-						    }
-						}
-						
-					};
-					
-			
-			    //如果是普通购买的情况下
-			    if(th.data.openSpecModal_flash_normal) th.data.is_normal=1;
-			
-			    //--判断商品是否超出活动限购--
-			    if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && !th.data.is_normal) {
-			        if (t + th.data.prom_buy_num > th.data.prom_buy_limit) {
-			            wx.showModal({
-			                title: '超出商品活动限购',
-			            });
-			
-			            var num = th.data.prom_buy_limit - th.data.prom_buy_num;
-			            if (num < 0) num = 0;
-			            th.setData({goodsInputNum: num})
-			            return false;
-			        }
-			    }
-			
-			    if (th.data.sele_g.prom_type == 1 && !th.data.is_normal) {
-			        var redis_num = 0;
-			        //------判断活动是否抢光-----
-			        await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
-			            os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, {
-			            1: 1
-			        }).then(res => {
-			            redis_num = res.data.data;
-			        });
-			
-			        if (t > redis_num) {
-			            wx.showModal({
-			                title: '超出商品活动库存',
-			            });
-			            th.setData({goodsInputNum: redis_num})
-			            return false;
-			        }
-			    }
-			    var e = th.data.sele_g.store_count;
-			    var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4
-			    if (th.data.sales_rules == 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) {
-			        if (!th.data.def_pick_store) {
-			            wx.showModal({title: '请选择门店',});
-			            return false;
-			        } else {
-			            e = th.data.def_pick_store.CanOutQty;
-			        }
-			    }
-			    if (!e) e = 0;
-			    //库存不足，不增加
-			    if (e < t) {
-			        wx.showModal({title: '库存不足',});
-			        if (e < 0) e = 0;
-			        th.setData({goodsInputNum: e});
-			        return false;
-			    }
-			    t > e || 0 == e ? t = e : t < 1 && (t = 1);
-			    th.setData({goodsInputNum: t});
-			    // th.is_show_more_buy();
-			
-			})
-			
-		};
-	  
-		
-		
-		
-		
+	  if(t<=0) return false;
+      var th = this;
+	  th.setData({goodsInputNum:t})
   },
@@ -1143,6 +964,7 @@ Page({
   },
   openSpecModel: function(t) {
+		// console.log('****ttttttt***', t);
 		var th=this;
     var open_store = t.currentTarget.dataset.ind;
     this.setData({
@@ -1223,57 +1045,12 @@ Page({
         });
       }
     }
-  },	
-	//---------联系客服------------
-	contactService: function () {
-	  this.getTel()
-		.then(() => {
-			if(self.data.store_tel) {
-				wx.showModal({
-					title: '联系客服',
-					content: '客服热线:' + self.data.store_tel,
-					confirmText: '拨打',
-					success(res) {
-						if(res.confirm) {
-							wx.makePhoneCall({
-								phoneNumber: self.data.store_tel,
-							})
-						};
-					},
-				});
-			};
-		});
-	},
-	// 获取客服电话
-	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();
-			});
-		});
-	},
+  },
+
+  //---------联系客服------------
+  contactService: function() {
+      getApp().con_Service();
+  },
   //-------获取购物车数量----------
   requestCardNum: function() {
     var t = this;
@@ -1315,6 +1092,7 @@ Page({
   //--点击分享事件---
   onShareAppMessage: function(t) {
+    getApp().globalData.no_clear=1;
     var th = this;
     var price = th.data.data.shop_price;
@@ -2768,10 +2546,7 @@ Page({
 	 },
 	 previewImage() {
-		 wx.previewImage({
-		   //将图片预览出来
-		   urls: [this.data.shareImgPath]
-		 });
+         getApp().pre_img(this.data.shareImgPath);
 	 },
 	onShareTimeline() {
@@ -2795,13 +2570,7 @@ 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)
     },
 	//评论的调用
@@ -2998,10 +2767,9 @@ Page({
 	  //   b[i] = this.data.iurl + e[i];
 	  // }
 	  this.data.show_prew_img = 1;
-	  wx.previewImage({
-	    current: b[t.currentTarget.dataset.id],
-	    urls: b
-	  });
+	  //调用预览图片
+	  getApp().pre_img2(b,t);
+
 	},
@@ -3125,45 +2893,38 @@ Page({
 	},
-	//获取redis中的数量
-	async getactLen(func) {
-		var r_num = 0,
-				prom_type = this.data.prom_type,
-				prom_id = this.data.prom_id;
-		await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
-				1: 1
-		}).then(res => {
-				var em = res;
-				if (em.data.code == 0) {
-						r_num = em.data.data;
-				}
-		})
-		func(r_num);
-	},
-	
-	
 	//--------检查是否活动，活动是否开始，或者是否结束-------
 	async check_prom(gid, prom_type, prom_id) {
+	    console.log('check_prom');
 	    var ee = this, th = ee;
 	    var user_id = getApp().globalData.user_id;
 	    if (!user_id) user_id = 0;
-		
-	    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();
-	//         this.data.is_normal = 1;
-	//         this.check_is_youhui(gid, 1);
-	//         return false;
-	    }
+	    // if (prom_type == 3 || prom_type == 0 || prom_type == 5 || prom_type == 7 || prom_type == 9 || prom_type == 10) {
+	    //     this.setData({
+	    //         prom_type: 0, isshow: 1,
+	    //     });
+	    //     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();
+				// this.data.is_normal = 1;
+				// this.check_is_youhui(gid, 1);
+				// return false;
+	   //  }
+
 	    //if (prom_type != 3 && prom_type!=0){
 	    //---判断秒杀----
 	    if (prom_type == 1 && prom_id > 0) {
@@ -3172,23 +2933,15 @@ Page({
 	            1: 1
 	        }).then(res => {
 	            var em = res;
-	            if (em.data.code == 0) {
-	
-	                if (em.data.data <= 0) {										
-										th.setData({
-										    prom_r_null: 1,
-												goodsInputNum: res.data.data,
-										});
-										
-										// th.setData({goodsInputNum: redis_num})
-									};
+	            if (res.data.code == 0) {
+									// console.log('!!!!!!res!!!!', res);
+	                if (res.data.data <= 0) ee.setData({
+	                    prom_r_null: 1
+	                });
 	                //拿取价格并且判断时间--
 	                getApp().request.get("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id, {
 	                    success: function (t) {
-												 th.setData({
-													 sele_g: t.data.data,
-												 });
-												 
+												// console.log('!!!!!!t!!!!', t);
 	                        if (t.data.code != 0) {
 	                            ee.get_normal(gid);
 	                            return false;
@@ -3215,6 +2968,7 @@ Page({
 	                        var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
 	                        ee.setData({
+															'data.shop_price': t.data.data.user_price,
 	                            prom_price: t.data.data.user_price,
 	                            prom_type: 1,
 	                            prom_id: prom_id,
@@ -3232,6 +2986,7 @@ Page({
 	                        if (endTime1 > newTime) {
 	                            ee.setData({
 	                                prom_time_text: '距秒杀开始还有',
+																	prom_st: 0,
 	                            })
 	                            ee.countDown(endTime1, 0);
 	                        } else {
@@ -3245,60 +3000,60 @@ Page({
 	                        }
 	                        //如果是进行中的话
-	                        if (endTime1 < newTime) {
-	                            //-- 获取秒杀活动的多少规格 --
-	                            ee.get_more_flahs(function (list) {
-	                                if (list && list.length > 1) {
-	
-	                                    var n_item = list[0];
-	                                    var ind = list.findIndex(function (ele) {
-	                                        return ele.goods_id == ee.data.data.goods_id;
-	                                    })
-	                                    if (ind < 0) return false;
-	                                    if (ind > 0) {
-	                                        n_item = JSON.parse(JSON.stringify(list[ind]));
-	                                        list.splice(ind, 1);
-	                                        list.unshift(n_item);
-	                                    }
-	
-	                                    ee.data.sele_g.viplimited = n_item.viplimited;
-	                                    ee.data.data.viplimited = n_item.viplimited;
-	
-	                                    var gb = 1;
-	                                    //-- 显示多规格 --
-	                                    for (let i in list) {
-	                                        let item = list[i];
-	                                        var gg = "";
-	                                        if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = "";
-	                                        if (item.goods_color == "null" || item.goods_color == null) item.goods_color = "";
-	
-	                                        if (item.goods_spec != "" && item.goods_color != "") {
-	                                            gg = item.goods_spec + "/" + item.goods_color;
-	                                        } else if (item.goods_spec != "" || item.goods_color != "") {
-	                                            gg = item.goods_spec + item.goods_color;
-	                                        } else {
-	                                            gg = "规格" + gb;
-	                                            gb++;
-	                                        }
-	                                        item.gg = gg;
-	                                        item.prom_id = item.prom_id;
-	                                        item.prom_type = 1;
-	                                    }
-	
-	                                    ee.setData({
-	                                        sku_g: list,
-	                                    });
-	
-	                                }
-	                            })
-	                        }
+	//                         if (endTime1 < newTime) {
+	//                             //-- 获取秒杀活动的多少规格 --
+	//                             ee.get_more_flahs(function (list) {
+	//                                 if (list && list.length > 1) {
+
+	//                                     var n_item = list[0];
+	//                                     var ind = list.findIndex(function (ele) {
+	//                                         return ele.goods_id == ee.data.data.goods_id;
+	//                                     })
+	//                                     if (ind < 0) return false;
+	//                                     if (ind > 0) {
+	//                                         n_item = JSON.parse(JSON.stringify(list[ind]));
+	//                                         list.splice(ind, 1);
+	//                                         list.unshift(n_item);
+	//                                     }
+
+	//                                     ee.data.sele_g.viplimited = n_item.viplimited;
+	//                                     ee.data.data.viplimited = n_item.viplimited;
+
+	//                                     var gb = 1;
+	//                                     //-- 显示多规格 --
+	//                                     for (let i in list) {
+	//                                         let item = list[i];
+	//                                         var gg = "";
+	//                                         if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = "";
+	//                                         if (item.goods_color == "null" || item.goods_color == null) item.goods_color = "";
+
+	//                                         if (item.goods_spec != "" && item.goods_color != "") {
+	//                                             gg = item.goods_spec + "/" + item.goods_color;
+	//                                         } else if (item.goods_spec != "" || item.goods_color != "") {
+	//                                             gg = item.goods_spec + item.goods_color;
+	//                                         } else {
+	//                                             gg = "规格" + gb;
+	//                                             gb++;
+	//                                         }
+	//                                         item.gg = gg;
+	//                                         item.prom_id = item.prom_id;
+	//                                         item.prom_type = 1;
+	//                                     }
+
+	//                                     ee.setData({
+	//                                         sku_g: list,
+	//                                     });
+
+	//                                 }
+	//                             })
+	//                         }
 	                    }
 	                });
 	            }
 	        })
 	    }
-	
+
 	},
@@ -3307,706 +3062,58 @@ Page({
 		let prom_type = e.currentTarget.dataset.promtype;
 		let prom_id = e.currentTarget.dataset.promid;
 		let goods_id = this.data.data.goods_id;
-		let url = `/packageA/pages/goodsInfo/goodsInfo?goods_id=${goods_id}&prom_type=${prom_type}&prom_id=${prom_id}`;s
+		let url = `/packageA/pages/goodsInfo/goodsInfo?goods_id=${goods_id}&prom_type=${prom_type}&prom_id=${prom_id}`;
+		// console.log('url~~~~', url);
 		getApp().goto(url);
 	},
-	//获取更多秒杀
-	get_more_flahs: async function (func) {
-	    var f_more = false;
-	    var user_id = getApp().globalData.user_id;
-	    if (!user_id) user_id = 0;
-	
-	    var url = "/api/weshop/goods/listSkuFlash?store_id=" + os.stoid + "&goods_id=" + this.data.data.goods_id + "&user_id=" + user_id;
-	    //获取秒杀的多规格
-	    await getApp().request.promiseGet(url, {}).then(res => {
-	        if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
-	            f_more = res.data.data;
-	        }
-	    })
-	    if (!f_more) {
-	        func(false);
-	        return false;
-	    }
-	    //-- 秒杀的价格要更新 --
-	    for (let i in f_more) {
-	
-	        let item = f_more[i];
-	        f_more[i].prom_id = item.act_id;
-	        f_more[i].prom_type = 1;
-	        if (item.goods_id == this.data.data.goods_id) {
-	            continue;
-	        }
-	        var url = "/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + item.act_id;
-	        await getApp().request.promiseGet(url, {}).then(rs => {
-	            if (rs.data.code == 0) {
-	                f_more[i].price = rs.data.data.user_price;
-	
-	            }
-	        })
-	    }
-	    func(f_more);
-	
-	},
-	
-	
-	
-
-	
-	
-	//-------------获取购买数量的总函数----------------
-	get_buy_num: function (gd, func) {
-					
-			var th = this,
-			    user_id = getApp().globalData.user_id;		
-					
-					
-	        //----获取商品购买数----
-	        getApp().request.get("/api/weshop/ordergoods/getUserBuyGoodsNum", {
-	            data: {
-	                store_id: os.stoid,
-	                user_id: user_id,
-	                goods_id: this.data.gid,
-	            },
-	            success: function (t) {
-	                if (t.data.code == 0) {
-	                    var g_buy_num = t.data.data.goodsbuynum;
-	
-	                    // 如果是秒杀的时候
-	                    // if (th.data.prom_type == 0 && gd.prom_type == 1) {
-	                    //     gd.prom_type = 0;
-	                    // }
-
-											//----获取活动购买数----
-											getApp().request.get("/api/weshop/ordergoods/getUserBuyGoodsNum", {
-												data: {
-														store_id: os.stoid,
-														user_id: user_id,
-														goods_id: th.data.gid,
-														prom_type: th.data.prom_type,
-														prom_id: th.data.prom_id
-												},
-												//-----获取-----
-												success: function (tt) {
-														if (tt.data.code == 0) {
-																th.setData({
-																		prom_buy_num: tt.data.data.goodsbuynum,
-																});
-																"function" == typeof func && func();
-														}
-												}
-											});
-											
-													
-	                }
-	            },
-	        });
-	},
-	
-	
-	
-	
-	
-	// 促销 -> 送礼包 -> 查看详情
-	viewLbDetails(e) {
-	    let id = e.currentTarget.dataset.id; // 获取礼包id
-	    let url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮
-	    // console.log('myurl', url);
-	    getApp().goto(url);
-	},
-	go_more_ladder: function (e) {
-	    var prom_id = e.currentTarget.dataset.id;
-	    getApp().goto("/pages/goods/goodsList/goodsList?ladder_id=" + prom_id);
-	},
-	
-	getHistoryBuy() {
-	    let _this = this;
-	    let req_data = {
-	        store_id: os.stoid,
-	        goods_id: this.data.gid,
-	        pay_status: 1,
-	        rndid: 1
-	    };
-	    getApp().request.promiseGet('/api/weshop/ordergoods/list', {
-	        data: req_data,
-	    })
-	        .then(res => {
-	            if (t.ajax_ok(res)) {
-	                _this.setData({
-	                    historyBuyInfo: res.data.data.pageData,
-	                })
-	            }
-	        })
-	},
-	
-
-	
-	//-- 秒杀的普通购买 --
-	openSpecModel_Nor: function () {
-	    this.data.g_buy_num = new Map();
+	//-- 检验商品的活动情况 --
+	check_gd_prom_new: function (func) {
 	    var th = this;
-	    this.setData({open_ind_store: 5, goodsInputNum: 1});//拼团直接给4
-			
-			this.setData({openSpecModal_flash_normal: 1});
-			
-			
-	    // if (th.data.sku_g_pt) {
-	    //     // this.get_sto(1)
-	    //     this.setData({openSpecModal_flash_normal: 1});
-	    // } else {
-	    //     th.get_sto(1);
-	    //     th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () {
-	    //         th.setData({
-	    //             openSpecModal_flash_normal: 1
-	    //         });
-	    //     });
-	    // }
-	    // this.check_is_youhui(th.data.gid, 1);
-	},
-	
-	closeSpecModal_flash_normal: function () {
-	    this.setData({openSpecModal_flash_normal: 0});
-	},
-	
-	
-	//打开客服操作菜单
-	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,
-		});
-	},
-	
-	
-	
-	
-	
-	
-	
-	//-- 加入购物的函数 --
-	add_cart_func: function (t) {
-	    var i = getApp().request;
-	    if (oo.user_id == null) {
-	        return s.my_warnning("还未登录！", 0, this);
-	    }
+	    var user_id = getApp().globalData.user_id;
+	    if (!user_id) user_id = 0;
-	    if (!getApp().globalData.userInfo) {
-	        return s.my_warnning("还未登录！", 0, this);
+	    var url = '/api/weshop/activitylist/listGoodActInfo2';
+	    var req_d = {
+	        "store_id": os.stoid,
+	        "goods_id": this.data.gid,
+	        "user_id": user_id,
 	    }
-	
-	    var e = this,
-	        th = e,
-	        a = 0,
-	        o = this.data.sele_g;
-	    a = o.goods_id;
-	
-	    //----------添加到购物车时，要判断限购数量，--------
-	    e.get_buy_num(o, function (ee) {
-	        //---判断商品是否超出限购---
-	        if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
-	            if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
-	                wx.showModal({
-	                    title: '提示',
-	                    content: '超出商品限购'
-	                });
-	                return false;
-	            }
-	        }
-	        //---判断商品是否超出活动限购---
-	        if ((th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) && !th.data.is_normal) {
-	            if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
-	                wx.showModal({
-	                    title: '提示',
-	                    content: '超出商品活动限购'
-	                });
-	                return false;
-	            }
-	        }
-	
-	        if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
-	        if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
-	            this.setData({
-	                sto_sele_name: ""
-	            });
-	        if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th);
-	
-	        //--------------此时操作的数据------------
-	        var newd = {
-	            goods_id: o.goods_id,
-	            goods_num: th.data.goodsInputNum,
-	            pick_id: th.data.sto_sele_id,
-	            user_id: oo.user_id,
-	            store_id: th.data.stoid,
-	            goods_price: o.shop_price,
-	            member_goods_price: o.shop_price,
-	            goods_name: o.goods_name,
-	            goods_sn: o.goods_sn,
-	            sku: o.sku,
-	            prom_id: th.data.sele_g.prom_id,
-	            prom_type: th.data.sele_g.prom_type,
-	        };
-	
-	        //---是不是从收藏夹出来的---
-	        if (th.data.c_guide_id) {
-	            newd['guide_id'] = th.data.c_guide_id;
-	            newd['guide_type'] = 2;
-	            if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 3;
-	        } else {
-	            if (getApp().globalData.guide_id) {
-	                newd['guide_id'] = getApp().globalData.guide_id;
-	                newd['guide_type'] = 0;
-	                if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1;
-	            }
-	        }
-	
-	        //让商品带上房间号
-	        //让商品带上房间号
-	        if (th.data.sys_switch.is_skuroom_id == 1) {
-	            if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
-	                newd.room_id = getApp().globalData.room_id;
-	            }
-	        } else {
-	            if (newd.goods_id == getApp().globalData.room_goods_id) newd.room_id = getApp().globalData.room_id;
-	        }
-	
-	        //如果是积分够，is_integral_normal就要有积分购普通购买字段
-	        if (o.prom_type == 4) {
-	            newd.is_integral_normal = 1;
-	        }
-	
-	        //如果有线下取价
-	        if (o.offline_price) {
-	            newd.offline_price = o.offline_price;
-	            newd.pricing_type = o.pricing_type;
-	        }
-	
-	        //-----如果是秒杀，团购，积分购,拼团-----
-	        if (th.data.prom_type == 1 || th.data.prom_type == 2) {
-	
-	            if (th.data.openSpecModal_flash_normal) {
-	
-	                newd.prom_type = 0;
-	                newd.prom_id = 0;
-	
-	                //---如果是线下门店销售的时候---
-	                if (th.data.sales_rules == 2) {
-	                    var pick = th.get_pick_from_list(th.data.sto_sele_id)
-	                    //---通过接口获取门店的线下库存信息--
-	                    getApp().request.get("/api/weshop/goods/getWareStorages", {
-	                        data: {
-	                            storageNos: pick.pickup_no,
-	                            wareIds: encodeURIComponent(th.data.sele_g.erpwareid),
-	                            storeId: os.stoid
-	                        },
-	                        success: function (res) {
-	                            if (res.data.code == 0) {
-	                                if (res.data.data.pageData.length > 0) {
-	                                    var CanOutQty = res.data.data.pageData[0].CanOutQty;
-	                                    if (CanOutQty < e.data.goodsInputNum) {
-	                                        return s.my_warnning("库存不足！", 0, th);
-	                                    }
-	                                    //在调一次接口,读取商品的预出库的数量，lock
-	                                    getApp().request.get("/api/weshop/order/ware/lock/page", {
-	                                        data: {
-	                                            store_id: os.stoid,
-	                                            wareId: th.data.sele_g.goods_id,
-	                                            storageId: pick.pickup_id,
-	                                            pageSize: 1000
-	                                        },
-	                                        success: function (res_data) {
-	                                            if (res_data.data.code == 0 && res_data.data.data.total > 0) {
-	
-	                                                var lock = 0;
-	                                                for (var i in res_data.data.data.pageData) {
-	                                                    lock += res_data.data.data.pageData[i].outQty;
-	                                                }
-	
-	                                                if (CanOutQty <= lock) {
-	                                                    return s.my_warnning("库存不足！", 0, th);
-	                                                }
-	                                                th.add_cart_next(e, t, a, o, newd, CanOutQty - lock);
-	                                            } else {
-	                                                th.add_cart_next(e, t, a, o, newd, CanOutQty);
-	                                            }
-	                                        }
-	                                    })
-	                                } else {
-	                                    return s.my_warnning("库存不足！", 0, th);
-	                                }
-	
-	                            }
-	                        }
-	                    })
-	                } else {
-	                    if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-	                    if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
-	                    th.add_cart_next(e, t, a, o, newd);  //加入购物车下一步
-	                }
-	
-	                return false;
-	            }
-	
-	
-	            newd.goods_price = th.data.prom_price;
-	            newd.member_goods_price = th.data.prom_price,
-	                newd.prom_type = th.data.prom_type;
-	            newd.prom_id = th.data.prom_id;
-	
-	            if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-	            if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
-	
-	            th.add_cart_next(e, t, a, o, newd);  //加入购物车下一步
-	
-	        } else if (o.prom_type == 7) {
-	
-	            //判断进行中的活动，是不是要判断线下库存
-	            th.check_zh_acting(function (ee) {
-	                newd.prom_id = 0;
-	                newd.prom_type = 0;
-	                if (ee && th.data.sele_g.act) {
-	                    newd.prom_id = th.data.sele_g.act.id;
-	                    newd.prom_type = 7;
-	                    if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-	                    if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
-	                    th.add_cart_next(e, t, a, o, newd);  //加入购物车下一步
-	                    return false;
-	                } else {
-	                    //---如果是线下门店销售的时候---
-	                    if (th.data.sales_rules == 2) {
-	                        var pick = th.get_pick_from_list(th.data.sto_sele_id)
-	                        //---通过接口获取门店的线下库存信息--
-	                        getApp().request.get("/api/weshop/goods/getWareStorages", {
-	                            data: {
-	                                storageNos: pick.pickup_no,
-	                                wareIds: encodeURIComponent(th.data.sele_g.erpwareid),
-	                                storeId: os.stoid
-	                            },
-	                            success: function (res) {
-	                                if (res.data.code == 0) {
-	                                    if (res.data.data.pageData.length > 0) {
-	                                        var CanOutQty = res.data.data.pageData[0].CanOutQty;
-	                                        if (CanOutQty < e.data.goodsInputNum) {
-	                                            return s.my_warnning("库存不足！", 0, th);
-	                                        }
-	                                        //在调一次接口,读取商品的预出库的数量，lock
-	                                        getApp().request.get("/api/weshop/order/ware/lock/page", {
-	                                            data: {
-	                                                store_id: os.stoid,
-	                                                wareId: th.data.sele_g.goods_id,
-	                                                storageId: pick.pickup_id,
-	                                                pageSize: 1000
-	                                            },
-	                                            success: function (res_data) {
-	                                                if (res_data.data.code == 0 && res_data.data.data.total > 0) {
-	
-	                                                    var lock = 0;
-	                                                    for (var i in res_data.data.data.pageData) {
-	                                                        lock += res_data.data.data.pageData[i].outQty;
-	                                                    }
-	
-	                                                    if (CanOutQty <= lock) {
-	                                                        return s.my_warnning("库存不足！", 0, th);
-	                                                    }
-	                                                    th.add_cart_next(e, t, a, o, newd, CanOutQty - lock);
-	                                                } else {
-	                                                    th.add_cart_next(e, t, a, o, newd, CanOutQty);
-	                                                }
-	                                            }
-	                                        })
-	                                    } else {
-	                                        return s.my_warnning("库存不足！", 0, th);
-	                                    }
-	
-	                                }
-	                            }
-	                        })
-	                    } else {
-	                        if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-	                        if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
-	                        th.add_cart_next(e, t, a, o, newd);  //加入购物车下一步
-	                    }
-	                }
-	            })
-	
-	        }
-	        else if (th.data.prom_type == 0 || th.data.prom_type == 3 || th.data.prom_type == 4 || th.data.prom_type == 5 || th.data.prom_type == 10) {
-	            newd.prom_type = 0;
-	            newd.prom_id = 0;
-	
-	            if (th.data.prom_type == 10) {
-	                newd.prom_type = th.data.prom_type;
-	                newd.prom_id = th.data.prom_id;
-	            }
-	
-	            //---如果是线下门店销售的时候---
-	            if (th.data.sales_rules == 2) {
-	                var pick = th.get_pick_from_list(th.data.sto_sele_id)
-	                //---通过接口获取门店的线下库存信息--
-	                getApp().request.get("/api/weshop/goods/getWareStorages", {
-	                    data: {
-	                        storageNos: pick.pickup_no,
-	                        wareIds: encodeURIComponent(th.data.sele_g.erpwareid),
-	                        storeId: os.stoid
-	                    },
-	                    success: function (res) {
-	                        if (res.data.code == 0) {
-	                            if (res.data.data.pageData.length > 0) {
-	                                var CanOutQty = res.data.data.pageData[0].CanOutQty;
-	                                if (CanOutQty < e.data.goodsInputNum) {
-	                                    return s.my_warnning("库存不足！", 0, th);
-	                                }
-	                                //在调一次接口,读取商品的预出库的数量，lock
-	                                getApp().request.get("/api/weshop/order/ware/lock/page", {
-	                                    data: {
-	                                        store_id: os.stoid,
-	                                        wareId: th.data.sele_g.goods_id,
-	                                        storageId: pick.pickup_id,
-	                                        pageSize: 1000
-	                                    },
-	                                    success: function (res_data) {
-	                                        if (res_data.data.code == 0 && res_data.data.data.total > 0) {
-	
-	                                            var lock = 0;
-	                                            for (var i in res_data.data.data.pageData) {
-	                                                lock += res_data.data.data.pageData[i].outQty;
-	                                            }
-	
-	                                            if (CanOutQty <= lock) {
-	                                                return s.my_warnning("库存不足！", 0, th);
-	                                            }
-	                                            th.add_cart_next(e, t, a, o, newd, CanOutQty - lock);
-	                                        } else {
-	                                            th.add_cart_next(e, t, a, o, newd, CanOutQty);
-	                                        }
-	                                    }
-	                                })
-	                            } else {
-	                                return s.my_warnning("库存不足！", 0, th);
-	                            }
-	
-	                        }
-	                    }
+	    getApp().request.get(url, {
+	        data: req_d,
+	        success: function (e) {
+	            if (e.data.code == 0 && e.data.data && e.data.data.length > 0) {
+	                var arr = e.data.data;
+	                var arr2 = arr.filter(function (e) {
+	                    return e.s_time < ut.gettimestamp();
 	                })
-	            } else {
-	                if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-	                if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
-	                th.add_cart_next(e, t, a, o, newd);  //加入购物车下一步
-	            }
-	        }
-	    })
-	},
-	
-	//---加入购物车的最后一步---
-	add_cart_next(e, t, a, o, newd, CanOutQty) {
-	    var th = this, i = getApp().request;
-	    //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
-	    if ((o.prom_type != 1 || o.prom_id <= 0) && ((o.prom_type != 6 && o.prom_type != 4 && o.prom_type != 2 ) || th.data.is_normal)) {
-	        var conf = th.data.bconfig;
-	        if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) {
-	            var s_list = JSON.parse(conf.switch_list);
-	            var now = ut.gettimestamp();
-	
-	
-	            var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
-	            var end = new Date(str);
-	            end = Date.parse(end) / 1000;
-	
-	            //--如果后台有开启等级价的功能，而且会员的等级没有过期的情况下--
-	            if (parseInt(s_list.rank_switch) == 2 && end > now) {
-	                var card_price = o[getApp().globalData.userInfo['card_field']];
-	                //如果会员有等级价
-	                if (getApp().globalData.userInfo['card_field'] != undefined && getApp().globalData.userInfo['card_field'] != null
-	                    && getApp().globalData.userInfo['card_field'] != "" && card_price > 0) {
-	                    newd.goods_price = card_price;
-	                    newd.member_goods_price = card_price;
-	                }
-	            }
-	        }
-	    }
-	
-	    //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d);
-	    if ("add" == t.currentTarget.dataset.action) {
-	
-	        if (th.data.prom_goods) {
-	            newd.prom_type = 3;
-	            newd.prom_id = th.data.prom_goods[0].prom_id;
-	        }
-	
-	        //----先看会员在购物车中是否加入了该商品-----
-	        i.get("/api/weshop/cart/page", {
-	            data: {
-	                store_id: e.data.stoid,
-	                user_id: oo.user_id,
-	                goods_id: a,
-	                pick_id: e.data.sto_sele_id,
-	                state: 0
-	            },
-	            success: function (re) {
-	
-	                //-------如果购物车中有相关的数据---------
-	                if (re.data.data.total > 0) {
-	
-	                    var item = re.data.data.pageData[0];
-	
-	                    //判断数量，要看下购物车中有没有该商品
-	                    if (CanOutQty) {
-	                        if (item.goods_num + th.data.goodsInputNum > CanOutQty) {
-	                            return s.my_warnning("库存不足！", 0, th);
-	                        }
-	                    } else {
-	                        if (item.goods_num + th.data.goodsInputNum > o.store_count) {
-	                            return s.my_warnning("库存不足！", 0, th);
-	                        }
-	                    }
-	
-	                    var updata = {
-	                        id: item.id,
-	                        goods_num: e.data.goodsInputNum + item.goods_num,
-	                        goods_price: newd.goods_price,
-	                        member_goods_price: newd.goods_price,
-	                        store_id: th.data.stoid,
-	                    };
-	
-	                    //---是不是从收藏夹出来的---
-	                    if (th.data.c_guide_id) {
-	                        updata['guide_id'] = th.data.c_guide_id;
-	                        updata['guide_type'] = 3;   //加入购物车之后就变成了3
-	                    } else {
-	                        if (getApp().globalData.guide_id) {
-	                            updata['guide_id'] = getApp().globalData.guide_id;
-	                            updata['guide_type'] = 0;
-	                        }
-	                    }
-	
-	                    i.put("/api/weshop/cart/update", {
-	                        data: updata,
-	                        success: function (t) {
-	                            getApp().my_warnning('加入购物车成功', 1, th, 450);
-	                            var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
-	                            th.setData({
-	                                cartGoodsNum: c_num
-	                            });
-	                            th.closeSpecModal();
-	                        }
-	                    });
-	                } else {
-	
-	
-	                    i.post("/api/weshop/cart/save", {
-	                        data: newd,
-	                        success: function (t) {
-	                            getApp().my_warnning('加入购物车成功', 1, th, 450);
-	                            var c_num = th.data.cartGoodsNum + e.data.goodsInputNum;
-	                            th.setData({
-	                                cartGoodsNum: c_num
-	                            });
-	                            th.closeSpecModal();
-	                        }
-	                    });
+	                //-- 如果只有一个活动的话 --
+	                if (arr.length == 1) {
+	                    th.data.prom_type = arr[0].prom_type;
+	                    th.data.prom_id = arr[0].act_id;
 	                }
-	            }
-	        });
-	
-	    }
-	    else {
-	
-	        //这一步主要是要让立即购买 走 购物车的逻辑 参与活动
-	        if (newd.prom_type == 10 || newd.prom_type == 7) {
-	            //----先看会员在购物车中是否加入了该商品,立即购买的-----
-	            getApp().request.get("/api/weshop/cart/page", {
-	                data: {
-	                    store_id: e.data.stoid,
-	                    user_id: oo.user_id,
-	                    state: 1
-	                },
-	                success: function (res) {
-	                    //-------如果购物车中有相关的数据---------
-	                    if (res.data.code == 0 && res.data.data.total > 0) {
-	                        for (let j in res.data.data.pageData) {
-	                            let item_j = res.data.data.pageData[j];
-	                            var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
-	                            getApp().request.delete(url, {});
-	                        }
-	                    }
-	                    newd.state = 1;
-	                    getApp().request.post("/api/weshop/cart/save", {
-	                        data: newd,
-	                        success: function (t) {
-	                            th.closeSpecModal();
-	                            getApp().goto("/pages/cart/cart2/cart2?state=1");
-	                        }
-	                    });
-	                }
-	            })
-	            return false;
-	        }
-	
-	        if (th.data.prom_goods) {
-	            var prom_d = th.data.prom_goods;
-	            for (var i in prom_d) {
-	                //判断活动有俩种条件，0元 1件
-	                var condition_t = prom_d[i].prom_type;
-	                switch (condition_t) {
-	                    case 0: //按钱
-	                        if (newd.goods_price >= condition_t) {
-	                            newd.prom_type = 3;
-	                            newd.prom_id = prom_d[i].prom_id;
-	                        }
-	                        break
-	                    case 1://按购买数量
-	                        if (newd.goods_num >= condition_t) {
-	                            newd.prom_type = 3;
-	                            newd.prom_id = prom_d[i].prom_id;
-	                        }
-	                        break;
+	                //-- 如果只有一个进行中的活动的话 --
+	                else if (arr2.length == 1) {
+	                    th.data.prom_type = arr2[0].prom_type;
+	                    th.data.prom_id = arr2[0].act_id;
 	                }
 	            }
-	
+	            //-- 调用回调 --
+	            func();
 	        }
-	
-	        newd['pick_name'] = th.data.sto_sele_name;
-	        newd['pick_dis'] = th.data.sto_sele_distr;
-	        th.buyNow(newd);
-	    }
+	    });
 	},
-	
-	
-	
-	
-	
+    click_contact:function () {
+        getApp().globalData.no_clear=1;
+    }
-	
-		
-	
-
-	  
 });
@@ -101,8 +101,7 @@
 							<!-- 秒杀价 -->
 							<!-- <view class="co-red" wx:if="{{options.prom_type == 1}}"><text class="rel yuan fs28">￥</text>{{filters.toFix(prom_price,2)}}</view> -->
 							<!-- 手店价 -->
-							<view class="co-red" wx:if="{{options.prom_type == 1}}"><text class="rel yuan fs28">￥</text>{{filters.toFix(prom_price,2)}}</view>
-							<view class="co-red" wx:else><text class="rel yuan fs28">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
+							<view class="co-red"><text class="rel yuan fs28">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
 							<view class="goods-title">
 								<view class="goods-name elli">{{data.goods_name}}</view>
 							</view>
@@ -507,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"
+			<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>
@@ -522,11 +521,6 @@
 			<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">
-			  <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">
@@ -548,45 +542,44 @@
 		<view class="flex f1 btn-group">
 			<!-- 从“秒杀”入口进入购买商品 -->
-			<block wx:if="{{options.prom_type == 1}}">
-				<!-- 活动正在开始，商品还没抢光 -->
-				<block wx:if="{{prom_st==1 && !prom_r_null}}">
-					<view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view>
-					<view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即抢购</view>
-				</block>
+			<!-- <block wx:if="{{options.prom_type == 1}}"> -->
+				<block wx:if="{{options.prom_type == 1}}">
+				  <block wx:if="{{prom_st==1 && !prom_r_null}}">
+				    <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view>
+				    <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即抢购</view>
+				  </block>
-				<!-- 活动还没开始，商品还没抢光 -->
-				<block wx:if="{{prom_st == 0 && !prom_r_null}}">
-					<!-- 秒杀预热要单独购买  -->
-					<!-- is_shop_buy支持以原价购买 -->
-					<block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
-							<view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view>
-							<view class="buy-btn cart-btn lanse">即将开始</view>
-					</block>
-					<block wx:else>
-						 <view class="buy-btn cart-btn cart-btn-lg lanse set_width f1">即将开始</view>
-					</block>
-				</block>
+				  <block wx:if="{{prom_st == 0 && !prom_r_null}}">
+				    <!-- 秒杀预热要单独购买  -->
+				    <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
+				        <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view>
+				        <view class="buy-btn cart-btn lanse">即将开始</view>
+				    </block>
+				    <block wx:else>
+				       <view class="buy-btn cart-btn cart-btn-lg lanse set_width f1">即将开始</view>
+				    </block>
+				  </block>
-				<!-- 商品已被抢光 -->
-				<block wx:if="{{prom_r_null}}">	
-					<block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
-						<view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view>
-						<view class="buy-btn cart-btn huise f1">已抢光</view>
-					</block>
-					<view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width f1">已抢光</view>
-				</block>
-				<!-- 活动已经结束，商品还没抢光 -->
-				<block wx:if="{{prom_st==3 && !prom_r_null}}">
-					<block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
-						<view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view>
-						<view class="buy-btn cart-btn huise f1">活动已经结束</view>
-					</block>
-					<view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width f1">活动已经结束</view>
-				</block>
+				  <block wx:if="{{prom_r_null}}">
-			</block>
+				    <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
+				      <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view>
+				      <view class="buy-btn cart-btn huise f1">已抢光</view>
+				    </block>
+				    <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width f1">已抢光</view>
+				  </block>
+					
+				  <block wx:if="{{prom_st==3 && !prom_r_null}}">
+				    <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
+				      <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view>
+				      <view class="buy-btn cart-btn huise f1">活动已经结束</view>
+				    </block>
+				
+				    <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width f1">活动已经结束</view>
+				  </block>
+				</block>
+			<!-- </block> -->
 			<!-- 从“我的服务”入口进入购买商品 -->
@@ -594,9 +587,15 @@
 				<view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view>
 				<view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即购买</view>
 			</block>
-				
+			
+			
+			
 		</view>
+		
+		
+		
+
 	</view>
 	<!--  制作一个圆球导航  -->
@@ -616,8 +615,7 @@
 					<view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>
 					<view class="flex ai_end xc-val-money">
 						<view class="spec-goods-price"><text class="fs20">￥</text>
-							<block wx:if="{{options.prom_type == 1}}">{{prom_price}}</block>
-							<block wx:else>{{data.shop_price}}</block>
+							<block wx>{{data.shop_price}}</block>
 						</view>
 					</view>
 				</view>
@@ -904,36 +902,3 @@
 		</view>
 	</view>
 </view>
-
-<!-- 弹起来,购买预热商品的普通购买 -->
-<view hidden="{{!openSpecModal_flash_normal}}">
-  <include src="buy_flash_normal.wxml" />
-</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">
-		<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>
@@ -562,7 +562,7 @@ view.cart-btn-lg {
 .spec-model {
     position: fixed;
     bottom: 0;
-    z-index: 19;
+    z-index: 20;
     background: white;
     width: 100%;
     /* padding: 0 30rpx; */
@@ -2968,56 +2968,3 @@ button.custom-service::after{
 	left: -1000px;
 	top: -1000px;
 }
-
-
-
-/* 联系客服操作菜单 */
-.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;
-}
@@ -177,7 +177,8 @@ Page({
   /**e
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {
+   	  getApp().globalData.no_clear=1;
 	  var th = this;	 
 	  var item=this.data.share_good;
 	  var price = item.shop_price;		
@@ -732,10 +733,7 @@ Page({
 	                   })
 	                   return false;
 	                 }
-	                 wx.previewImage({
-	                   //将图片预览出来
-	                   urls: [that.data.shareImgPath]
-	                 });
+                     getApp().pre_img(that.data.shareImgPath);
 	                 wx.hideLoading();
 	               }
 	             })
@@ -113,7 +113,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -98,7 +98,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -187,8 +187,8 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-		
+   onShareAppMessage: function () {
+   	    getApp().globalData.no_clear=1;
 		var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
 		var pagePath = this.route; //当前页面url
@@ -348,7 +348,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1;
     if (res.from === 'button') {
       // 来自页面内转发按钮
       // console.log(res.target)
@@ -605,6 +605,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
    * 用户点击右上角分享
    */
   onShareAppMessage: function (res) {
+    getApp().globalData.clear=1;
     this.setData({
       showActionSheet: 'false'
     })
@@ -71,7 +71,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1;
 	  var th=this;
 	  var id=th.data.hui_active.id;
 	  var url='/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + id + '&live=ing';
@@ -147,7 +147,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -192,7 +192,7 @@ Page({
 	/**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -394,6 +394,7 @@ Page({
   previewImage: function(e) {
     var th = this;
     var current = e.currentTarget.dataset.src;
+    getApp().globalData.no_clear=1;
     wx.previewImage({
       current: current, // 当前显示图片的http链接  
       urls: [th.data.head_img] // 需要预览的图片http链接列表  
@@ -394,6 +394,7 @@ Page({
   previewImage: function(e) {
     var th = this;
     var current = e.currentTarget.dataset.src;
+    getApp().globalData.no_clear=1;
     wx.previewImage({
       current: current, // 当前显示图片的http链接  
       urls: [th.data.head_img] // 需要预览的图片http链接列表  
@@ -320,7 +320,7 @@ Page({
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage: function () {
+     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
     },
@@ -875,6 +875,7 @@ Page({
   //--点击分享事件---
   onShareAppMessage: function(t) {
+      getApp().globalData.no_clear=1
 	  return o.share;   
   },
@@ -711,6 +711,7 @@ Page({
   //--点击分享事件---
   onShareAppMessage: function(t) {
+      getApp().globalData.no_clear=1
 	  var curPage=this;
 	  var pagePath = curPage.route; //当前页面url
 	  if (pagePath.indexOf('/') != 0) {
@@ -73,7 +73,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1;
         var th=this;
         var id=th.data.hui_active.id;
         var url="/packageA/pages/quan_pro/quan_pro?id="+id;
@@ -141,7 +141,7 @@ Page({
   /**e
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1;
 	  var th = this;	 
 	  var item=this.data.share_good;
 	  var price = item.money;		
@@ -709,10 +709,7 @@ Page({
 	                   })
 	                   return false;
 	                 }
-	                 wx.previewImage({
-	                   //将图片预览出来
-	                   urls: [that.data.shareImgPath]
-	                 });
+                     getApp().pre_img(that.data.shareImgPath);
 	                 wx.hideLoading();
 	               }
 	             })
-// packageA//pages/text/text.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
 \ No newline at end of file
-{
-  "usingComponents": {}
-}
 \ No newline at end of file
-<!--packageA//pages/text/text.wxml-->
-<text>packageA//pages/text/text.wxml</text>
-/* packageA//pages/text/text.wxss */
 \ No newline at end of file
@@ -60,7 +60,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   }
 })
 \ No newline at end of file
@@ -124,7 +124,7 @@ Page({
 	 * 用户点击右上角分享
 	 */
 	onShareAppMessage: function() {
-
+        getApp().globalData.no_clear=1
 	},
@@ -166,7 +166,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -246,6 +246,6 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function() {
-
+      getApp().globalData.no_clear=1
   }
 })
@@ -220,6 +220,7 @@ Page({
     var imgs = this.data.imgs;
+    getApp().globalData.no_clear=1;
     wx.chooseImage({
        count: 1, // 默认9
       sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
@@ -259,6 +260,7 @@ Page({
     var index = e.currentTarget.dataset.index;
     //所有图片
     var imgs = this.data.imgs;
+    getApp().globalData.no_clear=1;
     wx.previewImage({
       //当前显示图片
       current: imgs[index],
@@ -60,7 +60,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   }
 })
 \ No newline at end of file
@@ -106,7 +106,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -26,6 +26,7 @@ Page({
   //--点击分享事件---
   onShareAppMessage: function(t) {
+      getApp().globalData.no_clear=1
 	  return o.share;
   },
   get_list: function() {
@@ -161,6 +161,7 @@ Page({
     } else {
       image = imgArr[index].weapp_img[sindex];
     }
+    getApp().globalData.no_clear=1;
     wx.previewImage({
       current: image,
       //当前图片地址
@@ -112,6 +112,7 @@ Page({
     var iurl = th.data.iurl;
     if (image != "") {
       image = imgArr[0].weapp_img[index];
+      getApp().globalData.no_clear=1;
       wx.previewImage({
         current: image,
         //当前图片地址
@@ -119,6 +120,7 @@ Page({
       })
     } else {
       image = imgArr[0].img[index];
+      getApp().globalData.no_clear=1;
       wx.previewImage({
         current: iurl + image,
         //当前图片地址
@@ -7,6 +7,7 @@ Page({
   },
   bindButtonTap: function() {
     var that = this
+     getApp().globalData.no_clear=1;
     wx.chooseVideo({
       sourceType: ['album', 'camera'],
       maxDuration: 60,
@@ -34,6 +35,7 @@ Page({
     //---------分享配置--------
     onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1
       return {
         title: "直播视频回放",
       }
@@ -446,7 +446,7 @@ Page({
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage: function () {
+     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1;
         var title = this.data.act.name;
         var url = "/packageB/pages/zuhegou/index/index?id=" + this.data.act.id;
         if (getApp().globalData.user_id) {
@@ -198,6 +198,7 @@ Page({
     //---------分享配置--------
     onShareAppMessage: function (e) {
+        getApp().globalData.no_clear=1
         var curPage=this;
         var pagePath = curPage.route; //当前页面url
         if (pagePath.indexOf('/') != 0) {
@@ -447,7 +447,7 @@ Page({
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage: function () {
+     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1;
         var title = this.data.act.name;
         var url = "/packageB/pages/zuhegou/index/index?id=" + this.data.act.id;
         if (getApp().globalData.user_id) {
@@ -404,6 +404,7 @@ Page({
   },
   //---------分享配置--------
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1
     var url = "pages/goods/categoryList/categoryList";
     var userInfo = getApp().globalData.userInfo;
@@ -639,9 +640,9 @@ Page({
   //扫一扫
   getScancode: function () {
     // 允许从相机和相册扫码
+      getApp().globalData.no_clear=1;
     wx.scanCode({
       success: (res) => {
-        console.log(res);
         var key_word = res.result;
         wx.navigateBack({
           delta: 1
@@ -240,6 +240,7 @@ Page({
   },
   //---------分享配置--------
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1
     var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -235,6 +235,7 @@ Page({
     //---------分享配置--------
     onShareAppMessage: function (e) {
+        getApp().globalData.no_clear=1
         var curPage = this;
         var pagePath = curPage.route; //当前页面url
         if (pagePath.indexOf('/') != 0) {
@@ -147,7 +147,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -191,6 +191,7 @@ Page({
 	 * 用户点击右上角分享
 	 */
 	onShareAppMessage: function (e) {
+        getApp().globalData.no_clear=1
 	    var pagePath = this.route; //当前页面url
 	    if (pagePath.indexOf('/') != 0) {
 	        pagePath = '/' + pagePath;
@@ -972,6 +972,7 @@ Page({
     //------ 分享配置 --------
     onShareAppMessage: function (e) {
+        getApp().globalData.no_clear=1
         var pagePath = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${this.data.param.goods_id}&prom_type=9&group_id=${this.data.param.group_id}`; //当前页面url
 				// console.log('pagePath=====xxxxxx>', pagePath);
 				var imgPath = this.data.iurl + this.data.luckyGoInfo.original_img;
@@ -19,7 +19,6 @@ var more = function (e) {
 var utils = require('../../../../utils/util.js');
 var regeneratorRuntime = require('../../../../utils/runtime.js');
 const { app } = require("../../../../utils/common.js");
-let self = null;
 Page({
   data: {
@@ -282,14 +281,11 @@ 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;
@@ -2252,53 +2248,7 @@ Page({
   //---------联系客服------------
   contactService: function () {
-    this.getTel()
-  	.then(() => {
-  		if(self.data.store_tel) {
-  			wx.showModal({
-  				title: '联系客服',
-  				content: '客服热线:' + self.data.store_tel,
-  				confirmText: '拨打',
-  				success(res) {
-  					if(res.confirm) {
-  						wx.makePhoneCall({
-  							phoneNumber: self.data.store_tel,
-  						})
-  					};
-  				},
-  			});
-  		};
-  	});
-  },
-  // 获取客服电话
-  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();
-  		});
-  	});
+      getApp().con_Service();
   },
   //-------获取购物车数量----------
   requestCardNum: function () {
@@ -6511,36 +6461,7 @@ 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,12 +884,7 @@
     <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 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>
     <view bindtap="collectGoods" class="custom-service cart-ico new_split">
       <image hidden="{{is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart.png"></image>
@@ -1652,32 +1647,4 @@
 	<!-- 制作一个圆球导航 -->
 	<nav_box></nav_box>
-	
-	
-<!-- 联系客服操作菜单 -->
-<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">
-		<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>
@@ -3115,56 +3115,4 @@ button.custom-service::after{
  .popup-content {
  	max-height: 600rpx;
  	overflow-y: auto;
- }
- 
- 
- /* 联系客服操作菜单 */
- .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;
  }
 \ No newline at end of file
@@ -92,7 +92,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -237,24 +237,7 @@ Page({
     },
     /*-----联系客户------*/
     contactService: function() {
-        e.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().showWarning("商家未设置电话");
-                  return false;
-                }
-                e.confirmBox("请联系客服：" + rs.data.data.store_tel);
-              }
-            })
-          } else {
-            e.confirmBox("请联系客服：" + t.store_tel);
-          }
-        });
+        getApp().con_Service();
     },
     //--------取消订单---------
@@ -1074,13 +1057,7 @@ 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);
     },
     //跳转到商品
@@ -1115,6 +1092,11 @@ Page({
         //     }
         // })
     },
+
+
+    click_contact:function () {
+        getApp().globalData.no_clear=1;
+    }
@@ -61,7 +61,7 @@
             <view bindtap="checkTeam" class="contact-us check-btn" wx:if="{{optionIsGoup}}">查看拼团详情</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>
+							<button wx:if="{{sys_switch.weapp_customertype==1}}" class="contact-us goods-btn" bindtap="click_contact"  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>
@@ -114,7 +114,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -2601,35 +2601,12 @@ 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, })
-            }
-        });
+        getApp().con_Service();
     },
     //---------联系微信客服------------
     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);
     }
@@ -16,7 +16,6 @@ var more = function (e) {
   n = new more.default();
 var utils = require('../../../../utils/util.js');
 var regeneratorRuntime = require('../../../../utils/runtime.js');
-let self = null;
 Page({
   data: {
@@ -249,13 +248,10 @@ 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,
@@ -1434,55 +1430,8 @@ Page({
   //---------联系客服------------
   contactService: function () {
-    this.getTel()
-  	.then(() => {
-  		if(self.data.store_tel) {
-  			wx.showModal({
-  				title: '联系客服',
-  				content: '客服热线:' + self.data.store_tel,
-  				confirmText: '拨打',
-  				success(res) {
-  					if(res.confirm) {
-  						wx.makePhoneCall({
-  							phoneNumber: self.data.store_tel,
-  						})
-  					};
-  				},
-  			});
-  		};
-  	});
-  },
-  // 获取客服电话
-  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();
-  		});
-  	});
+      getApp().con_Service();
   },
-	
   //-------获取购物车数量----------
   requestCardNum: function () {
     var t = this;
@@ -4050,35 +3999,6 @@ 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,13 +508,7 @@
   <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 class="custom-service cart-ico new_split pdh20" bindtap="openCS">
-	  <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
-	  <view>客服</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>
@@ -955,33 +949,3 @@
   </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">
-		<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>
-
@@ -1614,7 +1614,6 @@ left:31rpx;}
 .icon-share {
 	font-size: 46rpx;
 	color: #d60021;
-	line-height: 1;
 }
 .xc-share-frame{
     /* width: 129rpx;
@@ -2833,7 +2832,7 @@ button.custom-service::after{
 }
 .icon-close {
-  font-size: 42rpx;
+  font-size: 48rpx;
 } 
 .quan_price{
 	background-color: #ff4700; color: #fff; padding: 10rpx 25rpx; margin-left: 10rpx; border-radius: 30rpx;
@@ -2916,56 +2915,3 @@ button.custom-service::after{
 	margin-right: 10rpx;
 }
-
-
-/* 联系客服操作菜单 */
-.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;
-}
-
@@ -1431,24 +1431,7 @@ Page({
   //---------联系客服------------
   contactService: function () {
-    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;
-            }
-            s.confirmBox("请联系客服：" + rs.data.data.store_tel);
-          }
-        })
-      } else {
-        s.confirmBox("请联系客服：" + t.store_tel);
-      }
-    });
+      getApp().con_Service();
   },
   //-------获取购物车数量----------
   requestCardNum: function () {
@@ -1489,11 +1472,7 @@ Page({
       b[i] = this.data.iurl + e[i];
     }
     this.data.show_prew_img = 1;
-
-    wx.previewImage({
-      current: b[t.currentTarget.dataset.id],
-      urls: b
-    });
+     getApp().pre_img2(b,t)
   },
   previewCommentImgs_w: function (t) {
@@ -1503,21 +1482,16 @@ Page({
       b[i] = this.data.iurl + e[i];
     }
     this.data.show_prew_img = 1;
-    wx.previewImage({
-      current: b[t.currentTarget.dataset.id],
-      urls: b
-    });
+      getApp().pre_img2(b,t)
   },
   previewGoodsCommentImgs: function (t) {
     var e = this,
       a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
+    getApp().globalData.no_clear=1;
     a = a.map(function (t) {
       return e.data.url + t;
-    }), wx.previewImage({
-      current: a[t.currentTarget.dataset.id],
-      urls: a
-    });
+    }),  getApp().pre_img2(a,t);
     this.data.show_prew_img = 1;
   },
   closePromModal: function () {
@@ -1532,7 +1506,7 @@ Page({
   },
   //--点击分享事件---
-  onShareAppMessage: function (t) {
+  onShareAppMessage: function (t) {         getApp().globalData.no_clear=1;
     var th = this;
     var price = th.data.pre_arr.presell_price;   
@@ -3814,10 +3788,7 @@ Page({
   previewImage() {
     this.data.show_prew_img = 1;
-    wx.previewImage({
-      //将图片预览出来
-      urls: [this.data.shareImgPath]
-    });
+    getApp().pre_img(this.data.shareImgPath);
   },
@@ -4014,13 +3985,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);
+    },
+
+
+    click_contact:function () {
+        getApp().globalData.no_clear=1;
     }
 });
@@ -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" 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>
@@ -344,7 +344,7 @@ Page({
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage: function () {
+     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
     }
 })
 \ No newline at end of file
@@ -11,7 +11,7 @@
         </view>
     </view>
     <view class="mgb5">历史报告</view>
-    <scroll-view enable-flex scroll-y class="history_list" bindscrolltolower="bindscrolltolower">
+    <view class="history_list">
         <view class="history_list_month" wx:for="{{history}}">
             <view style="color:#333;font-size:26rpx;margin-top: 30rpx">{{item.history_time}}</view>
             <view class="souce" wx:for="{{item.time_arr}}" wx:for-item="subitem" bindtap="go_result" data-id="{{subitem.id}}" wx:for-index="subindex" wx:key="subindex">
@@ -19,7 +19,7 @@
                 <view style="color: #9b9b9b;" >去查看<text style="font-size: 24rpx;" class="iconfont icon-arrow_right"></text></view>
             </view>
         </view>
-    </scroll-view>
+    </view>
     <view class="no-more txt-center" wx:if="{{history.length > 0 && no_more}}">- 没有更多了 -</view>
     <nodata class="t-c" wx:if="{{history.length==0 && is_get}}"></nodata>
 </view>
 \ No newline at end of file
@@ -101,7 +101,7 @@ Page({
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage: function () {
+     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
     },
@@ -52,6 +52,7 @@ Page({
     //-- 重新从相册中选择图片 --
     show_pai_pop: function () {
         var th = this;
+        getApp().globalData.no_clear=1;
         //选择和拍照一张图片
         wx.chooseImage({
             count: 1,
@@ -70,6 +71,7 @@ Page({
     //选择图片
     takePhoto() {
         var that = this;
+        getApp().globalData.no_clear=1;
         wx.chooseImage({
             count: 1,
             sizeType: ['compressed'],
@@ -68,13 +68,14 @@ Page({
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage: function () {
+     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
     },
     //从相册中选择图片
     show_pai_pop: function () {
         let th = this;
+        getApp().globalData.no_clear=1;
         //选择和拍照一张图片
         wx.chooseImage({
             count: 1,
@@ -98,7 +99,7 @@ Page({
     //选择图片
     takePhoto() {
         var that = this;
-
+        getApp().globalData.no_clear=1;
         wx.chooseImage({
             count: 1,
             sizeType: ['compressed'],
 /*
  * @Author: abson
  * @Date: 2022-02-16 15:36:47
- * @LastEditTime: 2022-03-10 11:16:23
+ * @LastEditTime: 2022-02-28 16:01:07
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\success_result\success_result.js
@@ -63,7 +63,14 @@ Page({
     },
     onReady: function () {
-        
+        //用异步的获取比较准一点
+        wx.getSystemInfo({
+            success(res) {
+                console.log(111);
+                console.log(res.windowWidth);
+                console.log(res.windowHeight);
+            }
+        })
     },
     /**
@@ -76,7 +83,29 @@ Page({
         this.init();
         //var face_result=getApp().globalData.face_result;
         //var face_data=face_result.face_list[0];
-        this.data.id = options.id;
+        var id=options.id;
+        var first_leader = options.first_leader;
+
+        if (id == undefined || id == null || id == "") {
+            var gid_str = decodeURIComponent(options.scene);
+            gid_str = gid_str.split("_");
+            id=gid_str[0];
+            if (gid_str.length > 1) {
+                first_leader = gid_str[1];
+            }
+        }
+
+        this.data.id=id;
+        if (first_leader) {
+            console.log("log---".first_leader);
+            getApp().globalData.first_leader = first_leader;
+            //调用接口判断是不是会员
+            getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+                if (res.data.code == 0) {
+                    getApp().globalData.guide_id = res.data.data.id;
+                }
+            })
+        }
         //用异步的获取比较准一点
         wx.getSystemInfo({
@@ -127,6 +156,7 @@ Page({
                     var eye_data1 = face_data1.landmark150.eye_left_corner_right;
                     var eye_data2 = face_data1.landmark150.eye_left_corner_left;
                     var eye_data3 = face_data1.landmark150.eye_right_corner_right;
+
                     var hei1 = Math.abs(eye_data1.x - eye_data2.x);
                     var bili_eye = th.data.face_height * 0.56 / hei1;
                     var eye_top = eye_data1.y - hei1 / 2
@@ -582,7 +612,15 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage: function () {
+        getApp().globalData.no_clear=1;
+        var url="packageD/pages/AI-test-skin/success_result/success_result?id="+this.data.id+"&first_leader="+getApp().globalData.user_id;
+
+        var ob = {
+            title: "测肤报告",
+            path: url,
+        };
+        return ob;
     },
     //商品页面跳转
@@ -740,7 +778,7 @@ Page({
         }
         ///二微码
         var path3 = setting.url + "/api/wx/open/app/user/getWeAppEwm/" +
-            setting.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+            setting.stoid + "?sceneValue=" + scene + "&pageValue=packageD/pages/AI-test-skin/success_result/success_result";
         // 读取文件成功则OK--
         wx.getImageInfo({
@@ -195,6 +195,7 @@ Page({
   //---------分享配置--------
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1;
     var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -233,6 +233,7 @@ Page({
   //---------分享配置--------
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1;
     var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -2257,6 +2257,8 @@ Page({
                     var order_prom_txt1 = "formData.order_prom_id";
                     var order_prom_txt2 = "formData.order_prom_amount";
                     th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 })
+
+
                     total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
                     order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
                     var atxt = "formData.total_amount";
@@ -94,7 +94,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () { },
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1 },
   //---------------获取物流---------------
   get_wuliu(func) {
     var th = this,
@@ -233,7 +233,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -163,6 +163,7 @@ Page({
   //--- 分享设置 --
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1;
     var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -627,7 +627,7 @@ Page({
   //---------分享配置--------
   onShareAppMessage: function (e) {
-	  
+      getApp().globalData.no_clear=1;
 	var url="pages/goods/categoryList/categoryList";  
 	var userInfo=getApp().globalData.userInfo;
 	//是分销商才带
@@ -799,6 +799,7 @@ Page({
 //扫一扫
   getScancode:function(){
       var _this = this;
+      getApp().globalData.no_clear=1;
     // 允许从相机和相册扫码
     wx.scanCode({
       success: (res) => {
@@ -255,8 +255,6 @@ Page({
         share_hidden: false,
         all_activity_list: null,  //所有活动的列表
-				hiddenCS: true, //控制客服操作菜单
-				
     },
     //------初始化加载----------
@@ -2290,55 +2288,8 @@ Page({
     //---------联系客服------------
     contactService: function () {
-      this.getTel()
-			.then(() => {
-				if(self.data.store_tel) {
-					wx.showModal({
-						title: '联系客服',
-						content: '客服热线:' + self.data.store_tel,
-						confirmText: '拨打',
-						success(res) {
-							if(res.confirm) {
-								wx.makePhoneCall({
-									phoneNumber: self.data.store_tel,
-								})
-							};
-						},
-					});
-				};
-			});
+        getApp().con_Service();
     },
-		// 获取客服电话
-		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;
@@ -6659,36 +6610,7 @@ 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,
-			});
-		}
+    }
@@ -274,9 +274,8 @@
               </view>
             </view>
             <view class="goods-title">
-                <image wx:if="{{data.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
-                <view class="goods-name elli">{{data.goods_name}}</view>
-              </view>
+              <view class="goods-name elli">{{data.goods_name}}</view>
+            </view>
             <view class="goods-num">
               <view class="sales">销量：{{prom_act.buy_num+prom_act.virtual}}件</view>
               <view class="stock">
@@ -392,7 +391,6 @@
             <!-- 许程商品名字 -->
             <view wx:if="{{prom_type!=1 && prom_type!=2 }}">
               <view class="goods-title">
-                <image wx:if="{{data.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
                 <view class="goods-name elli">{{data.goods_name}}</view>
               </view>
             </view>
@@ -1012,8 +1010,18 @@
   <!-- -----------------底部按钮------------------ -->
   <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}}">
+      <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 class="custom-service cart-ico new_split" bindtap="openCS">
+    <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>
@@ -1710,32 +1718,3 @@
 <view hidden="{{!openSpecModal_flash_normal}}">
   <include src="buy_flash_normal.wxml" />
 </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">
-		<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>
@@ -126,9 +126,7 @@ image {
 .goods-title {
 	display: flex;
-    justify-content: space-between;
-    align-items: center;
-    vertical-align: middle;
+	justify-content: space-between;
 	/* overflow: hidden; */
 	/* height: 108rpx; */
 }
@@ -4004,54 +4002,3 @@ button.custom-service::after {
 	left: -1000px;
 	top: -1000px;
 }
-
-
-
-
-/* 联系客服操作菜单 */
-.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 .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;
-}
-
@@ -380,6 +380,7 @@ Page({
     },
 //---------分享配置--------
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1;
       var curPage=this;
       var pagePath = curPage.route; //当前页面url
       if (pagePath.indexOf('/') != 0) {
@@ -389,6 +389,7 @@ Page({
     //---------分享配置--------
     onShareAppMessage: function (e) {
+        getApp().globalData.no_clear=1;
         var curPage=this;
         var pagePath = curPage.route; //当前页面url
         if (pagePath.indexOf('/') != 0) {
@@ -84,7 +84,6 @@ Page({
     full_ad: null,  //全屏广告
     full_screen: 0, //全屏广告
     is_ok_h5:0,  //判断要不要显示关注二维码
-
   },
   onLoad: async function (tt) {
@@ -223,18 +222,20 @@ Page({
     //如果是自定义模板
     if (this.data.isTemplate) {
       //---先获取会员---
-      t.getUserFir(function () {
-        th.is_festival();
-        var new_nav = th.data.new_nav;
-        if (new_nav == "") {
-          th.is_new();
-        }
-				// sty
-        setTimeout(function () {
-          if (getApp().globalData.user_id) getApp().requestCardNum(th);
-        }, 500)
+      //t.getUserFir(function () {
+      if(getApp().globalData.user_id) {
+          th.is_festival();
+          var new_nav = th.data.new_nav;
+          if (new_nav == "") {
+              th.is_new();
+          }
+          // sty
+          setTimeout(function () {
+              if (getApp().globalData.user_id) getApp().requestCardNum(th);
+          }, 500)
+      }
-      });
+      //});
     } else {
       await this.init_fir();
       wx.setNavigationBarColor({
@@ -428,29 +429,18 @@ Page({
     var th = this;
     var show = getApp().globalData.isLoad_ad;
-    setTimeout(function () {
-      //user没有及时更新
-      var userInfo = getApp().globalData.userInfo;
-      if (!userInfo || !userInfo.user_id) userInfo = null;
-      //有加载过一次首页，就显示
-      if (show || userInfo || getApp().globalData.user_id) {
+    if(!show){
         setTimeout(function () {
-          full_screen.get_the_full_screen(th);
-        }, 800)
-        //动画效果
+            full_screen.get_the_full_screen(th);
+        }, 800);
+        getApp().globalData.isLoad_ad=1;
         if (!th.data.f_hidden) {
-          wx.showLoading({
-            title: '加载中..'
-          });
-          setTimeout(function () {
-            th.setData({ f_hidden: 1 })
-            wx.hideLoading();
-          }, 960)
+            setTimeout(function () {
+                th.setData({ f_hidden: 1 })
+                wx.hideLoading();
+            }, 960)
         }
-      } else {
-        getApp().globalData.isLoad_ad = 1;
-      }
-    }, 1500)
+    }
       setTimeout(function () {
           const query = wx.createSelectorQuery();
@@ -649,19 +639,20 @@ Page({
     });
     //---先获取会员---
-    t.getUserFir(function () {
-      th.is_festival();
-      var new_nav = th.data.new_nav;
-      if (new_nav == "") {
-        th.is_new();
-      }
-
-			// sty
-      setTimeout(function () {
-        if (getApp().globalData.user_id) getApp().requestCardNum(th);
-      }, 500)
+    //t.getUserFir(function () {
+    if(getApp().globalData.user_id) {
+        th.is_festival();
+        var new_nav = th.data.new_nav;
+        if (new_nav == "") {
+            th.is_new();
+        }
-    });
+        // sty
+        setTimeout(function () {
+            if (getApp().globalData.user_id) getApp().requestCardNum(th);
+        }, 500)
+    }
+    //});
     setTimeout(function () {
       var goods_list = th.selectComponent("#goods_list"); //组件的id
@@ -743,6 +734,7 @@ Page({
     });
   },
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1;
     var url = "/pages/index/index/index";
     var userInfo = getApp().globalData.userInfo;
     //是分销商才带
@@ -938,6 +930,7 @@ Page({
   //---扫一扫的函数---
   getScancode: function () {
     var _this = this;
+      getApp().globalData.no_clear=1;
     // 允许从相机和相册扫码
     wx.scanCode({
       success: (res) => {
@@ -959,6 +959,7 @@ Page({
   //------ 分享配置 --------
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1;
     var curPage=this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {