diff --git a/app.js b/app.js
index 5397c7e..60ba32e 100644
--- a/app.js
+++ b/app.js
@@ -1353,6 +1353,42 @@ App({
         })
     },
 
+     //--- 统一跳转到物流的优化 ---
+     async check_go_fw(goods_id,func){
+
+      var user_id=this.globalData.user_id?this.globalData.user_id:0;
+      var flag=null;
+      //判断拼团的---会员身份--
+      await this.promiseGet("/api/weshop/teamlist/pageteam/2", {
+          data: {
+              store_id: os.stoid,
+              is_end: 0,
+              is_show: 1,
+              user_id: user_id,
+              pageSize: 1000,
+              goods_id:goods_id
+          }
+      }).then(res => {
+          let pd_list = res.data.data.pageData;
+          if (res.data.code == 0 && pd_list.length > 0) {
+              flag = pd_list.find(pd => {
+                  return  pd.goods_type==1;
+              })
+          }
+      })
+
+      var url= "/packageA/pages/goodsInfo/goodsInfo?goods_id="+goods_id;
+      if(flag){
+          url='/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id='+goods_id+'&prom_type=6&prom_id='+flag.id;
+      }
+      if(func){
+          func(flag,url)
+      }else{
+          this.goto(url);
+      }
+
+
+  },
     //-- 如果是新会员没有地址的时候，自提的时候可以不用管 --
     is_no_addr(th,exp_type){
         exp_type=parseInt(exp_type+'');
@@ -1362,7 +1398,7 @@ App({
         }
         return false;
       },
-    //---- 判断是不是虚拟商品狗阿米  -----
+    //---- 判断是不是虚拟商品  -----
     is_virtual(gd){
         if(gd.is_virtual==2) return true;
         return false;
@@ -1413,7 +1449,10 @@ App({
             })
         }
         return  cx_arr;
-    }
+     },
+
+
 
+    });
 
-});
+    
diff --git a/app.json b/app.json
index 153f35a..934ee9d 100644
--- a/app.json
+++ b/app.json
@@ -116,10 +116,12 @@
                 "pages/cart2_ser/cart2_ser",
                 "pages/libao_payment/payment",
                 "pages/details_serviceCard/details_serviceCard",
-								"pages/serviceCard_pd/goodsInfo/goodsInfo",
-								"pages/serviceCard_pd/team_show/team_show",
-								"pages/serviceCard_pd/cart/cart",
-               "pages/serviceCard_pd/team_success/team_success"
+                "pages/serviceCard_pd/goodsInfo/goodsInfo",
+                "pages/serviceCard_pd/team_show/team_show",
+                "pages/serviceCard_pd/cart/cart",
+                "pages/serviceCard_pd/team_success/team_success",
+                "pages/serviceCard_pd/cart_wk/cart_wk",
+                "pages/serviceCard_pd/team_more/team_more"
             ]
         },
         {
diff --git a/app.wxss b/app.wxss
index 2e197c2..3e5ba4b 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1211,7 +1211,7 @@ background: #ffe3e2;
 .no_line_x{
   text-decoration: none !important;
   font-size: 24rpx !important;
-  color: #acaaaa !important;
+  /*color: #acaaaa !important;*/
 }
 .no_line_c{
   text-decoration: none !important;
diff --git a/components/diy_pingd_buy/diy_pingd_buy.js b/components/diy_pingd_buy/diy_pingd_buy.js
index 1b5e23d..6957bd9 100644
--- a/components/diy_pingd_buy/diy_pingd_buy.js
+++ b/components/diy_pingd_buy/diy_pingd_buy.js
@@ -49,12 +49,15 @@ Component({
         clearInterval(this.data.timer);
     }  
   },	
-  
-  
+
   ready: function() {
     console.log("ready");
     var g_id = this.data.object.data;
+    var data_type = this.data.object.data_type;
     console.log(g_id);
+    if(data_type!=2){
+        g_id=null;
+    }
     this.init(g_id);
   },
   detached() {
@@ -219,7 +222,7 @@ Component({
     bind_bnerr3: function (e) {
       var _errImg = e.target.dataset.errorimg;
       var _Img = e.target.dataset.img;
-      if (_Img != undefined) {
+      if (_errImg != undefined) {
         var _errObj = {};
         _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
         this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js
index 6cd7c92..7a22e7b 100644
--- a/packageA/pages/cart2_ser/cart2_ser.js
+++ b/packageA/pages/cart2_ser/cart2_ser.js
@@ -510,6 +510,9 @@ Page({
 							'pickup_id': gg.pick_id,
 							'pickup_keyid': list[i].keyid,
 						};
+						if(gg.is_pd_normal){
+							goods.is_pd_normal=1;
+						}
 					}
 
                     if(getApp().globalData.skinface_id){
@@ -562,6 +565,11 @@ Page({
                 goods.skinface_id=getApp().globalData.skinface_id;
             }
 
+			if(this.data.postdata && this.data.postdata.is_pd_normal==1){
+				goods.is_pd_normal=1;
+			}
+
+
 			//--导购分享过来的id--
 			if (gg.guide_id) {
 				goods.guide_id = gg.guide_id;
diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js
index d8ea6ed..86b0ed0 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.js
+++ b/packageA/pages/details_serviceCard/details_serviceCard.js
@@ -4,6 +4,7 @@ const app = getApp();
 const os = app.globalData.setting;
 let self = null;
 var util = require('../../../utils/util.js');
+const ut = require("../../../utils/util.js");
 
 Page({
 
@@ -70,8 +71,13 @@ Page({
 				}).then(res => {
 					if (res.data.code == 0) {
 						// console.log('请求成功', res);
+						var dd=res.data.data.pageData[0];
+						dd.prom_type=dd.list[0].prom_type;
+						dd.pt_status=dd.list[0].pt_status;
+						dd.pt_tail_money=dd.list[0].pt_tail_money;
+
 						this.setData({
-							details: res.data.data.pageData[0],
+							details: dd,
 						});
 					} else {
 						throw (res);
@@ -306,6 +312,9 @@ Page({
 					var card_id = details.list[i].card_id;
 					var prom_type = details.list[i].prom_type > 0 ? details.list[i].prom_type : 0;
 					var is_pd_normal = details.list[i].is_pd_normal;
+					if(is_pd_normal){
+						newd['is_pd_normal'] = 1;
+					}
 					// 库存
 					var redisNums = 0;
 					// 限购数
@@ -356,6 +365,12 @@ Page({
 
 					}
 
+					if(prom_type==6){
+						wx.showModal({
+							title: details.list[i].service_name +"拼团商品不加入购物车\n"
+						});
+						return false;
+					}
 
 					//----先看会员在购物车中是否加入了该商品-----
 					app.request.get("/api/weshop/cartService/page", { 
@@ -499,7 +514,7 @@ Page({
 
 
 	// 立即支付
-	pay() {
+	async pay() {
 
 		if(this.data.is_summit_ing) return false;
 		this.data.is_summit_ing=1;
@@ -508,54 +523,211 @@ Page({
 		let order_sn = this.data.details.order_sn;
 		let order_id = this.data.details.order_id;
 		let store_id = app.globalData.setting.stoid;
-		t_pay.set_pay_url("/api/weshop/order/pay/createRechargeOrder");
-		t_pay.pay({
-			parentSn: order_sn,
-			store_id: store_id
-		}, function () {
-			app.showWarning('支付成功');
-			setTimeout(function() {
-				wx.reLaunch({
-					url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
-				})
-			}, 1000)
-
-		}, function (e) {
-			th.data.is_summit_ing=0;
-			wx.showToast({
-				title: e,
-				icon: 'none',
-				duration: 2000
-			});
-		})
-		// app.request.post('/api/weshop/order/pay/createRechargeOrder', {
-		// 	data: {
-		// 		parentSn: order_sn,
-		// 		store_id: store_id,
-		// 	},
-		//
-		// 	success: function(res) {
-		// 		var n = res.data.data;
-		// 		self.weixinPay(n, function() {
-		// 			app.showWarning('支付成功');
-		// 			// setTimeout(function() {
-		// 			// 	wx.reLaunch({
-		// 			// 		url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
-		// 			// 	})
-		// 			// }, 1000)
-		// 		}, function() {
-		// 			app.showWarning('支付失败');
-		// 			// setTimeout(function() {
-		// 			// 	wx.reLaunch({
-		// 			// 		url: '/packageA/pages/cardList/cardList',
-		// 			// 	})
-		// 			// }, 1000)
-		// 		});
-		// 	}
-		// })
-	},
+		let user_id = os.user_id;
+
+		let flag = true;
+		// 如果是普通购买或单独购买，不用判断
+		// 如果是秒杀购买：1、判断活动是否变化；2、是否超出限购
+		let list =  this.data.details.list;
+		var pt_act=null;  //-- 拼团活动的优化 --
+
+		//秒杀活动和拼团活动要重新计算一下
+		for (const it of list) {
+			if (it.prom_type == 1) {
+				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 => {
+					console.log('11111111====>>>');
+					if (res.data.code == 0) {
+						console.log('当前的秒杀活动信息：', res.data.data);
+						act_details = res.data.data;
+						if (act_details.is_end == 1) {
+							wx.showModal({
+								title: '提示',
+								content: '活动已结束,无法支付,请取消订单！',
+								showCancel: false,
+							});
+							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 == 0 && 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.buy_limit>0 && flag){
+					await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
+						data: {
+							store_id: store_id,
+							user_id: user_id,
+							card_id: it.card_id,
+							prom_type: it.prom_type,
+							prom_id: it.prom_id,
+							ispay:1
+						}
+					}).then(res => {
+
+						if (res.data.code == 0) {
+							promcardbuynum = res.data.data.promcardbuynum;
+							let canBuyNum = act_details.buy_limit - promcardbuynum; // 自己还可购买的数量c
+
+							if (canBuyNum < qty) {
+								wx.showModal({
+									title: '提示',
+									content: '您已超出活动限购数量,无法支付,请取消订单！',
+									showCancel: false,
+								});
+								flag = false;
+							}
+						}
+					})
+				}
+
+			};
 
+			if (it.prom_type == 6) {
+				let act_details = null;
+				let redis_num = 0;
+				let promcardbuynum = 0;
+				let qty = it.qty;
 
+				await getApp().request.promiseGet("/api/weshop/teamlist/get/" + store_id + "/" + it.prom_id, {}).then(res => {
+
+					if (res.data.code == 0) {
+
+						act_details = res.data.data;
+
+						if (act_details.is_end == 1) {
+							wx.showModal({
+								title: '提示',
+								content: '活动已结束,无法支付,请取消订单！',
+								showCancel: false,
+							});
+							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) {
+							wx.showModal({
+								title: '提示',
+								content: '活动发生了变化,无法支付,请取消订单,重新购买！',
+								showCancel: false,
+							});
+							flag = false;
+							return false;
+						}
+
+					};
+				});
+
+				if(act_details.buy_limit>0){
+					await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
+						data: {
+							store_id: store_id,
+							user_id: user_id,
+							card_id: it.card_id,
+							prom_type: it.prom_type,
+							prom_id: it.prom_id,
+							ispay:1
+						}
+					}).then(res => {
+						if (res.data.code == 0) {
+							console.log('已经购买的数量：', res.data.data);
+							promcardbuynum = res.data.data.promcardbuynum;
+						}
+					})
+					let limited = act_details.buy_limit; // 限购数量a
+					let canBuyNum = limited - promcardbuynum; // 自己还可购买的数量c
+
+					if (canBuyNum < qty ) {
+						wx.showModal({
+							title: '提示',
+							content: '您已超出活动限购数量,无法支付,请取消订单！',
+							showCancel: false,
+						});
+						flag = false;
+					}
+				}
+				pt_act=act_details;
+			}
+		}
+
+		if (flag) {
+			t_pay.set_pay_url("/api/weshop/order/pay/createRechargeOrder");
+			t_pay.pay({
+				parentSn: order_sn,
+				store_id: store_id
+			}, function () {
+				app.showWarning('支付成功');
+
+				if(pt_act.kttype==1){
+					//--如果商家团的时候---
+					getApp().request.promisePost("/api/weshop/order/pay/vipAutoTuan", {
+						data: {orderSn:order_sn,storeId:os.stoid }
+					})
+				}
+
+				setTimeout(function () {
+					wx.reLaunch({
+						url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
+					})
+				}, 1000)
+
+			}, function (e) {
+				th.data.is_summit_ing = 0;
+				wx.showToast({
+					title: e,
+					icon: 'none',
+					duration: 2000
+				});
+			})
+		}else{
+			this.data.is_summit_ing=0;
+		}
+
+	},
+
+	//-- 支付尾款 --
+	pay2(){
+	    var url="/packageA/pages/serviceCard_pd/cart_wk/cart_wk?order_id="+this.data.details.order_id;
+	    getApp().goto(url);
+	},
+	
 	//------调起支付框--------
 	weixinPay: function(n, success, fail) {
 		if (!n) return false;
diff --git a/packageA/pages/details_serviceCard/details_serviceCard.wxml b/packageA/pages/details_serviceCard/details_serviceCard.wxml
index 71e61af..c9da4ae 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.wxml
+++ b/packageA/pages/details_serviceCard/details_serviceCard.wxml
@@ -8,8 +8,17 @@
 				<view class="ellipsis-1 pdr40 fs30"><text class="iconfont icon-shop c-red pdr10"></text>{{item.pickup_name}}</view>
 				<!-- 订单状态 -->
 				<block>
-					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 0}}">待支付</text>
-					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 1}}">待评价</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status<2 && details.pay_status==0 }}">
+						<block wx:if="{{details.prom_type==6}}">
+							<block wx:if="{{details.pt_status==0}}" >未支付</block>
+							<block wx:if="{{details.pt_status==1}}" >组团中</block>
+							<block wx:if="{{details.pt_status==2 && details.pt_tail_money>0}}">待支付尾款</block>
+						</block>
+						<block wx:else>
+							待支付
+						</block>
+					</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 1 && details.pay_status==1}}">待评价</text>
 					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 2}}">已评价</text>
 					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 3}}">已取消</text>
 					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 5}}">已作废</text>
@@ -39,7 +48,9 @@
 		
 		
 		<!-- 统计栏 -->
-		<view class="t-r bdt pdv20">共{{filter.count(details.list)}}件商品，合计：<text class="rmb c-red bold fs30">{{details.account}}</text></view>
+		<view class="t-r bdt pdv20">
+			共{{filter.count(details.list)}}件商品，合计：<text class="rmb c-red bold fs30">{{filter.toFix(details.account+details.pt_tail_money,2) }}</text>
+		</view>
 	</view>
 	
 	
@@ -68,14 +79,24 @@
 	</view>
 	
 	<!-- 底部按钮栏 -->
-	<view class="btn-bar t-r bg-white pd20">
+	<view class="btn-bar t-r bg-white pd20" hidden="{{details.pt_status == 1 && details.order_status<2 }}">
 		<!-- 待支付 -->
-		<block wx:if="{{details.order_status == 0}}">
+		<block wx:if="{{details.pay_status == 0 && details.order_status<2 && details.prom_type!=6  }}">
+			<text class="btn btn-border" bindtap="cancle">取消订单</text>
+			<text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
+		</block>
+
+		<block wx:if="{{details.pt_status == 0 && details.order_status<2 && details.prom_type==6  }}">
 			<text class="btn btn-border" bindtap="cancle">取消订单</text>
 			<text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
 		</block>
+
+		<block wx:if="{{details.pt_status == 2 && details.order_status<2 && details.prom_type==6 && details.pt_tail_money>0 }}">
+			<text class="btn bg-red white mgl20" bindtap="pay2">支付尾款</text>
+		</block>
+
 		<!-- 已支付/未评价 -->
-		<block wx:if="{{details.order_status == 1}}">
+		<block wx:if="{{details.order_status == 1 && details.pay_status == 1 }}">
 			<text class="btn bg-orange white" bindtap="buy2">再来一单</text>
 			<text class="btn bg-red white mgl20" bindtap="access">立即评价</text>
 		</block>
diff --git a/packageA/pages/goodsInfo/filter.wxs b/packageA/pages/goodsInfo/filter.wxs
index 5c5f0a2..c2fae18 100644
--- a/packageA/pages/goodsInfo/filter.wxs
+++ b/packageA/pages/goodsInfo/filter.wxs
@@ -8,7 +8,19 @@ function format_tt(ts) {
            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
+  format_tt:format_tt,
+  is_no_dis:is_no_dis
 }
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 3058c10..3281583 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -218,17 +218,13 @@ Page({
   },
 
   //------初始化加载----------
-  onLoad: function(t) {
+  onLoad:function(t) {
+		 self = this;
 
+      this.setData({
+          options: t,
+      });
 
-        console.log("11111111");
-
-		self = this;
-		
-		this.setData({
-			options: t,
-		}); 
- 
     var ee = this,
         that = ee,
         th = ee,
@@ -251,11 +247,11 @@ Page({
       if(gid_str.length>1){
         first_leader=gid_str[1];
       }	  
-			//-- 如果有room_id的获取 --
-			if(gid_str.length>2 && gid_str[2]) {
-				room_id=gid_str[2];
-				room_user_share=1;		  
-			};
+        //-- 如果有room_id的获取 --
+        if(gid_str.length>2 && gid_str[2]) {
+            room_id=gid_str[2];
+            room_user_share=1;
+        };
     };
 		
     ee.setData({ gid: gid});
@@ -328,43 +324,10 @@ Page({
 
           //------几人评价-------
           //n.init(th, "", "comments");
-
-          th.requestCardNum(), wx.pageScrollTo && th.setData({
+            wx.pageScrollTo && th.setData({
             supportPageScroll: !0
           });
 
-          //计算等级价相关
-        //   var swithc_list = e.switch_list;
-        //   var sw_arr = JSON.parse(swithc_list);
-        //   //---如果后台又开等级卡的开关---
-        //   if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
-        //     th.setData({ rank_switch: true });
-        //     //---回调卡的列表---
-        //     th.getPlusCardType(function (ob) {
-        //       th.setData({ card_list: ob.card_list });
-        //       var ti = setInterval(function () {
-        //         var user = getApp().globalData.userInfo;
-        //         if (!user) return false;
-        //         clearInterval(ti);
-        //         if (user.card_field && user['card_expiredate']) {
-        //           var str = user['card_expiredate'].replace(/-/g, '/');
-        //           var end = new Date(str);
-        //           end = Date.parse(end) / 1000;
-        //           var now = ut.gettimestamp();
-        //           //--- 判断是等级会员，且在有效期范围内 ---
-        //           if (user.card_field && now < end) {
-        //             var card_name = ob.name_map.get(user.card_field);
-        //             //if(card_name.length>6) card_name=card_name.substring(0,6);
-
-        //             var is_near_date = 0;
-        //             if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天
-        //             th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list, is_near_date: is_near_date });
-        //           }
-        //         }
-        //       }, 500)
-        //     })
-        //   }
-
         }, 1);
 
         //获取用户设备信息，屏幕宽度
@@ -508,7 +471,11 @@ Page({
 						});
 					};
 										
-				};
+				}else{
+                    this.setData({
+                        actList: res.data.data,
+                    });
+                }
 			});
 		};
 		// <---- 秒杀
@@ -580,7 +547,6 @@ Page({
       }
     };
 		
-		this.getTaohe();
 
     // if (th.data.is_closecoupon != 1 && (!th.data.fir_quan || th.data.fir_quan.length<=0)) {
     //   //----获取详情页的券的数量----
@@ -640,199 +606,213 @@ Page({
 	// gid 在onload阶段已经保存在this.data中
   onShow: function() {
 
-      getApp().check_can_share();
+    getApp().check_can_share();
 
     var that=this;var th=this;
     var ee = this,gid = this.data.gid, i = getApp().request;
-    this.data.is_timer = 1;
 
-      //获取用户的默认门店
-      th.check_guide(()=>{
-          getApp().get_user_store(function(e) {
-              console.log('get_user_store');
-              console.log("999999999");
+    //判断是不是要跳转到拼团服务卡
+    getApp().check_go_fw(gid,function (act,url){
 
+        if(act){
+            wx.redirectTo({
+                url:url
+            })
+            return false;
+        }
 
-              if(!e) {
-                  th.data.fir_def_store={}; //赋值空对象
-                  return false;
-              }
+        th.data.is_timer = 1;
+        //获取用户的默认门店
+        th.check_guide(()=>{
+            getApp().get_user_store(function(e) {
+                console.log('get_user_store');
+                console.log("999999999");
 
-              console.log("000000");
 
-              if(getApp().globalData.is_dj_pk)  th.setData({has_def:1})
+                if(!e) {
+                    th.data.fir_def_store={}; //赋值空对象
+                    return false;
+                }
 
-              var ee=JSON.parse(JSON.stringify(e));
+                console.log("000000");
 
+                if(getApp().globalData.is_dj_pk)  th.setData({has_def:1})
 
-              console.log(e);
+                var ee=JSON.parse(JSON.stringify(e));
 
-              //--定时器推迟一下--
-              setTimeout(function () {
-                  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;
-                  }
 
-                  var appd=getApp().globalData;
-                  var w_time = setInterval(function() {
-                      if (that.data.is_get_local_ok == 0) return false;
-                      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,
-                              })
-                          }
-                      }
-                  }, 500)
-              },1500)
+                console.log(e);
 
-          });
-      })
+                //--定时器推迟一下--
+                setTimeout(function () {
+                    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;
+                    }
+
+                    var appd=getApp().globalData;
+                    var w_time = setInterval(function() {
+                        if (that.data.is_get_local_ok == 0) return false;
+                        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,
+                                })
+                            }
+                        }
+                    }, 500)
+                },1500)
+
+            });
+        })
+
+        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,
+                        'isshow':1
+
+                    });
+
+                    that.getTaohe();
+
+                    // console.log('0xxxxx999999', t.data.data);
+                    //-----商品详情---
+                    if(!t.data.data.serviceContent) t.data.data.serviceContent="  ";
+                    a.wxParse("content", "html", ut.format_content(t.data.data.serviceContent), ee, 6);
+                    e.wxParseAddFullImageUrl(ee, "content");
+
+                    //获取重表
+                    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);
+        th.get_sto();
+    })
 
-		this.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,
-					});
-								
-					// console.log('0xxxxx999999', t.data.data);
-					//-----商品详情---
-					if(!t.data.data.serviceContent) t.data.data.serviceContent="  ";
-					a.wxParse("content", "html", ut.format_content(t.data.data.serviceContent), ee, 6);
-					e.wxParseAddFullImageUrl(ee, "content");
-														
-					//获取重表
-				    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();
-						}
-					});
-				};
-			}
-    });
-		
-				
-		
-    this.data.enterAddressPage && (this.data.enterAddressPage = !1);
-		this.get_sto();
 
 
 		
@@ -1701,7 +1681,7 @@ Page({
             }
             e.his_cate_num=his_cate_num;
 
-			//--普通门店排版--
+            //--普通门店排版,服务卡项有指定门店才能使用，所以要筛选一下--
 			setTimeout(function(){			
 			  var sto_list=th.data.data.storageId;
 			  if(sto_list){
@@ -2008,7 +1988,7 @@ Page({
             });
             //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
             if (!th.data.def_pick_store) {
-              th.setData({def_pick_store:e.data.data.pageData[0]})
+               th.setData({def_pick_store:e.data.data.pageData[0]})
             }
 
           }
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index 14b0cd5..1962e91 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -4,7 +4,7 @@
 <wxs module="tool" src="filter.wxs"></wxs>
 
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
-<block>
+<block wx:if="{{isshow}}">
 	<view class="container">
 		<view class="type-navbar">
 			<view class="type-box" wx:for="{{categories}}" wx:key="categories">
@@ -830,7 +830,12 @@
 								<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}}</view>
+											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
+												<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
+													<text class="no_store">(配送不匹配)</text>
+												</block>
+
+											</view>
 										</view>
 										<view>
 											<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
@@ -856,7 +861,11 @@
 								<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}}</view>
+											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
+												<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
+													<text class="no_store">(配送不匹配)</text>
+												</block>
+											</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"}}
@@ -884,7 +893,11 @@
 							<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}}</view>
+										<view class="fs28 xc-black3 address_name">{{item.pickup_name}}
+											<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
+												<text class="no_store">(配送不匹配)</text>
+											</block>
+										</view>
 									</view>
 									<view>
 										<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
