Merge branch 'master' of http://121.196.213.68:3000/caoliancun/zhongPin into caolc

components/site-item/site-item.vue

@@ -1,5 +1,9 @@
 <template>
+<<<<<<< HEAD
 	<view class="cu-item cur padding no-mr-border site-item" >
+=======
+	<view class="cu-item cur padding no-mr-border site-item" :style="{height:siteItem.oilProductCodeAndPrices && siteItem.oilProductCodeAndPrices.length>3?'220rpx !important':listHeight?listHeight + 'rpx !important':''}">
+>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
 		<view class="cu-avatar radius lg "
 			:style="'background-image:url('+(siteItem.siteImages?siteItem.siteImages:defaultLogo)+');'"> 
 		</view> 

components/three-sites.vue

@@ -78,6 +78,7 @@
 						...uni.getStorageSync('location'),
 						...this.filterData,
 						comprehensiveSort:1,
+						zpDisable:'ENABLE',
 						// siteBrand: "", //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
 						// channelCode: "", //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
 						// oilProductCode: "" //   备注：// 油号选择 ( 0# 92# 92#)