diff --git a/app.js b/app.js
index 9d5f501..7ee7ddc 100644
--- a/app.js
+++ b/app.js
@@ -251,7 +251,7 @@ App({
             title: t,
             mask: e,
             duration: a,
-            image:"/packageA/images/gt.png",
+            image:"/images/gt.png",
             complete: function() {
                 "function" == typeof o && setTimeout(o, a);
             }
diff --git a/packageA/images/gt.png b/images/gt.png
index 354851e..354851e 100644
--- a/packageA/images/gt.png
+++ b/images/gt.png
diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js
index 784fcd4..b3859ea 100644
--- a/packageA/pages/activity_share/activity_share.js
+++ b/packageA/pages/activity_share/activity_share.js
@@ -142,7 +142,7 @@ Page({
 	  //礼包的转发
 	  if(th.data.currentIndex==3){
 		  var lbid=th.data.hui_active.lbId;
-		  var url="pages/giftpack/giftpacklist/giftpacklist?lbId="+lbid+"&isBuy=1";
+		  var url="/pages/giftpack/giftpacklist/giftpacklist?lbId="+lbid+"&isBuy=1";
 		  if(getApp().globalData.user_id){
 		      url+="&first_leader="+getApp().globalData.user_id;
 		  }	 		  
@@ -1060,6 +1060,28 @@ Page({
 	 		 this.data.is_load=0;
 	 		 this.data.currentPage=1;	
 	 		 this.requestGoodsList();	
+	 },
+	 
+	 
+	 go_goods:function(e){
+	 		 var index=e.currentTarget.dataset.index;
+	 		 var item=this.data.list[index];
+	 		 var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
+	 		 getApp().goto(url); 
+	 },
+	 
+	 go_coll_good:function(e){
+		 var gid=e.currentTarget.dataset.gid;		
+		 var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid;
+		 getApp().goto(url); 
+	 },
+	 
+	 go_libao:function(e){
+		 var index=e.currentTarget.dataset.index;
+		 var item=this.data.list[index];	 
+		 var lbid=item.lbId;
+		 var url="/pages/giftpack/giftpacklist/giftpacklist?lbId="+lbid+"&isBuy=1";
+		 getApp().goto(url);
 	 }
 
 		
diff --git a/packageA/pages/activity_share/activity_share.wxml b/packageA/pages/activity_share/activity_share.wxml
index 7fe123b..3d3183c 100644
--- a/packageA/pages/activity_share/activity_share.wxml
+++ b/packageA/pages/activity_share/activity_share.wxml
@@ -26,13 +26,13 @@
 		 scroll-y="true"
 		 bindscrolltolower="refresh"
 		 scroll-anchoring
-		 refresher-enabled>
+		 >
 		   
 		   <block wx:for="{{list}}">
 	
 			<!-- 拼单和秒杀 -->
 			<block wx:if="{{currentIndex == 0 || currentIndex == 1}}">
-				<view class class="list-item">
+				<view class class="list-item" bindtap="go_goods" data-index="{{index}}">
 					<view class="img-container">
 						<image src="{{url+item.original_img}}" style="width: 100%; height: 100%;"
 						  binderror="bind_bnerr2"  lazy-load="true" 
@@ -67,7 +67,7 @@
 							<view>￥{{item.price}}</view>
 							<view class="retail">零售价：￥{{item.market_price}}</view>
 						</view>
-						<view bindtap="share_good" data-index="{{index}}" class="t-r fs28"><text class="btn-share">分享</text></view>
+						<view catchtap="share_good" data-index="{{index}}" class="t-r fs28"><text class="btn-share">分享</text></view>
 					</view>
 				</view>
 			</block>
@@ -107,7 +107,7 @@
 						
 			<!-- 专享礼包 -->
 			<block wx:if="{{currentIndex == 3}}">
-				<view class class="list-item">
+				<view class class="list-item" bindtap="go_libao" data-index="{{index}}">
 					<view class="img-container">
 						<image src="{{url+item.lbUrl}}" style="width: 100%; height: 100%;"
 						  binderror="bind_bnerr2"  lazy-load="true" 
@@ -122,7 +122,7 @@
 						</view>
 						<view class="fs22 line-through gray">零售价：￥{{item.giftPosPrice}}</view>
 						<!-- <view class="fs22">已售：<text class="red">3</text></view> -->
-						<view bindtap="share_index" data-index="{{index}}" class="t-r fs28"><view class="btn-share">分享</view></view>
+						<view catchtap="share_index" data-index="{{index}}" class="t-r fs28"><view class="btn-share">分享</view></view>
 					</view>
 				</view>
 			</block>
@@ -151,7 +151,7 @@
 				<view class="popup-title dash-b">活动详情</view>
 				<!-- 搭配促销 -->
 				<block wx:if="{{currentIndex2 == 1}}">
-					<view class="pdv20 dash-b fs28">
+					<view class="pdv20 dash-b fs28" bindtap="go_coll_good" data-gid="{{hui_active.main_goods_id}}">
 						<view class="popup-title2">必买商品</view>
 						<view class="popup-title3">商品编号：{{hui_active.goods_sn}}</view>
 						<view class="popup-title3">{{hui_active.main_goods_name}}</view>
@@ -168,7 +168,7 @@
 							</view>
 							<view class="popup-list t-c">
 								<block wx:for="{{list2}}">							
-								   <view class="flex ai-center pdb10">
+								   <view class="flex ai-center pdb10" bindtap="go_coll_good" data-gid="{{item.goods_id}}">
 										<view class="w25">{{index+1}}</view>
 										<view class="w25 ellipsis-2">{{item.goods_name}}</view>
 										<view class="w25">￥{{g_filter.toFix(item.shop_price,2)}}</view>
@@ -206,11 +206,11 @@
 							</view>
 							<view class="t-c">								
 								<block wx:for="{{list2}}">								
-									<view class="flex ai-center pdb10">
+									<view class="flex ai-center pdb10"  bindtap="go_coll_good" data-gid="{{item.goods_id}}">
 										<view class="w25">{{index+1}}</view>
 										<view class="w25 ellipsis-2">{{item.goods_name}}</view>
 										<view class="w25">￥{{item.shop_price}}</view>
-										<view  bindtap="share_good2" data-index="{{index}}" class="w25"><text class="btn-share">分享</text></view>
+										<view  catchtap="share_good2" data-index="{{index}}" class="w25"><text class="btn-share">分享</text></view>
 									</view>								
 								</block>								
 							</view>
diff --git a/packageA/pages/goods_share/goods_share.js b/packageA/pages/goods_share/goods_share.js
index aeb8bb2..35948dc 100644
--- a/packageA/pages/goods_share/goods_share.js
+++ b/packageA/pages/goods_share/goods_share.js
@@ -792,6 +792,13 @@ Page({
 		 this.data.is_load=0;
 		 this.data.currentPage=1;	
 		 this.requestGoodsList();	
+	 },
+	 
+	 go_goods:function(e){
+		 var index=e.currentTarget.dataset.index;
+		 var item=this.data.list[index];
+		 var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
+		 getApp().goto(url); 
 	 }
 	 
 	 		
diff --git a/packageA/pages/goods_share/goods_share.wxml b/packageA/pages/goods_share/goods_share.wxml
index 6705aed..ec817b0 100644
--- a/packageA/pages/goods_share/goods_share.wxml
+++ b/packageA/pages/goods_share/goods_share.wxml
@@ -33,9 +33,9 @@
 		 scroll-y="true"
 		 bindscrolltolower="refresh"
 		 scroll-anchoring
-		 refresher-enabled>	
+		 >	
 		    <block wx:for="{{list}}">
-			<view class class="list-item">
+			<view class class="list-item" bindtap="go_goods" data-index="{{index}}">
 				<view class="img-container">
 					 <image src="{{url+item.original_img}}" style="width: 100%; height: 100%;"
 					   binderror="bind_bnerr2"  lazy-load="true" 
@@ -64,7 +64,7 @@
 							  <text wx:else class="red">￥{{item.fir_rate+item.sec_rate+item.thi_rate}}</text> 	 						
 						</view>
 					</view>
-					<view bindtap="share_good" data-index="{{index}}"  class="t-r fs28 pdt14">
+					<view catchtap="share_good" data-index="{{index}}"  class="t-r fs28 pdt14">
 						<view class="btn-share">分享</view>
 					</view>
 				</view>
diff --git a/packageA/pages/live_share/live_share.js b/packageA/pages/live_share/live_share.js
index e340ea0..2631ba1 100644
--- a/packageA/pages/live_share/live_share.js
+++ b/packageA/pages/live_share/live_share.js
@@ -179,6 +179,16 @@ Page({
 	   this.requestGoodsList();
 	},
 	
+	cancel:function(){
+		this.setData({share_hidden:1});
+	},
+	go_live:function(e){
+		var index=e.currentTarget.dataset.index;
+		var item=this.data.list[index];
+		var url='/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + item.id + '&live=ing';
+		getApp().goto(url);
+	}
+	
 	
 	
 })
\ No newline at end of file
diff --git a/packageA/pages/live_share/live_share.wxml b/packageA/pages/live_share/live_share.wxml
index 14b4030..353d0c1 100644
--- a/packageA/pages/live_share/live_share.wxml
+++ b/packageA/pages/live_share/live_share.wxml
@@ -14,10 +14,10 @@
 		 scroll-y="true"
 		 bindscrolltolower="refresh"
 		 scroll-anchoring
-		 refresher-enabled>		 							
+		 >		 							
 			<!-- 专享礼包 -->
 			<block wx:for="{{list}}">
-				<view class class="list-item">
+				<view class class="list-item" bindtap="go_live" data-index="{{index}}">
 					<view class="img-container {{currentIndex2 == 0?'live':currentIndex2 == 1?'coming':'playback'}}">
 						<image src="{{item.cover_img}}" style="width: 100%; height: 100%;"
 						  binderror="bind_bnerr2"  lazy-load="true" 
@@ -27,7 +27,7 @@
 						<view class="ellipsis-2 fs28 name">{{item.name}}</view>
 						<view class="pdt20 fs26 red">直播时间：{{filter.format_time(item.start_time, 2)}} </view>
 						<view class="fs26 red pdv10">主播：{{item['anchor_name']}}</view>
-						<view bindtap="share_index" data-index="{{index}}" class="t-r fs28 pdt10"><view class="btn-share">分享</view></view>
+						<view catchtap="share_index" data-index="{{index}}" class="t-r fs28 pdt10"><view class="btn-share">分享</view></view>
 					</view>
 				</view>
 			</block>			
diff --git a/packageA/pages/quan/quan.js b/packageA/pages/quan/quan.js
index 154edc6..3e541d1 100644
--- a/packageA/pages/quan/quan.js
+++ b/packageA/pages/quan/quan.js
@@ -156,6 +156,20 @@ Page({
   	com.set_type(1); 
   },
   
+  cancel:function(){
+  	this.setData({share_hidden:1});
+  },
+  
+  go_quan:function(e){
+	  var index=e.currentTarget.dataset.index;
+	  var item=this.data.list[index];
+	  var url="/packageA/pages/quan_pro/quan_pro?id="+item.id;
+	  getApp().goto(url);
+  }
+  
+  
+  
+  
   
 	
 	
diff --git a/packageA/pages/quan/quan.wxml b/packageA/pages/quan/quan.wxml
index ff8e6a0..b2cd17c 100644
--- a/packageA/pages/quan/quan.wxml
+++ b/packageA/pages/quan/quan.wxml
@@ -17,7 +17,7 @@
 		 refresher-enabled>
 		 									
 			<block wx:for="{{list}}">
-				<view class="coupons bg-red">
+				<view class="coupons bg-red" bindtap="go_quan" data-index="{{index}}">
 					<view class="flex">
 						<view>
 							<view class="coupon-hd ellipsis-2 fs32">{{item.name}}</view>
@@ -40,7 +40,7 @@
 						<view wx:if="{{item.useobjecttype==12}}" class="coupon-ft ellipsis-2 fs28">分类一({{item.useobjectname}})</view>
 						<view wx:if="{{item.useobjecttype==20}}" class="coupon-ft ellipsis-2 fs28">单品({{item.useobjectname}})</view>
 												
-						<view bindtap="share_index" data-index="{{index}}" class="btn-share" >分享</view>
+						<view catchtap="share_index" data-index="{{index}}" class="btn-share" >分享</view>
 					</view>
 				</view>				
 			</block>