diff --git a/packageA/pages/serviceCard_pd/cart/cart.js b/packageA/pages/serviceCard_pd/cart/cart.js
index 4c81e8d..754c836 100644
--- a/packageA/pages/serviceCard_pd/cart/cart.js
+++ b/packageA/pages/serviceCard_pd/cart/cart.js
@@ -3,6 +3,7 @@ var t = getApp(), app = t, a = t.request, e = require("../../../../utils/common.
 var oo = t.globalData.setting, os = oo;
 var regeneratorRuntime = require('../../../../utils/runtime.js');
 var util_pay = require("../../../../utils/pay.js");
+var t_pay = require("../../../../utils/pay2.js");
 
 Page({
   data: {
@@ -62,35 +63,16 @@ Page({
     rank_switch: 0,      //是不是开同等级卡
     show_card: null,     //显示的等级卡
     card_name: '',       //显示的卡的名称
-    card_cut_price: null,//减价多少钱  
-    bconfig: null,
-    showFold:true,
-  },
-
-
-
-  onReady() {
-
-    setTimeout(() => {
-      wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
-        if (res.length != 0) {
-          this.setData({
-            showFold: res[0].height < res[1].height,
-          });
-        };
 
-      }).exec();
-    }, 1000);
+    card_cut_price: null,//减价多少钱
 
-  },
-  
-  clickCollapse() {
-    this.setData({
-      flag: !this.data.flag,
-    })
+    //dis_config:null,  //因为拼团有佣金抵扣
+    //bn_use_commission: 0, //是不是使用佣金
   },
   onLoad: function (t) {
     console.log("onLoad_pt_cart");
+
+
     var th = this; this.setData({ is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow, });
     var appD = getApp().get_b_now();
     getApp().getConfig2(function (e) {
@@ -110,6 +92,8 @@ Page({
     th.data.param = t;
     //先获取物流，再获取用户信息，再展示页面
     //th.get_wuliu(th.get_info(th.show_page));
+    //getApp().is_distribut(this);
+
   },
   onUnload: function () { this.setData({ isclose: 1 }) },
 
@@ -214,6 +198,28 @@ Page({
                   if (pt_data.kttype == 3) {
                     t.data.data.shop_price = tt.data.data.yf_price;  //用定金来购买
                   }
+
+                    //-- 计算获得佣金的金额 --
+                    if (getApp().globalData.userInfo.is_distribut
+                        && th.data.dis_config && th.data.dis_config.is_yongjin_dk) {
+                        var fir_num = 0;
+                        var sec_num = 0;
+                        var thi_num = 0;
+                        if (th.data.dis_config.pattern == 1) {
+                            fir_num = (teamlist.fir_rate || 0) * order_goods.goods_num;
+                            sec_num = (teamlist.sec_rate || 0) * order_goods.goods_num;
+                            thi_num = (teamlist.thi_rate || 0) * order_goods.goods_num;
+                        } else {
+                            fir_num = parseFloat((teamlist.commission || 0) * order_goods.goods_num * (th.data.dis_config.firstRate || 0) / 100).toFixed(2);
+                            sec_num = parseFloat((teamlist.commission || 0) * order_goods.goods_num * (th.data.dis_config.secondRate || 0) / 100).toFixed(2);
+                            thi_num = parseFloat((teamlist.commission || 0) * order_goods.goods_num * (th.data.dis_config.thirdRate || 0) / 100).toFixed(2);
+                        }
+                        var c_num = getApp().get_commission(fir_num, sec_num, thi_num, th);
+                        goods.use_commission = parseFloat(c_num.toFixed(2));
+
+                    }
+
+
                 }
               } else {
                 t.data.data.prom_id = 0;
@@ -238,6 +244,12 @@ Page({
 
   //----------子页返回父页触发----------
   onShow: function () {
+
+    s.fy_back('',0);
+
+    t_pay.set_fir();
+    util_pay.set_fir();
+
     var th = this;
     if (th.data.isclose == 0) {
       wx.navigateTo({
@@ -400,39 +412,42 @@ Page({
                       //要进行判断，如果是用微信支付，就要跳转到支付界面
                       if (order_amount > 0) {
                           th.setData({ isclose: 0 });
-                          getApp().request.post("/api/weshop/order/pay/createRechargeOrder", {
-                              data: {
-                                  parentSn: data.data.order_sn,
-                                  store_id: oo.stoid
-                              },
-                              success: function(su) {
-
-                                  var n = su.data.data;
-                                  let order_id = data.data.order_id;
-                                  th.weixinPay(n,
-                                      function() {
-                                          // getApp().showWarning("购买成功");
-                                          wx.showToast({
-                                              title: '购买成功',
-                                              icon: 'success',
-                                              duration: 2000
-                                          });
-                                          setTimeout(function() {
-                                              wx.redirectTo({
-                                                  url: "/packageA/pages/serviceCard_pd/team_success/team_success?order_sn=" + data.data.order_sn
-                                              });
-                                          }, 1000)
-                                      },
-                                      function() {
-                                          getApp().showWarning("支付失败");
-                                          setTimeout(function() {
-                                              wx.reLaunch({
-                                                  url: "/pages/user/order_list/order_list?index=2&tabindex=1",
-                                              })
-                                          }, 1000)
-                                      })
-                              }
+
+                          t_pay.set_pay_url("/api/weshop/order/pay/createRechargeOrder");
+                          t_pay.pay({
+                              parentSn: data.data.order_sn,
+                              store_id: oo.stoid
+                          }, function () {
+                              wx.showToast({
+                                  title: '购买成功',
+                                  icon: 'success',
+                                  duration: 2000
+                              });
+                              setTimeout(function() {
+                                  wx.redirectTo({
+                                      url: "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + data.data.order_sn
+                                  });
+                              }, 1000)
+
+                          }, function (e) {
+                              wx.showToast({
+                                  title: e,
+                                  icon: 'none',
+                                  duration: 2000
+                              });
+
+                              //-- 支付失败,要返回 --
+                              setTimeout(function () {
+                                  var cps = getCurrentPages();
+                                  if (cps.length > 1) {
+                                      wx.navigateBack({ delta: 1 })
+                                  } else {
+                                      getApp().goto("/pages/index/index/index");
+                                  }
+                              }, 1000)
+
                           })
+
                       }
                   } else {
                       th.data.is_summit_ing = 0; //是否提交中
diff --git a/packageA/pages/serviceCard_pd/cart/cart.wxml b/packageA/pages/serviceCard_pd/cart/cart.wxml
index 086ba23..875b0a9 100644
--- a/packageA/pages/serviceCard_pd/cart/cart.wxml
+++ b/packageA/pages/serviceCard_pd/cart/cart.wxml
@@ -1,115 +1,24 @@
 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
 <form bindsubmit="submitForm">
     <view class="container">
-		
-		<view class="tab-container" wx:if="{{kt_type!=3 || is_normal==1}}">
-			<view class="tab-wrapper">			
-					<view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}"  
-					data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >门店自提</view>
-					
-					<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>
-				
-			</view>
-		</view>
-		
-		
-        <!--要进行判断地址是否显示---->
-        <view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{bn_exp_type==1 || kt_type==3}}'>
-            <!---默认地址显示------>
-            <block wx:if="{{user_addr!=null}}">
-                <view class="user-contact">收货人：{{user_addr.consignee}}{{'　　'}}{{user_addr.mobile}}</view>
-                <view class="location">
-                    <view class="address">{{user_addr.more_address}}{{'  '}}{{user_addr.address}}</view>
-                    <view class="pos-icon">
-                        <image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
-                    </view>
-                </view>
-                <view class="update-logistics">
-                    <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/icon-arrowdown.png"></image>
-                </view>
-            </block>
-            <!---先增地址------>
-            <block wx:else>
-                <view class="add_new">
-                    <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址
-                </view>
-            </block>
-            <!-- <view class="border-img"><image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/tt.png"></image></view> -->
-        </view>
-
 
         <!------立即购买-------->
         <block>
-         <!-- <view class="xc-border main-top"></view> -->
                 <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="goods-img">
+                      <view class="goods-img" bindtap="go_to" data-url="/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id={{items.service_id}}&prom_type=6&prom_id={{bn_goods.prom_id}}">
                           <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="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
-                          <view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view>
-                               <!-- 商品属性 -->
-                          <view class="flex-vertical fs28 color-gray n_guige">
-                                 <view class="goods-color"><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text>
-                          </view></view>
-
+                      <navigator class="order-cont" url="/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id={{items.service_id}}&prom_type=6&prom_id={{bn_goods.prom_id}}">
+                            <view class="goods-name ellipsis-2">{{bn_goods.service_name}}</view>
                              <!-----商品名称规格------>
-                    <view class="order-num flex-space-between">
-                        <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
-                        <view class="goods-num">x{{bn_goods.buynum}}</view>
-                    </view>
+                            <view class="order-num flex-space-between">
+                                <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
+                                <view class="goods-num">x{{bn_goods.buynum}}</view>
+                            </view>
                       </navigator>
-                      <!-- <view class="order-num">
-                          <view class="co-red">￥{{bn_goods.shop_price}}</view>
-                          <view class="goods-num">x{{bn_goods.buynum}}</view>
-                      </view> -->
-                </view>
-				
-				<!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
-				<view class="plus_buy fs28" wx:if="{{card_cut_price>0}}">
-					<view class="flex">
-						<view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
-							<image  src="{{imgUrl}}/miniapp/images/plus/dj_icon.png"></ image>
-							<text class="card_name">{{show_card.CardName}}</text>
-						</view>            						
-						<view>立减 <text style="color:#f23030;">{{filters.toFix(card_cut_price,2) }}</text> 元</view>
-					</view>
-					<view>
-						<text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
-					</view>				
-					<!-- 三角形 -->
-					<view class="car_tri_up"></view>
-					<!-- 立即开通跳转 -->
-					<view bindtap="buycard" class="card_op">立即开通</view>				
-				</view>	
-				
-				
-                <view class="set-mes bdr_b-14">
-                    <view wx:if="{{order.store_prom}}"><icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
-                    </view>
-
-                    <!--阶梯团是不显示的-->
-					<block wx:if="{{bn_exp_type==0 && !is_default_logistics}}">
-						<view class="use-item flex-space-between" wx:if="{{kt_type!=3 || is_normal==1}}">							
-						   <view>选择物流</view>
-						   <view class="flex-vertical"  bindtap="show_wu_arr"  data-txt='index' style="margin-right: 8rpx;">
-							   <view class="logistics-name">{{wu_arr[index].name}}</view><view class="xc-right"></view>
-						   </view>						
-						</view>
-					</block>
-
-                    <!--阶梯团是不显示的
-                    <block wx:if="{{kt_type!=3 || is_normal==1 }}">
-                        <view class="use-item" hidden='{{bn_exp_type==1}}'>
-                              <view>使用物流：</view>
-                              <picker bindchange="bindPickerChange" value="{{index}}" range="{{wu_arr}}" range-key="name">
-                                    <view >{{wu_arr[index].name}}</view>
-                              </picker>
-                        </view>
-                    </block>-->
 
                 </view>
 <!-- 保障服务 -->
@@ -129,18 +38,17 @@
                     <view class="leave-word">
                         <input placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></input>
                      
+
+
+                <view class="set-mes bdr_b-14">
+                    <view wx:if="{{order.store_prom}}">
+                        <icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
                     </view>
                 </view>
+
          </block>
 
          <view class="information bdr14">
-						 <!-----使用余额------>
-						 <view class="set-mes" wx:if="{{userinfo.user_money>0 && yuer>0}}">
-							 <view class="use-item" bindtap='set_bn_useyuer' style="padding-left:0;padding-right:0;">
-								<icon  color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
-								<view class="yu_er">使用余额 :￥{{yuer}} </view>
-							 </view>
-						 </view>
             <view class="item" wx:if="{{kt_type<3 || is_normal==1}}">
                 <view>商品金额</view>
                 <view class="co-red">￥ {{formData.all_price}}元</view>
@@ -151,70 +59,15 @@
                 <view class="co-red">￥ {{formData.all_price}}元</view>
             </view>
 
-            <view class="item" wx:if="{{formData.shipping_price>0}}">
-                <view>配送费用</view>
-                <view class="co-red">￥ {{formData.shipping_price}}元</view>
-            </view>
-            <view class="item" wx:if="{{formData.user_money>0}}">
-                <view>使用余额</view>
-                <view class="co-red">- ￥ {{formData.user_money}}元</view>
-            </view>
-
         </view>
     </view>
 
      <view class="btn-wrap">
 			<view class="pay-amount">
 					<view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
-					<!-- <view class="co-red big"></view> -->
 			</view>
 			<button class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
      </view>
 </form>
 
-<!----弹起选择物流名的列表---->
-<view wx:if='{{open_express==1}}' >
-    <view class="cover-layer flex-center "  bindtap='close_express'>
-    </view>
-
-    <view class="cx-popup radius {{open_express==1?'up' : 'down'}}" >
-        <view class="tops flex">
-            <view class="top-content fs32">
-                <view>
-                    选择物流名字
-                </view>
-            </view>
-            <view class="close-frame"  bindtap='close_express' >
-                <view class="xc-close-express">×</view>
-            </view>
-        </view>
-        <view class="express_list">
-            <view  wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
-                <view class="express_list_frame" bindtap="click_express_name"
-                      data-shippingcode="{{express_list.shipping_code}}"
-                      data-name="{{express_list.name}}" data-idxe="{{idx}}">
-
-                    <block wx:if="{{is_express==idx}}">
-                        <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view>
-                    </block>
-                    <block wx:else>
-                        <view class="circle  xc-hooks"></view>
-                    </block>
-                    <view class="fs30">{{express_list.name}}</view>
-
-                </view>
-            </view>
-        </view>
-        <view class="flex click-buttem" >
-            <view class="xc-determine flex-center" bindtap="determine_expres">
-                <view class="flex-vertical  t-c">确定</view>
-            </view>
-            <view class="xc-confirms flex-center" bindtap="select_default_logistics">
-                <view class="flex-vertical  t-c">设为默认</view>
-            </view>
-        </view>
-
-    </view >
-</view>
-
 <warn id="warn"></warn>
diff --git a/packageA/pages/serviceCard_pd/cart_wk/cart_wk.js b/packageA/pages/serviceCard_pd/cart_wk/cart_wk.js
new file mode 100644
index 0000000..4abcb1c
--- /dev/null
+++ b/packageA/pages/serviceCard_pd/cart_wk/cart_wk.js
@@ -0,0 +1,739 @@
+// pages/cart/cart_wk/cart_wk.js
+var t = getApp(),
+  oo = t.globalData.setting,
+  os=oo;
+var ut=require("../../../../utils/util.js");
+var util_pay=require("../../../../utils/pay.js");
+var regeneratorRuntime = require('../../../../utils/runtime.js');
+
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    imgUrl: t.globalData.setting.imghost,
+    order_id: 0, //订单ID
+    order: null, //订单所有字段
+    user_addr: null, //会员地址
+    pickup: null,    //门店
+    goods: null,      //商品
+    /*------------------------*/
+    userinfo: null, //获取会员
+    /*----------物流选择--------*/
+    wu_arr: null,
+    index: 0,
+    is_express: 0,
+    //申请提现的金额
+    txmon: 0,
+    yuer: 0,
+    //判断页面是返回回来的还是 首次进入的
+    isclose: 1,
+
+    //配送方式 0=用户自选 1=自提 2=物流
+    distr_type: 0,
+    //实际配送方式 0物流  1自提
+    exp_type: 1,
+    //------物流费用------
+    exp_price: 0,
+    enterAddressPage: 0,  //进入地址页面
+    is_no_by: {},
+    allpice: 0,
+    show_pay_type: 0,
+
+    teamgroup: null,
+    submit:1, //默认按钮是灰色
+    show_submit:0, //不线上
+
+      dis_config: null,
+      bn_use_commission: 0, //是不是使用佣金
+
+      bn_is_order_yh:1,  //是不是订单优惠
+      bn_is_post_temp:1, //是不是进行计算包邮模板
+
+    paying:0,  //支付中
+    same_ok:1  //同城配送的控制
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+    //清空is_pick_up
+    getApp().request.put("/api/weshop/useraddress/updatePickUp", {
+      data: { user_id: getApp().globalData.user_id, is_pickup: 0 },
+      success: function (s) {
+      }
+    });
+
+    var th = this;
+    this.data.order_id = options.order_id;
+    //--初始化--
+    getApp().getConfig2(function (e) {
+      var json_d = JSON.parse(e.switch_list);
+
+      //测试强行写死，后面一定要删除
+      //json_d.pickupway=2;
+
+
+      th.data.json_d = json_d;
+      var is_default_logistics = json_d.is_default_logistics;
+      var is_same_city = json_d.is_same_city;
+      th.setData({ is_default_logistics: is_default_logistics,is_same_city:is_same_city });
+
+      th.get_wuliu(th.get_info(th.show_page));
+    }, 1)
+
+    //判断是不是佣金抵扣
+    getApp().is_distribut(this);
+
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+    ut.fy_back('',0);
+    this.data.paying=0;
+    util_pay.set_fir();
+    getApp().check_can_share();
+    var th = this;
+    if (th.data.isclose == 0) {
+      wx.navigateTo({
+        url: "/pages/index/index/index"
+      })
+    }
+    th.getuser_addr(function (addr) {
+      if (addr == null || addr == undefined || addr.length == 0) {
+        th.setData({ user_addr: null, enterAddressPage: 1,same_ok:1  });
+      } else {
+        th.setData({
+          user_addr: addr, enterAddressPage: 0,same_ok:1
+        });
+      }
+    })
+
+    //--更新默认地址--,看一下是不是跳到地址页面
+    // if (!getApp().globalData.is_cart_old) {
+    //   this.update_code();
+    // } else {
+    //   getApp().globalData.is_cart_old = 0;
+    // }
+
+  },
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {  getApp().globalData.no_clear=1 },
+  //---------------获取物流---------------
+  get_wuliu(func) {
+    var th = this,
+      to = getApp();
+    to.getwuliu(function (e) {
+      //如果第一个不是开启默认，说明要让用户自己选
+      if (!e[0].is_default) {
+        th.setData({ is_default_logistics: 0 });
+      }
+
+      th.setData({ wu_arr: e })
+      typeof func == "function" && func();
+    })
+  },
+  //------获取会员信息-----先获取用户信息，在进行下一步---
+  get_info: function (func) {
+    var user_id = t.globalData.user_id,
+      to = getApp();
+    to.auth.get_u(func);
+  },
+
+  //------获取会员收货地址-----
+  getuser_addr: function (func) {
+    var to = getApp(),
+      a = to.request;
+
+    a.get("/api/weshop/useraddress/page", {
+      data: {
+        user_id: to.globalData.user_id,
+        store_id: oo.stoid,
+        pageSize: 600
+      },
+      success: function (su) {
+        var user_addr = su.data.data.pageData;
+        var item = null;
+        var def_item = null;
+        for (var i = 0; i < user_addr.length; i++) {
+          if (user_addr[i]['is_default'] == 1) { def_item = user_addr[i]; }
+          if (user_addr[i]['is_pickup'] == 1) { item = user_addr[i]; }
+        }
+
+        if (item == null) item = def_item;
+        if (item == null) item = user_addr[0];
+        if (item == undefined) item = null;
+        func(item);
+      }
+    });
+
+  },
+
+  //----------------展示页面,是再获取用户信息之后--------------
+  show_page: function () {
+    var th = this,
+      to = getApp();
+    th.setData({
+      userinfo: to.globalData.userInfo,
+    });
+    //选获取地址
+    th.getuser_addr(function (addr) {
+
+      if (addr == null || addr == undefined || addr.length == 0) {
+        th.setData({
+          enterAddressPage: 1,
+        });
+
+      } else {
+        th.setData({
+          user_addr: addr, enterAddressPage: 0,
+        });
+      }
+      //获取立即购买的商品信息
+      th.get_buy_goods(th.data.order_id);
+    });
+    //获取提现金额
+    getApp().request.get("/api/weshop/withdrawals/summoney", {
+      data: {
+        user_id: to.globalData.user_id,
+        store_id: oo.stoid,
+        status: 0
+      },
+      success: function (su) {
+        console.log("withdrawals");
+        if (su.data.code == 0) {
+          var yuer = parseFloat(th.data.userinfo.user_money -
+            th.data.userinfo.frozen_money - su.data.data.summoney).toFixed(2);
+          th.setData({
+            txmon: su.data.data.summoney,
+            yuer: yuer
+          });
+        }
+      }
+    });
+  },
+
+  //-----获取商品------
+  async get_buy_goods(ord) {
+    var order = null,
+      order_goods = null,
+      goods = null,
+      pickup = null,
+      distr_type = 0,
+      exp_type = 0,
+      teamgroup = null,
+      teamlist=null,
+      th = this;
+
+    //---获取订单---
+    await getApp().request.promiseGet("/api/weshop/recharge/list", {
+      data:{store_id:oo.stoid,order_id: ord }
+    }).then(res => {
+       if(res.data.code==0 && res.data.data.length){
+         order = res.data.data[0];
+       }else{
+         wx.showToast({
+           title: "订单未找到",
+           icon: 'none',
+           duration: 2000
+         })
+       }
+    });
+
+    if(!order) return  false;
+
+    //---获取订单从表---
+    await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", {
+      data: {
+        store_id: oo.stoid,
+        order_id: ord
+      }
+    }).then(res => {
+       if(ut.ajax_ok(res)){
+         order_goods = res.data.data.pageData[0];
+       }
+    });
+
+    order.pt_listno=order_goods.pt_listno;
+    order.pt_status=order_goods.pt_status;
+    order.pt_prom_id=order_goods.prom_id;
+    order.pt_tail_money=order_goods.pt_tail_money;
+    order.tail_pay_type=order_goods.tail_pay_type;
+    order.pickup_id=order_goods.pickup_id;
+    order.order_amount=order.account;
+    order_goods.goods_num=order_goods.qty;
+
+    //---获取商品---
+    await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + order_goods.card_id, {}).then(res => {
+      goods = res.data.data;
+      order.show_img = oo.imghost + goods.img_url;
+    });
+    //---获取门店---
+    await getApp().request.promiseGet("/api/weshop/pickup/get/" + oo.stoid + "/" + order.pickup_id, {}).then(res => {
+      pickup = res.data.data;
+    });
+
+    //---获取尾款价格---
+    await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
+      data: { store_id: oo.stoid, team_id: order.pt_prom_id, listno: order.pt_listno }
+    }).then(res => {
+      teamgroup = res.data.data.pageData[0];
+    });
+
+    await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + order.pt_prom_id, {
+          data: { }
+      }).then(res => {
+          if(res.data.code==0) teamlist=res.data.data;
+      });
+
+
+    var act_set=null;
+    var url = '/api/weshop/activitylist/getActInfo1/'+os.stoid+'/6/'+order.pt_prom_id;
+    await getApp().promiseGet(url, {}).then(res => {
+          if(res.data.code==0){
+              act_set=res.data.data;
+          }
+      })
+
+
+      // if(act_set.is_order_yh){
+      //     th.data.bn_is_order_yh=1;
+      // }else{
+      //     th.data.bn_is_order_yh=0;
+      // }
+      th.data.bn_is_order_yh=0;
+      th.data.bn_is_post_temp=0;
+
+      // if(act_set.is_post_temp){
+      //     th.data.bn_is_post_temp=1;
+      // }else{
+      //     th.data.bn_is_post_temp=0;
+      // }
+
+      
+    var jsarr = JSON.parse(teamgroup.jt_json);
+    var count = teamgroup.jt_ct_num;
+    if(teamgroup.is_xuni_ct) count=teamlist.ct_num;
+
+    //要计算尾款的价钱
+    var price = 0;
+    jsarr.forEach(function (value, index) {
+      if (count >= value['rynum']) price = value['price'];
+    })
+    var tail_money = (price * order_goods.goods_num - order['order_amount']).toFixed(2);
+
+    tail_money = parseFloat(tail_money);
+    order.tail_money = tail_money;
+
+    if (!goods) return false;
+
+      if(goods.is_minishop==1 && getApp().is_sp_hao()){
+
+          if(goods.distr_type==1 || pickup.distr_type==1) {
+              wx.showToast({
+                  title: "视频号仅支持物流",
+                  icon: 'none',
+                  duration: 2000
+              })
+
+              setTimeout(function(){
+                  wx.navigateBack({delta: 1})
+              },1000)
+
+              return false
+          }
+
+          goods.distr_type=2;
+          th.setData({show_same_city:0})
+
+      }
+
+      //--判断物流--
+      if (goods.distr_type)
+        distr_type = goods.distr_type;
+      else
+        distr_type = pickup.distr_type;
+
+
+      //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
+      if(goods.is_same_city && th.data.is_same_city && goods.whsle_id<=0){
+         await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+order.pickup_id, {}).then(res=>{
+              if(res.data.code==0){
+                  var pk=res.data.data;
+                  if(pk && pk.is_same_city){
+                      th.setData({show_same_city:1})
+                  }
+              }
+          })
+      }
+
+      exp_type = 1;
+      order.order_goods = order_goods;
+
+      //-- 计算获得佣金的金额 --
+      if (getApp().globalData.userInfo.is_distribut
+          && th.data.dis_config && th.data.dis_config.is_yongjin_dk) {
+          var fir_num = 0;
+          var sec_num = 0;
+          var thi_num = 0;
+          if (th.data.dis_config.pattern == 1) {
+              fir_num = (teamlist.fir_rate || 0) * order_goods.goods_num;
+              sec_num = (teamlist.sec_rate || 0) * order_goods.goods_num;
+              thi_num = (teamlist.thi_rate || 0) * order_goods.goods_num;
+          } else {
+              fir_num = parseFloat((teamlist.commission || 0) * order_goods.goods_num * (th.data.dis_config.firstRate || 0) / 100).toFixed(2);
+              sec_num = parseFloat((teamlist.commission || 0) * order_goods.goods_num * (th.data.dis_config.secondRate || 0) / 100).toFixed(2);
+              thi_num = parseFloat((teamlist.commission || 0) * order_goods.goods_num * (th.data.dis_config.thirdRate || 0) / 100).toFixed(2);
+          }
+          var c_num = getApp().get_commission(fir_num, sec_num, thi_num, th);
+          goods.use_commission = parseFloat(c_num.toFixed(2));
+
+      }
+
+    this.setData({
+      order: order,
+      distr_type: distr_type,
+      pickup: pickup,
+      exp_type: exp_type,
+      goods: goods,
+      teamgroup: teamgroup,
+      teamlist: teamlist,
+    });
+
+    //--计算价格--
+    th.calculatePrice2();
+  },
+
+
+  calculatePrice2: async function () {
+    wx.showLoading();
+    var th = this;
+    th.setData({submit: 1})
+
+    var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.tail_money;
+    var o_condition = allpice;
+    var ord_prom=null;
+    var order_prom_amount=0;
+
+    if (th.data.bn_is_order_yh) {
+      await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
+        data: {store_id: os.stoid, orderAmount: o_condition, user_id: getApp().globalData.user_id}
+      }).then(res => {
+        if (res.data.code == 0) {
+          ord_prom = res.data.data;
+        }
+      })
+    }
+
+    th.data.ord_prom=ord_prom;
+
+    //--计算物流--
+    if (th.data.exp_type == 0) {
+      th.calculate_wuliu();
+      return false;
+    }else if(th.data.exp_type == 2){
+      th.calculate_same_city();
+      return false;
+    } else {
+
+      var order_prom_id=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 - order_m).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";
+      var order_prom_txt2 = "formData.order_prom_amount";
+      if (order_prom_id > 0) {
+        th.setData({[order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount})
+      } else {
+        th.setData({[order_prom_txt1]: 0, [order_prom_txt2]: 0})
+      }
+
+      if (th.data.bn_use_commission) {
+        allpice -= th.data.goods.use_commission;
+      }
+
+
+      allpice = allpice.toFixed(2);
+
+      th.setData({exp_price: 0, allpice: allpice, submit: 0, show_submit: 1})
+      wx.hideLoading();
+    }
+  },
+
+  //--图片失败，默认图片--
+  bind_bnerr: function (e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _errObj = {};
+    _errObj[_errImg] = this.data.imgUrl + "/miniapp/images/del/logo.jpg";
+    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+  },
+
+  //-------------------获取物流---------------
+  get_wuliu(func) {
+    var th = this, to = getApp();
+    to.getwuliu(function (e) {
+      th.setData({
+        wu_arr: e
+      })
+      typeof func == "function" && func();
+    })
+  },
+
+  //--------点击选择----------
+  set_wuliu: function (e) {
+    var type = e.currentTarget.dataset.type, th = this;
+    this.setData({
+      exp_type: type,same_ok:1
+    });
+    //--计算物流的值--
+    if (type == 0) {
+      th.calculate_wuliu();
+    } else if(type==1){
+      var allpice = parseFloat(th.data.order.order_amount)
+        + parseFloat(th.data.order.user_money)
+        + parseFloat(th.data.order.tail_money);
+      allpice = allpice.toFixed(2);
+      this.setData({
+        allpice: allpice, exp_price: 0,show_submit:1,submit:0
+      });
+    }else{
+        th.calculate_same_city();
+    }
+  },
+
+  //关闭支付
+  close_show_pay: function () {
+    this.setData({ show_pay_type: 0 });
+  },
+
+  //--弹起支付框--
+  to_pay() {
+    //如果有再计算价格的过程中，不能提交订单
+    if(this.data.submit){ return false}
+    if(!this.data.same_ok){ return false}
+    this.set_pay_type(1);
+  },
+
+  //选择支付方式,服务卡项固定微信支付
+  set_pay_type: function (e) {
+    if(this.data.paying) return false;
+    this.data.paying=1;
+    this.to_pay_type(0);
+  },
+
+  //--立即支付--
+  to_pay_type: function (ind) {
+    var th = this;
+
+
+    th.data.exp_type=parseInt(th.data.exp_type+'');
+    //---支付参数--
+    var dd = {
+      order_sn: th.data.order.order_sn,
+      order_id: th.data.order.order_id,
+      store_id: oo.stoid,
+      exp_type: th.data.exp_type,
+      user_id: t.globalData.user_id,
+      listno: th.data.order.pt_listno,
+      prom_id: th.data.order.pt_prom_id,
+      tail_pay_type: ind,//0微信支付 1余额支付
+    };
+
+    if(getApp().globalData.scene){
+      dd.scene=getApp().globalData.scene;
+    }
+
+    if(th.data.bn_use_commission){
+        dd.use_commission=th.data.goods.use_commission;
+    }
+
+    if(th.data.bn_use_commission){
+      dd.use_commission=th.data.goods.use_commission;
+    }
+
+    //--判断有没有优惠活动--
+    if (th.data.formData.order_prom_amount > 0) {
+      var order_prom_list = {};
+      order_prom_list.order_prom_id = th.data.formData.order_prom_id;
+      order_prom_list.order_prom_amount = th.data.formData.order_prom_amount;
+      dd.order_prom_list = order_prom_list;
+    }
+
+    var arr = [];
+    arr.push(dd);
+    console.log(JSON.stringify(arr));
+
+    wx.request({
+      url: oo.url + '/api/weshop/order/pay/payTuanWkCard',
+      data: JSON.stringify(arr),
+      method: 'POST',
+      header: {
+        'content-type': 'application/json'
+      },// 设置请求的 header
+      success: function (t) {
+
+        //---用微信支付---
+        if (dd.tail_pay_type == 0) {
+
+          if (t.data.code != 0) {
+              getApp().my_warnning(t.data.msg, 1, th);
+              th.data.paying=0;
+              return false;
+          }
+
+          util_pay.pay_data(t,function (){
+                var allmoney = th.data.allpice;
+                th.jumpPaymentPage(th.data.order.order_id, allmoney);
+          },function (){
+                th.data.paying=0;
+                //getApp().my_warnning("支付失败", 0, th);
+          })
+
+        } else {
+          if (t.data.code == 0) {
+            //---用余额支付---
+            // getApp().my_warnning("支付成功", 1, th);
+						wx.showToast({
+						  title: '支付成功',
+						  icon: 'success',
+						  duration: 2000
+						});
+            setTimeout(function () {
+              th.setData({ isclose: 0 });
+              th.data.paying=0;
+              wx.redirectTo({
+                url: "/pages/user/order_list/order_list?index=1"
+              })
+            }, 1000)
+          } else {
+
+             th.data.paying=0;
+             getApp().my_warnning(t.data.msg, 1, th);
+          }
+        }
+      }
+    });
+  },
+
+  //检查区域是不是包邮
+  check_area: function (arr) {
+    var user_addr = this.data.user_addr;
+    if (!user_addr) return 0;
+    for (var i in arr) {
+      var item = arr[i];
+      if (user_addr.twon == item || user_addr.district == item
+        || user_addr.city == item || user_addr.province == item) {
+        return 0;
+      }
+    }
+    return 1;
+  },
+
+  //检查立即购买的商品是不是不包邮
+  check_good: function (arr, goods_id) {
+    if (!goods_id) goods_id = this.data.goods.goods_id;
+    for (var i in arr) {
+      var item = arr[i];
+      if (goods_id == item) return 0;
+    }
+    return 1;
+  },
+  check_by_area: function (region_list) {
+    var arr = region_list.split(",");
+    var check = this.check_area(arr);
+    return !check;
+  },
+  check_by_goods: function (goods_list, goods_id) {
+    var arr = goods_list.split(",");
+    var check = this.check_good(arr, goods_id);
+    return !check;
+  },
+
+  //------------循环获取config-----------
+  get_wuliu_config: function (region_id, code, rs) {
+    var item = null, rslist = rs.pageData;
+    for (var i = 0; i < rslist.length; i++) {
+      if (rslist[i].code == code && rslist[i].region_id == region_id) { item = rslist[i]; }
+    }
+    return item;
+  },
+  //-------循环获取config,code default-------
+  get_wuliu_default: function (code, rs) {
+    var item = null, rslist = rs.pageData;
+    for (var i = 0; i < rslist.length; i++) {
+      if (rslist[i].shipping_code == code && rslist[i].is_default == 1) { item = rslist[i]; }
+    }
+    return item;
+  },
+
+
+  //------支付成功页面--------
+  jumpPaymentPage: function (order_id, order_amount) {
+    wx.setStorageSync("order:order_list:update", !0), wx.redirectTo({
+      url: "/pages/payment/pay_success/pay_success?order_id=" + order_id + "&type=1&card=1",
+    });
+  },
+
+  //------调起支付框--------
+  weixinPay: function (n, success, fail) {
+    if (!n) return false;
+    var th = this;
+
+      getApp().globalData.no_clear=1;
+
+    wx.requestPayment({
+      timeStamp: String(n.timeStamp),
+      nonceStr: n.nonceStr,
+      package: n.packageValue,
+      signType: n.signType,
+      paySign: n.paySign,
+      success: function (n) {
+        // console.log(n), getApp().showSuccess("支付成功！");
+				wx.showToast({
+				  title: '支付成功',
+				  icon: 'success',
+				  duration: 2000
+				});
+        "function" == typeof success && success();
+      },
+      fail: function (n) {
+        console.log(n), "requestPayment:fail" == n.errMsg ? getApp().my_warnning("支付失败", 0, th) : "requestPayment:fail cancel" == n.errMsg ? getApp().my_warnning("您已取消支付", 0, th) : getApp().my_warnning("支付失败：" + n.errMsg.substr("requestPayment:fail ".length), 0, th),
+          "function" == typeof fail && fail();
+      }
+    });
+  },
+
+
+  //使用
+  set_bn_commission:function(){
+      var th = this;
+      th.setData({bn_use_commission: !th.data.bn_use_commission});
+      th.calculatePrice2();
+  }
+
+})
\ No newline at end of file
diff --git a/packageA/pages/serviceCard_pd/cart_wk/cart_wk.json b/packageA/pages/serviceCard_pd/cart_wk/cart_wk.json
new file mode 100644
index 0000000..a3afde3
--- /dev/null
+++ b/packageA/pages/serviceCard_pd/cart_wk/cart_wk.json
@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "支付尾款",
+  "usingComponents": {
+    "warn": "/components/long_warn/long_warn"
+  }
+}
\ No newline at end of file
diff --git a/packageA/pages/serviceCard_pd/cart_wk/cart_wk.wxml b/packageA/pages/serviceCard_pd/cart_wk/cart_wk.wxml
new file mode 100644
index 0000000..64cb0b1
--- /dev/null
+++ b/packageA/pages/serviceCard_pd/cart_wk/cart_wk.wxml
@@ -0,0 +1,157 @@
+<wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
+
+<!--头部门店显示-->
+<view class='top bdr_t-14 flex'>
+	<image class="t_img" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'></image>
+  <view class='t_wz'>{{pickup.pickup_name}}</view>
+</view>
+
+<!--商品图片显示-->
+<view class='center'>
+  <view class='cen_img'>
+    <image src="{{order.show_img}}" binderror="bind_bnerr" data-errorimg="order.show_img"></image>
+  </view>
+
+	<view class="details-container">
+		<view class='cen_name ellipsis-3'>{{order.order_goods.service_name}}</view>
+		<view class="flex jc_sb">
+			<view class='cen_jg'>￥{{order.order_goods.price}}</view>
+			<view class='cen_sl'>x{{order.order_goods.qty}}</view>
+		</view>
+	</view>
+  
+</view>
+
+<view class="use-item bdr_b-14 jc_sb" wx:if='{{exp_type==0 && !is_default_logistics}}'>
+    <view>选择物流：</view>
+    <view class="flex-vertical"  bindtap="show_wu_arr"  data-txt='index' style="margin-right: 8rpx;">
+				<view class="logistics-name">{{wu_arr[index].name}}</view><view class="xc-right"></view>
+		</view>	
+</view>
+
+<!--成团人数-->
+<view class='chentuan bdr14'>
+  <view class='ct_one jc_sb'>
+    <view class='ct_one_left'>成团人数</view>
+    <view class='ct_one_right'>
+         <text wx:if="{{teamgroup.is_xuni_ct}}" class='redwz'>{{teamgroup.jt_ct_num}}</text>
+         <text wx:else class='redwz'>{{teamgroup.jt_ct_num}}</text>
+         人
+    </view>
+  </view>
+  <view class='ct_one jc_sb'>
+    <view class='ct_one_left'>成团金额</view>
+    <view class='ct_one_right'><text class='redwz'>￥{{filters.toFix(order.account+order.tail_money,2)}}</text></view>
+  </view>
+
+  <view class='ct_one jc_sb'>
+    <view class='ct_one_left'>支付定金</view>
+    <view class='ct_one_right'><text class='redwz'>￥{{filters.toFix(order.account,2)}}</text>
+    </view>
+  </view>
+</view>
+
+<!--尾款-->
+<view class='chentuan bdr14'>
+    <view class='ct_one jc_sb'>
+        <view class='ct_one_left'>尾款金额</view>
+        <view class='ct_one_right'>
+            <text class='redwz'>￥{{order.tail_money}}</text>
+        </view>
+    </view>
+    <view class='ct_one jc_sb' wx:if="{{exp_price>0}}">
+        <view class='ct_one_left'>配送费用</view>
+        <view class='ct_one_right'>
+            <text class='redwz'>￥{{exp_price}}</text>
+        </view>
+    </view>
+    <!-- 订单优惠优惠金额 -->
+    <view class="ct_one jc_sb" wx:if="{{formData.order_prom_amount>0}}">
+        <view>订单优惠</view>
+        <view class="co-red">- ￥ {{filters.toFix(formData.order_prom_amount, 2)}}</view>
+    </view>
+</view>
+
+
+<!-----使用佣金抵扣,只有佣金小于尾款金额的时候------>
+<view class="set-mes mgt20" wx:if="{{goods.use_commission>0 && can_commission && goods.use_commission<order.tail_money+exp_price}}">
+    <view class="use-item" bindtap='set_bn_commission'>
+        <icon  color="{{bn_use_commission?'red':'gray'}}" size="16" type="success"></icon>
+        <view class="yu_er">使用佣金 :￥{{goods.use_commission}} </view>
+    </view>
+</view>
+
+<view style="height:100rpx"></view>
+
+
+<!--支付-->
+<view class='zf shadow'>
+  <!-- <view class='zf_left'>
+    <text class='zf_left_wz'>支付合计：</text>
+    <text class='zf_left_red'>¥{{filters.toFix(order.tail_money+exp_price,2)}}</text>
+  </view> -->
+	<view class='zf_left'>支付合计：<text class='zf_left_red'>¥{{filters.toFix(order.tail_money+exp_price-(bn_use_commission?goods.use_commission:0)-formData.order_prom_amount ,2)}}</text></view>
+  <view class="zf_btn {{(submit || !same_ok)?'gray':''}}" bindtap="to_pay">支付尾款</view>
+</view>
+
+
+<!--支付的方式选择，0微信支付  1余额支付-->
+<block wx:if="{{show_pay_type}}">
+   <view class="cover-layer" bindtap="close_show_pay"></view>
+	 <view class="pay_type_view">
+		  <view class="title">请选择支付方式</view>
+			<view class="anniu_view">
+				   <view bindtap="set_pay_type" data-type="0" >微信支付</view>
+					 <view bindtap="set_pay_type" data-type="1" >余额支付</view>
+			</view>
+	 </view>
+</block>
+
+<warn id="warn"></warn>
+
+<!----弹起选择物流名的列表---->
+<view wx:if='{{open_express==1}}' >
+    <view class="cover-layer flex-center "  bindtap='close_express'>
+    </view>
+
+    <view class="cx-popup radius {{open_express==1?'up' : 'down'}}" >
+        <view class="tops flex">
+            <view class="top-content fs32">
+                <view>
+                    选择物流名字
+                </view>
+            </view>
+            <view class="close-frame"  bindtap='close_express' >
+                <view class="xc-close-express">×</view>
+            </view>
+        </view>
+        <view class="express_list">
+            <view  wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
+                <view class="express_list_frame" bindtap="click_express_name"
+                      data-shippingcode="{{express_list.shipping_code}}"
+                      data-name="{{express_list.name}}" data-idxe="{{idx}}">
+
+                    <block wx:if="{{is_express==idx}}">
+                        <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view>
+                    </block>
+                    <block wx:else>
+                        <view class="circle  xc-hooks"></view>
+                    </block>
+                    <view class="fs30">{{express_list.name}}</view>
+
+                </view>
+            </view>
+        </view>
+        <view class="flex click-buttem" >
+            <view class="xc-determine flex-center" bindtap="determine_expres">
+                <view class="flex-vertical  t-c">确定</view>
+            </view>
+            <view class="xc-confirms flex-center" bindtap="select_default_logistics">
+                <view class="flex-vertical  t-c">设为默认</view>
+            </view>
+        </view>
+
+    </view >
+</view>
+<view style="height: 50rpx"></view>
+
diff --git a/packageA/pages/serviceCard_pd/cart_wk/cart_wk.wxss b/packageA/pages/serviceCard_pd/cart_wk/cart_wk.wxss
new file mode 100644
index 0000000..bd6b927
--- /dev/null
+++ b/packageA/pages/serviceCard_pd/cart_wk/cart_wk.wxss
@@ -0,0 +1,517 @@
+page{ color: #333;}
+.bdr_t-14 {
+	border-top-left-radius: 14rpx;
+	border-top-right-radius: 14rpx;
+}
+.bdr_b-14 {
+	border-bottom-left-radius: 14rpx;
+	border-bottom-right-radius: 14rpx;
+}
+.bdr14 {
+	border-radius: 14rpx;
+}
+.mgt20 {
+	margin-top: 20rpx;
+}
+.shadow {
+	box-shadow: 0 4rpx 12px #e7e9eb;
+}
+.shadow-1 {
+	box-shadow: 16rpx 0px 12px #e7e9eb;
+}
+
+page {
+	background-color: #F0F0F0;
+	padding: 0 22rpx;
+	box-sizing: border-box;
+}
+
+.user-mes {
+    position: relative;
+    background-color: #fff;
+    font-size: 32rpx;
+    color: #444;
+		/* margin-top: 28rpx; */
+		border-radius: 14rpx;
+}
+.user-contact {
+    padding: 24rpx 26rpx;
+    font-weight: 600; 
+}
+ 
+.location {
+    position: relative;
+    padding: 0 70rpx 24rpx;
+}
+
+.pos-icon {
+    position: absolute;
+    left: 28rpx;
+    top: 6rpx;
+    width: 30rpx;
+    height: 36rpx;
+}
+
+.border-img {
+  width: 100%;
+  height: 16rpx;
+}
+
+.update-logistics {
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 80rpx;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.arrow-rigth {
+  width: 32rpx;
+  height: 32rpx;
+}
+
+.order-meg {
+  margin-bottom: 20rpx;
+  font-size: 28rpx;
+
+}
+
+.order-detail {
+  padding: 30rpx 0;
+  border-bottom: 1px solid #ddd;
+  color: #777;
+  min-height: 100rpx;
+  background-color: #fff;
+
+}
+
+.top {
+	background-color: white;
+	height: 40px;
+	display: flex;
+	padding: 0 26rpx;
+	/* border-bottom: 2rpx solid rgb(238, 238, 238); */
+	margin-top: 20rpx;
+	align-items: center;
+}
+
+.t_img {
+	display: block;
+  width: 50rpx;
+  height: 50rpx;
+	margin-left:-6rpx;
+}
+
+.t_wz {
+  font-size: 30rpx;
+  /* font-weight: bold; */
+  color: rgb(0, 0, 0);
+  line-height: 65rpx;
+  /* margin-left: 18rpx; */
+}
+
+.center {
+	box-sizing: border-box;
+  background-color: white;
+  width: 100%;
+  min-height: 80rpx;
+  display: flex;
+  padding: 24rpx 26rpx;
+  border-bottom: 2rpx solid #eee;
+}
+
+.center .cen_img {
+  width: 200rpx;
+  height: 200rpx;
+	border-radius: 14rpx;
+	overflow: hidden;
+	flex-shrink: 0;
+}
+
+.center .cen_img image {
+	display: block;
+  width: 100%;
+  height: 100%;
+}
+
+.details-container {
+	display: flex;
+	padding-left:20rpx;
+	flex:1;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+.center .cen_name {
+  height: 120rpx;
+  font-size: 30rpx;
+}
+
+.center .cen_jg {
+  color: #c4182e;
+  font-size: 32rpx;
+  width: 200rpx;
+  height: 40rpx;
+}
+
+.center .cen_jg .cen_sl {
+  color: black;
+  font-size: 26rpx;
+  width: 200rpx;
+  height: 38rpx;
+}
+
+.quhou {
+	box-sizing: border-box;
+  background-color: white;
+  border-bottom: 2rpx solid #eee;
+  font-size: 28rpx;
+  height: 92rpx;
+  display: flex;
+	align-items: center;
+	padding: 0 26rpx;
+}
+
+.quhou .qu_fs {
+  font-size: 30rpx;
+  display: flex;
+  height: 60rpx;
+  /* margin-left: 25rpx; */
+  line-height: 62rpx;
+	margin-right: 20rpx;
+}
+
+.quhou .qu_fs image {
+  width: 34rpx;
+  height: 34rpx;
+  margin-right: 18rpx;
+  vertical-align: center;
+  position: relative;
+  top:14rpx
+}
+
+.quhou .qu_fs .qu_wz {}
+
+.chentuan {
+	box-sizing: border-box;
+  width: 100%;
+  min-height: 90rpx;
+  background-color: white;
+  padding: 20rpx 26rpx;
+  margin-top: 20rpx;
+  font-size: 28rpx;
+}
+
+.chentuan .ct_one {
+  /* height: 40rpx; */
+  /* margin-bottom: 10rpx; */
+  display: flex;
+	line-height: 60rpx;
+	font-size: 30rpx;
+  /* width: 708rpx; */
+}
+
+.chentuan .ct_one .ct_one_left {
+  /* margin-left: 10rpx; */
+}
+
+.chentuan .ct_one .ct_one_right {
+  text-align: right;
+  width: 200rpx;
+}
+
+.redwz {
+  color: #c4182e;
+}
+
+.zf {
+  /* background-color: white;
+  width: 100%;
+  min-height: 80rpx;
+  line-height: 80rpx;
+  font-size: 30rpx;
+  position: fixed;
+  bottom: 0;
+  text-align: right; */
+	
+	height: 94rpx;
+	box-sizing: border-box;
+	display: flex;
+	justify-content: space-between;
+	background-color: white;
+	align-items: center;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	padding: 0 30rpx;
+}
+
+.zf view{
+  display: inline-block;
+}
+
+.zf .zf_left {
+  text-align: right;
+  margin-right: 20rpx;
+}
+
+.zf_btn {
+  /* color: white;
+  background-color: #c4182e;
+  font-size: 28rpx;
+  width: 170rpx;
+  text-align: center;
+  line-height: 80rpx; */
+	/* float: right;
+	width: 200rpx;
+	height: 100rpx;
+	line-height: 100rpx;
+	text-align: center;
+	font-size: 30rpx;
+	color: #fff;
+	background-color: #f23030; */
+	color: white;
+	background-color: #FE4445;
+	height: 72rpx;
+	line-height: 72rpx;
+	padding: 0 42rpx;
+	border-radius: 36rpx;
+	margin-left: 0;
+	margin-right: 0;
+}
+
+.zf .zf_left .zf_left_red {
+  color: #c4182e;
+}
+
+.zf_btn.gray{
+    background-color:darkgrey;
+}
+
+    /*----------nyf新增，地址---------*/
+.add_new{
+	box-sizing: border-box;
+	height: 92rpx;
+	padding: 0 26rpx;
+	display: flex;
+	align-items: center;
+	/* line-height: 60rpx; */
+}
+.addr_jia{
+	width: 45rpx; 
+	height: 45rpx; 
+	border: 1rpx solid #ddd;
+  margin-right: 15rpx; 
+	/* margin-left: 20rpx; */
+	vertical-align: middle;
+}
+.yu_er{margin-left: 15rpx;} .wuliu{margin-left: 20rpx;}
+
+
+.use-item{
+  display: flex;
+  align-items: center;
+  height: 92rpx;
+  /* border-bottom: 1px solid #ddd; */
+  font-size: 30rpx;
+  padding:0 26rpx;
+  background: #fff;
+}
+.use-item>view{
+  display: flex;margin-right: 20rpx;
+}
+.use-item.bfff{ background-color: #fff;}
+.use-item .dp{width: 56rpx; height: 56rpx;}
+
+.pay_type_view{width: 500rpx;height: 220rpx; position: fixed; background: #fff;z-index: 12;
+ left: 50%; margin-left: -250rpx; top: 50%; margin-top: -110rpx; text-align: center; border-radius: 12rpx;}
+ .pay_type_view .title{ height:100rpx; line-height: 100rpx; border-bottom: 1rpx solid #ededed;}
+.anniu_view{display: flex;height: 120rpx; line-height: 120rpx;}
+.anniu_view>view{width: 50%; border-right:1rpx solid #ededed;}
+
+
+.tab-container {
+	font-size: 28rpx;
+	margin-top: 20rpx;
+	display: flex;
+}
+
+.tab-wrapper {
+	background-color: #ccc;
+	display: flex;
+	border-radius: 40rpx;
+	overflow: hidden;
+}
+
+.tab {
+	padding: 20rpx 30rpx;
+	
+}
+
+
+.tab.active {
+	background-color: white;
+	border-radius: 40rpx;
+}
+
+.xc-right{
+    width:20rpx;
+    height:20rpx;
+    border-top:2rpx solid #666;
+    border-right:2rpx solid #666;
+    transform:rotate(45deg);
+    display:inline-block;
+}
+
+
+/* 自定义弹出窗口 */
+.cx-popup{
+    width:100%;
+    height:880rpx;
+    background: #fff;
+    z-index: 35;
+    border-top-left-radius: 20rpx;
+    border-top-right-radius: 20rpx;
+    position:fixed;
+    bottom:0;
+		left: 0;
+    /* padding-bottom: 25rpx; */
+}
+
+.cx-popup .top{
+    width:95%;
+    height:100rpx;
+    border-bottom:3rpx solid #ddd;
+    margin: auto;
+ margin-top: 30rpx;
+
+}
+.xc-top-content{
+    width: 93%;
+    height:85rpx;
+    padding-top: 30rpx;
+    font-size: 34rpx;
+    font-weight: 600;
+
+}
+
+.xc-close{
+   width: 37rpx;
+height: 37rpx;
+border-radius: 50%;
+border: 3rpx solid #333;
+text-align: center;
+line-height: 34rpx;
+font-size: 29rpx;
+color: #333;
+
+}
+
+.xc-confirm {
+   width: 50%;
+   border-radius: 50rpx;
+   height: 80rpx;
+    margin:0 auto;
+    background:#d60021;
+    color:#fff;
+    font-size:28rpx;
+    margin-top: 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); } }
+
+
+.xc-close-express{
+   width: 40rpx;
+height: 40rpx;
+border-radius: 50%;
+border: 3rpx solid #333;
+text-align: center;
+font-size:32rpx;
+line-height: 38rpx;
+color: #333;
+margin-top: 5rpx;
+}
+.cx-popup .tops{
+  width: 100%;
+height: 145rpx;
+border-bottom: 3rpx solid #eee;
+
+}
+.top-content {
+  width: 82%;
+padding-top: 33px;
+height: 100%;
+padding-left: 40rpx;
+}
+.close-frame{
+  margin-top: 30rpx;
+
+}
+
+.xc-hook {
+width: 33rpx;
+height: 33rpx;
+transform: rotate(-135deg);
+line-height: 35rpx;
+text-align: center;
+margin-right: 20rpx
+
+
+}
+.xc-hooks {
+width: 30rpx;
+height: 30rpx;
+border: 1rpx solid #999;
+margin-right: 20rpx;
+}
+.express_list_frame{
+  display: flex;
+height: 80rpx;
+align-items: center;
+padding-left: 40rpx;
+border-bottom: 1rpx solid #eee;
+
+}
+.express_list{
+  width: 100%;
+  height: 65%;
+  overflow-y: auto;
+  margin-bottom: 40rpx;
+  
+}
+.xc-confirms {
+	box-sizing: border-box;
+  width: 40%;
+  border-radius: 50rpx;
+  height: 80rpx;
+  margin:0 auto;
+  font-size:28rpx;
+  background: #fff;
+  color: #333;
+  border: 2rpx solid #333;
+}
+
+.determine-frame{
+  width: 100%;
+  height: 130rpx;
+  
+}
+.xc-determine{
+  height: 80rpx;
+  width: 40%;
+  border-radius: 50rpx;
+background: #d60021;
+color: #fff;
+font-size: 28rpx;
+margin: 0 auto;
+
+}
+
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml b/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
index 96f4d63..56239d8 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
+++ b/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
@@ -5,18 +5,13 @@
 
       <!-- 商品名称 -->
       <view class="spec-goods">
-        <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
+          <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-1">{{sele_g.goods_name}}</view>
-          <view class="flex ai_end xc-val-money {{sele_g[card_field]}}" >
+          <view class="spec-goods-name ellipsis-1">{{sele_g.serviceName}}</view>
+          <view class="flex ai_end xc-val-money" >
             <view class="spec-goods-price" wx:if="{{is_normal==1}}" >
-			                 <!-- 如果是等级会员，且有等级价 -->
-			     			  <block wx:if="{{card_field && sele_g[card_field]>0}}">
-			     			    ￥ {{sele_g[card_field]}}
-			     			  </block> 		 
-			     			  <block wx:else>
-			     			    ￥ {{sele_g.shop_price}} 
-			     			  </block>	 
+			  ￥ {{sele_g.money}}
 			</view>
             <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view>
           </view>
@@ -24,11 +19,7 @@
           <block wx:if="{{is_normal==1}}">
             <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>    
+              <block><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>
             </view>
           </block>
           <block wx:if="{{is_normal==0}}">
@@ -47,10 +38,9 @@
       <view style="margin-top: 20rpx">
         <view  class="flex-space-between address ai_end xc-width ">
 
-          <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-            <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-			
-			
+          <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name {{def_pick_store.distance!=null?'max':''}} ">{{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"}}
 
@@ -63,11 +53,11 @@
             <view class="fs28 xc-ash-9f">选择门店</view>
           </view>
 
-          <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></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 class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
 		<view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
-        <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view>
+        <view class="fs24 xc-ash-9f xc-distance-top" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view>
       </view>
       <!----商品的属性项目---->
      <view> 
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/filter.wxs b/packageA/pages/serviceCard_pd/goodsInfo/filter.wxs
index 1b916fc..a0a8bfb 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/filter.wxs
+++ b/packageA/pages/serviceCard_pd/goodsInfo/filter.wxs
@@ -20,8 +20,19 @@ function act_type(ty){
    }
 }
 
+//拿来判断是不是在指定门店内
+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,
-  act_type:act_type
+  act_type:act_type,
+  is_no_dis:is_no_dis
 }
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
index d8f204d..ee2c404 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
@@ -3,4270 +3,3350 @@ var ut = require("../../../../utils/util.js"),
     e = require("../../../../utils/common.js"),
     oo = getApp().globalData,
     os = oo.setting;
+var s=getApp();
 //评价加载更多
-var more = function(e) {
-      return e && e.__esModule ? e : {
-        default: e
-      };
+var more = function (e) {
+        return e && e.__esModule ? e : {
+                default: e
+            };
     }(require("../../../../utils/LoadMore.js")),
     n = new more.default();
 var regeneratorRuntime = require('../../../../utils/runtime.js');
 
 Page({
-  data: {
-    start_stop: 2, //秒杀开始 结束 的控制(1正在进行，2即将开始)
-    color_type: 0, //线条控制
-    color_type_one: 0,
-    color_type_two: 1,
-    gid: "",
-    stoid: os.stoid,
-    url: os.url,
-    resourceUrl: os.h5_url,  //公众号那边的图片文件域名
-    iurl: os.imghost,
-
-    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
+    data: {
+        start_stop: 2, //秒杀开始 结束 的控制(1正在进行，2即将开始)
+        color_type: 0, //线条控制
+        color_type_one: 0,
+        color_type_two: 1,
+        gid: "",
+        stoid: os.stoid,
+        url: os.url,
+        resourceUrl: os.h5_url,  //公众号那边的图片文件域名
+        iurl: os.imghost,
+
+        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,     //是不是处理
+        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, //控制客服操作菜单显示和控制
+        user_order_pt_state: 0,
+
+        is_retail_price: 0,
     },
 
-  
-    //门店相关
-    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,
-  },
-
-  //------初始化加载----------
-  onLoad: function(t) {
-		self = this;
-		this.setData({ options: t,});
- 
-    var ee = this,
-        that = ee,
-        th = ee,
-        gid = t.goods_id,
-        first_leader=t.first_leader;
-	
-	
-	//-- 自定义海报 --
-	// 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})												
-	// 		}			
-	// 	}
-	// })	
-			
-				
-    //---获取手机地址坐标--
-    //--如果tg_id是空的话，分享回来--
-    if (gid == undefined || gid == null || gid == "") {
-      var gid_str = decodeURIComponent(t.scene);
-      gid_str=gid_str.split("_");
-      gid=gid_str[0];
-      if(gid_str.length>1){
-        first_leader=gid_str[1];
-      }	  
-      //-- 如果有room_id的获取 --
-      if(gid_str.length>2 && gid_str[2]) {
-          room_id=gid_str[2];
-          room_user_share=1;
-      };
-    };
-		
-    ee.setData({ gid: gid});
-		
-    if(first_leader) { 	
-      getApp().globalData.first_leader=first_leader;
-      //调用接口判断是不是会员
-      getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
-        if(res.data.code==0) {
-          getApp().globalData.guide_id=res.data.data.id;
-        }
-      })
-    }
-		
-    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
-        });
-      }
-
-      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");
-    
-      th.requestCardNum(), wx.pageScrollTo && th.setData({
-        supportPageScroll: !0
-      });
-
-    
-    }, 1);
-
-    //获取用户设备信息，屏幕宽度
-    wx.getSystemInfo({
-      success: res => {
-        that.setData({
-          screenWidth: res.screenWidth
+    //------初始化加载----------
+    onLoad: function (t) {
+        self = this;
+        this.setData({options: t,});
+
+        var ee = this, that = ee, th = ee,
+            gid = t.goods_id,
+            first_leader = t.first_leader;
+
+        //-- 自定义海报 --
+        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})
+        		}
+        	}
         })
