Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents 89f5a969 3812ccf0
Showing 3 changed files with 19 additions and 7 deletions
packageA/pages/activity_share/activity_share.js
packageA/pages/activity_share/activity_share.wxml
pages/cart/cart2_pt/cart2_pt.js
@@ -923,24 +923,29 @@ Page({
 		var item=this.data.list[index];
 		this.setData({share_hidden:0,hui_active:item});
+		
+		
 		var com = this.selectComponent("#share_button"); //组件的id
 		com.set_type(1); 
 	},
 	//---点击分享商品---  
-	share_good:function(e){	
-		
+	share_good:function(e){			
 		//--先判断会员状态--
 		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: '/pages/togoin/togoin', })
 		  return false;
-		}
-		
+		}		
 		var index=e.currentTarget.dataset.index;
 		var item=this.data.list[index];
-		this.setData({share_hidden:0,share_good:item});			
-		 
+		//如果是搭配购
+		if(item.main_goods_id){
+			item.goods_id=item.main_goods_id;
+			item.goods_name=item.main_goods_name;
+		}
+		
+		this.setData({share_hidden:0,share_good:item});				 
 		var com = this.selectComponent("#share_button"); //组件的id
 		com.set_type(0); 
 	},
@@ -98,7 +98,9 @@
 							</view>
 							<view class="flex-equality pdt20" wx:else>
 								<view bindtap="showPopup" data-index="{{index}}" class="btn-container" ><text class="btn-share">活动详情</text></view>
-								<view bindtap="share_index" data-index="{{index}}" class="btn-container"><text class="btn-share w164">分享</text></view>
+								
+								<view wx:if="{{currentIndex2==1}}" bindtap="share_good" data-index="{{index}}" class="btn-container"><text class="btn-share w164">分享</text></view>
+								<view wx:else bindtap="share_index" data-index="{{index}}" class="btn-container"><text class="btn-share w164">分享</text></view>
 							</view>
 						</view>
 					</view>
@@ -490,6 +490,11 @@ Page({
             return false;
           }
         }
+		
+		//阶梯团强制带1，自提~~~
+		if(th.data.kt_type==3 ){
+			th.data.bn_exp_type=1;
+		}
         var item={
           'user_id': to.globalData.user_id,