diff --git a/packageA/pages/jfbuy/jfbuy.js b/packageA/pages/jfbuy/jfbuy.js
index fb503a7..ad1dd41 100644
--- a/packageA/pages/jfbuy/jfbuy.js
+++ b/packageA/pages/jfbuy/jfbuy.js
@@ -73,7 +73,12 @@ Page({
 			page:th.data.currentPage2,
 			pageSize:th.data.pageSize			
 		};
-	  
+		
+		var clientHeight = wx.getSystemInfoSync().windowHeight;
+		var clientWidth = wx.getSystemInfoSync().windowWidth;
+		this.data.clientHeight=clientHeight;
+		this.data.clientWidth=clientWidth;
+		
 	  
 		this.request_list(this.data.requestData);
      // var th=this;
@@ -139,6 +144,24 @@ Page({
 		 //    th.countDown();
 		 // },1000);
 	  // }
+	  
+	  
+	  //-- 判断有没有自定义的广告图片 --
+	  getApp().request.get("/api/weshop/ad/page?pid=501&store_id=" + os.stoid, {
+	    data: {
+	      enabled: 1
+	    },
+		success:function(res){
+			if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+				var a = res.data.data.pageData;
+				var tt = {
+				  'ad_code': os.imghost + a[0].ad_code,	
+				};
+				th.setData({ad:tt})			
+			}
+		}
+	  })
+	  
   },
 
   /**
@@ -393,5 +416,18 @@ Page({
 		 var item=this.data.list2[index];
 		 var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id;
 		 getApp().goto(url);
+	},
+	
+	
+	imageLoad:function(e){
+		var imgwidth = e.detail.width;
+		var imgheight = e.detail.height;
+		//宽高比
+		var ratio = imgwidth / imgheight;
+		//计算的高度值
+		var viewHeight = this.data.clientWidth / ratio;
+		var con_heihgt=this.data.clientHeight-viewHeight;
+		this.setData({con_heihgt:con_heihgt})
+	
 	}
 })
\ No newline at end of file
diff --git a/packageA/pages/jfbuy/jfbuy.wxml b/packageA/pages/jfbuy/jfbuy.wxml
index c9be835..f570399 100644
--- a/packageA/pages/jfbuy/jfbuy.wxml
+++ b/packageA/pages/jfbuy/jfbuy.wxml
@@ -5,8 +5,10 @@
 		<view class="input-container"><input bindinput="set_search_value" class="search" type="text" placeholder="请输入您想查找的商品信息"/></view>
 		<view bindtap="search_data" class="btn-search">搜索</view>
 	</view> -->
-
-	<view class="banner-container flex">
+	<view wx:if="{{ad}}">
+		<image src="{{ad.ad_code}}" mode="widthFix" bindload="imageLoad"></image>		
+	</view>
+	<view wx:else class="banner-container flex">
 		<image src="{{url}}/miniapp/images/integral/liwu.png?v=1" class="banner"></image>
 		<view style="display: inline-block; padding-top: 72rpx;">
 			 <view class="fs36">小积分大作为</view>
@@ -15,7 +17,7 @@
 	</view>
 		
 	<!-- 列表 -->
-	<view class="list-container">
+	<view class="list-container" style="{{ad?('height:'+con_heihgt+'px;'):''}}">
 		<!-- 标题 -->
 		<view class="title" >
 			<block wx:for="{{tab}}">