-      }
-    });
-	
-    //获取用户的默认门店
-    getApp().get_user_store(function(e) { 
-			if(!e) {
-        th.data.fir_def_store={}; //赋值空对象
-        return false;
-      }
-      var ee=JSON.parse(JSON.stringify(e));
-      //--定时器推迟一下--
-      setTimeout(function () {
-        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;
+
+        var room_id=0;
+        var room_user_share=0;
+
+        //---获取手机地址坐标--
+        //--如果tg_id是空的话，分享回来--
+        if (gid == undefined || gid == null || gid == "") {
+            var gid_str = decodeURIComponent(t.scene);
+            gid_str = gid_str.split("_");
+            gid = gid_str[0];
+            if (gid_str.length > 1) {
+                first_leader = gid_str[1];
+            }
+            //-- 如果有room_id的获取 --
+            if (gid_str.length > 2 && gid_str[2]) {
+                room_id = gid_str[2];
+                room_user_share = 1;
+            }
         }
 
-        var appd=getApp().globalData;
-        var w_time = setInterval(function() {
-          if (that.data.is_get_local_ok == 0) return false;
-          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;
-                    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,
-                    })
-                  }
+        //-- 如果有房间号 --
+        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;
+        }
 
+
+
+        ee.setData({gid: gid});
+
+        if (first_leader) {
+            getApp().globalData.first_leader = first_leader;
+            //调用接口判断是不是会员
+            getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+                if (res.data.code == 0) {
+                    getApp().globalData.guide_id = res.data.data.id;
+                    getApp().globalData.guide_pick_id= res.data.data.pickup_id
                 }
-              })
+            })
+        }
+
+        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
+                });
+            }
+
+            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,
+                is_retail_price: json_d.is_retail_price || 0,
+            });
+
+            ee.init(gid);
+
+            //------几人评价------
+            //n.init(th, "", "comments");
+            wx.pageScrollTo && th.setData({
+                supportPageScroll: !0
+            });
+
+
+        }, 1);
+
+        //获取用户设备信息，屏幕宽度
+        wx.getSystemInfo({
+            success: res => {
+                that.setData({
+                    screenWidth: res.screenWidth
+                })
             }
+        });
 
-            //e.distance = distance;
-            appd.lat=that.data.lat;
-            appd.lon=that.data.lon;
-
-          } else {
-            if (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,
-              })
+        //获取用户的默认门店
+        getApp().get_user_store(function (e) {
+            if (!e) {
+                th.data.fir_def_store = {}; //赋值空对象
+                return false;
             }
-          }
-        }, 500)
-      },700)
-
-    });
-	 
-  
-	},
-	
-	
-	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/goodsimages/page", {
-    //   data: {
-    //     store_id: os.stoid,
-    //     goods_id: gid,
-    //   },
-    // }).then(res => {
-
-    //   var t = res;
-    //   var g = t.data.data.pageData;
-    //   if (g.length == 0) {
-    //     var ie = {
-    //       "image_url": o.imghost + "/public/images/default_goods_image_240.gif"
-    //     };
-    //     g.push(ie);
-    //     gallery = g;
-    //     return;
-    //   }
-    //   for (var i = 0; i < g.length; i++) {
-    //     if (g[i].image_url.indexOf(o.imghost) == -1)
-    //       g[i].image_url = o.imghost + g[i].image_url;
-    //   }
-    //   gallery = g;
-    // })
-		
-		
-		// ----> 秒杀
-		let prom_type = this.data.options.prom_type;
-		
-		let goods_id = this.data.options.goods_id;
-		if(!goods_id) goods_id = this.data.data.goods_id;
-	
-		if(prom_type) { // 进入商品详情页地址传参有带goods_id、prom_type、prom_id参数, 即从秒杀入口进入
-			let prom_id = this.data.options.prom_id;
-			// 检查活动是否开始
-			this.check_prom(goods_id, prom_type, prom_id);
-			
-		} else { // 从非秒杀入口进入,地址不带prom_type、prom_id参数
-			getApp().request.promiseGet('/api/weshop/activitylist/listGoodActInfo2', {
-				data: {
-					store_id: os.stoid,
-					goods_id: goods_id,
-					goods_type: 1,
-					user_id: oo.user_id,
-				}
-			}).then(res => {
-				if (res.data.code == 0) {
-					let result = res.data.data;
-					let resLength = result.length;					
-					if(resLength == 1) { // 如果数组长度为1，则直接显示当前活动
-						let goods_id = this.data.options.goods_id;
-						let prom_type = result[0].prom_type;
-						let prom_id = result[0].act_id;
-						this.setData({
-							'options.prom_type': prom_type,
-							'options.prom_id': prom_id,
-						});
-						// 检查活动是否开始
-						this.check_prom(goods_id, prom_type, prom_id);
-					} else if(resLength > 1) { //如果数组长度大于1，表示当前商品参加多个活动，以列表形式显示多活动
-						this.setData({
-							actList: res.data.data,
-						});
-					};
-										
-				};
-			});
-		};
-		// <---- 秒杀
-		
-		
-
-		
-		
-		
-		
-
-		
-		
-    //------是否收藏----------
-    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.getTaohe();
-      
-    //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,
-    });
-
-  },
-
-  //---展示---
-	// gid 在onload阶段已经保存在this.data中
-  onShow: function() {
-
-    getApp().check_can_share();
-    var that=this;
-    var ee = this,gid = this.data.gid, i = getApp().request;
-    this.data.is_timer = 1;
-    this.wait_for_store_config();
-		
-
-		
-
-    i.get("/api/weshop/serviceCard/get/" + os.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,
-					});
-								
-					// console.log('0xxxxx999999', t.data.data);
-					//-----商品详情---
-					if(!t.data.data.serviceContent) t.data.data.serviceContent="  ";
-					a.wxParse("content", "html", t.data.data.serviceContent, ee, 6);
-					e.wxParseAddFullImageUrl(ee, "content");
-														
-					//获取重表
-				    getApp().promiseGet("/api/weshop/serviceItem/list",{
-						data:{store_id:os.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();
-						}
-					});
-				};
-			}
-    });
-		
-				
-		
-    this.data.enterAddressPage && (this.data.enterAddressPage = !1);
-		this.get_sto();
-
-
-		
-  },
-	
-  enterAddress: function() {
-    this.data.enterAddressPage = !0, wx.navigateTo({
-      url: "/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();
-  },
-	
-  // tabClick2: function(t) {
-  //   this.setData({
-  //     activeCategoryId2: t.currentTarget.id
-  //   });
-  // },
-
-  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();
-    }
-  },
-
-  // doScrollTop: function() {
-  //   wx.pageScrollTo({
-  //     scrollTop: 0
-  //   });
-  // },
-
-  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(!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;
-		
-		// 秒杀活动
-		if(this.data.prom_type == 1) {
-			// 如果是秒杀活动下的单独购买，is_normal为1
-			if(this.data.openSpecModal_flash_normal) this.data.is_normal = 1;
-			
-			if(!this.data.is_normal) {// 秒杀购买
-			
-				// 获取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,
-						});
-						// wx.showModal({
-						// 	title: '超出活动库存',
-						// });
-						getApp().my_warnning('超出活动库存', 0, self);
-						return false;
-					} 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; // 限购数量a
-							let promcardbuynum = data.data.data.promcardbuynum;
-							let buyedNum = promcardbuynum; // 自己已经购买的数量b
-							let canBuyNum = limited - buyedNum; // 自己还可购买的数量c
-							limitNum = limited;
-							boughtNum = buyedNum;
-
-							if(canBuyNum <= 0) {
-								canBuyNum = 0;
-							};
-							
-							if(canBuyNum > res) {
-								if(curNum > res) { // t当前增减的数量
-									// wx.showModal({
-									// 	title: '超出活动库存',
-									// });
-									getApp().my_warnning('超出活动库存', 0, self);
-									th.setData({
-										goodsInputNum: res,
-									});
-									return false;
-								};
-							};
-							
-							if(canBuyNum <= res) {
-								if(curNum > canBuyNum) {
-									// wx.showModal({
-									// 	title: '超出限购数量',
-									// });
-									getApp().my_warnning('超出限购数量', 0, self);
-									th.setData({
-										goodsInputNum: canBuyNum,
-									});
-									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(this.data.prom_type && this.data.prom_type == 1) {
-			newd['prom_type'] = this.data.prom_type;
-			newd['prom_id'] = this.data.prom_id;
-			newd['prom_price'] = this.data.prom_price;
-		};
-		
-		if(this.data.prom_type == 1 && this.data.openSpecModal_flash_normal) {
-			newd['prom_type'] = 0;
-			newd['prom_price'] = this.data.data.shop_price;
-		};
-		
-		// console.log('newd++++++++', newd);
-		th.buyNow(newd);
-	} else {
-				
-        var newd = {
-            service_id: th.data.data.id,
-            service_sn:th.data.data.service_sn,
-            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(th.data.options.prom_type == 1) {
-					newd['prom_type'] = th.data.options.prom_type;
-					newd['prom_id'] = th.data.options.prom_id;
-					if(th.data.openSpecModal_flash_normal) {
-						newd['money'] = th.data.data.shop_price;
-						newd['is_pd_normal'] = 1;
-					} else {
-						newd['money'] = th.data.prom_price;
-					};
-				};
-				
-
-        //----先看会员在购物车中是否加入了该商品-----
-        getApp().request.get("/api/weshop/cartService/page", {
+            if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
+            var ee = JSON.parse(JSON.stringify(e));
+            //--定时器推迟一下--
+            setTimeout(function () {
+                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;
+                }
+
+                var appd = getApp().globalData;
+                var w_time = setInterval(function () {
+                    if (that.data.is_get_local_ok == 0) return false;
+                    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;
+                                        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) {
+                            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,
+                            })
+                        }
+                    }
+                }, 500)
+            }, 700)
+
+        });
+
+
+    },
+
+
+    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;
+
+
+
+        let goods_id = this.data.options.goods_id;
+        if (!goods_id) goods_id = this.data.data.goods_id;
+
+        //------是否收藏----------
+        await getApp().request.promiseGet("/api/weshop/goodscollect/page", {
             data: {
                 store_id: os.stoid,
+                goods_id: gid,
                 user_id: oo.user_id,
-                service_id: th.data.data.id,
+            }
+        }).then(res => {
+            var t = res;
+            var data = t.data.data.pageData;
+            if (data && data.length > 0) {
+                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
             },
-            success: function(re) {
-								//-------如果购物车中有相关的数据---------
-                if (re.data.data.total > 0) {
-									var item = null;
-									// 多门店问题
-									var cartGoodsNum = 0;
-									const tmpObj = re.data.data.pageData;
-									for (let i = 0; i < tmpObj.length; i++) {
-										if (th.data.sto_sele_id != tmpObj[i].pick_id) {
-												cartGoodsNum += parseInt(tmpObj[i].goods_num);
-										} else {
-											item = tmpObj[i];
-										}
-									}
-									// 当前门店同类商品还没加入到购物车 但是有其他门店的同类商品
-									if (th.data.prom_type == 1 && !th.data.is_normal && !item) {
-
-											// 秒杀购物车购买 修正数量
-											var snum = limitNum - boughtNum;
-											if (snum <= 0) {
-												// wx.showModal({
-												// 	title: '超出限购数量',
-												// });
-												getApp().my_warnning('超出限购数量', 0, self);
-												return false;
-											}
-
-											var cSnum = snum- cartGoodsNum <= 0 ? 0 : snum- cartGoodsNum;
-											var cRedisNums = redisNums- cartGoodsNum <= 0 ? 0 : redisNums- cartGoodsNum;
-
-											if (newd['goods_num'] >= redisNums){
-												if (redisNums > snum) {
-													newd['goods_num'] = cSnum;
-												} else {
-													newd['goods_num'] = cRedisNums;
-												}
-											} else {
-												if (newd['goods_num'] > snum) newd['goods_num'] = cSnum;
-											}
-
-											if (newd['goods_num'] <= 0) {
-												getApp().my_warnning('加入购物车成功', 1, th, 450);
-												th.closeSpecModal();
-												return false;
-											}
-											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();
-												}
-										});
-										return false;
-									} 
-									
-									// 以下为当前门店同类商品已经加入到购物车
-										var totalNum = th.data.goodsInputNum + item.goods_num;
-
-										// 秒杀购物车购买 修正数量
-										if (th.data.prom_type == 1 && !th.data.is_normal) {
-											var snum = limitNum - boughtNum;
-											if (snum <= 0) {
-												// wx.showModal({
-												// 	title: '超出限购数量',
-												// });
-												getApp().my_warnning('超出限购数量', 0, self);
-												return false;
-											}
-											if (totalNum >= redisNums){
-												if (redisNums > snum) {
-													totalNum = snum- cartGoodsNum;
-												} else {
-													totalNum = redisNums- cartGoodsNum;
-												}
-											} else {
-												if (totalNum > snum)
-														totalNum = snum- cartGoodsNum;
-												}
-										}
-
-                    var updata = {
-                        id: item.id,
-                        goods_num: totalNum,
-                        money: th.data.data.shop_price,
-                        store_id: os.stoid,
-                    };
-										
-										// 秒杀：单独购买的情况下，加入购物车显示的是零售价，否则显示秒杀活动价
-										if(th.data.options.prom_type == 1) {
-											// updata['prom_type'] = th.data.options.prom_type;
-											// updata['prom_id'] = th.data.options.prom_id;
-											if(th.data.openSpecModal_flash_normal) {
-												updata['money'] = th.data.data.shop_price;
-												updata['is_pd_normal'] = 1;
-											} else {
-												updata['money'] = th.data.prom_price;
-											};
-										};
-
-                    if (getApp().globalData.guide_id) {
-                        updata['guide_id'] = getApp().globalData.guide_id;
-                        updata['guide_type'] = 1;
+        }).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 => {
+            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,
+        });
+
+    },
+
+    //---展示---
+    // gid 在onload阶段已经保存在this.data中
+    onShow: function () {
+
+        getApp().check_can_share(this);
+        var that = this;
+        var ee = this, gid = this.data.gid, i = getApp().request;
+        this.data.is_timer = 1;
+        this.wait_for_store_config();
+
+        i.get("/api/weshop/serviceCard/get/" + os.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,
+                        });
                     }
-                    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();
-                        }
+
+                    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({
+                        'sele_g':t.data.data,
+                        '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,
                     });
+
+
+                    // ----> 秒杀
+                    let prom_type = that.data.options.prom_type;
+
+                    if (prom_type) { // 进入商品详情页地址传参有带goods_id、prom_type、prom_id参数, 即从秒杀入口进入
+                        let prom_id = that.data.options.prom_id;
+                        // 检查活动是否开始
+                        that.check_prom(t.data.data.id, prom_type, prom_id);
+                    }
+
+
+                    that.getTaohe();
+                    //-----商品详情---
+                    if (!t.data.data.serviceContent) t.data.data.serviceContent = "  ";
+                    a.wxParse("content", "html", ut.format_content(t.data.data.serviceContent), ee, 6);
+                    e.wxParseAddFullImageUrl(ee, "content");
+
+                    //获取重表
+                    getApp().promiseGet("/api/weshop/serviceItem/list", {
+                        data: {store_id: os.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 {
-                    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();
+                    wx.showModal({
+                        title: t.data.msg,
+                        showCancel: !1,
+                        complete: function () {
+                            wx.navigateBack();
                         }
                     });
                 }
+
             }
         });
 
-    };
-		
-		
-		
-	
-	
-		
-	
-  },
- 
-  //----------立即购买-----------
-  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,
-			});
-		};
-		
-		// 秒杀活动
-		if(this.data.prom_type == 1) {
-			// 如果是秒杀活动下的单独购买，is_normal为1
-			if(this.data.openSpecModal_flash_normal) this.data.is_normal = 1;
-			
-			if(this.data.is_normal) {// 单独购买
-				this.setData({
-					goodsInputNum: t,
-				});
-			} else {// 秒杀购买
-			
-				// 获取redis当前可以购买的数量
-				// 如果数量为0，设置和显示已抢光
-				// 否则，进一步判断是否超出限购或超出库存
-				await this.getactLen().then(async function(res) {
-					// 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; // 限购数量a
-							let promcardbuynum = data.data.data.promcardbuynum;
-							let buyedNum = promcardbuynum; // 自己已经购买的数量b
-							let canBuyNum = limited - buyedNum; // 自己还可购买的数量c
-							
-							if(canBuyNum <= 0) {
-								canBuyNum = 0;
-							};
-							
-							if(limited > res) {
-								if(t > res) { // t当前增减的数量
-									// wx.showModal({
-									// 	title: '超出活动库存',
-									// });
-									getApp().my_warnning('超出活动库存', 0, self);
-									th.setData({
-										goodsInputNum: res,
-									});
-									return false;
-								};
-							};
-							
-							if(limited <= res) {
-								if(t>canBuyNum) {
-									// wx.showModal({
-									// 	title: '超出限购数量',
-									// });
-									getApp().my_warnning('超出限购数量', 0, self);
-									th.setData({
-										goodsInputNum: canBuyNum,
-									});
-									return false;
-								};
-							};
-							
-							th.setData({
-								goodsInputNum: t,
-							});
-						});
-					};
-				});
-				
-			}
-			
-			
-		};
-
-  },
-
-
-  closeSpecModal: function() {	  
-    this.setData({
-      openSpecModal: !1,
-      openSpecModal_pt: !1,
-			openSpecModal_flash_normal: !1,
-    });
-  },
-  
-  openSpecModel: function(t) {
-		var th=this;
-    var open_store = t.currentTarget.dataset.ind;
-    this.setData({
-      store: 0,
-      choice_sort_store: 0,
-      sort_store: 0,
-      open_ind_store: open_store,
-    })
-    //--先判断会员状态--
-    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;
-    }
-
-    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/" + os.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,
-              });
-            }
-          }
+        this.data.enterAddressPage && (this.data.enterAddressPage = !1);
+        this.get_sto();
+
+    },
+
+    enterAddress: function () {
+        this.data.enterAddressPage = !0, wx.navigateTo({
+            url: "/pages/user/address_list/address_list?operate=selectAddress"
         });
-      } 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: os.stoid,
-          add_time: timestamp,
-					type: 1,
-        };
-        //加入收藏夹就是导购的ID
-        if(getApp().globalData.guide_id){
-          d.guide_id=getApp().globalData.guide_id;
-          d.guide_type=2;
+    },
+
+    onUnload: function () {
+        for (var i = 1; i < 100; i++) {
+            clearInterval(i);
         }
+    },
 
-        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,
-              });
-            }
-          }
+    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();
+    },
+
+    // tabClick2: function(t) {
+    //   this.setData({
+    //     activeCategoryId2: t.currentTarget.id
+    //   });
+    // },
+
+    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 () {
+        this.setData({
+            activeCategoryId: 1
         });
-      }
-    }
-  },	
-	//---------联系客服------------
-	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: os.stoid,
-        user_id: getApp().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: os.stoid,
-                  user_id: getApp().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.data.original_img;
-    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="/packageA/pages/goodsInfo/goodsInfo?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";
-	}
-	
-	
-	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 th = this,that=this;
-    var timer_get = setInterval(function() {
-      if (th.data.is_get_local_ok == 0) return false;
-      var i = getApp().request;
-	  if (!th.data.data) return false;	      
-      var dd= {
-          store_id: os.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;
-                }
+    },
+
+    //-----------------拼单生成方法---------------------
+    addCart_pt: function () {
+        var th = this;
+        if (this.data.is_normal == 0) {
+            //看一下有没有起购数，如果有起购数，要计算起购数
+            var qnum = parseFloat(th.data.prom_act.minbuynum);
+            if (qnum > 0 && th.data.goodsInputNum < qnum) {
+                getApp().confirmBox("拼团商品至少要买" + qnum + "件!");
+                return false;
             }
-            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(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
-				});
-				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});		  
-		      th.deal_pickup(e);  
-		    },800)
-          
+            th.addcart_pt_func();
+        } else {
+            th.addcart_pt_func();
         }
-      })
-    }, 200)
-  },
-
-  
-  //------------处理门店---------------
-  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: os.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]);
-                  }
+    },
+
+    addcart_pt_func: function () {
+        if (oo.user_id == null) {
+            s.my_warnning("还未登录！", 0, this);
+            return;
+        }
+        var e = this,
+            th = e,
+            o = this.data.sele_g;
+
+        //----------添加到购物车时，要判断限购数量，--------
+        e.get_buy_num(async function (ee) {
+
+            //---判断商品是否超出活动限购,拼团的普通购买不计算活动的限购---
+            if (th.data.promcardbuynum != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal != 1) {
+
+                if (th.data.goodsInputNum + th.data.promcardbuynum > th.data.prom_buy_limit) {
+                    s.my_warnning('超出商品活动限购', 0, th);
+                    var num = th.data.prom_buy_limit - th.data.promcardbuynum;
+                    if (num < 0) num = 0;
+                    th.setData({goodsInputNum: num})
+                    return false;
                 }
-              }
+            }
+
+            var redis_num = 0
+            //不是普通购买的时候
+            if (th.data.is_normal != 1) {
+                //-------判断活动是否抢光---------
+                await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.prom_id, {
+                    1: 1
+                }).then(res => {
+                    redis_num = res.data.data;
+                })
+
+                if (th.data.goodsInputNum > redis_num) {
+                    s.my_warnning('超出商品活动库存', 0, th);
+                    th.setData({goodsInputNum: redis_num})
 
-                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]);
+                    return false;
                 }
+            }
+
+            if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
+            if (th.data.goodsInputNum > o.store_count) {
+                th.setData({goodsInputNum: o.store_count})
+                return s.my_warnning("超出商品库存", 0, th);
+            }
 
+            if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
                 th.setData({
-                    def_pickpu_list: def_arr,
-                    pickpu_list: ee.data.data.pageData
+                    sto_sele_name: ""
                 });
-			  
-			  //门店分类要排序下
-			  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);
-              }
+            if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th);
+            //--------------此时操作的数据------------
+            var newd = {
+                id: o.id,
+                goods_num: th.data.goodsInputNum,
+                pick_id: th.data.sto_sele_id,
+                keyid: th.data.sto_sele_keyid,
+                user_id: oo.user_id,
+                store_id: th.data.stoid,
+                goods_price: o.money,
+                goods_name: o.serviceName,
+                goods_sn: o.serviceSn,
+                sku: o.sku,
+            };
 
-                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;
+            //---是不是从收藏夹出来的---
+            if (th.data.c_guide_id) {
+                newd['guide_id'] = th.data.c_guide_id;
+                newd['guide_type'] = 2;
+
+
+
+
+            } else {
+                if (getApp().globalData.guide_id) {
+                    newd['guide_id'] = getApp().globalData.guide_id;
+                    newd['guide_type'] = 0;
                 }
-                th.setData(sd);
+            }
 
+            //让商品带上房间号
+            if (!th.data.sys_switch.is_skuroom_id && th.data.sys_switch.is_skuroom_id == 1) {
+                if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
+                    newd.room_id = getApp().globalData.room_id;
+                }
             } else {
-              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]})
-              }
+                if (newd.goods_id == getApp().globalData.room_goods_id) {
+                    newd.room_id = getApp().globalData.room_id;
+                }
             }
