auto commit

pages/deviceList/deviceListType1/deviceInfo.vue

@@ -37,7 +37,7 @@
 			bg-color="#F1F8FF" 
 			color="#010101" 
 			border-color="#6d6d6d">设备心跳</u-divider>
-			<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?dividerBottom+30:dividerBottom+30" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
+			<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?677:677" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
 				<view class="device-list u-text-center ">
 					<view v-if="dataList.length>=1" class="list-header u-flex u-row-around">
 						<view class="u-flex-2">时间</view>

pages/deviceList/deviceListType2/deviceInfo.vue

@@ -37,7 +37,7 @@
 			bg-color="#F1F8FF" 
 			color="#010101" 
 			border-color="#6d6d6d">设备心跳</u-divider>
-			<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?dividerBottom+30:dividerBottom+30" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
+			<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?677:677" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
 				<view class="device-list u-text-center ">
 					<view v-if="dataList.length>=1" class="list-header u-flex u-row-around">
 						<view class="u-flex-2">时间</view>

pages/login/login.vue

@@ -150,7 +150,7 @@ export default {
 	font-size: 70rpx;
 	color: #fff;
 	line-height: 98rpx;
-	font-weight: 800;
+	font-weight: 600;
 	padding: 0 0 68rpx;
 	margin-top: 15vh;
 	.til{