Merge branch 'master' of http://121.196.213.68:3000/caoliancun/MP_XOIL_company_new into lixuan

pages/tabbar/station/stationList.vue

@@ -1,9 +1,9 @@
 <template>
-	<view class="my-bg">
+	<view style="height: 100vh;" class="my-bg flex_column">
 		<cu-custom class="main-totextbar bg-main-oil" bgColor="bg-main-oil">
 			<block slot="content">附近油站</block>
 		</cu-custom>
-	<view class="">
+	<view style="flex: 1;" class="flex_column">
 		<view class="headList">
 			<view class="headList_head" v-for="(list,i) in tabHeadS" :class="[TabHead == i? 'ativeHead':'']" :key='i' @tap='changeHaed(list.value)'>
 				{{list.title}}
@@ -25,7 +25,7 @@
 		</view> 
 		
 		<!-- 筛选开始 -->
-		<scroll-view  class="screentop  bg-white">
+		<scroll-view style="flex: 1;"  class="screentop  bg-white">
 			<view @click="reunrnFn" class="">
 				<sl-filter reflexTitle ref="slFilter" :productCodeList="productCodeList" :areaCodeList="areaCodeList" @result="filterRes" :menuList="menuList"  v-if="TabHead == 0"></sl-filter>
 				<sl-filter reflexTitle ref="slFilter" @result="filterRes" :menuList="ureaMenuList" v-if="TabHead == 1 && changeHs == true"></sl-filter>
@@ -93,19 +93,19 @@
 						key: 'distance',
 						detailList: [{
 								title: "默认",
-								value: 20
+								value: ''
 							},
 							{
 								title: "20Km",
-								value: 20
+								value: 20000
 							},
 							{
 								title: "30Km",
-								value: 30
+								value: 30000
 							},
 							{
 								title: "50Km",
-								value: 50
+								value: 50000
 							}
 						]
 					},{
@@ -349,7 +349,7 @@
 				}
 			},
 			filterRes(val) {
-				console.log(val)
+				console.log(val,'重置')
 				if(this.TabHead ==0){
 					this.filterDatas = val 
 					this.currentPage = 1
@@ -676,6 +676,7 @@
 </script>
 
 <style scoped>
+	.flex_column{display: flex;flex-direction: column;}
 	.headList_head{
 		padding: 2% 0;
 		width: 16%;