-          } 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]})
+
+            //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
+
+            if (th.data.is_normal == 1) {
+                var conf = th.data.bconfig;
+                if (conf.switch_list) {
+                    var s_list = JSON.parse(conf.switch_list);
+                    //如果后台有开启等级价的功能
+                    if (parseInt(s_list.rank_switch) == 2) {
+                        var card_price = o[getApp().globalData.userInfo['card_field']];
+                        //如果会员有等级价
+                        if (getApp().globalData.userInfo['card_field'] != undefined && getApp().globalData.userInfo['card_field'] != null
+                            && getApp().globalData.userInfo['card_field'] != "" && card_price > 0) {
+                            newd.goods_price = card_price;
+                        }
+                    }
+                }
             }
 
-          }
-        }
-      });
-    } else {	
-      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
-              })
-          }
-
-      }
-    }
-  },
- 
-  //加载更多是靠这个函数
-  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;
-  },
-
- 
-  //--定义的保存图片方法，分享团---
-  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;
-    }
-
-    //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团  4阶梯团
-    var type = this.data.prom_type;
-    if (type == 6) type = 2;
-    if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3;
-
-    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 ;
-	}
-    ///二微码
-    var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
-        os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/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";
-		  
-			// context.fillStyle="#FFFFFF";
-			// context.fillRect(0,0,554 * unit, 899 * unit);
-			
-		  //-- 如果有自定义海报的时候，判断背景的图片 --
-		  if(th.data.share_b_img){
-			  pg_path=th.data.share_b_img;
-		  }	
-          context.drawImage(pg_path, 0, 0, 554 * unit, 899 * 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;				  
-				  var x1=(x+90) *unit;
-				  var y1=(y+50) *unit;		  
-				  //--昵称---
-				  context.setFontSize(24 * unit)
-				  context.setFillStyle("black")
-				  context.fillText(app.globalData.userInfo.nickname, x1, y1);
-				  var width = 24 * app.globalData.userInfo.nickname.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(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
-			 var width = 24 * app.globalData.userInfo.nickname.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); 
-		  }
-		  
-         
-          //---产品名称---
-          //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
-		  if(type!=4){
-			 context.setFillStyle("black");
-			 context.setFontSize(21.3 * unit)
-			 th.draw_Text(context, th.data.data.goods_name,
-			     38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
-			 //------产品的价格-------
-			 context.setFontSize(23 * unit)
-			 context.setFillStyle("red")
-			 context.fillText("￥", 416 * unit, 185 * unit);
-			 context.setFontSize(31 * unit)
-			 var pri0 = th.data.data.shop_price;
-			 if (th.data.prom_act)
-			    pri0 = th.data.prom_act.price;			 
-			 pri0 = parseFloat(pri0).toFixed(2);
-			 context.fillText(pri0, 438 * unit, 185 * unit); 	 
-			 //---市场价划掉---
-			 context.setFillStyle("gray")
-			 context.setFontSize(22 * unit)
-			 context.fillText("￥" + th.data.data.market_price, 426 * unit, 213 * unit);
-			 context.setStrokeStyle('gray');
-			 context.setLineWidth(1 * unit);
-			 context.moveTo(426 * unit, 206 * unit);
-			 context.lineTo(510 * unit, 206 * unit);
-			 context.stroke();
-			 
-		  }else{
-			  context.setFillStyle("black");
-			  context.setFontSize(21.3 * unit)
-			  th.draw_Text(context, th.data.data.goods_name,
-			      38 * unit, 170 * unit, 20 * unit, 300*unit, unit);
-			  //------ 产品的价格 -----			 
-			  var pri0 = th.data.prom_act.addmoney;
-			  var integral=th.data.prom_act.integral;				 	  
-			  var text=	"";			  
-			  if(integral){text=integral+"积分";  }				  
-			  if(pri0 && integral){ text+="+";}
-			  if(pri0){ text+="￥"+pri0;}
-			  
-			  if(!pri0 && !integral){ text="0积分";}			
-			  context.setFillStyle("red");	  
-			  context.fillText(text, 38 * unit, 235 * unit); 	 
-		 			  
-		  }
-		  	        
-          //---中间大图---
-          context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
-          //-------大图后面就不一样了-----------
-          switch (type) {
-            case 0: //普通商品的展示
-			case 4: 
-              //中间的几个字
-			  if(th.data.poster && parseInt(th.data.poster.style)==2 ){				 		 
-				 if(parseInt(th.data.poster.show_quality)){
-					 var g_path = "../../../images/share/s_gou.png";
-					 context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
-					 context.setFillStyle("red")
-					 context.setFontSize(18 * unit)
-					 context.fillText("正品保证", 84 * unit, 690 * unit);
-					 
-					 context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
-					 context.setFillStyle("red")
-					 context.setFontSize(18 * unit)
-					 context.fillText("纯实体店", 246 * unit, 690 * unit);
-					 
-					 context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
-					 context.setFillStyle("red")
-					 context.setFontSize(18 * unit)
-					 context.fillText("官方验证", 420 * unit, 690 * unit);
-				 }
-				  		  
-			  }else{
-				  var g_path = "../../../images/share/s_gou.png";
-				  context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
-				  context.setFillStyle("red")
-				  context.setFontSize(18 * unit)
-				  context.fillText("正品保证", 84 * unit, 690 * unit);
-				  
-				  context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
-				  context.setFillStyle("red")
-				  context.setFontSize(18 * unit)
-				  context.fillText("纯实体店", 246 * unit, 690 * unit);
-				  
-				  context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
-				  context.setFillStyle("red")
-				  context.setFontSize(18 * unit)
-				  context.fillText("官方验证", 420 * unit, 690 * unit);
-			  }
-			  
-			  
-				//---画线---
-				context.setLineWidth(1 * unit)
-				context.moveTo(32 * unit, 710 * unit)
-				context.lineTo(520 * unit, 710 * unit)
-				context.stroke();
-				
-				//---文字---
-				context.setFillStyle("black")
-				context.setFontSize(22 * unit)
-			  
-			  if(type==0){
-				    // 原来start --->				  
-				    context.setFontSize(24 * unit)
-				    context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit);	
-					
-					context.setFontSize(22 * unit)
-				    context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 806 * unit);
-				    context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit);	
-					
-			  }else{				  
-				    context.setFontSize(24 * unit)
-				    context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit);					
-					context.setFontSize(22 * unit)
-					context.fillText("长按识别二维码", 40 * unit, 806 * unit);
-					context.fillText("立即开始兑换", 40 * unit, 846 * unit);
-				
-														 
-			  }
-			 
-              //---二维吗图---            
-			  //-- 自定义海报 --
-			  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, 120 * unit, 120 * unit);				  
-			  }else{
-					   //---二维吗图---
-					   context.drawImage(vpath, 410 * unit, 726 * unit, 115 * unit, 125 * unit);
-			  }	
-			  
-              break;
-            case 1: //秒杀商品的展示
-              //---画线---
-              context.setLineWidth(1 * unit)
-              context.moveTo(32 * unit, 670 * unit)
-              context.lineTo(520 * unit, 670 * unit)
-              context.stroke();
-
-              //画秒杀的图片
-              var miaos_path = '../../../images/share/miao_share.png';
-              context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit);
-			
-			  context.setFillStyle("black")	
-			  context.setFontSize(24 * unit)
-			  context.fillText(th.data.sto_sele_name_1, 40 * unit, 786 * unit);				
-              //---文字---
-              context.setFontSize(22 * unit)
-              context.setFillStyle("black")
-              context.fillText("特惠好物，限时秒杀", 40 * unit, 826 * unit);
-              context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 866 * unit);
-						
-							
-              //---二维吗图---
-              //-- 自定义海报 --
-              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, 120 * unit, 120 * unit);				  
-              }else{
-				   //---二维吗图---
-				   context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
-              }							  
-              break;
-
-            case 2: //会员团和商家团的展示
-              //---画线---
-              context.setLineWidth(1 * unit)
-              context.moveTo(32 * unit, 670 * unit)
-              context.lineTo(520 * unit, 670 * unit)
-              context.stroke();
-              //---文字---
-             
-			  context.setFillStyle("black")
-			  context.setFontSize(24 * unit)
-			  context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
-
-              //绘制成团图片
-              var ct_img = "../../../images/share/ct_num.png";
-              context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit);
-              var ct_num = th.data.prom_act.ct_num;
-              context.setFontSize(14 * unit)
-              context.font = 'normal';
-              context.setFillStyle("red")
-              if (ct_num < 10) {
-                context.fillText(ct_num + "人拼团", 92 * unit, 760 * unit);
-              } else {
-                context.fillText(ct_num + "人拼团", 86 * unit, 760 * unit);
-              }
-              context.setFontSize(22 * unit)
-              context.fillText("已拼" + th.data.prom_act.buy_num + "份", 166 * unit, 763 * unit);
-             
-			  context.setFillStyle("gray")
-              context.fillText("快来和我一起拼团吧！", 40 * unit, 806 * unit);
-              context.setFillStyle("black")
-              context.font = 'normal bold 18px sans-serif';
-              context.setFontSize(21.3 * unit)
-              context.fillText("长按识别二维码，立即参团", 40 * unit, 836 * unit);
-							
-							
-              //---二维吗图---
-              //-- 自定义海报 --
-              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, 120 * unit, 120 * unit);				  
-              }else{
-				   //---二维吗图---
-				   context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
-              }	
-              break
-            case 3: //阶梯团的展示
-              //---画线---
-              context.setLineWidth(1 * unit)
-              context.moveTo(32 * unit, 670 * unit)
-              context.lineTo(520 * unit, 670 * unit)
-              context.stroke();
-              //---文字---
-              
-			  context.setFillStyle("black")
-			  context.setFontSize(24 * unit)
-			  context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
-			  
-              //---绘制中间阶梯的价格---
-              var list = th.data.prom_act.ct_rylist;
-              for (var i = 0; i < list.length; i++) {
-                var item = list[i];
-                var wi = i * 90 * unit;
-                context.font = 'normal';
-                context.setFontSize(16 * unit)
-                context.setFillStyle("red")
-                context.fillText("￥", 40 * unit + wi, 756 * unit);
-                context.setFontSize(22 * unit)
-                var pri = parseFloat(item.price).toFixed(2);
-                context.fillText(pri, 56 * unit + wi, 756 * unit);
-                context.setFillStyle("gray")
-                context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit);
-              }
-              //----------------下面部分----------------
-							// context.setFillStyle("gray")
-							// context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit);
-							// context.setFillStyle("black")
-							// context.font = 'normal bold 18px sans-serif';
-							// context.setFontSize(22 * unit)
-							// context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
-              //context.setFillStyle("gray")
-			  context.setFillStyle("black")
-              context.fillText("快来和我一起拼团吧！", 40 * unit, 820 * unit);             
-              //context.font = 'normal bold 18px sans-serif';
-              context.setFontSize(22 * unit)
-              context.fillText("长按识别二维码，立即参团", 40 * unit, 850 * unit);
-													
-			  
-			  //-- 自定义海报 --
-			  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, 120 * unit, 120 * unit);				  
-			  }else{
-				   //---二维吗图---
-				   context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
-			  }			  
-              break
-			  
-			   
-          }
-		  
-		  
-		  //--- 如果是自定义海报的时候 ---
-		  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();
-		  }
-		 
-		 
-          //把画板内容绘制成图片，并回调 画板图片路径
-          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();
+
+            //-----如果是秒杀，团购，积分购,拼团,且不是普通购买-----
+            if (th.data.prom_type == 6 && th.data.is_normal != 1) {
+                newd.goods_price = th.data.prom_price;
+                newd.prom_type = th.data.prom_type;
+                newd.prom_id = th.data.prom_id;
+                newd.kt_type = th.data.prom_act.kttype; //开团类型
+                newd.is_pt_tz = 0;
+                //th.data.sto_sele_distr=1; //直接用自提的方式提交
+                if (newd.kt_type > 1) {
+                    newd.is_pt_tz = 1; //开团类型
+                }
+                if (newd.kt_type == 3) {
+                    th.data.sto_sele_distr = 1;
                 }
-              })
-            }, 500)
 
