diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue
index 3dc008f..9296fea 100644
--- a/pages/highWay/runData/form.vue
+++ b/pages/highWay/runData/form.vue
@@ -79,11 +79,19 @@
 		</view>
 		<!-- 用户权限收费站 -->
 		<view class="station_box">
-			<view :style="(index+1)%2 == 0 ? 'margin-right:20rpx;margin-left:20rpx;' : ''" @click="changeStationIndex(index)" class="station_item" :class="[item.isFinish ? 'active' : '',index == stationIndex ? 'choosed' : '']" v-for="(item, index) in highwaySubDataList" :key="item.id">
+			<view v-if="index < 9" :style="(index+1)%3 == 0 ? 'margin-right:0;':''" @click="changeStationIndex(index)" class="station_item" :class="[item.isFinish ? 'active' : '',index == stationIndex ? 'choosed' : '']" v-for="(item, index) in highwaySubDataList" :key="item.id">
+				<view v-if='item.isFinish' class="tag"><uni-icons type="checkmarkempty" color="#fff" size="12"></uni-icons></view>
+				{{item.stationName}}
+			</view>
+			<view v-if="index >= 9" :style="(index+1)%3 == 0 ? 'margin-right:0;':''" @click="changeStationIndex(index)" class="station_item" :class="[item.isFinish ? 'active' : '',index == stationIndex ? 'choosed' : '']" v-for="(item, index) in highwaySubDataList" :key="item.id">
 				<view v-if='item.isFinish' class="tag"><uni-icons type="checkmarkempty" color="#fff" size="12"></uni-icons></view>
 				{{item.stationName}}
 			</view>
 		</view>
+		<view v-if="highwaySubDataList.length > 9" class="station_act" @click="showStaion = !showStaion">
+			<uni-icons v-if="!showStaion" type="bottom" size="14" color="#2D8CF0" style="margin-right:10rpx;"></uni-icons>
+			<uni-icons v-if="showStaion" type="top" size="14" color="#2D8CF0" style="margin-right:10rpx;"></uni-icons>
+		{{showStaion?'收起':'展开'}}</view>
 		<view class="form_item_box">
 			<view class="form_item">
 				<view class="form_item_label">收费站名称：</view>
@@ -197,6 +205,7 @@
 				index: 2, //时段选择,默认0-24
 				userInfo: {},
 				yoyMom: {},//同比环比
+				showStaion: false,//展开收起
 			}
 		},
 		onLoad(options) {
@@ -547,6 +556,12 @@
 	}
 
 	//收费站
+	.station_act{
+		color: #2D8CF0;
+		font-size: 24rpx;
+		text-align: center;
+		margin-bottom: 30rpx;
+	}
 	.station_box {
 		display: flex;
 		flex-wrap: wrap;
@@ -568,6 +583,7 @@
 			border: 1rpx solid #C1C1C1;
 			text-align: center;
 			margin-bottom: 30rpx;
+			margin-right: 16rpx;
 
 			&.active {
 				position: relative;
@@ -588,8 +604,8 @@
 					text-align: center;
 				}
 			}
-			&.choose{
-				border-color: #2D8CF0;
+			&.choosed{
+				border-color: #2D8CF0 !important;
 			}
 		}
 	}
diff --git a/pages/highWay/runData/list.vue b/pages/highWay/runData/list.vue
index c2a9741..bd1e4d3 100644
--- a/pages/highWay/runData/list.vue
+++ b/pages/highWay/runData/list.vue
@@ -35,7 +35,7 @@
 						<view class="picker_select">
 							<picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel">
 								<text class="unselect_txt"
-									:style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text>
+									:style="index?'color:#333;':''">{{index?array[index].dictLabel:'请选择时段'}}</text>
 								<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
 							</picker>
 						</view>
@@ -119,7 +119,7 @@
 					statDateEnd: '',
 					statPeriod: ''
 				};
-				this.index = -1;
+				this.index = '';
 			},
 			//查询
 			showSearch() {
diff --git a/pages/highWay/runStatusData/form.vue b/pages/highWay/runStatusData/form.vue
index ee25efe..c6d62f6 100644
--- a/pages/highWay/runStatusData/form.vue
+++ b/pages/highWay/runStatusData/form.vue
@@ -397,9 +397,9 @@
 						"yhdw": "",
 						"zyds": 0
 				}]
-				// this.$request(getApp().globalData.baseUrl + '/api/biz/roadInfo/all?page=0&pageSize=-1&_t=' + Date.parse(new Date()), {}, 'GET').then(res => {
-				// 	this.highwayDataList = res.data.list;
-				// })
+				this.$request(getApp().globalData.baseUrl + '/api/biz/roadInfo/all?page=0&pageSize=-1&_t=' + Date.parse(new Date()), {}, 'GET').then(res => {
+					this.highwayDataList = res.data.list;
+				})
 			},
 			//高速公路切换选择
 			changeHighway(e, key, index) {
diff --git a/pages/highWay/runStatusData/list.vue b/pages/highWay/runStatusData/list.vue
index d588fc2..0f2499b 100644
--- a/pages/highWay/runStatusData/list.vue
+++ b/pages/highWay/runStatusData/list.vue
@@ -36,7 +36,7 @@
 						<view class="picker_select">
 							<picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel">
 								<text class="unselect_txt"
-									:style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text>
+									:style="index?'color:#333;':''">{{index?array[index].dictLabel:'请选择时段'}}</text>
 								<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
 							</picker>
 						</view>
@@ -120,7 +120,7 @@
 					statDateEnd: '',
 					statPeriod: ''
 				};
