diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.js b/packageA/pages/serviceCard_pd/team_show/team_show.js
index 1f98af0..9e004c9 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,7 +129,9 @@ 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 +290,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,
+        card_id: gd.id,
+        prom_type: 6,
         prom_id: gd.prom_id
 
       },
     }).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 +332,8 @@ Page({
       minusStatus: minusStatus,
     })
 
+    return true;
+
   },
 
   /*输入框事件*/
@@ -370,22 +360,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 +425,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 +444,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( "/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
+            is_ok=0;
         }
       }
     })
@@ -512,7 +500,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 +510,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 +548,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 +591,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 +689,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 +735,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 +751,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 +775,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 +835,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 +929,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 +954,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 +963,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)
@@ -1005,9 +999,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 +1030,9 @@ Page({
 				getApp().confirmBox("门店库存不足", null, 25000, !1);
 				return false;
 			  }
+
+
+
 		
 		      if ( bconfig && bconfig.is_sort_storage) {
 			wx.getLocation({
@@ -1127,25 +1140,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 +1440,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 +1482,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 +1547,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..9d6ae9e 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.service_name}}</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..d764f05 100644
--- a/packageA/pages/serviceCard_pd/team_success/team_success.js
+++ b/packageA/pages/serviceCard_pd/team_success/team_success.js
@@ -84,7 +84,7 @@ Page({
 	  })	
   },
   onShow:function () {
-      getApp().check_can_share();
+      getApp().check_can_share(this);
   },
 
   //关闭展开列表
@@ -151,7 +151,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 }
       })
 
@@ -229,6 +229,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;
@@ -284,8 +285,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,
@@ -804,8 +804,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();
+                    }
+                })
             }
         });
     },
diff --git a/packageA/pages/serviceCard_pd/team_success/team_success.wxml b/packageA/pages/serviceCard_pd/team_success/team_success.wxml
index 4889b15..0d45317 100644
--- a/packageA/pages/serviceCard_pd/team_success/team_success.wxml
+++ b/packageA/pages/serviceCard_pd/team_success/team_success.wxml
@@ -164,8 +164,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>
@@ -176,7 +176,7 @@
 
         <!--会员团 商家团-->
         <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare'
-                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团</button>
+                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团{{isLogin}}</button>
 
  <view class="xc-home-page-frame">
   <button class="xc-home-page" bindtap='gohome'> 返回首页</button>