-          });
-        });
-      }
-    });
-  },
-
-
-  //文本换行 参数：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);
-      }
-    }
-  },
-
-  // ----视频图片----
-  // 图片计数器
-  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.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);
+            }
+            else if (th.data.prom_type == 3) {
+                newd.prom_type = 0;
+                newd.prom_id = 0;
+            }
+            newd['pick_name'] = th.data.sto_sele_name;
+            newd['pick_dis'] = th.data.sto_sele_distr;
+            newd['is_normal'] = th.data.is_normal;
+
+            if (newd['is_normal']) {
+                newd['is_pd_normal'] = 1;
+                th.buyNow(newd);
+                return false;
+                //判断一下有没有全局优惠活动
+                //th.check_nor_promgood(newd.goods_id, function (e) {
+                //     if (e && e.act_id) {
+                //         newd['prom_type'] = 3;
+                //         newd['prom_id'] = e.act_id;
+                //     }
+                //     th.buyNow(newd)
+                //})
+            }
+            else th.buyNow_pt(newd);
+        })
+    },
+
+    //----------立即购买-----------
+    buyNow: function(e) {
+        getApp().globalData.service_now=e;
+        this.setData({openSpecModal_pt:0})
+        wx.redirectTo({
+            url: "/packageA/pages/cart2_ser/cart2_ser",
+        });
+    },
+
+    //----------立即购买_pt-----------
+    buyNow_pt: function (e) {
+        getApp().set_b_now(e);
+        this.setData({openSpecModal_pt:0})
+        getApp().goto("/packageA/pages/serviceCard_pd/cart/cart?is_bnow=1&goods_id=" + e.goods_id);
+    },
+
+    //----------增加购买数量-----------
+    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,
+            });
+        }
+
+            // 秒杀活动
+            // 如果是秒杀活动下的单独购买，is_normal为1
+            if (this.data.is_normal) {// 单独购买
+                this.setData({
+                    goodsInputNum: t,
+                });
+            } else {// 秒杀购买
+
+                // 获取redis当前可以购买的数量
+                // 如果数量为0，设置和显示已抢光
+                // 否则，进一步判断是否超出限购或超出库存
+                await this.getactLen().then(async function (res) {
+                    // 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.prom_act;
+                         th.get_buy_num2().then(function (data) {
+                            let limited = 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 (limited > res) {
+                                if (t > res) { // t当前增减的数量
+                                    getApp().my_warnning('超出活动库存', 0, self);
+                                    th.setData({
+                                        goodsInputNum: res,
+                                    });
+                                    return false;
+                                }
+
+                            }
+
+                            if (limited <= res) {
+                                if (t > canBuyNum) {
+                                    getApp().my_warnning('超出限购数量', 0, self);
+                                    th.setData({
+                                        goodsInputNum: canBuyNum,
+                                    });
+                                    return false;
+                                }
+
+                            }
+
+                            th.setData({
+                                goodsInputNum: t,
+                            });
+                        });
+                    }
+
+                })
+
+            }
+
+
+
+
+    },
+
+
+    closeSpecModal: function () {
+        this.setData({
+            openSpecModal: !1,
+            openSpecModal_pt: !1,
+            openSpecModal_flash_normal: !1,
+        });
+    },
+
+    openSpecModel: function (t) {
+        var th = this;
+        var open_store = t.currentTarget.dataset.ind;
+        this.setData({
+            store: 0,
+            choice_sort_store: 0,
+            sort_store: 0,
+            open_ind_store: open_store,
+        })
+        //--先判断会员状态--
+        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;
+        }
+
+        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/" + os.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,
+                            });
+                        }
+                    }
+                });
+            } 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: os.stoid,
+                    add_time: timestamp,
+                    type: 1,
+                };
+                //加入收藏夹就是导购的ID
+                if (getApp().globalData.guide_id) {
+                    d.guide_id = getApp().globalData.guide_id;
+                    d.guide_type = 2;
+                }
+
+                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,
+                            });
+                        }
+                    }
+                });
+            }
+        }
+    },
+    //---------联系客服------------
+    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();
+            });
+        });
+    },
+
+
+    //--点击分享事件---
+    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.data.original_img;
+        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 = "/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?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";
+        }
+
+
+        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 th = this, that = this;
+        var timer_get = setInterval(function () {
+            if (th.data.is_get_local_ok == 0) return false;
+            var i = getApp().request;
+            if (!th.data.data) return false;
+            var dd = {
+                store_id: os.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 (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});
+                        th.deal_pickup(e);
+                    }, 800)
+
+                }
+            })
+        }, 200)
+    },
+
+
+    //------------处理门店---------------
+    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: os.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]})
+                        }
+
+                    }
+                }
+            });
+        } else {
+            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;
+    },
+
+
+    //--定义的保存图片方法，分享团---
+    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;
+        }
+
+        //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团  4积分购
+        var type = 2
+        if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3;
+
+        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;
+        }
+        ///二微码
+        var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+            os.stoid + "?sceneValue=" + scene + "&pageValue=packageA/pages/serviceCard_pd/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;
+                    }
+
+                    var act_time='';
+                    if (!th.data.share_b_img){ // 如果是普通商品，绘制新海报
+                        th.drawPoster(context, unit, th.data.share_goods_img, vpath, type);
+                    } else {
+
+                        context.drawImage(pg_path, 0, 0, 554 * unit, 899 * 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;
+                                var x1 = (x + 90) * unit;
+                                var y1 = (y + 50) * unit;
+                                //--昵称---
+                                context.setFontSize(24 * unit)
+                                context.setFillStyle("black")
+                                context.fillText(app.globalData.userInfo.nickname, x1, y1);
+                                var width = 24 * app.globalData.userInfo.nickname.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);
+
+                            }
+                        } else {
+                            //--昵称---
+                            context.setFontSize(24 * unit)
+                            context.setFillStyle("black")
+                            context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
+                            var width = 24 * app.globalData.userInfo.nickname.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);
+                        }
+
+
+                        //---产品名称---
+                        //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
+
+                        context.setFillStyle("black");
+                        context.setFontSize(21.3 * unit)
+                        th.draw_Text(context, th.data.data.goods_name,
+                            38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
+                        //------产品的价格-------
+                        context.setFontSize(23 * unit)
+                        context.setFillStyle("red")
+                        context.fillText("￥", 416 * unit, 185 * unit);
+                        context.setFontSize(31 * unit)
+                        var pri0 = th.data.data.shop_price;
+                        if (th.data.prom_act)
+                            pri0 = th.data.prom_act.price;
+                        pri0 = parseFloat(pri0).toFixed(2);
+                        context.fillText(pri0, 438 * unit, 185 * unit);
+                        //---市场价划掉---
+                        context.setFillStyle("gray")
+                        context.setFontSize(22 * unit)
+                        context.fillText("￥" + th.data.data.show_price, 426 * unit, 213 * unit);
+                        context.setStrokeStyle('gray');
+                        context.setLineWidth(1 * unit);
+                        context.moveTo(426 * unit, 206 * unit);
+                        context.lineTo(510 * unit, 206 * unit);
+                        context.stroke();
+
+                        //---中间大图---
+                        context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
+                        //-------大图后面就不一样了-----------
+                        switch (type) {
+                            case 2: //会员团和商家团的展示
+                                //---画线---
+                                context.setLineWidth(1 * unit)
+                                context.moveTo(32 * unit, 670 * unit)
+                                context.lineTo(520 * unit, 670 * unit)
+                                context.stroke();
+                                //---文字---
+
+                                context.setFillStyle("black")
+                                context.setFontSize(24 * unit)
+                                context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
+
+                                //绘制成团图片
+                                var ct_img = "../../../../images/share/ct_num.png";
+                                context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit);
+                                var ct_num = th.data.prom_act.ct_num;
+                                context.setFontSize(14 * unit)
+                                context.font = 'normal';
+                                context.setFillStyle("red")
+                                if (ct_num < 10) {
+                                    context.fillText(ct_num + "人拼团", 92 * unit, 760 * unit);
+                                } else {
+                                    context.fillText(ct_num + "人拼团", 86 * unit, 760 * unit);
+                                }
+                                context.setFontSize(22 * unit)
+                                context.fillText("已拼" + th.data.prom_act.buy_num + "份", 166 * unit, 763 * unit);
+
+                                context.setFillStyle("gray")
+                                context.fillText("快来和我一起拼团吧！", 40 * unit, 806 * unit);
+                                context.setFillStyle("black")
+                                context.font = 'normal bold 18px sans-serif';
+                                context.setFontSize(21.3 * unit)
+                                context.fillText("长按识别二维码，立即参团", 40 * unit, 836 * unit);
+
+
+                                //---二维吗图---
+                                //-- 自定义海报 --
+                                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, 120 * unit, 120 * unit);
+                                } else {
+                                    //---二维吗图---
+                                    context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+                                }
+                                break
+                            case 3: //阶梯团的展示
+                                //---画线---
+                                context.setLineWidth(1 * unit)
+                                context.moveTo(32 * unit, 670 * unit)
+                                context.lineTo(520 * unit, 670 * unit)
+                                context.stroke();
+                                //---文字---
+
+                                context.setFillStyle("black")
+                                context.setFontSize(24 * unit)
+                                context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
+
+                                //---绘制中间阶梯的价格---
+                                var list = th.data.prom_act.ct_rylist;
+                                for (var i = 0; i < list.length; i++) {
+                                    var item = list[i];
+                                    var wi = i * 90 * unit;
+                                    context.font = 'normal';
+                                    context.setFontSize(16 * unit)
+                                    context.setFillStyle("red")
+                                    context.fillText("￥", 40 * unit + wi, 756 * unit);
+                                    context.setFontSize(22 * unit)
+                                    var pri = parseFloat(item.price).toFixed(2);
+                                    context.fillText(pri, 56 * unit + wi, 756 * unit);
+                                    context.setFillStyle("gray")
+                                    context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit);
+                                }
+                                //----------------下面部分----------------
+                                context.setFillStyle("black")
+                                context.fillText("快来和我一起拼团吧！", 40 * unit, 820 * unit);
+                                //context.font = 'normal bold 18px sans-serif';
+                                context.setFontSize(22 * unit)
+                                context.fillText("长按识别二维码，立即参团", 40 * unit, 850 * unit);
+                                //-- 自定义海报 --
+                                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, 120 * unit, 120 * unit);
+                                } else {
+                                    //---二维吗图---
+                                    context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+                                }
+                                break
+
+
+                        }
+
+
+                        //--- 如果是自定义海报的时候 ---
+                        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();
+                        }
+                    }
+
+
+                    //把画板内容绘制成图片，并回调 画板图片路径
+                    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)
+
+                    });
+                });
+            }
+        });
+    },
+
+
+    //文本换行 参数：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);
+            }
+        }
+    },
+
+    // ----视频图片----
+    // 图片计数器
+    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.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;
+        }
+        //获取商品是分享图信息
+        wx.getImageInfo({
+            src: ee.data.data.original_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) {
+        var th = this;
+        var ind = ee.currentTarget.dataset.ind;
+        var bconfig = th.data.bconfig;
+
+        //如果开启了，则不在选择门店
+        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_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 = os.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 store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
+        if (!store_name)
+            store_name = getApp().globalData.setting.appName;
+
+
+        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";
+        }
+
+        return {
+            title: this.data.data.goods_name + '-' + store_name,
+            imageUrl: this.data.gallery[0].image_url,
+            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: os.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: os.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: os.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,
+            isshow: 1,
+        });
+        this.get_sku(os.stoid, this.data.data, gid);
+        this.get_sto();
+        //this.check_is_youhui(gid, 1);
+        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 + "/6/" + prom_id, {
+            1: 1
+        }).then(res => {
+            var em = res;
+            var flag = null;
+            if (em.data.code == 0) {
+                if (em.data.data <= 0) ee.setData({
+                    prom_r_null: 1
+                });
+                //拿取价格并且判断时间--
+                getApp().request.get("/api/weshop/teamlist/get/" +
+                    os.stoid + "/" + prom_id, {
+                    success: async 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) {
+                            ee.get_normal(gid);
+                            return false;
+                        }
+
+                        /*-- 还没有开始预热的也不显示 --*/
+                        if (t.data.data.show_time > now) {
+                            ee.get_normal(gid);
+                            return false;
+                        }
+
+                        /*-- 判断拼单是否启用 --*/
+                        if (!t.data.data.is_show) {
+                            console.log('没启用');
+                            wx.setNavigationBarTitle({
+                                title: '系统提示',
+                            });
+                            wx.showToast({
+                                title: '此商品暂时没有拼单活动',
+                                icon: 'none',
+                                success(){
+                                    setTimeout(() => {
+                                        wx.navigateBack()
+                                    }, 2000)
+                                }
+                            });
+                            return false
+                        }
+
+                        //判断拼团的---会员身份--
+                        await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", {
+                            data: {
+                                store_id: os.stoid,
+                                is_end: 0,
+                                is_show: 1,
+                                user_id: getApp().globalData.user_id,
+                                pageSize: 1000
+                            }
+                        }).then(res => {
+                            let pd_list = res.data.data.pageData;
+                            if (res.data.code == 0 && pd_list.length > 0) {
+                                flag = pd_list.some(pd => {
+                                    return pd.goods_id == gid && pd.goods_type==1
+                                })
+                            }
+                        })
+                        if (!flag) {
+                            ee.get_normal(gid);
+                            return false;
+
+                        }
+                        //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中-------
+                        await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", {
+                            data: {
+                                prom_id: prom_id,
+                                prom_type: 6,
+                                user_id: oo.user_id,
+                                store_id: os.stoid,
+                                pageSize: 1,
+                                page: 1
+                            }
+                        }).then(e => {
+                            if (e.data.code == 0 && e.data.data.pageData.length > 0) {
+                                var odr = e.data.data.pageData[0];
+                                th.data.buy_order = odr;
+                                if (odr.pt_status == 0 && odr.order_status == 1) {
+                                    th.setData({
+                                        user_order_pt_state: 1
+                                    });
+                                }
+                                if (odr.pt_status == 1) {
+                                    if (odr.is_zsorder == 4) {
+                                        getApp().request.promiseGet("/api/weshop/teamgroup/page/", {
+                                            data: {
+                                                store_id: os.stoid,
+                                                team_id: odr.prom_id,
+                                                listno: odr.pt_listno
+                                            }
+                                        }).then(res => {
+                                            var now = ut.gettimestamp();
+                                            if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
+                                                var tgr = res.data.data.pageData[0];
+                                                //如果团的时间已经到了
+                                                if (now >= tgr.kt_end_time) {
+                                                    th.update_jiti(tgr.id);
+                                                } else {
+                                                    th.setData({
+                                                        user_order_pt_state: 2
+                                                    });
+                                                }
+                                            }
+                                        })
+
+                                    } else {
+                                        th.setData({
+                                            user_order_pt_state: 2
+                                        });
+                                    }
+                                }
+
+                                if (odr.pt_status == 2 && odr.is_zsorder == 4) {
+                                    th.setData({
+                                        user_order_pt_state: 3,
+                                    });
+                                    th.data.wk_order_id = odr.order_id;
+                                }
+                            }
+                        })
+
+                        //----------查看阶梯团------------
+                        if (t.data.data.ct_rylist != "null" && t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) {
+                            t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist);
+                            var max_num = 0;
+                            t.data.data.ct_rylist.forEach(function (val, ind) {
+                                if (parseInt(val.rynum) > max_num) max_num = parseInt(val.rynum);
+                            })
+                            t.data.data.max_ct_num = max_num;
+                        }
+
+                        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: 6,
+                            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 = now;
+                        var endTime2 = t.data.data.end_time;
+                        var endTime1 = t.data.data.start_time;
+
+                        if (endTime1 > newTime) {
+                            ee.setData({
+                                prom_time_text: '距拼单开始还剩:',
+                                prom_st: 0
+                            })
+                            ee.countDown(endTime1, 0);
+                        } else {
+                            if (endTime2 > newTime) {
+                                ee.setData({
+                                    prom_time_text: '距拼单结束还剩:',
+                                    prom_st: 1
+                                })
+                                ee.countDown(endTime2);
+                            }
+                        }
+
+                        //-------查看有多少人在开这个团-------
+                        th.get_team_group(prom_id);
+                    }
+                });
+            }
+        })
+
+    },
+
+
+    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}`;
+        s
+        getApp().goto(url);
+    },
+
+
+    //获取更多秒杀
+    get_more_flash: async function (func) {
+        var f_more = false;
+        var user_id = getApp().globalData.user_id;
+        if (!user_id) user_id = 0;
+
+        var url = "/api/weshop/goods/listSkuFlash?store_id=" + os.stoid + "&goods_id=" + this.data.options.goods_id + "&user_id=" + user_id;
+        //获取秒杀的多规格
+        await getApp().request.promiseGet(url, {}).then(res => {
+            if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+                f_more = res.data.data;
+            }
+        })
+        if (!f_more) {
+            func(false);
+            return false;
         }
-      });
-    }
-  },
-  //--获取商品图片的本地缓存，回调写法--
-  get_goods_temp: function(tt) {
-    var ee = this;
-    if (ee.data.share_goods_img) {
-      tt();
-      return false;
-    }
-    //获取商品是分享图信息
-    wx.getImageInfo({
-      src: ee.data.data.original_img,
-      success: function(res) {
-        //res.path是网络图片的本地地址
-        ee.data.share_goods_img = res.path;
-        tt();
-      },
-      fail: function(res) {
-
-        ee.data.share_goods_img = "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的
-        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) {
-    var th = this;
-    var ind=ee.currentTarget.dataset.ind;
-    var bconfig = th.data.bconfig;
-
-    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);
+        //-- 秒杀的价格要更新 --
+        for (let i in f_more) {
+
+            let item = f_more[i];
+            f_more[i].prom_id = item.act_id;
+            f_more[i].prom_type = 1;
+            if (item.goods_id == this.data.data.goods_id) {
+                continue;
             }
-          } else {
-            th.setData({ is_gps: "3" });
-          }
+            var url = "/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + item.act_id;
+            await getApp().request.promiseGet(url, {}).then(rs => {
+                if (rs.data.code == 0) {
+                    f_more[i].price = rs.data.data.user_price;
 
+                }
+            })
         }
-      })
-    }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_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[index]; //当没有门店分类的时候
-      }
-
-    } else {
-      var index = th.data.sec_pick_index;
-      item = th.data.sec_sto.s_arr[index];
-    }
-
-    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[index]; //当没有门店分类的时候
-      }
-    } else {
-      var index = th.data.sec_pick_index;
-      item = th.data.sec_sto.s_arr[index];
-    }
-	
-	//判断门店的配送方式是不是匹配
-    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 = os.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)
-          }
+        func(f_more);
+
+    },
+
+
+    //-------------获取购买数量的总函数----------------
+    get_buy_num: function (func) {
+
+        var th = this,
+            user_id = getApp().globalData.user_id;
+        if (user_id == null) {
 
+            th.setData({
+                prom_buy_num: 0,
+            });
+            "function" == typeof func && func();
+            return false;
         }
-      });
 
+            //----获取活动购买数----
+            getApp().request.get("/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();
+                    }
+                }
+            });
 
-      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级
+    get_buy_num2: async function () {
+        // var map = this.data.g_buy_num,
+        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
+            }
         });
-      }
+    },
 
-      else {
-        th.setData({
-          store: 0,
-          choice_sort_store: 0,
-          sort_store: 0,
+
+    // 促销 -> 送礼包 -> 查看详情
+    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,
         })
-      }
-	  
-  },
-
-  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);
-              }
+            .then(res => {
+                if (ut.ajax_ok(res)) {
+                    _this.setData({
+                        historyBuyInfo: res.data.data.pageData,
+                    })
+                }
+            })
+    },
+
 
+    //打开客服操作菜单
+    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 {
-              th.setData({
-                is_gps: "3"
-              });
+                this.getTel()
+                    .then(() => {
+                        self.setData({
+                            hiddenCS: false,
+                        });
+                    });
             }
+            ;
+        }
+        ;
 
-            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 store_name=getApp().globalData.config?getApp().globalData.config.store_name:'';
-		if(!store_name)
-		   store_name=getApp().globalData.setting.appName;
-		
-		return {
-			title:this.data.data.goods_name + '-' + store_name,
-			imageUrl:this.data.gallery[0].image_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) {}
-        })
+    //关闭客服操作菜单
+    closeCS() {
+        this.setData({
+            hiddenCS: true,
+        });
     },
-		
-	//评论的调用
-	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: os.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: os.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: os.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;
+
+    click_contact: function () {
+        getApp().globalData.no_clear = 1;
     },
-	//----倒计时函数-----
-	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,
-			isshow: 1,
-		});
-		this.get_sku(os.stoid, this.data.data, gid);
-		this.get_sto();
-		this.check_is_youhui(gid, 1);
-		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;
-			};
-		})
-	},
 
+    //打开客服操作菜单
+    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,
+                    });
+                });
 
+        }
+        ;
+    },
 
-    //--------检查是否活动，活动是否开始，或者是否结束-------
-    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 + "/6/" + prom_id, {
-                1: 1
-            }).then(res => {
-                var em = res;
-                var flag = null;
-                if (em.data.code == 0) {
-                    if (em.data.data <= 0) ee.setData({
-                        prom_r_null: 1
-                    });
-                    //拿取价格并且判断时间--
-                    getApp().request.get("/api/weshop/teamlist/get/" +
-                        os.stoid + "/" + prom_id, {
-                        success: async 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) {
-                                ee.get_normal(gid);
-                                return false;
-                            }
+    //关闭客服操作菜单
+    closeCS() {
+        this.setData({
+            hiddenCS: true,
+        });
+    },
 
-                            /*-- 还没有开始预热的也不显示 --*/
-                            if (t.data.data.show_time > now) {
-                                ee.get_normal(gid);
-                                return false;
-                            }
+    //--点击弹起拼单--
+    openSpecModel_pt: function (e) {
 
-                            /*-- 判断拼单是否启用 --*/
-                            if (!t.data.data.is_show) {
-                                console.log('没启用');
-                                wx.setNavigationBarTitle({
-                                    title: '系统提示',
-                                });
-                                wx.showToast({
-                                    title: '此商品暂时没有拼单活动',
-                                    icon: 'none',
-                                    success(){
-                                        setTimeout(() => {
-                                            wx.navigateBack()
-                                        }, 2000)
-                                    }
-                                });
-                                return false
-                            }
 
-                            //判断拼团的---会员身份--
-                            await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", {
-                                data: {
-                                    store_id: os.stoid,
-                                    is_end: 0,
-                                    is_show: 1,
-                                    user_id: getApp().globalData.user_id,
-                                    pageSize: 1000
-                                }
-                            }).then(res => {
-                                let pd_list = res.data.data.pageData;
-                                if (res.data.code == 0 && pd_list.length > 0) {
-                                    flag = pd_list.some(pd => {
-                                        return pd.goods_id == gid
-                                    })
-                                }
-                            })
-                            if (!flag) {
-                                ee.get_normal(gid);
-                                return false;
+        this.setData({open_ind_store: 4, goodsInputNum: 1});//拼团直接给4
 
-                            }
-                            //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中-------
-                            await getApp().request.promiseGet("/api/weshop/order/page", {
-                                data: {
-                                    pt_prom_id: prom_id,
-                                    user_id: oo.user_id,
-                                    store_id: os.stoid,
-                                    pageSize: 1,
-                                    page: 1
-                                }
-                            }).then(e => {
-                                if (e.data.code == 0 && e.data.data.pageData.length > 0) {
-                                    var odr = e.data.data.pageData[0];
-                                    th.data.buy_order = odr;
-                                    if (odr.pt_status == 0 && odr.order_status == 1) {
-                                        th.setData({
-                                            user_order_pt_state: 1
-                                        });
-                                    }
-                                    if (odr.pt_status == 1 && odr.order_status == 1) {
-                                        if (odr.is_zsorder == 4) {
-                                            getApp().request.promiseGet("/api/weshop/teamgroup/page/", {
-                                                data: {
-                                                    store_id: os.stoid,
-                                                    team_id: odr.pt_prom_id,
-                                                    listno: odr.pt_listno
-                                                }
-                                            }).then(res => {
-                                                var now = ut.gettimestamp();
-                                                if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
-                                                    var tgr = res.data.data.pageData[0];
-                                                    //如果团的时间已经到了
-                                                    if (now >= tgr.kt_end_time) {
-                                                        th.update_jiti(tgr.id);
-                                                    } else {
-                                                        th.setData({
-                                                            user_order_pt_state: 2
-                                                        });
-                                                    }
-                                                }
-                                            })
 
-                                        } else {
-                                            th.setData({
-                                                user_order_pt_state: 2
-                                            });
-                                        }
-                                    }
+        //--先判断会员状态--
+        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 (odr.pt_status == 2 && odr.is_zsorder == 4) {
-                                        th.setData({
-                                            user_order_pt_state: 3,
-                                        });
-                                        th.data.wk_order_id = odr.order_id;
-                                    }
-                                }
-                            })
+        var th = this;
+        var ind = parseInt(e.currentTarget.dataset.it);
 
-                            //----------查看阶梯团------------
-                            if (t.data.data.ct_rylist != "null" && t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) {
-                                t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist);
-                                var max_num = 0;
-                                t.data.data.ct_rylist.forEach(function (val, ind) {
-                                    if (parseInt(val.rynum) > max_num) max_num = parseInt(val.rynum);
-                                })
-                                t.data.data.max_ct_num = max_num;
-                            }
+        //如果是拼单活动的普通购买
+        if (ind == 1) {
+
+            if (!th.data.is_normal) {
+                th.data.g_buy_num = new Map();
+            }
+            //如果拼单的sku data是空的，就要先获取一下
+            th.get_sto(1);
+            th.setData({
+                is_normal: ind,
+                openSpecModal_pt: 1
+            });
+            //th.check_is_youhui(th.data.gid, 1);
+        } else {
 
-                            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");
+            if (th.data.is_normal) {
+                th.data.g_buy_num = new Map();
+            }
 
-                            ee.setData({
-                                prom_price: t.data.data.price,
-                                prom_type: 6,
-                                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,
+            //拼单商品从这里进，先判断有没有买过商品，
+            getApp().request.get("/api/weshop/rechargeServicelist/page", {
+                data: {
+                    prom_id: th.data.prom_act.id,
+                    prom_type: 6,
+                    user_id: oo.user_id,
+                    store_id: os.stoid,
+                    pageSize: 1,
+                    page: 1
+                },
+                success: function (e) {
+                    //--跳转到已经购买的情况--
+                    if (e.data.data.pageData.length > 0) {
+                        var odr = e.data.data.pageData[0];
+                        //还未支付
+                        if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) {
+                            wx.showModal({
+                                title: "您已经购买了该商品待支付中",
+                                success: function (a) {
+                                    if (a.confirm) {
+                                        wx.navigateTo({
+                                            url: "/packageA/pages/details_serviceCard/details_serviceCard?order_id=" + odr.order_id,
+                                        });
+                                    }
+                                }
                             });
+                        } else if (odr.pt_status == 1 && odr.order_status == 1) {
 
-                            ee.get_sto();
+                            if (this.data.is_go_to_team_show) return false;
+                            this.data.is_go_to_team_show = 1;
+                            wx.showLoading();
 
-                            var newTime = now;
-                            var endTime2 = t.data.data.end_time;
-                            var endTime1 = t.data.data.start_time;
+                            /*---
+                             wx.redirectTo({
+                             url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
+                             });--*/
+                            getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
 
-                            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);
-                                }
-                            }
-                            //-------查看有多少人在开这个团-------
-                            th.get_team_group(prom_id);
+                        } else {
+                            th.setData({
+                                is_normal: ind,
+                                openSpecModal_pt: 1
+                            });
                         }
-                    });
+                    }
+                    else {
+                        th.setData({
+                            is_normal: ind,
+                            openSpecModal_pt: 1
+                        });
+                    }
                 }
             })
-
+        }
     },
-	
-	
-	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}`;s
-		getApp().goto(url);
-	},
-	
-	
-	
-	//获取更多秒杀
-	get_more_flash: async function (func) {
-	    var f_more = false;
-	    var user_id = getApp().globalData.user_id;
-	    if (!user_id) user_id = 0;
-	
-	    var url = "/api/weshop/goods/listSkuFlash?store_id=" + os.stoid + "&goods_id=" + this.data.options.goods_id + "&user_id=" + user_id;
-	    //获取秒杀的多规格
-	    await getApp().request.promiseGet(url, {}).then(res => {
-	        if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
-	            f_more = res.data.data;
-	        }
-	    })
-	    if (!f_more) {
-	        func(false);
-	        return false;
-	    }
-	    //-- 秒杀的价格要更新 --
-	    for (let i in f_more) {
-	
-	        let item = f_more[i];
-	        f_more[i].prom_id = item.act_id;
-	        f_more[i].prom_type = 1;
-	        if (item.goods_id == this.data.data.goods_id) {
-	            continue;
-	        }
-	        var url = "/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + item.act_id;
-	        await getApp().request.promiseGet(url, {}).then(rs => {
-	            if (rs.data.code == 0) {
-	                f_more[i].price = rs.data.data.user_price;
-	
-	            }
-	        })
-	    }
-	    func(f_more);
-	
-	},
-	
-	
-	
-
-	
-	
-	//-------------获取购买数量的总函数----------------
-	get_buy_num: function (gd, func) {
-	    // var 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 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;
-	    // }
-	
-
-	        //----获取商品购买数----
-
-					    //----获取活动购买数----
-					    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
-					        },
-					        //-----获取-----
-					        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 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});
-			
-			
-	    // if (th.data.sku_g_pt) {
-	    //     // this.get_sto(1)
-	    //     this.setData({openSpecModal_flash_normal: 1});
-	    // } else {
-	    //     th.get_sto(1);
-	    //     th.get_sku(os.stoid, th.data.data, th.data.gid, 1, function () {
-	    //         th.setData({
-	    //             openSpecModal_flash_normal: 1
-	    //         });
-	    //     });
-	    // }
-	    // this.check_is_youhui(th.data.gid, 1);
-	},
-	
-	closeSpecModal_flash_normal: function () {
-	    this.setData({openSpecModal_flash_normal: 0});
-	},
-	
-	
-	//打开客服操作菜单
-	openCS() {
-		// 判断会员状态
-		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,
-		});
-	},
-	
-	
-	
-	
-	
-	
-	
-	//-- 加入购物的函数 --
-	add_cart_func: function (t) {
-	    var i = getApp().request;
-	    if (oo.user_id == null) {
-	        return s.my_warnning("还未登录！", 0, this);
-	    }
-	
-	    if (!getApp().globalData.userInfo) {
-	        return s.my_warnning("还未登录！", 0, this);
-	    }
-	
-	    var e = this,
-	        th = e,
-	        a = 0,
-	        o = this.data.sele_g;
-	    a = o.goods_id;
-	
-	    //----------添加到购物车时，要判断限购数量，--------
-	    e.get_buy_num(o, function (ee) {
-	        //---判断商品是否超出限购---
-	        if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
-	            if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
-	                // wx.showModal({
-	                //     title: '提示',
-	                //     content: '超出活动限购数量'
-	                // });
-									getApp().my_warnning('超出活动限购数量', 0, self);
-	                return false;
-	            }
-	        }
-	        //---判断商品是否超出活动限购---
-	        if ((th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) && !th.data.is_normal) {
-	            if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
-	                // wx.showModal({
-	                //     title: '提示',
-	                //     content: '超出活动限购数量'
-	                // });
-									getApp().my_warnning('超出活动限购数量', 0, self);
-	                return false;
-	            }
-	        }
-	
-	        if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
-	        if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
-	            this.setData({
-	                sto_sele_name: ""
-	            });
-	        if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th);
-	
-	        //--------------此时操作的数据------------
-	        var newd = {
-	            goods_id: o.goods_id,
-	            goods_num: th.data.goodsInputNum,
-	            pick_id: th.data.sto_sele_id,
-	            user_id: oo.user_id,
-	            store_id: th.data.stoid,
-	            goods_price: o.shop_price,
-	            member_goods_price: o.shop_price,
-	            goods_name: o.goods_name,
-	            goods_sn: o.goods_sn,
-	            sku: o.sku,
-	            prom_id: th.data.sele_g.prom_id,
-	            prom_type: th.data.sele_g.prom_type,
-	        };
-	
-	        //---是不是从收藏夹出来的---
-	        if (th.data.c_guide_id) {
-	            newd['guide_id'] = th.data.c_guide_id;
-	            newd['guide_type'] = 2;
-	            if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 3;
-	        } else {
-	            if (getApp().globalData.guide_id) {
-	                newd['guide_id'] = getApp().globalData.guide_id;
-	                newd['guide_type'] = 0;
-	                if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1;
-	            }
-	        }
-	
-	        //让商品带上房间号
-	        //让商品带上房间号
-	        if (th.data.sys_switch.is_skuroom_id == 1) {
-	            if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
-	                newd.room_id = getApp().globalData.room_id;
-	            }
-	        } else {
-	            if (newd.goods_id == getApp().globalData.room_goods_id) newd.room_id = getApp().globalData.room_id;
-	        }
-	
-	        //如果是积分够，is_integral_normal就要有积分购普通购买字段
-	        if (o.prom_type == 4) {
-	            newd.is_integral_normal = 1;
-	        }
-	
-	        //如果有线下取价
-	        if (o.offline_price) {
-	            newd.offline_price = o.offline_price;
-	            newd.pricing_type = o.pricing_type;
-	        }
-	
-	        //-----如果是秒杀，团购，积分购,拼团-----
-	        if (th.data.prom_type == 1 || th.data.prom_type == 2) {
-	
-	            if (th.data.openSpecModal_flash_normal) {
-	
-	                newd.prom_type = 0;
-	                newd.prom_id = 0;
-	
-	                //---如果是线下门店销售的时候---
-	                if (th.data.sales_rules == 2) {
-	                    var pick = th.get_pick_from_list(th.data.sto_sele_id)
-	                    //---通过接口获取门店的线下库存信息--
-	                    getApp().request.get("/api/weshop/goods/getWareStorages", {
-	                        data: {
-	                            storageNos: pick.pickup_no,
-	                            wareIds: encodeURIComponent(th.data.sele_g.erpwareid),
-	                            storeId: os.stoid
-	                        },
-	                        success: function (res) {
-	                            if (res.data.code == 0) {
-	                                if (res.data.data.pageData.length > 0) {
-	                                    var CanOutQty = res.data.data.pageData[0].CanOutQty;
-	                                    if (CanOutQty < e.data.goodsInputNum) {
-	                                        return s.my_warnning("库存不足！", 0, th);
-	                                    }
-	                                    //在调一次接口,读取商品的预出库的数量，lock
-	                                    getApp().request.get("/api/weshop/order/ware/lock/page", {
-	                                        data: {
-	                                            store_id: os.stoid,
-	                                            wareId: th.data.sele_g.goods_id,
-	                                            storageId: pick.pickup_id,
-	                                            pageSize: 1000
-	                                        },
-	                                        success: function (res_data) {
-	                                            if (res_data.data.code == 0 && res_data.data.data.total > 0) {
-	
-	                                                var lock = 0;
-	                                                for (var i in res_data.data.data.pageData) {
-	                                                    lock += res_data.data.data.pageData[i].outQty;
-	                                                }
-	
-	                                                if (CanOutQty <= lock) {
-	                                                    return s.my_warnning("库存不足！", 0, th);
-	                                                }
-	                                                th.add_cart_next(e, t, a, o, newd, CanOutQty - lock);
-	                                            } else {
-	                                                th.add_cart_next(e, t, a, o, newd, CanOutQty);
-	                                            }
-	                                        }
-	                                    })
-	                                } else {
-	                                    return s.my_warnning("库存不足！", 0, th);
-	                                }
-	
-	                            }
-	                        }
-	                    })
-	                } else {
-	                    if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-	                    if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
-	                    th.add_cart_next(e, t, a, o, newd);  //加入购物车下一步
-	                }
-	
-	                return false;
-	            }
-	
-	
-	            newd.goods_price = th.data.prom_price;
-	            newd.member_goods_price = th.data.prom_price,
-	                newd.prom_type = th.data.prom_type;
-	            newd.prom_id = th.data.prom_id;
-	
-	            if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-	            if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
-	
-	            th.add_cart_next(e, t, a, o, newd);  //加入购物车下一步
-	
-	        } else if (o.prom_type == 7) {
-	
-	            //判断进行中的活动，是不是要判断线下库存
-	            th.check_zh_acting(function (ee) {
-	                newd.prom_id = 0;
-	                newd.prom_type = 0;
-	                if (ee && th.data.sele_g.act) {
-	                    newd.prom_id = th.data.sele_g.act.id;
-	                    newd.prom_type = 7;
-	                    if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-	                    if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
-	                    th.add_cart_next(e, t, a, o, newd);  //加入购物车下一步
-	                    return false;
-	                } else {
-	                    //---如果是线下门店销售的时候---
-	                    if (th.data.sales_rules == 2) {
-	                        var pick = th.get_pick_from_list(th.data.sto_sele_id)
-	                        //---通过接口获取门店的线下库存信息--
-	                        getApp().request.get("/api/weshop/goods/getWareStorages", {
-	                            data: {
-	                                storageNos: pick.pickup_no,
-	                                wareIds: encodeURIComponent(th.data.sele_g.erpwareid),
-	                                storeId: os.stoid
-	                            },
-	                            success: function (res) {
-	                                if (res.data.code == 0) {
-	                                    if (res.data.data.pageData.length > 0) {
-	                                        var CanOutQty = res.data.data.pageData[0].CanOutQty;
-	                                        if (CanOutQty < e.data.goodsInputNum) {
-	                                            return s.my_warnning("库存不足！", 0, th);
-	                                        }
-	                                        //在调一次接口,读取商品的预出库的数量，lock
-	                                        getApp().request.get("/api/weshop/order/ware/lock/page", {
-	                                            data: {
-	                                                store_id: os.stoid,
-	                                                wareId: th.data.sele_g.goods_id,
-	                                                storageId: pick.pickup_id,
-	                                                pageSize: 1000
-	                                            },
-	                                            success: function (res_data) {
-	                                                if (res_data.data.code == 0 && res_data.data.data.total > 0) {
-	
-	                                                    var lock = 0;
-	                                                    for (var i in res_data.data.data.pageData) {
-	                                                        lock += res_data.data.data.pageData[i].outQty;
-	                                                    }
-	
-	                                                    if (CanOutQty <= lock) {
-	                                                        return s.my_warnning("库存不足！", 0, th);
-	                                                    }
-	                                                    th.add_cart_next(e, t, a, o, newd, CanOutQty - lock);
-	                                                } else {
-	                                                    th.add_cart_next(e, t, a, o, newd, CanOutQty);
-	                                                }
-	                                            }
-	                                        })
-	                                    } else {
-	                                        return s.my_warnning("库存不足！", 0, th);
-	                                    }
-	
-	                                }
-	                            }
-	                        })
-	                    } else {
-	                        if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-	                        if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
-	                        th.add_cart_next(e, t, a, o, newd);  //加入购物车下一步
-	                    }
-	                }
-	            })
-	
-	        }
-	        else if (th.data.prom_type == 0 || th.data.prom_type == 3 || th.data.prom_type == 4 || th.data.prom_type == 5 || th.data.prom_type == 10) {
-	            newd.prom_type = 0;
-	            newd.prom_id = 0;
-	
-	            if (th.data.prom_type == 10) {
-	                newd.prom_type = th.data.prom_type;
-	                newd.prom_id = th.data.prom_id;
-	            }
-	
-	            //---如果是线下门店销售的时候---
-	            if (th.data.sales_rules == 2) {
-	                var pick = th.get_pick_from_list(th.data.sto_sele_id)
-	                //---通过接口获取门店的线下库存信息--
-	                getApp().request.get("/api/weshop/goods/getWareStorages", {
-	                    data: {
-	                        storageNos: pick.pickup_no,
-	                        wareIds: encodeURIComponent(th.data.sele_g.erpwareid),
-	                        storeId: os.stoid
-	                    },
-	                    success: function (res) {
-	                        if (res.data.code == 0) {
-	                            if (res.data.data.pageData.length > 0) {
-	                                var CanOutQty = res.data.data.pageData[0].CanOutQty;
-	                                if (CanOutQty < e.data.goodsInputNum) {
-	                                    return s.my_warnning("库存不足！", 0, th);
-	                                }
-	                                //在调一次接口,读取商品的预出库的数量，lock
-	                                getApp().request.get("/api/weshop/order/ware/lock/page", {
-	                                    data: {
-	                                        store_id: os.stoid,
-	                                        wareId: th.data.sele_g.goods_id,
-	                                        storageId: pick.pickup_id,
-	                                        pageSize: 1000
-	                                    },
-	                                    success: function (res_data) {
-	                                        if (res_data.data.code == 0 && res_data.data.data.total > 0) {
-	
-	                                            var lock = 0;
-	                                            for (var i in res_data.data.data.pageData) {
-	                                                lock += res_data.data.data.pageData[i].outQty;
-	                                            }
-	
-	                                            if (CanOutQty <= lock) {
-	                                                return s.my_warnning("库存不足！", 0, th);
-	                                            }
-	                                            th.add_cart_next(e, t, a, o, newd, CanOutQty - lock);
-	                                        } else {
-	                                            th.add_cart_next(e, t, a, o, newd, CanOutQty);
-	                                        }
-	                                    }
-	                                })
-	                            } else {
-	                                return s.my_warnning("库存不足！", 0, th);
-	                            }
-	
-	                        }
-	                    }
-	                })
-	            } else {
-	                if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-	                if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
-	                th.add_cart_next(e, t, a, o, newd);  //加入购物车下一步
-	            }
-	        }
-	    })
-	},
-	
-	//---加入购物车的最后一步---
-	add_cart_next(e, t, a, o, newd, CanOutQty) {
-	    var th = this, i = getApp().request;
-	    //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
-	    if ((o.prom_type != 1 || o.prom_id <= 0) && ((o.prom_type != 6 && o.prom_type != 4 && o.prom_type != 2 ) || th.data.is_normal)) {
-	        var conf = th.data.bconfig;
-	        if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) {
-	            var s_list = JSON.parse(conf.switch_list);
-	            var now = ut.gettimestamp();
-	
-	
-	            var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
-	            var end = new Date(str);
-	            end = Date.parse(end) / 1000;
-	
-	            //--如果后台有开启等级价的功能，而且会员的等级没有过期的情况下--
-	            if (parseInt(s_list.rank_switch) == 2 && end > now) {
-	                var card_price = o[getApp().globalData.userInfo['card_field']];
-	                //如果会员有等级价
-	                if (getApp().globalData.userInfo['card_field'] != undefined && getApp().globalData.userInfo['card_field'] != null
-	                    && getApp().globalData.userInfo['card_field'] != "" && card_price > 0) {
-	                    newd.goods_price = card_price;
-	                    newd.member_goods_price = card_price;
-	                }
-	            }
-	        }
-	    }
-
-	    if ("add" == t.currentTarget.dataset.action) {
-	
-	        if (th.data.prom_goods) {
-	            newd.prom_type = 3;
-	            newd.prom_id = th.data.prom_goods[0].prom_id;
-	        }
-	
-	        //----先看会员在购物车中是否加入了该商品-----
-	        i.get("/api/weshop/cart/page", {
-	            data: {
-	                store_id: e.data.stoid,
-	                user_id: oo.user_id,
-	                goods_id: a,
-	                pick_id: e.data.sto_sele_id,
-	                state: 0
-	            },
-	            success: function (re) {
-	
-	                //-------如果购物车中有相关的数据---------
-	                if (re.data.data.total > 0) {
-	
-	                    var item = re.data.data.pageData[0];
-	
-	                    //判断数量，要看下购物车中有没有该商品
-	                    if (CanOutQty) {
-	                        if (item.goods_num + th.data.goodsInputNum > CanOutQty) {
-	                            return s.my_warnning("库存不足！", 0, th);
-	                        }
-	                    } else {
-	                        if (item.goods_num + th.data.goodsInputNum > o.store_count) {
-	                            return s.my_warnning("库存不足！", 0, th);
-	                        }
-	                    }
-	
-	                    var updata = {
-	                        id: item.id,
-	                        goods_num: e.data.goodsInputNum + item.goods_num,
-	                        goods_price: newd.goods_price,
-	                        member_goods_price: newd.goods_price,
-	                        store_id: th.data.stoid,
-	                    };
-	
-	                    //---是不是从收藏夹出来的---
-	                    if (th.data.c_guide_id) {
-	                        updata['guide_id'] = th.data.c_guide_id;
-	                        updata['guide_type'] = 3;   //加入购物车之后就变成了3
-	                    } else {
-	                        if (getApp().globalData.guide_id) {
-	                            updata['guide_id'] = getApp().globalData.guide_id;
-	                            updata['guide_type'] = 0;
-	                        }
-	                    }
-	
-	                    i.put("/api/weshop/cart/update", {
-	                        data: updata,
-	                        success: function (t) {
-	                            getApp().my_warnning('加入购物车成功', 1, th, 450);
-	                            var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
-	                            th.setData({
-	                                cartGoodsNum: c_num
-	                            });
-	                            th.closeSpecModal();
-	                        }
-	                    });
-	                } else {
-	
-	
-	                    i.post("/api/weshop/cart/save", {
-	                        data: newd,
-	                        success: function (t) {
-	                            getApp().my_warnning('加入购物车成功', 1, th, 450);
-	                            var c_num = th.data.cartGoodsNum + e.data.goodsInputNum;
-	                            th.setData({
-	                                cartGoodsNum: c_num
-	                            });
-	                            th.closeSpecModal();
-	                        }
-	                    });
-	                }
-	            }
-	        });
-	
-	    }
-	    else {
-	
-	        //这一步主要是要让立即购买 走 购物车的逻辑 参与活动
-	        if (newd.prom_type == 10 || newd.prom_type == 7) {
-	            //----先看会员在购物车中是否加入了该商品,立即购买的-----
-	            getApp().request.get("/api/weshop/cart/page", {
-	                data: {
-	                    store_id: e.data.stoid,
-	                    user_id: oo.user_id,
-	                    state: 1
-	                },
-	                success: function (res) {
-	                    //-------如果购物车中有相关的数据---------
-	                    if (res.data.code == 0 && res.data.data.total > 0) {
-	                        for (let j in res.data.data.pageData) {
-	                            let item_j = res.data.data.pageData[j];
-	                            var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
-	                            getApp().request.delete(url, {});
-	                        }
-	                    }
-	                    newd.state = 1;
-	                    getApp().request.post("/api/weshop/cart/save", {
-	                        data: newd,
-	                        success: function (t) {
-	                            th.closeSpecModal();
-	                            getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
-	                        }
-	                    });
-	                },
-	            })
-	            return false;
-	        }
-	
-	        if (th.data.prom_goods) {
-	            var prom_d = th.data.prom_goods;
-	            for (var i in prom_d) {
-	                //判断活动有俩种条件，0元 1件
-	                var condition_t = prom_d[i].prom_type;
-	                switch (condition_t) {
-	                    case 0: //按钱
-	                        if (newd.goods_price >= condition_t) {
-	                            newd.prom_type = 3;
-	                            newd.prom_id = prom_d[i].prom_id;
-	                        }
-	                        break
-	                    case 1://按购买数量
-	                        if (newd.goods_num >= condition_t) {
-	                            newd.prom_type = 3;
-	                            newd.prom_id = prom_d[i].prom_id;
-	                        }
-	                        break;
-	                }
-	            }
-	
-	        }
-	
-	        newd['pick_name'] = th.data.sto_sele_name;
-	        newd['pick_dis'] = th.data.sto_sele_distr;
-	        th.buyNow(newd);
-	    }
-	},
-
-	click_contact:function () {
-	    getApp().globalData.no_clear=1;
-	},
-	
-	//打开客服操作菜单
-	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,
-		});
-	},
-
-	//--点击弹起拼单--
-	openSpecModel_pt: function (e) {
-	
-	
-	    this.setData({open_ind_store: 4, goodsInputNum: 1});//拼团直接给4
-	
-	
-	    //--先判断会员状态--
-	    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;
-	    }
-	
-	    var th = this;
-	    var ind = parseInt(e.currentTarget.dataset.it);
-	
-	    //如果是拼单活动的普通购买
-	    if (ind == 1) {
-	
-	        if (!th.data.is_normal) {
-	            th.data.g_buy_num = new Map();
-	        }
-	
-	        //如果拼单的sku data是空的，就要先获取一下
-	        if (th.data.sku_g_pt) {
-	            th.get_sto(1);
-	            th.setData({
-	                is_normal: ind,
-	                openSpecModal_pt: 1
-	            });
-	        } else {
-	            th.get_sto(1);
-	            th.get_sku(os.stoid, th.data.data, th.data.gid, 1, function () {
-	                th.setData({
-	                    is_normal: ind,
-	                    openSpecModal_pt: 1
-	                });
-	            });
-	        }
-	        th.check_is_youhui(th.data.gid, 1);
-	    } else {
-	
-	        if (th.data.is_normal) {
-	            th.data.g_buy_num = new Map();
-	        }
-	
-	        //拼单商品从这里进，先判断有没有买过商品，
-	        getApp().request.get("/api/weshop/order/page", {
-	            data: {
-	                pt_prom_id: th.data.prom_act.id,
-	                user_id: oo.user_id,
-	                store_id: os.stoid,
-	                pageSize: 1,
-	                page: 1
-	            },
-	            success: function (e) {
-	                //--跳转到已经购买的情况--
-	                if (e.data.data.pageData.length > 0) {
-	                    var odr = e.data.data.pageData[0];
-	                    //还未支付
-	                    if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) {
-	                        wx.showModal({
-	                            title: "您已经购买了该商品待支付中",
-	                            success: function (a) {
-	                                if (a.confirm) {
-	                                    wx.navigateTo({
-	                                        url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
-	                                    });
-	                                }
-	                            }
-	                        });
-	                    } else if (odr.pt_status == 1 && odr.order_status == 1) {
-	
-	                        if (this.data.is_go_to_team_show) return false;
-	                        this.data.is_go_to_team_show = 1;
-	                        wx.showLoading();
-	
-	                        /*---
-	                         wx.redirectTo({
-	                         url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
-	                         });--*/
-	                        getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
-	
-	                    } else {
-	                        th.setData({
-	                            is_normal: ind,
-	                            openSpecModal_pt: 1
-	                        });
-	                    }
-	                }
-	                else {
-	                    th.setData({
-	                        is_normal: ind,
-	                        openSpecModal_pt: 1
-	                    });
-	                }
-	            }
-	        })
-	    }
-	},
 
     //--获取有多少人在开团--
     async get_team_group(prom_id) {
@@ -4296,18 +3376,32 @@ Page({
                 teamgroup = res.data.data.pageData;
                 grounp_tatal = res.data.data.total;
             })
+
             //获取订单的总数这个接口不能用
-            for (i = 0; i < teamgroup.length; i++) {
-                await getApp().request.promiseGet("/api/weshop/order/page", {
-                    data: {
-                        store_id: os.stoid,
-                        pt_status: 1,
-                        pt_listno: teamgroup[i].listno
-                    }
-                }).then(res => {
-                    var order = res.data.data.pageData;
-                    teamgroup[i].open_num = order.length;
-                })
+            for (var i = 0; i < teamgroup.length; i++) {
+
+                if(teamgroup[i].goods_type==0){
+                    await getApp().request.promiseGet("/api/weshop/order/page", {
+                        data: {
+                            store_id: os.stoid,
+                            pt_status: 1,
+                            pt_listno: teamgroup[i].listno
+                        }
+                    }).then(res => {
+                        var order = res.data.data.pageData;
+                        teamgroup[i].open_num = order.length;
+                    })
+                }else{
+
+                    //获取order信息根据订单编号order_sn
+                    await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", {
+                        data: { store_id: os.stoid, prom_id: prom_id,pt_status: 1}
+                    }).then(res => {
+                        var order = res.data.data.pageData;
+                        teamgroup[i].open_num = order.length;
+                    })
+                }
+
                 await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + teamgroup[i].openvipid, {}).then(res => {
                     var user = res.data.data;
                     teamgroup[i].user = user;
@@ -4324,6 +3418,377 @@ Page({
         }
     },
 
+    doScrollTop: function () {
+        wx.pageScrollTo({
+            scrollTop: 0
+        });
+    },
+
+
+    clickShare() {
+        if(!getApp().globalData.user_id){
+            getApp().goto("/packageE/pages/togoin/togoin");
+            return false;
+        }
+        this.setData({
+            share_hidden: true,
+        });
+    },
+
+    cancel() {
+        this.setData({
+            share_hidden: false,
+        });
+    },
+
+
+    //-- 先版绘制 --
+    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.推荐来源
+        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');
+        }
+
+        if (type == 2) { // 商家和会员团
+            src = '../../../../images/share/ct_num.png';
+            context.drawImage(src, 54 * unit, 648 * unit, 120 * unit, 30 * unit);
+            context.setTextAlign('left');
+
+            let ct_num = self.data.prom_act.ct_num;
+            context.setFontSize(16 * unit)
+            context.font = 'normal';
+            context.setFillStyle("red")
+            if (ct_num < 10) {
+                context.fillText(ct_num + "人拼团", 100 * unit, 670 * unit);
+            } else {
+                context.fillText(ct_num + "人拼团", 96 * unit, 670 * unit);
+            }
+            context.setFontSize(22 * unit)
+            context.fillText("已拼" + self.data.prom_act.buy_num + "份", 186 * unit, 672 * unit);
+        }
+
+        if (type == 3) { // 阶梯团
+            let list = self.data.prom_act.ct_rylist;
+            for (let i = 0; i < list.length; i++) {
+                let item = list[i];
+                let wi = i * 90 * unit;
+                context.font = 'normal';
+                context.setTextAlign('left');
+                context.setFontSize(16 * unit)
+                context.setFillStyle("red")
+                context.fillText("￥", 50 * unit + wi, 680 * unit);
+                context.setFontSize(22 * unit)
+                let pri = parseFloat(item.price).toFixed(2);
+                context.fillText(pri, 66 * unit + wi, 680 * unit);
+
+
+                context.setFillStyle("gray")
+                context.fillText("满" + item.rynum + "人", 50 * unit + wi, 716 * unit);
+            }
+
+
+            var wp=  52 * unit;
+            var hp=755 * unit
+            self.draw_pos_price(context,wp,hp,self.data.data.market_price,unit);
+        }
+
+
+        // 7.商品价格
+        if (type != 3) {
+            let price = this.data.data.money;
+            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');
+            if (this.data.prom_type == 4 && this.data.prom_integral) {
+                context.fillText(this.data.prom_integral + '积分+￥' + price, 54 * unit, 735 * unit);
+
+                var wp= 62 * unit+ut.measureText(this.data.prom_integral + '积分+￥' + price, 32 * unit);
+                var hp=735 * unit
+                this.draw_pos_price(context,wp,hp,this.data.data.market_price,unit);
+
+            } else {
+                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.market_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();
+
+    },
+
+
+    //-------跳转pt teamshow-------
+    go_to_team_show: function () {
+
+        if (this.data.is_go_to_team_show) return false;
+        this.data.is_go_to_team_show = 1;
+        wx.showLoading();
+
+        var th = this;
+        var url = "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + th.data.buy_order.order_sn;
+        /*--
+         wx.redirectTo({
+         url:url,
+         })--*/
+        getApp().goto(url);
+
+        setTimeout(()=>{
+            this.data.is_go_to_team_show =0;
+        },1000)
+
+    },
+
+
+    //---拼团倒计时---
+    countDown2() {
+        if (!this.data.is_timer) return false;
+        var th = this;
+        // 获取当前时间，同时得到活动结束时间数组
+        var newTime = ut.gettimestamp();
+        var List = th.data.teamgroup;
+        for (var j = 0; j < List.length; j++) {
+            // 对结束时间进行处理渲染到页面
+            var endTime = List[j].kt_end_time;
+            let obj = null;
+            // 如果活动未结束，对时间进行处理
+            if (endTime - newTime > 0) {
+                let time = (endTime - newTime);
+                // 获取天、时、分、秒
+                let day = parseInt(time / (60 * 60 * 24));
+                let hou = parseInt(time % (60 * 60 * 24) / 3600);
+                let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+                let 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 {
+                //活动已结束，全部设置为'00'
+                obj = {
+                    day: '00',
+                    hou: '00',
+                    min: '00',
+                    sec: '00'
+                }
+            }
+            var txt = "timer[" + j + "]";
+            th.setData({
+                [txt]: obj
+            });
+        }
+        setTimeout(th.countDown2, 1000);
+    },
+    //-- 跳转参加团 --
+    go_cj_team: function (e) {
+        var ind = e.currentTarget.dataset.ind;
+        var item = this.data.teamgroup[ind];
+        var goods_id = e.currentTarget.dataset.goodsid;
+        var id = item.id;
+        var th = this;
+
+        getApp().request.get("/api/weshop/rechargeServicelist/page", {
+            data: {
+                prom_type: 6,
+                prom_id: item.team_id,
+                user_id: oo.user_id,
+                store_id: os.stoid,
+                pageSize: 1,
+                page: 1
+            },
+            success: function (e) {
+                if (e.data.code != 0) {
+                    getApp().my_warnning("读取订单失败", 0, th);
+                    return fasle;
+                }
+                //--跳转到已经购买的情况--
+                if (e.data.data.pageData.length > 0) {
+                    var odr = e.data.data.pageData[0];
+                    //还未支付
+                    if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) {
+                        wx.showModal({
+                            title: "您已经购买了该商品待支付中",
+                            success: function (a) {
+                                if (a.confirm) {
+                                    wx.navigateTo({
+                                        url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
+                                    });
+                                }
+                            }
+                        });
+                    } else if (odr.pt_status == 1 && odr.order_status == 1) {
+
+                        if (this.data.is_go_to_team_show) return false;
+                        this.data.is_go_to_team_show = 1;
+                        wx.showLoading();
+
+                        getApp().goto("/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + odr.order_sn);
+
+                    } else {
+                        console.log(222, goods_id)
+                        wx.navigateTo({
+                            url: "/packageA/pages/serviceCard_pd/team_show/team_show?tg_id=" + id + "&goods_id=" + goods_id,
+                        });
+                    }
+                }
+                //--跳转到参团--
+                else {
+                    console.log(1111, th.data.goods_id)
+                    wx.navigateTo({
+                        url: "/packageA/pages/serviceCard_pd/team_show/team_show?tg_id=" + id + "&goods_id=" + goods_id,
+                    });
+                }
+            }
+        })
+
+    },
+
+    //-- 跳到团更多 --
+    go_t_more: function () {
+        var team_id = this.data.prom_id;
+        wx.navigateTo({
+            url: "/packageA/pages/serviceCard_pd/team_more/team_more?team_id=" + team_id,
+        });
+    },
+
+    //-------跳转pt商品-------
+    go_to_nopay: function () {
+        var th = this;
+        var url = "/packageA/pages/details_serviceCard/details_serviceCard?order_id=" + th.data.buy_order.order_id;
+        getApp().goto(url);
+
+    },
+
+
+    //--调用更新阶梯团的接口--
+    update_jiti: function (id) {
+        var th = this;
+        //--更新阶梯团--
+        getApp().request.put("/api/weshop/teamgroup/updateTeamOrder/" + os.stoid + "/" + id, {
+            success: function (ee) {
+                //--等于0是要去支付尾款，接口调用失败，就要去查看参团详情--
+                if (ee.data.code == 0) {
+                    th.setData({
+                        user_order_pt_state: 3,
+                    });
+                } else if (ee.data.code == -1) {
+                    th.setData({
+                        user_order_pt_state: 2,
+                    });
+                }
+            }
+        })
+    },
+
+    //--跳转到支付尾款界面--
+    go_pay_wk: function () {
+        var url = "/packageA/pages/serviceCard_pd/cart_wk/cart_wk?order_id=" + this.data.wk_order_id;
+        getApp().goto(url);
+    },
+
+
 });
 
 
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
index feb03a7..ffdfeb2 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
@@ -1,10 +1,10 @@
 {
-    "navigationBarTitleText": "商品详情",
+    "navigationBarTitleText": "卡项详情",
     "enablePullDownRefresh": false,
     "usingComponents": {
         "nav_box": "/components/nav_box/nav_box",
         "warn": "/components/long_warn/long_warn",
-        "goods_recommend": "/components/goods_list/goods_list",
-				"share": "/components/share/share"
+        "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
+		"share": "/components/share/share"
     }
 }
\ No newline at end of file
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
index eb4ee7e..3eb917e 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
@@ -4,7 +4,7 @@
 <wxs module="tool" src="filter.wxs"></wxs>
 
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
-<block>
+<block wx:if="{{isshow}}">
 	<view class="container">
 		<view class="type-navbar">
 			<view class="type-box" wx:for="{{categories}}" wx:key="categories">
@@ -79,9 +79,9 @@
 				        <view class="flex fs35 xc-qtsign">￥</view>
 				        <view class="fs50 val">{{prom_price}}</view>
 				      </view>
-				      <view class="word-line fs20 xc-qtunit-price">
-				        零售价￥{{filters.toFix(data.market_price,2)}}
-				      </view>
+				      <view wx:if="{{is_retail_price}}" class="fs20 xc-qtunit-price t-l" >零售价￥{{filters.toFix(data.market_price,2)}}</view>
+				      <view wx:else class="fs20 xc-qtunit-price t-l">￥{{filters.toFix(data.shop_price,2)}}</view>
+
 				    </view>
 						
 				    <view class="abs white xc-nanber">
@@ -94,16 +94,7 @@
 				      </view>
 				    </view>
 						
-						<!-- 幸运购 -->
-						<view class="abs white xc-nanber" wx:if="{{false}}">
-						  <text class="fs22">已成团{{prom_act.buy_num}}期</text>
-						  <view class="flex" style='margin-top:-34rpx'>
-						    <view class="xc-people-img">
-						      <image class="imgs" src="{{prom_st==1? iurl+'/miniapp/images/r_logo_red.png':iurl+'/miniapp/images/r_logo.png'}}"></image>
-						    </view>
-						    <view class="t-s fs20 xc-people-val">{{prom_act.ct_num}}人团</view>
-						  </view>
-						</view>
+
 						
 				    <view class="hy-stop word-color fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view>
 				    <view class="hy-stop word-color-lan fs26  abs" wx:if="{{prom_st==0}}">距活动开始还有</view>
@@ -215,7 +206,7 @@
 								<image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
 								<view class="fs30" style="color:black;">选择门店</view>
 							</view>
-							<view class="red_bb fs26">更多门店<text class="bg_jj"></text></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}}">
@@ -243,42 +234,7 @@
 
 				</view>
 				
