diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
index ffc960d..4e1c22a 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
@@ -3385,6 +3385,7 @@ Page({
                         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}
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
index 063418c..e59fca6 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">
@@ -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>
 
@@ -788,7 +668,11 @@
 								<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}}">
@@ -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>