Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

WXD-SEASON\season
2 parents d43963de 49a3afe4
Showing 52 changed files with 9314 additions and 298 deletions
app.json
components/diy_groupbuy/diy_groupbuy.js
components/diy_groupbuy/diy_groupbuy.wxml
components/diy_pingd_buy/diy_pingd_buy.js
components/diy_pregoods/diy_pregoods.js
components/diy_public/diy_public.js
components/diy_seckill/diy_seckill.js
components/diy_top_nav/diy_top_nav.wxml
components/serviceCard_list/serviceCard_list.js
components/serviceCard_list/serviceCard_list.wxml
packageA/pages/activity_share/activity_share.js
packageA/pages/cardList/cardList.js
packageA/pages/cart2_ser/cart2_ser.js
packageA/pages/cart2_ser/cart2_ser.wxml
packageA/pages/details_serviceCard/details_serviceCard.js
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
packageC/pages/group_list/group_list.js
packageC/pages/group_list/group_list.wxml
@@ -239,7 +239,8 @@
               "pages/user/my_service/tment_eval",
               "pages/user_template/index",
               "pages/team/team_show/team_show",              
-              "pages/user/order_detail/order_detail"
+              "pages/user/order_detail/order_detail",
+              "pages/group_buy/goodsInfo/goodsInfo"
           ]
       }
     ],