-				
-				<view class="bdt16" wx:if="{{actList}}">
-				  <view class="cx-frame" style="position: relative; height: auto">
-				    <!-- <block> -->
-							<view class="flex ai_c" wx:for="{{actList}}">
-								<view class="cx-sizs fs30 pdr40" wx:if="{{item.prom_type == 1}}">秒杀{{index+1}}</view>
-								<view class="f1">
-									<!-- <view class="fs28 f1"> -->
-										<!-- <view>
-											<text class="prom_condition">
-											  <text class="fill-box">消费满</text>享优惠
-											</text>
-										</view> -->
-								
-										<!-- <view class="word f1 fs26"> -->
-									    <!-- <text class="tick lh2 pdr20" wx:if="{{item.money>0}}">减价{{item.money}}元</text>
-									    <text class="tick lh2 pdr20" wx:if="{{item.sale>0}}">打{{item.sale}}折</text>
-									    <text class="tick lh2 pdr20" wx:if="{{item.past==1}}">包邮</text>
-									    <text class="tick lh2 pdr20" wx:if="{{item.intValue>0}}">送{{item.intValue}}积分</text>
-									    <view class="tick lh2 pdr20" wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券</view>
-									    <view class="tick ellipsis-1x lh2" wx:if="{{item.gift_id>0}}">送商品{{item.goods_name}}</view>
-									    <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.lb_id>0}}" data-id="{{item.lb_id}}" bindtap="viewLbDetails">送{{item.lbtitle}}</view> -->
-									    <view class="tick ellipsis-1x lh2 details pdr40" bindtap="viewFlash" data-promtype="{{item.prom_type}}" data-promid="{{item.act_id}}">{{item.act_name}}</view>
-									  <!-- </view> -->
-									<!-- </view> -->
-								</view>
-							</view>
-				  		
-				      
-				    <!-- </block> -->
-				  </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>
@@ -595,26 +551,8 @@
 	</view> -->
 
 	<!-- 底部按钮 -->
-	<view class="join-cart jc_sb ai_c">
-
-		<view class="flex">
-			<!-- <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split pdh20" open-type="contact"
-			 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
-				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
-				<view>客服</view>
-			</button>
-
-			<view wx:elif="{{sys_switch.weapp_customertype==2}}" class="custom-service cart-ico new_split pdh20" bindtap="con_weixin"
-			 style="text-align: center">
-				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
-				<view>客服</view>
-			</view>
+	<view class="join-cart ai_c">
 
-			<view wx:else class="custom-service cart-ico new_split pdh20" bindtap="contactService" style="text-align: center">
-				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
-				<view>客服</view>
-			</view> -->
-			
 			<view class="custom-service cart-ico new_split pdh20" bindtap="openCS">
 			  <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
 			  <view>客服</view>
@@ -633,72 +571,23 @@
 					<view>购物车</view>
 				</navigator>
 			</view>
-		</view>
 
-		
-		<view class="flex f1 btn-group">
-			
-			<!-- 从“秒杀”入口进入购买商品 -->
-			<block wx:if="{{options.prom_type == 1}}">
-				<!-- 活动正在开始，商品还没抢光 -->
-				<block wx:if="{{prom_st==1 && !prom_r_null}}">
-					<view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view>
-					<view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即抢购</view>
-				</block>
-				
-				<!-- 活动还没开始，商品还没抢光 -->
-				<block wx:if="{{prom_st == 0 && !prom_r_null}}">
-					<!-- 秒杀预热要单独购买  -->
-					<!-- is_shop_buy支持以原价购买 -->
-					<block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
-							<view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view>
-							<view class="buy-btn cart-btn lanse f1">即将开始</view>
-					</block>
-					<block wx:else>
-						 <view class="buy-btn cart-btn cart-btn-lg lanse set_width f1">即将开始</view>
-					</block>
-				</block>
-				
-				<!-- 商品已被抢光 -->
-				<block wx:if="{{prom_r_null}}">	
-					<block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
-						<view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view>
-						<view class="buy-btn cart-btn huise f1">已抢光</view>
-					</block>
-					<view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width f1">已抢光</view>
-				</block>
-				
-				<!-- 活动已经结束，商品还没抢光 -->
-				<block wx:if="{{prom_st==3 && !prom_r_null}}">
-					<block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
-						<view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view>
-						<view class="buy-btn cart-btn huise f1">活动已经结束</view>
-					</block>
-					<view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width f1">活动已经结束</view>
-				</block>
-				
-			</block>
-			
-			<!-- -----拼单------ -->
-			<!-- <block wx:elif="{{options.prom_type==6}}">
+		    <!-- -----拼单------ -->
+		    <block >
 			  <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h">
 			    <view class="fir-v">
-			      
-			      <block wx:if="{{card_field && sele_g[card_field]>0}}">
-			        {{filters.toFix(sele_g[card_field],2)}}
-			      </block>
-			      <block wx:else>{{filters.toFix(sele_g.shop_price,2)}}</block>
+			      {{filters.toFix(sele_g.money,2)}}
 			    </view>
 			    <view>单独购买</view>
 			  </view>
-			  <block wx:if="{{user_order_pt_state==0}}"> -->
+			  <block wx:if="{{user_order_pt_state==0}}">
 			    <!-- --商家团-- -->
-			    <!-- <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==1}}" class="buy-btn cart-btn line-h">
+			     <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==1}}" class="buy-btn cart-btn line-h">
 			      <view class="fir-v">￥{{prom_act.price}}</view>
 			      <view>去参团</view>
-			    </view> -->
+			    </view>
 			    <!-- --会员团-- -->
-			    <!-- <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==2}}" class="buy-btn cart-btn line-h">
+			     <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==2}}" class="buy-btn cart-btn line-h">
 			      
 			      <view class="pd_top1" wx:if="{{prom_act.tz_yhjgtype>1}}">
 			        <view>一键开团</view>
@@ -713,9 +602,9 @@
 			        <view class="fir-v">￥{{ filters.toFix(prom_act.price,2)}}</view>
 			        <view>一键开团</view>
 			      </view>
-			    </view> -->
+			    </view>
 			    <!-- -阶梯团-- -->
-			    <!-- <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3 && user_order_pt_state!=3 }}" class="buy-btn cart-btn line-h">
+			    <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3 && user_order_pt_state!=3 }}" class="buy-btn cart-btn line-h">
 			      <view class="fir-v">￥{{filters.toFix(prom_act.yf_price,2)}}</view>
 			      <view>支付定金</view>
 			    </view>
@@ -734,16 +623,7 @@
 			      支付尾款
 			    </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>
 
@@ -787,8 +667,12 @@
 								</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}}</view>
+										<view class="flex xc-ash" style="flex-shrink:0;max-width: 62%;" >
+											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
+												<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
+													<text class="no_store">(配送不匹配)</text>
+												</block>
+											</view>
 										</view>
 										<view>
 											<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
@@ -814,7 +698,11 @@
 								<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}}</view>
+											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
+                                                <block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
+													<text class="no_store">(配送不匹配)</text>
+												</block>
+											</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"}}
@@ -842,7 +730,11 @@
 							<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}}</view>
+										<view class="fs28 xc-black3 address_name">{{item.pickup_name}}
+											<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
+												<text class="no_store">(配送不匹配)</text>
+											</block>
+										</view>
 									</view>
 									<view>
 										<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
@@ -913,12 +805,6 @@
 	</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">
@@ -945,3 +831,11 @@
 </view>
 
 <view class="mask2" bindtap="closeCS"></view>
+
+<!-- --弹起来,选择规格数量,拼单商品购买---- -->
+<view hidden="{{!openSpecModal_pt}}">
+	<include src="buy_pt.wxml" />
+</view>
+
+<!-- 分享控件，底部弹出 -->
+<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum" wx:if="{{share_hidden}}"></share>
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss
index f70d545..e4a323a 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss
@@ -361,20 +361,6 @@ image {
 
 }
 
