diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 6cf7570..da613da 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -529,11 +529,10 @@ Page({
 			this.check_prom(goods_id, prom_type, prom_id);
 			
 		} else { // 从非秒杀入口进入,地址不带prom_type、prom_id参数
-			getApp().request.promiseGet('/api/weshop/activitylist/getGoodActInfo', {
+			getApp().request.promiseGet('/api/weshop/activitylist/listGoodActInfo2', {
 				data: {
 					store_id: os.stoid,
-					goodsidlist: goods_id,
-					is_detail: 1,
+					goods_id: goods_id,
 					goods_type: 1,
 					user_id: oo.user_id,
 				}
@@ -1370,6 +1369,8 @@ Page({
       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;
@@ -1385,30 +1386,24 @@ Page({
 		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==6){		
-	// 	title+='\n'+th.data.prom_act.share_remark;
-	// 	ob.title=title;
-	// 	ob.desc=th.data.prom_act.share_remark;
-	// }
-	
-	//如果是积分购的时候
-	// if(th.data.prom_type==4){
-	// 	var name = th.data.prom_act.name;
-	// 	//-- 积分购的 --
-	// 	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;}
+    };
 			
-	// 	ob.title= text+" "+name;		
-	// }
+	// 如果服务卡参加秒杀活动，且后台设置了分享标题和分享图片
+	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;
 	
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index c1ad464..12fdd62 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -756,12 +756,12 @@
 										 </block>
 										 
 										 <!-- 普通商品 -->
-											<!-- <block wx:else>
+											<block wx:else>
 											 <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}"
 												data-action="buy">
 												{{sele_g.offline_price?"券后购买":"立即购买"}}
 											 </view>
-											</block> -->
+											</block>
 											
 									</block>
 								</block>