token刷新问题,设备心跳调整

common/http.interceptor.js

@@ -17,7 +17,7 @@ const install = (Vue, vm) => {
 		// config.header.Token = 'xxxxxx';
 		
 		// 方式一，存放在vuex的token，假设使用了uView封装的vuex方式，见：https://uviewui.com/components/globalVariable.html
-		if(vm.vuex_user.token){config.header.Authorization = `Bearer ${vm.vuex_user.token}`;}
+		// if(vm.vuex_user.token){config.header.Authorization = `Bearer ${vm.vuex_user.token}`;}
 		if(vm.vuex_user.userId){config.header.user_id = vm.vuex_user.userId;}
 		
 		
@@ -28,6 +28,10 @@ const install = (Vue, vm) => {
 		// config.header.token = getApp().globalData.username;
 		
 		// 方式四，如果token放在了Storage本地存储中，拦截是每次请求都执行的，所以哪怕您重新登录修改了Storage，下一次的请求将会是最新值
+		let lifeData = uni.getStorageSync('lifeData');
+		let token = lifeData.vuex_user?.token;
+		if(token){config.header.Authorization = `Bearer ${token}`;}
+		// console.log('getStorageSync token',token);
 		// const token = uni.getStorageSync('token');
 		// config.header.token = token;
 		

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'?677:677" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
+			<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?730:730" :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>
@@ -95,7 +95,7 @@
 					page: {
 						size: 7 // 每页数据的数量
 					},
-					auto:true,
+					auto:false,
 					// use:false,
 					noMoreSize: 4, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5
 					empty:{
@@ -150,7 +150,7 @@
 		},
 		onLoad(page){
 			this.id = page.id;
-			this.deviceId = page.id;
+			// this.deviceId = page.id;
 			if(page.roadName){
 				this.roadName = page.roadName;
 				this.title = page.roadName;
@@ -237,6 +237,7 @@
 					if(res.code==200){
 						this.pageData = res.data;
 						this.form.deviceId = res.data.deviceId;
+						this.mescroll.resetUpScroll();
 						// console.log('findRoadSpaceVoById',res);
 					}else{
 						uni.showToast({
@@ -253,7 +254,7 @@
 			upCallback(page) {
 				// console.log('page',page);
 				let params ={
-					deviceId:this.deviceId,
+					deviceId:this.form.deviceId,
 					pageNum:1,//page.num--只请求第一页
 					pageSize:page.size
 				};

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'?677:677" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
+			<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?730:730" :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>