Merge branch 'dev-ft' into 'main'

fix:DEFECT-369 修改问题单号的pc端和min-pro筛选时间数据不同意问题,修改返回顶部时间为10ms，feat:新增无数据显示默认图片

See merge request huang/thingskit-app!40

 <script>
 import base from '@/config/baseUrl';
 import store from '@/store';
-// #ifdef APP-PLUS
-import APPUpdate from '@/uni_modules/zhouWei-APPUpdate/js_sdk/appUpdate';
-// #endif
 
 import { mpUpData, scene } from '@/config/common';
 export default {
@@ -16,9 +13,6 @@ export default {
 		store.commit('setCacheData');
 		//获取二维码信息
 		scene(e);
-		// #ifdef APP-PLUS
-		APPUpdate(); //检测app更新
-		// #endif
 	},
 	onShow(e) {
 		// #ifdef MP

@@ -2,7 +2,7 @@
 	padding: 30rpx;
 }
 .alarm-detail-column {
-	border-radius: 20px;
+	border-radius: 10px;
 	width: 688rpx;
 	height: 573rpx;
 	background-color: #ffffff;
@@ -54,7 +54,7 @@
 }
 .hanle-main {
 	margin-top: 30rpx;
-	border-radius: 20px;
+	border-radius: 10px;
 	width: 688rpx;
 	height: 273rpx;
 	background-color: #ffffff;

@@ -128,30 +128,7 @@ export const judgeLogin = (callback) => {
 	}
 	if (!storeUserInfo.isToken) {
 		// #ifdef MP
-		return uni.$u.toast('请登录')
-		// uni.$showModal({
-		// 	title: "登录提示",
-		// 	confirmVal: '去登录',
-		// 	cancelVal: '再逛会',
-		// 	content: '此时此刻需要您登录喔~',
-		// }).then(res => {
-		// 	uni.navigateTo({
-		// 		url: "/pages/personal/login"
-		// 	});
-		// }).catch(res => {})
-		// store.commit('setLoginPopupShow', true);
-		// #endif
-		// #ifdef APP-PLUS
-		uni.$showModal({
-			title: "登录提示",
-			confirmVal: '去登录',
-			cancelVal: '再逛会',
-			content: '此时此刻需要您登录喔~',
-		}).then(res => {
-			uni.navigateTo({
-				url: "/pages/personal/login"
-			});
-		}).catch(res => {})
+		return
 		// #endif
 		// #ifdef H5
 		h5Login();

@@ -31,6 +31,11 @@ uni.$u.http.setConfig((config) => {
 // 请求拦截
 uni.$u.http.interceptors.request.use(
 	(config) => {
+		if (store.state.userInfo.isThirdLogin) {
+			uni.switchTab({
+				url: "../pages/personal/personal",
+			});
+		}
 		// 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
 		config.data = config.data || {};
 		// 根据custom参数中配置的是否需要token，添加对应的请求头
@@ -71,7 +76,6 @@ uni.$u.http.interceptors.response.use(
 		} else {}
 	},
 	(response) => {
-		console.log('Response error', response)
 		// 关闭加载动画
 		store.commit("setLoadingShow", false);
 		let show = true;
@@ -82,12 +86,19 @@ uni.$u.http.interceptors.response.use(
 		} else if (message == "request:fail timeout") {
 			errorData = "请求超时:请检查网络";
 		} else if (response.data.status == 401) {
-			uni.reLaunch({
-				url: "/publicLoginSubPage/public/login",
-			});
-			// 清空登录信息
-			store.commit("emptyUserInfo");
-			show = false;
+			if (!store.state.userInfo.isThirdLogin) {
+				uni.reLaunch({
+					url: "/publicLoginSubPage/public/login",
+				});
+				// 清空登录信息
+				store.commit("emptyUserInfo");
+				show = false;
+			} else {
+				uni.switchTab({
+					url: "../pages/personal/personal",
+				});
+				show = false;
+			}
 		} else {
 			errorData = message || "";
 		}

@@ -30,7 +30,12 @@
 		<!-- 吸顶组件 -->
 		<!-- 自带分页组件 -->
 		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
-			<view class="device-list">
+			<!-- 无数据图片 -->
+			<view v-if="list.length == 0" style="position: relative;top: 100rpx;flex-direction: column;" class="u-flex">
+				<view><image style="width: 280rpx;height: 250rpx;" src="../../static/empty.png"></image></view>
+				<view style="text-align: center;"><text style="font-size: 12px;color: gray;">~ 空空如也 ~</text></view>
+			</view>
+			<view v-else class="device-list">
 				<view @click="openAlertDetail(item)" class="list-item" v-for="(item, index) in list" :key="index">
 					<view class="u-flex item">
 						<view class="item-text text-clip">
@@ -164,7 +169,7 @@
 										<view class="u-flex popup-alarm-child">
 											<view class="home-text-muted">选择日期</view>
 											<view style="width: 623rpx;margin-left: 5rpx;margin-right: 70rpx;margin-top: 35rpx;">
-												<uni-datetime-picker v-model="range" type="daterange" />
+												<uni-datetime-picker v-model="range" type="datetimerange" rangeSeparator="至" />
 											</view>
 										</view>
 									</view>
@@ -197,7 +202,7 @@ export default {
 	},
 	data() {
 		return {
-			range: ['', ''],
+			range: [],
 			alertStatusVal: '',
 			deviceTypeVal: '',
 			alertLevelVal: '',
@@ -378,7 +383,7 @@ export default {
 		topBack() {
 			uni.pageScrollTo({
 				scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
-				duration: 300 // 滚动动画的时长
+				duration: 10 // 滚动动画的时长
 			});
 		},
 		/*下拉刷新的回调 */
@@ -451,7 +456,6 @@ export default {
 					}
 				})
 				.catch(e => {
-					uni.$u.toast(e.data?.message);
 					//联网失败, 结束加载
 					that.mescroll.endErr();
 				});

@@ -41,9 +41,7 @@ export default {
 						this.tree = list;
 					}
 				})
-				.catch(e => {
-					uni.$u.toast(e.data.message);
-				});
+				.catch(e => {});
 		},
 		confirm(val) {
 			this.id = val[0].id;

@@ -125,14 +125,17 @@
 		justify-content: space-between;
 
 		.item {
-			margin: 30rpx;
 			justify-content: flex-start;
 			flex-direction: column;
 			align-items: center;
+			height: 211rpx;
+			margin-top: 8rpx;
+			margin-left: 37rpx;
 
 			.item-text {
 				width: 400rpx;
 				text-align: left;
+				margin-top: 13rpx;
 
 				.text {
 					color: #666666;
@@ -152,7 +155,8 @@
 
 			.item-right {
 				flex-direction: row;
-				margin-top: -15rpx;
+				margin-top: -3rpx;
+				margin-right: 25rpx;
 
 				.right-image {
 					width: 30rpx;

@@ -7,7 +7,7 @@
 				<view class="u-flex org-contact"><text class="text">组织关系</text></view>
 				<view class="u-flex org-device">
 					<image class="device-image" src="../../../static/org.png"></image>
-					<text class="device-text">设备数：{{ deviceTotal }}</text>
+					<text class="device-text">摄像头数：{{ cameraTotal }}</text>
 				</view>
 			</view>
 			<view class="org-item"><image class="image" src="../../../static/arrow-right.png"></image></view>
@@ -54,7 +54,7 @@ export default {
 				auto: false // 不自动加载
 			},
 			current: 0,
-			deviceTotal: 0,
+			cameraTotal: 0,
 			list: [],
 			ordId: ''
 		};
@@ -72,7 +72,7 @@ export default {
 	onLoad() {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
-		this.getDeviceTotalData();
+		this.getcameraTotalData();
 	},
 	methods: {
 		/*下拉刷新的回调 */
@@ -98,6 +98,7 @@ export default {
 				.then(res => {
 					uni.stopPullDownRefresh();
 					this.mescroll.endByPage(res.items.length, res.total);
+					this.cameraTotal = res.total;
 					if (pageNo == 1) {
 						this.list = res.items;
 					} else {
@@ -105,7 +106,6 @@ export default {
 					}
 				})
 				.catch(e => {
-					uni.$u.toast(e.data?.message);
 					//联网失败, 结束加载
 					this.mescroll.endErr();
 				});
@@ -113,22 +113,6 @@ export default {
 		hideImageUrl(item, index) {
 			this.current = index;
 		},
-		getDeviceTotalData() {
-			let httpData = {
-				page: 1,
-				pageSize: 10
-			};
-			uni.$u.http
-				.get('/yt/device', { params: httpData, custom: { load: false } })
-				.then(res => {
-					if (res) {
-						this.deviceTotal = res.total;
-					}
-				})
-				.catch(e => {
-					uni.$u.toast(e.data?.message);
-				});
-		},
 		openCameraDetail(e) {
 			console.log(e);
 		},

@@ -41,9 +41,7 @@ export default {
 						this.tree = list;
 					}
 				})
-				.catch(e => {
-					uni.$u.toast(e.data.message);
-				});
+				.catch(e => {});
 		},
 		confirm(val) {
 			this.id = val[0].id;

@@ -144,9 +144,9 @@ export default {
 			});
 		},
 		openOrgStatus() {
-			uni.navigateTo({
-				url: 'configuration/configuration'
-			});
+			// uni.navigateTo({
+			// 	url: 'configuration/configuration'
+			// });
 		},
 		//告警状态查询
 		navigatorAlarmStatus(e) {

@@ -67,11 +67,11 @@
 			width: 330rpx;
 			height: 200rpx;
 			background-color: #fff;
-			border-radius: 20px;
+			border-radius: 10px;
 			margin-left: 25rpx;
 			margin-right: 21rpx;
 			.video {
-				border-radius: 20px;
+				border-radius: 10px;
 				width: 330rpx;
 				height: 200rpx;
 			}
@@ -92,7 +92,7 @@
 				.image {
 					width: 330rpx;
 					height: 200rpx;
-					border-radius: 20px;
+					border-radius: 10px;
 				}
 			}
 		}

@@ -20,7 +20,7 @@
 	background-color: #fff;
 	border: 0.01rpx solid #fff;
 	padding: 40rpx;
-	border-radius: 20px;
+	border-radius: 10px;
 	.item-center {
 		width: 290rpx;
 		height: 150rpx;
@@ -80,7 +80,7 @@
 			justify-content: space-between;
 			align-items: flex-start;
 			flex-direction: column;
-			border-radius: 20px;
+			border-radius: 10px;
 			.item-child-top {
 				justify-content: space-between;
 				padding: 30rpx;

@@ -8,7 +8,7 @@
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 				<block v-if="userInfo.isToken || userInfo.isThirdLogin">
 					<view @click="openPersonalInfo" class="u-m-r-20">
-						<image class="avatar" mode="aspectFill" :src="userInfo.avatar == '' ? '/static/logo.png' : userInfo.avatar"></image>
+						<image class="avatar" mode="aspectFill" :src="!userInfo.avatar ? '../../static/logo.png' : userInfo.avatar"></image>
 					</view>
 					<view class="u-flex-1">
 						<view class="nickName u-flex">

 import Vue from 'vue';
 import moment from 'moment';
-// #ifdef APP-PLUS
-import {judgePermission} from './permission'
-// #endif
 const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
 //金额过滤
 Vue.filter('money', function(val) {
@@ -26,68 +23,68 @@ Vue.filter('money', function(val) {
 });
 //手机号中间4位为*
 Vue.filter('phone', function(val) {
-    var tel = val;
-    tel = "" + tel;
-    var telShort = tel.replace(tel.substring(3, 7), "****")
-    return telShort
+	var tel = val;
+	tel = "" + tel;
+	var telShort = tel.replace(tel.substring(3, 7), "****")
+	return telShort
 })
 //获取系统信息、判断ipX安全距离
 export const getTabbarHeight = function() {
-    var systemInfo = uni.getSystemInfoSync()
-    var data = {
-        ...systemInfo,
-        tabbarH: 50,//tabbar高度--单位px
-        tabbarPaddingB: 0,//tabbar底部安全距离高度--单位px
-        device: systemInfo.system.indexOf('iOS') != -1?'iOS':'Android', //苹果或者安卓设备
-    }
-    let modelArr = ['10,3','10,6','X', 'XR', 'XS', '11', '12', '13', '14', '15', '16'];
-    let model = systemInfo.model;
-    model && modelArr.forEach(item => {
-        //适配iphoneX以上的底部，给tabbar一定高度的padding-bottom
-        if(model.indexOf(item) != -1 && (model.indexOf('iPhone') != -1 || model.indexOf('iphone') != -1)) {
-            data.tabbarH = 70
-            data.tabbarPaddingB = 20
-        }
-    })
-    return data;
+	var systemInfo = uni.getSystemInfoSync()
+	var data = {
+		...systemInfo,
+		tabbarH: 50, //tabbar高度--单位px
+		tabbarPaddingB: 0, //tabbar底部安全距离高度--单位px
+		device: systemInfo.system.indexOf('iOS') != -1 ? 'iOS' : 'Android', //苹果或者安卓设备
+	}
+	let modelArr = ['10,3', '10,6', 'X', 'XR', 'XS', '11', '12', '13', '14', '15', '16'];
+	let model = systemInfo.model;
+	model && modelArr.forEach(item => {
+		//适配iphoneX以上的底部，给tabbar一定高度的padding-bottom
+		if (model.indexOf(item) != -1 && (model.indexOf('iPhone') != -1 || model.indexOf('iphone') != -1)) {
+			data.tabbarH = 70
+			data.tabbarPaddingB = 20
+		}
+	})
+	return data;
 }
 
 //计算两点距离
-export const  commonDistance = function(lat1, lng1, lat2, lng2) {
-    var f = ((lat1 + lat2) / 2) * Math.PI / 180.0;
-    var g = ((lat1 - lat2) / 2) * Math.PI / 180.0;
-    var l = ((lng1 - lng2) / 2) * Math.PI / 180.0;
-    var sg = Math.sin(g);
-    var sl = Math.sin(l);
-    var sf = Math.sin(f); 
-    var s, c, w, r, d, h1, h2;
-    var a = 6378137.0; //地球的直径
-    var fl = 1 / 298.257;
-    sg = sg * sg;  
-    sl = sl * sl;  
-    sf = sf * sf;  
-    s = sg * (1 - sl) + (1 - sf) * sl;  
-    c = (1 - sg) * (1 - sl) + sf * sl;  
-    w = Math.atan(Math.sqrt(s / c));  
-    r = Math.sqrt(s * c) / w;  
-    d = 2 * w * a;  
-    h1 = (3 * r - 1) / 2 / c;  
-    h2 = (3 * r + 1) / 2 / s;  
-    var num = d * (1 + fl * (h1 * sf * (1 - sg) - h2 * (1 - sf) * sg))  
-    // 换算单位
-    if (num == undefined) {
-        num = "0.0 m"
-    };
-    if (num < 1000) {
-        num = (Math.round(num)).toFixed(1) + "m"
-    } else if (num > 1000) {
-        num = (Math.round(num / 100) / 10).toFixed(1) + "km"
-    }
-    return num
+export const commonDistance = function(lat1, lng1, lat2, lng2) {
+	var f = ((lat1 + lat2) / 2) * Math.PI / 180.0;
+	var g = ((lat1 - lat2) / 2) * Math.PI / 180.0;
+	var l = ((lng1 - lng2) / 2) * Math.PI / 180.0;
+	var sg = Math.sin(g);
+	var sl = Math.sin(l);
+	var sf = Math.sin(f);
+	var s, c, w, r, d, h1, h2;
+	var a = 6378137.0; //地球的直径
+	var fl = 1 / 298.257;
+	sg = sg * sg;
+	sl = sl * sl;
+	sf = sf * sf;
+	s = sg * (1 - sl) + (1 - sf) * sl;
+	c = (1 - sg) * (1 - sl) + sf * sl;
+	w = Math.atan(Math.sqrt(s / c));
+	r = Math.sqrt(s * c) / w;
+	d = 2 * w * a;
+	h1 = (3 * r - 1) / 2 / c;
+	h2 = (3 * r + 1) / 2 / s;
+	var num = d * (1 + fl * (h1 * sf * (1 - sg) - h2 * (1 - sf) * sg))
+	// 换算单位
+	if (num == undefined) {
+		num = "0.0 m"
+	};
+	if (num < 1000) {
+		num = (Math.round(num)).toFixed(1) + "m"
+	} else if (num > 1000) {
+		num = (Math.round(num / 100) / 10).toFixed(1) + "km"
+	}
+	return num
 }
 // px转upx
-export const px2upx = function(n){
-    return n/(uni.upx2px(n)/n);
+export const px2upx = function(n) {
+	return n / (uni.upx2px(n) / n);
 }
 
 // 判断两时间段之间活动状态、判断活动还有多长时间开始、多长时间结束----添加定时器运行此方法可倒计时
@@ -95,53 +92,59 @@ export const px2upx = function(n){
 // var closeTime = new Date(item.closeTime.replace(/-/g, '/')).getTime(); //转时间戳
 // var djs = this.djsTime(startTime, closeTime);
 export const djsTime = function(startTime, endTime) {
-    var bbb = new Date().getTime(),
-        leftTime = startTime - bbb,
-        rightTime = endTime - bbb,
-        djsTime = '',
-        speed = 0,
-        activityStatus = 0, //活动状态 1：未开始 2：进行中 3：已结束
-        dd,hh,mm,ss;
-    if (leftTime > 0) { //还未开始
-        activityStatus = 1
-        dd = Math.floor(leftTime / 1000 / 60 / 60 / 24);
-        hh = Math.floor((leftTime / 1000 / 60 / 60) % 24) < 10 ? '0' + Math.floor((leftTime / 1000 / 60 / 60) % 24) : Math.floor((leftTime / 1000 / 60 / 60) % 24);
-        mm = Math.floor((leftTime / 1000 / 60) % 60) < 10 ? '0' + Math.floor((leftTime / 1000 / 60) % 60) : Math.floor((leftTime / 1000 / 60) % 60);
-        ss = Math.floor((leftTime / 1000) % 60) < 10 ? '0' + Math.floor((leftTime / 1000) % 60) : Math.floor((leftTime / 1000) % 60);
-        if (dd != 0) {
-            djsTime = dd + "天 " + hh + ":" + mm + ":" + ss;
-        } else {
-            djsTime = hh + ":" + mm + ":" + ss;
-        }
-    } else if (leftTime <= 0) {
-        if (rightTime > 0) { //进行中
-            activityStatus = 2;
-            speed = (1 - rightTime / (endTime - startTime)) * 100;
-            dd = Math.floor(rightTime / 1000 / 60 / 60 / 24);
-            hh = Math.floor((rightTime / 1000 / 60 / 60) % 24) < 10 ? '0' + Math.floor((rightTime / 1000 / 60 / 60) % 24) : Math.floor((rightTime / 1000 / 60 / 60) % 24);
-            mm = Math.floor((rightTime / 1000 / 60) % 60) < 10 ? '0' + Math.floor((rightTime / 1000 / 60) % 60) : Math.floor((rightTime / 1000 / 60) % 60);
-            ss = Math.floor((rightTime / 1000) % 60) < 10 ? '0' + Math.floor((rightTime / 1000) % 60) : Math.floor((rightTime / 1000) % 60);
-            if (dd != 0) {
-                djsTime = dd + "天 " + hh + ":" + mm + ":" + ss;
-            } else {
-                djsTime = hh + ":" + mm + ":" + ss;
-            }
-        } else { //已结束
-            speed = 100;
-            djsTime = '已结束';
-            activityStatus = 3;
-        }
-    }
-    var item = {
-        djsTime: djsTime, //距离当前时间差
-        activityStatus: activityStatus, //活动状态 1：未开始 2：进行中 3：已结束
-        speed: speed, //进度（单位%）
-        dd: dd, //天
-        hh: hh, //小时
-        mm: mm, //分
-        ss: ss, //秒
-    }
-    return item;
+	var bbb = new Date().getTime(),
+		leftTime = startTime - bbb,
+		rightTime = endTime - bbb,
+		djsTime = '',
+		speed = 0,
+		activityStatus = 0, //活动状态 1：未开始 2：进行中 3：已结束
+		dd, hh, mm, ss;
+	if (leftTime > 0) { //还未开始
+		activityStatus = 1
+		dd = Math.floor(leftTime / 1000 / 60 / 60 / 24);
+		hh = Math.floor((leftTime / 1000 / 60 / 60) % 24) < 10 ? '0' + Math.floor((leftTime / 1000 / 60 / 60) %
+			24) : Math.floor((leftTime / 1000 / 60 / 60) % 24);
+		mm = Math.floor((leftTime / 1000 / 60) % 60) < 10 ? '0' + Math.floor((leftTime / 1000 / 60) % 60) : Math
+			.floor((leftTime / 1000 / 60) % 60);
+		ss = Math.floor((leftTime / 1000) % 60) < 10 ? '0' + Math.floor((leftTime / 1000) % 60) : Math.floor((
+			leftTime / 1000) % 60);
+		if (dd != 0) {
+			djsTime = dd + "天 " + hh + ":" + mm + ":" + ss;
+		} else {
+			djsTime = hh + ":" + mm + ":" + ss;
+		}
+	} else if (leftTime <= 0) {
+		if (rightTime > 0) { //进行中
+			activityStatus = 2;
+			speed = (1 - rightTime / (endTime - startTime)) * 100;
+			dd = Math.floor(rightTime / 1000 / 60 / 60 / 24);
+			hh = Math.floor((rightTime / 1000 / 60 / 60) % 24) < 10 ? '0' + Math.floor((rightTime / 1000 / 60 /
+				60) % 24) : Math.floor((rightTime / 1000 / 60 / 60) % 24);
+			mm = Math.floor((rightTime / 1000 / 60) % 60) < 10 ? '0' + Math.floor((rightTime / 1000 / 60) % 60) :
+				Math.floor((rightTime / 1000 / 60) % 60);
+			ss = Math.floor((rightTime / 1000) % 60) < 10 ? '0' + Math.floor((rightTime / 1000) % 60) : Math.floor((
+				rightTime / 1000) % 60);
+			if (dd != 0) {
+				djsTime = dd + "天 " + hh + ":" + mm + ":" + ss;
+			} else {
+				djsTime = hh + ":" + mm + ":" + ss;
+			}
+		} else { //已结束
+			speed = 100;
+			djsTime = '已结束';
+			activityStatus = 3;
+		}
+	}
+	var item = {
+		djsTime: djsTime, //距离当前时间差
+		activityStatus: activityStatus, //活动状态 1：未开始 2：进行中 3：已结束
+		speed: speed, //进度（单位%）
+		dd: dd, //天
+		hh: hh, //小时
+		mm: mm, //分
+		ss: ss, //秒
+	}
+	return item;
 }
 
 // 小程序获取定位权限判断
@@ -151,14 +154,14 @@ function getMpLocation(successCallback, errCallback, isOpenSetting) {
 		success: res => {
 			if (res.authSetting['scope.userLocation'] || !isOpenSetting) {
 				uni.getLocation({
-                    // #ifndef MP-ALIPAY
-                    type: 'gcj02',
-                    // #endif
-					success(res){
-                        console.log('successCallback')
+					// #ifndef MP-ALIPAY
+					type: 'gcj02',
+					// #endif
+					success(res) {
+						console.log('successCallback')
 						successCallback(res);
 					},
-					fail(err){
+					fail(err) {
 						console.log("位置信息错误", err);
 						errCallback("位置信息获取失败");
 					}
@@ -200,40 +203,24 @@ export const getAppLatLon = function(successCallback, errCallback, isOpenSetting
 		getMpLocation(successCallback, errCallback, isOpenSetting);
 	}
 	// #endif
-    // #ifdef MP-ALIPAY
-    getMpLocation(successCallback, errCallback, false);
-    // #endif
-    // #ifdef H5
-    uni.getLocation({
-        type: 'gcj02',
-    	success(res){
-            console.log('successCallback')
-    		successCallback(res);
-    	},
-    	fail(err){
-    		console.log("位置信息错误", err);
-    		errCallback("位置信息获取失败");
-    	}
-    });
-    // #endif
-	// #ifdef APP-PLUS
-	judgePermission("location", function(result) {
-		if (result == 1) {
-			uni.getLocation({
-				type: 'gcj02',
-				success: res => {
-					successCallback(res);
-				},
-				fail: (err) => {
-					console.log("位置信息错误", err);
-					errCallback("位置信息获取失败");
-				}
-			});
+	// #ifdef MP-ALIPAY
+	getMpLocation(successCallback, errCallback, false);
+	// #endif
+	// #ifdef H5
+	uni.getLocation({
+		type: 'gcj02',
+		success(res) {
+			console.log('successCallback')
+			successCallback(res);
+		},
+		fail(err) {
+			console.log("位置信息错误", err);
+			errCallback("位置信息获取失败");
 		}
 	});
 	// #endif
 }
 
 export function formatToDate(date = undefined, format = DATE_TIME_FORMAT) {
-  return moment(date).format(format);
-}
\ No newline at end of file
+	return moment(date).format(format);
+}

@@ -8,7 +8,7 @@
 		</view>
 		<view class="u-m-t-20 basic-text"><text class="text">基本资料</text></view>
 		<view class="basic-main">
-			<u--form labelPosition="left" :model="myInfoModel" :rules="rules" ref="myInfoFormRef">
+			<u--form labelPosition="left" :model="myInfoModel">
 				<u-form-item labelWidth="80px" label="真实姓名" prop="userInfo.realName" borderBottom ref="item1">
 					<u--input placeholder="请输入真实姓名" v-model="myInfoModel.userInfo.realName" border="none"></u--input>
 				</u-form-item>
@@ -86,54 +86,6 @@ export default {
 			dateTime: Number(new Date()),
 			avatar: '',
 			id: '',
-			rules: {
-				'userInfo.realName': [
-					{
-						type: 'string',
-						required: true,
-						message: '请填写姓名',
-						trigger: ['blur', 'change']
-					},
-					{
-						validator: (rule, value, callback) => {
-							return uni.$u.test.chinese(value);
-						},
-						message: '姓名必须为中文',
-						trigger: ['change', 'blur']
-					}
-				],
-				'userInfo.phoneNumber': [
-					{
-						type: 'string',
-						required: true,
-						message: '请填写手机号码',
-						trigger: ['blur', 'change']
-					},
-					{
-						// 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
-						validator: (rule, value, callback) => {
-							return uni.$u.test.mobile(value);
-						},
-						message: '手机必须为数字',
-						trigger: ['change', 'blur']
-					}
-				],
-				'userInfo.email': [
-					{
-						type: 'string',
-						required: true,
-						message: '请填写邮箱',
-						trigger: ['blur', 'change']
-					},
-					{
-						validator: (rule, value, callback) => {
-							return uni.$u.test.email(value);
-						},
-						message: '邮箱必须带有@',
-						trigger: ['change', 'blur']
-					}
-				]
-			},
 			info: {},
 			openIds: ''
 		};
@@ -153,7 +105,6 @@ export default {
 	},
 	onShow() {
 		let getOpenId = getApp().globalData.openId;
-		console.log('获取全局openId', getOpenId);
 		if (getOpenId) {
 			this.openIds = getOpenId;
 		}
@@ -161,7 +112,6 @@ export default {
 	methods: {
 		confrimBind(e) {
 			if (e) {
-				console.log('Bind', e.third?.thirdUserId);
 				//解绑
 				let httpData = {
 					appUserId: e.data?.userId,
@@ -231,37 +181,30 @@ export default {
 			});
 		},
 		onSubmitFunc() {
-			this.$refs.myInfoFormRef
-				.validate()
+			let httpData = {
+				avatar: this.avatar,
+				email: this.myInfoModel.userInfo.email,
+				id: this.id,
+				phoneNumber: this.myInfoModel.userInfo.phoneNumber,
+				realName: this.myInfoModel.userInfo.realName
+			};
+			uni.$u.http
+				.put('/yt/user/center', httpData)
 				.then(res => {
-					let httpData = {
-						avatar: this.avatar,
-						email: this.myInfoModel.userInfo.email,
-						id: this.id,
-						phoneNumber: this.myInfoModel.userInfo.phoneNumber,
-						realName: this.myInfoModel.userInfo.realName
-					};
-					uni.$u.http
-						.put('/yt/user/center', httpData)
-						.then(res => {
-							if (res) {
-								uni.showToast({
-									title: '更新个人资料成功~',
-									icon: 'none'
-								});
-								setTimeout(() => {
-									uni.navigateBack({
-										delta: 1
-									});
-								}, 500);
-							}
-						})
-						.catch(e => {
-							uni.$u.toast(e.data.message);
+					if (res) {
+						uni.showToast({
+							title: '更新个人资料成功~',
+							icon: 'none'
 						});
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							});
+						}, 500);
+					}
 				})
-				.catch(errors => {
-					uni.$u.toast('校验失败');
+				.catch(e => {
+					uni.$u.toast(e.data.message);
 				});
 		},
 		dateClose() {

@@ -118,7 +118,8 @@ export default {
 										url: '../../pages/personal/personal'
 									});
 									let userInfo = {
-										isThirdLogin: true //token用于判断是否登录
+										isThirdLogin: true, //token用于判断是否登录
+										avatar: data.avatarUrl
 									};
 									this.setUserInfo(userInfo);
 								} else {
@@ -130,7 +131,8 @@ export default {
 									};
 									let userInfo = {
 										...resObj,
-										token: true //token用于判断是否登录
+										token: true, //token用于判断是否登录
+										isThirdLogin: false
 									};
 									if (userInfo.token) {
 										this.setUserInfo(userInfo);

@@ -25,6 +25,7 @@ export const mutations = {
 		// #endif
 		// #ifndef H5
 		uni.removeStorageSync("userInfo");
+		uni.removeStorageSync('storagePre');
 		// #endif
 	},
 };
@@ -35,6 +36,5 @@ export const actions = {
 		commit
 	}, data) {
 		state.badgeInfo = data
-		console.log('Change total', data);
 	}
 };

@@ -64,7 +64,7 @@ button {
 .text-bold {
 	color: #333333;
 	font-family: PingFangSC-Medium, PingFang SC;
-	font-weight: 500;
+	font-weight: bold;
 	font-size: 15px;
 }
 //（设备、告警,适用设备详情基础信息文本（右边的值的文本））第二个文本
@@ -132,7 +132,7 @@ button {
 .home-text-total {
 	font-size: 17px;
 	font-family: PingFangSC-Regular, PingFang SC;
-	font-weight: 500;
+	font-weight: bold;
 	color: #333333;
 }
 .home-text-total-bottom {

@@ -116,6 +116,8 @@ export default {
 			this.list.length = 0;
 			this.page.num = 1;
 			this.loadData(1);
+			this.isJudgeNextPage = '';
+			this.model1.userInfo.type = '';
 		},
 		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 		upCallback() {