diff --git a/packageA/pages/goods_share/goods_share.js b/packageA/pages/goods_share/goods_share.js
index 3c8f04d..66d1994 100644
--- a/packageA/pages/goods_share/goods_share.js
+++ b/packageA/pages/goods_share/goods_share.js
@@ -24,7 +24,9 @@ Page({
 		dis_switch:0,    //-- 分销开关 --
 		pattern:0,       //-- 分成的方式 --
 		share_hidden:1,  //-- 分享的按钮隐藏 --
-		share_good:null  //--- 要分享的商品 --- 
+		share_good:null  ,//--- 要分享的商品 --- 
+		
+		is_no_distri:0
   },
   /**
    * 生命周期函数--监听页面加载
@@ -90,17 +92,43 @@ Page({
 	    }
 	  });
 	  
+	  
+	  //看有没有开启分销功能
+	  getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{
+	  	  var dis=rs.data.data;	
+	  	  if( dis && dis.switch==0){
+	  		   th.setData({is_no_distri:1})
+	  	  }	   				  
+	  })	
+	    //看有没有开启分销功能
+	  getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=5",{}).then(res=>{
+	  			    if(res.data.code==0){
+	  					  var arr = res.data.data.pageData;
+	  					  if (arr.length > 0) {
+	  						   var item=arr[0];
+	  						   if(item.is_sy==0){
+	  							   var now = Date.parse(new Date());now = now / 1000;
+	  							   if(item.end_time<now) th.setData({is_no_distri:1})
+	  						   }
+	  					  }
+	  				} 
+	  })
+	  
+	  
   },
 
   /*** 生命周期函数--监听页面显示***/
   onShow: function () {
 	 var th=this;
 	 
-	 
-	 this.setData({
-		//用来判断是否是分销商，是分销商才显示分成佣金
-		is_distribut: app.globalData.userInfo.is_distribut
-	 });
+	
+	 if(app.globalData.userInfo) {
+		 this.setData({
+		 		//用来判断是否是分销商，是分销商才显示分成佣金
+		 		is_distribut: app.globalData.userInfo.is_distribut
+		 });
+	 }
+	
 	 
      getApp().getConfig2(function(rs){
      			  //计算等级价相关
diff --git a/packageA/pages/goods_share/goods_share.wxml b/packageA/pages/goods_share/goods_share.wxml
index 4a9deb8..edc4495 100644
--- a/packageA/pages/goods_share/goods_share.wxml
+++ b/packageA/pages/goods_share/goods_share.wxml
@@ -19,12 +19,14 @@
 			    <view class="title-item" bindtap="sort1">价格<text class="iconfont icon-shang"></text></view>
 			</block>
 			
+			<block wx:if="{{!is_no_distri}}">
 			<block wx:if="{{orderField=='commission'}}">
 			   <view class="title-item" bindtap="sort2">佣金<text class="iconfont {{orderType=='asc'?'icon-shang':'icon-xia'}}"></text></view>
 			</block>  
 			<block wx:else> 
 			   <view class="title-item" bindtap="sort2">佣金<text class="iconfont icon-xia"></text></view>
 			</block>  
+			</block>
 			
 			<view class="title-item" bindtap='new_sort'>最新</view>
 		</view>
diff --git a/packageA/pages/goods_share/goods_share.wxss b/packageA/pages/goods_share/goods_share.wxss
index 969bd02..fec871d 100644
--- a/packageA/pages/goods_share/goods_share.wxss
+++ b/packageA/pages/goods_share/goods_share.wxss
@@ -40,6 +40,7 @@ page {
 	display: flex;
 	font-size: 30rpx;
 	border-bottom: 2rpx solid #f8f8f8;
+	justify-content: space-around;
 }
 .title .iconfont {
 	color: #ccc;
@@ -47,7 +48,7 @@ page {
 	margin-left: 8rpx;
 }
 .title-item {
-	width: 25%;
+	/* width: 25%; */
 	box-sizing: border-box;
 	text-align: center;
 	padding: 20rpx;
diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js
index 5efc91d..8a5eda8 100644
--- a/pages/activity/pind_list/pind_list.js
+++ b/pages/activity/pind_list/pind_list.js
@@ -16,6 +16,7 @@ Page({
         isshow:0,
         iurl: os.imghost,
 		ad_data:null,
+		max_sw_height:200,
     },
 
     //------初始化加载----------
@@ -47,9 +48,9 @@ Page({
 				var narr=[];
 				for(var i in a){
 					var tt = {
-					  'ad_code': os.imghost + a[0].ad_code,
+					  'ad_code': os.imghost + a[i].ad_code,
 					  'media_link': '',
-					  'ad_weapplink':a[0].ad_weapplink
+					  'ad_weapplink':a[i].ad_weapplink
 					};
 					narr.push(tt);
 				}
@@ -206,6 +207,20 @@ Page({
           _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
           this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
        }
-    }
+    },
+	
+	imageLoad:function(e){
+	  var imgwidth = e.detail.width;
+	  var imgheight = e.detail.height;
+	  //宽高比
+	  var ratio = imgwidth / imgheight;
+	  //计算的高度值
+	  var viewHeight = 750 / ratio;
+	  var hei=this.data.max_sw_height;
+	
+	  if (hei< viewHeight) {
+	      this.setData({ max_sw_height: viewHeight });
+	   }
+	}
 
 });
diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js
index cb25d9d..8ab76f0 100644
--- a/pages/activity/seckill_list/seckill_list.js
+++ b/pages/activity/seckill_list/seckill_list.js
@@ -12,6 +12,7 @@ Page({
         ismore:1,  //是否可以加载更多
         isshow:0,
 		ad_data:null,
+		max_sw_height:200,
     },
 
     //------初始化加载----------
@@ -44,9 +45,9 @@ Page({
 				var narr=[];
 				for(var i in a){
 					var tt = {
-					  'ad_code': os.imghost + a[0].ad_code,
+					  'ad_code': os.imghost + a[i].ad_code,
 					  'media_link': '',
-					  'ad_weapplink':a[0].ad_weapplink
+					  'ad_weapplink':a[i].ad_weapplink
 					};
 					narr.push(tt);
 				}
@@ -207,5 +208,19 @@ Page({
 				title: '秒杀活动-' + getApp().globalData.config.store_name,
 			}
 		},
+		
+		imageLoad:function(e){
+		  var imgwidth = e.detail.width;
+		  var imgheight = e.detail.height;
+		  //宽高比
+		  var ratio = imgwidth / imgheight;
+		  //计算的高度值
+		  var viewHeight = 750 / ratio;
+		  var hei=this.data.max_sw_height;
+		
+		  if (hei< viewHeight) {
+		      this.setData({ max_sw_height: viewHeight });
+		   }
+		}
 
 });
diff --git a/pages/distribution/distribution.js b/pages/distribution/distribution.js
index 16617a1..534ea46 100644
--- a/pages/distribution/distribution.js
+++ b/pages/distribution/distribution.js
@@ -171,16 +171,20 @@ Page({
 					  title: "全部满足成为分销商",
 					  icon: 'none',
 					  duration: 2000
-					});		
-					//-- 会员的分销的内容要进行存储 --			
-					app.globalData.userInfo.is_distribut=1;
-					wx.setStorageSync("userinfo",app.globalData.userInfo);					
-					setTimeout(function(){
-						self.getDis_data();
-						self.setData({
-							userInfo: app.globalData.userInfo,
-						});
-					},2000)											
+					});	
+						
+					if(app.globalData.userInfo)	{
+						//-- 会员的分销的内容要进行存储 --
+						app.globalData.userInfo.is_distribut=1;
+						wx.setStorageSync("userinfo",app.globalData.userInfo);					
+						setTimeout(function(){
+							self.getDis_data();
+							self.setData({
+								userInfo: app.globalData.userInfo,
+							});
+						},2000)	
+					}
+															
 				}
 			} 
 			
@@ -284,7 +288,7 @@ Page({
 						  var txt="fenxiao["+index+"].pass";
 						  var txt2="data.is_distribut";
 						  var txt3="userInfo.is_distribut";						  
-						  getApp().globalData.userInfo.is_distribut=1;
+						  if(getApp().globalData.userInfo) getApp().globalData.userInfo.is_distribut=1;
 						  
 						   
 						  setTimeout(function(){