@@ -84,7 +84,7 @@ Component({
 		       if(!user_id){ user_id=0;}
  
 		       //--调用接口,读取团购--
-		       app.request.promiseGet("/api/weshop/goods/groupBuy/getGoodsList?store_id="
+		       app.request.promiseGet("/api/weshop/goods/groupBuy/getGoodsList?isnew=1&store_id="
 		         + os.stoid + "&aidlist=" + goodsidlist+"&user_id="+user_id, {}).then(res => {
 		           console.log(res,100);
 		           //如果秒杀的数组为空的时候    
@@ -106,7 +106,7 @@ Component({
 		   if(!user_id){ user_id=0;}
 		   var req={ store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2,user_id:user_id};
  
-		   getApp().request.promiseGet("/api/weshop/goods/groupBuy/page?page=1&pageSize=9",
+		   getApp().request.promiseGet("/api/weshop/goods/groupBuy/page?isnew=1&page=1&pageSize=9",
 		     { isShowLoading: 1, data:req  }
 		   ).then(res => {
 		     if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
@@ -122,15 +122,11 @@ Component({
 		   var newTime = ut.gettimestamp(), all_array = [], th = this;
 		   th.setData({ newTime: newTime });
 		   if (g_id) {
-		     /*--商品队列按照添加的顺序排列--*/
-		     g_id.forEach(function (val, ind) {
+		     
 		       goodslist.forEach(function (vy, indy) {
-		         if (val.goodsid == vy.goods_id) {
-		           if(!vy.id) vy.id=vy.prom_id;
 		           all_array.push(vy);
-		         }
 		       })
-		     })
+		     
 		   } else {
 		     all_array = goodslist;
 		   }
@@ -221,11 +217,25 @@ Component({
  
 		 //跳转到团购列表
 		 go_to_group: function () {
-		
 		    var  url="/packageC/pages/group_list/group_list";
 			getApp().goto(url);
  
+		 },
+
+
+		 //跳转到商品详情，要区别商品和服务卡项
+		 go_group_buy(e){
+			 let index=e.currentTarget.dataset.index;
+			 let idx=e.currentTarget.dataset.idx;
+			 let aitem=this.data.goods_array[index][idx];
+			 var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+aitem.goods_id+"&prom_type=2&prom_id="+aitem.prom_id;
+			 //如果是服务卡项的时候
+			 if(aitem.goods_type==1){
+				 url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+aitem.goods_id+"&prom_id="+aitem.prom_id;
+			 }
+			 getApp().goto(url);
 		 }
+
  
  
  
@@ -17,7 +17,9 @@
 			<swiper-item class="s_it" wx:for="{{goods_array}}">
 				<block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
 					<navigator
-						url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=2&prom_id={{aitem.prom_id}}"
+					    bindtap="go_group_buy"
+                        data-index="{{index}}"
+                        data-idx="{{aind}}"
 						class="s1_gk_a1">
 						<view class='one'>
 							<view class='sp_top'>
@@ -64,7 +66,9 @@
 		<block wx:for="{{goods_array}}">
 			<block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
 				<navigator
-					url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=2&prom_id={{aitem.prom_id}}"
+					bindtap="go_group_buy"
+					data-index="{{index}}"
+					data-idx="{{aind}}"
 					class="s1_gk_a1">
 					<view class="flex jc_sb" style="padding: 0 20rpx; margin-top: 10rpx;">
 						<view>
@@ -135,14 +135,12 @@ Component({
 		var th=this,all_array=[];
 		if(g_id){
 			/*--商品队列按照添加的顺序排列--*/
-			g_id.forEach(function(val, ind) {
+		
 			  goodslist.forEach(function (vy,indy) {
-				if(val.goodsid==vy.goods_id){
-				  all_array.push(vy);
-				  //th.setData({goods_array:arr});
-				}
+				   all_array.push(vy);
+				   //th.setData({goods_array:arr});
 			  })
-			})
+			
 		}else{
 			all_array=goodslist;
 		}
@@ -112,12 +112,11 @@ Component({
 		var newTime = ut.gettimestamp(),all_array = [],th=this;
 		th.setData({newTime:newTime});		
 		if(g_id){
-			/*--商品队列按照添加的顺序排列--*/
-			g_id.forEach(function(val, ind) {
-			  goodslist.forEach(function (vy,indy) {
-				if(val.goodsid==vy.goods_id){  all_array.push(vy); }
+		    /*--商品队列按照添加的顺序排列--*/
+			  goodslist.forEach(function (vy,indy) {			
+           all_array.push(vy); 
 			  })
-			})
+			
 		}else{
 			all_array=goodslist;
 		}
@@ -99,7 +99,7 @@ Component({
     if (this.data.prom_type==2) {  //团购
       this.setData({
         prom_text:'已团',
-        nav1:'/pages/goods/goodsInfo/goodsInfo?',
+        nav1:'/packageG/pages/group_buy/goodsInfo/goodsInfo?',
         nav2:'/pages/goods/goodsInfo/goodsInfo?'
       }) 
     }
@@ -168,7 +168,7 @@ Component({
           }
  
           if (th.data.prom_type==2) { //团购
-            gUrl="/api/weshop/goods/groupBuy/getGoodsList?store_id="
+            gUrl="/api/weshop/goods/groupBuy/getGoodsList?isnew=1&store_id="
             +os.stoid+"&aidlist="+goodsidlist + "&user_id="+user_id;
           }
  
@@ -278,14 +278,13 @@ Component({
       var newTime = ut.gettimestamp(), all_array = [], th = this;
       th.setData({ newTime: newTime });
       if (g_id) {
-        /*--商品队列按照添加的顺序排列--*/
-        g_id.forEach(function (val, ind) {
+        
           goodslist.forEach(function (vy, indy) {
-            if (val.goodsid == vy.goods_id) {
-              all_array.push(vy);
-            }
+        
+            all_array.push(vy);
+            
           })
-        })
+      
       } else {
          all_array = goodslist;
       }
@@ -157,14 +157,11 @@ Component({
       var newTime = ut.gettimestamp(), all_array = [], th = this;
       th.setData({ newTime: newTime });
       if (g_id) {
-        /*--商品队列按照添加的顺序排列--*/
-        g_id.forEach(function (val, ind) {
-          goodslist.forEach(function (vy, indy) {
-            if (val.goodsid == vy.goods_id) {
+          /*--商品队列按照添加的顺序排列--*/
+          goodslist.forEach(function (vy, indy) {      
               all_array.push(vy);
-            }
           })
-        })
+        
       } else {
          all_array = goodslist;
       }
@@ -27,7 +27,7 @@
 <!-- 广告轮播时 -->
 <view wx:if="{{nav_type==1}}" style="padding-bottom:{{nav_pb}}px;color: {{nav_frontColor}};">
   <view  style="height: {{nav_h}}px;width: 100%;"></view>
-  <view style="width: 100%;height:{{mentButt_h}}px;line-height:{{mentButt_h}}px;text-align: left;padding-left: 20rpx;">{{nav_title}}</view>
+  <view style="width: 100%;height:{{mentButt_h}}px;line-height:{{mentButt_h}}px;text-align: center;">{{nav_title}}</view>
 </view>
  
 <!-- 详情页面 -->
@@ -153,10 +153,46 @@ Component({
       })
     },
  
-      go_url:function (e) {
-          var url=e.currentTarget.dataset.url;
-					console.log('url===>>>>', url);
-          getApp().goto(url);
+      go_url:async function (e) {
+        var gid = e.currentTarget.dataset.gid;
+        var rurl = '/api/weshop/activitylist/listGoodActInfo2New';
+        var req_d = {
+          "store_id": os.stoid,
+          "goods_id": gid,
+          "user_id": getApp().globalData.user_id,
+          "goods_type":1
+        }
+        var res= await getApp().request.promiseGet(rurl, {data: req_d});
+
+        var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid;
+        if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+          var arr = res.data.data;
+          let times = new Date().getTime();
+          //-- 预热也要计算 --
+          var arr2 = arr.filter(function (e) {
+            return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
+          })
+          if(arr2.length==1) {
+            switch(arr2[0].prom_type){
+              case 1:
+                url+="&prom_type=1&prom_id="+arr2[0].act_id;
+                break;
+              case 2:
+                url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+arr2[0].act_id;
+                break;
+              case 6:
+                url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr2[0].act_id}`;
+                break;
+              case 8:
+                url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr2[0].act_id}`;
+                break;
+            }
+          }
+
+        }
+
+
+        getApp().goto(url);
       }
  
   },
@@ -5,7 +5,7 @@
   <view class="hang ">
     <!-- 商品详情 -->
  
-    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.id}}">
+    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-gid="{{item.id}}">
     <!--<view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}">-->
       <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}" hover-class="none"> -->
 			<navigator  hover-class="none">
@@ -171,6 +171,12 @@ Page({
 			let goods_id = item.goods_id;
 			let price = item.presell_money;
 			let url = `packageC/pages/presell/goodsInfo/goodsInfo?goods_id=${goods_id}&pre_id=${pre_id}`;
+
+			//如果是服务卡项的时候
+			if(item.goods_type==1){
+				url = `packageC/pages/presell/cardInfo/goodsInfo?goods_id=${goods_id}&pre_id=${pre_id}`;
+			}
+
 			let title = item.goods_name;
 			let img = this.data.url + item.original_img;
 			let ind = 9;
@@ -240,26 +246,41 @@ Page({
 		  if(item){
 			  var price = item.price;
 			  if(!price) price=item.shop_price;
+			  item.prom_id=item.id;
+			  var url='';
+
 			  switch(th.data.currentIndex){
-				  case 0: item.prom_type=1;break;
-				  case 1: item.prom_type=6;break;
-          case 2:
-            if(th.data.currentIndex2==1) item.prom_type = 5;
-            if(th.data.currentIndex2==2) {
-              item.prom_type = 3;
-              item.id=item.prom_id;
-					  };
-            break;
-					case 5:
-						item.prom_type = 2;
-						break;
-			  }
+				  case 0:
+					   item.prom_type=1;
+					  //服务卡项的时候
+					   if(item.goods_type>0)
+						   url="/packageA/pages/goodsInfo/goodsInfo?goods_id=" + item.goods_id+"&prom_type=1&prom_id="+item.prom_id;
+					   break;
+				  case 1:
+					   item.prom_type=6;
+					  //服务卡项的时候
+					   if(item.goods_type>0)
+						  url="/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=" + item.goods_id+"&prom_type="+item.prom_type+"&prom_id="+item.prom_id;
+					   break;
+				  case 2:
+					if(th.data.currentIndex2==1) item.prom_type = 5;
+					if(th.data.currentIndex2==2) {
+					  item.prom_type = 3;
+					  item.id=item.prom_id;
+					}
+					break;
+				 case 5:
+					item.prom_type = 2;
+					//服务卡项的时候
+					if(item.goods_type>0)
+						 url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id=" + item.goods_id+"&prom_id="+item.prom_id;
+					break;
+			   }
  
-				item.prom_id=item.id;
  
 			  var title= item.goods_name;
 			  var img=this.data.url+item.original_img;		  
-			  var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id+"&prom_type="+item.prom_type+"&prom_id="+item.prom_id;
+			  if(!url) url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id+"&prom_type="+item.prom_type+"&prom_id="+item.prom_id;
 			  if(getApp().globalData.user_id){
 			     url+="&first_leader="+getApp().globalData.user_id;
 			  }	  
@@ -689,15 +710,53 @@ Page({
 	  that.setData({
 	    canvasHidden: false,share_hidden:1
 	  })
-	
-	  var app = getApp();
-	  var unit = that.data.screenWidth / 750 * 1.35;  //基础单位，
+
+	    var app = getApp();
+	    var unit = that.data.screenWidth / 750 * 1.35;  //基础单位，
  
         var prom_type=0;
         var prom_id=th.data.share_good.id;
+
+		var scene='';
+		var goods_path='pages/goods/goodsInfo/goodsInfo';
+		var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
+
         switch(th.data.currentIndex){
-            case 0: prom_type=1;break;
-            case 1: prom_type=6;break;
+            case 0:
+				prom_type=1;
+				//服务卡项的时候
+				if(th.data.share_good.goods_type>0){
+
+					scene = th.data.share_good.goods_id;
+					if (user_id > 0) {
+						scene += "_" + user_id;
+					}else{
+						scene += "_0";
+					}
+					scene += "_0";
+				    scene += "_" + 1+"_"+prom_id;
+
+					goods_path='packageA/pages/goodsInfo/goodsInfo';
+
+				}
+				break;
+            case 1:
+				prom_type=6;
+				//服务卡项的时候
+				if(th.data.share_good.goods_type>0){
+
+					scene =th.data.share_good.goods_id+'';
+					if (user_id > 0) {
+						scene += "_" + user_id;
+					}else{
+						scene += "_0";
+					}
+					scene += "_0";
+					scene += "_6";
+					scene += "_"+prom_id;
+					goods_path='packageA/pages/serviceCard_pd/goodsInfo/goodsInfo';
+				}
+				break;
             case 2:
                 if(th.data.currentIndex2==1) prom_type = 5;
                 if(th.data.currentIndex2==2){
@@ -705,23 +764,43 @@ Page({
                     prom_id=th.data.share_good.prom_id;
 				}
                 break;
-        }
+			case 5:
+				prom_type = 2;
+				//服务卡项的时候
+				if(th.data.share_good.goods_type>0){
  
+					scene =th.data.share_good.goods_id+'';
+					if (user_id > 0) {
+						scene += "_" + user_id;
+					}else{
+						scene += "_0";
+					}
+					scene += "_0";
+					scene += "_" +prom_id;
+
+					goods_path='packageG/pages/group_buy/goodsInfo/goodsInfo';
  
+				}
+				break
+        }
  
-	  var scene = th.data.share_good.goods_id+"";
-      scene+="."+prom_type+"."+prom_id;
  
-	  var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
-	  if(user_id>0){
-	    scene+="_"+user_id;
+	  if(!scene){
+		  scene = th.data.share_good.goods_id+""+"."+prom_type+"."+prom_id;
+		  if(user_id>0){
+			  scene+="_"+user_id;
+		  }
 	  }
-	  
+
+	  var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+			os.stoid + "?sceneValue=" + scene + "&pageValue="+goods_path;
+
+	  console.log(path3);
+
 	  var ind=3;
       if(that.data.currentIndex==1){
 		  ind=4; 
 	  }
-
       //-- 价格 --
 	  var pri0 = th.data.share_good.shop_price;
       if (th.data.share_good.price)
@@ -732,10 +811,6 @@ Page({
 		  th.insert_act_share(th.data.share_good.title,th.data.share_good.id,ind,th.data.share_good.goods_sn,pri0); //插入分享
 	  }
  
-	  ///二微码
-	  var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
-	      os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
-	 
 	  //读取文件成功则OK--
 	  wx.getImageInfo({
 	    src: path3,
@@ -1306,23 +1381,49 @@ Page({
     go_goods: function (e) {
         var index = e.currentTarget.dataset.index;
         var item = this.data.list[index];
-        var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
+        var url='';
  
-        switch(this.data.currentIndex){
-			case 0:  item.prom_type = 1;break;
-			case 1:  item.prom_type = 6;break;
+		switch (this.data.currentIndex) {
+			case 0:
+				item.prom_type = 1;
+				break;
+			case 1:
+				item.prom_type = 6;
+				break;
 			case 2:
-				if(th.data.currentIndex2==1) item.prom_type = 5;
-				if(th.data.currentIndex2==2) item.prom_type = 3;
+				if (th.data.currentIndex2 == 1) item.prom_type = 5;
+				if (th.data.currentIndex2 == 2) item.prom_type = 3;
 				break;
 			case 5:
-				item.prom_type = 2;break;
+				item.prom_type = 2;
+				break;
 		}
  
-        item.prom_id = item.id;
-        url+="&prom_type="+item.prom_type+"&prom_id="+item.prom_id
+		item.prom_id = item.id;
  
-        getApp().goto(url);
+		//-- 秒杀，拼单，团购，预售 --
+		if(item.goods_type>0){
+			switch (item.prom_type){
+				case 1: //秒杀
+					url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
+					break;
+				case 2: //团购
+					url = '/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id=' + item.goods_id;
+					break;
+				case 6: //拼单
+					url="/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=" + item.goods_id
+					break;
+				case 8: //预售
+					url = `pageValue=packageC/pages/presell/cardInfo/goodsInfo?goods_id=${item.goods_id}&pre_id=${item.id}`;
+					break;
+			}
+
+
+		}else {
+			url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
+		}
+		url += "&prom_type=" + item.prom_type + "&prom_id=" + item.prom_id
+		getApp().goto(url);
     },
  
 	 go_coll_good:function(e){
@@ -239,13 +239,16 @@ Page({
 			if(arr2.length==1) {
                 switch(arr2[0].prom_type){
 					case 1:
-						url+="&prom_type=1&prom_id="+arr[0].act_id;
+						url+="&prom_type=1&prom_id="+arr2[0].act_id;
+						break;
+					case 2:
+						url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+arr2[0].act_id;
 						break;
 					case 6:
-						url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr[0].act_id}`;
+						url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr2[0].act_id}`;
 						break;
 					case 8:
-						url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr[0].act_id}`;
+						url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr2[0].act_id}`;
 						break;
 				}
 			}
@@ -267,7 +267,7 @@ Page({
 				t.data.data['buynum'] = gg.goods_num;
 				t.data.data.shop_price = gd.money;
  
-				if(th.data.postdata.prom_type == 1) {
+				if([1,2].includes(th.data.postdata.prom_type)) {
 					let postdata = th.data.postdata;
 					t.data.data.shop_price = postdata.prom_price;
 				};
@@ -535,7 +535,7 @@ Page({
 						return false;
 					}
  
-					if (gg.prom_type == 1 && gg.is_pd_normal == 0) {
+					if ((gg.prom_type == 1 && gg.is_pd_normal == 0) || gg.prom_type == 2) {
 						// 秒杀活动购买
 						var goods = {
 							'card_id': gg.service_id,
@@ -565,7 +565,6 @@ Page({
                     if(getApp().globalData.skinface_id){
                         goods.skinface_id=getApp().globalData.skinface_id;
                     }
-					
  
 					//--导购分享过来的id--
 					if (gg.guide_id) {
@@ -579,10 +578,11 @@ Page({
 									goods.guide_sn = res.data.data.salesman_no;
 								}
 							})
-          }
-          if (gg.groupchat_id) {
-            goods.groupchat_id=gg.groupchat_id
-          }
+                    }
+
+					if (gg.groupchat_id) {
+						goods.groupchat_id=gg.groupchat_id
+					}
 					item.list.push(goods);
 				}
 			}
@@ -604,7 +604,7 @@ Page({
 				'prom_id': this.data.postdata.prom_id,     //促销活动id
 			};
  
-			if(this.data.postdata.prom_type == 1) {
+			if([1,2].includes(this.data.postdata.prom_type)) {
 				goods.price = this.data.postdata.prom_price;
 			};
  
@@ -619,23 +619,23 @@ Page({
  
 			//--导购分享过来的id--
 			if (gg.guide_id) {
-				goods.guide_id = gg.guide_id;
-				goods.guide_type = gg.guide_type;
-				//调用接口判断是不是会员
-				await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + gg.guide_id, {}).then(
-					res => {
-						if (res.data.code == 0) {
-							goods.guide_name = res.data.data.salesman;
-							goods.guide_sn = res.data.data.salesman_no;
-						}
-					})
-      }
-      
-      if(gg.groupchat_id){
-        goods.groupchat_id=gg.groupchat_id
-      }
-			console.log('goooooooooooooooooods', goods);
-			item.list.push(goods);
+						goods.guide_id = gg.guide_id;
+						goods.guide_type = gg.guide_type;
+						//调用接口判断是不是会员
+						await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + gg.guide_id, {}).then(
+							res => {
+								if (res.data.code == 0) {
+									goods.guide_name = res.data.data.salesman;
+									goods.guide_sn = res.data.data.salesman_no;
+								}
+							})
+			  }
+
+			  if(gg.groupchat_id){
+				goods.groupchat_id=gg.groupchat_id
+			  }
+			 console.log('goooooooooooooooooods', goods);
+			 item.list.push(goods);
 		}
  
  
@@ -835,4 +835,37 @@ Page({
 	},
  
  
+	//立即购买的点击跳转
+	go_view(){
+		if(!this.data.postdata.prom_type)  this.data.postdata.prom_type=0;
+		let url='packageA/pages/goodsInfo/goodsInfo?goods_id='+this.data.postdata.id;
+		switch(this.data.postdata.prom_type){
+			case 1:
+				url+= '&prom_id='+this.data.postdata.prom_id+'&prom_type=1';
+				break;
+			case 2:
+				url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+this.data.postdata.id+"&prom_id="+this.data.postdata.prom_id;
+				break
+		}
+		getApp().goto(url);
+	},
+
+	//购物车购买的点击跳转
+	go_cart_view(e){
+		let idx = e.currentTarget.dataset.idx;
+		let pidx=e.currentTarget.dataset.pidx;
+		let item=this.data.cartlist[pidx].goods[idx];
+		let url='packageA/pages/goodsInfo/goodsInfo?goods_id='+this.data.postdata.id;
+		switch(item.prom_type){
+			case 1:
+				url+= '&prom_id='+item.prom_id+'&prom_type=1';
+				break;
+			case 2:
+				url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+item.service_id+"&prom_id="+item.prom_id;
+				break
+		}
+		getApp().goto(url);
+
+	}
+
 });
@@ -10,14 +10,14 @@
                     <!-- <view>门店：{{item.pname}}</view> -->
                     <view>{{item.pname}}</view>
                 </view>
-                <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items">
+                <view class="order-detail"  bindtap="go_cart_view"  data-idx="{{idx}}" data-pidx="{{pidx}}" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items">
                     <!----商品图片----->
                     <view class="goods-img" style="position: relative">
                         <image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
                         <image class="wh100 bdr14" src="{{items.img_url}}" binderror='cart_set_err' data-err='cartlist[{{pidx}}].goods[{{idx}}].img_url'></image>
                     </view>
                     <!----商品名称规格---->
-                    <navigator class="order-cont" url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{items.service_id}}">
+                    <navigator class="order-cont">
                         <view class="goods-name ellipsis-2">{{items.service_name}}</view>
                         <!-----商品名称规格------>
                         <view class="order-num flex-space-between">
@@ -33,12 +33,12 @@
         <block wx:else>
                 <view class="use-item bfff bdr_t-14 mgt20">
                       <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> <view>{{bn_pickname}}</view></view>
-                <view class="order-detail">
+                <view class="order-detail" bindtap="go_view">
                       <view class="goods-img">
                           <image class="wh100 bdr14" src="{{bn_goods.original_img}}" 
                             binderror='cart_set_err' data-err="bn_goods.original_img"></image>
                       </view>
-                      <navigator class="order-cont" url="/packageA/goodsInfo/goodsInfo?goods_id={{bn_goods.id}}">
+                      <navigator class="order-cont">
                           <view class="goods-name ellipsis-2">{{bn_goods.serviceName}}</view>
                              <!-- 商品属性 -->
                              <!-- <view class="flex-vertical fs28 color-gray n_guige"> -->
@@ -261,13 +261,16 @@ Page({
 			if(arr2.length==1) {
 				switch(arr2[0].prom_type){
 					case 1:
-						url+="&prom_type=1&prom_id="+arr[0].act_id;
+						url+="&prom_type=1&prom_id="+arr2[0].act_id;
+						break;
+					case 2:
+						url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+goods_id+"&prom_id="+arr2[0].act_id;
 						break;
 					case 6:
-						url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${goods_id}&prom_type=${arr2[0].prom_type}&prom_id=${arr[0].act_id}`;
+						url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${goods_id}&prom_type=${arr2[0].prom_type}&prom_id=${arr2[0].act_id}`;
 						break;
 					case 8:
-						url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${goods_id}&prom_id=${arr[0].act_id}`;
+						url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${goods_id}&prom_id=${arr2[0].act_id}`;
 						break;
 				}
 			}
@@ -440,7 +443,7 @@ Page({
 					var boughtNum = 0;
  
 					// 秒杀活动中购买
-					if (prom_type == 1 && !is_pd_normal) {
+					if ((prom_type == 1 && !is_pd_normal) || prom_type==2) {
  
 							// 获取已购数量
 							await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum?store_id="+os.stoid+"&user_id="+getApp().globalData.user_id+"&card_id="+card_id+"&prom_type="+prom_type+"&prom_id="+prom_id, {
@@ -449,20 +452,35 @@ Page({
 							});
  
 							// 获取库存
-							await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/1/" + prom_id, {}).then(res => {
+							await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/"+prom_type+"/" + prom_id, {}).then(res => {
 								if (res.data.code == 0) {
 									redisNums = !res.data.data ? 0 : res.data.data;
-								};
-							});
+								}
+							})
  
 							// 获取限购数
 							var is_end = 1;
-							await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id, {}).then(res => {
-								if (res.data.code == 0) {
-									is_end = res.data.data.is_end;
-									limitNum = res.data.data.buy_limit;
-								}
-							});
+
+							switch (prom_type){
+								case 1:
+									await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id, {}).then(res => {
+										if (res.data.code == 0) {
+											is_end = res.data.data.is_end;
+											limitNum = res.data.data.buy_limit;
+										}
+									});
+									break;
+								case 2:
+									await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + details.list[i].card_id + "/" + prom_id, {}).then(res => {
+										if (res.data.code == 0) {
+											is_end = res.data.data.is_end;
+											limitNum = res.data.data.buy_limit;
+										}
+									});
+									break;
+							}
+
+
 							// 判断活动是否结束
 							if (is_end == 1) {
 								wx.showModal({
@@ -658,14 +676,15 @@ Page({
  
 		//秒杀活动和拼团活动要重新计算一下
 		for (const it of list) {
-			if (it.prom_type == 1) {
+			if ([1,2].includes(it.prom_type)) {
 				let act_details = null;
 				let redis_num = 0;
 				let promcardbuynum = 0;
 				let qty = it.qty;
  
  
-				await getApp().request.promiseGet('/api/ms/flash_sale/getNew/' + store_id + '/' + user_id + '/' + it.prom_id, {}).then(res => {
+				if(it.prom_type==1)
+				   await getApp().request.promiseGet('/api/ms/flash_sale/getNew/' + store_id + '/' + user_id + '/' + it.prom_id, {}).then(res => {
 					console.log('11111111====>>>');
 					if (res.data.code == 0) {
 						console.log('当前的秒杀活动信息：', res.data.data);
@@ -679,16 +698,6 @@ Page({
 							flag = false;
 							return false;
 						};
-						if (act_details.id != it.prom_id) {
-							wx.showModal({
-								title: '提示',
-								content: '活动发生了变化,无法支付,请取消订单,重新购买！',
-								showCancel: false,
-							});
-							flag = false;
-							return false;
-						};
-
  
 						var t_now = ut.gettimestamp();
 						if (act_details.is_end == 1 || act_details.start_time > t_now || act_details.end_time < t_now) {
@@ -716,6 +725,46 @@ Page({
  
 					};
 				});
+				if(it.prom_type==2)
+					await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + it.card_id + "/" + it.prom_id, {}).then(res => {
+						if (res.data.code == 0) {
+							console.log('当前的t团购活动信息：', res.data.data);
+							act_details = res.data.data;
+							if (act_details.is_end == 1) {
+								wx.showModal({
+									title: '提示',
+									content: '活动已结束,无法支付,请取消订单！',
+									showCancel: false,
+								});
+								flag = false;
+								return false;
+							};
+							var t_now = ut.gettimestamp();
+							if (act_details.is_end == 1 || act_details.start_time > t_now || act_details.end_time < t_now) {
+								wx.showModal({
+									title: '提示',
+									content: '活动发生了变化,无法支付,请取消订单,重新购买！',
+									showCancel: false,
+								});
+								flag = false;
+								return false;
+							}
+
+							//指定门店的控制
+							if (act_details.pick_up_lists) {
+								var idx0=act_details.pick_up_lists.findIndex(function (e){
+									return e.pickup_id==it.pickup_id;
+								})
+								if(idx0<0){
+									getApp().confirmBox(it.service_name + "秒杀活动的门店不可售");
+									th.setData({ paying: 0 });
+									flag = false;
+									return false;
+								}
+							}
+
+						};
+					});
  
 				if(act_details && act_details.buy_limit>0 && flag){
 					await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
@@ -273,6 +273,8 @@ Page({
             prom_id=gid_str[4];
             that.data.options.prom_type= parseInt(gid_str[3]);
             that.data.options.prom_id=parseInt(gid_str[4]);
+
+        
         }
  
         this.setData({options: that.data.options});
@@ -996,6 +998,19 @@ Page({
 				await this.getactLen().then(async function(res) {
 					redisNums = res;
 					let curNum = th.data.goodsInputNum;
+
+                    if(curNum > res) { // t当前增减的数量
+                        // wx.showModal({
+                        // 	title: '超出活动库存',
+                        // });
+                        getApp().my_warnning('超出活动库存', 0, self);
+                        th.setData({
+                            goodsInputNum: res || 1
+                        });
+                        is_ok=0;
+                        return false;
+                    }
+
 					// res: redis可购买数量
 					console.log('当前可以购买的数量:', res);
 					if(res <= 0) {
@@ -1026,24 +1041,9 @@ Page({
  
 							if(canBuyNum <= 0) {
 								canBuyNum = 0;
-							};
-							
-							if(canBuyNum > res) {
-								if(curNum > res) { // t当前增减的数量
-									// wx.showModal({
-									// 	title: '超出活动库存',
-									// });
-									getApp().my_warnning('超出活动库存', 0, self);
-									th.setData({
-										goodsInputNum: res || 1
-									});
-                                    is_ok=0;
-									return false;
-								};
-							};
-							
-							if(canBuyNum <= res) {
-								if(curNum > canBuyNum) {
+							}
+
+							if(curNum > canBuyNum) {
 									// wx.showModal({
 									// 	title: '超出限购数量',
 									// });
@@ -1053,8 +1053,8 @@ Page({
 									});
                                     is_ok=0;
 									return false;
-								}
 							}
+
 						})
  
 					}
@@ -1495,6 +1495,7 @@ Page({
                 is_collect: 0,
                 collect_id: 0,
               });
+              ut.m_toast('取消成功');
             }
           }
         });
@@ -1525,6 +1526,7 @@ Page({
                 is_collect: 1,
                 collect_id: e.data.data.collect_id,
               });
+              ut.m_toast('收藏成功 在【我的-收藏夹】中查看');
             }
           }
         });
@@ -3473,7 +3475,8 @@ Page({
 					            user_id: user_id,
 					            card_id: th.data.options.goods_id,
 					            prom_type: th.data.options.prom_type,
-					            prom_id: th.data.options.prom_id
+					            prom_id: th.data.options.prom_id,
+                                isnew:1
 					        },
 					        //-----获取-----
 					        success: function (tt) {
@@ -109,13 +109,24 @@
  
 						<view class="flex jc_sb">
 							<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="word-line fs20 xc-qtunit-price">
-								  零售价￥{{filters.toFix(data.market_price,2)}}
-								</view> -->
+								<view class="flex" style="align-items: baseline;">
+									<!-- 秒杀价 -->
+									<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  wx:if="{{options.prom_type == 1}}" class="word-line no_line_x fs20 xc-qtunit-price">
+										<block wx:if="{{sys_switch.is_retail_price}}">
+											￥{{filters.toFix(data.show_price,2)}}
+										</block>
+										<block wx:else>
+											￥{{filters.toFix(data.shop_price,2)}}
+										</block>
+									</view>
+
+								</view>
+
+
+
 								<view class="goods-title">
 									<view class="goods-name elli">{{data.goods_name}}</view>
 								</view>
@@ -136,8 +147,9 @@
  
 						      <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
 						      <view class="stock" wx:else>限购:不限</view>
-									<view class="sales">已售:{{prom_act.buy_num+prom_act.virtual}}件</view>
-						
+							  <view wx:if="{{prom_st>0}}"  class="sales">已售:{{prom_act.buy_num+prom_act.virtual}}件</view>
+							  <view wx:else class="sales">已售:{{prom_act.buy_num}}件</view>
+
 						      <!-- <block wx:if="{{prom_st==0}}">
 						        <view class="sales">已购:0件</view>
 						      </block> -->
@@ -267,10 +267,12 @@ Page({
             if (gid_str.length > 2 && gid_str[2]) {
                 room_id =  parseInt(gid_str[2]);
                 room_user_share = 1;
-
                 that.data.options.room_id=room_id;
+            }
+            if (gid_str.length > 3 && gid_str[3]){
                 that.data.options.prom_type= parseInt(gid_str[3]);
                 that.data.options.prom_id=parseInt(gid_str[4]);
+
             }
  
             this.setData({options: that.data.options});
@@ -1083,6 +1085,7 @@ Page({
                                 is_collect: 0,
                                 collect_id: 0,
                             });
+                            ut.m_toast('取消成功');
                         }
                     }
                 });
@@ -1111,6 +1114,7 @@ Page({
                                 is_collect: 1,
                                 collect_id: e.data.data.collect_id,
                             });
+                            ut.m_toast('收藏成功 在【我的-收藏夹】中查看');
                         }
                     }
                 });
@@ -360,7 +360,15 @@ Page({
 	 },
  
 	 goto(e) {
-		 let url = e.currentTarget.dataset.url;
+		 let index = e.currentTarget.dataset.index;
+		 let pidx = e.currentTarget.dataset.pidx;
+		 let item=this.data.list[pidx][index];
+
+		 let url="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.id+"&prom_type=2";
+		 //-- 如果是服务卡项的时候 --
+		 if(item.goods_type==1){
+			 url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.id;
+		 }
 		 app.goto(url);
 	 },
  
@@ -4,7 +4,7 @@
 	<block wx:for="{{list}}" wx:for-item="p_item" wx:for-index="p_idx">
  
 	   <block wx:for="{{p_item}}">
-		  <view class="list-item" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.id}}&prom_type=2">
+		  <view class="list-item" bindtap="goto"  data-pidx="{{p_idx}}"  data-index="{{index}}" >
 			<view class="img-container">
 				<image class="img-block" src="{{imghost + item.original_img}}" data-val="{{item.original_img}}"
 					   data-errorimg="list[{{p_idx}}][{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
@@ -11,7 +11,7 @@ var oo = t.globalData.setting,
 var regeneratorRuntime = require('../../../../utils/runtime.js');
 var util_pay = require("../../../../utils/pay.js");
 let self = null;
-
+ 
 Page({
   data: {
     prom_type: 9,
@@ -87,6 +87,8 @@ Page({
     can_use_ord_prom:{},
     //存储订单促销的取价，按照门店进行索引
     show_ord_prom:{},
+    sameCityExp_off:0, //未达到起送价
+    sameCityExp_info:'',//未达到起送价提示信息
   },
  
  
@@ -144,6 +146,8 @@ Page({
       title: '填写订单',
     });
     self = this;
+
+    t.goods_price_y=t.goods_price;
     this.setData({
       is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow,
       param: t,
@@ -576,7 +580,6 @@ Page({
  
           }
  
-
           t.data.data.goods_price=th.data.param.goods_price;
  
           //用深拷贝把商品缓存起来，方便后面使用
@@ -748,6 +751,13 @@ Page({
       }
     }
  
+    //价格要返回，在重新进来的时候
+    let goods_price_y=this.data.param.goods_price_y;
+    this.setData({
+      show_ord_prom:{},
+      can_use_ord_prom:{},
+      'param.goods_price':goods_price_y
+    })
  
     //先获取是否有关闭使用优惠券
     getApp().getConfig2(function (ee) {
@@ -1073,7 +1083,22 @@ Page({
         if (res.data.code == 0) {
           var wl_txt = "formData.shipping_price";
           th.setData({ [wl_txt]: res.data.data, })
+          th.setData({
+            sameCityExp_off:0,
+            sameCityExp_info:''
+          })
         } else {
+          if (res.data.code==-2) {  //未达到起送价
+            th.setData({
+              sameCityExp_off:2,
+              sameCityExp_info:res.data.msg
+            })
+          }else{
+            th.setData({
+              sameCityExp_off:1,
+              sameCityExp_info:res.data.msg
+            })
+          }
           is_next = 0;
           wx.showToast({
             title: res.data.msg, icon: 'none', duration: 2000
@@ -1821,7 +1846,10 @@ Page({
     var th = this;
     var ty = t.currentTarget.dataset.t;
     th.setData({
-      bn_exp_type: ty,same_ok:1
+      bn_exp_type: ty,
+      same_ok:1,
+      sameCityExp_off:0, 
+      sameCityExp_info:'',
     });
     //当物流为空的时候。
     if (ty == 0 && th.data.wu_arr == null) {
@@ -2344,6 +2372,10 @@ Page({
     }
     func(isok);
   },
+  //去凑单
+  qcd(){
+    getApp().goto("/pages/index/index/index");
+  },
  
  
 });
@@ -9,7 +9,7 @@
  
           <view hidden="{{bn_t_exp_t==1}}" bindtap='setexptype' data-t='0' class="tab {{bn_exp_type== 0 ? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">快递邮寄</view>
  
-          <!-- 同城配送 -->
+          <!-- 同城配送 --> 
           <block wx:if="{{show_same_city}}">
             <view hidden="{{bn_t_exp_t==3}}" bindtap='setexptype' data-t='2' class="tab {{bn_exp_type== 2 ? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">同城配送</view>
           </block>
@@ -221,11 +221,22 @@
   </view>
  
   <view class="btn-wrap" wx:if="{{is_show_sub}}">
-    <view class="pay-amount">
-      <view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
-      <!-- <view class="co-red big"></view> -->
-    </view>
-    <button disabled="{{sub || !same_ok}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    <block wx:if="{{sameCityExp_off>0 && sameCityExp_info}}">
+      <view class="pay-amount">
+        <view class="payable"><text class="co-red fs24">{{sameCityExp_info}}</text></view>
+        <!-- <view class="co-red big"></view> -->
+      </view>
+      <!-- <button wx:if="{{sameCityExp_off==2}}" class="tips-btn" catchtap="qcd">去凑单</button> -->
+    </block>
+    <block wx:else>
+      <view class="pay-amount">
+        <view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
+        <!-- <view class="co-red big"></view> -->
+      </view>
+      <button disabled="{{sub || !same_ok}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    </block>
+
+
   </view>
 </form>
  
@@ -2535,6 +2535,7 @@ Page({
                 is_collect: 0,
                 collect_id: 0,
               });
+              ut.m_toast('取消成功');
             }
           }
         });
@@ -2564,6 +2565,7 @@ Page({
                 is_collect: 1,
                 collect_id: e.data.data.collect_id,
               });
+              ut.m_toast('收藏成功 在【我的-收藏夹】中查看');
             }
           }
         });
@@ -1247,6 +1247,7 @@ Page({
                 is_collect: 0,
                 collect_id: 0,
               });
+              ut.m_toast('取消成功');
             }
           }
         });
@@ -1277,6 +1278,7 @@ Page({
                 is_collect: 1,
                 collect_id: e.data.data.collect_id,
               });
+              ut.m_toast('收藏成功 在【我的-收藏夹】中查看');
             }
           }
         });
@@ -123,7 +123,9 @@ Page({
         bconfig: null,
         showFold:true,
  
-        is_fwk:0,  //-- 是不是服务卡项的购买 --
+        is_fwk:0,  //-- 是不是服务卡项的购买 -- 
+        sameCityExp_off:0, //未达到起送价
+        sameCityExp_info:'',//未达到起送价提示信息
       },
  
  
@@ -2526,7 +2528,22 @@ Page({
                     }).then(res => {
                         if (res.data.code == 0) {
                             shipping_price = res.data.data;
+                            th.setData({
+                              sameCityExp_off:0,
+                              sameCityExp_info:''
+                            })
                         } else {
+                          if (res.data.code==-2) {  //未达到起送价
+                            th.setData({
+                              sameCityExp_off:2,
+                              sameCityExp_info:res.data.msg
+                            })
+                          }else{
+                            th.setData({
+                              sameCityExp_off:1,
+                              sameCityExp_info:res.data.msg
+                            })
+                          }
                             is_next = 0;
                             wx.showToast({
                                 title: res.data.msg, icon: 'none', duration: 2000
@@ -2595,10 +2612,14 @@ Page({
                     }
                 })
                 var gd_w = good['weight'] * good['buynum'];
+                //这个不是取尾款而是取总金额
+                let order_amount = parseFloat(o_condition);
+                // var o_condition1 = parseFloat(o_condition);
+                if (order_amount < 0) order_amount = 0;
                 //-- 获取距离  --
                 var req_data = {
                     store_id: os.stoid,
-                    order_amount: parseFloat(o_condition1),
+                    order_amount: parseFloat(order_amount),
                     lon: lon, lat: lat,
                     pickup_id: bn_pick,
                     goods_weight: gd_w,
@@ -2612,7 +2633,22 @@ Page({
                 }).then(res => {
                     if (res.data.code == 0) {
                         shipping_price = res.data.data;
+                        th.setData({
+                          sameCityExp_off:0,
+                          sameCityExp_info:''
+                        })
                     } else {
+                      if (res.data.code==-2) {  //未达到起送价
+                        th.setData({
+                          sameCityExp_off:2,
+                          sameCityExp_info:res.data.msg
+                        })
+                      }else{
+                        th.setData({
+                          sameCityExp_off:1,
+                          sameCityExp_info:res.data.msg
+                        })
+                      }
                         is_next = 0;
                         wx.showToast({
                             title: res.data.msg, icon: 'none', duration: 2000
@@ -2927,7 +2963,10 @@ Page({
     set_wuliu: function (e) {
         var type = e.currentTarget.dataset.type;
         this.setData({
-            exp_type: type,same_ok:1
+            exp_type: type,
+            same_ok:1,
+            sameCityExp_off:0,
+            sameCityExp_info:'',
         });
         this.calculatePrice2();
     },
@@ -3443,7 +3482,12 @@ Page({
     //-- 查看物流 --
     go_wuliu:function (e) {
         getApp().go_wuliu(e);
-    }
+    },
+      //去凑单
+    qcd(){
+      getApp().goto("/pages/index/index/index");
+    },
+
  
  
  
@@ -388,14 +388,26 @@
             请于{{days}}天{{hours}}小时{{minutes}}分{{seconds}}秒内付款完成，超时订单将自动取消
         </view>
  
-        <view class="btn-wrap" hidden="{{disabled_btn}}">
+        <view class="btn-wrap" >
+          <block wx:if="{{sameCityExp_off>0 && sameCityExp_info}}">
             <view class="pay-amount">
+                <view class="payable">
+                    <text class="co-red fs24">{{sameCityExp_info}}</text>
+                </view>
+            </view>
+            <!-- <button wx:if="{{no_start || is_end || is_complete}}" class="tips-btn gray">支付尾款</button> -->
+            <!-- <button wx:if="{{sameCityExp_off==2}}"  class="tips-btn" catchtap="qcd">去凑单</button> -->
+          </block>
+          <block wx:else>
+            <view class="pay-amount" hidden="{{disabled_btn}}">
                 <view class="payable">应付金额：
                     <text class="co-red"> <text class="fs24">￥</text>{{filters.toFix(order_m,2)}}</text>
                 </view>
             </view>
             <button wx:if="{{no_start || is_end || is_complete}}" class="tips-btn gray">支付尾款</button>
             <button wx:else class="tips-btn" bindtap="show_pay" hidden="{{!show_submit || !same_ok}}">支付尾款</button>
+          </block>
+
             <!-- 预售 -->
             <!-- <button  class="tips-btn" formType="submit" id="submitOrder">立即支付</button> -->
         </view>
@@ -142,6 +142,8 @@ Page({
         can_use_ord_prom:{},
         //存储订单促销的取价，按照门店进行索引
         show_ord_prom:{},
+        sameCityExp_off:0, //未达到起送价
+        sameCityExp_info:'',//未达到起送价提示信息
       },
  
  
@@ -282,6 +284,11 @@ Page({
             });
         }
  
+        this.setData({
+            show_ord_prom:{},
+            can_use_ord_prom:{}
+        })
+
  
         th.data.g_cart_q_time = null;
         if (th.data.isclose == 0) {
@@ -841,8 +848,8 @@ Page({
         //     return false;
         // }
  
-        th.setData({dis_btn:1})
-        this.data.submit=0;
+        th.setData({dis_btn:1,submit:1})
+        //this.data.submit=0;
  
         wx.showLoading({
             title: "处理中.",mask:true
@@ -1181,7 +1188,22 @@ Page({
                         if (res.data.code == 0) {
                             var wl_txt = "formData.shipping_price";
                             th.setData({ [wl_txt]: res.data.data, })
+                            th.setData({
+                              sameCityExp_off:0,
+                              sameCityExp_info:''
+                            })
                         }else{
+                          if (res.data.code==-2) {  //未达到起送价
+                            th.setData({
+                              sameCityExp_off:2,
+                              sameCityExp_info:res.data.msg
+                            })
+                          }else{
+                            th.setData({
+                              sameCityExp_off:1,
+                              sameCityExp_info:res.data.msg
+                            })
+                          }
                             is_next=0;
                             wx.showToast({
                                 title: res.data.msg, icon: 'none',  duration: 2000
@@ -1244,14 +1266,14 @@ Page({
                 if (th.data.bn_use_money == 1) {
                     if (amoney > order_m) {
                         order_m = parseFloat(order_m).toFixed(2);
-                        th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
+                        th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price,submit: 0, show_submit: 1,dis_btn:0 })
                     } else {
                         order_m = parseFloat(order_m) - parseFloat(amoney);
                         order_m = order_m.toFixed(2);
-                        th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
+                        th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price,submit: 0, show_submit: 1,dis_btn:0 })
                     }
                 } else {
-                    th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
+                    th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price,submit: 0, show_submit: 1,dis_btn:0 })
                 }
                 //优惠活动送积分
                 if (good.s_intValue) {
@@ -2261,7 +2283,7 @@ Page({
     setexptype: function (t) {
         var th = this;
         var ty = t.currentTarget.dataset.t, def_exp_code = getApp().globalData.userInfo.def_exp_code;
-        th.setData({ bn_exp_type: ty,same_ok:1 });
+        th.setData({ bn_exp_type: ty,same_ok:1,sameCityExp_off:0, sameCityExp_info:'',});
         if (ty == 0) {
             th.setData({ is_all_zt: 0 });
         }
@@ -3348,7 +3370,7 @@ Page({
     //立即购买的时候，点击订单促销的参与
     set_can_use_ord_prom_now:function (e){
  
-        if(this.data.submit || this.data.dis_btn) return false;
+        if(this.data.submit) return false;
         this.data.submit=1;
  
         let pickid=this.data.bn_pick;
@@ -3400,7 +3422,11 @@ Page({
         if(!th.data.can_use_ord_prom[pickid]){
             th.get_buy_now_quan();
         }
-    }
+    },
+      //去凑单
+  qcd(){
+    getApp().goto("/pages/index/index/index");
+  },
  
  
  
@@ -272,10 +272,21 @@
 	</view>
  
 	<view class="btn-wrap shadow-1" wx:if="{{show_submit}}">
-		<view class="pay-amount">
-			<view class="payable">应付金额：<text class="co-red"><text class="fs24">￥</text>{{formData.order_amount}}</text></view>
-		</view>
-		<button disabled="{{dis_btn}}"  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    <block wx:if="{{sameCityExp_off>0 && sameCityExp_info}}">
+      <view class="pay-amount">
+        <view class="payable"><text class="co-red fs24">{{sameCityExp_info}}</text></view>
+      </view>
+      <button  class="tips-btn" catchtap="qcd">去凑单</button>
+    </block>
+		<block wx:else>
+      <view class="pay-amount">
+        <view class="payable">应付金额：<text class="co-red"><text class="fs24">￥</text>{{formData.order_amount}}</text></view>
+      </view>
+      <button disabled="{{dis_btn}}"  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    </block>
+
+
+
 	</view>
 </form>
  
@@ -1603,6 +1603,7 @@ Page({
                 is_collect: 0,
                 collect_id: 0,
               });
+              ut.m_toast('取消成功');
             }
           }
         });
@@ -1632,6 +1633,7 @@ Page({
                 is_collect: 1,
                 collect_id: e.data.data.collect_id,
               });
+              ut.m_toast('收藏成功 在【我的-收藏夹】中查看');
             }
           }
         });
@@ -1483,6 +1483,7 @@ Page({
                 is_collect: 0,
                 collect_id: 0,
               });
+              ut.m_toast('取消成功');
             }
           }
         });
@@ -1510,6 +1511,7 @@ Page({
                 is_collect: 1,
                 collect_id: e.data.data.collect_id,
               });
+              ut.m_toast('收藏成功 在【我的-收藏夹】中查看');
             }
           }
         });
@@ -186,7 +186,8 @@ Page({
     can_use_ord_prom:{},
     //存储订单促销的取价，按照门店进行索引
     show_ord_prom:{},
-
+    sameCityExp_off:0, //未达到起送价
+    sameCityExp_info:'',//未达到起送价提示信息
   },
  
  
@@ -3691,8 +3692,23 @@ Page({
         await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", { is_json: 1, data: req_data }).then(res => {
           if (res.data.code == 0) {
             cart_item.shipping_price = res.data.data;
+            th.setData({
+              sameCityExp_off:0,
+              sameCityExp_info:''
+            })
           } else {
-            is_next = 0;
+            if (res.data.code==-2) {  //未达到起送价
+              th.setData({
+                sameCityExp_off:2,
+                sameCityExp_info:res.data.msg
+              })
+            }else{
+              th.setData({
+                sameCityExp_off:1,
+                sameCityExp_info:res.data.msg
+              })
+            }
+            // is_next = 0;
  
             if (qfunc) qfunc();
             else {
@@ -4532,9 +4548,23 @@ Page({
         if (res.data.code == 0) {
           var wl_txt = "formData.shipping_price";
           th.setData({ [wl_txt]: res.data.data, })
-
+          th.setData({
+            sameCityExp_off:0,
+            sameCityExp_info:''
+          })
         } else {
-          is_next = 0;
+          if (res.data.code==-2) {  //未达到起送价
+            th.setData({
+              sameCityExp_off:2,
+              sameCityExp_info:res.data.msg
+            })
+          }else{
+            th.setData({
+              sameCityExp_off:1,
+              sameCityExp_info:res.data.msg
+            })
+          }
+          // is_next = 0;
           if (qfunc) {
             qfunc();
           } else {
@@ -7722,7 +7752,7 @@ Page({
   setexptype2: function (e) {
  
     if(this.data.submit) return false;
-    this.setData({ submit: 1,same_ok:1 });
+    this.setData({ submit: 1,same_ok:1,sameCityExp_off:0, sameCityExp_info:'',});
  
     if(this.data.all_collocation_list){
        var bn_coll= this.selectComponent('#bn_coll');
@@ -7741,7 +7771,7 @@ Page({
   setexptype_w2: function (e) {
  
     if(this.data.submit) return false;
-    this.setData({ submit: 1,same_ok:1 });
+    this.setData({ submit: 1,same_ok:1,sameCityExp_off:0, sameCityExp_info:'',});
  
     for (let i = 0; i <this.data.cartlist.length ; i++) {
  
@@ -9164,7 +9194,12 @@ Page({
     if(!th.data.can_use_ord_prom[pickid]){
       th.get_buy_now_quan();
     }
-  }
+  },
+
+  //去凑单
+  qcd(){
+    getApp().goto("/pages/index/index/index");
+  },
  
  
  
@@ -841,12 +841,21 @@
   </view>
  
   <view class="btn-wrap shadow-1" wx:if="{{show_submit}}">
+    <block wx:if="{{sameCityExp_off>0 && sameCityExp_info}}">
+      <view class="pay-amount">
+        <view class="payable"><text class="co-red fs24">{{sameCityExp_info}}</text>
+        </view>
+      </view>
+      <button wx:if="{{sameCityExp_off==2}}"  class="tips-btn  "  catchtap="qcd">去凑单</button>
+    </block>
+    <block wx:else>
     <view class="pay-amount">
       <view class="payable">应付金额：<text class="co-red"><text class="fs24">￥</text>{{formData.order_amount}}</text></view>
       <!-- <view class="co-red big"></view> -->
     </view>
     <button class="tips-btn" formType="submit" id="submitOrder"
             disabled="{{submit || !same_ok}}" bindtap="requestSubscribe">提交订单</button>
+    </block>
   </view>
 </form>
  
@@ -379,7 +379,6 @@ module.exports = {
             c_item.offline_price = offline_price;
             c_item.offline_num = offline_num;
         }
-
     },
     //筛选组合购，纯粹的数组按活动id分组
     find_split: function (arr) {
@@ -93,6 +93,8 @@ Page({
     can_use_ord_prom:{},
     //存储订单促销的取价，按照门店进行索引
     show_ord_prom:{},
+    sameCityExp_off:0, //未达到起送价
+    sameCityExp_info:'',//未达到起送价提示信息
   },
  
  
@@ -1029,7 +1031,22 @@ Page({
         if (res.data.code == 0) {
           var wl_txt = "formData.shipping_price";
           th.setData({ [wl_txt]: res.data.data, })
+          th.setData({
+            sameCityExp_off:0,
+            sameCityExp_info:''
+          })
         }else{
+          if (res.data.code==-2) {  //未达到起送价
+            th.setData({
+              sameCityExp_off:2,
+              sameCityExp_info:res.data.msg
+            })
+          }else{
+            th.setData({
+              sameCityExp_off:1,
+              sameCityExp_info:res.data.msg
+            })
+          }
           is_next=0;
           wx.showToast({
             title: res.data.msg, icon: 'none',  duration: 2000
@@ -1637,7 +1654,7 @@ Page({
     var th = this;
     var ty = t.currentTarget.dataset.t, def_exp_code = getApp().globalData.userInfo.def_exp_code;
  
-    th.setData({ bn_exp_type: ty,same_ok:1 });
+    th.setData({ bn_exp_type: ty,same_ok:1,sameCityExp_off:0, sameCityExp_info:'', });
     //当物流为空的时候。
     if (ty == 0 && th.data.wu_arr == null) {
       th.data.isget_by_quan = {};
@@ -1963,7 +1980,11 @@ Page({
       mark:true
     })
     th.calculatePrice2()
-  }
+  },
+    //去凑单
+    qcd(){
+      getApp().goto("/pages/index/index/index");
+    },
  
  
  
@@ -216,11 +216,21 @@
  
  
 	<view class="btn-wrap shadow-1" wx:if="{{show_submit}}">
-		<view class="pay-amount">
-			<view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
-			<view hidden="{{can_use_ord_prom && can_use_ord_prom[bn_pick] }}" class="payable">应付积分：<text class="co-red">{{formData.integral}}积分</text></view>
-		</view>
-		<button disabled="{{submit || !same_ok}}"  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+
+    <block wx:if="{{sameCityExp_off>0 && sameCityExp_info}}">
+      <view class="pay-amount">
+        <view class="payable"><text class="co-red fs24">{{sameCityExp_info}}</text></view>
+        <!-- <view class="payable">应付积分：<text class="co-red">{{formData.integral}}积分</text></view> -->
+      </view>
+      <button wx:if="{{sameCityExp_off==2}}"  class="tips-btn" catchtap="qcd">去凑单</button>
+    </block>
+    <block wx:else>
+      <view class="pay-amount">
+        <view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
+        <view class="payable">应付积分：<text class="co-red">{{formData.integral}}积分</text></view>
+      </view>
+      <button disabled="{{submit || !same_ok}}"  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    </block>
 	</view>
 </form>
  
@@ -97,6 +97,8 @@ Page({
     can_use_ord_prom:{},
     //存储订单促销的取价，按照门店进行索引
     show_ord_prom:{},
+    sameCityExp_off:0, //未达到起送价
+    sameCityExp_info:'',//未达到起送价提示信息
   },
  
  
@@ -686,6 +688,11 @@ Page({
       }
     }
  
+    this.setData({
+      show_ord_prom:{},
+      can_use_ord_prom:{}
+    })
+
  
     //先获取是否有关闭使用优惠券
     getApp().getConfig2(function (ee) {
@@ -1076,6 +1083,31 @@ Page({
       th.setData({ [wl_txt]: 0, })
     }
  
+
+
+    //-- 如果是订单优惠的时候,allpice要拿来减掉一些 --
+    var order_prom_id=0;
+    var order_prom_amount=0;
+    if(ord_prom){
+      order_prom_id = ord_prom['id'];
+      switch (ord_prom['type']) {
+        case 0:
+          allpice = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+          order_prom_amount = (o_condition - allpice).toFixed(2);
+          break;
+        case 1:
+          //-- 如果有优惠促销倍减的时候 --
+          var bs = 1;
+          if (ord_prom.is_bz) {
+            bs = Math.floor(o_condition / ord_prom.money);
+          }
+          allpice = o_condition - bs * ord_prom['expression'];//满额优惠金额
+          order_prom_amount = ord_prom['expression'];
+          break;
+      }
+    }
+
+    
     //判断是否同城配送,而且没有调用过
     if (th.data.bn_exp_type == 2 && th.data.user_addr) {
       var lon = 0;
@@ -1113,9 +1145,23 @@ Page({
         if (res.data.code == 0) {
           var wl_txt = "formData.shipping_price";
           th.setData({ [wl_txt]: res.data.data, })
-
+          th.setData({
+            sameCityExp_off:0,
+            sameCityExp_info:''
+          }) 
         } else {
-          is_next = 0;
+          if (res.data.code==-2) {  //未达到起送价
+            th.setData({
+              sameCityExp_off:2,
+              sameCityExp_info:res.data.msg
+            })
+          }else{
+            th.setData({
+              sameCityExp_off:1,
+              sameCityExp_info:res.data.msg
+            })
+          }
+          // is_next = 0;
           wx.showToast({
             title: res.data.msg, icon: 'none', duration: 2000
           })
@@ -1134,27 +1180,6 @@ Page({
  
     }
  
-    //-- 如果是订单优惠的时候,allpice要拿来减掉一些 --
-    var order_prom_id=0;
-    var order_prom_amount=0;
-    if(ord_prom){
-      order_prom_id = ord_prom['id'];
-      switch (ord_prom['type']) {
-        case 0:
-          allpice = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-          order_prom_amount = (o_condition - allpice).toFixed(2);
-          break;
-        case 1:
-          //-- 如果有优惠促销倍减的时候 --
-          var bs = 1;
-          if (ord_prom.is_bz) {
-            bs = Math.floor(o_condition / ord_prom.money);
-          }
-          allpice = o_condition - bs * ord_prom['expression'];//满额优惠金额
-          order_prom_amount = ord_prom['expression'];
-          break;
-      }
-    }
  
     //--订单优惠的显示--
     var order_prom_txt1 = "formData.order_prom_id";
@@ -1773,7 +1798,7 @@ Page({
   setexptype_w: function (t) {
     var th = this;
     var ty = t.currentTarget.dataset.t, txt = t.currentTarget.dataset.txt;
-    th.setData({ [txt]: ty,same_ok:1 });
+    th.setData({ [txt]: ty,same_ok:1,sameCityExp_off:0, sameCityExp_info:'', });
     var iszt = 1;
     if (ty == 0) {
       th.setData({ is_all_zt: 0 });
@@ -1795,7 +1820,7 @@ Page({
   setexptype: function (t) {
     var th = this;
     var ty = t.currentTarget.dataset.t;
-    th.setData({ bn_exp_type: ty, same_ok:1 });
+    th.setData({ bn_exp_type: ty, same_ok:1, sameCityExp_off:0, sameCityExp_info:'',});
     //当物流为空的时候。
     if (ty == 0 && th.data.wu_arr == null) {
       return th.get_wuliu(th.calculatePrice2());
@@ -2538,6 +2563,10 @@ Page({
     }
     func(isok);
   },
+  //去凑单
+  qcd(){
+    getApp().goto("/pages/index/index/index");
+  },
  
  
  
@@ -237,11 +237,20 @@
   </view>
  
   <view class="btn-wrap" wx:if="{{show_btn}}">
-    <view class="pay-amount">
-      <view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
-      <!-- <view class="co-red big"></view> -->
-    </view>
-    <button disabled="{{submit || !same_ok}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    <block wx:if="{{sameCityExp_off>0 && sameCityExp_info}}">
+      <view class="pay-amount">
+        <view class="payable"><text class="co-red fs24">{{sameCityExp_info}}</text></view>
+      </view>
+      <button wx:if="{{sameCityExp_off==2}}" class="tips-btn" catchtap="qcd">去凑单</button>
+    </block>
+    <block wx:else>
+      <view class="pay-amount">
+        <view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
+        <!-- <view class="co-red big"></view> -->
+      </view>
+      <button disabled="{{submit || !same_ok}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+    </block>
+
   </view>
 </form>
  
+<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">
+											<view class="spec-goods-price">
+		                        <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>
+		             		                  						 
+						<!-- <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" 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 hidden="{{has_def && sys_switch.is_pricing_open_store}}" 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 && !filters.is_virtual_gd(sele_g.is_virtual) && 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
+var is_has = function (text,val) {
+  if(text.indexOf(","+val+",")==-1) return false;
+  return true
+}
+function format_tt(ts) {
+		   if(ts==null || ts==undefined || ts=='') return "";
+           var d = getDate(ts*1000)
+           var fm=(d.getMonth()+1)+"月"+ d.getDate()+"日";
+           return fm;
+}
+
+//拿来判断是不是在指定门店内
+function is_no_dis(text,val){
+    if(text==undefined) return false;
+    if(text=='') return false;
+    if(!text) return false;
+
+    if(text.indexOf(val)==-1) return true;
+    return false;
+}
+
+module.exports = {
+  is_has: is_has,
+  format_tt:format_tt,
+  is_no_dis:is_no_dis
+}
+var g_filters = {
+	    //-- 判断是不是有等级价 --
+	    is_has_rank:function(rank_switch,item){
+	    	 if(!rank_switch) return false;
+	    	 if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true}
+	    	 return false;	 
+	    },
+       	
+	    //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
+		get_card_price:function(goods,all_card,type){		
+			     var price1=parseFloat(goods['cardprice1']);
+			     var price2=parseFloat(goods['cardprice2']);
+			     var price3=parseFloat(goods['cardprice3']);					   
+			     if(!all_card){
+			         if(type==0) return 0;
+			         return "";
+			     }	
+																	 												 
+				 var arr=[]; 
+				 var min_price= 0;
+				 var min_name="";		
+						  
+				 var min_price=null;
+				 var min_name=null;	   
+			     //---设置对应的价格名字----	   
+				 for(var i=0;i<3;i++) {						
+					var vl=all_card[i];		
+					if(!vl) continue;			
+					if(vl['CorrPrice']=="Price1" && price1>0)
+					{	 	 		  
+					   if(min_price==null) {
+						     min_price=price1;min_name=vl['CardName'];
+					   }
+					   else if(price1<min_price) {
+							min_price=price1;min_name=vl['CardName'];					  
+					   }
+					}
+					if(vl['CorrPrice']=="Price2" && price2>0)
+					{
+						if(min_price==null) {
+							min_price=price2;min_name=vl['CardName'];
+						}
+						else if(price2<min_price) {
+							min_price=price2;min_name=vl['CardName'];					  
+						}					
+					}
+											
+					if(vl['CorrPrice']=="Price3" && price3>0)
+					{						
+						if(min_price==null) {
+							min_price=price3;min_name=vl['CardName'];
+						}
+						else if(price3<min_price) {
+							min_price=price3;min_name=vl['CardName'];					  
+						}
+					}
+														
+				 } 
+				 if(min_price==null){
+					 if(type==0) return 0;
+					 return "";
+				 }	
+				 
+				 //if(type==0) return arr.length;
+			     //--进行排序,升序---
+				 /*---
+				 arr.sort(function(a,b){
+					          if (a.price < b.price) {
+					            return -1;
+					          } else if (a.fee == b.fee) {
+					            return 0;
+					          } else {
+					            return 1;
+					          }
+				 })--*/			 				 
+				 //-- 获取最下价钱，和相应的卡的名称 --		  
+				 //min_price=min.price;
+				 //min_name=min.name;				   
+			     if(type==0) return min_price.toFixed(2);	
+				 if(min_name.length>4)	min_name=min_name.substring(0, 8);	 
+			     return min_name;
+		},
+		
+		toFix: function (val, count,set) {
+			if(val===undefined) return 0;
+			if(val===null) return 0;
+			if(val==='') return 0;
+			val = parseFloat(val);
+			if(set==1 && val==0) return val;
+			return val.toFixed(count)
+		},
+		
+		//折扣数值处理，小数位数为1时，只显示1位；小数位数为2时，才显示2位；
+		num: function(value) {
+			if(value != 0) {
+				var val = value.toFixed(2).toString();
+				if(val.indexOf('.') != -1) {
+					var arrval = val.split('.');
+					if(arrval[1].length == 1 && arrval[1][0] == 0) {
+						val = val.slice(0,-2);
+					};
+			
+					if(arrval[1].length == 2 && arrval[1][1] == 0) {
+						val = val.slice(0,-1);
+					};
+				};
+				return val;
+			} else {
+				return value.toFixed(0);
+			};
+		}, 
+}
+module.exports = {
+	  is_has_rank:g_filters.is_has_rank,
+	  get_card_price:g_filters.get_card_price,
+		num:g_filters.num,
+}
 \ No newline at end of file
+var t = require("../../../../utils/util.js"),
+    ut = t,
+    e = require("../../../../utils/common.js"),
+    a = require("../../../../utils/wxParse/wxParse.js"),
+    s = getApp(),
+    i = s.request,
+    rq = i,
+    oo = s.globalData,
+    o = s.globalData.setting,
+    os = o;
+
+let self = null;
+
+//评价加载更多
+var more = function (e) {
+        return e && e.__esModule ? e : {
+            default: e
+        };
+    }(require("../../../../utils/LoadMore.js")),
+    n = new more.default();
+var utils = require('../../../../utils/util.js');
+var regeneratorRuntime = require('../../../../utils/runtime.js');
+
+Page({
+    data: {
+        start_stop: 2, //秒杀开始 结束 的控制(1正在进行，2即将开始)
+        color_type: 0, //线条控制
+        color_type_one: 0,
+        color_type_two: 1,
+        is_share_text: 1,
+
+        gid: "",
+        stoid: o.stoid,
+        url: o.url,
+        resourceUrl: o.h5_url,  //公众号那边的图片文件域名
+        iurl: o.imghost,
+        defaultAvatar: o.resourceUrl + "/static/images/user68.jpg",
+
+        data: null,
+        content: "", //商品详情
+
+
+        gallery: null, //图片滚动
+        is_collect: 0,
+        collect_id: 0,
+        cartGoodsNum: 0,
+        specSelect: 0,
+        optionItemId: 0,
+        goodsInputNum: 1,
+        openSpecModal: !1,
+
+        activeCategoryId: 0,
+        supportPageScroll: !1,
+        address: {
+            address: "",
+            district: 0,
+        },
+        shipping: "",
+        shippingCost: 0,
+        enterAddressPage: !1,
+        categories: [{
+            name: "卡项",
+            id: 0
+        }, {
+            name: "详情",
+            id: 1
+        }, {
+            name: "评价",
+            id: 2
+        }],
+        activeCategoryId2: 0,
+        categories2: [{
+            name: "商品详情",
+            id: 0
+        }, {
+            name: "规格参数",
+            id: 1
+        }],
+        activeCategoryId3: 1, // 点击评价-全部、有图、好评、中评时对应的id
+        categories3: [{
+            name: "全部",
+            id: 1,
+            num: 0
+        },
+            {
+                name: "有图",
+                id: 5,
+                num: 0
+            },
+
+            {
+                name: "好评",
+                id: 2,
+                num: 0
+            }, {
+                name: "中评",
+                id: 3,
+                num: 0
+            }, {
+                name: "差评",
+                id: 4,
+                num: 0
+            },
+        ],
+
+        select: {
+            price: 0,
+            stock: 0,
+            specName: "",
+            activity: null
+        },
+
+
+        //门店相关
+        ismend: 0,
+        is_sec_mend: 0,
+        sto_sele_name: "", //选中的门店名称
+        sto_sele_id: "", //选中的门店id
+        sto_sele_keyid: '', //选中的门店线下
+        sto_sele_distr: "", //选择的门店的配送方式
+        is_show_sto_cat: 1, //是否显示门店分类
+        only_pk: null,
+        all_sto: null,
+        sec_sto: null, //选择了的门店分类
+        pickpu_list: null, //读出的所有门店list
+        def_pickpu_list: null, //一开始5个门店list
+        sec_pick_index: 0, //第二级门店选择ID
+        fir_pick_index: 0, //第一级门店选择ID
+        all_pick_list: null,//所有的门店先记录起来
+
+        //联系电话
+        mobile: '',
+        //商品的活动类型 0普通  1秒杀 2团购 3优惠  4 积分购  6拼单
+        timer: [],
+
+        //商品的购买次数
+        prom_buy_num: -1,
+        g_buy_num: null,
+
+        //会员自己的购买的拼单商品的情况
+        //购买的订单
+        buy_order: null,
+        //1加入购物车  2立即购买
+        openSpecModal_ind: 0,
+
+        //---计时器开关----
+        is_timer: 1,
+        isshow: 0,
+        bconfig: null, //基础配置
+
+        //会员分享的头像
+        share_head: "",
+        share_goods_img: "",
+
+        //----------视频图片data参数---------
+        current: 0, //图片计数
+        swiperCurrent: 0, //轮播的下标
+        hiddenn: 0, //控制轮播计数显示
+
+        currentTab: 0, // 选择器控制参数
+        mapurl: "",
+        mapurl_f_img: "",
+        videopicture: 0, //视频图片的控制
+
+        video: 0, //视频图片切换器
+        index: 0,
+        noon: 0, //开始视频的隐藏
+
+        screenWidth: 0,
+        canvasHidden: 1,
+
+        //--推荐--
+        store_config: null,
+        is_show_pl: 0, //是否品类
+        is_show_pp: 0, //是否品牌
+        is_show_gb: 0, //是否国别
+        is_closecoupon: 0,
+
+
+        select_store: 0, //选择更多
+        index: 1,
+        more_store: 0, //选择门店
+        sort_store: 0, //门店分类
+        choice_sort_store: 0, //选择分类门店
+        new_user: 0, //新用户
+
+        def_pick_store: null, // 默认的门店
+        fir_def_store: null,  //客户默认的门店的
+        lat: null, //维度
+        lon: null, //经度
+
+        is_get_local_ok: 0, //获取坐标是否完成
+        region_name: "门店分类", //区域的名字
+        is_gps: 1,
+        open_ind_store: 0, //哪里打开的门店列表的控制属性
+        default_store: {}, //创建添加默认门店地址的对象
+
+        comments_no_more: 0,
+
+        is_collect_load: 0,     //是不是处理
+        is_newsales_rules: 0,   //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存
+        sales_rules: 1,	       //默认是线上销售
+
+        wait_for_user_store: null,
+        poster: null,      //自定义海报
+        share_b_img: '',   //自定义分享的背景
+        showPoster: false,
+        hui_condition: null,
+        sto_sele_name_1: '',//分享的门店名称
+
+        // 秒杀
+        prom_st: null,
+        prom_r_null: 0,
+
+        hiddenCS: true, //控制客服操作菜单显示和控制
+
+        openSpecModal_flash_normal: 0,
+        keyword: '', //门店搜索
+        sec_i: -1,//选中分类门店 下标
+
+        nav_frontColor: "#ffffff",
+        nav_backgroundColor: "#ffffff",
+        nav_type: 2,  //导航类型
+        istop: 0, //是否置顶风格为1
+        searchbox_transparent: 1,
+    },
+
+    //------初始化加载----------
+    onLoad: function (t) {
+        self = this;
+
+
+        t.prom_type=2;
+        this.data.options=t;
+
+        var ee = this,
+            that = ee,
+            th = ee,
+            gid = t.goods_id,
+            first_leader = t.first_leader,
+            prom_type = 2,
+            prom_id = t.prom_id,
+            room_id = t.room_id,
+            room_user_share = t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
+
+        var share_openid = t.share_openid;
+
+        //检查测肤
+        getApp().check_skin_face(t, 1, gid);
+
+        //---获取手机地址坐标--
+        //--如果tg_id是空的话，分享回来--
+        if (gid == undefined || gid == null || gid == "") {
+            var gid_str = decodeURIComponent(t.scene);
+            gid_str = gid_str.split("_");
+            gid = gid_str[0];
+            this.data.options.goods_id=gid;
+            if (gid_str.length > 1 && gid_str[1] && parseInt(gid_str[1]) > 0) {
+                first_leader = gid_str[1];
+            }
+            //-- 如果有room_id的获取 --
+            if (gid_str.length > 2 && gid_str[2] && parseInt(gid_str[2]) > 0) {
+                room_id = gid_str[2];
+                room_user_share = 1;
+            }
+
+            if (gid_str.length > 3 && gid_str[3] && parseInt(gid_str[3]) > 0) {
+                this.data.options.prom_id = gid_str[3];
+            }
+
+        }
+
+        //-- 设置顶部高度 --
+        let height = getApp().globalData.navBarHeight;
+        ee.setData({gid: gid, top_nav: height});
+
+        if (first_leader > 0) {
+            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;
+                    getApp().globalData.guide_pick_id = res.data.data.pickup_id
+                }
+            })
+        }
+
+        //-- 如果有房间号 --
+        if (room_id) {
+            getApp().globalData.room_id = room_id;
+            getApp().globalData.room_goods_id = gid;
+            //如果是会员分享过来的要记录
+            if (room_user_share)
+                getApp().globalData.room_user_share = room_user_share;
+
+            if (share_openid) {
+                this.get_room_share_guide(share_openid);
+            }
+        }
+
+
+        var c_guide_id = t.c_guide_id;
+        if (c_guide_id) {
+            th.data.c_guide_id = c_guide_id;
+        }
+
+        getApp().getConfig(function (e) {
+            ee.setData({sto_sele_name_1: e.store_name})
+        })
+
+        //----获取系统参数-----
+        getApp().getConfig2(function (e) {
+            ee.setData({
+                bconfig: e,
+                sales_rules: e.sales_rules,
+            });
+
+            if (e.categoryset.indexOf("," + 1 + ",") != -1) {
+                ee.setData({
+                    is_show_pl: 1
+                });
+            }
+            if (e.categoryset.indexOf("," + 3 + ",") != -1) {
+                ee.setData({
+                    is_show_pp: 1
+                });
+            }
+            if (e.categoryset.indexOf("," + 2 + ",") != -1) {
+                ee.setData({
+                    is_show_gb: 1
+                });
+            }
+            // console.log(e);
+            var json_d = JSON.parse(e.switch_list);
+            ee.setData({
+                store_config: e,
+                sys_switch: json_d,
+                is_closecoupon: json_d.is_closecoupon,
+                is_newsales_rules: json_d.is_newsales_rules
+            });
+            ee.init(gid);
+
+            //------几人评价-------
+            //n.init(th, "", "comments");
+            wx.pageScrollTo && th.setData({
+                supportPageScroll: !0
+            });
+
+        }, 1);
+
+        //获取用户设备信息，屏幕宽度
+        wx.getSystemInfo({
+            success: res => {
+                that.setData({
+                    screenWidth: res.screenWidth
+                })
+            }
+        });
+
+        //-- 自定义海报 --
+        getApp().request.promiseGet("/api/weshop/goods/poster/page", {
+            data: {store_id: os.stoid, type: 1, is_use: 1}
+        }).then(res => {
+            if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]) {
+
+                var poster_data = res.data.data.pageData[0];
+                var json_str = poster_data.jsonStr;
+
+                if (json_str) {
+                    var json_data = JSON.parse(json_str);
+                    if (json_data.bg_img) {
+
+                        //-- 把图片那到本地 --
+                        wx.getImageInfo({
+                            src: json_data.bg_img,
+                            success: function (res) {
+                                var path = res.path;
+                                th.setData({share_b_img: path})
+                            },
+                            fail: function (res) {
+                            }
+                        });
+                    }
+                    th.setData({poster: json_data})
+
+                }
+            }
+        })
+
+
+    },
+
+    //-- 获取直播的分享人的导购信息 --
+    async get_room_share_guide(share_openid) {
+
+        var url = "/api/weshop/users/page";
+        var first_leader = 0;
+
+        //调用接口判断是不是会员
+        await getApp().request.promiseGet(url, {
+            data: {
+                stoid: os.stoid,
+                weapp_openid: share_openid
+            }
+        }).then(res => {
+            if (ut.ajax_ok(res)) {
+                first_leader = res.data.data.pageData[0].user_id;
+                getApp().globalData.guide_id = res.data.data.id;
+            }
+        })
+
+        if (!first_leader) return false;
+
+        getApp().globalData.first_leader = first_leader;
+
+        //调用接口判断是不是会员
+        await 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;
+                getApp().globalData.guide_pick_id = res.data.data.pickup_id
+            }
+        })
+
+    },
+
+
+    onReady() {
+        // 用于控制保障服务折叠图标的显示
+        setTimeout(() => {
+            wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
+                if (res.length != 0) {
+                    this.setData({
+                        showFold: res[0].height < res[1].height,
+                    });
+                }
+            }).exec();
+        }, 1000);
+
+    },
+
+
+    //------------程序初始化入口-------------
+    async init(gid) {
+        var ee = this,
+            th = ee,
+            gallery = null,
+            is_collect = 0,
+            collect_id = 0,
+            categories3 = ee.data.categories3,
+            fir_com = null,
+            fir_quan = null,
+            mapurl = null,
+            mapurl_f_img = null;
+
+
+        //------是否收藏----------
+        await getApp().request.promiseGet("/api/weshop/goodscollect/page", {
+            data: {
+                store_id: os.stoid,
+                goods_id: gid,
+                user_id: oo.user_id,
+            }
+        }).then(res => {
+            var t = res;
+            var data = t.data.data.pageData;
+            if (data && data.length > 0) {
+                //ee.setData({ is_collect: 1, collect_id: data[0].collect_id, });
+                is_collect = 1;
+                collect_id = data[0].collect_id;
+            }
+        })
+
+        //------获取评价的统计数量----
+        await getApp().request.promiseGet("/api/weshop/serviceComment/countlist/", {
+            data: {
+                store_id: os.stoid,
+                service_id: gid
+            },
+        }).then(res => {
+            console.log('get评价统计数量', res.data.data);
+            var t = res;
+            var g = t.data.data[0];
+            if (g != null && g != undefined) {
+                var allnum = g.c0 + g.c1 + g.c2 + g.c3 + g.c4 + g.c5;
+                var num2 = g.c4 + g.c5;
+                var num3 = g.c3;
+                var num4 = g.c0 + g.c1 + g.c2;
+
+                var dd = ee.data.categories3;
+                dd[0].num = allnum;
+                dd[1].num = g.cimg;
+                dd[2].num = num2;
+                dd[3].num = num3;
+                dd[4].num = num4;
+
+                categories3 = dd;
+            }
+        });
+
+        //----获取详情页的评价----
+        await getApp().request.promiseGet("/api/weshop/serviceComment/pageComment", {
+            data: {
+                store_id: os.stoid,
+                service_id: gid,
+                pageSize: 3,
+                parent_id: 0,
+                page: 1,
+                is_show: 1,
+            },
+        }).then(res => {
+            console.log('get详情页评价', res.data.data);
+            fir_com = res.data.data.pageData;
+        });
+
+        if (fir_com) {
+            for (var ind in fir_com) {
+                if (fir_com[ind].head_pic == "") fir_com[ind].head_pic = ee.data.iurl + "/miniapp/images/hui_hear_pic.png";
+                if (fir_com[ind].img) fir_com[ind].img = ut.unserialize(fir_com[ind].img);
+                if (fir_com[ind].weapp_img) fir_com[ind].weapp_img = JSON.parse(fir_com[ind].weapp_img);
+            }
+        }
+        ;
+
+
+        //this.getHistoryBuy(); //获取历史购买
+        ee.setData({
+            is_collect: is_collect,
+            collect_id: collect_id,
+            categories3: categories3,
+            fir_quan: fir_quan,
+            fir_comments: fir_com,
+            // cardComments: fir_com,
+        });
+
+    },
+
+    //检测有没有导购分享的门店
+    check_guide(func) {
+        var first_leader = getApp().globalData.first_leader;
+        if (!first_leader) {
+            func();
+            return false;
+        }
+        if (this.data.is_geted_guide_pick) {
+            func();
+            return false;
+        }
+
+        if (getApp().globalData.guide_pick_id) {
+            func();
+            return false;
+        }
+        var th = this;
+        getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+            if (res.data.code == 0) {
+                getApp().globalData.guide_pick_id = res.data.data.pickup_id;
+            }
+            th.data.is_geted_guide_pick = 1;
+            func();
+        })
+    },
+
+    //---展示---
+    // gid 在onload阶段已经保存在this.data中
+    onShow: function () {
+
+        getApp().check_can_share(this);
+        //-- 看一下隐私政策要不要显示 --
+        var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+        if (privacy_pop) {
+            privacy_pop.check_pri_show();
+        }
+
+        var that = this;
+        var th = this;
+        var ee = this, gid = this.data.gid, i = getApp().request;
+
+        th.data.is_timer = 1;
+        //获取用户的默认门店
+        th.check_guide(() => {
+            getApp().get_user_store(function (e) {
+                if (!e) {
+                    th.data.fir_def_store = {}; //赋值空对象
+                    return false;
+                }
+
+                if (getApp().globalData.is_dj_pk) th.setData({has_def: 1})
+
+                var ee = JSON.parse(JSON.stringify(e));
+                console.log(e);
+
+                //--定时器推迟一下--
+                var appd = getApp().globalData;
+                var w_time = setInterval(function () {
+                    if (that.data.is_get_local_ok == 0) return false;
+                    if (!th.data.data) {
+                        return false;
+                    }
+                    var ser_card = th.data.data;
+                    //--如果默认门店不在等级卡的默认们店以内
+                    if (ser_card.storageId != null && ser_card.storageId != "" && ser_card.storageId.indexOf(ee.keyid) == -1) {
+                        ee.is_no_dis = 1;
+                    }
+
+
+                    clearInterval(w_time);
+                    var distance = null;
+                    var e = JSON.parse(JSON.stringify(ee));
+
+                    //如果有开启近距离的话,同时距离优不一样了
+                    if (that.data.lat != null) {
+                        //如果经纬度有变化的话
+                        if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) {
+                            that.data.fir_def_store = e;
+                            that.setData({
+                                def_pick_store: e,
+                                sto_sele_name: e.pickup_name,
+                                sto_sele_id: e.pickup_id,
+                                sto_sele_distr: e.distr_type,
+                                sto_sele_keyid: e.keyid,
+                            })
+                        } else {
+                            //要用接口是获取距离，js的计算不准
+                            getApp().request.promiseGet("/api/weshop/pickup/list", {
+                                data: {
+                                    store_id: os.stoid,
+                                    pickup_id: e.pickup_id,
+                                    lat: th.data.lat,
+                                    lon: th.data.lon,
+                                    is_pos: 1
+                                },
+                            }).then(res => {
+                                if (ut.ajax_ok(res)) {
+                                    e = res.data.data.pageData[0];
+                                    if (e) {
+                                        e.is_no_dis = ee.is_no_dis;
+                                        appd.pk_store = e;
+                                        that.data.fir_def_store = e;
+
+                                        console.log('get_user_store--2');
+                                        console.log(e);
+
+                                        that.setData({
+                                            def_pick_store: e,
+                                            sto_sele_name: e.pickup_name,
+                                            sto_sele_id: e.pickup_id,
+                                            sto_sele_distr: e.distr_type,
+                                            sto_sele_keyid: e.keyid,
+                                        })
+                                    }
+
+                                }
+                            })
+                        }
+
+                        //e.distance = distance;
+                        appd.lat = that.data.lat;
+                        appd.lon = that.data.lon;
+
+                    } else {
+                        if (e) {
+
+                            console.log('get_user_store3---');
+                            console.log(e);
+
+                            e.distance = null;
+                            that.data.fir_def_store = e;
+                            that.setData({
+                                def_pick_store: e,
+                                sto_sele_name: e.pickup_name,
+                                sto_sele_id: e.pickup_id,
+                                sto_sele_distr: e.distr_type,
+                                sto_sele_keyid: e.keyid,
+                            })
+                        }
+                    }
+                }, 200)
+
+
+            });
+        })
+
+        th.wait_for_store_config();
+
+        i.get("/api/weshop/serviceCard/get/" + o.stoid + "/" + ee.data.gid, {
+            failRollback: !0,
+            success: function (t) {
+                if (t.data.code == 0) {
+                    // console.log('GET pic and video');
+                    if (t.data.data.listServiceVideos && t.data.data.listServiceVideos[0] && t.data.data.listServiceVideos[0].video_url) {
+                        that.setData({
+                            mapurl: t.data.data.listServiceVideos[0].video_url,
+                        });
+                    }
+
+                    if (t.data.data.listServiceVideos && t.data.data.listServiceVideos[0] && t.data.data.listServiceVideos[0].video_img) {
+                        that.setData({
+                            mapurl_f_img: t.data.data.listServiceVideos[0].video_img,
+                        });
+                    }
+
+                    if (t.data.data.listServiceImages) {
+                        that.setData({
+                            gallery: t.data.data.listServiceImages,
+                        });
+                    }
+
+                    if (t.data.data.listServiceItem) {
+                        that.setData({
+                            listServiceItem: t.data.data.listServiceItem,
+                        });
+                    }
+
+                    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,
+                        'data.goods_id': t.data.data.id,
+                        'data.id': t.data.data.id,
+                        'data.sales_sum': t.data.data.sales_sum,
+                        'data.storageId': t.data.data.storageId,
+                        'data.service_sn': t.data.data.serviceSn,
+                        'data.listServiceVideos': t.data.data.listServiceVideos,
+                        // gallery: t.data.data.listServiceImages,
+                        // mapurl: t.data.data.listServiceVideos[0].video_url,
+                        // mapurl_f_img: t.data.data.listServiceVideos[0].video_img,
+                        //listServiceItem: t.data.data.listServiceItem,
+                    });
+
+                    that.getTaohe();
+                    // ----> 秒杀
+                    let prom_type = th.data.options.prom_type;
+
+                    let goods_id = th.data.options.goods_id;
+                    if (!goods_id) goods_id = th.data.data.goods_id;
+
+                    let prom_id = th.data.options.prom_id;
+                    // 检查活动是否开始
+                    th.check_prom(goods_id, prom_type, prom_id);
+
+
+                    getApp().deal_iframe(a, e, 'content', t.data.data.serviceContent, ee);
+
+                    //获取重表
+                    getApp().promiseGet("/api/weshop/serviceItem/list", {
+                        data: {store_id: o.stoid, service_id: t.data.data.id}
+                    }).then(res => {
+                        if (res.data.code == 0) {
+                            var list = res.data.data;
+                            that.setData({service_list: list})
+                        }
+                    })
+
+                } else {
+                    wx.showModal({
+                        title: t.data.msg,
+                        showCancel: !1,
+                        complete: function () {
+                            wx.navigateBack();
+                        }
+                    });
+                }
+                ;
+            }
+        });
+
+        th.data.enterAddressPage && (this.data.enterAddressPage = !1);
+        //没有互动，就调用默认的门店
+        if (!th.data.prom_type) th.get_sto();
+
+
+
+    },
+
+    enterAddress: function () {
+        this.data.enterAddressPage = !0, wx.navigateTo({
+            url: "/packageF/pages/user/address_list/address_list?operate=selectAddress"
+        });
+    },
+
+    onUnload: function () {
+        // for(var i = 1; i < 100; i++) {
+        //   clearInterval(i);
+        // }
+    },
+
+    onHide: function () {
+        this.data.is_timer = 0;
+        // for(var i = 1; i < 100; i++) {
+        //   clearInterval(i);
+        // }
+    },
+    //----------三个选项按钮-----------
+    tabClick: function (t) {
+        var e = t.currentTarget.id;
+        this.setData({
+            activeCategoryId: e
+        }), 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment();
+    },
+
+    tabClick3: function (t) {
+        var e = this;
+        if (t.currentTarget.id != this.data.activeCategoryId3) {
+            e.data.c_curr_p = 1;
+            this.setData({
+                activeCategoryId3: t.currentTarget.id,
+                comments: null, comments_no_more: 0, get_c: 0,
+            });
+            this.requestComments_new();
+        }
+    },
+
+    tabComment: function () {
+        this.setData({
+            activeCategoryId: 2, comments_no_more: 0, get_c: 0
+        }), this.data.comments || this.requestComments_new();
+    },
+
+    //商品详情的时候调用
+    tabGoodsContent: function () {
+        var th = this,
+            i = getApp().request;
+        this.setData({
+            activeCategoryId: 1
+        });
+    },
+
+
+    //------------加入购物车--------------
+    addCart: async function (t) {
+        var th = this;
+        var ind = t.currentTarget.dataset.openSpecModal_ind;
+        var action = t.currentTarget.dataset.action;
+
+
+        if (getApp().is_sp_hao() && action == 'add') {
+            wx.showToast({
+                title: "视频号商品不允许加入购物车",
+                icon: 'none',
+                duration: 2000
+            });
+            return false;
+        }
+
+
+        if (this.data.goodsInputNum == 0) {
+            getApp().my_warnning('请输入购买数量', 1, th, 450);
+            return false;
+        }
+
+
+        if (!ind) ind = t.currentTarget.dataset.openspecmodal_ind;
+
+        th.setData({
+            open_ind_store: ind
+        });
+
+        if (!th.data.sto_sele_name) {
+            getApp().my_warnning('请选择门店', 1, th, 450);
+            return false;
+        }
+
+        // 库存
+        var redisNums = 0;
+        // 限购数
+        var limitNum = 0;
+        // 已购买数量
+        var boughtNum = 0;
+        var is_ok = 1;
+
+        // 获取redis当前可以购买的数量
+        // 如果数量为0，设置和显示已抢光
+        // 否则，进一步判断是否超出限购或超出库存
+        await this.getactLen().then(async function (res) {
+            redisNums = res;
+            let curNum = th.data.goodsInputNum;
+            // res: redis可购买数量
+            console.log('当前可以购买的数量:', res);
+            if (res <= 0) {
+                // 可购买数量<=0, 设置和显示已抢光
+                th.setData({
+                    prom_r_null: 1,
+                });
+                getApp().my_warnning('超出活动库存', 0, self);
+                is_ok = 0;
+                return false;
+            } else {
+
+                if(curNum>redisNums){
+                    getApp().my_warnning('超出活动库存', 0, self);
+                    is_ok = 0;
+                    return false;
+                }
+                // 可购买数量>0
+                // 计算自己还可以购买的数量
+                // 自己还可购买的数量c = 每人活动限购数量a - 自己已经购买的数量b
+                // 如果限购数量a>redis可购买数量d，当增加数量t>d, 提示超出库存
+                // 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购
+                let actInfo = th.data.sele_g;
+                if(actInfo.buy_limit>0){
+                    await th.get_buy_num2().then(function (data) {
+                        let limited = actInfo.buy_limit; // 限购数量a
+                        let promcardbuynum = data.data.data.promcardbuynum;
+                        let canBuyNum = limited - promcardbuynum; // 自己还可购买的数量c
+
+                        limitNum = limited;
+                        boughtNum = promcardbuynum;
+
+                        if (canBuyNum <= 0) {
+                            canBuyNum = 0;
+                        }
+
+                        if (curNum > canBuyNum) {
+                            getApp().my_warnning('超出限购数量', 0, self);
+                            th.setData({
+                                goodsInputNum: canBuyNum || 1,
+                            });
+                            is_ok = 0;
+                            return false;
+                        }
+                    })
+                }
+            }
+        })
+
+        if (!is_ok) return false;
+
+
+        if (action == "buy") {
+            //--------------此时操作的数据------------
+            var newd = {
+                id: th.data.data.id,
+                goods_num: th.data.goodsInputNum,
+                pick_id: th.data.sto_sele_id,
+                keyid: th.data.sto_sele_keyid,
+            };
+            newd['pick_name'] = th.data.sto_sele_name;
+            newd['guide_id'] = getApp().globalData.guide_id;
+            newd['guide_type'] = 0;
+
+            if (getApp().globalData.groupchat_id) {
+                newd['groupchat_id'] = getApp().globalData.groupchat_id;
+            }
+            if (this.data.prom_type) {
+                newd['prom_type'] = this.data.prom_type;
+                newd['prom_id'] = this.data.prom_id;
+                newd['prom_price'] = this.data.prom_price;
+            }
+            th.buyNow(newd);
+        } else {
+
+            var newd = {
+                service_id: th.data.data.id,
+                service_sn: th.data.data.service_sn,
+                service_name: th.data.data.goods_name,
+                goods_num: th.data.goodsInputNum,
+                pick_id: th.data.sto_sele_id,
+                user_id: oo.user_id,
+                store_id: os.stoid,
+                money: th.data.data.shop_price,
+            };
+            if (getApp().globalData.guide_id) {
+                newd['guide_id'] = getApp().globalData.guide_id;
+                newd['guide_type'] = 0;
+            }
+
+            if (getApp().globalData.groupchat_id) {
+                newd['groupchat_id'] = getApp().globalData.groupchat_id;
+            }
+            // 秒杀：单独购买的情况下，加入购物车显示的是零售价，否则显示秒杀活动价
+            newd['prom_type'] = th.data.options.prom_type;
+            newd['prom_id'] = th.data.options.prom_id;
+            newd['money'] = th.data.prom_price;
+
+            //----先看会员在购物车中是否加入了该商品-----
+            getApp().request.get("/api/weshop/cartService/page", {
+                data: {
+                        store_id: os.stoid,
+                        user_id: oo.user_id,
+                        service_id: th.data.data.id,
+                        pick_id: th.data.sto_sele_id
+                },
+                success: function (re) {
+                    //-------如果购物车中有相关的数据---------
+                    if (ut.ajax_ok(re)) {
+                        var item = re.data.data.pageData[0];
+                        // 多门店问题
+                        var cartGoodsNum = 0;
+                        const tmpObj = re.data.data.pageData;
+                        for (let i = 0; i < tmpObj.length; i++) {
+                            if (tmpObj[i].prom_id == th.data.prom_id && tmpObj[i].prom_type==2) {
+                                cartGoodsNum += parseInt(tmpObj[i].goods_num);
+                            }
+                        }
+                        // 以下为当前门店同类商品已经加入到购物车
+                        var totalNum = th.data.goodsInputNum + cartGoodsNum
+                        var snum = limitNum - boughtNum-totalNum;
+                        if (snum < 0 && limitNum>0 ) {
+                            getApp().my_warnning('购物车已经购买了该商品，超出活动限购数量', 0, self);
+                            return false;
+                        }
+                        if (totalNum >= redisNums) {
+                            getApp().my_warnning('购物车已经购买了该商品，超出活动数量', 0, self);
+                            return false;
+                        }
+                        var updata = {
+                            id: item.id,
+                            goods_num: totalNum,
+                            money: th.data.data.shop_price,
+                            store_id: os.stoid,
+                        };
+                        updata['money'] = th.data.prom_price;
+
+                        if (getApp().globalData.guide_id) {
+                            updata['guide_id'] = getApp().globalData.guide_id;
+                            updata['guide_type'] = 1;
+                        }
+                        if (getApp().globalData.groupchat_id) {
+                            updata['groupchat_id'] = getApp().globalData.groupchat_id;
+                        }
+                        getApp().request.put("/api/weshop/cartService/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 {
+                        getApp().request.post("/api/weshop/cartService/save", {
+                            data: newd,
+                            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();
+                            }
+                        });
+                    }
+                }
+            });
+
+        }
+
+
+    },
+
+    //----------立即购买-----------
+    buyNow: function (e) {
+        getApp().globalData.service_now = e;
+        wx.redirectTo({
+            url: "/packageA/pages/cart2_ser/cart2_ser",
+        });
+    },
+    //----------增加购买数量-----------
+    addCartNum: function (t) {
+        this.checkCartNum(this.data.goodsInputNum + 1);
+    },
+    //----------减少购买数量-----------
+    subCartNum: function (t) {
+        this.checkCartNum(this.data.goodsInputNum - 1);
+    },
+    //----------输入框输入购买数量-----------
+    inputCartNum: function (t) {
+        this.checkCartNum(Number(t.detail.value));
+    },
+
+    //------检查数量是不是超出限购------
+    checkCartNum: async function (t) {
+        var th = this;
+
+        if (!th.data.def_pick_store) {
+            wx.showModal({title: '请选择门店',});
+            return false;
+        }
+        // 非秒杀活动
+        if (this.data.prom_type != 1) {
+            this.setData({
+                goodsInputNum: t,
+            });
+        }
+
+        //团购活动
+        // 获取redis当前可以购买的数量
+        // 如果数量为0，设置和显示已抢光
+        // 否则，进一步判断是否超出限购或超出库存
+        await this.getactLen().then(async function (res) {
+
+            if (t > res) { // t当前增减的数量
+                // wx.showModal({
+                // 	title: '超出活动库存',
+                // });
+                getApp().my_warnning('超出活动库存', 0, self);
+                th.setData({
+                    goodsInputNum: res || 1,
+                });
+                return false;
+            }
+
+
+            // res: redis可购买数量
+            // console.log('当前可以购买的数量:', res);
+            if (res <= 0) {
+                // 可购买数量<=0, 设置和显示已抢光
+                th.setData({
+                    prom_r_null: 1,
+                });
+            } else {
+                // 可购买数量>0
+                // 计算自己还可以购买的数量
+                // 自己还可购买的数量c = 每人活动限购数量a - 自己已经购买的数量b
+                // 如果限购数量a>redis可购买数量d，当增加数量t>d, 提示超出库存
+                // 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购
+                let actInfo = th.data.sele_g;
+                await th.get_buy_num2().then(function (data) {
+                    let limited = actInfo.buy_limit == 0 ? 100000 : actInfo.buy_limit; // 限购数量a
+                    let promcardbuynum = data.data.data.promcardbuynum;
+                    let buyedNum = promcardbuynum; // 自己已经购买的数量b
+                    let canBuyNum = limited - buyedNum; // 自己还可购买的数量c
+
+                    if (canBuyNum <= 0) {
+                        canBuyNum = 0;
+                    }
+
+                    if (t > canBuyNum) {
+                        // wx.showModal({
+                        // 	title: '超出限购数量',
+                        // });
+                        getApp().my_warnning('超出限购数量', 0, self);
+                        th.setData({
+                            goodsInputNum: canBuyNum || 1,
+                        });
+                        return false;
+                    }
+
+
+                    th.setData({
+                        goodsInputNum: t,
+                    });
+                });
+            }
+
+        })
+
+
+
+
+    },
+
+
+    closeSpecModal: function () {
+        this.setData({
+            openSpecModal: !1,
+            openSpecModal_pt: !1,
+            openSpecModal_flash_normal: !1,
+        });
+    },
+
+    openSpecModel: function (t) {
+
+        if (this.data.get_sto_ing) return false;
+
+        var th = this;
+        var open_store = t.currentTarget.dataset.ind;
+        if (getApp().is_sp_hao() && open_store == 1) {
+            wx.showToast({
+                title: "视频号商品不允许加入购物车",
+                icon: 'none',
+                duration: 2000
+            });
+            return false;
+        }
+
+
+        //--先判断会员状态--
+        var user_info = getApp().globalData.userInfo;
+        if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+            wx.navigateTo({
+                url: '/packageE/pages/togoin/togoin',
+            })
+            return false;
+        }
+
+        this.setData({
+            store: 0,
+            choice_sort_store: 0,
+            sort_store: 0,
+            open_ind_store: open_store,
+        })
+
+
+        var ind = t.currentTarget.dataset.ind;
+        this.setData({
+            openSpecModal: !0,
+            openSpecModal_ind: ind,
+        });
+
+    },
+
+    //---------点击收藏和不收藏------------
+    collectGoods: function () {
+        var t = this, i = getApp().request;
+        var user_id = s.globalData.user_id;
+        if (user_id == '') {
+            getApp().getUserFir(function () {
+            });
+            getApp().showWarning("未登录");
+            return false;
+        } else {
+
+            if (t.data.is_collect_load) return false;
+            t.data.is_collect_load = 1;
+
+            if (t.data.is_collect == 1) { //删除收藏
+                i.delete("/api/weshop/goodscollect/del/" + o.stoid + "/" + t.data.collect_id, {
+                    success: function (e) {
+                        t.data.is_collect_load = 0;
+                        if (e.data.code == 0) {
+                            t.setData({
+                                is_collect: 0,
+                                collect_id: 0,
+                            });
+                            ut.m_toast('取消成功');
+                        }
+                    }
+                });
+            } else {
+                var timestamp = Date.parse(new Date());
+                timestamp = timestamp / 1000;
+                var d = {
+                    goods_id: t.data.data.goods_id,
+                    user_id: s.globalData.user_id,
+                    store_id: o.stoid,
+                    add_time: timestamp,
+                    type: 1,
+                };
+                //加入收藏夹就是导购的ID
+                if (getApp().globalData.guide_id) {
+                    d.guide_id = getApp().globalData.guide_id;
+                    d.guide_type = 2;
+                }
+                if (getApp().globalData.groupchat_id) {
+                    d.groupchat_id = getApp().globalData.groupchat_id;
+                }
+                i.post("/api/weshop/goodscollect/save", { //添加收藏
+                    data: d,
+                    success: function (e) {
+                        t.data.is_collect_load = 0;
+                        if (e.data.code == 0) {
+                            t.setData({
+                                is_collect: 1,
+                                collect_id: e.data.data.collect_id,
+                            });
+                            ut.m_toast('收藏成功 在【我的-收藏夹】中查看');
+                        }
+                    }
+                });
+            }
+        }
+    },
+    //---------联系客服------------
+    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();
+            });
+        });
+    },
+    //-------获取购物车数量----------
+    requestCardNum: function () {
+        var t = this;
+        getApp().request.get("/api/weshop/cart/page", {
+            data: {
+                store_id: o.stoid,
+                user_id: s.globalData.user_id,
+                state: 0,
+                is_gift: 0
+            },
+            success: function (e) {
+                var num = 0;
+                for (var i = 0; i < e.data.data.pageData.length; i++) {
+                    num += e.data.data.pageData[i].goods_num;
+                }
+
+                //-- 读取服务卡的数量 --
+                getApp().promiseGet("/api/weshop/cartService/page", {
+                    data: {
+                        store_id: s.globalData.setting.stoid,
+                        user_id: s.globalData.user_id,
+                    }
+                }).then(res => {
+                    for (var i = 0; i < res.data.data.pageData.length; i++) {
+                        num += res.data.data.pageData[i].goods_num;
+                    }
+                    t.setData({cartGoodsNum: num});
+                })
+
+
+            }
+        });
+    },
+
+    //--点击分享事件---
+    onShareAppMessage: function (t) {
+
+        var th = this;
+        var price = th.data.data.shop_price;
+        if (th.data.prom_act) {
+            price = th.data.prom_act.price;
+
+        }
+        var title = th.data.data.goods_name;
+        var img = th.data.iurl + th.data.data.image_url;
+        if (th.data.prom_type == 6) {
+            title = th.data.prom_act.share_title;
+            img = th.data.iurl + th.data.prom_act.share_imgurl;
+        }
+
+
+        var url = "/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id=" + th.data.gid+"&prom_id="+th.data.prom_id;
+        if (getApp().globalData.user_id) {
+            url += "&first_leader=" + getApp().globalData.user_id;
+        }
+
+        //-- 如果房间分享，且不是会员分享的 --
+        if (getApp().globalData.room_id &&
+            th.data.data.goods_id == getApp().globalData.room_goods_id &&
+            !getApp().globalData.room_user_share
+        ) {
+            url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1";
+        }
+
+
+        var ob = {
+            title: price + "元  " + title,
+            path: url,
+            imageUrl: img,
+        };
+
+        // 如果服务卡参加秒杀活动，且后台设置了分享标题和分享图片
+        if (th.data.prom_type == 1) {
+            if (th.data.sele_g && th.data.sele_g.share_title) {
+                title = th.data.sele_g.share_title;
+                ob.title = title;
+            }
+            ;
+            if (th.data.sele_g && th.data.sele_g.share_imgurl) {
+                img = th.data.iurl + th.data.sele_g.share_imgurl;
+                ob.imageUrl = img;
+            }
+        }
+
+        return ob;
+
+    },
+
+    //-----图片失败，默认图片-----
+    bind_bnerr: function (e) {
+        var _errImg = e.target.dataset.errorimg;
+        var _errObj = {};
+        _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif";
+        this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    },
+
+    //-----图片失败，默认图片-----
+    bind_bnerr2: function (e) {
+
+        var _errImg = e.target.dataset.errorimg;
+        var _errObj = {};
+        _errObj[_errImg] = this.data.iurl + "/miniapp/images/hui_hear_pic.png"
+        this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    },
+
+
+    //---------拿出门店分类和门店------------
+    get_sto(e) {
+        var is_normal = e;
+        var th = this, that = this;
+
+        if (e == 1) {
+            th.setData({
+                is_normal: 1
+            })
+        } else {
+            th.setData({
+                is_normal: 0
+            })
+        }
+
+        this.data.get_sto_ing = 1;
+
+        var timer_get = setInterval(function () {
+            if (th.data.is_get_local_ok == 0) return false;
+            if (!th.data.fir_def_store) return false;
+            var i = getApp().request;
+            if (!th.data.data) return false;
+            var dd = {
+                store_id: o.stoid,
+                isstop: 0,
+                is_pos: 1,
+                pageSize: 2000
+            }
+            //如果有距离的话
+            if (th.data.lat != null) {
+                dd.lat = th.data.lat;
+                dd.lon = th.data.lon;
+            }
+            clearInterval(timer_get);
+
+            //如果会员是有默认的门店话
+            if (!th.data.def_pick_store && th.data.fir_def_store) {
+                th.setData({def_pick_store: th.data.fir_def_store});
+            }
+
+            wx.showLoading({
+                title: '加载中.'
+            });
+            //----------获取门店----------------
+            getApp().request.promiseGet("/api/weshop/pickup/list", {
+                data: dd,
+            }).then(res => {
+                var e = res;
+                if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length > 0) {
+
+                    var his_cate_num = 0;
+                    for (let i in e.data.data.pageData) {
+                        let item = e.data.data.pageData[i];
+                        if (item.category_id > 0) {
+                            his_cate_num = 1;
+                            break;
+                        }
+                    }
+                    e.his_cate_num = his_cate_num;
+
+                    //--普通门店排版,服务卡项有指定门店才能使用，所以要筛选一下--
+                    setTimeout(function () {
+                        var sto_list = th.data.data.storageId;
+                        if (sto_list) {
+                            for (var k = 0; k < e.data.data.pageData.length; k++) {
+                                var it = e.data.data.pageData[k];
+                                if (sto_list.indexOf(it.keyid) == -1) {
+                                    //删除
+                                    e.data.data.pageData.splice(k--, 1);
+                                }
+                            }
+
+                        }
+
+                        //如果有秒杀的指定门店
+                        if (th.data.prom_type == 2 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length && !is_normal) {
+                            var pick_up_lists = th.data.prom_act.pick_up_lists;
+                            for (var kq = 0; kq < e.data.data.pageData.length; kq++) {
+                                var it0 = e.data.data.pageData[kq];
+                                var idx0 = pick_up_lists.findIndex(function (e) {
+                                    return e.pickup_id == it0.pickup_id;
+                                })
+                                if (idx0 < 0) {
+                                    //删除
+                                    e.data.data.pageData.splice(kq--, 1);
+                                }
+                            }
+
+                            if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') {
+                                //-- 查找一下门店有没有在 --
+                                var idx1 = pick_up_lists.findIndex(function (e) {
+                                    return e.pickup_id == th.data.def_pick_store.pickup_id;
+                                })
+                                if (idx1 < 0) {
+                                    //如果是秒杀的指定门店，就要设置秒杀的
+                                    th.data.def_pick_store.is_no_dis_act = 1;
+                                    that.setData({
+                                        def_pick_store: th.data.def_pick_store
+                                    })
+                                }
+                            }
+
+                        }
+
+                        //-- 如果门店过滤后，还会是数量 --
+                        if (e.data.data.pageData.length) {
+                            //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
+                            if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && th.data.bconfig.is_sort_storage) {
+                                th.setData({
+                                    def_pick_store: e.data.data.pageData[0],
+                                    sto_sele_name: e.data.data.pageData[0].pickup_name,
+                                    sto_sele_id: e.data.data.pageData[0].pickup_id,
+                                    sto_sele_distr: e.data.data.pageData[0].distr_type,
+                                    sto_sele_keyid: e.data.data.pageData[0].keyid,
+                                });
+                                th.data.fir_def_store = e.data.data.pageData[0];
+                            }
+
+                            //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
+                            if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') {
+                                for (var k = 0; k < e.data.data.pageData.length; k++) {
+                                    if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
+                                        e.data.data.pageData.splice(k, 1); //删除
+                                        break;
+                                    }
+                                }
+                                e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
+                            }
+
+                            th.setData({all_pick_list: e.data.data.pageData, isshow: 1});
+                            th.deal_pickup(e);
+                        } else {
+                            th.data.get_sto_ing = 0;
+                            th.setData({
+                                isshow: 1
+                            })
+                            wx.hideLoading();
+                        }
+
+
+                    }, 800)
+
+                }
+            })
+        }, 200)
+    },
+    //获取搜索门店输入的值
+    input_store: function (e) {
+        this.setData({
+            keyword: e.detail.value
+        })
+    },
+    //搜索门店
+    searchfn() {
+        let choice_sort_store = this.data.choice_sort_store
+        if (choice_sort_store == 0) {  //全局搜索
+            let all_pick_list = this.data.all_pick_list
+            let def_pickpu_list = this.data.def_pickpu_list
+            let keyword = this.data.keyword
+            if (keyword) {
+                let arr = all_pick_list.filter(item => {
+                    let i = item.pickup_name.indexOf(keyword)
+                    if (i > -1) {
+                        return true
+                    } else {
+                        return false
+                    }
+                })
+                if (arr && arr.length > 0) {
+                    if (this.data.is_show_sto_cat == 1) {
+                        this.setData({
+                            def_pickpu_list: arr
+                        })
+                    } else {
+                        this.setData({
+                            only_pk: arr
+                        })
+                    }
+                } else {
+                    wx.showToast({
+                        title: '没有搜索到门店',
+                        icon: 'none',
+                        duration: 2000
+                    })
+                }
+            } else {
+                if (this.data.is_show_sto_cat == 1) {
+                    this.setData({
+                        def_pickpu_list: all_pick_list.slice(0, 10)
+                    })
+                } else {
+                    this.setData({
+                        only_pk: all_pick_list
+                    })
+                }
+
+            }
+        } else {   //分类下搜索
+            let sec_i = this.data.sec_i
+            let all_sto = this.data.all_sto
+            let old_all_sto = this.data.old_all_sto
+            if (!old_all_sto) {
+                this.setData({
+                    old_all_sto: JSON.parse(JSON.stringify(all_sto))
+                })
+            }
+            let sec_sto = this.data.sec_sto
+            let sec_arr = this.data.old_all_sto[sec_i].s_arr
+            let keyword = this.data.keyword
+            let text = 'sec_sto.s_arr'
+            if (keyword) {
+                let arr = sec_arr.filter(item => {
+                    let i = item.pickup_name.indexOf(keyword)
+                    if (i > -1) {
+                        return true
+                    } else {
+                        return false
+                    }
+                })
+                if (arr && arr.length > 0) {
+                    this.setData({
+                        [text]: arr
+                    })
+                } else {
+                    wx.showToast({
+                        title: '没有搜索到门店',
+                        icon: 'none',
+                        duration: 2000
+                    })
+                }
+            } else {
+                if (this.data.old_all_sto) {
+                    this.setData({
+                        [text]: this.data.old_all_sto[sec_i].s_arr
+                    })
+                } else {
+                    this.setData({
+                        [text]: all_sto[sec_i].s_arr
+                    })
+                }
+            }
+
+
+        }
+    },
+
+
+    //------------处理门店---------------
+    deal_pickup(e) {
+        var th = this;
+        if (!th.data.data) return false
+        wx.hideLoading();
+        //单总量超出5个的时候
+        if (e.data.data.total > 10 && e.his_cate_num) {
+            getApp().request.get("/api/weshop/storagecategory/page", {
+                data: {
+                    store_id: o.stoid,
+                    pageSize: 1000,
+                    orderField: "sort",
+                    orderType: 'asc',
+                },
+                success: function (ee) {
+                    if (ee.data.code == 0) {
+
+                        var check_all_cate = 0;
+                        if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {
+                            for (let i in ee.data.data.pageData) {
+                                let item = ee.data.data.pageData[i];
+                                if (item.is_show == 1) {
+                                    check_all_cate = 1;
+                                    break
+                                }
+                            }
+                        }
+
+                        if (check_all_cate) {
+
+
+                            var sto_cate = ee.data.data.pageData;
+                            var sto_arr = e.data.data.pageData;
+                            var newarr = new Array();
+                            var qita = new Array();
+
+                            var is_del_pk = 0;
+
+                            //----要进行门店分组--------
+                            for (var i = 0; i < sto_arr.length; i++) {
+                                //找一下这个门店有没有在分类数组内
+                                var find2 = 0, find2name = "", sort = 0;
+                                is_del_pk = 0;
+                                for (var m = 0; m < sto_cate.length; m++) {
+                                    if (sto_arr[i].category_id == sto_cate[m].cat_id) {
+                                        if (sto_cate[m].is_show != 1) {
+                                            is_del_pk = 1;
+                                            sto_arr.splice(i, 1);
+                                            i--;
+                                        } else {
+                                            find2 = sto_cate[m].cat_id;
+                                            find2name = sto_cate[m].cat_name;
+                                            sort = sto_cate[m].sort;
+                                            is_del_pk = 0;
+                                        }
+                                        break;
+                                    }
+                                }
+                                if (is_del_pk) continue;
+
+                                if (newarr.length > 0) {
+                                    var find = 0;
+                                    //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
+                                    if (find2 != 0) {
+                                        for (var ii = 0; ii < newarr.length; ii++) {
+                                            if (sto_arr[i].category_id == newarr[ii].cat_id) {
+                                                newarr[ii].s_arr.push(sto_arr[i]);
+                                                find = 1;
+                                                break;
+                                            }
+                                        }
+                                        if (find == 0) {
+                                            var arr0 = new Array();
+                                            arr0.push(sto_arr[i]);
+                                            var item = {
+                                                cat_id: find2,
+                                                name: find2name,
+                                                sort: sort,
+                                                s_arr: arr0
+                                            };
+                                            newarr.push(item);
+                                        }
+                                    } else {
+                                        qita.push(sto_arr[i]);
+                                    }
+                                } else {
+                                    //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
+                                    if (find2 != 0) {
+                                        var arr0 = new Array();
+                                        arr0.push(sto_arr[i]);
+                                        var item = {
+                                            cat_id: find2,
+                                            name: find2name,
+                                            sort: sort,
+                                            s_arr: arr0
+                                        };
+                                        newarr.push(item);
+                                    } else {
+                                        qita.push(sto_arr[i]);
+                                    }
+                                }
+                            }
+
+                            var def_arr = new Array();
+                            //-- 开始就看10个门店 --
+                            for (var k = 0; k < 10; k++) {
+                                if (k == sto_arr.length) break;
+                                def_arr.push(sto_arr[k]);
+                            }
+
+                            th.setData({
+                                def_pickpu_list: def_arr,
+                                pickpu_list: ee.data.data.pageData
+                            });
+
+                            //门店分类要排序下
+                            function compare(property) {
+                                return function (a, b) {
+                                    var value1 = a[property];
+                                    var value2 = b[property];
+                                    return value1 - value2;
+                                }
+                            }
+
+                            if (newarr.length > 0)
+                                newarr.sort(compare("sort"));
+
+                            //----安排其他的分类-----
+                            if (qita.length > 0) {
+                                var item = {
+                                    cat_id: -1,
+                                    name: "其他",
+                                    s_arr: qita
+                                };
+                                newarr.push(item);
+                            }
+
+                            var sd = {
+                                all_sto: newarr,
+                                is_show_sto_cat: 1
+                            }
+                            if (!sto_arr || sto_arr.length <= 10) {
+                                sd.is_show_sto_cat = -1;
+                                sd.only_pk = sto_arr;
+                            }
+                            th.setData(sd);
+
+                        } else {
+                            th.setData({
+                                is_show_sto_cat: -1,
+                                only_pk: e.data.data.pageData
+                            });
+                            //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
+                            if (!th.data.def_pick_store) {
+                                th.setData({def_pick_store: e.data.data.pageData[0]})
+                            }
+                        }
+                    } else {
+                        th.setData({
+                            is_show_sto_cat: -1,
+                            only_pk: e.data.data.pageData
+                        });
+                        //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
+                        if (!th.data.def_pick_store) {
+                            th.setData({def_pick_store: e.data.data.pageData[0]})
+                        }
+                    }
+                    th.data.get_sto_ing = 0;
+                }
+            });
+        } else {
+            th.data.get_sto_ing = 0;
+
+            th.setData({
+                is_show_sto_cat: 0,
+                only_pk: e.data.data.pageData
+            });
+            //-----如果没有默认门店，要取第一个门店作为默认店------
+            if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) {
+
+                if (e.data.data && e.data.data.pageData && e.data.data.pageData.length > 0) {
+                    th.setData({
+                        def_pick_store: e.data.data.pageData[0],
+                        sto_sele_name: e.data.data.pageData[0].pickup_name,
+                        sto_sele_id: e.data.data.pageData[0].pickup_id,
+                        sto_sele_distr: e.data.data.pageData[0].distr_type,
+                        sto_sele_keyid: e.data.data.pageData[0].keyid,
+                    })
+                }
+
+            }
+        }
+    },
+
+    //加载更多是靠这个函数
+    onReachBottom: function () {
+        if (this.data.activeCategoryId == 2) {
+            if (!this.data.comments_no_more) this.requestComments_new();
+        }
+
+        var goods_list = this.selectComponent("#goods_list"); //组件的id
+        if (goods_list) goods_list.get_list();
+    },
+
+
+    //---小于10的格式化函数----
+    timeFormat(param) {
+        return param < 10 ? '0' + param : param;
+    },
+
+
+    // ----视频图片----
+    // 图片计数器
+    swiperChange: function (e) {
+        var that = this;
+        if (e.detail.current > 0) {
+            that.setData({
+                hiddenn: 1,
+                videopicture: 1,
+            })
+        } else {
+            that.setData({
+                hiddenn: 0,
+                videopicture: 0,
+            })
+        }
+        if (e.detail.source == 'touch') {
+            that.setData({
+                current: e.detail.current
+            })
+        }
+    },
+
+    /*---视频相关--*/
+    videopicture: function (e) {
+        var vipi = e.currentTarget.dataset.vipi;
+        this.setData({
+            videopicture: vipi,
+            swiperCurrent: vipi,
+            noon: 0,
+            current: 1
+        });
+    },
+
+    videoPlay: function (e) {
+        var _index = e.currentTarget.id
+        this.setData({
+            _index: _index,
+            noon: 1
+        })
+
+        setTimeout(function () {
+            //将点击视频进行播放
+            var videoContext = wx.createVideoContext(_index)
+            videoContext.play();
+        }, 500)
+    },
+
+    //--获取头像的本地缓存,回调写法--
+    get_head_temp: function (tt, func) {
+        var ee = this;
+        if (ee.data.share_head) {
+            tt(func);
+            return false;
+        }
+        //---获取分享图片的本地地址,头像和商品图片----
+        var path2 = getApp().globalData.userInfo ? getApp().globalData.userInfo.head_pic : '';
+        if (path2 == "") {
+            ee.data.share_head = "../../../../images/share/hui_hear_pic.png";
+            tt(func);
+        } else {
+            path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
+            path2 = path2.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
+            wx.getImageInfo({
+                src: path2,
+                success: function (res) {
+                    //res.path是网络图片的本地地址
+                    ee.data.share_head = res.path;
+                    tt(func);
+                },
+                fail: function (res) {
+                    ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的
+                    tt(func);
+                }
+            });
+        }
+    },
+
+    //--获取商品图片的本地缓存，回调写法--
+    get_goods_temp: function (tt) {
+        var ee = this;
+        if (ee.data.share_goods_img) {
+            tt();
+            return false;
+        }
+
+        var img = ee.data.iurl + ee.data.data.image_url;
+        if (ee.data.prom_act && ee.data.prom_act.share_img) {
+            img = ee.data.iurl + ee.data.prom_act.share_img;
+        }
+
+        //获取商品是分享图信息
+        wx.getImageInfo({
+            src: img,
+            success: function (res) {
+                //res.path是网络图片的本地地址
+                ee.data.share_goods_img = res.path;
+                tt();
+            },
+            fail: function (res) {
+                //获取默认空白图
+                wx.getImageInfo({
+                    src: ee.data.iurl + '/miniapp/images/default_g_img.gif',
+                    success: function (res) {
+                        ee.data.share_goods_img = res.path; //分享的图片不能用网络的
+                        tt();
+                    }
+                })
+
+            }
+        });
+    },
+
+
+    //--跳转到商品详情页面--
+    go_goods: function (e) {
+        var gid = e.currentTarget.dataset.gid;
+        var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid;
+        getApp().goto(url);
+    },
+
+
+    pop_err_img: function (e) {
+        var txt = e.currentTarget.dataset.errorimg;
+        var ob = {};
+        ob[txt] = this.data.iurl + "/miniapp/images/default_g_img.gif";
+        this.setData(ob);
+    },
+
+    // 选择门店
+    choice_store: function (ee) {
+        this.setData({
+            keyword: ''
+        })
+        var th = this;
+        var ind = ee.currentTarget.dataset.ind;
+        var bconfig = th.data.bconfig;
+
+        //--先判断会员状态--
+        var user_info = getApp().globalData.userInfo;
+        // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+        //     wx.navigateTo({
+        //         url: '/packageE/pages/togoin/togoin',
+        //     })
+        //     return false;
+        // }
+
+
+        //如果开启了，则不在选择门店
+        if (this.data.sys_switch.is_pricing_open_store && getApp().globalData.pk_store) {
+            return false;
+        }
+        if (!th.data.only_pk && !th.data.def_pickpu_list) {
+            getApp().confirmBox("暂无可售门店", null, 25000, !1);
+            return false;
+        }
+
+        if (th.data.only_pk && !th.data.only_pk.length) {
+            getApp().confirmBox("暂无可售门店", null, 25000, !1);
+            return false;
+        }
+        if (th.data.def_pickpu_list && !th.data.def_pickpu_list.length) {
+            getApp().confirmBox("暂无可售门店", null, 25000, !1);
+            return false;
+        }
+
+
+        if (bconfig && bconfig.is_sort_storage) {
+            wx.getLocation({
+                type: 'gcj02',
+                success: function (res) {
+
+                    th.data.lat = res.latitude;
+                    th.data.lon = res.longitude;
+                    th.data.is_get_local_ok = 1;
+                    th.setData({is_gps: 1});
+                    th.get_sto(th.data.is_normal);
+                },
+                fail: function (res) {
+
+                    th.data.is_get_local_ok = 1;
+                    th.get_sto(th.data.is_normal);
+                    if (res.errCode == 2) {
+                        th.setData({is_gps: 0});
+                        if (th.data.is_gps == 0) {
+                            getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+                        }
+                    } else {
+                        th.setData({is_gps: "3"});
+                    }
+
+                }
+            })
+        } else {
+            th.data.is_get_local_ok = 1;
+            th.get_sto(th.data.is_normal);
+        }
+
+        if (ind != undefined && ind != null) {
+            this.setData({
+                open_ind_store: ind,
+                store: 1,
+                openSpecModal: !1,
+                openSpecModal_pt: !1
+            })
+        } else {
+            this.setData({
+                store: 1,
+                openSpecModal: !1,
+                openSpecModal_pt: !1
+            })
+        }
+    },
+    //关闭选择门店
+    close_popup: function (e) {
+        var th = this;
+        this.setData({
+            store: 0,
+            choice_sort_store: 0,
+            sort_store: 0,
+            fir_pick_index: 0,
+            sec_pick_index: 0
+        })
+
+        var openindstore = this.data.open_ind_store;
+        if (openindstore == 1) {
+            th.setData({
+                openSpecModal: !0,
+                openSpecModal_ind: openindstore,
+            });
+        } else if (openindstore == 2) {
+            th.setData({
+                openSpecModal: !0,
+                openSpecModal_ind: openindstore,
+            });
+        } else if (openindstore == 4) { //4就是拼团
+            th.setData({
+                openSpecModal_pt: 1,      //打开拼团购买界面
+                store: 0,                 //关闭门店
+                choice_sort_store: 0,     //关闭门店2级
+                sort_store: 0,             //关闭门店2级
+            });
+        } else {
+            th.setData({
+                store: 0,
+                choice_sort_store: 0,
+                sort_store: 0
+            })
+        }
+    },
+
+    //选择更多门店
+    more_store: function () {
+        this.setData({
+            sort_store: 1
+        });
+    },
+
+    sort_store: function () {
+    },
+    // 返回按钮
+    returns: function () {
+        this.setData({
+            sort_store: 0,
+            choice_sort_store: 0
+        });
+    },
+    //---选择分类门店---
+    choice_sort_store: function (e) {
+        var index = e.currentTarget.dataset.index;
+        var region_name = e.currentTarget.dataset.region;
+        var item = this.data.all_sto[index];
+        this.setData({
+            region_name: region_name,
+            sort_store: 0,
+            choice_sort_store: 1,
+            sec_sto: item,
+            sec_i: index,
+            sec_pick_index: 0
+        });
+    },
+
+    choose_for_store_fir: function (e) {
+        var index_c = e.currentTarget.dataset.ind;
+        var th = this;
+        th.setData({
+            fir_pick_index: index_c
+        })
+
+    },
+
+    //确定def_pick为选择的门店
+    sure_pick: function (e) {
+        var th = this;
+        var item = null;
+        var openindstore = th.data.open_ind_store;
+
+        if (th.data.choice_sort_store == 0) {
+            var index = th.data.fir_pick_index;
+            if (th.data.is_show_sto_cat == 1) {
+                item = th.data.def_pickpu_list[index];
+            } else {
+                item = th.data.only_pk ? th.data.only_pk[index] : null; //当没有门店分类的时候
+            }
+
+        } else {
+            var index = th.data.sec_pick_index;
+            item = th.data.sec_sto.s_arr[index];
+        }
+
+        if (!item) return false;
+
+
+        var ser_card = this.data.data;
+        //判断门店的配送方式是不是匹配
+        if (ser_card.storageId != null && ser_card.storageId != "" && ser_card.storageId.indexOf(item.keyid) == -1) {
+            wx.showToast({
+                title: "该门店无此服务项目，请重新选择！",
+                icon: 'none',
+                duration: 2000
+            });
+            return false;
+        }
+
+        if (!item) return false;
+
+        th.setData({
+            def_pick_store: item,
+            sto_sele_name: item.pickup_name,
+            sto_sele_id: item.pickup_id,
+            sto_sele_keyid: item.keyid,
+            sto_sele_distr: item.distr_type,
+            store: 0,
+            choice_sort_store: 0,
+            fir_pick_index: 0
+        });
+
+        if (openindstore == 1) {
+            th.setData({
+                openSpecModal: !0,
+                openSpecModal_ind: openindstore,
+            });
+        } else if (openindstore == 2) {
+            th.setData({
+                openSpecModal: !0,
+                openSpecModal_ind: openindstore,
+            });
+        } else if (openindstore == 4) { //4就是拼团
+            th.setData({
+                openSpecModal_pt: 1,      //打开拼团购买界面
+                store: 0,                 //关闭门店
+                choice_sort_store: 0,     //关闭门店2级
+                sort_store: 0,             //关闭门店2级
+            });
+        } else {
+            th.setData({
+                store: 0,
+                choice_sort_store: 0,
+                sort_store: 0
+            })
+        }
+    },
+
+    //---点击二级之后的选择---
+    choose_for_store: function (e) {
+        var index_c = e.currentTarget.dataset.ind;
+        var th = this;
+        th.setData({
+            sec_pick_index: index_c,
+            fir_pick_index: index_c
+        })
+
+    },
+    //把选择的门店设置成默认的门店def_pick
+    set_def_pick: function (e) {
+        var th = this;
+        var item = null;
+        if (th.data.choice_sort_store == 0) {
+            var index = th.data.fir_pick_index;
+            if (th.data.is_show_sto_cat == 1) {
+                item = th.data.def_pickpu_list[index];
+            } else {
+                item = th.data.only_pk ? th.data.only_pk[index] : null; //当没有门店分类的时候
+            }
+        } else {
+            var index = th.data.sec_pick_index;
+            item = th.data.sec_sto.s_arr[index];
+        }
+
+        if (!item) return false;
+
+        //判断门店的配送方式是不是匹配
+        var ser_card = this.data.data;
+        //判断门店的配送方式是不是匹配
+        if (ser_card.storageId != null && ser_card.storageId != "" && ser_card.storageId.indexOf(item.keyid) == -1) {
+            wx.showToast({
+                title: "该门店无此服务项目，请重新选择！",
+                icon: 'none',
+                duration: 2000
+            });
+            return false;
+        }
+
+
+        var store_id = o.stoid;
+        var user_id = getApp().globalData.user_id;
+        var def_pickup_id = item.pickup_id;
+
+        getApp().request.put('/api/weshop/users/update', {
+            data: {
+                user_id: user_id,
+                def_pickup_id: def_pickup_id
+            },
+            success: function (res) {
+                if (res.data.code == 0) {
+                    if (th.data.choice_sort_store == 0) th.setData({
+                        fir_pick_index: 0
+                    });
+                    getApp().globalData.pk_store = item;
+                } else {
+                    //s.showWarning("设置默认门店地址失败", null, 500, !1);
+                    getApp().my_warnning("设置默认门店地址失败", 0, th)
+                }
+
+            }
+        });
+
+
+        if (!item) return false;
+
+        th.setData({
+            def_pick_store: item,
+            sto_sele_name: item.pickup_name,
+            sto_sele_id: item.pickup_id,
+            sto_sele_keyid: item.keyid,
+            sto_sele_distr: item.distr_type,
+            store: 0,
+            choice_sort_store: 0
+        });
+
+        var openindstore = th.data.open_ind_store;
+        if (openindstore == 1) {
+            th.setData({
+                openSpecModal: !0,
+                openSpecModal_ind: openindstore,
+                store: 0,
+                choice_sort_store: 0,
+                sort_store: 0,
+            });
+        } else if (openindstore == 2) {
+            th.setData({
+                openSpecModal: !0,
+                openSpecModal_ind: openindstore,
+                store: 0,
+                choice_sort_store: 0,
+                sort_store: 0,
+            });
+        } else if (openindstore == 4) { //4就是拼团
+            th.setData({
+                openSpecModal_pt: 1,      //打开拼团购买界面
+                store: 0,                 //关闭门店
+                choice_sort_store: 0,     //关闭门店2级
+                sort_store: 0,             //关闭门店2级
+            });
+        } else {
+            th.setData({
+                store: 0,
+                choice_sort_store: 0,
+                sort_store: 0,
+            })
+        }
+
+    },
+
+    wait_for_store_config: function () {
+        var th = this;
+        var t_time = setInterval(function () {
+            if (th.data.bconfig == null) false;
+            var e = th.data.bconfig;
+            if (e && e.is_sort_storage) {
+                wx.getLocation({
+                    type: 'gcj02',
+                    success: function (res) {
+                        th.data.lat = res.latitude;
+                        th.data.lon = res.longitude;
+                        th.data.is_get_local_ok = 1;
+                    },
+                    fail: function (res) {
+                        if (res.errCode == 2) {
+                            th.setData({
+                                is_gps: 0
+                            });
+                            if (th.data.is_gps == 0) {
+                                getApp().confirmBox("请开启GPS定位", null, 10000, !1);
+                            }
+
+                        } else {
+                            th.setData({
+                                is_gps: "3"
+                            });
+                        }
+
+                        th.data.is_get_local_ok = 1;
+                    }
+                })
+            } else {
+                th.data.is_get_local_ok = 1;
+            }
+            clearInterval(t_time);
+        }, 500)
+    },
+
+
+    //-- 根据ID拿出门店 --
+    get_pick_from_list(pid) {
+        var all_pick_list = this.data.all_pick_list;
+        for (var i in all_pick_list) {
+            var item = all_pick_list[i];
+            if (item.pickup_id == pid) {
+                return item;
+            }
+        }
+    },
+
+    closePoster() {
+        this.setData({
+            showPoster: false,
+        });
+    },
+
+    // 保存图片到手机
+    savePic() {
+        console.log('保存图片');
+        var self = this;
+        // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限
+        this.getSetting().then((res) => {
+            // 判断用户是否授权了保存到相册的权限，如果没有发起授权
+            if (!res.authSetting['scope.writePhotosAlbum']) {
+                this.authorize().then(() => {
+                    // 同意授权后保存下载文件
+                    this.saveImage(self.data.shareImgPath)
+                        .then(() => {
+                            self.setData({
+                                showPoster: false
+                            });
+                        });
+                })
+            } else {
+                // 如果已经授权，保存下载文件
+                this.saveImage(self.data.shareImgPath)
+                    .then(() => {
+                        self.setData({showPoster: false});
+                    });
+            }
+
+        })
+    },
+
+    // 获取用户已经授予了哪些权限
+    getSetting() {
+        return new Promise((resolve, reject) => {
+            wx.getSetting({
+                success: res => {
+                    resolve(res)
+                }
+            })
+        })
+    },
+
+    // 发起首次授权请求
+    authorize() {
+        // isFirst 用来记录是否为首次发起授权，
+        // 如果首次授权拒绝后，isFirst赋值为1
+        let isFirst = wx.getStorageSync('isFirst') || 0;
+        return new Promise((resolve, reject) => {
+            wx.authorize({
+                scope: 'scope.writePhotosAlbum',
+                // 同意授权
+                success: () => {
+                    resolve();
+                },
+                // 拒绝授权,这里是用户拒绝授权后的回调
+                fail: res => {
+                    if (isFirst === 0) {
+                        wx.setStorageSync('isFirst', 1);
+                        wx.showToast({
+                            title: '保存失败',
+                            icon: 'none',
+                            duration: 1000
+                        })
+                    } else {
+                        this.showModal();
+                    }
+                    console.log('拒绝授权');
+                    reject();
+                }
+            })
+        })
+    },
+
+    // 保存图片到系统相册
+    saveImage(saveUrl) {
+        var self = this;
+        return new Promise((resolve, reject) => {
+            wx.saveImageToPhotosAlbum({
+                filePath: saveUrl,
+                success: (res) => {
+                    wx.showToast({
+                        title: '保存成功',
+                        duration: 1000,
+                    });
+                    self.setData({
+                        showPlaybill: 'true'
+                    });
+                    resolve();
+                },
+                fail: () => {
+                    wx.showToast({
+                        title: '保存失败',
+                        duration: 1000,
+                    });
+                }
+            })
+        })
+    },
+
+    previewImage() {
+        getApp().pre_img(this.data.shareImgPath);
+    },
+
+    onShareTimeline() {
+        getApp().globalData.no_clear = 1
+
+        var th = this;
+        var price = th.data.data.shop_price;
+        if (th.data.prom_act) {
+            price = th.data.prom_act.price;
+
+        }
+        var title = th.data.data.goods_name;
+        // var img=th.data.data.original_img;
+        var img = th.data.iurl + th.data.data.image_url;
+        if (th.data.prom_type == 6) {
+            title = th.data.prom_act.share_title;
+            img = th.data.iurl + th.data.prom_act.share_imgurl;
+        }
+
+        var url = "goods_id=" + th.data.gid;
+        if (getApp().globalData.user_id) {
+            url += "&first_leader=" + getApp().globalData.user_id;
+        }
+
+        //-- 如果房间分享，且不是会员分享的 --
+        if (getApp().globalData.room_id &&
+            th.data.data.goods_id == getApp().globalData.room_goods_id &&
+            !getApp().globalData.room_user_share
+        ) {
+            url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1";
+        }
+
+        // 如果服务卡参加秒杀活动，且后台设置了分享标题和分享图片
+        if (th.data.prom_type == 1) {
+            if (th.data.sele_g && th.data.sele_g.share_imgurl) {
+                img = th.data.iurl + th.data.sele_g.share_imgurl;
+            }
+            ;
+        }
+        ;
+
+        return {
+            title: price + "元  " + title,
+            imageUrl: img,
+            query: url
+        }
+    },
+
+
+    clickCollapse() {
+        this.setData({
+            flag: !this.data.flag,
+        })
+    },
+
+    //---------联系微信客服------------
+    con_weixin: function () {
+        var url = this.data.sys_switch.weapp_customertype_url;
+        var id = this.data.sys_switch.weapp_customertype_appid;
+        wx.openCustomerServiceChat({
+            extInfo: {url: url},
+            corpId: id,
+            success(res) {
+            }
+        })
+    },
+
+    //评论的调用
+    requestComments_new: async function () {
+        var e = this, th = e, ee = e;
+        var tp = e.data.activeCategoryId3;
+        var t = '/api/weshop/serviceComment/pageComment?page=' + e.data.c_curr_p;
+
+        wx.showLoading();
+        var req_where = {
+            store_id: o.stoid, pageSize: 5, is_show: 1,
+            parent_id: 0, goods_id: th.data.gid, commenttype: tp,
+            service_id: this.data.gid,
+        }
+        if (getApp().globalData.userInfo) {
+            req_where.userId = getApp().globalData.user_id;
+        }
+
+        var rs_data = null;
+        await getApp().request.promiseGet(t, {data: req_where}).then(res => {
+            var tot = res.data.data.total;
+            e.data.c_curr_p++;
+            e.setData({
+                com_num: tot, //已经有加载
+            });
+            if (res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
+                rs_data = res.data.data.pageData;
+            } else {
+                th.setData({comments_no_more: 1, auto: 1});
+            }
+        })
+
+        if (rs_data) {
+            //var cda = th.data.comments;
+            var cda = rs_data, com_data = th.data.comments;
+            for (var ind in cda) {
+                var ep = cda[ind];
+                if (cda[ind].head_pic == '') {
+                    cda[ind].head_pic = th.data.iurl + "/miniapp/images/hui_hear_pic.png";
+                }
+                if (ep.weapp_img != "" && ut.isString(ep.weapp_img)) {
+                    cda[ind].weapp_img = JSON.parse(ep.weapp_img);
+                }
+                if (ep.img != "" && ut.isString(ep.img)) {
+                    cda[ind].img = ut.unserialize(ep.img);
+                }
+
+                //--测量多有字的宽带，计算有多少行--
+                var widh = ut.measureText(ep.content, 30);
+                var lines = widh / 712;
+                cda[ind].seeMore = false;
+                if (lines > 3) cda[ind].seeMore = true;
+
+                await getApp().request.promiseGet("/api/weshop/serviceComment/pageComment", {
+                    data: {
+                        store_id: o.stoid,
+                        parent_id: ep.comment_id,
+                        service_id: this.data.gid,
+                    }
+                }).then(res => {
+                    if (res.data.data.pageData && res.data.data.pageData.length > 0) {
+                        cda[ind].replay_list = res.data.data.pageData;
+                    }
+                })
+            }
+
+            if (!com_data) com_data = cda;
+            else com_data = com_data.concat(cda);
+
+            th.setData({comments: com_data});
+        }
+        th.setData({get_c: 1});
+        wx.hideLoading();
+    },
+
+
+    //--点赞功能--
+    click_zan: function (e) {
+        var com_id = e.currentTarget.dataset.com_id;
+        var item_id = e.currentTarget.dataset.item_id;
+        var app = getApp(),
+            th = this;
+
+        if (app.globalData.userInfo == null || app.globalData.userInfo == undefined) {
+            app.confirmBox("您还未登录");
+            return false;
+        }
+
+        var iszan = th.data.comments[item_id].userZanNum;
+        if (this.data.iszaning) return false;
+        this.data.iszaning = 1;
+
+
+        app.request.post("/api/weshop/serviceCommentZan/save", {
+            data: {
+                store_id: o.stoid,
+                user_id: app.globalData.user_id,
+                goods_id: th.data.gid,
+                service_id: th.data.gid,
+                comment_id: com_id
+            },
+            success: function (ee) {
+
+                if (ee.data.code == "-1") {
+                    app.my_warnning("不能给自己点赞", 0, th);
+                    th.data.iszaning = 0;
+                    return;
+                }
+
+                if (ee.data.code == 0 && iszan != 1) {
+                    var num = th.data.comments[item_id].zan_num;
+                    num++;
+                    var text = "comments[" + item_id + "].zan_num";
+                    var text1 = "comments[" + item_id + "].userZanNum";
+                    var _errObj = {};
+                    _errObj[text] = num;
+                    _errObj[text1] = 1;
+                    th.setData(_errObj);
+
+                } else {
+                    var num = th.data.comments[item_id].zan_num;
+                    num--;
+                    var text = "comments[" + item_id + "].zan_num";
+                    var text1 = "comments[" + item_id + "].userZanNum";
+                    var _errObj = {};
+                    _errObj[text] = num;
+                    _errObj[text1] = 0;
+                    th.setData(_errObj);
+                }
+
+                setTimeout(function () {
+                    th.data.iszaning = 0;
+                }, 500)
+
+            }
+        })
+    },
+
+
+    //--外侧评价的点击效果---
+    clik_evaluate: function (e) {
+        var val = e.currentTarget.dataset.val;
+        this.setData({
+            activeCategoryId: 2,
+            activeCategoryId3: val,
+            comments: null
+        });
+        this.requestComments_new();
+    },
+
+
+    //显示全部
+    toggleHandler: function (e) {
+        var that = this,
+            index = e.currentTarget.dataset.index;
+        for (var i = 0; i < that.data.comments.length; i++) {
+            if (index == i) {
+                for (var i = 0; i < that.data.comments.length; i++) {
+                    that.data.comments[index].auto = true;
+                    that.data.comments[index].seeMore = false;
+                }
+            }
+        }
+        that.setData({
+            comments: that.data.comments
+        })
+    },
+
+    //收起更多
+    toggleContent: function (e) {
+        var that = this,
+            index = e.currentTarget.dataset.index;
+        for (var i = 0; i < that.data.comments.length; i++) {
+            if (index == i) {
+                that.data.comments[index].auto = true;
+                that.data.comments[index].seeMore = true;
+            }
+        }
+        that.setData({
+            comments: that.data.comments
+        })
+    },
+
+    //--查看评价--
+    look_pj: function () {
+        this.tabComment();
+        this.doScrollTop();
+    },
+
+    previewCommentImgs_w: function (t) {
+        var e = this.data.comments[t.currentTarget.dataset.cidx].weapp_img;
+        var b = e.slice()
+        // for (var i in b) {
+        //   b[i] = this.data.iurl + e[i];
+        // }
+        this.data.show_prew_img = 1;
+        wx.previewImage({
+            current: b[t.currentTarget.dataset.id],
+            urls: b
+        });
+    },
+
+
+    // 判断是否开启美业，获取套盒列表
+    getTaohe() {
+        // 判断是否开启美业
+        getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => {
+            if (res.data.code == 0) {
+                let enableMeiye = res.data.data.EnableMeiye;
+                self.setData({
+                    enableMeiye,
+                });
+
+                if (enableMeiye) { // 开启美业
+                    // 获取套盒列表
+                    let url = '/api/weshop/serviceGoods/list'
+                    let data = {
+                        store_id: getApp().globalData.setting.stoid,
+                        service_id: this.data.data.id,
+                    };
+                    // 请求数据
+                    getApp().promiseGet(url, {
+                        data: data,
+                    }).then(res => {
+                        if (res.data.code == 0) {
+                            console.log('请求成功套盒列表', res);
+                            self.setData({
+                                taoheList: res.data.data,
+                            });
+                        } else {
+                            throw (res);
+                        }
+                        ;
+                    }).catch(err => {
+                    });
+
+                }
+                ;
+            }
+            ;
+        });
+    },
+
+
+    //---小于10的格式化函数----
+    // timeFormat(param) {
+    //     return param < 10 ? '0' + param : param;
+    // },
+
+    //----倒计时函数-----
+    countDown(time, prom_st) {
+        if (!this.data.is_timer) return false;
+        var th = this;
+        // 获取当前时间，同时得到活动结束时间数组
+        var endTime = time;
+        var newTime = ut.gettimestamp();
+        // 对结束时间进行处理渲染到页面
+        var obj = null;
+        // 如果活动未结束，对时间进行处理
+        if (endTime - newTime > 0) {
+            var time = (endTime - newTime);
+            // 获取天、时、分、秒
+            var day = parseInt(time / (60 * 60 * 24));
+            var hou = parseInt(time % (60 * 60 * 24) / 3600);
+            var min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+            var sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+            obj = {
+                day: this.timeFormat(day),
+                hou: this.timeFormat(hou),
+                min: this.timeFormat(min),
+                sec: this.timeFormat(sec)
+            }
+        } else {
+            if (th.data.prom_st == 0) {
+                //var endTime2 = new Date(th.data.prom_end_time).getTime();
+                var endTime2 = th.data.prom_act.end_time;
+                th.setData({
+                    prom_time_text: '距结束还剩:',
+                    prom_st: 1
+                })
+                setTimeout(function () {
+                    th.countDown(endTime2)
+                }, 1000);
+                return false;
+
+            } else {
+                //活动已结束，全部设置为'00'
+                obj = {
+                    day: '00',
+                    hou: '00',
+                    min: '00',
+                    sec: '00'
+                }
+                th.setData({
+                    prom_time_text: '活动已经结束:',
+                    prom_st: 3
+                })
+                th.setData({
+                    djs: obj
+                });
+                return false;
+            }
+        }
+
+        th.setData({
+            djs: obj
+        });
+        setTimeout(function () {
+            th.countDown(endTime)
+        }, 1000);
+    },
+
+    get_normal(gid) {
+        this.setData({
+            prom_type: 0,
+            prom_id:0
+        });
+        this.get_sto();
+        this.data.is_normal = 1;
+    },
+
+    //获取redis中的数量
+    async getactLen() {
+        let prom_type = this.data.options.prom_type;
+        let prom_id = this.data.options.prom_id;
+        return await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
+            1: 1
+        }).then(res => {
+            if (res.data.code == 0) {
+                // 当前可以购买的数量
+                let r_num = res.data.data;
+                return r_num;
+            }
+            ;
+        })
+    },
+
+
+    //--------检查是否活动，活动是否开始，或者是否结束-------
+    async check_prom(gid, prom_type, prom_id) {
+        var ee = this, th = ee;
+        var user_id = getApp().globalData.user_id;
+        if (!user_id) user_id = 0;
+
+        //-------判断团购活动是否抢光---------
+        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) {
+                if (em.data.data <= 0) ee.setData({
+                    prom_r_null: 1
+                });
+                //拿取价格并且判断时间--
+                getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gid + "/" + prom_id, {
+                    success: function (t) {
+                        if (t.data.code != 0) {
+                            ee.get_normal(gid);
+                            return false;
+                        }
+                        //----已经结束-----
+                        if (t.data.data.is_end == 1) {
+                            ee.get_normal(gid);
+                            return false;
+                        }
+                        //----已经过期-----
+                        var now = ut.gettimestamp();
+                        if (t.data.data.end_time < now || t.data.data.start_time > now) {
+                            ee.get_normal(gid);
+                            return false;
+                        }
+
+                        /*-- 还没有开始预热的也不显示 --*/
+                        if (t.data.data.show_time > now) {
+                            ee.get_normal(gid);
+                            return false;
+                        }
+
+                        th.setData({
+                            sele_g: t.data.data,
+                        });
+
+                        var t_gd = ee.data.data;
+                        var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss");
+                        var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
+
+                        ee.setData({
+                            prom_price: t.data.data.price,
+                            prom_type: 2,
+                            f_prom_type: 2,
+                            prom_id: prom_id,
+                            prom_buy_limit: t.data.data.buy_limit,
+                            prom_act: t.data.data,
+                            prom_end_time: prom_end_time,
+                            prom_start_time: prom_start_time,
+                            isshow: 1,
+                        });
+
+                        ee.get_sto();
+                        var newTime = ut.gettimestamp();
+                        var endTime2 = t.data.data.end_time;
+                        var endTime1 = t.data.data.start_time;
+                        if (endTime1 > newTime) {
+                            ee.setData({
+                                prom_time_text: '距团购开始还有'
+                            })
+                            ee.countDown(endTime1, 0);
+                        } else {
+                            if (endTime2 > newTime) {
+                                ee.setData({
+                                    prom_time_text: '距团购结束还有',
+                                    prom_st: 1
+                                })
+                                ee.countDown(endTime2);
+                            }
+                        }
+
+                    }
+                });
+            }
+        })
+    },
+
+
+    viewFlash(e) {
+        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}`;
+        if (prom_type == 6) {
+            url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${goods_id}&prom_type=${prom_type}&prom_id=${prom_id}`;
+        }
+        getApp().goto(url);
+    },
+
+
+
+    //-------------获取购买数量的总函数----------------
+    get_buy_num: function (gd, func) {
+        // var map = this.data.g_buy_num,
+        var th = this,
+            user_id = getApp().globalData.user_id;
+        if (user_id == null) {
+            // map.set(gd.goods_id, 0);
+            th.setData({
+                // g_buy_num: map,
+                prom_buy_num: 0,
+            });
+            "function" == typeof func && func();
+            return false;
+        }
+
+        // if (map.has(gd.goods_id)) {
+        //     "function" == typeof func && func();
+        // } else {
+        //----获取商品购买数----
+        if (th.data.prom_type == 1) {
+            //----获取活动购买数----
+            getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
+                data: {
+                    store_id: os.stoid,
+                    user_id: user_id,
+                    card_id: th.data.options.goods_id,
+                    prom_type: th.data.options.prom_type,
+                    prom_id: th.data.options.prom_id
+                },
+                //-----获取-----
+                success: function (tt) {
+                    if (tt.data.code == 0) {
+                        // map.set(gd.goods_id, g_buy_num);
+                        th.setData({
+                            // g_buy_num: map,
+                            promcardbuynum: tt.data.data.promcardbuynum,
+                            cardbuynum: tt.data.data.cardbuynum,
+                        });
+                        "function" == typeof func && func();
+                    }
+                }
+            });
+        } else {
+            "function" == typeof func && func();
+        }
+    },
+
+    get_buy_num2: async function () {
+        var th = this, user_id = getApp().globalData.user_id;
+        //----获取活动购买数----
+        return await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
+            data: {
+                store_id: os.stoid,
+                user_id: user_id,
+                card_id: th.data.options.goods_id,
+                prom_type: th.data.options.prom_type,
+                prom_id: th.data.options.prom_id,
+                isnew:1
+            },
+            //-----获取-----
+            success: function (tt) {
+                if (tt.data.code == 0) {
+                    // map.set(gd.goods_id, g_buy_num);
+                    th.setData({
+                        // g_buy_num: map,
+                        promcardbuynum: tt.data.data.promcardbuynum,
+                        cardbuynum: tt.data.data.cardbuynum,
+                    });
+                }
+            }
+        });
+    },
+
+
+    // 促销 -> 送礼包 -> 查看详情
+    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 () {
+        var th = this;
+
+        if (th.data.get_sto_ing) return false;
+
+        // 是否授权登陆
+        var user_info = getApp().globalData.userInfo;
+        if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+            wx.navigateTo({
+                url: '/packageE/pages/togoin/togoin',
+            })
+            return false;
+        }
+        this.data.g_buy_num = new Map();
+        var th = this;
+        this.setData({open_ind_store: 5, goodsInputNum: 1});//拼团直接给4
+
+        this.setData({openSpecModal_flash_normal: 1});
+        this.get_sto(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, is_normal: 0});
+    },
+
+
+    //打开客服操作菜单
+    openCS() {
+        // 判断会员状态
+        let user_info = getApp().globalData.userInfo;
+        if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
+            wx.navigateTo({
+                url: '/packageE/pages/togoin/togoin',
+            })
+            return false;
+        }
+        ;
+        // csType/在线客服设置：
+        // 0关闭（如果有设置热线电话，则显示拨打热线电话）、
+        // 1小程序客服、
+        // 2企业微信客服
+        if (this.data.sys_switch) {
+            let csType = this.data.sys_switch.weapp_customertype;
+            if (csType == 0) {
+                // 拨打电话号码
+                this.contactService();
+            } else {
+                this.getTel()
+                    .then(() => {
+                        self.setData({
+                            hiddenCS: false,
+                        });
+                    });
+            }
+            ;
+        }
+        ;
+
+    },
+
+    //关闭客服操作菜单
+    closeCS() {
+        this.setData({
+            hiddenCS: true,
+        });
+    },
+
+
+    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,
+        });
+    },
+
+
+    //-- 弹出框的同意的优化,重新获取定位 ---
+    agree_pri: function () {
+        var th = this;
+        var bconfig = th.data.bconfig;
+        if (bconfig && bconfig.is_sort_storage) {
+            wx.getLocation({
+                type: 'gcj02',
+                success: function (res) {
+
+                    th.data.lat = res.latitude;
+                    th.data.lon = res.longitude;
+                    th.data.is_get_local_ok = 1;
+                    th.setData({is_gps: 1});
+                    th.get_sto();
+                },
+                fail: function (res) {
+                    th.data.is_get_local_ok = 1;
+                    th.get_sto();
+                    if (res.errCode == 2) {
+                        th.setData({is_gps: 0});
+                        if (th.data.is_gps == 0) {
+                            getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+                        }
+                    } else {
+                        th.setData({is_gps: "3"});
+                    }
+
+                }
+            })
+        }
+    },
+
+    clickShare() {
+        this.setData({
+            share_hidden: true,
+        });
+    },
+    send() {
+        this.setData({
+            share_hidden: false,
+        });
+    },
+    cancel() {
+        this.setData({
+            share_hidden: false,
+        });
+    },
+
+
+    saveImageFn() {
+        if (this.data.share_b_img) {
+            this.saveImageToPhotosAlbum()
+        } else {
+            this.saveImageToPhotosAlbumDef()
+        }
+    },
+
+
+    //--定义的保存图片方法，分享团---
+    saveImageToPhotosAlbum: function () {
+        //--先判断会员状态--
+        // var user_info = getApp().globalData.userInfo;
+        // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+        //     //getApp().my_warnning("请先登录",0,this);
+        //     wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
+        //     return false;
+        // }
+
+        if (this.data.share_hidden) {
+            this.setData({
+                share_hidden: false,
+            });
+        }
+        ;
+
+        //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团  4阶梯团
+        var type = this.data.prom_type || 0;
+        console.log('商品类型-----');
+        console.log(type);
+        // if (type == 2) type = -1;
+        if (type == 4) type = 0;
+        if (type == 8) type = 0;
+        if (type == 2) type = 0;
+        if (type == 6) type = 2; // 6拼团 2团购
+        if (type == 10) type = -1;
+
+        wx.showLoading({
+            title: '生成中...',
+        })
+        var that = this,
+            th = that;
+        //设置画板显示，才能开始绘图
+        that.setData({
+            canvasHidden: false
+        })
+
+        var app = getApp();
+        var unit = that.data.screenWidth / 750 * 1.35;  //基础单位，
+        var path2 = that.data.data.original_img;
+
+        var scene = th.data.gid;
+        var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
+        if (user_id > 0) {
+            scene += "_" + user_id;
+        }
+        //-- 如果不是会员分享过来的要分享给别人 --
+        if (getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) {
+            //固定房间是第3个字符
+            if (!user_id) scene += "_0";
+            scene += "_" + getApp().globalData.room_id;
+        } else {
+            if (!user_id) scene += "_0";
+            scene += "_0";
+        }
+        if (this.data.prom_id) {
+            scene += "_" + th.data.prom_id;
+        }
+
+        ///二微码
+        var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+            os.stoid + "?sceneValue=" + scene + "&pageValue=packageG/pages/group_buy/goodsInfo/goodsInfo";
+
+
+        console.log(path3);
+
+        //读取文件成功则OK--
+        wx.getImageInfo({
+            src: path3,
+            success: function (res) {
+                //回调写法
+                th.get_head_temp(th.get_goods_temp, function () {
+                    var vpath = res.path;
+                    var context = wx.createCanvasContext('share');
+                    //先画背景
+                    var pg_path = "../../../../images/share/share_bg.png";
+
+                    //-- 如果有自定义海报的时候，判断背景的图片 --
+                    if (th.data.share_b_img) {
+                        pg_path = th.data.share_b_img;
+                    }
+                    context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
+
+                    let nick = app.globalData.userInfo ? app.globalData.userInfo.nickname : '';
+
+                    //-- 是自定义海报的情况下 --
+                    if (th.data.poster && parseInt(th.data.poster.style) == 2) {
+                        //在线上分享人的情况下
+                        if (parseInt(th.data.poster.show_headpic)) {
+                            //获取坐标
+                            var x = parseFloat(th.data.poster.head_x) * 2;
+                            var y = parseFloat(th.data.poster.head_y) * 2;
+                            var x1 = (x + 90) * unit;
+                            var y1 = (y + 50) * unit;
+                            //--昵称---
+                            context.setFontSize(24 * unit)
+                            context.setFillStyle("black")
+                            context.fillText(nick, x1, y1);
+                            var width = 24 * nick.length * unit + 4 * unit;
+                            //强烈推荐 改许程
+                            var tj_path = "../../../../images/share/q_tj.png";
+                            context.drawImage(tj_path, x1 + width, y1 - 22 * unit, 85 * unit, 30 * unit);
+                            context.setFontSize(16 * unit)
+                            context.setLineJoin('round'); //交点设置成圆角
+                            context.setFillStyle("white")
+                            context.fillText('强烈推荐', x1 + width + 8 * unit, y1 - 1 * unit);
+
+                            //context.setFillStyle("black")
+                            //context.setFontSize(24 * unit)
+                            //context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit);
+                        }
+                    } else {
+                        //--昵称---
+                        context.setFontSize(24 * unit)
+                        context.setFillStyle("black")
+                        context.fillText(nick, 152 * unit, 76 * unit);
+                        var width = 24 * nick.length * unit + 2 * unit;
+                        //强烈推荐 改许程
+                        var tj_path = "../../../../images/share/q_tj.png";
+                        context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit);
+                        context.setFontSize(16 * unit);
+                        context.setLineJoin('round'); //交点设置成圆角
+                        context.setFillStyle("white");
+                        context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit);
+                    }
+
+                    var share_title = th.data.data.goods_name;
+
+                    if (th.data.prom_type == 1 || th.data.prom_type == 2 || th.data.prom_type == 6 || th.data.prom_type == 4) {
+                        share_title = th.data.prom_act.share_title;
+                        if (!share_title) share_title = th.data.prom_act.title;
+                        if (th.data.prom_type == 4) share_title = th.data.prom_act.name;
+
+                        //-- 显示活动时间 --
+                        if (th.data.share_b_img) {
+                            act_time = "截止时间：" + ut.formatTime(th.data.prom_act.end_time);
+                        }
+                    }
+
+                    //---产品名称---
+                    //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
+
+                    context.setFillStyle("black");
+                    context.setFontSize(21.3 * unit)
+                    th.draw_Text(context, share_title,
+                        80 * unit, 160 * unit, 200 * unit, 279 * unit, unit);
+
+                    //------产品的价格-------
+                    context.setFontSize(23 * unit)
+                    context.setFillStyle("red")
+
+                    // 7.商品价格
+                    let price = th.data.data.shop_price;
+                    if (th.data.card_field && th.data.data[th.data.card_field]) {
+                        price = th.data.data[th.data.card_field];
+                    }
+                    if (th.data.prom_act) price = th.data.prom_price;
+                    price = parseFloat(price).toFixed(2);
+
+                    var wd1 = th.data.screenWidth - ut.measureText(price, 31 * unit) - 25;
+                    context.fillText("￥", wd1 - 15, 160 * unit);
+                    context.setFontSize(31 * unit)
+                    context.fillText(price, wd1, 165 * unit);
+
+
+                    //-- 零售价的优化 --
+                    var wp = wd1;
+                    var hp = 203 * unit;
+                    if (th.data.prom_type != 4) wp -= 12;
+                    th.draw_pos_price(context, wp, hp, th.data.data.show_price, unit);
+
+
+                    //console.log(th.data.share_goods_img);
+                    //let share_goods_img=th.data.presellForm.share_img;
+                    //share_goods_img?share_goods_img:th.data.data.share_goods_img;
+                    //---中间大图---
+                    context.drawImage(th.data.share_goods_img, 70 * unit, 220 * unit, 408 * unit, 408 * unit);
+                    //---自定义海报 产品质量保证
+                    if (th.data.poster.show_quality == 1) {
+                        var g_path = "../../../../images/share/s_gou.png";
+                        context.drawImage(g_path, 56 * unit, 644 * unit, 22 * unit, 22 * unit);
+                        context.setFillStyle("red")
+                        context.setFontSize(18 * unit)
+                        context.fillText("正品保证", 84 * unit, 664 * unit);
+
+                        context.drawImage(g_path, 218 * unit, 644 * unit, 22 * unit, 22 * unit);
+                        context.setFillStyle("red")
+                        context.setFontSize(18 * unit)
+                        context.fillText("纯实体店", 246 * unit, 664 * unit);
+
+                        context.drawImage(g_path, 388 * unit, 644 * unit, 22 * unit, 22 * unit);
+                        context.setFillStyle("red")
+                        context.setFontSize(18 * unit)
+                        context.fillText("官方验证", 420 * unit, 664 * unit);
+
+                    }
+
+                    //---画线---
+                    // context.setLineWidth(1 * unit)
+                    // context.moveTo(32 * unit, 662 * unit)
+                    // context.lineTo(520 * unit, 662 * unit)
+                    // context.stroke();
+
+                    //-- 图片底部文字 --
+                    switch (type) {
+                        case 0:
+                            //---文字---
+                            //---文字---
+                            context.setFillStyle("black");
+                            context.setFontSize(22 * unit);
+
+                            context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
+                            context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);
+
+                            break;
+
+                        case 1:
+
+                            //画秒杀的图片
+                            if (th.data.is_share_text) {
+                                var miaos_path = '../../../../images/share/miao_share.png';
+                                context.drawImage(miaos_path, 43 * unit, 690 * unit, 222 * unit, 40 * unit);
+                            }
+
+                            context.setFillStyle("black")
+                            context.setFontSize(24 * unit)
+                            context.fillText(th.data.sto_sele_name_1, 40 * unit, 770 * unit);
+                            //---文字---
+                            context.setFontSize(22 * unit)
+                            context.setFillStyle("black")
+                            if (th.data.is_share_text) {
+                                context.fillText("特惠好物，限时秒杀", 40 * unit, 807 * unit);
+                            }
+                            context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 844 * unit);
+
+                            break;
+
+                    }
+
+
+                    //---二维吗图---
+                    //-- 自定义海报 --
+                    if (th.data.poster) {
+                        var erm_x = parseFloat(th.data.poster.ewm_x) * 2;
+                        var erm_y = parseFloat(th.data.poster.ewm_y) * 2;
+                        context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);
+                    } else {
+                        //---二维吗图---
+                        context.drawImage(vpath, 390 * unit, 746 * unit, 130 * unit, 116 * unit);
+                    }
+
+                    //--- 如果是自定义海报的时候 ---
+                    if (th.data.poster && parseInt(th.data.poster.style) == 2) {
+
+                        //如果显示会员信息的话
+                        if (parseInt(th.data.poster.show_headpic)) {
+                            //获取坐标
+                            var x = parseFloat(th.data.poster.head_x) * 2;
+                            var y = parseFloat(th.data.poster.head_y) * 2;
+                            //---绘制圆形要放在最后----
+                            context.save();
+                            context.beginPath();
+                            var h_x = x * unit;
+                            var h_y = y * unit;
+                            var h_r = 40 * unit;
+                            var cx = h_x + h_r;
+                            var cy = h_y + h_r;
+                            context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
+                            context.closePath();
+                            context.fill();
+                            context.clip();
+                            context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
+                            context.restore();
+                        }
+
+                    } else {
+                        //---绘制圆形要放在最后----
+                        context.save();
+                        context.beginPath();
+                        var h_x = 60 * unit;
+                        var h_y = 24 * unit;
+                        var h_r = 40 * unit;
+                        var cx = h_x + h_r;
+                        var cy = h_y + h_r;
+                        context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
+                        context.closePath();
+                        context.fill();
+                        context.clip();
+                        context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
+                        context.restore();
+                    }
+
+
+                    if (th.data.poster.show_time == 1 && th.data.prom_act) {
+                        var act_time = '';
+                        act_time = "截止时间：" + ut.formatTime(th.data.prom_act.end_time);
+                        context.setFillStyle("red")
+                        getApp().draw_Text(context, act_time, 38 * unit, 880 * unit, 200 * unit, 340 * unit, unit);
+                    }
+
+                    //把画板内容绘制成图片，并回调 画板图片路径
+                    context.draw(false, function () {
+                        setTimeout(function () {
+                            wx.canvasToTempFilePath({
+                                x: 0,
+                                y: 0,
+                                width: 750,
+                                height: 1217,
+                                destWidth: 1.2 * 750 * 750 / that.data.screenWidth,
+                                destHeight: 1.2 * 1217 * 750 / that.data.screenWidth,
+                                canvasId: 'share',
+                                success: function (res) {
+
+                                    that.setData({
+                                        shareImgPath: res.tempFilePath,
+                                        canvasHidden: true
+                                    })
+
+                                    if (!res.tempFilePath) {
+                                        wx.showModal({
+                                            title: '提示',
+                                            content: '图片绘制中，请稍后重试',
+                                            showCancel: false
+                                        })
+                                        return false;
+                                    }
+
+                                    // wx.previewImage({
+                                    //   //将图片预览出来
+                                    //   urls: [that.data.shareImgPath]
+                                    // });
+                                    that.setData({
+                                        showPoster: true,
+                                    });
+                                    wx.hideLoading();
+                                }
+                            })
+                        }, 500)
+
+                    });
+                });
+            },
+            fail: function (res) {
+                console.log(res);
+                wx.hideLoading();
+
+            }
+        });
+    },
+    //--定义的保存图片方法，分享团---
+    saveImageToPhotosAlbumDef: function () {
+        //--先判断会员状态--
+        // var user_info = getApp().globalData.userInfo;
+        // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+        //     //getApp().my_warnning("请先登录",0,this);
+        //     wx.navigateTo({url: '/packageE/pages/togoin/togoin',})
+        //     return false;
+        // }
+
+        if (this.data.share_hidden) {
+            this.setData({share_hidden: false,});
+        }
+        ;
+
+        //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团  4阶梯团
+        var type = this.data.prom_type || 0;
+        console.log('商品类型-----');
+        console.log(type);
+        // if (type == 2) type = -1;
+        if (type == 4) type = 0;
+        if (type == 8) type = 0;
+        if (type == 2) type = 0;
+        if (type == 6) type = 2; // 6拼团 2团购
+        if (type == 10) type = -1;
+
+        if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3;
+        console.log('商品类型。。。。。');
+        console.log(type);
+        wx.showLoading({title: '生成中...',})
+        var that = this, th = that;
+        //设置画板显示，才能开始绘图
+        that.setData({
+            canvasHidden: false
+        })
+
+        var app = getApp();
+        var unit = that.data.screenWidth / 750 * 1.35;  //基础单位，
+        var path2 = that.data.data.original_img;
+
+        var scene = th.data.gid;
+        var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
+        if (user_id > 0) {
+            scene += "_" + user_id;
+        }
+        //-- 如果不是会员分享过来的要分享给别人 --
+        if (getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) {
+            //固定房间是第3个字符
+            if (!user_id) scene += "_0";
+            scene += "_" + getApp().globalData.room_id;
+        } else {
+            if (!user_id) scene += "_0";
+            scene += "_0";
+        }
+        if (this.data.prom_type) {
+            scene += "_" + th.data.prom_id;
+        }
+
+        ///二微码
+        var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+            os.stoid + "?sceneValue=" + scene + "&pageValue=packageG/pages/group_buy/goodsInfo/goodsInfo";
+
+        console.log(path3);
+
+
+        // 读取文件成功则OK--
+        wx.getImageInfo({
+            src: path3,
+            success: function (res) {
+                // 回调写法
+                th.get_head_temp(th.get_goods_temp, function () {
+                    var vpath = res.path;
+                    var context = wx.createCanvasContext('share');
+                    // 先画背景
+                    var pg_path = "../../../../../images/share/share_bg.png";
+                    th.drawPoster(context, unit, th.data.share_goods_img, vpath, type);
+
+                    //把画板内容绘制成图片，并回调 画板图片路径
+                    context.draw(false, function () {
+                        setTimeout(function () {
+                            wx.canvasToTempFilePath({
+                                x: 0,
+                                y: 0,
+                                width: 750,
+                                height: 1217,
+                                destWidth: 1.2 * 750 * 750 / that.data.screenWidth,
+                                destHeight: 1.2 * 1217 * 750 / that.data.screenWidth,
+                                canvasId: 'share',
+                                success: function (res) {
+
+                                    that.setData({
+                                        shareImgPath: res.tempFilePath,
+                                        canvasHidden: true
+                                    })
+
+                                    if (!res.tempFilePath) {
+                                        wx.showModal({
+                                            title: '提示',
+                                            content: '图片绘制中，请稍后重试',
+                                            showCancel: false
+                                        })
+                                        return false;
+                                    }
+
+                                    that.setData({
+                                        showPoster: true,
+                                    });
+                                    wx.hideLoading();
+                                }
+                            })
+                        }, 500)
+
+                    });
+                });
+            },
+            fail: function (res) {
+                console.log(res);
+                wx.hideLoading();
+
+            }
+        });
+    },
+
+    //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
+    draw_Text: function (ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) {
+        var lineWidth = 0;
+        var lastSubStrIndex = 0; //每次开始截取的字符串的索引
+        var han = 0;
+        for (let i = 0; i < str.length; i++) {
+            if (han == 2) return;
+            //lineWidth += ctx.measureText(str[i]).width;
+            lineWidth += ut.measureText(str[i], 21.3 * unit);
+            if (lineWidth > canvasWidth) {
+                han++;
+
+                if (han == 2)
+                    ctx.fillText(str.substring(lastSubStrIndex, i) + '...', leftWidth, initHeight); //绘制截取部分
+                else
+                    ctx.fillText(str.substring(lastSubStrIndex, i), leftWidth, initHeight);
+
+                initHeight += 22; //22为字体的高度
+                lineWidth = 0;
+                lastSubStrIndex = i;
+                titleHeight += 20;
+            }
+            if (i == str.length - 1) { //绘制剩余部分
+                ctx.fillText(str.substring(lastSubStrIndex, i + 1), leftWidth, initHeight);
+            }
+        }
+    },
+
+    drawPoster(context, unit, img, vpath, type) {
+        // 1.灰色背景
+        context.setFillStyle('#f2f1f6');
+        context.rect(0, 0, 554 * unit, 899 * unit);
+        context.fill();
+
+        // 2.商城名称
+        let shopName = this.data.sto_sele_name_1;
+        context.setTextAlign('center');
+        context.setFontSize(26 * unit);
+        context.setFillStyle('black');
+        context.fillText(shopName, 277 * unit, 60 * unit);
+
+        // 3.推荐来源
+        if (getApp().globalData.userInfo) {
+            let fromText = `来自${getApp().globalData.userInfo.nickname}的推荐`;
+            context.setTextAlign('center');
+            context.setFontSize(22 * unit);
+            context.setFillStyle('#96959a');
+            context.fillText(fromText, 277 * unit, 105 * unit);
+        }
+        // 4.海报背景
+        context.setFillStyle('white');
+        context.fillRect(37 * unit, 157 * unit, 480 * unit, 673 * unit);
+
+        // 5.商品图片
+        // 图片的x坐标
+        let bg_x = 37 * unit
+        // 图片的y坐标
+        let bg_y = 157 * unit
+        // 图片宽度
+        let bg_w = 480 * unit
+        // 图片高度
+        let bg_h = 474 * unit
+        // 图片圆角
+        let bg_r = 4
+        // 绘制海报背景图片圆角
+        context.save()
+        context.beginPath()
+        context.arc(bg_x + bg_r, bg_y + bg_r, bg_r, Math.PI, Math.PI * 1.5)
+        context.arc(bg_x + bg_w - bg_r, bg_y + bg_r, bg_r, Math.PI * 1.5, Math.PI * 2)
+        context.arc(bg_x + bg_w, bg_y + bg_h, bg_r, 0, Math.PI * 0.5)
+        context.arc(bg_x, bg_y + bg_h, 0, Math.PI * 0.5, Math.PI)
+        context.clip()
+        context.drawImage(img, bg_x, bg_y, bg_w, bg_h);
+        context.restore();
+
+        // 6.强烈推荐
+        let src = '';
+        context.beginPath();
+        if (type == 0) { // 普通
+            src = '../../../../images/share/q_tj.png';
+            context.drawImage(src, 54 * unit, 648 * unit, 85 * unit, 30 * unit);
+            context.setFontSize(16 * unit)
+            context.setFillStyle("white")
+            context.setTextAlign('left');
+            context.fillText('强烈推荐', 64 * unit, 668 * unit);
+        }
+        if (type == 1) { // 秒杀
+
+            if (this.data.is_share_text == 1) {
+                src = '../../../../images/share/miao_share.png';
+                context.drawImage(src, 54 * unit, 648 * unit, 200 * unit, 36 * unit);
+            }
+            context.setTextAlign('left');
+        }
+
+
+        // 7.商品价格
+        let price = this.data.data.shop_price;
+        if (this.data.card_field && this.data.data[this.data.card_field]) {
+            price = this.data.data[this.data.card_field];
+        }
+        if (this.data.prom_act) price = this.data.prom_price;
+        price = parseFloat(price).toFixed(2);
+        context.setFontSize(32 * unit);
+        context.setFillStyle('#DE1117');
+
+        //price = this.data.presellList.presell_price
+        context.fillText('￥' + price, 54 * unit, 735 * unit);
+        //-- 零售价的优化 --
+        var wp = 62 * unit + ut.measureText('￥' + price, 32 * unit);
+        var hp = 735 * unit
+        this.draw_pos_price(context, wp, hp, this.data.data.show_price, unit);
+
+
+        // 8.商品标题
+        context.setFontSize(20 * unit);
+        context.setFillStyle('#898989');
+        getApp().draw_Text(context, this.data.data.goods_name, 54 * unit, 800 * unit, 240 * unit, 280 * unit, unit, 1);
+
+        // 9.小程序码
+        context.drawImage(vpath, 375 * unit, 660 * unit, 120 * unit, 120 * unit);
+        context.setFontSize(16 * unit);
+        context.setFillStyle('#777');
+        context.fillText('长按识别二维码', 378 * unit, 810 * unit);
+
+        // 10.竖线
+        context.beginPath();
+        context.setFillStyle('#eee');
+        context.rect(354 * unit, 670 * unit, 1 * unit, 130 * unit);
+        context.fill();
+    },
+
+    //---市场价划掉---
+    draw_pos_price(context, w, h, market_price, unit) {
+
+        if (!this.data.sys_switch) return false;
+        if (!this.data.sys_switch.is_retail_price) return false;
+
+        context.setFillStyle("gray")
+        context.setFontSize(22 * unit)
+        var pri0 = "￥" + market_price.toFixed(2);
+        context.fillText(pri0, w, h);
+
+        var c_h = h - 6;
+        context.setStrokeStyle('gray');
+        context.setLineWidth(1 * unit);
+        context.moveTo(w - 5, c_h);
+        context.lineTo(w + ut.measureText(pri0, 22 * unit) + 5, c_h);
+        context.stroke();
+
+    },
+
+
+    closePoster() {
+        this.setData({
+            showPoster: false,
+        });
+    },
+
+    // 保存图片到手机
+    savePic() {
+        console.log('保存图片');
+        var self = this;
+        // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限
+        this.getSetting().then((res) => {
+            // 判断用户是否授权了保存到相册的权限，如果没有发起授权
+            if (!res.authSetting['scope.writePhotosAlbum']) {
+                this.authorize().then(() => {
+                    // 同意授权后保存下载文件
+                    this.saveImage(self.data.shareImgPath)
+                        .then(() => {
+                            self.setData({
+                                showPoster: false
+                            });
+                        });
+                })
+            } else {
+                // 如果已经授权，保存下载文件
+                this.saveImage(self.data.shareImgPath)
+                    .then(() => {
+                        self.setData({
+                            showPoster: false
+                        });
+                    });
+            }
+
+        })
+    },
+
+    // 发起首次授权请求
+    authorize() {
+        // isFirst 用来记录是否为首次发起授权，
+        // 如果首次授权拒绝后，isFirst赋值为1
+        let isFirst = wx.getStorageSync('isFirst') || 0;
+        return new Promise((resolve, reject) => {
+            wx.authorize({
+                scope: 'scope.writePhotosAlbum',
+                // 同意授权
+                success: () => {
+                    resolve();
+                },
+                // 拒绝授权,这里是用户拒绝授权后的回调
+                fail: res => {
+                    if (isFirst === 0) {
+                        wx.setStorageSync('isFirst', 1);
+                        wx.showToast({
+                            title: '保存失败',
+                            icon: 'none',
+                            duration: 1000
+                        })
+                    } else {
+                        this.showModal();
+                    }
+                    console.log('拒绝授权');
+                    reject();
+                }
+            })
+        })
+    },
+
+
+    // 保存图片到系统相册
+    saveImage(saveUrl) {
+        var self = this;
+        return new Promise((resolve, reject) => {
+            wx.saveImageToPhotosAlbum({
+                filePath: saveUrl,
+                success: (res) => {
+                    wx.showToast({
+                        title: '保存成功',
+                        duration: 1000,
+                    });
+                    self.setData({
+                        showPlaybill: 'true'
+                    });
+                    resolve();
+                },
+                fail: () => {
+                    wx.showToast({
+                        title: '保存失败',
+                        duration: 1000,
+                    });
+                }
+            })
+        })
+    },
+
+    // 预览海报
+    previewPoster() {
+        getApp().globalData.no_clear = 1;
+        wx.previewImage({
+            current: this.data.shareImgPath, // 当前显示图片的http链接
+            urls: [this.data.shareImgPath], // 需要预览的图片http链接列表
+        });
+    },
+
+
+});
+
+
+{
+    "navigationBarTitleText": "卡项详情",
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+        "nav_box": "/components/nav_box/nav_box",
+        "warn": "/components/long_warn/long_warn",
+        "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
+        "privacy_pop": "/components/privacy_pop/privacy_pop",
+        "top_nav": "/components/diy_top_nav/diy_top_nav",
+        "share": "/components/share/share"
+    },
+    "navigationStyle": "custom"
+}
 \ No newline at end of file
+<import src="../../../../utils/wxParse/wxParse.wxml"></import>
+<wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
+<wxs module="g_filters" src="g_filter.wxs"></wxs>
+<wxs module="tool" src="filter.wxs"></wxs>
+<!-- 判断隐私是不是显示 -->
+<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
+<!-- 顶开 -->
+<top_nav wx:if="{{!istop || activeCategoryId>0}}" nav_type="{{-1}}" nav_frontColor="{{nav_frontColor}}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{gtitle}}"></top_nav>
+<!-- 商品内容区域,普通商品,秒杀,拼团 -->
+<block wx:if="{{isshow}}">
+	<view class="container">
+
+		<view class="type-navbar_box">
+			<top_nav id="my-nav" bindclickShare="clickShare" nav_type="{{nav_type}}" is_share="{{true}}"
+					 nav_frontColor="{{nav_frontColor}}" istop="{{(istop && searchbox_transparent && activeCategoryId==0)  ? 1 : 0 }}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{gtitle}}"></top_nav>
+		</view>
+
+		<view class="type-navbar" style="top:{{top_nav?(top_nav-4):0}}px">
+			<view class="type-box" wx:for="{{categories}}" wx:key="categories">
+				<view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
+					{{item.name}}
+				</view>
+			</view>
+		</view>
+		<view class="goods-detail">
+			<view class="goods-info" hidden="{{activeCategoryId==0?false:true}}">
+
+				<!-- 有视频和图片的情况 -->
+				<view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove" wx:if="{{mapurl}}">
+				  <view class="xc-videos-picture rel">
+				    <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box  swiperContainer rel" duration="{{1000}}" indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange">
+				      <swiper-item wx:if="{{mapurl}}">
+				        <view wx:if="{{noon == 0}}">
+				          <image class="xc-picturess" src="{{iurl+mapurl_f_img}}" mode="aspectFit">
+				            <image id="{{index}}" class="xc-play" src="{{iurl}}/miniapp/images/pofang.png" bindtap="videoPlay"></image>
+				          </image>
+				        </view>
+				        <view wx:else>
+				          <video class="xc-videos" src="{{iurl+mapurl}}" id="{{index}}" wx:if="{{_index == index}}"></video>
+				        </view>
+				      </swiper-item>
+				      <swiper-item wx:for="{{gallery}}" wx:key="gallery" class="sty">
+				        <view class="wh100 g_img_box" style="background-image:url({{iurl +(data.image_url?data.image_url:'miniapp/images/default_g_img.gif')}});"></view>
+				      </swiper-item>
+				    </swiper>
+
+				    <block wx:if="{{mapurl}}">
+				      <view wx:if="{{hiddenn==1}}">
+				        <view class="xc-imageCount">{{current}}/{{gallery.length}}</view>
+				      </view>
+				      <view class="xc-video-picture abs">
+				        <view class="xc-video" data-vipi="0" bindtap="videopicture">
+				          <view class="{{videopicture==0 ? 'xc-video-button':'xc-video-buttons'}}  {{videopicture==0 ? 'xc-sn':''}}">
+				            视频
+				          </view>
+				        </view>
+				        <view class="xc-picture  {{videopicture==1 ? 'xc-sn':''}}" data-vipi="1" bindtap="videopicture">
+				          <view>图片</view>
+				        </view>
+				      </view>
+				    </block>
+
+				  </view>
+				</view>
+
+
+				<!-- 只有图片的情况 -->
+				<view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove" wx:else>
+					<view class="xc-videos-picture rel">
+						<swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box  swiperContainer rel" duration="{{1000}}"
+						 indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange">
+							<swiper-item class="sty1">
+								<image class="wh100" src="{{iurl + (data.image_url?data.image_url:'miniapp/images/default_g_img.gif')}}"
+								 binderror="bind_bnerr" mode="aspectFit" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image>
+							</swiper-item>
+						</swiper>
+					</view>
+				</view>
+
+
+				<!-- --显示团购价和剩余时间 -->
+				<view class="prom_show rel" wx:if="{{prom_type==2}}">
+
+					<view class="abs flex fs36" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}}
+
+						<view wx:if="{{sys_switch.is_retail_price}}" class="word-line fs24 no_line_c" style="margin-left: 10rpx;position: relative;top: -6rpx; color:#fff !important">零售价：￥{{filters.toFix(data.show_price,2)}}</view>
+						<view wx:else class="word-line no_line_x fs24" style="margin-left: 10rpx;position: relative;top: -6rpx;color:#fff !important">￥{{filters.toFix(data.shop_price,2)}}</view>
+					</view>
+
+					<image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image>
+
+					<image class="secondkill-img" src='{{iurl+"/miniapp/images/group_img.png"}}'></image>
+					<view class="stop fs26 abs"  style="color: #fff;top: 22rpx">
+
+						<block wx:if="{{prom_st==0 && !prom_r_null}}">开始时间</block>
+						<block wx:else>结束时间</block>
+
+					</view>
+					<view class="secview  flex abs fs24 xc-miaosha-time" style="color: #fff;top: 68rpx">
+						<block wx:if="djs.day">{{djs.day}}天</block>{{djs.hou}}小时{{djs.min}}分{{djs.sec}}秒
+					</view>
+				</view>
+
+
+				<block>
+					<view class="goods-price rel">
+						<view class="co-red" style="overflow: hidden">
+							<view class="market-price" style="overflow: hidden"></view>
+						</view>
+
+
+						<view class="flex jc_sb" style="padding-bottom: 20rpx;">
+							<view>
+								<!-- 手店价 -->
+								<view class="co-red" wx:if="{{prom_type == 0}}"><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>
+							</view>
+
+							<!-- 这个是分享按钮 -->
+							<view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
+								<view class="iconfont icon-share"></view>
+								<view class="fs22 c-7b">分享</view>
+							</view>
+						</view>
+
+
+						<block wx:if="{{prom_type==1}}">
+						  <view class="goods-num">
+						    <block>
+						      <view class="stock">总数量：{{prom_act.is_virtual_count ? prom_act.goods_num : (prom_act.goods_num+prom_act.virtual)}}件</view>
+
+						      <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
+						      <view class="stock" wx:else>限购:不限</view>
+							  <view wx:if="{{prom_st>0}}"  class="sales">已售:{{prom_act.buy_num+prom_act.virtual}}件</view>
+							  <view wx:else class="sales">已售:{{prom_act.buy_num}}件</view>
+
+						    </block>
+						  </view>
+						</block>
+
+						<block wx:if="{{prom_type==2}}">
+							<view class="goods-num">
+								<block>
+									<view class="stock">总数量：{{ prom_act.goods_num+prom_act.virtualNum}}件</view>
+
+									<view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
+									<view class="stock" wx:else>限购:不限</view>
+									<view wx:if="{{prom_st>0}}" class="sales">已售:{{prom_act.buy_num+prom_act.virtualNum}}件</view>
+									<view wx:else class="sales">已售:{{prom_act.buy_num}}件</view>
+
+								</block>
+							</view>
+						</block>
+
+
+						<view class="goods-num" wx:else>
+							<view class="sales">销量：{{data.sales_sum}}</view>
+							<view class="sales">有效天数：{{data.validDays?data.validDays:'不限'}}</view>
+						</view>
+
+					</view>
+				</block>
+
+
+
+				<!-- 门店收货地址 -->
+				<view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}">
+					<view class="address_frame" bindtap="choice_store" data-ind="0">
+						<view class="flex-vertical-between ">
+							<view class="flex-vertical select_store_height">
+								<image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+								<view class="fs30" style="color:black;">选择门店</view>
+							</view>
+							<view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
+						</view>
+
+						<view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+							<view class="flex-space-between address ai_end  ">
+								<view>
+									<text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+								</view>
+								<view class="distance fs24" 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="no_store" wx:if="{{only_pk && !only_pk.length}}">(未找到门店)</view>
+							<block wx:else>
+								<view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(未找到门店)</view>
+								<text wx:elif="{{def_pick_store.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售)</text>
+								<block wx:else>
+									<view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(该店不可售)</view>
+								</block>
+							</block>
+
+							<view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
+						</view>
+					</view>
+
+				</view>
+
+
+				<!-- 保障服务 -->
+				<view class="bz_view flex bdt16 ai_c" wx:if="{{store_config.service_bz}}">
+					<image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
+					<view class="flex f1 ai_c rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
+						<view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{store_config.service_bz}}</view>
+					  <view class="bz-content hideArea">{{store_config.service_bz}}</view>
+					  <view class="cx-obtain-coupon wsize arrow" wx:if="{{showFold}}">
+					    <text class="bg_jj down {{flag ? 'up':''}}"></text>
+					  </view>
+					</view>
+				</view>
+
+				<!-- - 宝贝评价 -- -->
+				<view class="bdt16">
+				  <view class="bb_view">
+				    <view class="bold">宝贝评价({{categories3[0].num}})</view>
+				    <view class="red_bb fs26" bindtap="look_pj">
+				      查看全部
+				      <text class="bg_jj"></text>
+				    </view>
+				  </view>
+				  <view class="xc_comment">
+				    <view class="xc_comment-have-pictures" data-val="5" bindtap="clik_evaluate">
+				      有图({{categories3[1].num}})
+				    </view>
+				    <view class="xc_comment-discuss" data-val="2" bindtap="clik_evaluate">
+				      好评({{categories3[2].num}})
+				    </view>
+				    <view class="xc_comment-discuss" data-val="3" bindtap="clik_evaluate">
+				      中评({{categories3[3].num}})
+				    </view>
+				    <view class="xc_comment-discuss" data-val="4" bindtap="clik_evaluate">
+				      差评({{categories3[4].num}})
+				    </view>
+				  </view>
+				  <scroll-view scroll-x="true" class="pj_scroll">
+				    <view class="flex">
+				      <view class="xc_comment-detail" style="" wx:for="{{fir_comments}}" wx:key="{{item}}">
+				        <view class="xc_comment-left">
+				          <view class="xc_comment-user">
+				            <view class="xc_user-img">
+				              <image class="xc_imgs" src='{{item.is_anonymous!=1?item.head_pic:iurl+"/miniapp/images/hui_hear_pic.png"}}' binderror="bind_bnerr2" data-errorimg="fir_comments[{{index}}].head_pic"></image>
+				            </view>
+				            <view class="xc_user">
+				              <view class="xc_user-name five-level-word">
+				                {{item.is_anonymous!=1?item.username:'匿名'}}
+				              </view>
+				              <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
+				            </view>
+				          </view>
+				          <view class="xc_comment-font pj_word_size ellipsis-1 pdt12">
+				            <text class="ellipsis-1">{{item.content?item.content:'此用户没有填写评价。'}}</text>
+				          </view>
+				          <view class="xc_comment-val">
+				            <view class="xc_comment-time">{{item.add_time}}</view>
+				          </view>
+				        </view>
+				        <view class="xc_goods-img-frame">
+				          <image wx:if="{{item.img[0]!=undefined && item.img[0]!=null}}" class="xc_goods-img" src='{{iurl+item.img[0]}}'></image>
+				          <image wx:elif="{{item.weapp_img[0]!=undefined && item.weapp_img[0]!=null}}" class="xc_goods-img" src='{{item.weapp_img[0]}}'></image>
+				          <image wx:else class="xc_goods-img" src='{{gallery[0].image_url}}'></image>
+				        </view>
+				      </view>
+				    </view>
+				  </scroll-view>
+				</view>
+
+
+
+				<!-- 图文详情 -->
+				<view class="t_g_info bdt16">
+				  <view class="red_shu"></view>
+				  <view class="fs30 bold">卡项详情</view>
+				</view>
+				<view class="pdh20">
+
+					<block wx:if="{{listServiceItem && listServiceItem.length > 0}}">
+						<view class="card fs28" wx:for="{{listServiceItem}}">
+							<view class="flex ai_c jc_sb" style="height: 88rpx;">
+								<view class="ellipsis-2 f1" wx:if="{{item.displayqty==1}}" >{{item.projectName}}（无限次）</view>
+                <view class="ellipsis-2 f1" wx:else>{{item.projectName}}（{{item.frequency}}次）</view>
+								<view class="pdl30 t-r">
+										<view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
+										<view class="fs22 c-9 del" wx:if="{{item.showPrice}}">零售价：￥{{item.showPrice}}</view>
+								</view>
+							</view>
+							<view class="flex ai_c jc_sb fs24 c-6">
+								<view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
+								<!-- 指定开始日期和结束日期 -->
+								<view class="pdl30 shrink0">有效期：{{filters.showStartAndEndDate(item, data.validDays)}}</view>
+							</view>
+						</view>
+					</block>
+
+					<block wx:if="{{enableMeiye}}">
+						<block wx:if="{{taoheList && taoheList.length > 0}}">
+							<view class="taohe fs28" wx:for="{{taoheList}}">
+								<view class="flex ai_c jc_sb" style="height: 88rpx;">
+									<view class="ellipsis-2 f1">{{item.goods_name}} ({{item.goods_sn}}) ({{item.frequency}}个)</view>
+									<view class="pdl30 t-r">
+											<view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
+											<view class="fs22 c-9 del">零售价：￥{{item.show_price}}</view>
+									</view>
+								</view>
+								<view class="flex ai_c jc_sb fs24 c-6 pdt10">
+									<view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
+									<view class="pdl30 shrink0">有效期：{{filters.showStartAndEndDate(item,data.validDays)}}</view>
+								</view>
+							</view>
+						</block>
+					</block>
+
+					<!-- <view class="table_s" wx:if="{{service_list}}">
+          <view class="tb_item tb-l">
+            <view class="item_left f1">
+              <text>项目名称</text>
+            </view>
+						<view class="item_left f1">
+						  <text>耗时(分)</text>
+						</view>
+						<view class="item_left f1">
+						  <text>次数</text>
+						</view>
+          </view>
+          <view class="tb_item tb-l" wx:for="{{service_list}}">
+            <view class="item_right f1">
+              <text>{{item.projectName}}</text>
+            </view>
+						<view class="item_right f1">
+						  <text>{{item.timeConsuming}}</text>
+						</view>
+						<view class="item_right f1">
+						  <text>{{item.frequency}}</text>
+						</view>
+          </view>
+        </view> -->
+
+					<view class="wxParse">
+						<template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
+					</view>
+
+				</view>
+
+				<!-- 推荐商品 -->
+				<view class="flex-center rel xc-linellae-frame">
+				  <view class="xc-linellae"></view>
+				  <view class="abs flex-center xc-recommend-frame ">
+				    <image class=" xc-recommend" src="{{iurl}}/miniapp/images/diamond.png"></image>
+				    <view class="xc-recommend-word">推荐</view>
+				  </view>
+				</view>
+				<serviceCard_recommend id="goods_list"></serviceCard_recommend>
+
+			</view>
+
+
+			<view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}">
+				<view class="pd20">
+					<!-- <view class="table_s" wx:if="{{service_list}}">
+				  <view class="tb_item tb-l">
+				    <view class="item_left f1">
+				      <text>项目名称</text>
+				    </view>
+						<view class="item_left f1">
+						  <text>耗时(分)</text>
+						</view>
+						<view class="item_left f1">
+						  <text>次数</text>
+						</view>
+				  </view>
+				  <view class="tb_item tb-l" wx:for="{{service_list}}">
+				    <view class="item_right f1">
+				      <text>{{item.projectName}}</text>
+				    </view>
+						<view class="item_right f1">
+						  <text>{{item.timeConsuming}}</text>
+						</view>
+						<view class="item_right f1">
+						  <text>{{item.frequency}}</text>
+						</view>
+				  </view>
+				</view> -->
+
+				<block wx:if="{{listServiceItem && listServiceItem.length > 0}}">
+					<view class="card fs28" wx:for="{{listServiceItem}}">
+						<view class="flex ai_c jc_sb" style="height: 88rpx;">
+							<view class="ellipsis-2 f1">{{item.projectName}}（{{item.frequency}}次）</view>
+							<view class="pdl30 t-r">
+									<view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
+									<view class="fs22 c-9 del" wx:if="{{item.showPrice}}">零售价：￥{{item.showPrice}}</view>
+							</view>
+						</view>
+						<view class="flex ai_c jc_sb fs24 c-6">
+							<view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
+							<!-- 指定开始日期和结束日期 -->
+							<view class="pdl30 shrink0">有效期：{{filters.showStartAndEndDate(item, data.validDays)}}</view>
+						</view>
+					</view>
+				</block>
+
+				<block wx:if="{{enableMeiye}}">
+					<block wx:if="{{taoheList && taoheList.length > 0}}">
+						<view class="taohe fs28" wx:for="{{taoheList}}">
+							<view class="flex ai_c jc_sb" style="height: 88rpx;">
+								<view class="ellipsis-2 f1">{{item.goods_name}} ({{item.goods_sn}}) ({{item.frequency}}个)</view>
+								<view class="pdl30 t-r">
+										<view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
+										<view class="fs22 c-9 del">零售价：￥{{item.show_price}}</view>
+								</view>
+							</view>
+							<view class="flex ai_c jc_sb fs24 c-6 pdt10">
+								<view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
+								<view class="pdl30 shrink0">有效期：{{filters.showStartAndEndDate(item,data.validDays)}}</view>
+							</view>
+						</view>
+					</block>
+				</block>
+
+					<view class="wxParse">
+						<template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
+					</view>
+
+				</view>
+			</view>
+
+			<view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">
+			  <view class="topframe">
+			    <view class="topframe-top">
+			      <view class="topframe-top-content">
+			        <view>宝贝评价</view>
+			        <view class="topframe-top-val">({{categories3[0].num}})</view>
+			      </view>
+			      <view class="topframe-praise" wx:if="{{categories3[0].num}}">
+			        好评{{ filters.toFix(categories3[2].num/categories3[0].num*100,2) }}%
+			      </view>
+			      <view wx:else>好评 0%</view>
+			    </view>
+			    <view class="buttem-list">
+			      <view bindtap="tabClick3" id="{{item.id}}" wx:for="{{categories3}}" wx:key="categories3" class="item {{activeCategoryId3==item.id?'red':''}}">
+			        {{item.name}}({{item.num}})
+			      </view>
+			    </view>
+			  </view>
+			  <block wx:for="{{comments}}" wx:for-index="cIdx" wx:key="{{cIdx}}">
+			    <view style='border-bottom:4rpx solid #eee;'>
+			      <view class="middle">
+			        <view class="middle-img-frame">
+			          <image class="middle-img" src="{{item.is_anonymous!=1?item.head_pic:iurl+'/miniapp/images/hui_hear_pic.png'}}" binderror="bind_bnerr2" data-errorimg="comments[{{cIdx}}].head_pic"></image>
+			          <view class="middle-user-frame">
+			            <view class="middle-user">
+			              {{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}}
+			            </view>
+			            <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
+			          </view>
+			        </view>
+			        <view class="xc-pirces">
+			          <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}" style="word-break: break-all;">
+			            {{item.content?item.content:'此用户没有填写评价。'}}
+			          </view>
+			        </view>
+			        <view wx:if='{{item.seeMore}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleHandler'>
+			          全部显示
+			        </view>
+			        <view wx:if='{{!item.seeMore && item.auto}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleContent'>
+			          收起
+			        </view>
+			        <view class="img-ul">
+			          <block wx:if="{{item.source_type==0}}">
+			            <view class="img-li" wx:for="{{item.img}}" wx:key="{{index}}">
+			              <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}" data-img="{{iurl}}{{item}}" data-id="{{index}}" src="{{iurl}}{{item}}"></image>
+			            </view>
+			          </block>
+			          <block wx:if="{{item.source_type==1}}">
+			            <view class="img-li" wx:for="{{item.weapp_img}}" wx:if="{{aitem.length>10}}" wx:key="{{index}}" wx:for-item="aitem">
+			              <image bindtap="previewCommentImgs_w" class="wh100" data-cidx="{{cIdx}}" data-img="{{aitem}}" data-id="{{index}}" src="{{aitem}}"></image>
+			            </view>
+			          </block>
+			        </view>
+			        <view class="z_parameter">
+			          <view class="parameter-font">{{item.add_time}}</view>
+			          <view class="parameter-dian" bindtap="click_zan" data-com_id="{{item.comment_id}}" data-item_id="{{cIdx}}">
+			            <image wx:if="{{item.userZanNum==1}}" class="parameter-img" src="{{iurl}}/miniapp/images/zan_red.png"></image>
+			            <image wx:else class="parameter-img" src="{{iurl}}/miniapp/images/dianzan.png"></image>
+			            <view class="parameter-val" style='color:{{item.userZanNum==1? "#d60022":"#999" }}'>
+			              {{item.zan_num}}
+			            </view>
+			          </view>
+			        </view>
+			      </view>
+			      <view class="reply rel" wx:if="{{item.replay_list}}">
+			        <view class="line_bulge"></view>
+			        <view class="shop-reply">店家回复:</view>
+			        <view class="shop-font" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="{{index}}">
+			          {{r_item.content}}
+			        </view>
+			      </view>
+			    </view>
+			  </block>
+			  <block wx:if="{{(!comments || comments.length==0) && get_c }}">
+			    <text class="no_pj_list">暂无评价</text>
+			  </block>
+			  <block wx:if="{{comments.length>10 && comments_no_more}}">
+			    <text class="no_pj_list">已经加载到底部</text>
+			  </block>
+			</view>
+		</view>
+	</view>
+	<!---滚动到顶部---->
+	<!-- <view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}">
+		<image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image>
+	</view> -->
+
+	<!-- 底部按钮 -->
+	<view class="join-cart ai_c">
+
+		<view class="flex">
+			<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">
+			  <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>
+			  <view>收藏</view>
+			</view>
+
+			<view class="shopping-cart cart-ico new_split pdh20">
+				<navigator open-type="switchTab" url="/pages/cart/cart/cart" style="text-align: center">
+					<image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image>
+<!--					<view class="cart-num ellipsis-1"> {{cartGoodsNum}} </view>-->
+					<view>购物车</view>
+				</navigator>
+			</view>
+		</view>
+
+
+		<view class="flex f1 btn-group">
+			<!-- -----团购------ -->
+			<block wx:if="{{prom_type==2}}">
+				<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}}">
+					<view class="buy-btn cart-btn cart-btn-lg lanse f1">即将开始</view>
+				</block>
+				<block wx:if="{{prom_r_null}}">
+					<view  class="buy-btn cart-btn cart-btn-lg huise f1">已抢光</view>
+				</block>
+				<block wx:if="{{prom_st==3 && !prom_r_null}}">
+					<view  class="buy-btn cart-btn cart-btn-lg lanse f1">活动已经结束</view>
+				</block>
+			</block>
+
+			<!-- 从“我的服务”入口进入购买商品 -->
+			<block wx:else>
+				<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>
+
+	<!--  制作一个圆球导航  -->
+	<nav_box></nav_box>
+</block>
+
+<!-- 弹起来,选择规格数量,普通商品购买和秒杀 -->
+<view hidden="{{!openSpecModal}}">
+
+	<view bindtap="closeSpecModal" class="cover-layer"></view>
+	<view class="spec-model">
+		<view class="pding">
+
+			<icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
+
+
+			<view class="spec-goods">
+				<image class="wh100 spec-img" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}"
+				 binderror="pop_err_img" data-errorimg="data.image_url" />
+				<view class="spec-goods-info">
+					<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="{{prom_type == 2}}">{{prom_price}}</block>
+							<block wx:else>{{data.shop_price}}</block>
+						</view>
+					</view>
+				</view>
+			</view>
+
+
+
+			<!-- 选择门店模块 -->
+			<view class="flex-space-between address ai_end xc-width" style="padding-top: 30rpx;">
+				<view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+					<text class="fs30 xc-black3 shop_name" style="width:360rpx">{{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 hidden="{{has_def && sys_switch.is_pricing_open_store}}" 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 class="no_store" wx:elif="{{def_pick_store.is_no_dis_act}}">(该店不可售)</view>
+					<view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && 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>
+
+
+
+		<view class="b_num">
+			<view>购买数量</view>
+			<view class="count">
+				<view class="sub {{goodsInputNum <= 1 ? 'active':''}}" wx:if="{{goodsInputNum <= 1}}">-</view>
+				<view bindtap="subCartNum" class="sub" wx:else>-</view>
+				<input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
+				<view bindtap="addCartNum" class="add">+</view>
+			</view>
+		</view>
+
+
+
+		<view class="spec-cart-btns">
+			<view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view>
+			<view wx:elif="{{def_pick_store && def_pick_store.is_no_dis_act}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view>
+			<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>
+
+                                     <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32 {{!sto_sele_name?'gray':''}}"
+                                         data-action="add">加入购物车</view>
+                                     <!-- 秒杀 -->
+                                     <block wx:if="{{prom_type == 2}}">
+                                         <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}"
+                                          data-action="buy" data-promtype="{{prom_type}}" data-promid="{{prom_id}}">
+                                            立即购买
+                                         </view>
+                                     </block>
+
+                                     <!-- 普通商品 -->
+                                     <block wx:else>
+                                         <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}"
+                                            data-action="buy">
+                                            立即购买
+                                         </view>
+                                    </block>
+
+							</block>
+						</block>
+					</block>
+				</block>
+
+			</block>
+		</view>
+
+		<view class="clear"></view>
+	</view>
+</view>
+
+
+
+<!-- 选择门店的弹框，1.1版最新的 -->
+<block wx:if="{{store==1}}">
+	<view class="mongolia-layer" bindtap="close_popup"></view>
+	<view class="popup-frame">
+		<block wx:if="{{sort_store==0}}">
+			<!-- 头部 标题 -->
+			<view class="popup-top flex-space-between">
+				<text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
+				<view>
+					<view>
+						<icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
+					</view>
+					<view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}">
+						<text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text>
+						<view class="bg_rights"></view>
+					</view>
+				</view>
+			</view>
+            <view class="searchbar flex-vertical-between storeListpadd">
+        <input class="inputstore fs28" placeholder="输入要搜索的门店" value="{{keyword}}" placeholder-class="fs28" maxlength="16" bindinput="input_store" bindconfirm="searchfn" />
+        <view class="search flex-center" bindtap="searchfn">
+          <view class="fs28">搜索</view>
+        </view>
+      </view>
+			<!-- 门店列表，最外层的门店列表，一开始 -->
+			<view class="store-list">
+				<!--如果还没有点击更多门店的时候  -->
+				<block wx:if="{{choice_sort_store==0}}">
+					<!-- 需要for循环 -->
+					<block wx:if="{{is_show_sto_cat==1}}">
+						<view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+							<view class="store flex-vertical">
+								<!-- 需要点击事件 -->
+								<block wx:if="{{index==fir_pick_index}}">
+									<view class="circle white xc-hook fs20 red-b">Г</view>
+								</block>
+								<block wx:else>
+									<view class="circle  xc-hooks"></view>
+								</block>
+								<view class="address-frame xc-ash">
+									<view class="flex-vertical-between butttem5">
+										<view class="flex xc-ash">
+											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
+												<block wx:if="{{tool.is_no_dis(data.storageId,item.keyid)}}">
+													<text class="no_store">(该店不可售)</text>
+												</block>
+												<text wx:elif="{{item.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售1)</text>
+
+											</view>
+										</view>
+										<view>
+											<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
+												距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
+										</view>
+									</view>
+									<view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+								</view>
+							</view>
+						</view>
+					</block>
+					<block wx:else>
+						<view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+							<view class="store flex-vertical">
+								<!-- 需要点击事件 -->
+								<block wx:if="{{index==fir_pick_index}}">
+									<view class="circle white xc-hook fs20 red-b">Г</view>
+								</block>
+								<block wx:else>
+									<view class="circle  xc-hooks"></view>
+								</block>
+
+								<view class="address-frame xc-ash">
+									<view class="flex-vertical-between ">
+										<view class="flex xc-ash">
+											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
+												<block wx:if="{{tool.is_no_dis(data.storageId,item.keyid)}}">
+													<text class="no_store">(该店不可售)</text>
+												</block>
+												<text wx:elif="{{item.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售)</text>
+											</view>
+										</view>
+										<view>
+											<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
+											</view>
+										</view>
+									</view>
+									<view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+								</view>
+							</view>
+						</view>
+					</block>
+				</block>
+				<block wx:else>
+					<!-- 如果是点击选择门店分类后显示分类下的门店  -->
+					<view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store">
+						<view class="store flex-vertical">
+							<!-- 需要点击事件 -->
+							<block wx:if="{{index==sec_pick_index}}">
+								<view class="circle white xc-hook fs20 red-b">Г</view>
+							</block>
+							<block wx:else>
+								<view class="circle  xc-hooks"></view>
+							</block>
+
+							<view class="address-frame xc-ash">
+								<view class="flex-vertical-between ">
+									<view class="flex xc-ash">
+										<view class="fs28 xc-black3 address_name">{{item.pickup_name}}
+											<block wx:if="{{tool.is_no_dis(data.storageId,item.keyid)}}">
+												<text class="no_store">(该店不可售)</text>
+											</block>
+											<text wx:elif="{{item.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售)</text>
+										</view>
+									</view>
+									<view>
+										<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
+											距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
+									</view>
+								</view>
+								<view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+							</view>
+						</view>
+					</view>
+				</block>
+
+			</view>
+
+			<!-- 门店列表底部 -->
+			<view class="store-bottom-frame">
+				<view class="store-bottom flex-vertical-between">
+					<view class="determine red-b fs28 white t-c" bindtap="sure_pick" data-openindstore="{{open_ind_store}}">确定</view>
+					<view class="default  t-c fs28" bindtap="set_def_pick" data-openindstore="{{open_ind_store}}">设为默认</view>
+				</view>
+			</view>
+
+		</block>
+
+		<block wx:else>
+			<view class="popup-top flex-space-between">
+				<text class="fs32 nearby_store">门店分类选择</text>
+				<view>
+					<view>
+						<icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
+					</view>
+					<view class="felx choose_mores" bindtap="returns">
+						<text class="fs26 red-co">返回</text>
+					</view>
+				</view>
+			</view>
+			<view class="sort_store_list">
+
+				<view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}">
+					<view class="sort-store flex-vertical-between">
+						<view class="fs30" di>{{item.name}}</view>
+						<view class="black_rights-frame">
+							<view class="black_rights"></view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+		</block>
+	</view>
+</block>
+<!--  ---------------分享弹窗--------------- -->
+<!--二维码显示页面-->
+<canvas canvas-id='share' style='width:750rpx;height:1217rpx;background-color:white;' wx:if='{{!canvasHidden}}'></canvas>
+<warn id="warn"></warn>
+
+<view wx:if="{{showPoster}}">
+	<view class="mask" catchtap="closePoster"></view>
+	<view class="poster-container">
+		<view class="poster-wrapper">
+			<view class="poster" bindtap="previewPoster">
+				<!-- <view class="poster" bindtap="previewImage"> -->
+				<image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image>
+				<view class="btn-close" catchtap="closePoster">
+					<text class="iconfont icon-close"></text>
+				</view>
+			</view>
+			<view class="btn-container">
+				<!-- <button class="btn-share" open-type="share" bindtap="">微信好友分享</button> -->
+				<button class="btn-share" bindtap="savePic">保存到相册</button>
+			</view>
+		</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" wx:if="{{store_tel}}">
+		<text class="iconfont icon-dianhua"></text>客服热线：
+		<text class="c-red">{{store_tel}}</text>
+	</view>
+	<!-- 小程序客服 -->
+	<block wx:if="{{sys_switch.weapp_customertype == 1}}">
+		<button class="pd20 bdt fs30 btn2" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+		  <text class="iconfont icon-kefu1"></text>在线客服
+		</button>
+	</block>
+	<!-- 微信客服 -->
+	<block wx:elif="{{sys_switch.weapp_customertype == 2}}">
+		<view class="pd20 bdt fs30 btn2" bindtap="con_weixin">
+			<text class="iconfont icon-kefu1"></text>在线客服
+		</view>
+	</block>
+</view>
+
+<view class="mask2" bindtap="closeCS"></view>
+<!-- 分享控件，底部弹出 -->
+<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageFn" wx:if="{{share_hidden}}"></share>
+@import "../../../../utils/wxParse/wxParse.wxss";
+.container { margin-bottom: 100rpx; overflow: hidden;}
+image {
+    vertical-align: top;
+}
+.goods-detail{
+	/* overflow: hidden */
+	padding-top: 78rpx;
+}
+
+.type-navbar {
+    display: flex;
+    justify-content: center;
+    width: 100%;
+		position: fixed;
+		top: 0;
+		z-index: 999;
+    /* height: 80rpx; */
+    /* margin-bottom: 20rpx; */
+    background-color: #fff;
+		border-top: 2rpx solid #ebedf0;
+    /* border-bottom: 1rpx #fafafa solid; */
+}
+.type-box {
+    width: 25%;
+    box-sizing: border-box;
+    font-size: 32rpx;
+    line-height: 76rpx;
+    padding: 0 20rpx;
+    text-align: center;
+    display: inline-block;
+    overflow: hidden;
+}
+.type-navbar-item {
+    /* border-bottom: 4rpx solid #fff; */
+    display: flex;
+    justify-content: center;
+    width: 100%;
+		font-size: 26rpx;
+}
+.type-item-on {
+	color: #F95D74;
+	font-weight: bold;
+  /* border-bottom: 4rpx solid #F95D74; */
+	position: relative;
+	font-size: 30rpx;
+}
+.type-item-on:after {
+	content: '';
+	position: absolute;
+	width: 50%;
+	height: 4rpx;
+	background-color: #F95D74;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	margin: 0 auto;
+}
+.swiper_box {
+    width: 100%;
+    height: 750rpx;
+		background-color: #f2f2f2;
+}
+.goods-title {
+    display: flex;
+    justify-content: space-between;  
+		/* overflow: hidden; */
+    /* height: 108rpx; */
+}
+.goods-name {
+    /* width: 560rpx; */
+    /* line-height: 46rpx; */
+    font-size: 32rpx;
+		font-weight: bold;
+    color: #333;
+    /* margin-top: 30rpx;
+    margin-bottom:30rpx; */
+		flex: 1;
+		text-align: justify;
+		margin: 10rpx 0 20rpx;
+}
+
+.goods-collect {
+    width: 112rpx;
+    padding-top: 30rpx;
+}
+
+.collect-img {
+    width: 50rpx;
+    height: 44rpx;
+    margin: 0 auto;
+    overflow: hidden;
+}
+
+.collect-des {
+    text-align: center;
+    font-size: 24rpx;
+    color: #333;
+}
+
+.goods-price {
+    font-size: 60rpx;
+    /* padding: 20rpx 34rpx; */
+    /* padding:0rpx 34rpx; */
+    /* line-height: 60rpx; */
+    color: #999;
+		padding: 20rpx;
+    /* margin-top: 46rpx; */
+    /* margin-top:26rpx;
+    padding-bottom:20rpx; */
+}
+
+.prom-info {
+    margin: 10rpx 0;
+    color: #f23030;
+}
+
+.prom-info>.prom-type {
+    color: white;
+    background-color: #f23030;
+    margin-right: 14rpx;
+    padding: 2rpx 8rpx;
+    border-radius: 4rpx;
+}
+.market-price {
+    /* display: flex;
+    margin-left: -5rpx; */
+}
+
+.market-price .yuan{
+    /* top:24rpx; */
+    font-size: 30rpx
+}
+
+.market-price>view>text {
+    text-decoration: line-through;
+}
+
+.market-price>.yj{
+   color: #999999; font-size: 24rpx;/* margin-left: 16rpx;position: relative;top:30rpx; */
+	 display: inline-block;
+}
+
+.goods-price>.tm{ color: #999999; font-size: 26rpx;margin-top: 10rpx;}
+
+.goods-num {
+    display: flex;
+		font-size: 24rpx;
+    justify-content: space-between;
+		
+}
+
+.goods-detail .twen{
+  background: #fff;height: 60rpx; line-height: 60rpx; font-size: 30rpx;padding-left: 30rpx;display: flex;
+}
+.goods-detail .twen .img{ width: 32rpx; height: 32rpx; margin-left: 200rpx; background: #fff}
+.goods-detail .twen image.img{vertical-align:auto;}
+
+
+.logistics-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 90rpx;
+    /*border-bottom: 1px solid #f5f5f5;*/
+    font-size: 32rpx;
+    color: #666;
+}
+.logistics-item .small{color: #999; font-size: 24rpx;}
+
+.item-title { width: 180rpx;}
+.item-mes {
+    color: #333; width: 420rpx;
+    height: 90rpx; line-height: 90rpx;
+}
+.item-img { width: 32rpx; height: 32rpx;}
+.prom-item {
+    color: #f23030;
+    border: 1px solid #f23030;
+    border-radius: 18rpx;
+    line-height: 40rpx;
+    height: 40rpx;
+    padding: 2rpx 8rpx;
+}
+
+.guarantee {
+    justify-content: space-around;
+}
+
+.ico-item {
+    width: 32rpx;
+    height: 32rpx;
+    margin-right: 10rpx;
+}
+
+.guarantee>view {
+    display: flex;
+    align-items: center;
+    height: 32rpx;
+    color: #666;
+}
+
+.user-comment {
+    margin: 10rpx 0;
+    font-size: 28rpx;
+}
+
+.good-comment,.comment-num {
+    display: flex;
+}
+
+.recommend {
+    background-color: #fff;
+    border-bottom: 1px solid #ddd;
+    padding-bottom: 20rpx;
+}
+
+.recommend-title {
+    height: 70rpx;
+    line-height: 70rpx;
+    font-size: 28rpx;
+    padding: 0 30rpx;
+}
+
+.recommend-ul {
+    display: flex;
+    justify-content: flex-start;
+}
+
+.recommend-ul .li {
+    width: 25%;
+    box-sizing: border-box;
+    text-align: center;
+    font-size: 28rpx;
+    color: #333;
+}
+
+.li-img {
+    width: 120rpx;
+    height: 120rpx;
+    margin: 0 auto;
+}
+
+.li-title {
+    height: 58rpx;
+    line-height: 30rpx;
+    margin: 10rpx 0;
+}
+
+.comment-item {
+    background-color: #fff;
+    font-size: 28rpx;
+}
+
+.comment-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 102rpx;
+    margin: 0 30rpx;
+    color: #333;
+    border-bottom: 1px solid #eee;
+}
+
+.user-name {
+    display: flex;
+    align-items: center;
+}
+
+.user-pic {
+    width: 54rpx;
+    height: 54rpx;
+    margin-right: 10rpx;
+    border-radius: 50%;
+    overflow: hidden;
+}
+
+.stars {
+    float: left;
+    display: flex;
+    height: 42rpx;
+    line-height: 42rpx;
+    margin: 15rpx 0;
+    width: 200rpx;
+}
+
+.star {
+    width: 26rpx;
+    height: 26rpx;
+    margin-right: 5rpx;
+}
+
+.state-spec {
+    margin: 15rpx 0;
+    float: right;
+    font-size: 24rpx;
+    color: #666;
+    width: 460rpx;
+    text-align: right;
+}
+
+.comment-cont {
+    padding: 0 30rpx 30rpx;
+    border-bottom: 1px solid #eee;
+}
+
+.comment-mes {
+    line-height: 42rpx;
+}
+
+.img-ul {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.img-li {
+    width: 150rpx;
+    height: 150rpx;
+    margin-top: 8rpx;
+    margin-right: 10rpx;
+}
+
+.comment-btn {
+    height: 60rpx;
+    padding: 20rpx 30rpx;
+}
+
+.comment-btn .btn {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 60rpx;
+    width: 45%;
+    border: 1px solid #eee;
+}
+
+.comment-btn .btn-img {
+    width: 30rpx;
+    height: 28rpx;
+    margin: 0 10rpx;
+}
+
+.reply-ul {
+    margin-top: 20rpx;
+}
+
+.reply-li {
+    color: #aaa;
+}
+
+.join-cart {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    display: flex;
+    width: 100%;
+    height: 100rpx;
+    background-color: #fff;
+    z-index: 9;
+    border-top: 4rpx solid #eee;
+
+}
+
+.join-cart > view {
+    /* width: 29%; */
+}
+
+.join-cart .new_split {
+    /* width: 13%; */
+    /* text-align: center; */
+		/* padding: 20rpx; */
+		/* box-sizing: border-box; */
+		/* flex-shrink: 0; */
+    /* padding: 0;
+    margin: 0; */
+}
+
+.cart-ico {
+    font-size: 24rpx;
+    color: #333;
+}
+
+.shopping-cart {
+    position: relative;
+}
+
+.cs-img {
+    width: 45rpx;
+    height: 40rpx;
+    /* margin-top: 15rpx; */
+}
+
+.sc-img {
+    width: 42rpx;
+    height: 40rpx;
+    /* margin-top: 15rpx; */
+}
+
+.cart-num {
+    position: absolute;
+    left: 50%;
+    top: 1rpx;
+    width: 40rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    text-align: center;
+    border-radius: 50%;
+    color: #fff;
+    background-color: rgba(217,81,99,0.9);
+}
+
+.cart-btn {
+    font-size: 28rpx;
+    color: #fff;
+    line-height: 70rpx;
+   /* margin-top: 16rpx; */
+   text-align: center;
+
+
+}
+
+.join-btn {
+    background-color: #ffb03f;
+    height: 70rpx;
+/* border-radius: 55rpx 0rpx 0rpx 55rpx;
+margin-top: 16rpx; */
+
+
+}
+
+view.cart-btn-lg {
+    width: 50%;
+}
+
+.buy-btn {
+    background-color: #f23030;
+    height: 70rpx;
+/* border-radius: 0 56rpx 55rpx 0; */
+
+}
+
+.buy-btn-all{
+        background-color: #f23030;
+    height: 70rpx;
+    border-radius: 56rpx;
+}
+
+
+.toTop {
+    position: fixed;
+    z-index: 3;
+    right: 20rpx;
+    bottom: 160rpx;
+    width: 68rpx;
+    height: 68rpx;
+    border: 1px solid #ddd;
+    border-radius: 50%;
+    overflow: hidden;
+    cursor: pointer;
+}
+
+.comment-more {
+    height: 56rpx;
+    line-height: 56rpx;
+    font-size: 26rpx;
+    color: #999;
+    text-align: center;
+    background-color: #eee;
+}
+
+.goods-more {
+    background-color: #fff;
+}
+
+.goods-norms {
+    background-color: #fff;
+}
+
+.type-navbar2 {
+    display: flex;
+    height: 72rpx;
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+}
+
+.type-box2 {
+    width: 50%;
+    font-size: 26rpx;
+    line-height: 72rpx;
+    text-align: center;
+    overflow: hidden;
+}
+
+.type-item2-on {
+    color: #f23030;
+}
+
+.parameter {
+    padding: 40rpx 0;
+}
+
+.table {
+    width: 698rpx;
+    margin: 0 auto;
+    border: 1px solid #ddd;
+    border-bottom: none;
+}
+
+.tb {
+    width: 100%;
+    min-height: 69rpx;
+    line-height: 69rpx;
+    border-bottom: 1px solid #ddd;
+    font-size: 28rpx;
+    text-align: center;
+    color: #333;
+}
+
+.th-thitle {
+    font-weight: bold;
+    background-color: #f5fafe;
+}
+
+.td-cont {
+    display: flex;
+}
+
+.td-title {
+    width: 259rpx;
+    background-color: #f5fafe;
+    border-right: 1px solid #ddd;
+}
+
+.td-text {
+    width: 439rpx;
+}
+
+.goods-comment {
+    background-color: #fff;
+}
+
+.type-navbar3 {
+    display: flex;
+    height: 88rpx;
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    padding: 10rpx 0;
+}
+
+.type-box3 {
+    width: 20%;
+    font-size: 30rpx;
+    line-height: 44rpx;
+    text-align: center;
+    overflow: hidden;
+}
+
+.type-item3-on {
+    color: #f23030;
+}
+
+.spec-model {
+    position: fixed;
+    bottom: 0;
+    z-index: 19;
+    background: white;
+    width: 100%;
+    /* padding: 0 30rpx; */
+    font-size: 32rpx;
+    box-sizing: border-box;
+    border-radius: 20rpx 20rpx 0 0;
+     /* height: 72%; */
+}
+
+.spec-model .pding{padding: 0 20rpx;}
+
+.spec-goods {
+    padding: 30rpx 0 20rpx;
+    /* float: left; */
+    width: 100%;
+   /* border-bottom:2rpx solid #eee; */
+}
+
+.spec-img {
+    float: left;
+    height: 186rpx;
+    width: 186rpx;
+     border: 4rpx solid #eee
+}
+
+.spec-goods-info {
+    float: left;
+    padding: 0 25rpx;
+    width: 400rpx;
+}
+
+.spec-goods-name {
+    font-size: 30rpx;
+    line-height: 35rpx;
+    height: 70rpx;
+    margin: 15rpx 20rpx 25rpx 0;
+    overflow: hidden;
+    text-overflow: ellipsis;color: #333;
+}
+
+.spec-goods-price {
+    color: #d60021;
+    font-size: 33rpx;
+    font-weight: bold;
+}
+
+.spec-goods-stock {
+    margin-top: 3rpx;
+    font-size: 24rpx;
+    color: #999999;
+    margin-right: 15rpx;
+}
+
+.spec-name {
+    clear: both;
+    padding: 20rpx 0;
+    font-size: 30rpx;color: #333;
+}
+
+.quhuo{font-size: 30rpx; color: #000}
+.b_num{
+ display: flex;font-size: 30rpx; color: #333;
+ justify-content: space-between;
+ align-items: center;
+ padding: 20rpx;
+}
+
+.count {
+    /* position: fixed; */
+    display: flex;
+    height: 50rpx;
+    /* border: 1rpx solid #000; */
+    font-size: 28rpx;
+    right: 30rpx;
+}
+
+
+.count>view,.count>input {
+    width: 60rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    text-align: center;
+}
+.spec_bt{
+  background: fff;color: #333; margin-left: 10rpx;padding: 4rpx 15rpx 4rpx; display: inline-block;
+  border-radius:30rpx;font-size: 24rpx;border: 1rpx solid #ccc; margin: 10rpx; height: 40rpx; line-height: 40rpx;
+}
+.spec_bt.act{background: #d60021;color: #fff;border: 1rpx solid #d60021;}
+.sub {
+    /* border-right: 1px solid #000; */
+}
+.sub.active {
+	/* background-color: #ddd; */
+	color: #ccc;
+}
+
+.sub, .add, .count>input {
+    /* border-right: 1px solid #000; */
+	background-color: #f8f8f8;
+	border-radius: 8rpx;
+}
+.sub.active {
+	/* background-color: #ddd; */
+	color: #ccc;
+}
+.count>input {
+	margin: 0 10rpx;
+	line-height: normal;
+}
+
+.add {
+    /* border-left: 1px solid #000; */
+}
+
+.spec-btn {
+    color: black;
+    background-color: white;
+    padding: 10rpx 10rpx;
+    font-size: 26rpx;
+    line-height: 28rpx;
+    float: left;
+    border: 1rpx solid #dedede;
+    margin: 4rpx 10rpx 4rpx 0;
+    border-radius: 4rpx;
+}
+
+.spec-btn-click {
+    color: white;
+    background-color: #f23030;
+    border: 1rpx solid #f23030;
+}
+
+.spec-cart-btns {
+    /* width: 92%; */
+    line-height: 70rpx;
+    /* margin: 0rpx auto;
+	margin-top: 160rpx; */
+  /* border-radius: 20rpx; */
+/* position: fixed; */
+/* bottom: 50rpx; */
+/* left: 4%; */
+	padding: 20rpx;
+}
+
+.spec-cart-btn {
+ 
+    width:100%;
+    font-size: 30rpx;
+    text-align: center;
+    color: white;
+    border-radius: 40rpx;
+}
+
+.spec-cart-btn.w40 {
+	width: 46%;
+}
+
+.spec-add-cart {
+    background-color: #ffb03f;
+}
+
+.spec-buy {
+    background-color: #f23030;
+    /* margin-left: 34rpx; */
+}
+
+.spec-cart-disable {
+    background: #bbbbbb;
+}
+
+.spec-cart-btn-lg {
+    width: 614rpx;
+}
+
+.prom-model {
+    position: fixed;
+    bottom: 0;
+    z-index: 20;
+    background: white;
+    width: 100%;
+    padding: 0 30rpx 30rpx;
+    font-size: 32rpx;
+    box-sizing: border-box;
+    overflow-x: hidden;
+}
+
+.prom-model .prom-title {text-align: center;margin: 30rpx 0;}
+.prom-model .logistics-item {border: 0;}
+.prom-model .item-mes {width: 500rpx;}
+.integral-btn {width: 100%; padding: 0rpx;margin: 0rpx;}
+.clear{clear: both;}
+.sto_v .title,.sto_v .stitle{ border-top: 1rpx solid #dedede;border-bottom: 1rpx solid #dedede; height: 78rpx; line-height: 78rpx;}
+.sto_v .title .tubiao,.sto_v .stitle .tubiao{width: 32rpx; height: 32rpx; margin-top: 23rpx;}
+.itemlists .item{border-bottom: 1rpx solid #dedede; height: 72rpx; line-height: 72rpx;font-size: 28rpx; margin: 0 10rpx;}
+
+.cshu{margin-bottom: 30rpx; margin-top: 20rpx;}
+.cshu view{color: #999; font-size: 30rpx; margin-left: 26rpx;}
+
+
+/*---活动特殊显示---*/
+.prom_show{height: 120rpx;  display: flex;}
+.prom_show .secondkill-img{width: 100%; height: 100%;}
+.prom_show .spike-img{width: 283rpx; height: 57rpx; top:35rpx;
+left:31rpx;}
+.prom_show .stop{ color:#d81731;top: 17rpx;right:65rpx; font-weight:600;}
+.prom_show .start{ color:#009ae2;top: 17rpx;right:65rpx; font-weight:600;}
+.prom_show .timeac { font-size: 32rpx; height: 120rpx; color: #333; }
+.prom_show .timeac.left{width: 66%; color: #fff;background:#f23030;}
+.prom_show .timeac.right{width: 34%;background-color: #d7d7d7; text-align: center}
+
+.prom_show .secview .day{padding-right:10rpx;}
+.prom_show .secview .time-val{width:36rpx;height:36rpx;border-radius:7rpx; line-height: 36rpx;}
+.prom_show .secview .time{margin-right:10rpx; margin-left:10rpx;}
+
+
+.prom_show .timeac.left view{ margin-left: 20rpx}
+.prom_show .timeac.left view.firview{margin-top: 10rpx}
+.prom_show .timeac.left view .tr_line{ text-decoration: line-through; font-size: 28rpx;}
+.prom_show .timeac.left view .bprice{ font-size: 50rpx; }
+
+.prom_show .timeac.right view.firview{margin-top:12rpx; margin-bottom: 10rpx}
+.prom_show .timeac.right view.secview{display: flex; text-align: center; justify-content:center; flex-direction: row;}
+.prom_show .timeac.right view .tui-conutdown-box{ 
+  /* background: #6b6b6b; */
+   width: auto;
+   /* min-width: 45rpx;  */
+   height: 45rpx; color: #c4182e; font-size: 27rpx; text-align: center; line-height: 46rpx;}
+
+.huise{ background:gray}
+.lanse{background:#0199e2}
+
+
+/*------拼单------*/
+.pt_view{ text-align: center; width: 100%; height: 100rpx; line-height: 100rpx; font-size: 26rpx}
+.pt_view .secondkill-img{width: 100%;height: 100%;}
+.pt_fir{ background: #fff;/* margin-bottom: 10rpx; */}
+.pt_fir .pt_fir_title{display: flex; align-items: center; /* margin-left: 10rpx; margin-top: 20rpx; */ font-size: 28rpx; position: relative;}
+.pt_fir .pt_fir_title .kt_type{ color: #fff;background:#e9030d; width: 100rpx; line-height: 40rpx; border-radius: 6rpx; margin: 0 10rpx;
+  height: 40rpx; font-size: 24rpx; text-align: center;}
+.pt_fir .pt_fir_title .price{color: #e9030d;font-size: 26rpx;}
+.pt_fir .pt_fir_title .bigw{font-size: 36rpx;}
+.pt_fir .pt_fir_title .tprice{text-decoration: line-through;color: #949494}
+.pt_fir .pt_fir_title .tprice.ml50{margin-left: 50rpx}
+
+.pt_fir .pt_fir_title .js{padding: 0 15rpx;height: 40rpx;background:#e9030d; text-align: center; border-radius: 8rpx; color: #fff; margin-left: 10rpx;}
+.pt_fir .pt_fir_title .tuannum{color: #e9030d; position: absolute; right: 20rpx; font-size: 26rpx;}
+.pding{padding-top: 20rpx;padding-left: 20rpx;height: 81%;
+ padding-right: 20rpx;font-size: 26rpx;color: #ea120f}
+.pdres{margin-left: 10rpx;color: #8f8f94}
+.ptgz{position: relative;font-size: 30rpx;padding-left: 20rpx;margin-top: 10rpx; overflow: hidden }
+.shuxian{width: 6rpx;height: 28rpx; background: #ea120f; display: inline-block;top: 5rpx;position: relative; margin-right: 5rpx}
+.ptgz_an{position: absolute;top:5rpx; right: 6rpx}
+.ptgz_an .arrow-two{width:18rpx;height:18rpx;border-color:#da0b31; margin-top:30rpx;}
+
+.pt_fir.se{height: auto; margin-bottom: 10rpx}
+.t_gz{padding: 10rpx 20rpx; font-size:28rpx }
+
+.pt_fir.se1{height: auto; margin: 0}
+.pt_fir.se2{height: auto; margin: 0;/* border-top:6rpx solid #eeeeee;border-bottom:2rpx solid #eeeeee; */}
+
+.pt_hb{height:78rpx; line-height: 75rpx; position: relative; font-size: 32rpx;overflow: hidden;width:695rpx;margin-left:28rpx;
+    border-bottom: 1rpx solid #E5E5E5 }
+.ptgz_an.xq{font-size: 32rpx; color:#d40024}
+.wf{display: flex; padding: 20rpx 0;}
+.wf .item{width: 24.5%; text-align: center; font-size: 26rpx; color: #666}
+.wf .item .item_txy{position: relative;width: 60rpx; height: 60rpx; background: #ea120f; border-radius: 50%;left: 50%;margin-left: -30rpx;
+   border: 3px #dfdfdf solid; text-align: center;line-height: 60rpx; color: #fff; margin-bottom: 10rpx;}
+.wf .item .item_txy.hs{ background: #cbcbcb;}
+.po{margin-bottom: 20rpx;}
+
+.cart-btn.line-h{ line-height: 26rpx;}
+.cart-btn .fir-v{ margin-top: 10rpx;}
+
+.hyt{ padding: 0 20rpx; font-size: 30rpx; display: flex; align-items:center; margin-top: 10rpx;}
+.hyt .r_f{color: #e9120f;font-size: 26rpx;position: relative;top:3rpx}
+.hyt .byj{color: #e9120f;font-size: 32rpx;position: relative;top:5rpx}
+
+.pt_fir .pt_fir_title.no-mar-b{margin-bottom: 0;padding-bottom: 10rpx; margin-left: 20rpx}
+.pt_fir .pt_fir_title.boder-1{border-bottom: 1rpx #e7e7e7 solid}
+
+.jie_price{/* padding: 10rpx 30rpx; */}
+.jie_price_title{font-size: 30rpx; color: #a26270; margin-bottom: 10rpx}
+.price_list{display: flex; width: 100%;}
+.price_item{width: 25%;font-size: 28rpx; color: #4c336c}
+
+.pt_fir.se2 .zzk-1{/* margin-top: 23rpx; */ font-size: 30rpx;position: relative; /* margin-bottom: 30rpx; */ border-left:4rpx solid red;/* margin-left:14rpx; */height:30rpx;line-height:30rpx;/* padding-left:5rpx; */}
+.ckgd{/* position: absolute;top:0;right:57rpx; */ color:#d70025; font-size: 26rpx;}
+.ckgd .arrow-one{width:14rpx;height:14rpx;border-color:#da0b31;/* margin-top:5rpx; */ margin:auto;}
+.bview{
+     position: fixed; top:0; left:0; width: 100%; height: 100%;
+     background-color: rgba(0, 0, 0, 0.5);
+}
+.juzhong{
+    position: fixed; top:0; left:0; width: 100%; height: 100%;
+    display: flex;
+    flex-direction:row;
+    justify-content: center;
+    align-items: center;
+}
+
+.juzhong .xq{ padding: 0 20rpx; background: #fff; font-size: 30rpx; padding-bottom: 20rpx;}
+.juzhong .xq .title{text-align: center; margin: 20rpx 0; position: relative; height: 50rpx;}
+.juzhong .xq .hs1{font-size: 28rpx; color: #ab8f9e}
+.juzhong .xq .title .close{position: absolute;top: 0; right: 0; width: 45rpx; height: 45rpx;}
+
+.pt_qd{margin-top: 40rpx; height: auto;}
+.spec-cart-btn.w100{width: 95%; margin-left: 0; height: 75rpx; line-height:75rpx;margin: auto; }
+
+.sto_v{color: #333;}
+.ellipsis{overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
+
+
+/*---多少人参加团--*/
+.group {
+		padding-top:20rpx;
+    padding-bottom:20rpx;
+    width: 100%;
+    /* min-height: 92rpx; */
+    border-bottom: 2rpx solid #ebedf0;
+
+}
+
+.group .group-list {
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+    /* height: 90rpx; */
+    /* padding: 0 130rpx 0 100rpx; */
+    /* width: 470rpx;
+   
+    position: absolute; */
+}
+
+.group .group-list .gtou {
+    width: 70rpx;
+    height: 70rpx;
+    /* float: left;
+    position: relative;
+    top: 6rpx;
+    left: -96rpx; */
+}
+
+.group .group-list .gtou image {
+		display: block;
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    background-color: #f0f0f0;
+}
+
+.group .group-list .gdn {
+		width: 140rpx;
+		text-align: center;
+    /* float: left; */
+    font-size: 26rpx;
+		/* padding-left: 20rpx; */
+    /* line-height: 48rpx;
+    height: 48rpx;
+    width: 168rpx;
+    position: relative;
+    left: -80rpx;
+    top:20rpx; */
+    font-weight:bold;
+}
+
+.group .group-list .ghaicha {  
+  /* width:300rpx; */
+    font-size: 27rpx;
+    /* margin-left:180rpx;
+     top:13rpx;
+    left:-3rpx; */
+    font-weight: bold;
+
+
+}
+
+.group .group-list .ghaicha .gred {
+    /* height: 48rpx;
+    width: 300rpx; */
+}
+
+.gsj {
+    float: left;
+    color: #8f8f94;
+}
+
+.group .group-list .cjt {
+    height:42rpx;
+    width: 137rpx;
+    /* position: absolute;
+    right: 4rpx;
+    top:25rpx; */
+    line-height: 42rpx;
+    font-size: 24rpx;
+    color: #fff;
+    border:2rpx solid #d60024;
+    background-color:#d60024;
+    border-radius:25rpx;
+
+}
+
+.gbody {
+    background-color: white;
+}
+.t_show{/* overflow: hidden; */ display: flex; /* width: 300rpx; */ color: #292929; /* line-height: 36rpx; */font-size:26rpx;
+}
+.join-cart>view.set_width {
+   width:58%;
+}
+
+/*秒杀样式zwp*/
+#zwpMs{
+    width: 31%;
+    color: #fff;
+    background: url(https://mshopimg.yolipai.net/miniapp/images/user/bgred.png) no-repeat;
+    background-size: 100% 60px;
+}
+
+
+/*--------- 修改后的样式 -----------*/
+.elli{
+    overflow : hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+.one_elli{
+    overflow : hidden;
+    text-overflow: ellipsis;
+    white-space:nowrap;
+}
+
+.tuwen_title{ /* height: 86rpx; */ background-color:#eeeeee; /* margin-bottom: 32rpx; */ position: relative;
+    display: flex; justify-content: center;align-items: center; padding: 20rpx;}
+
+.tuwen_title .g_line{
+    width:496rpx;
+    height:1rpx;
+    border-bottom:#ababab 1rpx solid;
+}
+.tuwen_title .center_s{
+    width: 124rpx; position: absolute; height: 34rpx; background-color:#eeeeee; font-size: 32rpx; display: flex;
+    overflow: hidden; justify-content: center;align-items: center;
+}
+.tuwen_title .center_s image{ width: 34rpx; height: 26rpx; margin-right: 10rpx}
+.t_g_info{ /* margin: 0 34rpx;margin-bottom: 20rpx; */ display: flex; align-items: center;padding: 20rpx; }
+.red_shu{ width: 10rpx; height: 36rpx; background-color:#da0035; margin-right: 8rpx; }
+
+.tb-l{ /* line-height: 96rpx; */}
+.table_s{ border:#e4e4e4 1rpx solid; box-sizing: border-box;font-size: 26rpx;border-right: none;}
+.tb_item{display: flex; /* height: 96rpx; */ border-bottom: 1rpx solid #e4e4e4 }
+.item_left{width: 210rpx; height: 100%; box-sizing:border-box; text-align: center;padding: 20rpx; background: #f9f9f9 ;border-right:2rpx solid #e4e4e4} .item_left text{ /* margin-left: 44rpx; */}
+.item_right{flex:1; height: 100%; overflow : hidden;white-space:nowrap;text-overflow: ellipsis; padding: 20rpx;border-right:2rpx solid #e4e4e4;text-align: center;}
+.item_right text{ /* margin-left: 66rpx; */}
+
+.table_s .tb-l:last-child {border-bottom: none;}
+
+.bzfu_img{ width: 164rpx; height:34rpx; /* margin-right: 18rpx; margin-left: 12rpx */ }
+ .bz_view{ /* height:100rpx; padding: 0 34rpx 0 13rpx; */ color: #333; font-size: 28rpx; padding: 20rpx 20rpx 20rpx 10rpx;
+    /* border-bottom: 3rpx solid #eee; */
+		/* border-top: 3rpx solid #eee; */}
+    .bz_view view{ width: 520rpx; /* max-height: 70rpx; */ /* overflow: hidden; */}   
+
+.bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 20rpx; color: #333;
+    font-size: 30rpx; /* height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx */ }
+.red_bb{ color: #d70026; /* min-width:158rpx;width: auto; */}
+
+.bg_jj {
+	width: 14rpx;
+	height: 14rpx;
+	border-top: 2rpx solid #d70026;
+	border-right: 2rpx solid #d70026;
+	transform: rotateZ(45deg);
+	display: inline-block;
+	margin-bottom: 3rpx;
+}
+
+.bg_jj.down {
+	transform: rotateZ(135deg);
+}
+
+.bg_jj.up {
+	transform: rotateZ(-45deg);
+	margin-top: 6rpx;
+}
+
+.bz-content {
+	padding: 0 0 0 20rpx;
+}
+
+
+
+/* 顶部边框 */
+.topframe{
+    width: 100%;
+    height: 172rpx;
+    flex-direction: row;
+    justify-content: space-between;
+    border-bottom: 6rpx solid  #eeeeee;
+    overflow: hidden;
+}
+/* 评价人边框*/
+.topframe .topframe-top{
+    display: flex;
+    margin-top: 40rpx;
+    margin-bottom: 36rpx;
+    color: #7d7d7d;
+    padding-left: 20rpx;
+    font-size: 32rpx;
+}
+/*评价人数量*/
+.topframe .topframe-top .topframe-top-val{
+    margin-left: 15rpx;
+
+}
+.topframe-top-content{
+    display: flex;
+    width: 36%;
+}
+/* 好评 */
+.topframe-praise{
+    width: 61%;
+    text-align: right;
+    color: #dc4355;
+    font-size: 28rpx;
+}
+/* 按钮列表 */
+.buttem-list{
+    width: 100%;
+    display: flex;
+    font-size: 20rpx;
+    overflow: hidden;
+}
+
+.buttem-list .item{
+    min-width: 17%;
+    font-size: 24rpx;
+    border-radius: 20rpx;
+    background:#ffe3e2;
+    height:38rpx;
+    text-align: center;
+    line-height: 38rpx;
+    margin-left: 20rpx;
+}
+
+.buttem-list .item.red{
+    color: #fff;
+    background: #d60022;
+}
+
+/* 用户评价 */
+.middle{
+    width: 95%;
+    margin:0 auto;
+}
+.middle-img-frame{
+    height:65rpx;
+    display: flex;
+    margin-top: 32rpx;
+  
+}
+/* 评价的用户图片 */
+.middle-img{
+    width:60rpx;
+    height:60rpx;
+    border-radius: 50%;
+    -moz-border-radius: 50%;
+    -webkit-border-radius: 50%;
+    margin-right: 15rpx;
+}
+/* 评价的用户边框 */
+.middle-user-frame{
+    height: 72rpx;
+    overflow: hidden;
+}
+.middle-user{
+    height: 25;
+    font-size: 28rpx;
+}
+/* 评价图片 */
+.middle-img-two{
+    width: 115rpx;
+    height: 25rpx;
+    text-align: center;
+    margin-bottom:20rpx;
+    margin-left:5rpx;
+}
+.xc-pirces{
+  margin-top: 14rpx;
+}
+/* 评价文字 */
+.middle-font{
+    font-size: 30rpx;
+   
+}
+.iddle-goods-img{
+    width: 100%;
+    display: flex;
+    margin-top:22rpx;
+}
+/* 商品图片 */
+.goods-img{
+    width: 156rpx;
+    height: 156rpx;
+    margin-left: 22rpx;
+    height: 100%;
+}
+.parameter-frame{
+    margin-top:14rxp;
+    margin-bottom: 14rpx;
+    width:50%;
+    height: 30rpx;
+}
+.z_parameter{
+    width:98%;
+    height: 45rpx;
+    display:flex;
+    line-height: 45rpx;
+    margin-top: 20rpx;
+    margin-bottom: 14rpx;
+    justify-content : space-between;
+}
+.parameter-font{
+    font-size: 26rpx;
+  
+}
+/* 规格 */
+.parameter-state{
+    width: 100rpx;
+    font-size: 24rpx;
+    color: #c4c4c4;
+}
+.parameter-dian{
+    display: flex;
+    width: 94rpx;
+    height: 33rpx;
+    font-size: 20rpx;
+    border-radius: 20rpx;
+    line-height:33rpx;
+    padding-left: 25rpx;
+    border:4rpx solid #eeeeee;
+
+}
+/* 点赞图片 */
+.parameter-img{
+    width: 27rpx;
+    height: 27rpx;
+    margin-top: 3rpx;
+}
+.parameter-val{
+    margin-left:25rpx;
+    font-size: 26rpx;
+    color: #999;
+}
+/* 回复 */
+.reply{
+    width: 95%;
+    /* height: 120rpx; */
+   padding-top: 14rpx;
+    border-top:3rpx solid #eeeeee;
+    margin:0 auto;
+
+}
+.shop-reply{
+    height: 30rpx;
+    color:#d60022;
+    font-size:24rpx;
+    overflow: hidden;
+}
+.shop-font{
+    width: 94%;
+    font-size: 24rpx;
+    padding-top: 10rpx;
+   
+}
+.line_bulge{
+    width: 17rpx;
+    height: 17rpx;
+    border-top: 1rpx solid #eeeeee;
+    border-left: 1rpx solid #eeeeee;
+    transform:rotate(45deg);
+    position: absolute;
+    top: -12rpx;
+    left:50rpx;
+    background:#fff;
+}
+
+
+.xc_comment{
+    display: flex;
+		justify-content: space-around;
+    width: 100%;
+		box-sizing: border-box;
+		padding: 10rpx 20rpx;
+    /* height: 42rpx;
+    padding-left: 34rpx; */
+    color: #333;
+
+}
+.xc_comment-have-pictures{
+    width: 153rpx;
+    /* height: 42rpx; */
+    line-height: 42rpx;
+    text-align: center;
+    background: #ffe3e2;
+    color: 28rpx;
+    border-radius:21rpx;
+    font-size: 24rpx;
+}
+.xc_comment-discuss{
+    width: 152rpx;
+    height: 42rpx;
+    line-height: 42rpx;
+    text-align: center;
+    background: #ffe3e2;
+    color: 28rpx;
+    border-radius:20rpx;
+    font-size: 24rpx;
+    margin-left: 28rpx
+}
+
+.xc_comment-detail{
+    display: flex;
+    /* margin-top: 40rpx; */
+    /* width: 524rpx; */
+    /* margin-left: 34rpx; */
+    border-radius: 24rpx;
+    border: 2rpx solid #ebedf0;
+		margin-left: 20rpx;
+		box-sizing: border-box;
+    /* overflow: hidden; */
+}
+
+.xc_user-img{
+  border-radius:50%;
+	margin: auto 0;
+}
+
+.xc_comment-user{
+    display: flex;
+    /* margin-top: 22rpx;
+    margin-left: 22rpx; */
+}
+.xc_user{
+    width: 170rpx;
+    height: 60rpx;
+    margin-left: 6rpx;
+    overflow: hidden;
+}
+.xc_user-name{ /* height: 25rpx; */}
+.xc_comment-img{
+    width: 22rpx;
+    height: 22rpx;
+    /* margin-top: 14rpx; */
+    margin-right: 5rpx
+}
+.xc_comment-font{
+    /* height: 75rpx; */
+    /* margin-left: 22rpx; */
+    white-space:normal;
+    overflow: hidden;
+    /* margin-top: 8rpx;
+    line-height: 38rpx; */
+
+}
+.xc_comment-val{
+   /* width: 88%;
+    height: 30rpx;
+    margin-left: 22rpx;
+    display: flex;
+    margin-top: 15rpx;
+    margin-bottom:15rpx; */
+}
+
+.xc_comment-time{
+    /* height: 30rpx; */
+    font-size: 22rpx;
+    color: #a5a5a5;
+    overflow: hidden;
+}
+
+.xc_goods-img{
+    width: 190rpx;
+		height: 190rpx;
+}
+.xc_comment-left{
+    display:inline-block;
+    width: 312rpx;
+		padding: 20rpx;
+}
+.xc_goods-img-frame{
+		border-radius: 0 22rpx 22rpx 0;
+	  overflow: hidden;
+    /* display:inline-block; */
+    /* width: 40%;
+    height: 90%;
+    text-align: center;
+    padding-top: 30rpx;
+    vertical-align: top; */
+}
+.xc_imgs{
+    width: 50rpx;
+    height:50rpx;
+    border-radius:50%;
+    margin-right: 5rpx;
+}
+
+.pj_word_size{ font-size: 28rpx}
+.pj_scroll{
+	/* white-space: nowrap; */
+	/* height: 324rpx; */
+	/* margin-bottom: 50rpx; */
+	display: flex;
+	align-items: center;
+	padding: 20rpx 0;
+	/* box-sizing: border-box; */
+	/* box-shadow: 0 8px 12px #e7e9eb; */
+}
+
+
+/*领券*/
+.three-level-word{
+    font-size: 25rpx;
+}
+.four-level-word{
+    font-size: 23rpx;
+}
+.cx-frame{
+    /* border-top:3rpx solid #eee; */
+    /* width:99%;
+    height: 95rpx;
+    line-height: 95rpx;
+    padding-left:24rpx; */
+	padding: 20rpx;
+}
+.cx-frame .cx-sizs{
+    /* width: 68rpx; */
+    /* height: 100%; */
+    /* line-height: 100rpx; */
+    /* overflow: hidden; */
+    /* margin-left: 10rpx; */
+}
+.xc-coupon-fram{
+    position: relative;
+		margin-right: 16rpx;
+    /* width:200rpx; */
+    /* padding-top:30rpx; */
+
+}
+.xc-coupon-fram .xc-coupon{
+    /* width:175rpx ;
+    height: 40rpx;
+    line-height: 40rpx; */
+    background-color:#d60021 ;
+    /* margin:0 auto; */
+    color:#fff;
+		padding: 6rpx 20rpx;
+
+}
+.xc-coupon-fram .xc-circular{
+    width: 16rpx;
+    height:16rpx;
+    background-color: white;
+    position:absolute;
+    top: 50%;
+		/* left: -10rpx; */
+		transform: translateY(-50%);
+}
+.xc-coupon-fram .xc-one{
+    left: -8rpx;
+}
+.xc-coupon-fram .xc-two{
+    right: -8rpx;
+}
+
+.cx-obtain-coupon{
+   /* width: 65rpx;
+    height: 100%;
+    padding-left:15rpx; */
+    color: #d70025;
+		display: flex;
+		align-items: center;
+    /* position: absolute;
+    right: 5rpx; */
+}
+
+/* 自定义弹出窗口 */
+.cx-popup{
+    width:100%;
+    background: #fff;
+    z-index: 35;
+    border-top-left-radius: 25rpx;
+    border-top-right-radius: 25rpx;
+    position:fixed;
+    bottom:0;
+}
+
+.cx-popup .top{
+    /* width: 90%;
+    height:85rpx; */
+		font-size: 32rpx;
+		padding: 20rpx 0;
+    border-bottom: 2rpx solid #ebedf0;
+    /* padding-top: 50rpx;
+    font-weight:600; */
+
+}
+.cx-popup .top-frame{
+    /* width: 100%;
+    display: flex;
+    justify-content: center;
+    overflow: hidden; */
+}
+.xc-valid-coupon{
+    width: 90%;
+    height:40rpx;
+    padding-top: 24rpx;
+    overflow: hidden;
+}
+.xc-frame{
+    position: relative;
+}
+.xc-coupon-frame {
+    width: 100%;
+    max-height: 560rpx;
+    overflow: auto;
+    
+}
+.xc-coupon-frame .rel:not(:first-child) {
+	margin-top: 20rpx;
+}
+.xc-coupon-frame .coupon {
+    width:100%;
+    height: 168rpx;
+    border-radius: 25rpx;
+    border:2rpx solid #ffdcdc;
+    overflow: hidden;
+   /* margin-top:16rpx; */
+	 box-sizing: border-box;
+
+}
+/* .xc-coupon-frame .coupon ~ .coupon {
+	margin-top:16rpx;
+} */
+.xc-coupon-left{
+    width: 216rpx;
+    /* height: 100%; */
+    background-color: #ffeeef;
+    border-right: 4rpx dashed #ffdbd9;
+    overflow: hidden;
+    /* line-height: 100%; */
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		flex-shrink: 0;
+}
+.xc-money{
+    color: #f30026;
+    text-align:center;
+}
+.xc-rmb{
+    /* width:44rpx;
+    padding-top:7rpx; */
+}
+.xc-money-frame{
+    /* margin-left:35rpx;
+    margin-top:48rpx; */
+
+}
+.xc-spacing{
+    letter-spacing:4rpx;
+}
+.xc-circular-one{
+    position: absolute;
+    top:-15rpx;
+    left:205rpx;
+    width: 30rpx;
+    height: 30rpx;
+    background: #fff;
+    overflow: hidden;
+}
+.xc-circular-two{
+    position: absolute;
+		bottom: -15rpx;
+    /* top:150rpx; */
+    left:205rpx;
+    width: 30rpx;
+    height:30rpx;
+    background: #fff;
+}
+.xc-detail-coupon{
+    /* margin-left: 22rpx;
+    overflow: hidden;
+    padding-top: 43rpx; */
+	/* display: flex;
+	align-items: center; */
+}
+.xc-coupon-right{
+    /* width: 455rpx;
+    height: 100%; */
+    background: #fffaf9;
+		padding: 20rpx;
+		box-sizing: border-box;
+		width: 100%;
+		justify-content: space-between;
+		align-items: center;
+}
+.xc-below{
+    margin-top:20rpx;
+
+}
+.xc-get{
+   
+    width: 140rpx;
+    /* height: 48rpx; */
+    color: #fff;
+    text-align: center;
+    border-radius:27rpx;
+    line-height:54rpx;
+    /* margin-left:20rpx; */
+}
+
+.background{
+    background:#f40028;
+}
+/*--不可使用--*/
+.background.nouse{
+    background:gainsboro;
+}
+
+.xc-background{
+    background:#b9b9b9;
+}
+
+
+.cx-confirm{
+    width: 100%;
+		padding: 20rpx;
+		box-sizing: border-box;
+    /* height: 160rpx; */
+ 
+}
+.cx-confirm .confirm{
+    /* width: 372rpx;
+    height: 60rpx; */
+    background-color: #f40026;
+    color: #fff;
+    border-radius:10rpx;
+    line-height: 80rpx;
+		font-size: 28rpx;
+
+}
+
+.up{ animation: up .7s; }
+.down{ animation: down 1s; }
+@keyframes up { 0% { transform: translateY(550rpx); } 100% { transform: translateY(0); } }
+@keyframes down { 0% { transform: translateY(0); } 100% { transform: translateY(550rpx); } }
+
+
+/* 分享 */
+.icon-share {
+	font-size: 46rpx;
+	color: #d60021;
+}
+.xc-share-frame{
+    /* width: 129rpx;
+    height: 48rpx;
+    border-top-left-radius: 18rpx;
+    border-bottom-left-radius: 18rpx; */
+    /* background: #d60021; */
+    /* position:absolute;
+    left:622rpx;
+    top:-37rpx;
+    line-height:50rpx;
+   margin-top:52rpx; */
+}
+.xc-share-frame-jieti{
+    width: 129rpx;
+    height: 48rpx;
+    border-top-left-radius: 18rpx;
+    border-bottom-left-radius: 18rpx;
+    background: #d60021;
+    line-height:50rpx;
+}
+
+.xc-share-frame .share-font,.xc-share-frame-jieti .share-font{
+    font-size: 32rpx;
+    color:#fff;
+    margin-left:10rpx;
+
+}
+
+
+.xc-share-frame .share-frame,.xc-share-frame-jieti .share-frame{
+    width: 30rpx;
+    height: 30rpx;
+    margin-top:9rpx;
+    margin-left: 10rpx;
+
+}
+.xc-share {
+    width:90%;
+    height:800rpx;
+    background:#fff;
+    z-index:35;
+}
+.img-frame{
+    position: absolute;
+    top: 175rpx;
+    left:100rpx;
+    z-index: 55;
+    overflow:hidden;
+
+}
+.img-frame .img{
+    width: 100rpx;
+    height: 100rpx;
+
+}
+.xc-share .top{
+    height: 85rpx;
+    width: 100%;
+    border-bottom: 4rpx dashed #f5f5f5;
+    overflow:hidden;
+
+}
+.xc-share .name{
+    font-size: 25rpx;
+    margin-left:180rpx;
+    color:#000;
+
+}
+
+.xc-share .recommend{
+    width: 110rpx;
+    height: 12rpx;
+    color: #fff;
+    background: #d60021;
+    font-size: 20rpx;
+    border-radius:25rpx;
+    margin-left:10rpx;
+    line-height:37rpx;
+}
+.xc-left-circle{
+    width: 40rpx;
+    height: 25rpx;
+    position: absolute;
+    top:280rpx;
+    left:29rpx;
+    z-index: 55;
+    background:#727272;
+    border-radius:50rpx 50rpx 0 0;
+    transform:rotate(90deg);
+
+}
+.xc-right-circle{
+    width: 40rpx;
+    height: 25rpx;
+    position: absolute;
+    top: 280rpx;
+    left:683rpx;
+    z-index: 55;
+    background:#727272;
+    border-radius:50rpx 50rpx 0 0;
+    transform:rotate(270deg);
+
+}
+.xc-circle-frame{
+    width: 25rpx;
+    height: 40rpx;
+    overflow: hidden;
+}
+.xc-goods-name{
+    width: 95%;
+    font-size: 35rpx;
+    padding-left: 75rpx;
+    height: 50rpx;
+    padding-top: 10rpx;
+    color:#000;
+
+}
+.xc-good-img{
+    width: 100%;
+    height: 381rpx;
+    margin-top:5rpx;
+
+}
+.xc-good-img .img{
+    width: 90%;
+    height: 381rpx;
+}
+.xc-ensure-frame{
+    width: 90%;
+    height: 60rpx;
+    border-bottom: 2rpx solid #d8d6d7;
+}
+.xc-ensure{
+    width: 30%;
+    height: 60rpx;
+    line-height: 60rpx;
+}
+xc-ensure-div{
+    width: 100%;
+    height: 60rpx;
+}
+.xc-ensure .word{
+    font-size: 25rpx;
+    color: #d30025;
+    margin-left:9rpx;
+
+}
+.xc-ensure .img{
+    width: 25rpx;
+    height: 25rpx;
+    margin-top:18rpx;
+
+}
+
+.xc-bottmon{
+    width: 100%;
+}
+.xc-bottmon .xc-left{
+    width: 55%;
+    margin-top:30rpx;
+    padding-left:20rpx;
+
+}
+.xc-left .xc-top{
+    font-size: 25rpx;
+    height:40rpx;
+    line-height:40rpx;
+    color:#000;
+}
+.xc-left .xc-middle{
+    font-size: 25rpx;
+    color: #b2b2b2;
+    height:30rpx;
+    line-height:30rpx;
+}
+.xc-left .xc-buttem{
+    font-size: 25rpx;
+    height:100rpx;
+    line-height:100rpx;
+    color:#000;
+}
+.xc-ensure-right{
+    width: 30%;
+}
+.xc-qrcode{
+    width:120rpx;
+    height: 120rpx;
+    margin-top:43rpx;
+    margin-left:80rpx;
+
+}
+.xc-close{
+    width:50rpx;
+    height:50rpx;
+    border-radius:50%;
+    border:3rpx solid #fff;
+    text-align:center;
+    line-height: 41rpx;
+    font-size:50rpx;
+    color:#fff;
+    font-weight: lighter;
+    font-family:MingLiU;
+    transform:rotate(270deg);
+    overflow:auto;
+    margin-top:6rpx;
+    margin-bottom:1rpx;
+
+}
+.xc-close-frame{
+    position:absolute;
+    margin-top:30rpx;
+    width:90%;
+    display:flex;
+    justify-content:center;
+    overflow: auto;
+
+}
+.xc-guanbi{
+    width: 100%;
+    height: 80rpx;
+    overflow: hidden;
+}
+
+
+/* 自定义弹出窗口 */
+.cx-popup{
+    width:100%;
+    background: #fff;
+    z-index: 35;
+    border-top-left-radius: 10rpx;
+    border-top-right-radius: 10rpx;
+    position:fixed;
+    bottom:0;
+}
+
+.xc-top-content{
+    width: 88%;
+    height:85rpx;
+    padding-top: 50rpx;
+    font-size: 36rpx;
+}
+
+
+.xc-valid-coupon{
+    width: 90%;
+    height:40rpx;
+    padding-top: 24rpx;
+    overflow: hidden;
+}
+.xc-frame {
+    /* width: 100%;
+    margin-top:20rpx; */
+	padding: 20rpx;
+}
+
+.xc-frame .list-frame{
+    width: 90%;
+    height: 100%;
+    overflow-y:scroll;
+
+    margin-top:20rpx;
+
+}
+.xc-close-frame{
+    margin-top:30rpx;
+    width:15%;
+    display:flex;
+}
+
+.xc-close{
+    width:70rpx;
+    height:70rpx;
+    border-radius:50%;
+    border:5rpx solid #a5a5a7;
+    text-align:center;
+    line-height: 55rpx;
+    font-size:80rpx;
+    color:#a5a5a7;
+    font-family:"微软正黑体";
+    margin-top:8rpx;
+
+}
+.xc-money{
+    color: #ff0013;
+}
+
+.xc-money-frame{
+    /* margin-left:35rpx; */
+
+}
+.xc-coupon-effect{
+    width: 99%;
+    height: 128rpx;
+    border-bottom:3rpx solid #ddd;
+
+
+}
+.xc-goods-coupon{
+    width: 80%;
+    height:100%;
+
+}
+.xc-title{
+    width:50%;
+    margin-left:222rpx;
+
+}
+.xc-coupon-money{
+    color: #c91e31;
+    font-size: 35rpx;
+    margin-top:20rpx;
+
+}
+.xc-coupon-time{
+    height: 50rpx;
+    font-size: 27rpx;
+    color: #a4a4a4;
+}
+.xc-coupon-time .time{
+    margin-left: 15rpx;
+    font-size: 27rpx;
+}
+.xc-coupon-selection{
+    width:99%;
+    height:100%;
+
+
+}
+.xc-confirm {
+    width: 90%;
+    height: 75rpx;
+    margin:0 auto;
+    background:#c41830;
+    color:#fff;
+    border-radius:10rpx;
+    font-size:30rpx;
+    margin-top: 50rpx;
+}
+.xc-not-Selection{
+    width: 60rpx;
+    height: 60rpx;
+    background: #eeeeee;
+}
+
+/*---------------视频图片---------------*/
+.xc-imageCount {
+    width:95rpx;
+    height:50rpx;
+    background-color: rgba(0, 0, 0, 0.3);
+    border-radius:40rpx;
+    line-height:50rpx;
+    color:#fff;
+    text-align:center;
+    font-size:26rpx;
+    position:absolute;
+
+    right:23rpx;
+    bottom:21rpx;
+}
+
+
+/* 视频图片的边框 */
+.xc-videos-picture{
+    width: 100%;
+    height: 750rpx;
+}
+/* 视频 */
+.xc-videos{
+    width: 100%;
+    height:544rpx;
+
+
+}
+/* 点击视频或图片 */
+.xc-video-picture{
+
+    bottom: 20rpx;
+    left: 0rpx;
+    display: flex;
+    align-items: center;
+    justify-content:center;
+    width: 45%;
+    height: 60rpx;
+    margin-left: 215rpx;
+
+}
+.xc-video-button:before{
+    content: "";
+    position: absolute;
+    left: 48%;
+    top: 40%;
+    width: 0;
+    height: 0;
+    margin-left: -36rpx;
+    margin-top: -10rpx;
+    border-width:13rpx;
+    border-style: dashed;
+    border-color: transparent transparent transparent #fff;
+    font-size: 0;
+    line-height: 0;
+    z-index: 2;
+    -webkit-backface-visibility: hidden;
+}
+.xc-video-buttons:before{
+    content: "";
+    position: absolute;
+    left: 50%;
+    top:41%;
+    width: 0;
+    height: 0;
+    margin-left: -36rpx;
+    margin-top: -10rpx;
+    border-width:13rpx;
+    border-style: dashed;
+    border-color: transparent transparent transparent #000;
+    font-size: 0;
+    line-height: 0;
+    z-index: 2;
+    -webkit-backface-visibility: hidden;
+}
+
+.xc-video{
+    /* width:100rpx; */
+    /* height: 50rpx;
+    line-height: 50rpx; */
+    text-align: center;
+    /* margin-left:-30rpx; */
+
+
+}
+/* 图片 */
+.xc-picture{
+    color:  #000;
+    background: #dcdcdc;
+    width: 94rpx;
+    height: 45rpx;
+    font-size: 25rpx;
+    border-radius: 25rpx;
+    font-family: 'SimHei',Arial;
+    text-align: center;
+    line-height: 45rpx;
+    margin-left:53rpx
+
+}
+/* 点击视频 */
+.xc-video-button{
+    position: relative;
+    color:  #000;
+    background: #dcdcdc;
+    width: 85rpx;
+    height: 45rpx;
+    line-height: 45rpx;
+    font-size: 30rpx;
+    border-radius: 25rpx;
+    font-family: 'SimHei',Arial;
+    padding-left: 11rpx;
+}
+
+
+.xc-sn{
+    color: #fff;
+    background: #c7161e;
+    border-color: transparent transparent transparent #fff;
+}
+/* 图片 */
+.xc-pictures{
+    width: 100%;
+    height:529rpx;
+
+}
+/*视频封面的图片 */
+.xc-picturess{
+    position: relative;
+    width: 100%;
+    height:529rpx;
+}
+/* 播放 */
+.xc-play{
+    width: 130rpx;
+    height: 130rpx;
+    position: absolute;
+    top:207rpx;
+    left:309rpx;
+}
+
+.xc-video-buttons{
+    position: relative;
+    color:  #000;
+    background: #dcdcdc;
+    width: 85rpx;
+    height: 45rpx;
+    line-height: 45rpx;
+    font-size: 30rpx;
+    border-radius: 25rpx;
+    font-family: 'SimHei',Arial;
+    padding-left: 11rpx;
+}
+
+
+.wsize{font-size: 32rpx}
+.five-level-word{font-size: 24rpx;}
+
+
+/*-- 推荐商品 --*/
+.xc-goods{
+    height: auto;
+    background: #f2f2f2;
+    padding: 0 20rpx;
+    margin-top: -25rpx;
+    padding-bottom: 20rpx
+}
+
+.xc-goods-recommend {
+    border-radius: 20rpx;
+    width:345rpx;
+    height: 450rpx;
+   margin-top: 25rpx;
+    display: inline-block;
+
+}
+
+.xc-goods-recommend.ml{ margin-left: 22rpx}
+
+.xc-goods-recommend .xc-goods-imgs{
+    width: 100%;
+    height: 325rpx;
+    border-radius:20rpx 20rpx 0 0;
+}
+
+.xc-goods-bottom{
+    width: 345rpx;
+    height: 134rpx;
+    background: #fff;
+    border-radius:0 0 20rpx 20rpx;
+    bottom:-8rpx;
+    left:0rpx;
+}
+.xc-goods-bottom .monry-frame{
+  width:283rpx;
+height:52rpx;
+padding-left:24rpx;
+
+}
+.xc-good-explain{
+    width: 283rpx;
+    height:60rpx;
+    word-break: normal; 
+    margin-left:30rpx;
+    font-size: 26rpx;
+    line-height: 30rpx;
+    margin-top: 5rpx;
+}
+.money-color-val{
+    color: #c6172f;
+}
+.rmb-symbol{
+    line-height:81rpx;
+    height:53rpx;
+    font-size: 28rpx;
+}
+.xc-original-price{
+    color: #c0c0c0;
+}
+/* 文字中间加线条 */
+.word-lines{
+    text-decoration:line-through;
+   line-height:90rpx;
+    margin-left:10rpx;
+    font-size: 20rpx;
+}
+
+ .xc-linellae-frame{
+  width: 100%;
+  height: 80rpx;
+  background: #f2f2f2;
+}
+.xc-linellae-frame .xc-linellae{
+  width: 386rpx;
+  height: 1rpx;
+  border-bottom: 1rpx solid #ebedf0;
+}
+.xc-recommend-frame{
+background:#f2f2f2;
+width:97rpx;
+height:100%;
+padding-left: 10rpx;
+}
+.xc-recommend-frame .xc-recommend{
+  width: 35rpx;
+  height: 27rpx;
+}
+.xc-recommend-frame .xc-recommend-word{
+  width:58rpx;
+font-size:24rpx;
+color: #a9a9a9;
+margin-left: 5rpx;
+margin-bottom:  5rpx;
+margin-top: 1rpx;
+
+}
+.xc-price-frame{
+  color: #ec0022;
+	align-items: baseline;
+/* height:44rpx; */
+}
+.xc-price-frame .sign{
+margin-top:19rpx;
+margin-left:-4px;
+}
+.xc-val-price{
+margin-left:24rpx;
+color: #ec0022;
+padding-top:13rpx;
+}
+.xc-val-price .save{
+  border-radius:10rpx;
+   margin-top:5rpx;
+  background:#fed2d9;
+  min-width:230rpx;
+  height:40rpx;
+  line-height:40rpx;
+  width: auto;
+  padding-left:12rpx;
+  padding-right:12rpx;
+
+}
+.xc-unit-price{
+  margin-top:25rpx;
+padding-left:-4rpx;
+
+}
+.xc-explain{
+  color:#292929;
+  width:542rpx;
+	margin: 10rpx 0 20rpx;
+	width: 100%;
+	font-weight: bold;
+}
+.xc-item{width: 16%; font-size: 26rpx; color: #666;margin-right:5rpx;}
+.xc-item .yuan{
+  width: 38rpx;
+  height: 38rpx;
+  line-height: 38rpx;
+  border:1rpx solid #f3f1f2;
+margin-left:33rpx;
+
+}
+.xc-item .word{
+  width:104rpx;
+  margin-top:16rpx;
+  color:#363636;
+   font-weight:600;
+
+}
+.xc-item .circle-color{
+  background: #d60024;
+  color: #fff;
+}
+.xc-item .circle-color1{
+  background: #fefefe;
+  color: #666666;
+}
+.link{
+height:6rpx;
+width:180rpx;
+top:54rpx;
+left:32px;
+}
+.link1{
+height:6rpx;
+width:166rpx;
+top:54rpx;
+left:264rpx;
+}
+.link2{
+  height:6rpx;
+width:157rpx;
+top:54rpx;
+right:87rpx;
+}
+.link-color-red{
+  background: #d60024;}
+.link-color{
+  background: #e5e5e5;
+}
+.xc-qt-price{
+  top:-15rpx;
+left:25rpx;
+  color: #fff;
+}
+.xc-qt-price .xc-qtunit-price{
+  margin-left:6rpx;
+margin-top:-4rpx;
+}
+.xc-nanber{
+  top:-25rpx;
+left:289rpx;
+
+}
+.xc-qtsign{
+margin-top:5rpx;
+
+}
+.xc-people-img{
+  height: 36rpx;
+  width: 36rpx;
+  background: #fff;
+  border-radius: 7rpx;
+  
+}
+.xc-people-img .imgs{
+  width: 28rpx;
+  height: 28rpx;
+  margin-top:4rpx;
+
+}
+.xc-people-val{
+  
+  height: 32rpx;
+  border-top: 1rpx solid #fff;
+  border-bottom: 1rpx solid #fff;
+  border-right: 1rpx solid #fff;
+   border-radius:0 7rpx 7rpx 0;
+   line-height:32rpx;
+    margin-left:-6rpx;
+    padding: 0 12rpx;
+}
+.word-color{
+  color:#d70024; 
+}
+.word-color-lan{
+  color:#0393e1; 
+}
+.pt_view .hy-stop{
+  top: -23rpx;
+  right: 56rpx;
+}
+.xc-time-val{width:36rpx;height:36rpx;border-radius:7rpx; line-height: 36rpx;}
+.xc-time{margin-right:10rpx; margin-left:10rpx; margin-top:-32rpx;
+}
+.xc-goods-explain{
+  width:100%;
+  /* padding-left:30rpx;
+  margin-left:-9rpx;
+  height: 150rpx */
+}
+.xc-partner-frame{
+border-bottom:2rpx solid #eee;
+width:100%;
+padding:20rpx;
+/* height:56rpx; */
+box-sizing: border-box;
+}
+.xc-person-number{
+  width:120rpx;
+  color: #999999;
+  padding-left:8rpx;
+  text-align: left 
+}
+
+.xc-miaosha-time{
+right:17rpx; top:55rpx;
+}
+.pd_top1{padding-top: 10rpx}
+.s_ms_bth{margin-top: 85rpx}
+
+
+.no_pj_list{text-align: center; width: 100%; color: #999; margin: 30rpx 0; display: inline-block; font-size: 28rpx}
+/* 门店地址 */
+.xc-address_frame{
+  /* border-top:1rpx solid #eee; */
+  width: 100%;
+  height: auto;
+	padding: 20rpx;
+	box-sizing: border-box;
+}
+.on_height{
+height: 90rpx;
+}
+.sn_height{
+  /* min-height: 170rpx; height: auto;padding: 10rpx 0; */
+}
+.xc-address_frame .address_frame{
+  width: 100%;
+/* padding-left: 10rpx;
+margin: auto; */
+
+}
+
+.stores-img{
+	width: 28rpx;
+  height: 28rpx;
+  margin-right: 10rpx;
+}
+.shop_name{
+  margin-right: 10rpx;
+  max-width: 370rpx;
+}
+.address{
+  /* width: 100%;
+  margin-top: 5rpx;
+  margin-bottom: 5rpx; */
+}
+.distance{
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+  background: #eee;
+  border-radius: 20rpx;
+  /* margin-right: 5rpx; */
+  color: #999;
+  height: 38rpx;
+line-height: 38rpx;
+
+}
+/* 选择门店的弹窗 */
+.mongolia-layer{
+  position: fixed;
+left: 0;
+top: 0;
+right: 0;
+bottom: 0;
+z-index: 11;
+background: rgba(0,0,0,0.4);
+width: 100%;
+height: 91.9%;
+
+}
+
+.popup-frame{
+  position: fixed;
+bottom:99rpx;
+z-index: 20;
+background: white;
+width: 100%;
+border-radius: 20rpx 20rpx 0 0;
+height: 72%;
+bottom: 0;
+}
+.popup-top{
+  border-bottom: 1rpx solid #eee;
+  height: 155rpx;
+  width: 95%;
+  margin: auto;
+  line-height: 155rpx;
+
+}
+.bg_rights{ 
+        border-top: 2rpx solid ;
+        border-right: 2rpx solid ;
+        transform: rotate(45deg);
+        display:inline-block;
+        width:15rpx;height:15rpx;
+        border-color:#da0b31;
+}
+.modal-closes {
+    position: absolute;
+    right: 30rpx;
+    top: -15rpx;
+    height: 25rpx;
+
+}
+.choose_more{
+  margin-top: 40rpx;
+  margin-right: 20rpx;
+
+}
+.choose_mores{
+  margin-top: 30rpx;
+  margin-right: 15rpx;
+
+}
+.store-list{
+  width: 95%;
+  height: 60%;
+  overflow-y: scroll;
+  margin: auto;
+}
+.store-list .store_choose{
+  width: 100%;
+  height: 120rpx;
+  line-height: 125rpx;
+  border-bottom: 1rpx solid #eee;
+
+}
+.store-list .store_choose .store{
+width: 100%;
+margin: auto;
+line-height: 37rpx;
+padding-left: 20rpx;
+
+}
+.xc-hook{
+  width: 35rpx;
+  height: 35rpx;
+  transform: rotate(-145deg);
+line-height: 37rpx;
+text-align: center;
+}
+ .xc-hooks{
+   width: 30rpx;
+  height: 30rpx;
+  border: 1rpx solid #999; 
+ }
+ .address-frame{
+   width: 93%;
+margin-left: 7rpx;
+
+ }
+ .nearby_store{
+margin-left: 17rpx;
+ }
+ .address_name{
+   margin-right: 10rpx;
+   max-width: 390rpx;
+
+ }
+ .address-val{
+   height: 38rpx;
+line-height: 38rpx;
+
+ }
+ .store-bottom{
+   width: 85%;
+   margin: auto;
+   height: 70rpx;
+ }
+ .determine{
+   width: 260rpx;
+  height: 55rpx;
+  border-radius: 50rpx;
+  line-height: 55rpx;
+ }
+ .default{
+   width: 260rpx;
+  height: 55rpx;
+  border:3rpx solid #c8c8c8;
+    border-radius: 50rpx;
+    line-height: 55rpx;
+ }
+ .store-bottom-frame{
+   width: 95%;
+     margin: auto;
+   
+ }
+ /* 门店分类列表 */
+.sort_store_list{
+  max-height: 700rpx;
+  overflow: hidden;
+  overflow-y: scroll;
+  width: 95%;
+  margin: auto;
+}
+.sort_store_list .sort-store-frame{
+  width: 100%;
+height: 100rpx;
+line-height:100rpx;
+border-bottom: 1rpx solid #eee;
+
+}
+.sort_store_list .sort-store-frame .sort-store{
+  width: 94.5%;
+  margin: auto;
+}
+.black_rights-frame{
+width: 50%；
+}
+.black_rights-frame .black_rights{
+  border-top: 3rpx solid;
+border-right: 3rpx solid;
+transform: rotate(45deg);
+display: inline-block;
+width: 20rpx;
+height: 20rpx;
+}
+.xc-val-money{
+  height:55rpx;
+}
+
+.xc-distance-bottom{
+ margin-bottom: 40rpx;
+}
+.xc-distance-top{
+margin-top: 10rpx;
+}
+.xc-width{
+  width: 100%;
+}
+.right-arrow{ width: 15rpx; height:15rpx;
+        border-top: 2rpx solid #d70026;
+        border-right: 2rpx solid #d70026;
+        transform: rotate(45deg);display:inline-block;
+        margin-bottom:3rpx;
+}
+.xc-goods-attribute{
+  border-bottom: 1px solid #eee;
+padding-bottom: 20rpx;
+/* margin-bottom:40rpx; */
+}
+.xc-val-fream{
+  width: 105rpx;
+}
+.is_stock{
+width: 58%;
+height: 70rpx;
+border-radius: 55rpx;
+}
+.select_store_height{
+  height: 50rpx;
+}
+.butttem5{
+  margin-bottom: 5rpx;
+}
+
+.no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
+
+
+.join-cart>view.no_store {
+  width: 58%; background-color: #adadad;
+}
+
+.s_btn{ margin-top: 25rpx; }
+/* 美妆价的样式 */
+.beauty-makeup-frame{
+  /* width: 101.5%;
+  margin: auto; */
+  height: 120rpx;
+  border-radius: 15rpx;
+  margin-top: 10px;
+
+}
+.beauty-makeup-frame .left{
+	width: 80%;
+	height: 100%;
+	background:#f7f7f7;
+	border-radius: 20rpx 0rpx 0rpx 20rpx;
+	/* padding: 0 10rpx; */
+}
+ .card-frame{
+	margin-top: 0rpx; 
+	/* padding-right: 23rpx;
+  margin-right: 15rpx; */
+}
+.advert-card{
+  margin-top: 0rpx!important;
+
+}
+.beauty-makeup-frame .right{
+	width: 20%;
+	height: 100%;
+	background:#f3efe3;
+	border-radius: 0rpx 20rpx 20rpx 0rpx;
+	}
+.grade-card-frame{
+
+	/* height:45rpx ; */
+	background: #3c300a;
+	border-radius: 20rpx;
+  /* margin-top: 10px;
+  margin-left: 7rpx; */
+  justify-content: center;
+  padding: 4rpx 12rpx;
+}
+.grade-card-frame .img{
+	width: 24rpx;
+  height: 24rpx;
+  margin-top: 2px;
+
+}
+.grade-card-frame .card-name{
+	margin-left: 8rpx;
+  /* max-width: 120rpx; */
+	max-width: 165rpx;
+}
+.card-effect{
+  /* margin-left: 15rpx; */
+}
+.at_once_carde{
+  width:65rpx;
+  height: 75rpx;
+  line-height:38rpx;
+}
+.bg_right{ width: 18rpx; height:18rpx;
+        border-top: 2rpx solid #333;
+        border-right: 2rpx solid #333;
+        transform: rotate(45deg);display:inline-block;
+        margin-bottom:3rpx;
+
+}
+.carde_frame{
+  height: 50rpx;
+  line-height: 18rpx
+}
+
+button.custom-service { line-height: normal; border: 0;}
+button.custom-service::after{
+	border: 0;
+}
+.no_store{color:#d60021; font-size: 26rpx;}
+.cx_show_view{ width: 580rpx; /* line-height: 30rpx; margin-bottom: 6rpx; */ }
+.cx_show_view .word{ width: 400rpx}
+.prom_condition {
+    color: #d60021;
+    /* width: 180rpx; */
+    /* height: 30rpx; */
+    font-size: 20rpx;
+    /* padding-top: 0.01rpx; */
+    /* display: flex;
+    justify-content: center;
+    align-items: center; */
+    border: 2rpx solid #d60021;
+    border-radius: 10rpx;
+    margin-right:10rpx ;
+    /* margin-left: 10rpx; */
+		font-size: 24rpx;
+		padding: 0 10rpx;
+}
+.hui_img{ width: 44rpx; height: 44rpx; margin-right: 8rpx}
+.order_hui{color: #444; width: 420rpx}
+.order_hui view{ height: 34rpx; line-height: 34rpx;}
+.dp_img{width: 240rpx; height: 240rpx; margin: 0 40rpx}
+.dp_cx_view{border-bottom: 0.02rpx solid #eee; padding-bottom: 40rpx}
+.act_content{ margin-top: 40rpx}
+.act_content view{ margin-bottom: 12rpx}
+.color_b{color: #ff9c00}
+
+.poster-container {
+ box-sizing: border-box;
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: calc(100% - 120rpx);
+ z-index: 1000;
+}
+.mask {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: 999;
+ background-color: rgba(0,0,0,.4);
+}
+.poster-wrapper {
+	width: 100%;
+}
+
+.poster {
+	box-sizing: border-box;
+	width: 100%;
+	height: 1055rpx;
+	border-radius: 20rpx;
+	/* box-shadow: 0 8px 12px #666; */
+	position: relative;
+	z-index: 999;
+	overflow: hidden;
+}
+.poster-img {
+	display: block;
+	width: 100%;
+	height: 100%;
+}
+.btn-container {
+	display: flex;
+	justify-content: space-around;
+}
+.btn-share {
+	display: block;
+	background-color: #FE6867;
+	color: white;
+	border-radius: 8rpx;
+	line-height: 80rpx;
+	margin-top: 28rpx;
+	padding: 0 60rpx;
+}
+/* .btn-close {
+	background-color: rgba(0,0,0,.5);
+	color: white;
+	width: 40rpx;
+	height: 40rpx;
+	line-height: 40rpx;
+	text-align: center;
+	border-radius: 50%;
+	position: absolute;
+	right: 20rpx;
+	top: 10rpx;
+} */
+
+.goods-price .rel_txt{
+	position: relative; top: 32rpx; font-size: 30rpx;
+}
+.goods-price .rel_img{width: 62rpx; height: 62rpx;position: relative; top: 12rpx;}   
+
+.btn-close {
+ /* background-color: rgba(0,0,0,.5); */
+ color: #ccc;
+ width: 50rpx;
+ height: 50rpx;
+ line-height: 50rpx;
+ text-align: center;
+ border-radius: 50%;
+ position: absolute;
+ right: 20rpx;
+ top: 20rpx;
+}
+
+.icon-close {
+  font-size: 48rpx;
+} 
+.quan_price{
+	background-color: #ff4700; color: #fff; padding: 10rpx 25rpx; margin-left: 10rpx; border-radius: 30rpx;
+}
+
+/*--闪白屏--*/
+.g_img_box{
+	background-position: center center;	
+	background-repeat: no-repeat;
+	-webkit-background-size: cover;
+	-moz-background-size: cover;
+	background-size: cover;	
+}
+
+
+
+.arrow {
+	width: auto !important;
+	position: absolute;
+	right: 0;
+	top: 50%;
+	transform: translateY(-50%);
+}
+
+.stock {
+	flex: 1;
+}
+
+.gray{ background-color: #dcdcdc !important;}
+
+
+.card,
+.taohe {
+	position: relative;
+	padding: 20rpx;
+	margin-bottom: 20rpx;
+	border-radius: 8rpx;
+	background: #ffdcdc;
+	overflow: hidden;
+	/* background: #ffdcdc url(https://mshopimg.yolipai.net/miniapp/images/fwk/crown_bg.png) no-repeat left top;
+	background-position: 10rpx 10rpx;
+	background-size: 206rpx 136rpx; */
+}
+
+.card::before {
+	position: absolute;
+	font-family: iconfont;
+	content: '\e62a';
+	color: rgba(255,0,0,.1);
+	font-size: 260rpx;
+	/* transform: rotateZ(45deg); */
+	top: -110rpx;
+	left: -70rpx;
+}
+
+.taohe::before {
+    position: absolute;
+    font-family: iconfont;
+    content: '\e64e';
+    color: rgba(255,0,0,.1);
+    font-size: 260rpx;
+    top: -20rpx;
+    left: -30rpx;
+}
+
+.rmb::before {
+	content: '￥';
+	font-size: 24rpx;
+}
+
+.c-red {
+	color: #f23030;
+}
+
+.btn-group {
+	border-radius: 70rpx;
+	overflow: hidden;
+	margin-right: 10rpx;
+}
+
+.del {
+  text-decoration: line-through;
+}
+
+
+
+
+.tick {
+	position: relative;
+}
+
+.tick:before {
+	content: '';
+	display: inline-block;
+	vertical-align: middle;
+	margin-top: -4rpx;
+	margin-right: 12rpx;
+	width: 22rpx;
+	height: 22rpx;
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUdwTPInDPInDPgoDfMnDPYqEvInDPInDPInDP87NPUoDv8vEvMoDPInDPIoDPMnDvInDPInDPInDPIoDPQoDfInDEON4KMAAAAVdFJOUwD45yawG4zz3gQ0DmLOfECQZpPlS54kMQ4AAAC0SURBVBjTbZFREoMgDERDS0xQQNHu/a/alEGtaIYfHrBhs0S1pujVifo40VkhC+BUHSDzQTlBhjHY8bjogXmDZ+orJKwXwMUeUoa/0PeGbH8Q4Y5CJopYOjosiOQxdpRGk1UXOkrBKdkimtN8UrKrJBVXdzsllSYSjR/0J9JaGn81WluWtonYKQ0op51P3M2L2bmZN9n8MKoVqTph/RsseyjfYxAkfgot/82CpuJVLOLSIv4Cd5AJ37BgpFwAAAAASUVORK5CYII=) no-repeat;
+	background-size: 22rpx auto;
+}
+
+.details::after {
+	content: '';
+	position: absolute;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	margin: auto;
+	display: inline-block;
+	width: 40rpx;
+	height: 40rpx;
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoBAMAAAB+0KVeAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAVUExURUdwTIyMjCYmJiYmJi0tLY+PjyYmJidnOsIAAAAGdFJOUwDt6aYcSSEXj/YAAAA8SURBVCjPY2AYBTQBLEbKDhiCTmlpKggeq2AAiDJLS0tGcBkFBUActbS0JAY4F6sgVu1YLcLnpFFAFQAATwgLKVhjC9UAAAAASUVORK5CYII=);
+	background-repeat: no-repeat;
+	background-size: 40rpx auto;
+}
+
+.lh2 {
+	line-height: 2;
+}
+
+.huise {
+	background: gray
+}
+
+.hideArea {
+	position: absolute;
+	left: -1000px;
+	top: -1000px;
+}
+ 
+.searchbar {
+  height: 95rpx;
+  border-bottom: 2rpx solid rgb(238, 238, 238);
+}
+.storeListpadd {
+  padding: 0rpx 31rpx;
+}
+.search {
+  width: 125rpx;
+  height: 45rpx;
+  line-height: 45rpx;
+  background-color: rgb(219, 27, 52);
+  border-radius: 30rpx;
+  color: rgb(255, 255, 255);
+}
+.inputstore {
+  width: 510rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  border-radius: 30rpx;
+  border: 2rpx solid rgb(238, 238, 238);
+  padding-left: 30rpx;
+}
+
+
+/*按钮变灰色的优化*/
+.spec-cart-btn.gray{ background-color:gainsboro !important; }
+
+.type-navbar_box{
+    position: fixed;
+    top: 0;
+    z-index: 999;
+    width: 100%;
+}
+
@@ -1029,15 +1029,33 @@ Page({
               }
             }
  
-            if (item.prom_type == 1) {
+
+            //秒杀和团购都能加入购物车
+            if( [1,2].indexOf(item.prom_type)>-1) {
               var prom = null;
               var now = ut.gettimestamp();
-              await getApp().request.promiseGet('/api/ms/flash_sale/getNew/' + os.stoid + '/' + user_id + '/' + item.prom_id, {}).then(res => {
-                if (res.data.code == 0) {
-                  prom = res.data.data;
-                  prom.price = prom.user_price;
-                }
-              });
+
+              //获取秒杀
+              if(item.prom_type==1) {
+                await getApp().request.promiseGet('/api/ms/flash_sale/getNew/' + os.stoid + '/' + user_id + '/' + item.prom_id, {}).then(res => {
+                  if (res.data.code == 0) {
+                    prom = res.data.data;
+                    prom.price = prom.user_price;
+                  }
+                });
+              }
+
+              //获取团购
+              if(item.prom_type==2) {
+                await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + item.service_id + "/" + item.prom_id, {}).then(res => {
+                  if (res.data.code == 0) {
+                    prom = res.data.data;
+                  }
+                });
+              }
+
+
+
               console.log('服务的秒杀信息')
               console.log(prom)
               //---如果互动都已经过期，或者还未开始，或者无活动
@@ -1057,10 +1075,12 @@ Page({
                   store_id: os.stoid,
                   user_id: user_id,
                   card_id: prom.goods_id,
+                  prom_type: item.prom_type,
+                  prom_id: item.prom_id
                 }
               }).then(res => {
                 if (res.data.code == 0) {
-                  msNum = res.data.data.cardbuynum
+                  msNum = res.data.data.promcardbuynum,
                   console.log('秒杀限购：' + msNum)
                 }
               })
@@ -3104,9 +3124,9 @@ Page({
       [txt]: t.goods_num
     });
  
-    // 1.秒杀活动 
+    // 1.秒杀活动 ,团购的活动
     // 2.活动开始
-    if (t.prom_type == 1 && t.is_pd_normal == 0) {
+    if((t.prom_type == 1 && t.is_pd_normal == 0) || t.prom_type==2) {
       var txt = "service_data[" + pitem + "].goods[" + item + "].goods_num";
       var redis_num = 0;
  
@@ -3119,7 +3139,6 @@ Page({
             if (t.id != v.id) {
               cartGoodsNum += parseInt(v.goods_num);
             }
-
           });
         }
       });
@@ -3157,27 +3176,38 @@ Page({
  
       // 限购数量
       var buylimit = 0
-      await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + t.store_id + "/" + getApp().globalData.user_id + "/" + t.prom_id, {
+      if(t.prom_type==1) {
+        await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + t.store_id + "/" + getApp().globalData.user_id + "/" + t.prom_id, {}).then(res => {
+          if (res.data.code == 0) {
+            th.data.sele_g = res.data.data;
+            th.data.sele_g.viplimited = res.data.data.buy_limit;
+            buylimit = !res.data.data.buy_limit ? 0 : res.data.data.buy_limit;
+          }
+        });
+      }
+
+      if(t.prom_type==2) {
+        await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" +  t.goods_id + "/" + t.prom_id, {}).then(res => {
+          if (res.data.code == 0) {
+            th.data.sele_g = res.data.data;
+            th.data.sele_g.viplimited = res.data.data.buy_limit;
+            buylimit = !res.data.data.buy_limit ? 0 : res.data.data.buy_limit;
+          }
+        });
+      }
  
-      }).then(res => {
-        if (res.data.code == 0) {
-          th.data.sele_g = res.data.data;
-          th.data.sele_g.viplimited = res.data.data.buy_limit;
-          buylimit = !res.data.data.buy_limit ? 0 : res.data.data.buy_limit;
-        };
-      });
  
       //用户已经成功付款购买的数量
       var gd_buy_num = 0;
-      await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum?store_id=" + t.store_id + "&user_id=" + getApp().globalData.user_id + "&card_id=" + t.card_id + "&prom_type=" + t.prom_type + "&prom_id=" + t.prom_id, {}).then(tt => {
+      await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum?store_id=" + t.store_id + "&isnew=1&user_id=" + getApp().globalData.user_id + "&card_id=" + t.card_id + "&prom_type=" + t.prom_type + "&prom_id=" + t.prom_id, {}).then(tt => {
         if (tt.data.code == 0) {
           gd_buy_num = !tt.data.data.promcardbuynum ? 0 : tt.data.data.promcardbuynum;
           th.setData({
             promcardbuynum: !tt.data.data.promcardbuynum ? 0 : tt.data.data.promcardbuynum,
             cardbuynum: tt.data.data.cardbuynum,
           });
-        };
-      });
+        }
+      })
  
       // 剩余购买数
       let num = buylimit - gd_buy_num;
@@ -4065,35 +4095,130 @@ Page({
       }
     } else {
  
+      //进行累计，秒杀和团购的购买数量
+      var flash_map = {};
+      var group_map = {};
+
       //-- 开始服务卡的购物车购买 --
       for (var i = 0; i < this.data.service_data.length; i++) {
         var i_arr = this.data.service_data[i].goods;
         console.log(i_arr)
  
         for (var j = 0; j < i_arr.length; j++) {
-          await rq.promisePut("/api/weshop/cartService/update", {
-            data: {
-              id: i_arr[j].id,
-              selected: i_arr[j].selected,
-              store_id: oo.stoid
+            await rq.promisePut("/api/weshop/cartService/update", {
+              data: {
+                id: i_arr[j].id,
+                selected: i_arr[j].selected,
+                store_id: oo.stoid
+              }
+            });
+
+            //判断秒杀的指定门店
+            if( [1,2].includes(i_arr[j].prom_type) && i_arr[j].prom && i_arr[j].prom.pick_up_lists && i_arr[j].selected){
+              var idx0=i_arr[j].prom.pick_up_lists.findIndex(function (e){
+                return e.pickup_id==i_arr[j].pick_id;
+              })
+              if(idx0<0){
+                getApp().confirmBox(i_arr[j].service_name + "秒杀活动的门店不可售");
+                th.clear_checkouting();
+                return false;
+              }
             }
-          });
  
+            //选中的情况下才进行计算
+            if(i_arr[j].selected) {
+              //进行秒杀和团购的累计
+              switch (i_arr[j].prom_type) {
+                case 1:
+                  if (!flash_map[i_arr[j].prom_id]) {
+                    flash_map[i_arr[j].prom_id] = {prom: i_arr[j].prom, num: i_arr[j].goods_num};
+                  } else {
+                    flash_map[i_arr[j].prom_id].num += i_arr[j].goods_num;
+                  }
+                  break;
+                case 2:
+                  if (!group_map[i_arr[j].prom_id]) {
+                    group_map[i_arr[j].prom_id] = {prom: i_arr[j].prom, num: i_arr[j].goods_num};
+                  } else {
+                    group_map[i_arr[j].prom_id].num += i_arr[j].goods_num;
+                  }
+                  break;
+              }
+            }
+        }
+      }
  
-          //判断秒杀的指定门店
-          if(i_arr[j].prom_type==1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists && i_arr[j].selected){
-            var idx0=i_arr[j].prom.pick_up_lists.findIndex(function (e){
-              return e.pickup_id==i_arr[j].pick_id;
-            })
-            if(idx0<0){
-              getApp().confirmBox(i_arr[j].service_name + "秒杀活动的门店不可售");
+      //判断flash_map是不是空,同时判断flash prom.buy_limit
+      if(Object.keys(flash_map).length>0){
+        for(let i in flash_map){
+
+
+         if(flash_map[i].prom.buy_limit>0) {
+           //查一下团购已经购买了多少减
+           var f_buyed = 0;
+           //获取当前商品活动库存
+           var fl_rs=await th.get_buy_num_ser_2(flash_map[i].prom.goods_id,1,flash_map[i].prom.id);
+           if(fl_rs.data.code==0 && fl_rs.data.data  && fl_rs.data.data.promcardbuynum){
+             f_buyed=fl_rs.data.data.promcardbuynum
+           }
+
+           if (flash_map[i].num+f_buyed> flash_map[i].prom.buy_limit) {
+             getApp().confirmBox(flash_map[i].prom.title + "秒杀活动的超出活动限购");
+             th.clear_checkouting();
+             return false;
+           }
+         }
+          let redis_num=0;
+          //获取当前商品活动库存
+          await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +oo.stoid + "/1/" + i, {
+            1: 1
+          }).then(res => {
+            redis_num = res.data.data;
+          });
+          if(flash_map[i].num>redis_num){
+            getApp().confirmBox(flash_map[i].prom.title + "秒杀活动的超出活动数量");
+            th.clear_checkouting();
+            return false;
+          }
+        }
+      }
+      //group_map,同时判断group prom.buy_limit
+      if(Object.keys(group_map).length>0){
+        for(let jg in group_map){
+
+           if(group_map[jg].prom.buy_limit>0){
+             //查一下团购已经购买了多少减
+             var gr_buyed=0;
+             //获取当前商品活动库存
+             var gb_rs=await th.get_buy_num_ser_2(group_map[jg].prom.goods_id,2,group_map[jg].prom.id);
+             if(gb_rs.data.code==0 && gb_rs.data.data && gb_rs.data.data.promcardbuynum){
+               gr_buyed=gb_rs.data.data.promcardbuynum
+             }
+             if(group_map[jg].num+gr_buyed>group_map[jg].prom.buy_limit){
+               getApp().confirmBox(group_map[jg].prom.title + "团购活动的超出活动限购");
+               th.clear_checkouting();
+               return false;
+             }
+
+           }
+
+
+            let redis_num=0;
+            //获取当前商品活动库存
+            await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +oo.stoid+ "/2/" + jg, {
+              1: 1
+            }).then(res => {
+              redis_num = res.data.data;
+            });
+            if(group_map[jg].num>redis_num){
+              getApp().confirmBox(group_map[jg].prom.title + "团购活动的超出活动数量");
               th.clear_checkouting();
               return false;
             }
-          }
         }
       }
  
+
       //排除失效服务结算
       this.data.invalidList.map(item => {
         if (item.selected && item.classType == 1) {
@@ -5662,7 +5787,65 @@ Page({
  
  
  
-  }
+  },
+
+  async go_card(e){
+    var gid=e.currentTarget.dataset.gid;
+    var rurl = '/api/weshop/activitylist/listGoodActInfo2New';
+    var req_d = {
+      "store_id": app.globalData.setting.stoid,
+      "goods_id": gid,
+      "user_id": getApp().globalData.user_id,
+      "goods_type":1
+    }
+    var res= await getApp().request.promiseGet(rurl, {data: req_d});
+
+    var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid;
+    if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+      var arr = res.data.data;
+      let times = new Date().getTime();
+      //-- 预热也要计算 --
+      var arr2 = arr.filter(function (e) {
+        return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
+      })
+      if(arr2.length==1) {
+        switch(arr2[0].prom_type){
+          case 1:
+            url+="&prom_type=1&prom_id="+arr2[0].act_id;
+            break;
+          case 2:
+            url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+arr2[0].act_id;
+            break;
+          case 6:
+            url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr2[0].act_id}`;
+            break;
+          case 8:
+            url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr2[0].act_id}`;
+            break;
+        }
+      }
+
+    }
+
+    app.goto(url);
+  },
+
+  //-- 在结算的时候，判断有没有超出限购 --
+  get_buy_num_ser_2: async function (goods_id,prom_type,prom_id) {
+    var th = this, user_id = getApp().globalData.user_id;
+    //----获取活动购买数----
+    return await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
+      data: {
+        store_id: os.stoid,
+        user_id: user_id,
+        card_id: goods_id,
+        prom_type: prom_type,
+        prom_id: prom_id,
+        isnew:1
+      },
+    });
+  },
+
  
  
 });
 \ No newline at end of file
@@ -284,13 +284,13 @@
           </block>
  
  
-          <navigator class="goods-img rel" url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{items.service_id}}">
+          <navigator class="goods-img rel" bindtap="go_card"  data-gid="{{items.service_id}}">
             <image class="wh100" src="{{items.img_url}}" binderror="bind_bnerr2" data-errorimg="service_data[{{pidx}}].goods[{{idx}}].img_url" data-url="{{items.img_url}}"></image>
  
           </navigator>
           <view class="goods-cont">
             <view class="goods-name">
-              <navigator class="ellipsis-2 fs30" url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{items.service_id}}">{{items.service_name}}</navigator>
+              <navigator class="ellipsis-2 fs30" bindtap="go_card"  data-gid="{{items.service_id}}">{{items.service_name}}</navigator>
               <block wx:if="{{items.is_gift}}">
                 <view>{{items.goods_num}}件</view>
               </block>
@@ -3004,6 +3004,7 @@ Page({
                         is_collect: 0,
                         collect_id: 0,
                       });
+                      ut.m_toast('取消成功');
                     }
                   }
                 });
@@ -3034,6 +3035,8 @@ Page({
                         is_collect: 1,
                         collect_id: e.data.data.collect_id,
                       });
+
+                      ut.m_toast('收藏成功 在【我的-收藏夹】中查看');
                     }
                   }
                 });
@@ -436,7 +436,7 @@ Page({
     //要等一下会员默认登录
     getApp().waitfor_login(async ()=> {
  
-      getApp().check_can_share();
+      getApp().check_can_share(th);
       if (typeof this.getTabBar === 'function' && this.getTabBar()) {
         this.getTabBar().setData({
           cartGoodsNum: getApp().globalData.cartGoodsNum
@@ -18,6 +18,7 @@ Page({
     is_full_screen_navigation_index: -1, //广告轮播满屏下标
     nav_title: '首页',
     nav_frontColor: "#000",
+    old_nav_frontColor: "",
     nav_backgroundColor: "#fff",
     nav_type: 1,  //导航类型
     searchbox_transparent: 1, //搜索框背景是否透明
@@ -213,7 +214,7 @@ Page({
             backgroundColor: temp_data.top_color, // 必写项
           })
           th.setData({
-            // nav_frontColor: top_w_color, // 必写项
+            nav_frontColor: top_w_color, // 必写项
             nav_backgroundColor: temp_data.top_color, // 必写项
           })
         }
@@ -232,8 +233,13 @@ Page({
     })
   },
   onPageScroll: function (e) {
-    //满屏模式监听
+    //满屏模式监听 
     let num = e.scrollTop
+    if (!this.data.old_nav_frontColor) {
+      this.setData({
+        old_nav_frontColor:this.data.nav_frontColor
+      })
+    }
     if (this.data.is_full_screen_navigation) {
       let nav_type = this.data.nav_type
       if (num >= 100 && nav_type) {
@@ -248,7 +254,7 @@ Page({
         this.setData({
           nav_type: 1,
           searchbox_transparent: 1,
-          nav_frontColor: '#000'
+          nav_frontColor: this.data.old_nav_frontColor
         })
         // this.data.nav_type = 1
       }
@@ -132,7 +132,7 @@ Page({
 			privacy_pop.check_pri_show();
 		}
  
-		getApp().check_can_share();
+		getApp().check_can_share(this);
 		//看一下小程序是不是过期了
 		getApp().getConfig2(function (config2) {
 			if (config2 && config2.is_overdue == 1) {
@@ -91,14 +91,17 @@ Page({
     var startDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
  
  
-    if (t.index && t.tabindex) {
+    if (t.index) {
+      if(t.tabindex) t.tabindex=0;
       this.setData({
         currentIndex: t.index,
         tabIndex: t.tabindex,
       });
-      this.clickTab();
+      //this.clickTab();
     };
  
+
+
     this.setData({
       currentDate: this.currentDate(),
       startDate: startDate,
@@ -185,8 +188,13 @@ Page({
         }
       }, 1)
  
-      th.resetData(), th.requestOrderList(th.data.activeCategoryId);
-      th.clickTab();
+      th.resetData();
+      if(th.data.currentIndex>0){
+        th.clickTab();
+      }else{
+        th.requestOrderList(th.data.activeCategoryId);
+      }
+
     },1500);
   },
  
@@ -2735,6 +2743,7 @@ Page({
     app.request.promiseGet(url, {
       data: data
     }).then(async res => {
+      wx.hideLoading();
       // 关闭加载状态
       th.data.is_load2 = 0;
       // 请求成功
@@ -3133,14 +3142,14 @@ Page({
  
     for (const it of list) {
       //秒杀
-      if (it.prom_type == 1) {
+      if ([1,2].includes(it.prom_type)) {
         let act_details = null;
         let redis_num = 0;
         let promcardbuynum = 0;
         let qty = it.qty;
  
-
-        await getApp().request.promiseGet('/api/ms/flash_sale/getNew/' + store_id + '/' + user_id + '/' + it.prom_id, {}).then(res => {
+        if(it.prom_type==1)
+            await getApp().request.promiseGet('/api/ms/flash_sale/getNew/' + store_id + '/' + user_id + '/' + it.prom_id, {}).then(res => {
  
           if (res.data.code == 0) {
             act_details = res.data.data;
@@ -3191,6 +3200,46 @@ Page({
  
           }
         });
+        if(it.prom_type==2)
+          await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + it.card_id + "/" + it.prom_id, {}).then(res => {
+            if (res.data.code == 0) {
+              console.log('当前的t团购活动信息：', res.data.data);
+              act_details = res.data.data;
+              if (act_details.is_end == 1) {
+                wx.showModal({
+                  title: '提示',
+                  content: '活动已结束,无法支付,请取消订单！',
+                  showCancel: false,
+                });
+                flag = false;
+                return false;
+              };
+              var t_now = ut.gettimestamp();
+              if (act_details.is_end == 1 || act_details.start_time > t_now || act_details.end_time < t_now) {
+                wx.showModal({
+                  title: '提示',
+                  content: '活动发生了变化,无法支付,请取消订单,重新购买！',
+                  showCancel: false,
+                });
+                flag = false;
+                return false;
+              }
+
+              //指定门店的控制
+              if (act_details.pick_up_lists) {
+                var idx0=act_details.pick_up_lists.findIndex(function (e){
+                  return e.pickup_id==it.pickup_id;
+                })
+                if(idx0<0){
+                  getApp().confirmBox(it.service_name + "秒杀活动的门店不可售");
+                  th.setData({ paying: 0 });
+                  flag = false;
+                  return false;
+                }
+              }
+
+            };
+          });
  
         if(act_details && act_details.buy_limit>0 && flag){
             await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
@@ -399,7 +399,7 @@
 	      <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.list}}" wx:for-item="goods"  wx:for-index="pinx" url="{{ofil.card_url(item)}}">
 	        <!-- 商品图片 -->
 	        <navigator class="rel">
-	          <image src="{{resourceUrl+goods.img_url}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].list[{{pinx}}].img_url"></image>
+	            <image src="{{resourceUrl+goods.img_url}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="cardList[{{index}}].list[{{pinx}}].img_url"></image>
 				<view class="abs flex-center fs26" wx:if="{{goods.prom_type==1}}">秒杀</view>
 				<view class="abs flex-center fs26" wx:if="{{goods.prom_type==6}}">团购</view>
 	        </navigator>
@@ -456,7 +456,8 @@
 	        </view>
  
 	        <view class="links flex-right-vertical fs24 padding">
-	          <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1 && !(item.order_goods[0].prom_type==9))}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
+	          <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1 && !(item.order_goods[0].prom_type==9))}}"
+					 class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
 	          <view bindtap="cancle" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{tabIndex}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" wx:if="{{(item.order_status==0)}}" data-index="{{tabIndex}}">取消订单</view>
  
 	            <!-- 尾款的支付时候，不显示订单详情 -->