-.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;
@@ -422,10 +408,7 @@ image {
 .join-btn {
     background-color: #ffb03f;
     height: 70rpx;
-/* border-radius: 55rpx 0rpx 0rpx 55rpx;
-margin-top: 16rpx; */
-
-
+    border-radius: 55rpx 0rpx 0rpx 55rpx;
 }
 
 view.cart-btn-lg {
@@ -435,8 +418,7 @@ view.cart-btn-lg {
 .buy-btn {
     background-color: #f23030;
     height: 70rpx;
-/* border-radius: 0 56rpx 55rpx 0; */
-
+    border-radius: 0 56rpx 55rpx 0;
 }
 
 .buy-btn-all{
@@ -868,7 +850,7 @@ left:31rpx;}
 .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;}
+.pt_qd{margin: 40rpx 0; height: auto;}
 .spec-cart-btn.w100{width: 95%; margin-left: 0; height: 75rpx; line-height:75rpx;margin: auto; }
 
 .sto_v{color: #333;}
@@ -2575,7 +2557,7 @@ line-height: 38rpx;
  }
  /* 门店分类列表 */
 .sort_store_list{
-  height: 82%;
+  max-height: 700rpx;
   overflow: hidden;
   overflow-y: scroll;
   width: 95%;
@@ -2969,4 +2951,18 @@ button.custom-service::after{
 	top: -1000px;
 }
 
+.join-cart>view {
+    width: 29%;
+}
+
+.join-cart>.new_split {
+    width: 13%;
+    text-align: center;
+    padding: 0;
+    margin: 0;
+}
+
+.shop_name.max{
+    max-width:370rpx; flex-shrink: 0;
+}
 
diff --git a/packageA/pages/serviceCard_pd/team_more/team_more.js b/packageA/pages/serviceCard_pd/team_more/team_more.js
new file mode 100644
index 0000000..2f46371
--- /dev/null
+++ b/packageA/pages/serviceCard_pd/team_more/team_more.js
@@ -0,0 +1,215 @@
+var t = getApp(), a = t.request, o = t.globalData.setting, os = o,
+  i = require("../../../../utils/util.js"), ut = i, s = require("../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../utils/runtime.js');
+
+
+Page({
+  data: {
+    ylburl: "https://mshopimg.yolipai.net/",//有礼派图片地址
+    pt_act: null,//拼单数据
+    baseUrl: "/api/weshop/teamgroup/page?1=1",
+    resourceUrl: t.globalData.setting.resourceUrl,
+    currentPage: 1,
+    requestData: null,
+    store_id: 1,
+    team_id:0,
+    requestUrl: "",
+    teamgroup:null,
+  },
+
+  onLoad: function (t) {
+
+    wx.setNavigationBarTitle({ title: "开团列表", })
+
+    var th=this;
+    //初始化加載更多
+    th.data.requestData=new Array();  
+    var team_id=t.team_id;
+    var teamlist=null;
+    th.data.team_id = team_id;
+
+   //获取活动表的ct_num
+    getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + team_id, {
+      data: {}
+    }).then(res => {
+      if (res.data.code == 0) {
+        teamlist = res.data.data;
+        var jt_team_num=teamlist.ct_rylist;
+        if (jt_team_num != "" && jt_team_num != null && jt_team_num!= undefined) {
+          var team_num_arr = JSON.parse(jt_team_num);
+          var max_num = 0;
+          team_num_arr.forEach(function (val, ind) {
+            if (val.rynum > max_num) max_num = val.rynum;
+          })
+          teamlist.max_num = max_num;
+        }
+
+         th.setData({ pt_act: teamlist });
+         th.init(team_id);
+      }
+    })
+  },
+
+  //加载更多的函数
+  async init(team_id) {
+         
+     var teamgroup_arr = [];//活動从表
+     var teamgroup = null,//活動从表
+      user = null,
+      ee = this, th=ee,
+      pt_status = 1;//已支付
+	 	  
+	  var req_data={
+		 store_id: os.stoid, pageSize:6,page:ee.data.currentPage,
+		 state: 2, team_id: team_id,ordernum:1
+	  }
+	  
+	  if(this.data.pt_act.kttype==3 && this.data.pt_act.max_num){
+		 req_data.max_num=this.data.pt_act.max_num; 
+	  }
+	  
+
+    //获取活动从表信息team_id
+    await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
+      data: req_data
+    }).then(res => {
+      if(ut.ajax_ok(res)){
+        teamgroup = res.data.data.pageData;
+        console.log(teamgroup);
+        ee.data.currentPage++;
+      }
+
+    })
+
+    //获取订单的总数这个接口不能用
+    for (i = 0; i < teamgroup.length; i++) {
+      await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", {
+        data: { store_id: os.stoid, pt_status: 1, pt_listno: teamgroup[i].listno }
+      }).then(res => {
+        if(ut.ajax_ok(res)){
+          var order = res.data.data.pageData;
+          teamgroup[i].open_num = order.length;
+        }
+      })
+
+      if(!teamgroup[i].open_num) continue;
+
+      await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + teamgroup[i].openvipid, {
+      }).then(res => {
+        var user = res.data.data;
+        teamgroup[i].user = user;
+      })
+
+      teamgroup_arr.push(teamgroup[i]);
+    }
+    // //设置值
+    // for(var ii=0;ii<teamgroup.length;ii++){
+    //   th.data.requestData.push(teamgroup[ii]);
+    // }
+    if(teamgroup_arr.length){
+      th.setData({ teamgroup: teamgroup_arr});
+      ee.countDown2();
+    }
+  },
+   //滚动到底部
+  onReachBottom: function () {
+    this.init(th.data.team_id);
+  },
+
+  resetData: function () {
+    n.resetConfig(), this.data.teamgroup = null, this.data.currentPage = 1;
+  },
+
+  //---小于10的格式化函数----
+  timeFormat(param) {
+    return param < 10 ? '0' + param : param;
+  },
+
+  //----拼单倒计时函数-----
+  countDown2() {
+    var th = this;
+    // 获取当前时间，同时得到活动结束时间数组
+    var newTime = ut.gettimestamp();
+    var List = this.data.teamgroup;
+	if(!List || List.length<=0) return false;
+
+    for (var j = 0; j < List.length; j++) {
+      // 对结束时间进行处理渲染到页面
+      var endTime = List[j].kt_end_time;
+      let obj = null;
+      // 如果活动未结束，对时间进行处理
+      if (endTime - newTime > 0) {
+        let time = (endTime - newTime);
+        // 获取天、时、分、秒
+        let day = parseInt(time / (60 * 60 * 24));
+        let hou = parseInt(time % (60 * 60 * 24) / 3600);
+        let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+        let 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 {
+        //活动已结束，全部设置为'00'
+        obj = {
+          day: '00',
+          hou: '00',
+          min: '00',
+          sec: '00'
+        }
+      }
+      var txt = "teamgroup[" + j + "].djs";
+      th.setData({
+        [txt]: obj
+      });
+    }
+
+    setTimeout(th.countDown2, 1000);
+  },
+
+  //--跳转到加载更多--
+  go_team_show:function (e) {
+
+    var th=this;
+    var tid=e.currentTarget.dataset.tid;
+    var team_id=e.currentTarget.dataset.team_id;
+    var oo=getApp().globalData;
+
+    getApp().request.get("/api/weshop/rechargeServicelist/page", {
+      data: {
+        prom_id: team_id,
+        user_id: oo.user_id,
+        store_id: os.stoid,
+        pageSize: 1,
+        page: 1
+      },
+      success: function(e) {
+        //--跳转到已经购买的情况--
+        if (e.data.code == 0 && e.data.data.pageData.length > 0) {
+          var odr = e.data.data.pageData[0];
+          //还未支付
+          if (odr.pt_status == 0 && odr.order_status == 1) {
+            wx.navigateTo({
+              url: "/packageA/pages/details_serviceCard/details_serviceCard/details_serviceCard?order_id=" + odr.order_id,
+            });
+          }else if (odr.pt_status == 1 && odr.order_status == 1){
+            wx.navigateTo({
+              url: "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + odr.order_sn,
+            });
+          }
+        }
+        //--跳转到参团--
+        else if(e.data.code == 0){
+          wx.navigateTo({
+            url: "/packageA/pages/serviceCard_pd/team_show/team_show?tg_id="+tid+"&goods_id="+th.data.pt_act.goods_id,
+          });
+        }
+
+      }
+    });
+
+  }
+ 
+})
\ No newline at end of file
diff --git a/packageA/pages/serviceCard_pd/team_more/team_more.json b/packageA/pages/serviceCard_pd/team_more/team_more.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/packageA/pages/serviceCard_pd/team_more/team_more.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/packageA/pages/serviceCard_pd/team_more/team_more.wxml b/packageA/pages/serviceCard_pd/team_more/team_more.wxml
new file mode 100644
index 0000000..45f8693
--- /dev/null
+++ b/packageA/pages/serviceCard_pd/team_more/team_more.wxml
@@ -0,0 +1,36 @@
+<!--//选项框-->
+<block  wx:for="{{teamgroup}}">
+<view class='group' wx:if="{{item.open_num>0}}">
+  <view class='group-list' bindtap="go_team_show" data-tid="{{item.id}}" data-team_id="{{item.team_id}}" >
+    <!--//选项框头像-->
+    <view class='gtou' >
+      <image src='{{item.user.head_pic}}'></image>
+    </view>
+    <!--//等你来拼-->
+    <view class='gdn'>等你来拼 (^_^)</view>
+    <!--//还差几人，剩余时间-->
+    <view class='ghaicha'>
+      <text class='gred' wx:if="{{pt_act.max_num}}">
+         <text wx:if="prom_act.max_num - item.open_num>0">还差{{pt_act.max_num - item.open_num}}人享最低优惠</text>
+         <text wx:else>您已经享最低优惠</text>
+      </text>
+      <text class='gred' wx:else>还差{{pt_act.ct_num - item.open_num}}人成团</text>
+      <view>
+        <view class="time_show_view">
+          剩余
+		  <text wx:if="{{item.djs.day}}">{{item.djs.day}}天:</text>
+		  <text>{{item.djs.hou}}</text>:
+          <text>{{item.djs.min}}</text>:
+          <text>{{item.djs.sec}}</text>结束
+        </view>
+      </view>
+
+    </view>
+    <!--//参加团-->
+    <view class='cjt'>
+      <navigator>去参团 ></navigator>
+    </view>
+    <view class="clear"></view>
+  </view>
+</view>
+</block>
\ No newline at end of file
diff --git a/packageA/pages/serviceCard_pd/team_more/team_more.wxss b/packageA/pages/serviceCard_pd/team_more/team_more.wxss
new file mode 100644
index 0000000..8b54aca
--- /dev/null
+++ b/packageA/pages/serviceCard_pd/team_more/team_more.wxss
@@ -0,0 +1,91 @@
+/* pages/team/team_more/team_more.wxss */
+
+/* pages/team/test.wxss */
+
+page {
+  background-color: white;
+}
+
+.top {
+  background-color: white;
+  width: 100%;
+  height: 100rpx;
+  font-size: 32rpx;
+  border-bottom: 2rpx #e5e5e5 solid;
+  padding-left: 4rpx;
+  padding-right: 4rpx;
+}
+
+.group {
+  width: 100%;
+  margin-top: 20rpx;
+  min-height: 108rpx;
+}
+
+.group .group-list {
+  border: 1rpx #f48886 solid;
+  border-radius: 200rpx;
+  height: 90rpx;
+  width: 720rpx;
+  margin-left: 15rpx;
+  overflow: hidden;
+  display: flex;
+  position: relative;
+}
+
+.group .group-list .gtou {
+  width: 80rpx;
+  height: 80rpx;
+  top: 6rpx;
+}
+
+.group .group-list .gtou image {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 200rpx;
+  background-color: green;
+}
+
+.group .group-list .gdn {
+  font-size: 24rpx;
+  line-height: 48rpx;
+  height: 48rpx;
+  width: 168rpx;
+  color: #8f8f94;
+  margin-left: 15rpx;
+}
+
+.group .group-list .ghaicha {
+  text-align: right;
+  width: 320rpx;
+  height: 96rpx;
+  font-size: 24rpx;
+  overflow: hidden;
+}
+
+.group .group-list .ghaicha .gred {
+  height: 48rpx;
+  line-height: 48rpx;
+  color: red;
+  width: 300rpx;
+}
+
+
+.group .group-list .cjt {
+  height: 86rpx;
+  width: 120rpx;
+  position: absolute;
+  right: 0;
+  top: 0;
+  border-radius: 0 100rpx 100rpx 0;
+  line-height: 86rpx;
+  font-size: 24rpx;
+  color: #fff;
+  border: 2rpx solid #dd524d;
+  background-color: #dd524d;
+}
+
+.gbody {
+  background-color: white;
+}
+.time_show_view{ height: 40rpx; line-height: 40rpx; color: #8f8f94; }
diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.js b/packageA/pages/serviceCard_pd/team_show/team_show.js
index b89f5f1..a39bd23 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.js
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.js
@@ -1,10 +1,6 @@
-var t = require("../../../../utils/util.js"),
-  ut = t,
-  e = require("../../../../utils/common.js"),
-  a = require("../../../../utils/wxParse/wxParse.js"),
+var ut = require("../../../../utils/util.js"),
   s = getApp(),
   i = s.request,
-  rq = i,
   oo = s.globalData,
   o = s.globalData.setting,
   os = o;
@@ -95,15 +91,13 @@ Page({
   },
   onLoad: function(options) {
       wx.setNavigationBarTitle({ title: "拼团订单",})
-      //var postdata=getApp().globalData.to_group;
+
       var postdata=options;
       var tg_id = postdata.tg_id, first_leader=options.first_leader,goods_id=options.goods_id;
       //如果tg_id是空的话
       if(tg_id==null ||goods_id==null){
         var tg_id_str=decodeURIComponent(postdata.scene);
         tg_id_str=tg_id_str.split("_");
-        console.log(tg_id_str.length);
-        //tg_id_str[0] teamgroup.id tg_id_str[1] user_id   tg_id_str[2] goods_id
         switch(tg_id_str.length){
           case 1:
             tg_id=tg_id_str[0];
@@ -126,6 +120,7 @@ Page({
       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
         }
       })
     }
@@ -134,9 +129,12 @@ Page({
 	
 	  var th=this;
 	  getApp().getConfig2(function(e) {
-	     th.setData({ bconfig: e,});	  
+
+         var json_d = JSON.parse(e.switch_list);
+	     th.setData({ bconfig: e,sys_switch:json_d});
 	     th.wait_for_store_config(); //获取默认的门店
     })
+
 		
   },
 
@@ -293,37 +291,28 @@ Page({
     var gd=this.data.goods;
     var th=this;
     var user_id=getApp().globalData.user_id;
-    var promgoodsbuynum=0;
+    var promcardbuynum=0;
     var goodsbuynum=0;
-    getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+    await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
       data: {
         store_id: os.stoid,
         user_id: user_id,
-        goods_id: gd.goods_id,
-        prom_type: gd.prom_type,
-        prom_id: gd.prom_id,
+        card_id: gd.id,
+        prom_type: 6,
+        prom_id: gd.prom_id,        
         isnew:1
       },
     }).then(res=>{
        var buy_num_data=res.data.data;
-       if(buy_num_data.promgoodsbuynum) promgoodsbuynum=buy_num_data.promgoodsbuynum;
-       goodsbuynum=buy_num_data.goodsbuynum;
+       if(buy_num_data.promcardbuynum) promcardbuynum=buy_num_data.promcardbuynum;
+       goodsbuynum=buy_num_data.cardbuynum;
     })
 
-    //先判断限购
-    if (num+goodsbuynum>gd.viplimited && gd.viplimited>0) {
-      getApp().confirmBox("超出商品限购");
-      return false;
-    }
-    if (num+promgoodsbuynum>th.data.teamlist.buy_limit && th.data.teamlist.buy_limit>0) {
+    if (num+promcardbuynum>th.data.teamlist.buy_limit && th.data.teamlist.buy_limit>0) {
       getApp().confirmBox("超出活动限购");
       return false;
     }
-    //判断库存
-    if ( num>gd.store_count) {
-      getApp().confirmBox("超出商品库存");
-      return false;
-    }
+
     var r_num=0;
     await  getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.teamlist.id, {
       1: 1
@@ -344,6 +333,8 @@ Page({
       minusStatus: minusStatus,
     })
 
+    return true;
+
   },
 
   /*输入框事件*/
@@ -370,22 +361,22 @@ Page({
       min_price = 0,
       th=this,
       that=th,
-      flag=null;
+      flag=null,
+      odr=null;
       await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2",{
         data:{
           store_id: os.stoid,
           is_end: 0,
           is_show: 1,
           user_id: getApp().globalData.user_id,
-          pageSize:1000
+          pageSize:1000,
+          goods_id:th.data.goods_id
         }
       }).then(res=>{
         let pd_list=res.data.data.pageData;
         if(res.data.code==0 && pd_list.length>0){
-          flag =pd_list.some(pd=>{
-              // if(th.data.goods_id){
-                return pd.goods_id==th.data.goods_id;
-              // }
+          flag =pd_list.find(pd=>{
+                return pd.goods_type==1;
           })
         }
       })
@@ -435,9 +426,10 @@ Page({
     var is_ok=1;
 
     //要先读取订单，看自己有没有买过该团的商品
-    await getApp().request.promiseGet("/api/weshop/order/page", {
+    await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", {
       data: {
-        pt_prom_id:teamgroup.team_id,
+        prom_id:teamgroup.team_id,
+        prom_type:6,
         user_id: oo.user_id,
         store_id: os.stoid,
         pageSize: 1,
@@ -453,18 +445,15 @@ Page({
       }
       //--跳转到已经购买的情况--
       if (e.data.data.pageData.length > 0) {
-        var odr = e.data.data.pageData[0];
+        odr = e.data.data.pageData[0];
         //还未支付
         if (odr.pt_status == 0 && odr.order_status == 1) {
-          wx.navigateTo({
-            url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
-          });
-          is_ok=0;
+
+            getApp().goto("/packageA/pages/details_serviceCard/details_serviceCard?order_id=" + odr.order_id)
+            is_ok=0;
         }else if (odr.pt_status == 1 && odr.order_status == 1){
-          wx.navigateTo({
-            url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
-          });
-          is_ok=0;
+            getApp().goto( "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + odr.order_sn);
+            is_ok=0;
         }
       }
     })
@@ -512,7 +501,7 @@ Page({
     }
 
     //多少人参团头像
-    await getApp().request.promiseGet("/api/weshop/order/pagePtList", {
+    await getApp().request.promiseGet("/api/weshop/rechargeServicelist/pagePtList", {
       data: {
         store_id: o.stoid,
         pt_listno: teamgroup.listno,
@@ -522,37 +511,31 @@ Page({
     })
 
     //获取商品信息
-    await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
+    await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + os.stoid + "/" + goods_id, {
     }).then(res => {
-      //商品地址
-      original_img = ee.data.imageurl + res.data.data.original_img,
-        goods = res.data.data
+          //商品地址
+          original_img = ee.data.imageurl + res.data.data.original_img,
+          goods = res.data.data
     })
-	
-	//显示商品规格
-	var gg = "";	
-	if(goods.goods_spec=="null" || goods.goods_spec==null ) goods.goods_spec="";
-	if(goods.goods_color=="null" || goods.goods_color==null) goods.goods_color="";
-	
-	if (goods.goods_spec != "" && goods.goods_color != "") {
-	  gg = goods.goods_spec + "/" + goods.goods_color;
-	} else if (goods.goods_spec != "" || goods.goods_color != "") {
-	  gg = goods.goods_spec + goods.goods_color;
-	} else {
-	  gg = "规格1";
-	}
-	goods.gg = gg;
-	
+
+    if(!goods){
+      getApp().showWarning("拼单活动商品未找到");
+      th.go_back();
+      return false;
+    }
+    goods.prom_id=teamgroup.team_id;
+
+
     //只装5个
     var ordertx2 = [], sf_num = 0, ct_nun = teamlist.ct_num;
     if (max_num) {
       ct_nun = parseInt(max_num);
-      if (ct_nun < ordertx.length) ct_nun = ordertx.length;
+      if (ordertx && ct_nun < ordertx.length) ct_nun = ordertx.length;
     }
 
     if (ct_nun > 5) ct_nun = 5;
     for (var i = 0; i < ct_nun; i++) {
-      if (i >= ordertx.length) sf_num++
+      if (!ordertx || i >= ordertx.length) sf_num++
       else
         ordertx2.push(ordertx[i]);
     }
@@ -566,9 +549,7 @@ Page({
 
     if(th.data.is_group_end==1 || th.data.is_group_end==2 ){
         getApp().confirmBox(th.data.end_text);
-        wx.redirectTo({
-          url: "/pages/goods/goodsInfo/goodsInfo?goods_id=" + goods.goods_id,
-        });
+        getApp().goto("/packageA/pages/goodsInfo/goodsInfo?goods_id=" + goods.card_id)
         return false;
     }
 
@@ -611,22 +592,21 @@ Page({
         th.data.fir_def_store={}; //赋值空对象
         return false;
       }
+
+      if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
       //--定时器推迟一下--
       setTimeout(function () {
         if(!th.data.goods) return false;
         var g_distr_type=th.data.goods.distr_type;
         //--如果默认门店的配送方式不对，就不能被选择--
-        if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
-          //th.data.fir_def_store={}; //赋值空对象
-          //return false;
-		  ee.is_no_dis=1;
-        }
+        // if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
+		 //  ee.is_no_dis=1;
+        // }
     
         var appd=getApp().globalData;
         var w_time = setInterval(function() {
           if (that.data.is_get_local_ok == 0) return false;
           clearInterval(w_time);
-          var distance = null;
           var e=JSON.parse(JSON.stringify(ee));
     
           //如果有开启近距离的话,同时距离优不一样了
@@ -710,9 +690,8 @@ Page({
     if(getCurrentPages()>1)
       wx.navigateBack({delta: 1})
     else
-      wx.navigateTo({
-        url: "/pages/index/index/index"
-      });
+       getApp().goto("/pages/index/index/index");
+
   },
   //---小于10的格式化函数----
   timeFormat(param) {
@@ -757,7 +736,7 @@ Page({
   },
  
   //------去支付，购买-------
-  go_pay:function () {
+  go_pay:async function () {
       var th=this;
 	  var def_pick_store=this.data.def_pick_store;
 	  if(def_pick_store && def_pick_store.pickup_id) {
@@ -773,6 +752,14 @@ Page({
         getApp().confirmBox("拼团商品至少要买"+qnum+"件!");
         return false;
       }
+
+
+      var minusStatus = th.data.num > 1 ? 'normal' : 'disable';
+      //判断限购
+      var f=await this.check_num(th.data.num,minusStatus);
+      if(!f) return false;
+
+
       //先判断团的redis数量
       this.buy_check_redis(function () {
         var arr=th.data.redis_arr;
@@ -789,15 +776,18 @@ Page({
           return false;
         }
 
+
+
         //--------------此时操作的数据------------
         var newd = {
-          goods_id: th.data.goods.goods_id,
+          id: th.data.goods.id,
           goods_num: th.data.num,
           pick_id: th.data.pick_id,
+            keyid: th.data.def_pick_store.keyid,
           user_id: oo.user_id,
-          store_id: th.data.stoid,
-          goods_name: th.data.goods.goods_name,
-          goods_sn: th.data.goods.goods_sn,
+          store_id: os.stoid,
+          goods_name: th.data.goods.service_name,
+          goods_sn: th.data.goods.service_sn,
         };
 
         //---是不是从收藏夹出来的---
@@ -846,7 +836,7 @@ Page({
 
         s.set_b_now(newd);
         wx.navigateTo({
-          url: "/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + th.data.goods.goods_id,
+          url: "/packageA/pages/serviceCard_pd/cart/cart?is_bnow=1&goods_id=" + th.data.goods.card_id,
         });
       });
   },
@@ -940,11 +930,16 @@ Page({
       })
   },
 
-  go_goodsinfo:function (e) {
-    var gid=e.currentTarget.dataset.gid;
-    var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
-    wx.navigateTo({ url: url, })  //跳到非tabbar页
-  },
+    go_goodsinfo:function (e) {
+        var index=e.currentTarget.dataset.index;
+        var item=this.data.pageteam[index];
+        var gid=item.goods_id;
+        var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+item.id+"&prom_type=6";
+        if(item.goods_type==1){
+            url="/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+item.id+"&prom_type=6";
+        }
+        getApp().goto(url);     //跳到非tabbar页
+    },
 
   gohome:function(){
     getApp().goto("/pages/index/index/index");
@@ -960,7 +955,7 @@ Page({
 
   //------ 分享配置 --------
   onShareAppMessage: function (e) {
-      getApp().globalData.no_clear=1;
+    getApp().globalData.no_clear=1;
     var curPage=this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -969,7 +964,7 @@ Page({
     var url=pagePath;
 
     //--分享图片--
-    img=th.data.iurl+th.data.teamlist.share_imgurl;
+    var img=this.data.iurl+this.data.teamlist.share_imgurl;
     //--把会员分享出去--
     if(getApp().globalData.user_id){
       if(url.indexOf("?")>0)
@@ -978,16 +973,22 @@ Page({
         url+="?first_leader="+getApp().globalData.user_id;
     }
 
+    if(url.indexOf('goods_id')==-1){
+      url+="&goods_id="+this.data.goods.id;
+    }
+
+    if(url.indexOf('tg_id')==-1){
+      url+="&tg_id="+this.data.teamgroup.id;
+    }
+
     return {
       path:url,
-      title: "商品分类",
+      title: "拼团",
       imageUrl: img,
     }
   },
 	
-	
-	
-	
+
 	
 	closeSpecModal: function() {
 		this.setData({
@@ -1005,9 +1006,25 @@ Page({
 	
 	//-- 选择门店。此时的门店选择与门店有关系 --
 	choice_store: function(ee) {
+
+      //--先判断会员状态--
+      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;
+      }
+
 				
 			  var th = this;
-			  var bconfig = th.data.bconfig;			
+			  var bconfig = th.data.bconfig;
+
+        //如果开启了，则不在选择门店
+        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;
@@ -1020,6 +1037,9 @@ Page({
 				getApp().confirmBox("门店库存不足", null, 25000, !1);
 				return false;
 			  }
+
+
+
 		
 		      if ( bconfig && bconfig.is_sort_storage) {
 			wx.getLocation({
@@ -1127,25 +1147,13 @@ Page({
 	  var timer_get = setInterval(function() {
 	    if (th.data.is_get_local_ok == 0) return false;
 	    if (!th.data.goods) return false;
-	    var dd = null,
-	        i = getApp().request;
+	    var dd = null, i = getApp().request;
 	    var g_distr_type = th.data.goods.distr_type;
-	    if (g_distr_type != 0) {
-	      dd = {
-	        store_id: o.stoid,
-	        distr_type: g_distr_type,
-          isstop: 0,
-          is_pos: 1,
-	        pageSize: 2000
-	      }
-	    } else {
+
 	      dd = {
-	        store_id: o.stoid,
-          isstop: 0,
-          is_pos: 1,
-	        pageSize: 2000
+	        store_id: o.stoid,isstop: 0,is_pos: 1, pageSize: 2000
 	      }
-	    }
+
 	    //如果有距离的话
 	    if (th.data.lat != null) {
 	      dd.lat = th.data.lat;
@@ -1439,7 +1447,7 @@ Page({
 	    if (th.data.is_show_sto_cat == 1) {
 	      item = th.data.def_pickpu_list[index];
 	    } else {
-	      item = th.data.only_pk[index]; //当没有门店分类的时候
+	      item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候
 	    }
 	
 	  } else {
@@ -1481,12 +1489,14 @@ Page({
 	    if (th.data.is_show_sto_cat == 1) {
 	      item = th.data.def_pickpu_list[index];
 	    } else {
-	      item = th.data.only_pk[index]; //当没有门店分类的时候
+	      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 store_id = o.stoid;
@@ -1544,6 +1554,12 @@ Page({
 	  })
 	
 	},
+
+
+    go_to:function (e) {
+        var url=e.currentTarget.dataset.url;
+        getApp().goto(url);
+    }
 	
 	
 	
diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.wxml b/packageA/pages/serviceCard_pd/team_show/team_show.wxml
index 6b6cf25..fcd8d17 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.wxml
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.wxml
@@ -3,7 +3,7 @@
 <view wx:if="{{is_show}}">
 
 	<!--图片区域-->
-	<view class='center'>
+	<view class='center'  bindtap="go_to" data-url="/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id={{goods.card_id}}&prom_type=6&prom_id={{teamlist.id}}">
 		<view class='cenleft'>
 			<image src='{{image}}' binderror='bind_bnerr' data-errorimg='image'></image>
 		</view>
@@ -11,7 +11,7 @@
 			<view class='cenrt'>
 
 				<view class='xc-goods-details ellipsis-2 fs28'>
-					<span>{{goods.goods_name}}</span>
+					<span>{{goods.serviceName}}</span>
 				</view>
 			</view>
 			<view class='cenrcen flex-vertical-between'>
@@ -19,7 +19,7 @@
 					<view class="fs40 xc-wc" style='font-size:40rpx'>
 						<span class="fs28" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
 					<view class="fs22 word-line xc-wc">
-						零售价￥{{goods.market_price}}
+						零售价￥{{goods.show_price}}
 					</view>
 				</view>
 				<view class="xc-wc fs24">
@@ -153,11 +153,7 @@
 			</view>
 		</view>
 	</view>
-	<!----//拼团玩法---->
-	<!-- <view class='pintuan' bindtap="cpd">
-		<view class='pintuanzhou'>拼团玩法</view>
-		<view class='pintuanyou'>开团/参团＞邀请参团＞人满成团</view>
-	</view> -->
+
 	<!--大家都在团-->
 	<view class='goodslist'>
 		<view class='goodslisttop'>
@@ -165,7 +161,7 @@
 			<view class='goodslisttopright'></view>
 		</view>
 		<view class="changxin">
-			<view class='onegoods' wx:for='{{pageteam}}' wx:key="{{index}}" bindtap="go_goodsinfo" data-gid="{{item.goods_id}}">
+			<view class='onegoods' wx:for='{{pageteam}}' wx:key="{{index}}" bindtap="go_goodsinfo" data-index="{{index}}">
 				<view class='onegoodsimg'>
 					<image src="{{imageurl+item.share_imgurl}}"></image>
 				</view>
@@ -187,9 +183,6 @@
 <view class="pop_up" wx:if="{{yijian}}">
 	<view>
 
-		<!----弹起来,选择规格数量,拼单商品购买------>
-		<!-- <view> -->
-		<!-- <view hidden="{{!openSpecModal_pt}}"> -->
 		<view bindtap="closeSpecModal" class="cover-layer"></view>
 		<view class="spec-model">
 			<view class="pding">
@@ -198,7 +191,7 @@
 				<view class="spec-goods">
 					<image class="wh100 spec-img xc-distance-bottom" src="{{image}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
 					<view class="spec-goods-info">
-						<view class="spec-goods-name ellipsis-1">{{goods.goods_name}}商品名称</view>
+						<view class="spec-goods-name ellipsis-1">{{goods.service_name}}商品名称</view>
 						<view class="flex ai_end xc-val-money">						
 							<view class="spec-goods-price">
 								<span class='t1'>¥</span><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text>	
@@ -229,7 +222,7 @@
 								<view class="fs28 xc-ash-9f">选择门店</view>
 					    </view>
 						
-						<view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></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>
@@ -237,17 +230,6 @@
 					<view class="fs24 xc-ash-9f xc-distance-top " wx:elif="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
 					
 				</view>
-				<!-- 商品的属性项目 -->
-				<view>
-					<view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
-					<block>
-						<view hidden="{{ismend==1}}" class="flex">
-							<view class="spec_bt act" >{{goods.gg}}
-							</view>
-						</view>
-					</block>
-					<view class="clear"></view>
-				</view>
 
 				<view>
 					<view class="b_num" hidden="{{ismend==1}}" style="margin-top: 20rpx">
@@ -260,7 +242,6 @@
 						</view>
 					</view>
 
-					<!-- <view class="clear"></view> -->
 
 				</view>
 			</view>
@@ -271,7 +252,6 @@
 			</view>
 
 		</view>
-		<!-- </view> -->
 
 	</view>
 </view>
@@ -416,83 +396,6 @@
   </view>
 </block>  
 
-
-
-
-
-
-<!-- <view class='buy-option'> -->
-<!--头部图片-->
-<!-- <view class='buy-top'>
-      <view class='buy-image mimg'>
-        <image src='{{image}}'></image>
-        <view>
-           <view>
-            <span class='t1'>¥</span><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text>
-           </view> 
-           <view class="ellipsis-2">
-               {{goods.goods_name}}
-           </view>
-        </view>
-
-      </view>
-
-      <view class='buy-cou' bindtap='cbcou'>⊗</view>
-      <view class='clear'></view>
-    </view> -->
-
-<!--取货门店-->
-<!-- <view class='quhuo' wx:if="{{qh}}" bindtap='cqh'> -->
-<!--当ii==0请选择门店显示，ii==1最后名字显示-->
-<!-- <text>取货门店</text><view class='end_name' wx:if="{{ii==1 }}">({{end_name}})</view><view wx:if="{{ii==0 }}" class='ttxz'>(请选择门店)</view>
-    </view> -->
-<!--选择门店-->
-<!-- <view class='xuanze1' wx:if="{{xz}}" bindtap='cxz'>
-      <text decode='true'>&lt; 选择门店</text>
-    </view>
-    <view class='x-z'> -->
-<!--第一层-->
-<!-- <block wx:if="{{one}}">
-        <view class="fir_view">
-          <view>
-            <view class='xuanze' bindtap='setchild' data-bindex='{{bindex}}' data-bname='{{item.name}}' wx:for-index="bindex" wx:for="{{ssl}}" wx:key>
-              <text decode='true'>{{item.name}}</text>
-            </view>
-          </view>
-        </view>
-      </block> -->
-<!--选择的-->
-<!-- <view class='xuanze1' wx:if="{{se}}" bindtap='sel'><text decode='true'>&lt;</text> {{sele_dl_name}}</view> -->
-<!--第二层list-->
-<!-- <block wx:if="{{list}}">
-        <scroll-view scroll-y="true" style="max-height: 460rpx">
-          <view class='xuanze' wx:for="{{ssl_child}}" wx:key bindtap='clist' 
-            data-pick_dis="{{item.distr_type}}" 
-            data-end='{{item.pickup_name}}' data-pick_id='{{item.pickup_id}}'>
-            <text decode='true'>{{item.pickup_name}}</text>
-          </view>
-        </scroll-view>
-      </block>
-    </view> -->
-
-<!--数量-->
-<!-- <view class='buy-button' wx:if="{{qh}}">
-      <text>数量</text>
-      <view class='stepper sum'>
-        <text class='{{minusStatus}}' type='number' bindtap='bindMinus' class="jiajian">-</text>
-        <input bindinput='bindManual' value='{{num}}'></input>
-        <text bindtap='bindPlus' class="jiajian">+</text>
-      </view>
-      <view class='clear'></view>
-    </view> -->
-
-<!-- <view class="clear"></view>
-  </view> -->
-<!--支付-->
-<!-- <view class='btn' bindtap="go_pay">立即支付</view> -->
-<!-- </view>
-</view> -->
-
 <!--mask吐司内容-->
 <view class="toast_mask" wx:if="{{isShowToast}}"></view>
 
diff --git a/packageA/pages/serviceCard_pd/team_success/team_success.js b/packageA/pages/serviceCard_pd/team_success/team_success.js
index 9ca0754..5e6a89d 100644
--- a/packageA/pages/serviceCard_pd/team_success/team_success.js
+++ b/packageA/pages/serviceCard_pd/team_success/team_success.js
@@ -81,10 +81,15 @@ Page({
 	  			th.setData({poster:json_data})					  							
 	  		}			
 	  	}
-	  })	
+	  })
+
+
+      getApp().getConfig(function (e) {
+          th.setData({sto_sele_name_1: e.store_name})
+      })
   },
   onShow:function () {
-      getApp().check_can_share();
+      getApp().check_can_share(this);
   },
 
   //关闭展开列表
@@ -151,7 +156,7 @@ Page({
         p_status=1;
 
       //--如果商家团的时候,这个要改---
-      await  getApp().request.promisePost("/api/weshop/order/pay/vipAutoTuan", {
+      await  getApp().request.promisePost("/api/weshop/rechargeServicelist/vipAutoTuan", {
           data: {orderSn:order_sn,storeId:os.stoid }
       })
 
@@ -193,7 +198,8 @@ Page({
     }).then(res => {
       if(res.data.code==0){
         teamlist=res.data.data;
-        this.setData({
+        ee.data.prom_act=teamlist;
+        ee.setData({
           teamlist:teamlist
         });
         var nt =ut.gettimestamp();
@@ -229,6 +235,7 @@ Page({
 
       //只装5个
       var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num;
+
       if(max_num){
          ct_nun=parseInt(max_num);
          if (ordertx && ct_nun < ordertx.length) ct_nun = ordertx.length;
@@ -241,10 +248,6 @@ Page({
             ordertx2.push(ordertx[i]);
       }
 
-      var sf_arr=[];
-      for (var i=0;i<sf_num;i++){
-          sf_arr.push(i);
-      }
 
 
     //获取活动从表信息team_id:305暂时
@@ -258,6 +261,28 @@ Page({
         }
     })
 
+      var head=[];
+      if(teamgroup.is_xuni_ct)  {
+          head=teamgroup.xuni_head_id.split(",");
+          order.is_xuni_ct=1;
+
+          this.setData({head:head,});
+      }
+
+
+
+      var sf_arr=[];
+      for (var i=0;i<sf_num;i++){
+
+          if(teamgroup.is_xuni_ct){
+              sf_arr.push(head[i]);
+          }else {
+
+              sf_arr.push(i);
+          }
+      }
+
+
 
     var ct_price = 0,
         num_0 = ordertx.length;
@@ -284,8 +309,7 @@ Page({
 
     //--当是成团的时候的操作--
     if(order.pt_status==2 || order.pt_status==4 || order.pt_status==5){
-        //设置值
-
+      //-- 设置值 --
       ee.setData({
         ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, min_price: min_price,
             order: order,  share_img: share_img,max_num:max_num,
@@ -412,7 +436,7 @@ Page({
 
         //二微码
         var path3 = os.url+ "/api/wx/open/app/user/getWeAppEwm/"+
-           os.stoid+"?sceneValue="+scene+"&pageValue=pages/team/team_show/team_show";
+           os.stoid+"?sceneValue="+scene+"&pageValue=/packageA/pages/serviceCard_pd/team_show/team_show";
 
            console.log(path3,6000);
 
@@ -437,225 +461,228 @@ Page({
 					var share_title=th.data.teamlist.share_title;
 					if(!share_title)
                         share_title=th.data.teamlist.title;
-                    context.drawImage(pg_path, 0, 0, 554 * unit, 899 * 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;				  
-							  var x1=(x+90) *unit;
-							  var y1=(y+50) *unit;		  
-							  //--昵称---
-							  context.setFontSize(24 * unit)
-							  context.setFillStyle("black")
-							  context.fillText(app.globalData.userInfo.nickname, x1, y1);
-							  var width = 24 * app.globalData.userInfo.nickname.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); 				  				  
-						}	
-						
-					}else{
-						//--昵称---
-						context.setFontSize(24 * unit)
-						context.setFillStyle("black")
-						context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
-						var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
-						//强烈推荐
-						var tj_path = "../../../../images/share/q_tj.png";
-						context.drawImage(tj_path, 152 * unit + width, 54 * unit, 110 * unit, 30 * unit);
-						context.setFontSize(18 * unit)
-						context.setFillStyle("white")
-						context.fillText('强烈推荐', 152 * unit + width + 20 * unit, 76 * unit);
-					}
-					
 
-                    //---产品名称---
-                    context.setFontSize(21.3 * unit);
-                    context.setFillStyle("black");
+                    var act_time='';
+                    if (!th.data.share_b_img){ // 如果是普通商品，绘制新海报
+                        th.drawPoster(context, unit, th.data.share_img_localpath, vpath, type);
+                    } else {
 
+                        context.drawImage(pg_path, 0, 0, 554 * unit, 899 * 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;
+                                var x1 = (x + 90) * unit;
+                                var y1 = (y + 50) * unit;
+                                //--昵称---
+                                context.setFontSize(24 * unit)
+                                context.setFillStyle("black")
+                                context.fillText(app.globalData.userInfo.nickname, x1, y1);
+                                var width = 24 * app.globalData.userInfo.nickname.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);
+                            }
 
+                        } else {
+                            //--昵称---
+                            context.setFontSize(24 * unit)
+                            context.setFillStyle("black")
+                            context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
+                            var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
+                            //强烈推荐
+                            var tj_path = "../../../../images/share/q_tj.png";
+                            context.drawImage(tj_path, 152 * unit + width, 54 * unit, 110 * unit, 30 * unit);
+                            context.setFontSize(18 * unit)
+                            context.setFillStyle("white")
+                            context.fillText('强烈推荐', 152 * unit + width + 20 * unit, 76 * unit);
+                        }
 
 
-                    th.draw_Text(context,share_title,
-                        38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
-                    //------产品的价格-------
-                    context.setFontSize(24 * unit)
-                    context.setFillStyle("red")
+                        //---产品名称---
+                        context.setFontSize(21.3 * unit);
+                        context.setFillStyle("black");
+
+                        th.draw_Text(context,share_title,
+                            38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
+                        //------产品的价格-------
+                        context.setFontSize(24 * unit)
+                        context.setFillStyle("red")
+
+                        var pri0 = th.data.teamlist.price;
+                        pri0=parseFloat(pri0).toFixed(2);
+                        var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
+                        context.fillText("￥", wd1-15, 180 * unit);
+                        context.setFontSize(31 * unit)
+                        context.fillText(pri0, wd1, 180 * unit);
+
+                        //---市场价划掉---
+                        context.setFillStyle("gray")
+                        context.setFontSize(22 * unit)
+                        pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2);
+                        var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
+                        context.fillText(pri0, wd2, 210 * unit);
+
+                        context.setStrokeStyle('gray')
+                        context.setLineWidth(1 * unit)
+                        context.moveTo(wd2-5, 204 * unit)
+                        context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit)
+                        context.stroke();
+                        console.log(th.data.share_img_localpath);
+
+
+                        //---中间大图---
+                        context.drawImage(th.data.share_img_localpath, 68 * unit, 242 * unit, 410 * unit, 410 * unit);
+
+                        var g_ct=th.data.teamlist.ct_num-th.data.ordertx.length;
+                        var wz= "";
+                        if(g_ct>0)  wz="还差"+g_ct+"人成团，";
+                        else{
+                            g_ct= th.data.max_num -th.data.ordertx.length;
+                            if(g_ct>0){
+                                wz="还差"+g_ct+"人享最低优惠，";
+                            }else{
+                                wz="已享受最优惠，";
+                            }
+                        }
 
-                    var pri0 = th.data.teamlist.price;
-                    pri0=parseFloat(pri0).toFixed(2);
-                    var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
-                    context.fillText("￥", wd1-15, 180 * unit);
-                    context.setFontSize(31 * unit)
-                    context.fillText(pri0, wd1, 180 * unit);
+                        //-------大图后面就不一样了-----------
+                        switch (type) {
+                            case 1://会员团和商家团的展示
+                                //---画线---
+                                context.setLineWidth(1 * unit)
+                                context.moveTo(32 * unit, 670 * unit)
+                                context.lineTo(520 * unit, 670 * unit)
+                                context.stroke();
 
-                    //---市场价划掉---
-                    context.setFillStyle("gray")
-                    context.setFontSize(22 * unit)
-                    pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2);
-                    var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
-                    context.fillText(pri0, wd2, 210 * unit);
+                                //---文字---
+                                context.setFontSize(22 * unit)
+                                context.setFillStyle("black")
+                                context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
 
-                    context.setStrokeStyle('gray')
-                    context.setLineWidth(1 * unit)
-                    context.moveTo(wd2-5, 204 * unit)
-                    context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit)
-                    context.stroke();
-                    console.log(th.data.share_img_localpath);
+                                //绘制成团图片
+                                var ct_img ="../../../../images/share/ct_num.png";
+                                context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit);
+                                var ct_num = th.data.teamlist.ct_num;
+                                context.setFontSize(14 * unit)
 
+                                context.setFillStyle("red")
+                                if(ct_num<10){
+                                    context.fillText(ct_num+"人拼团", 92 * unit, 760 * unit);
+                                }else{
+                                    context.fillText(ct_num+"人拼团", 86 * unit, 760 * unit);
+                                }
+                                context.setFontSize(22 * unit)
+                                context.fillText("已拼"+th.data.teamlist.buy_num+"份", 166 * unit, 763 * unit);
+                                context.setFillStyle("gray")
+                                context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 826 * unit);
+                                context.setFillStyle("black")
 
-                    //---中间大图---
-                    context.drawImage(th.data.share_img_localpath, 68 * unit, 242 * unit, 410 * unit, 410 * unit);
+                                context.setFontSize(22 * unit)
+                                context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit);
+                                //---二维吗图---
+                                //-- 自定义海报 --
+                                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, 120 * unit, 120 * unit);
+                                }else{
+                                    //---二维吗图---
+                                    context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+                                }
+                                break
+                            case 2://阶梯团的展示
+                                //---画线---
+                                context.setLineWidth(1 * unit)
+                                context.moveTo(32 * unit, 670 * unit)
+                                context.lineTo(520 * unit, 670 * unit)
+                                context.stroke();
+                                //---文字---
+                                context.setFontSize(22 * unit)
+                                context.setFillStyle("black")
+                                context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
+                                //---绘制中间阶梯的价格---
+                                var list= JSON.parse(th.data.teamlist.ct_rylist);
+                                for(var i=0; i<list.length;i++){
+                                    var item=list[i];
+                                    var wi=i*90*unit;
+                                    context.setFontSize(16 * unit)
+                                    context.setFillStyle("red")
+                                    context.fillText("￥", 40 * unit+wi, 756 * unit);
+                                    context.setFontSize(22 * unit)
+                                    var pri=parseFloat(item.price).toFixed(2);
+                                    context.fillText(pri, 56 * unit+wi, 756 * unit);
+                                    context.setFillStyle("gray")
+                                    context.fillText("满"+item.rynum+"人", 40 * unit+wi, 786 * unit);
+                                }
 
-                    var g_ct=th.data.teamlist.ct_num-th.data.ordertx.length;
-                    var wz= "";
-                    if(g_ct>0)  wz="还差"+g_ct+"人成团，";
-                    else{
-                        g_ct= th.data.max_num -th.data.ordertx.length;
-                        if(g_ct>0){
-                            wz="还差"+g_ct+"人享最低优惠，";
-                        }else{
-                            wz="已享受最优惠，";
+                                //----------------下面部分----------------
+                                context.setFillStyle("gray")
+                                context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 830 * unit);
+                                context.setFillStyle("black")
+                                context.setFontSize(22 * unit)
+
+                                context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
+                                //---二维吗图---
+                                //-- 自定义海报 --
+                                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, 120 * unit, 120 * unit);
+                                }else{
+                                    //---二维吗图---
+                                    context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+                                }
+                                break
                         }
-                    }
 
-                    //-------大图后面就不一样了-----------
-                    switch (type) {
-                        case 1://会员团和商家团的展示
-                            //---画线---
-                            context.setLineWidth(1 * unit)
-                            context.moveTo(32 * unit, 670 * unit)
-                            context.lineTo(520 * unit, 670 * unit)
-                            context.stroke();
-
-                            //---文字---
-                            context.setFontSize(22 * unit)
-                            context.setFillStyle("black")
-                            context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
-
-                            //绘制成团图片
-                            var ct_img ="../../../../images/share/ct_num.png";
-                            context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit);
-                            var ct_num = th.data.teamlist.ct_num;
-                            context.setFontSize(14 * unit)
-                         
-                            context.setFillStyle("red")
-                            if(ct_num<10){
-                                context.fillText(ct_num+"人拼团", 92 * unit, 760 * unit);
-                            }else{
-                                context.fillText(ct_num+"人拼团", 86 * unit, 760 * unit);
-                            }
-                            context.setFontSize(22 * unit)
-                            context.fillText("已拼"+th.data.teamlist.buy_num+"份", 166 * unit, 763 * unit);
-                            context.setFillStyle("gray")
-                            context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 826 * unit);
-                            context.setFillStyle("black")
-                            
-                            context.setFontSize(22 * unit)
-                            context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit);
-                            //---二维吗图---
-                            //-- 自定义海报 --
-                            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, 120 * unit, 120 * unit);				  
-                            }else{
-							   //---二维吗图---
-							   context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
-                            }	
-                            break
-                        case 2://阶梯团的展示
-                            //---画线---
-                            context.setLineWidth(1 * unit)
-                            context.moveTo(32 * unit, 670 * unit)
-                            context.lineTo(520 * unit, 670 * unit)
-                            context.stroke();
-                            //---文字---
-                            context.setFontSize(22 * unit)
-                            context.setFillStyle("black")
-                            context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
-                            //---绘制中间阶梯的价格---
-                            var list= JSON.parse(th.data.teamlist.ct_rylist);
-                            for(var i=0; i<list.length;i++){
-                                var item=list[i];
-                                var wi=i*90*unit;
-                                context.setFontSize(16 * unit)
-                                context.setFillStyle("red")
-                                context.fillText("￥", 40 * unit+wi, 756 * unit);
-                                context.setFontSize(22 * unit)
-                                var pri=parseFloat(item.price).toFixed(2);
-                                context.fillText(pri, 56 * unit+wi, 756 * unit);
-                                context.setFillStyle("gray")
-                                context.fillText("满"+item.rynum+"人", 40 * unit+wi, 786 * 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();
                             }
 
-                            //----------------下面部分----------------
-                            context.setFillStyle("gray")
-                            context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 830 * unit);
-                            context.setFillStyle("black")                        
-                            context.setFontSize(22 * unit)
-
-                            context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
-                            //---二维吗图---
-                            //-- 自定义海报 --
-                            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, 120 * unit, 120 * unit);				  
-                            }else{
-                               //---二维吗图---
-                               context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
-                            }	
-                            break
-                    }
-
-                    //--- 如果是自定义海报的时候 ---
-                    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();
+                        }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();
+                        }
                     }
 
                     //把画板内容绘制成图片，并回调 画板图片路径
@@ -804,8 +831,14 @@ Page({
                 tt();
             },
             fail: function (res) {
-                ee.data.share_img_localpath= "../../../images/share/default_g_img.gif";  //分享的图片不能用网络的
-                tt();
+                //获取默认空白图
+                wx.getImageInfo({
+                    src:os.imghost+'/miniapp/images/default_g_img.gif',
+                    success: function(res) {
+                        ee.data.share_img_localpath = res.path; //分享的图片不能用网络的
+                        tt();
+                    }
+                })
             }
         });
     },
@@ -829,7 +862,7 @@ Page({
         var th=this;
         var scene=this.data.teamgroup.id;
         var goods_id=this.data.teamlist.goods_id;
-        var url="/pages/team/team_show/team_show?tg_id="+scene+"&goods_id="+goods_id;
+        var url="/packageA/pages/serviceCard_pd/team_show/team_show?tg_id="+scene+"&goods_id="+goods_id;
         //--分享图片--
         var img=th.data.iurl+th.data.teamlist.share_imgurl;
         //--把会员分享出去--
@@ -985,7 +1018,123 @@ Page({
     go_to:function (e) {
         var url=e.currentTarget.dataset.url;
         getApp().goto(url);
-    }
+    },
+
+    //-- 先版绘制 --
+    drawPoster(context, unit, img, vpath, type) {
+
+        var self=this;
+
+        // 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.推荐来源
+        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 == 1) { // 商家和会员团
+            src = '../../../../images/share/ct_num.png';
+            context.drawImage(src, 54 * unit, 648 * unit, 120 * unit, 30 * unit);
+            context.setTextAlign('left');
+
+            let ct_num = self.data.prom_act.ct_num;
+            context.setFontSize(16 * unit)
+            context.font = 'normal';
+            context.setFillStyle("red")
+            if (ct_num < 10) {
+                context.fillText(ct_num + "人拼团", 100 * unit, 670 * unit);
+            } else {
+                context.fillText(ct_num + "人拼团", 96 * unit, 670 * unit);
+            }
+            context.setFontSize(22 * unit)
+            context.fillText("已拼" + self.data.prom_act.buy_num + "份", 186 * unit, 672 * unit);
+        }
+
+        if (type == 2) { // 阶梯团
+            let list = self.data.prom_act.ct_rylist;
+            for (let i = 0; i < list.length; i++) {
+                let item = list[i];
+                let wi = i * 90 * unit;
+                context.font = 'normal';
+                context.setTextAlign('left');
+                context.setFontSize(16 * unit)
+                context.setFillStyle("red")
+                context.fillText("￥", 50 * unit + wi, 680 * unit);
+                context.setFontSize(22 * unit)
+                let pri = parseFloat(item.price).toFixed(2);
+                context.fillText(pri, 66 * unit + wi, 680 * unit);
+
+
+                context.setFillStyle("gray")
+                context.fillText("满" + item.rynum + "人", 50 * unit + wi, 716 * unit);
+            }
+
+
+            var wp=  52 * unit;
+            var hp=755 * unit
+            self.draw_pos_price(context,wp,hp,self.data.data.market_price,unit);
+        }
+
+
+        // 8.商品标题
+        context.setFontSize(20 * unit);
+        context.setFillStyle('#898989');
+        getApp().draw_Text(context, this.data.goods.service_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();
+    },
 
 })
 
diff --git a/packageA/pages/serviceCard_pd/team_success/team_success.wxml b/packageA/pages/serviceCard_pd/team_success/team_success.wxml
index 4889b15..2179fef 100644
--- a/packageA/pages/serviceCard_pd/team_success/team_success.wxml
+++ b/packageA/pages/serviceCard_pd/team_success/team_success.wxml
@@ -95,8 +95,10 @@
           <image src='{{item.head_pic}}'></image>
           <span wx:if="{{item.is_pt_tz==1}}">团长</span>
         </view>
-        <view class='d' wx:for="{{sf_arr}}" wx:if="{{p_status!=2}}">
-          <image  src='{{iurl}}/miniapp/images/shafa.png'></image>
+
+        <view class='d' wx:for="{{sf_arr}}">
+          <image wx:if="{{teamgroup.is_xuni_ct}}"  src='{{iurl}}/miniapp/images/anonymous/anonymous{{item}}.png'></image>
+          <image wx:else src='{{iurl}}/miniapp/images/shafa.png'></image>
         </view>
 
         <view class='xc-ellipsis-img flex-vertical' wx:if="{{ordertx.length>5}}">
@@ -164,8 +166,8 @@
       <!----/ // // // //按钮---->
       
       <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'>
-        <!-- 阶梯团 -->
-				<button wx:if="{{p_status==1}}"  bindtap="clickShare"  style='background-color:#fab55a; color:#fff'>
+        <!-- 阶梯团wx:if="{{isLogin}}" -->
+				<button wx:if="{{p_status==1 && isLogin}}"  bindtap="clickShare"  style='background-color:#fab55a; color:#fff'>
         <!-- <button wx:if="{{p_status==1}}"  bindtap="clickShare" bindtap='cmeng'  style='background-color:#fab55a; color:#fff'> -->
           邀请好友参团
         </button>
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
index 00a4994..26fbc72 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
@@ -50,8 +50,8 @@
       <view style="margin-top: 20rpx">
         <view  class="flex-space-between address ai_end xc-width ">
 
-          <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-            <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+          <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text>
 			
 			
             <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 7836bb4..89c9c35 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -1368,7 +1368,7 @@
                 </block>
                 <view class="address-frame xc-ash">
                   <view class="flex-vertical-between butttem5">
-                    <view class="flex xc-ash">
+                    <view class="flex xc-ash" style="flex-shrink:0;max-width: 62%;">
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
                     </view>
                     <view>
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
index a117d2a..e6ecb83 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
@@ -3120,6 +3120,7 @@ button.custom-service::after{
  	overflow-y: auto;
  }
 
+
  .searchbar {
   height: 95rpx;
   border-bottom: 2rpx solid rgb(238, 238, 238);
@@ -3143,3 +3144,7 @@ button.custom-service::after{
   border: 2rpx solid rgb(238, 238, 238);
   padding-left: 30rpx;
 }
+.shop_name.max{
+    max-width:370rpx; flex-shrink: 0;
+}
+
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 8f40d0d..5889794 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -937,7 +937,7 @@ Page({
               continue;
             }
 
-            if (item.prom_type == 0) {
+            if (item.prom_type == 0 && !item.is_integral_normal && !item.is_pd_normal ) {
               var prom = null;
               var now = ut.gettimestamp();
               await getApp().request.promiseGet(`/api/weshop/activitylist/listGoodActInfo2`, {
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index a253e05..12d0f9f 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -311,6 +311,7 @@ Page({
     jsarr.forEach(function (value, index) {
       if (count >= value['rynum']) price = value['price'];
     })
+
     var tail_money = (price * order_goods.goods_num - order['order_amount'] - order['user_money']).toFixed(2);
 
     tail_money = parseFloat(tail_money);
diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
index 4e47ae6..a15a554 100644
--- a/pages/goods/goodsInfo/buy_integral.wxml
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -28,6 +28,7 @@
 		      
 		                           <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
 		                             <text class="fs30 xc-black3 shop_name  bold  {{def_pick_store.distance!=null?'max':''}} ">{{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"}}
 		                               
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index 896489e..8883f33 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -51,8 +51,6 @@
 
           <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
             <text class="fs30 xc-black3 shop_name {{def_pick_store.distance!=null?'max':''}} ">{{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"}}
 
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index fa45f00..debf06f 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -130,7 +130,6 @@
                 <view class="flex fs35 xc-qtsign">￥</view>
                 <view class="fs50 val">{{prom_price}}</view>
               </view>
-
               <view wx:if="{{is_retail_price}}" class="word-line fs20 xc-qtunit-price no_line_c" style="color:#fff !important ">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
               <view wx:else class="word-line no_line_x fs20 xc-qtunit-price" style="color:#fff !important ">￥{{filters.toFix(data.shop_price,2)}}</view>
             </view>
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 3bfe10d..bdc5b7c 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -3135,8 +3135,8 @@ xc-ensure-div {
 }
 
 .xc-qt-price .xc-qtunit-price {
-	margin-left: 6rpx;
-	margin-top: -4rpx;
+	/*margin-left: 6rpx;*/
+	/*margin-top: -4rpx;*/
 }
 
 .xc-nanber {
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 96b7c3d..88aae79 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -316,7 +316,7 @@ Page({
 		}
 
 		//--正再拼团中的处理--
-		var url = "/api/weshop/order/pageTuan?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
+		var url = "/api/weshop/order/pageTuanNew?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
 		await getApp().request.promiseGet(url, {}).then(res => {
 			if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
 				th.data.pt_timer_arr = res.data.data.pageData;
diff --git a/pages/team/team_ping/team_ping.js b/pages/team/team_ping/team_ping.js
index dbee1f7..fdf5ece 100644
--- a/pages/team/team_ping/team_ping.js
+++ b/pages/team/team_ping/team_ping.js
@@ -92,8 +92,7 @@ Page({
 
 
     //获取订单表的信息根据活动user_id,pt_prom_id>0 AND pay_time>0
-
-    await getApp().request.promiseGet("/api/weshop/order/pageTuan?"+where, {
+    await getApp().request.promiseGet("/api/weshop/order/pageTuanNew?"+where, {
       data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,}
     }).then(res => {
        order = res.data.data.pageData;
@@ -102,82 +101,130 @@ Page({
 
 
     wx.showLoading({ title: "加载中"});
-    for (i = 0; i < order.length; i++) {
-      //获取订单从表信息
-      await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", {
-        data: { store_id: os.stoid, order_id: order[i].order_id }
-      }).then(res => {
-        order_goods = res.data.data.pageData;
-        order[i].order_goods = order_goods;
-        order[i].gimage = ee.data.imageurl + order_goods[0]?.original_img; 
-      })
+    if(order && order.length){
+      for (i = 0; i < order.length; i++) {
 
-          
-     //获取订单表信息根据上面查询的订单号order[i].pt_listno
-      await getApp().request.promiseGet("/api/weshop/order/pagePtList", {
-        data: { store_id: os.stoid, pt_listno: order[i].pt_listno,pageSize:60,page:1}
-      }).then(res => {
-         //console.log("ordertx");
-         ordertx = res.data.data.pageData;
-         //console.log(ordertx);
-         order[i].tx=ordertx;
-      })
+        //获取teamgroup中的值
+        await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
+          data: { store_id: os.stoid, listno: order[i].pt_listno,pageSize:1,page:1}
+        }).then(res => {
+          team_g = res.data.data.pageData[0]
+        })
 
-      //获取teamgroup中的值
-      await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
-        data: { store_id: os.stoid, listno: order[i].pt_listno,pageSize:1,page:1}
-      }).then(res => {
-         team_g = res.data.data.pageData[0]
-      
-      })
 
-      //获取预存使用金额
-      await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order[i].order_sn, {
-      }).then(res => {
-        if (res.data.code == 0 && res.data.data) {
-          // data[ind].use_commission = res.data.data.use_commission;
-          order[i].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退
-          order[i].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退
+        switch (team_g.goods_type){
+          case 0:
+            //获取订单从表信息
+            await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", {
+              data: { store_id: os.stoid, order_id: order[i].order_id }
+            }).then(res => {
+              order_goods = res.data.data.pageData;
+              order[i].order_goods = order_goods;
+              order[i].gimage = ee.data.imageurl + order_goods[0]?.original_img;
+            })
+
+            //获取订单表信息根据上面查询的订单号order[i].pt_listno
+            await getApp().request.promiseGet("/api/weshop/order/pagePtList", {
+              data: { store_id: os.stoid, pt_listno: order[i].pt_listno,pageSize:60,page:1}
+            }).then(res => {
+              //console.log("ordertx");
+              ordertx = res.data.data.pageData;
+              //console.log(ordertx);
+              order[i].tx=ordertx;
+            })
+            //获取预存使用金额
+            await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order[i].order_sn, {
+            }).then(res => {
+              if (res.data.code == 0 && res.data.data) {
+                // data[ind].use_commission = res.data.data.use_commission;
+                order[i].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退
+                order[i].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退
+              }
+            })
+            break;
+
+          case 1:
+
+            order[i].goods_type=1;
+            order[i].pre_cut=0;
+
+            //获取order信息根据订单编号order_sn
+            await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", {
+              data: { store_id: os.stoid, order_id: order[i].order_id,}
+            }).then(res => {
+              order_goods = res.data.data.pageData;
+              order_goods[0].goods_num=order_goods[0].qty;
+              order_goods[0].goods_price=order_goods[0].price;
+              order[i].order_goods = order_goods;
+            })
+
+
+            //pt_tail_money  在从表
+            order[i].pt_tail_money=order_goods[0].pt_tail_money;
+
+            //-- 获取商品信息 --
+            await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + os.stoid + "/" + order_goods[0].card_id, {
+            }).then(res => {
+              //-- 商品地址 --
+              order[i].gimage = ee.data.imageurl + res.data.data.imgUrl
+              order[i].order_goods[0].goods_name= res.data.data.serviceName;
+            })
+
+            //-- 多少人参团头像 --
+            await getApp().request.promiseGet("/api/weshop/rechargeServicelist/pagePtList", {
+              data: {
+                store_id: o.stoid,
+                pt_listno: team_g.listno,
+              }
+            }).then(res => {
+              ordertx = res.data.data.pageData;
+              order[i].tx=ordertx;
+            })
+
+            break;
         }
-      })
-     
 
-      if (order[i].is_zsorder== 4) {
-        var num = 0;
-        var jt_data = JSON.parse(order[i].ct_rylist);
-        for (var m in jt_data) {
-          if (jt_data[m].rynum > num) num = jt_data[m].rynum;
+
+        if (order[i].is_zsorder== 4) {
+          var num = 0;
+          var jt_data = JSON.parse(order[i].ct_rylist);
+          for (var m in jt_data) {
+            if (jt_data[m].rynum > num) num = jt_data[m].rynum;
+          }
+          order[i].max_ct_num = num;
         }
-        order[i].max_ct_num = num;
-      }
 
-      var head=[];
-      if(team_g.is_xuni_ct)  {
+        var head=[];
+        if(team_g.is_xuni_ct)  {
           head=team_g.xuni_head_id.split(",");
           order[i].is_xuni_ct=1;
-      }
+        }
+
+        var sf_num = order[i].ct_num;
+        if (order[i].ct_num>=3){ sf_num=3;}
+        sf_num=sf_num-ordertx.length;
+        if(sf_num>0) {
+          var arr = [];
+          for(var j=0;j<sf_num;j++){
+            if(team_g.is_xuni_ct){
+              arr.push(head[j]);
+            }else{
+              arr.push(j);
+            }
 
-      var sf_num = order[i].ct_num;
-      if (order[i].ct_num>=3){ sf_num=3;}
-      sf_num=sf_num-ordertx.length;
-      if(sf_num>0) {
-        var arr = [];
-        for(var j=0;j<sf_num;j++){
-          if(team_g.is_xuni_ct){
-            arr.push(head[j]);
-          }else{
-            arr.push(j);
           }
-         
+          order[i].sf_num=arr;
         }
-        order[i].sf_num=arr;
-      }
 
+      }
+      //设置值
+      for (var ii = 0; ii < order.length;ii++){
+        this.data.requestData.push(order[ii]);
+      }
     }
-    //设置值
-    for (var ii = 0; ii < order.length;ii++){
-      this.data.requestData.push(order[ii]);
-    }
+
+
+
 
     wx.hideLoading();
     ee.setData({ order: this.data.requestData, ordertx: ordertx, isgo:1});
@@ -195,9 +242,13 @@ Page({
   //----跳转到拼单success展示-----
   go_team_success:function(e) {
      var order_sn=e.currentTarget.dataset.ordsn;
-     wx.navigateTo({
-      url: "/pages/team/team_success/team_success?ordersn=" + order_sn,
-    });
+     var goods_type=e.currentTarget.dataset.goods_type;
+     var url="/pages/team/team_success/team_success?ordersn=" + order_sn;
+     if(goods_type==1){
+       url="/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + order_sn;
+     }
+     getApp().goto(url);
+
   },
 
   onHide:function(){
diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml
index 1483d58..52bd7bc 100644
--- a/pages/team/team_ping/team_ping.wxml
+++ b/pages/team/team_ping/team_ping.wxml
@@ -11,7 +11,7 @@
 <!--单号显示--> 
 <view class='wu' wx:if="{{order.length>0}}">
   <view class='pd' wx:for="{{order}}" wx:key>
-    <view class='pd-list' bindtap="go_team_success" data-ordsn="{{item.order_sn}}">
+    <view class='pd-list' bindtap="go_team_success" data-ordsn="{{item.order_sn}}" data-goods_type="{{item.goods_type}}">
       <!--top-->
       <view class='pd-list-top'>
         <!-- <image src='{{iurl}}/miniapp/images/dianpu.png'></image> -->
@@ -33,7 +33,11 @@
               <view class="flex">
                 <text class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>￥</text>
                 <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view>
-                <view class="flex no_line_c  word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black"></text><text class="fs24 xc-wc">￥</text><text class="fs26  xc-wc">{{item.order_goods[0].shop_price || item.order_goods[0].market_price}}</text> </view>
+                <view hidden="{{item.goods_type}}" class="flex no_line_c  word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}">
+                  <text class="fs24 xc-black"></text>
+                  <text class="fs24 xc-wc">￥</text>
+                  <text  class="fs26  xc-wc">{{item.order_goods[0].shop_price || item.order_goods[0].market_price}}</text>
+                </view>
               </view>
 
               <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}">
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index 9980dc6..2e3fcb4 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -982,6 +982,14 @@ Page({
         url+="?first_leader="+getApp().globalData.user_id;
     }
 
+    if(url.indexOf('goods_id')==-1){
+      url+="&goods_id="+this.data.goods.goods_id;
+    }
+    if(url.indexOf('tg_id')==-1){
+      url+="&tg_id="+this.data.teamgroup.id;
+    }
+
+
     return {
       path:url,
       title: "商品分类",
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index 17f0cf2..fabddfb 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -84,7 +84,11 @@ Page({
 	  			th.setData({poster:json_data})					  							
 	  		}			
 	  	}
-	  })	
+	  })
+
+      getApp().getConfig(function (e) {
+          th.setData({sto_sele_name_1: e.store_name})
+      })
   },
   onShow:function () {
       getApp().check_can_share(this);
@@ -462,223 +466,227 @@ Page({
 					var share_title=th.data.teamlist.share_title;
 					if(!share_title)
                         share_title=th.data.teamlist.title;
-                    context.drawImage(pg_path, 0, 0, 554 * unit, 899 * 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;				  
-							  var x1=(x+90) *unit;
-							  var y1=(y+50) *unit;		  
-							  //--昵称---
-							  context.setFontSize(24 * unit)
-							  context.setFillStyle("black")
-							  context.fillText(app.globalData.userInfo.nickname, x1, y1);
-							  var width = 24 * app.globalData.userInfo.nickname.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); 				  				  
-						}	
-						
-					}else{
-						//--昵称---
-						context.setFontSize(24 * unit)
-						context.setFillStyle("black")
-						context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
-						var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
-						//强烈推荐
-						var tj_path = "../../../images/share/q_tj.png";
-						context.drawImage(tj_path, 152 * unit + width, 54 * unit, 110 * unit, 30 * unit);
-						context.setFontSize(18 * unit)
-						context.setFillStyle("white")
-						context.fillText('强烈推荐', 152 * unit + width + 20 * unit, 76 * unit);
-					}
-					
-
-                    //---产品名称---
-                    context.setFontSize(21.3 * unit);
-                    context.setFillStyle("black");
-
-
-                    getApp().draw_Text(context,share_title,
-                        38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
-                    //------产品的价格-------
-                    context.setFontSize(24 * unit)
-                    context.setFillStyle("red")
-
-                    var pri0 = th.data.teamlist.price;
-                    pri0=parseFloat(pri0).toFixed(2);
-                    var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
-                    context.fillText("￥", wd1-15, 180 * unit);
-                    context.setFontSize(31 * unit)
-                    context.fillText(pri0, wd1, 180 * unit);
-
-                    //---市场价划掉---
-                    context.setFillStyle("gray")
-                    context.setFontSize(22 * unit)
-                    pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2);
-                    var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
-                    context.fillText(pri0, wd2, 210 * unit);
-
-                    context.setStrokeStyle('gray')
-                    context.setLineWidth(1 * unit)
-                    context.moveTo(wd2-5, 204 * unit)
-                    context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit)
-                    context.stroke();
-                    console.log(th.data.share_img_localpath);
-
-
-                    //---中间大图---
-                    context.drawImage(th.data.share_img_localpath, 68 * unit, 242 * unit, 410 * unit, 410 * unit);
-
-                    var g_ct=th.data.teamlist.ct_num-th.data.ordertx.length;
-                    var wz= "";
-                    if(g_ct>0)  wz="还差"+g_ct+"人成团，";
-                    else{
-                        g_ct= th.data.max_num -th.data.ordertx.length;
-                        if(g_ct>0){
-                            wz="还差"+g_ct+"人享最低优惠，";
+
+                    if (!th.data.share_b_img){ // 如果是普通商品，绘制新海报
+                        th.drawPoster(context, unit, th.data.share_img_localpath, vpath, type);
+                    } else {
+                        context.drawImage(pg_path, 0, 0, 554 * unit, 899 * 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;
+                                var x1=(x+90) *unit;
+                                var y1=(y+50) *unit;
+                                //--昵称---
+                                context.setFontSize(24 * unit)
+                                context.setFillStyle("black")
+                                context.fillText(app.globalData.userInfo.nickname, x1, y1);
+                                var width = 24 * app.globalData.userInfo.nickname.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);
+                            }
+
                         }else{
-                            wz="已享受最优惠，";
+                            //--昵称---
+                            context.setFontSize(24 * unit)
+                            context.setFillStyle("black")
+                            context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
+                            var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
+                            //强烈推荐
+                            var tj_path = "../../../images/share/q_tj.png";
+                            context.drawImage(tj_path, 152 * unit + width, 54 * unit, 110 * unit, 30 * unit);
+                            context.setFontSize(18 * unit)
+                            context.setFillStyle("white")
+                            context.fillText('强烈推荐', 152 * unit + width + 20 * unit, 76 * unit);
                         }
-                    }
 
-                    //-------大图后面就不一样了-----------
-                    switch (type) {
-                        case 1://会员团和商家团的展示
-                            //---画线---
-                            context.setLineWidth(1 * unit)
-                            context.moveTo(32 * unit, 670 * unit)
-                            context.lineTo(520 * unit, 670 * unit)
-                            context.stroke();
-
-                            //---文字---
-                            context.setFontSize(22 * unit)
-                            context.setFillStyle("black")
-                            context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
-
-                            //绘制成团图片
-                            var ct_img ="../../../images/share/ct_num.png";
-                            context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit);
-                            var ct_num = th.data.teamlist.ct_num;
-                            context.setFontSize(14 * unit)
-                         
-                            context.setFillStyle("red")
-                            if(ct_num<10){
-                                context.fillText(ct_num+"人拼团", 92 * unit, 760 * unit);
+
+                        //---产品名称---
+                        context.setFontSize(21.3 * unit);
+                        context.setFillStyle("black");
+
+
+                        getApp().draw_Text(context,share_title,
+                            38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
+                        //------产品的价格-------
+                        context.setFontSize(24 * unit)
+                        context.setFillStyle("red")
+
+                        var pri0 = th.data.teamlist.price;
+                        pri0=parseFloat(pri0).toFixed(2);
+                        var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
+                        context.fillText("￥", wd1-15, 180 * unit);
+                        context.setFontSize(31 * unit)
+                        context.fillText(pri0, wd1, 180 * unit);
+
+                        //---市场价划掉---
+                        context.setFillStyle("gray")
+                        context.setFontSize(22 * unit)
+                        pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2);
+                        var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
+                        context.fillText(pri0, wd2, 210 * unit);
+
+                        context.setStrokeStyle('gray')
+                        context.setLineWidth(1 * unit)
+                        context.moveTo(wd2-5, 204 * unit)
+                        context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit)
+                        context.stroke();
+                        console.log(th.data.share_img_localpath);
+
+
+                        //---中间大图---
+                        context.drawImage(th.data.share_img_localpath, 68 * unit, 242 * unit, 410 * unit, 410 * unit);
+
+                        var g_ct=th.data.teamlist.ct_num-th.data.ordertx.length;
+                        var wz= "";
+                        if(g_ct>0)  wz="还差"+g_ct+"人成团，";
+                        else{
+                            g_ct= th.data.max_num -th.data.ordertx.length;
+                            if(g_ct>0){
+                                wz="还差"+g_ct+"人享最低优惠，";
                             }else{
-                                context.fillText(ct_num+"人拼团", 86 * unit, 760 * unit);
+                                wz="已享受最优惠，";
                             }
-                            context.setFontSize(22 * unit)
-                            context.fillText("已拼"+th.data.teamlist.buy_num+"份", 166 * unit, 763 * unit);
-                            context.setFillStyle("gray")
-                            context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 826 * unit);
-                            context.setFillStyle("black")
-                            
-                            context.setFontSize(22 * unit)
-                            context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit);
-                            //---二维吗图---
-                            //-- 自定义海报 --
-                            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, 120 * unit, 120 * unit);				  
-                            }else{
-							   //---二维吗图---
-							   context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
-                            }	
-                            break
-                        case 2://阶梯团的展示
-                            //---画线---
-                            context.setLineWidth(1 * unit)
-                            context.moveTo(32 * unit, 670 * unit)
-                            context.lineTo(520 * unit, 670 * unit)
-                            context.stroke();
-                            //---文字---
-                            context.setFontSize(22 * unit)
-                            context.setFillStyle("black")
-                            context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
-                            //---绘制中间阶梯的价格---
-                            var list= JSON.parse(th.data.teamlist.ct_rylist);
-                            for(var i=0; i<list.length;i++){
-                                var item=list[i];
-                                var wi=i*90*unit;
-                                context.setFontSize(16 * unit)
+                        }
+
+                        //-------大图后面就不一样了-----------
+                        switch (type) {
+                            case 1://会员团和商家团的展示
+                                //---画线---
+                                context.setLineWidth(1 * unit)
+                                context.moveTo(32 * unit, 670 * unit)
+                                context.lineTo(520 * unit, 670 * unit)
+                                context.stroke();
+
+                                //---文字---
+                                context.setFontSize(22 * unit)
+                                context.setFillStyle("black")
+                                context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
+
+                                //绘制成团图片
+                                var ct_img ="../../../images/share/ct_num.png";
+                                context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit);
+                                var ct_num = th.data.teamlist.ct_num;
+                                context.setFontSize(14 * unit)
+
                                 context.setFillStyle("red")
-                                context.fillText("￥", 40 * unit+wi, 756 * unit);
+                                if(ct_num<10){
+                                    context.fillText(ct_num+"人拼团", 92 * unit, 760 * unit);
+                                }else{
+                                    context.fillText(ct_num+"人拼团", 86 * unit, 760 * unit);
+                                }
                                 context.setFontSize(22 * unit)
-                                var pri=parseFloat(item.price).toFixed(2);
-                                context.fillText(pri, 56 * unit+wi, 756 * unit);
+                                context.fillText("已拼"+th.data.teamlist.buy_num+"份", 166 * unit, 763 * unit);
                                 context.setFillStyle("gray")
-                                context.fillText("满"+item.rynum+"人", 40 * unit+wi, 786 * unit);
-                            }
+                                context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 826 * unit);
+                                context.setFillStyle("black")
 
-                            //----------------下面部分----------------
-                            context.setFillStyle("gray")
-                            context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 830 * unit);
-                            context.setFillStyle("black")                        
-                            context.setFontSize(22 * unit)
-
-                            context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
-                            //---二维吗图---
-                            //-- 自定义海报 --
-                            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, 120 * unit, 120 * unit);				  
-                            }else{
-                               //---二维吗图---
-                               context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
-                            }	
-                            break
-                    }
+                                context.setFontSize(22 * unit)
+                                context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit);
+                                //---二维吗图---
+                                //-- 自定义海报 --
+                                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, 120 * unit, 120 * unit);
+                                }else{
+                                    //---二维吗图---
+                                    context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+                                }
+                                break
+                            case 2://阶梯团的展示
+                                //---画线---
+                                context.setLineWidth(1 * unit)
+                                context.moveTo(32 * unit, 670 * unit)
+                                context.lineTo(520 * unit, 670 * unit)
+                                context.stroke();
+                                //---文字---
+                                context.setFontSize(22 * unit)
+                                context.setFillStyle("black")
+                                context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
+                                //---绘制中间阶梯的价格---
+                                var list= JSON.parse(th.data.teamlist.ct_rylist);
+                                for(var i=0; i<list.length;i++){
+                                    var item=list[i];
+                                    var wi=i*90*unit;
+                                    context.setFontSize(16 * unit)
+                                    context.setFillStyle("red")
+                                    context.fillText("￥", 40 * unit+wi, 756 * unit);
+                                    context.setFontSize(22 * unit)
+                                    var pri=parseFloat(item.price).toFixed(2);
+                                    context.fillText(pri, 56 * unit+wi, 756 * unit);
+                                    context.setFillStyle("gray")
+                                    context.fillText("满"+item.rynum+"人", 40 * unit+wi, 786 * unit);
+                                }
+
+                                //----------------下面部分----------------
+                                context.setFillStyle("gray")
+                                context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 830 * unit);
+                                context.setFillStyle("black")
+                                context.setFontSize(22 * unit)
+
+                                context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
+                                //---二维吗图---
+                                //-- 自定义海报 --
+                                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, 120 * unit, 120 * unit);
+                                }else{
+                                    //---二维吗图---
+                                    context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+                                }
+                                break
+                        }
+
+                        //--- 如果是自定义海报的时候 ---
+                        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();
+                            }
 
-                    //--- 如果是自定义海报的时候 ---
-                    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();
+                        }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();
+                        }
                     }
 
                     //把画板内容绘制成图片，并回调 画板图片路径
@@ -885,6 +893,122 @@ Page({
 
     },
 
+    //-- 先版绘制 --
+    drawPoster(context, unit, img, vpath, type) {
+
+        var self=this;
+        self.data.prom_act=this.data.teamlist;
+
+        // 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.推荐来源
+        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 == 1) { // 商家和会员团
+            src = '../../../images/share/ct_num.png';
+            context.drawImage(src, 54 * unit, 648 * unit, 120 * unit, 30 * unit);
+            context.setTextAlign('left');
+
+            let ct_num = self.data.prom_act.ct_num;
+            context.setFontSize(16 * unit)
+            context.font = 'normal';
+            context.setFillStyle("red")
+            if (ct_num < 10) {
+                context.fillText(ct_num + "人拼团", 100 * unit, 670 * unit);
+            } else {
+                context.fillText(ct_num + "人拼团", 96 * unit, 670 * unit);
+            }
+            context.setFontSize(22 * unit)
+            context.fillText("已拼" + self.data.prom_act.buy_num + "份", 186 * unit, 672 * unit);
+        }
+
+        if (type == 2) { // 阶梯团
+            let list = self.data.prom_act.ct_rylist;
+            for (let i = 0; i < list.length; i++) {
+                let item = list[i];
+                let wi = i * 90 * unit;
+                context.font = 'normal';
+                context.setTextAlign('left');
+                context.setFontSize(16 * unit)
+                context.setFillStyle("red")
+                context.fillText("￥", 50 * unit + wi, 680 * unit);
+                context.setFontSize(22 * unit)
+                let pri = parseFloat(item.price).toFixed(2);
+                context.fillText(pri, 66 * unit + wi, 680 * unit);
+
+
+                context.setFillStyle("gray")
+                context.fillText("满" + item.rynum + "人", 50 * unit + wi, 716 * unit);
+            }
+
+
+            var wp=  52 * unit;
+            var hp=755 * unit
+            self.draw_pos_price(context,wp,hp,self.data.data.market_price,unit);
+        }
+
+
+        // 8.商品标题
+        context.setFontSize(20 * unit);
+        context.setFillStyle('#898989');
+        getApp().draw_Text(context, this.data.goods.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();
+    },
 
 
 
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 51e2ce4..cb49013 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -1447,7 +1447,9 @@ Page({
         success: function (t) {
           th.setData({ paying: 0 });
           if (t.data.code == 0) {
-            th.onload();
+            //th.data.orderList.splice(o_index, 1);
+            //th.setData({ orderList: th.data.orderList });
+            th.onShow();
           } else {
             getApp().confirmBox(t.data.msg + "请您取消该订单");
           }
@@ -1467,8 +1469,23 @@ Page({
     t.pay(e.order_sn, function () {
       th.setData({ paying: 0 });
       wx.showToast({ title: '支付成功' })
-      th.data.orderList.splice(o_index, 1);
-      th.setData({ orderList: th.data.orderList });
+      //th.data.orderList.splice(o_index, 1);
+      //th.setData({ orderList: th.data.orderList });
+
+      //商家团支付成功后，要让他的团能够建立或者参与
+      if(e.is_zsorder==2){
+        //--如果商家团的时候---
+        getApp().request.promisePost("/api/weshop/order/pay/vipAutoTuan", {
+          data: {orderSn:e.order_sn,storeId:os.stoid }
+        })
+      }
+
+      setTimeout(()=>{
+        th.setData({is_get:0})
+        th.onShow();
+      },500)
+
+
     }, function () {
       th.setData({ paying: 0 });
     }, os.stoid, 1);
@@ -2374,7 +2391,17 @@ Page({
           };
           if (currentIndex == 2) { // 卡项订单
             list = th.data.cardList;
-            list = list.concat(data);
+            var new_data= data.map((item,index)=>{
+                 if(item.list && item.list.length){
+                   item.pt_status=item.list[0].pt_status;
+                   item.pt_tail_money=item.list[0].pt_tail_money;
+                   item.prom_id=item.list[0].prom_id;
+                   item.prom_type=item.list[0].prom_type;
+                 }
+                 return item;
+            })
+
+            list = list.concat(new_data);
             th.setData({ cardList: list });
             console.log('currentCard', list);
           };
@@ -2699,6 +2726,11 @@ Page({
 
   // 卡项订单 - 立即支付
   pay: async function (e) {
+    let th=this;
+
+    if(th.data.ser_paying) return false;
+    th.data.ser_paying=1;
+
     let index = e.currentTarget.dataset.index;
     let item = this.data.cardList[index];
     let order_sn = item.order_sn;
@@ -2706,14 +2738,11 @@ Page({
     let store_id = app.globalData.setting.stoid;
     let user_id = oo.user_id;
     let flag = true;
-
-    let th=this;
-
-
     // 如果是普通购买或单独购买，不用判断
     // 如果是秒杀购买：1、判断活动是否变化；2、是否超出限购
-
     let list = item.list;
+    var pt_act=null;  //-- 拼团活动的优化 --
+
     for (const it of list) {
       if (it.prom_type == 1) {
         let act_details = null;
@@ -2723,9 +2752,8 @@ Page({
 
 
         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);
             act_details = res.data.data;
             if (act_details.is_end == 1) {
               wx.showModal({
@@ -2745,108 +2773,129 @@ Page({
               flag = false;
               return false;
             };
-          };
-        });
 
-        await getApp().request.promiseGet('/api/weshop/activitylist/getActLen/' + store_id + '/' + it.prom_type + '/' + it.prom_id, {
-          1: 1
-        }).then(res => {
-          console.log('222222222====>>>');
-          if (res.data.code == 0) {
-            // 当前可以购买的数量
-            console.log('redis当前可以购买的数量：', res.data.data);
-            redis_num = res.data.data;
-            // if(redis_num <=0) {
-            // 	wx.showModal({
-            // 		title: '提示',
-            // 		content: '活动库存不足,无法支付,请取消订单！',
-            // 		showCancel: false,
-            // 	});
-            // 	// flag = false;
-            // 	return true;
-            // };
-          };
-        });
 
-        await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
-          data: {
-            store_id: store_id,
-            user_id: user_id,
-            card_id: it.card_id,
-            prom_type: it.prom_type,
-            prom_id: it.prom_id,
+            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;
+            }
+
           }
-        }).then(res => {
-          console.log('333333333====>>>');
-          if (res.data.code == 0) {
-            console.log('已经购买的数量：', res.data.data);
-            promcardbuynum = res.data.data.promcardbuynum;
+        });
 
+        if(act_details.buy_limit>0 && flag){
+            await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
+              data: {
+                store_id: store_id,
+                user_id: user_id,
+                card_id: it.card_id,
+                prom_type: it.prom_type,
+                prom_id: it.prom_id,
+                ispay:1
+              }
+            }).then(res => {
+              if (res.data.code == 0) {
+                  promcardbuynum = res.data.data.promcardbuynum;
+                  let canBuyNum = act_details.buy_limit - promcardbuynum; // 自己还可购买的数量c
+
+                  if (canBuyNum < qty) {
+                    wx.showModal({
+                      title: '提示',
+                      content: '您已超出活动限购数量,无法支付,请取消订单！',
+                      showCancel: false,
+                    });
+                    flag = false;
+                  }
+              }
+            })
+        }
 
-            let limited = act_details.buy_limit; // 限购数量a
-            let buyedNum = promcardbuynum; // 自己已经购买的数量b
-            let canBuyNum = limited - buyedNum; // 自己还可购买的数量c
+      };
 
+      if (it.prom_type == 6) {
+        let act_details = null;
+        let redis_num = 0;
+        let promcardbuynum = 0;
+        let qty = it.qty;
 
-            if (canBuyNum <= 0) {
+        await getApp().request.promiseGet("/api/weshop/teamlist/get/" + store_id + "/" + it.prom_id, {}).then(res => {
+
+          if (res.data.code == 0) {
+
+            act_details = res.data.data;
+
+            if (act_details.is_end == 1) {
               wx.showModal({
                 title: '提示',
-                content: '您已超出活动限购数量,无法支付,请取消订单！',
+                content: '活动已结束,无法支付,请取消订单！',
                 showCancel: false,
               });
               flag = false;
               return false;
-            };
-
-            if (limited > redis_num) {
-              if (canBuyNum <= redis_num) {
-                if (qty > canBuyNum) {
-                  wx.showModal({
-                    title: '提示',
-                    content: '您已超出活动限购数量,无法支付,请取消订单！',
-                    showCancel: false,
-                  });
-                  flag = false;
-                  return false;
-                };
-
-              };
-
-              if (canBuyNum > redis_num) {
-                if (qty > redis_num) {
-                  wx.showModal({
-                    title: '提示',
-                    content: '活动库存不足,无法支付,请取消订单！',
-                    showCancel: false,
-                  });
-                  flag = false;
-                  return false;
-                };
+            }
 
-              };
-            };
+            if (act_details.id != it.prom_id) {
+              wx.showModal({
+                title: '提示',
+                content: '活动发生了变化,无法支付,请取消订单,重新购买！',
+                showCancel: false,
+              });
+              flag = false;
+              return false;
+            }
 
-            if (limited <= redis_num) {
-              if (qty > canBuyNum) {
-                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.buy_limit>0 && flag){
+          await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
+            data: {
+              store_id: store_id,
+              user_id: user_id,
+              card_id: it.card_id,
+              prom_type: it.prom_type,
+              prom_id: it.prom_id,
+              ispay:1
+            }
+          }).then(res => {
+            if (res.data.code == 0) {
+              console.log('已经购买的数量：', res.data.data);
+              promcardbuynum = res.data.data.promcardbuynum;
+            }
+          })
+          let limited = act_details.buy_limit; // 限购数量a
+          let canBuyNum = limited - promcardbuynum; // 自己还可购买的数量c
+
+          if (canBuyNum < qty ) {
+            wx.showModal({
+              title: '提示',
+              content: '您已超出活动限购数量,无法支付,请取消订单！',
+              showCancel: false,
+            });
+            flag = false;
+          }
+        }
+        pt_act=act_details;
 
-    if(th.data.ser_paying) return false;
-    th.data.ser_paying=1;
+      }
 
+    }
 
     if (flag) {
 
@@ -2855,12 +2904,28 @@ Page({
         parentSn: order_sn,
         store_id: store_id
       }, function () {
-        th.data.ser_paying=0;
-        wx.showToast({
-          title: '支付成功',
-          icon:'success',
-          duration: 2000
-        });
+          th.data.ser_paying=0;
+          wx.showToast({
+            title: '支付成功',
+            icon:'success',
+            duration: 2000
+          });
+
+          if(pt_act.kttype==1){
+
+            //--如果商家团的时候,这个要改,要用服务卡的接口---
+            getApp().request.promisePost("/api/weshop/rechargeServicelist/vipAutoTuan", {
+              data: {orderSn:order_sn,storeId:os.stoid }
+            })
+          }
+
+          setTimeout(()=>{
+            th.setData({is_get:0})
+            th.onShow();
+          },500)
+
+
+
       }, function (e) {
         th.data.ser_paying=0;
         wx.showToast({
@@ -2891,7 +2956,9 @@ Page({
       //   });
       //   // }
       // });
-    };
+    }else {
+      th.data.ser_paying=0;
+    }
 
   },
 
@@ -2958,12 +3025,7 @@ Page({
                 },
               });
 
-              // let index = e.currentTarget.dataset.index;
-              // let cardList = self.data.cardList;
-              // cardList.splice(index, 1);
-              // self.setData({
-              // 	cardList,
-              // });
+
 
               //self.request_list(self.data.currentRequestData);
             },
@@ -2994,7 +3056,7 @@ Page({
 
 
     if (action == "buy") {
-      //--------------此时操作的数据------------
+      //-------------- 此时操作的数据 ------------
       var newd = {
         id: th.data.data.id,
         goods_num: th.data.goodsInputNum,
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 93c921b..e504d79 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -322,19 +322,44 @@
 	    <!--商品编号 -->
 	    <text selectable='true'>订单编号：{{item.order_sn}}</text>
 	    <!-- 订单状态 -->
-	    <view class="flex-center c-r">
-				<view wx:if="{{item.order_status == 0}}">待支付</view>
-				<view wx:if="{{item.order_status == 1}}" class="flex-center">待评价 <view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}"  ></image>
-        </view>
-				<view wx:if="{{item.order_status == 2}}" class="flex-center">已评价<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}"    data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image>
-        </view>
-				<view wx:if="{{item.order_status == 3}}" class="c-a9" class="flex-center">已取消<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}"    data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image>
-        </view>
-				<view wx:if="{{item.order_status == 5}}">已作废</view>
-	    </view>
+		  <view class="flex-center c-r">
+			  <view wx:if="{{item.pay_status == 0 && item.order_status<2 }}">
+				  <block wx:if="{{item.prom_type==6}}">
+					  <block wx:if="{{item.pt_status==0}}" >未支付</block>
+					  <block wx:if="{{item.pt_status==1}}" >组团中</block>
+
+				  </block>
+				  <block wx:else>
+					  待支付
+				  </block>
+			  </view>
+			  <view wx:if="{{item.order_status<2}}">
+				  <block wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</block>
+			  </view>
+
+			  <view wx:if="{{item.order_status == 1 && item.pay_status==1}}" class="flex-center">待评价
+				  <view class="lin"></view>
+				  <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"
+						 data-index="{{index}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}">
+
+				  </image>
+			  </view>
+			  <view wx:if="{{item.order_status == 2}}" class="flex-center">已评价
+				  <view class="lin"></view>
+				  <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData" data-index="{{index}}"
+						 data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}"></image>
+			  </view>
+
+
+              <!-- 要判断支付尾款失败 -->
+			  <view wx:if="{{item.order_status == 3 && item.pt_status!=6}}" class="c-a9" class="flex-center">已取消
+				  <view class="lin"></view>
+				  <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData" data-index="{{index}}"
+						 data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}"></image>
+			  </view>
+			  <view wx:if="{{item.order_status == 5}}">已作废</view>
+			  <view wx:if="{{item.pt_status==6}}"><text style="font-size: 26rpx;">支付尾款失败</text></view>
+		  </view>
 	  </view>
 	
 	  <!-- 商品详情集合 -->
@@ -345,7 +370,8 @@
 	        <!-- 商品图片 -->
 	        <navigator class="rel">
 	          <image src="{{resourceUrl+goods.img_url}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].list[{{pinx}}].img_url"></image>
-	          <!-- <view class="abs flex-center fs26">服务卡</view> -->
+				<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>
 	        <!-- 商品内容 -->
 	        <view class="Commodity_content">
@@ -389,7 +415,7 @@
 	                <view class="commodity_money flex baseline">
 	                  <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
 	                  <view class="fs24 c-r">￥</view>
-	                  <view class="c-r">{{filters.toFix(item.account,2)}}
+	                  <view class="c-r">{{filters.toFix(item.account+item.pt_tail_money,2)}}
 	                  </view>
 	
 	                </view>
@@ -407,18 +433,24 @@
 				<navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{item.order_id}}">订单详情</navigator>	
 
 
-				<block wx:if="{{item.order_status==1}}">
+				<block wx:if="{{item.order_status==1 && item.pay_status==1}}">
 					<navigator wx:if="{{item.list.length > 1}}"  class="order-btn white bg-orange"
 										 url="/packageB/pages/user/comment/comment?card=1&status=0&order_id={{item.list[index].order_id}}">评价</navigator>
 					<navigator wx:else  class="order-btn white bg-orange"
 										 url="/packageB/pages/user/add_comment/add_comment?card=1&goods_id={{item.list[0].card_id}}&order_id={{item.list[0].order_id}}&price={{item.list[0].price}}">评价</navigator>
 				</block>
 
-	          <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="pay" data-index="{{index}}" wx:if="{{item.order_status==0}}">立即支付</navigator>
-			  
+				<navigator class="commodity_To_evaluate flex-level comment_go"
+						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type!=6 && item.pay_status==0 && item.order_status<2}}">立即支付</navigator>
 
+				<navigator class="commodity_To_evaluate flex-level comment_go"
+						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type==6 && item.pt_status==0 && item.order_status<2}}">立即支付</navigator>
 
-	        </view>
+				<navigator class="commodity_To_evaluate flex-level comment_go" url="/packageA/pages/serviceCard_pd/cart_wk/cart_wk?order_id={{item.order_id}}"
+						   data-idx="{{index}}" wx:if="{{item.order_status<2 && item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
+
+
+			</view>
 	      </view>
 	    </view>
 	  </view>
@@ -467,7 +499,7 @@
 </view>
 
 <!-- 无订单 -->
-<view class="empty_order" wx:if="{{((!orderList||orderList.length==0) && is_get && currentIndex == 0) || (list2.length==0 && currentIndex == 1) || (cardList.length == 0 && currentIndex == 2)}}">
+<view class="empty_order" wx:if="{{((!orderList||orderList.length==0) && is_get && currentIndex == 0) || (list2.length==0 && currentIndex == 1) || (cardList.length == 0 && currentIndex == 2 && is_get)}}">
   <view class="flex-level">
     <image src="{{iurl}}miniapp/images/order/empty_order.png"></image>
   </view>