-				this.index = -1;
+				this.index = '';
 			},
 			//查询
 			showSearch() {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 591825d..82678fa 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -13,7 +13,7 @@
 				<uni-easyinput placeholderStyle="color:#c8c8c8;font-size:24rpx;" v-model="form.verCode" placeholder="请输入图形验证码" maxlength="20"></uni-easyinput>
 				<image :src="codeImg" @click="getVerCode" style="width: 180rpx; height:59rpx;"></image>
 			</view>
-			<button type="primary" class="page-body-button" @click="doLogin">登录</button>
+			<view type="primary" class="login_btn" @click="doLogin">登录</view>
 		</view>
 	</view>
 </template>
@@ -46,6 +46,7 @@
 			},
 			//登录
 			doLogin() {
+				console.log('login',this.form)
 				if(this.form.username == '' || this.form.password == '') {
 					uni.showToast({
 						title: '用户名密码不能为空',
@@ -161,13 +162,14 @@
 			}
 		}
 	}
-	button {
+	.login_btn {
 		background-color: #2D8CF0;
 		color: #ffffff;
 		font-size: 28rpx;
 		line-height: 90rpx;
 		font-family: PingFang SC-Regular, PingFang SC;
 		border-radius: 100rpx;
+		text-align: center;
 		margin: 70rpx auto 107rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/railway/railwayRunData/list.vue b/pages/railway/railwayRunData/list.vue
index 4453c68..4524491 100644
--- a/pages/railway/railwayRunData/list.vue
+++ b/pages/railway/railwayRunData/list.vue
@@ -11,8 +11,8 @@
 			:contentText="contentText"></uni-load-more>
 		<!-- 筛选 -->
 		<view class="foot_btn_box">
-			<view @click="goPage('/pages/railway/railwayRunData/form?type=add')" class="act_btn"><uni-icons type="plusempty"
-					size="18" color="#fff" style="margin-right: 9rpx;"></uni-icons>新建</view>
+			<!-- <view @click="goPage('/pages/railway/railwayRunData/form?type=add')" class="act_btn"><uni-icons type="plusempty"
+					size="18" color="#fff" style="margin-right: 9rpx;"></uni-icons>新建</view> -->
 			<view @click="showSearch" class="act_btn btn1"><uni-icons type="search" size="18" color="#2D8CF0"
 					style="margin-right: 9rpx;"></uni-icons>查询
 			</view>
@@ -33,10 +33,10 @@
 					</view>
 					<view class="cont_tit picker">
 						<view>统计时段</view>
-						<view class="picker_select">
+						<view>
 							<picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel">
-								<text class="unselect_txt"
-									:style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text>
+								<text class="picker_select"
+									:style="index?'color:#333;':''">{{index?array[index].dictLabel:'请选择时段'}}</text>
 								<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
 							</picker>
 						</view>
@@ -120,7 +120,7 @@
 					statDateEnd: '',
 					statPeriod: ''
 				};
-				this.index = -1;
+				this.index = '';
 			},
 			//查询
 			showSearch() {
@@ -308,13 +308,11 @@
 		left: 0;
 		right: 0;
 		bottom: 0;
-		display: flex;
-		justify-content: space-around;
 		background-color: #F8F8F8;
-		padding-bottom: 20px;
+		padding: 20px 30rpx;
 
 		.act_btn {
-			width: 329rpx;
+			width: 690rpx;
 			height: 90rpx;
 			line-height: 88rpx;
 			display: flex;
diff --git a/pages/railway/runStatus/list.vue b/pages/railway/runStatus/list.vue
index 9e73854..69408f3 100644
--- a/pages/railway/runStatus/list.vue
+++ b/pages/railway/runStatus/list.vue
@@ -36,7 +36,7 @@
 						<view class="picker_select">
 							<picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel">
 								<text class="unselect_txt"
-									:style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text>
+									:style="index?'color:#333;':''">{{index?array[index].dictLabel:'请选择时段'}}</text>
 								<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
 							</picker>
 						</view>
@@ -120,7 +120,7 @@
 					statDateEnd: '',
 					statPeriod: ''
 				};
-				this.index = -1;
+				this.index = '';
 			},
 			//查询
 			showSearch() {
diff --git a/util/request.js b/util/request.js
index 0b4aba3..b717a9a 100644
--- a/util/request.js
+++ b/util/request.js
@@ -18,7 +18,7 @@ const request = (url, data, method = 'GET') => {
 				if (res.statusCode == 200) {
 					if (res.data.code == 200 || res.data.code == "" || res.data.status == 200) {
 						resolve(res.data)
-					} else if (res.data.code == 401) {
+					} else if (res.data.code == 20011) {
 						uni.removeStorageSync("satoken")
 						uni.navigateTo({
 							url: '/pages/login/login'
@@ -27,7 +27,8 @@ const request = (url, data, method = 'GET') => {
 						resolve(res.data)
 						uni.showToast({
 							title: res.data.msg,
-							icon: "none"
+							icon: "none",
+							duration: 2000
 						})
 					}
 				} else {