Merge pull request 'xiugai' (#4) from lixuan into master

Reviewed-on: #4

pages/tabbar/home/home.vue

@@ -151,7 +151,7 @@
 			</view> -->
 			<view class="  ">
 				<view class="" v-if="siteList.length>0">
-					<site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"
+					<site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0" :listHeight="listHeight"
 						class="cu-list menu-avatar cu-item" @tap="toDetail(item)">
 					</site-item>
 				</view>
@@ -191,6 +191,7 @@
 						link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473'
 					},
 				],
+				listHeight:160,
 				siteInfo: {
 
 				},
@@ -501,7 +502,8 @@
 						...this.filterData,
 						// siteBrand: "", //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
 						// channelCode: "", //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
-						oilProductCode: "0#" //   备注：// 油号选择 ( 0# 92# 92#)
+						// oilProductCode: "0#" //   备注：// 油号选择 ( 0# 92# 92#)
+						comprehensiveSort:1
 					}
 
 				}
@@ -541,7 +543,8 @@
 						}
 					})
 				} else {
-					oilSiteApi.getSiteList(data1).then(res => {
+					console.log(data1,'dayindata111111111111')
+					oilSiteApi.getSiteLists(data1).then(res => {
 						if (res.code == 20000) {
 							// console.log(res.data.list)
 							this.siteList = res.data.list