'fix:解决冲突'

 <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

@@ -70,8 +70,12 @@
 			<view><u--textarea border="none" height="96" placeholder="请输入处理结果" v-model="formModel.result" count></u--textarea></view>
 		</view>
 		<!-- #endif -->
-		<view v-if="list.status !== 'CLEARED_ACK'" style="margin-top: 44rpx;display: flex;align-items: center;justify-content: center;">
-			<view class="u-flex" style="width: 400rpx"><u-button @click="handleSubmit" type="primary" shape="circle" text="处理"></u-button></view>
+		<view style="margin-top: 44rpx;display: flex;align-items: center;justify-content: space-between;">
+			<view v-if="list.status !== 'CLEARED_ACK' && list.status !== 'ACTIVE_ACK'" class="u-flex" style="width: 260rpx">
+				<u-button @click="handleSubmit" type="primary" shape="circle" text="处理"></u-button>
+			</view>
+			<view style="width: 30rpx;"></view>
+			<view v-if="list.status == 'ACTIVE_ACK'" class="u-flex" style="width: 260rpx"><u-button @click="handleRemove" type="error" shape="circle" text="清除"></u-button></view>
 		</view>
 	</view>
 </template>
@@ -95,6 +99,7 @@ export default {
 		uni.hideTabBar();
 	},
 	methods: {
+		//处理
 		handleSubmit() {
 			if (this.formModel.result == '') return uni.$u.toast('请输入处理结果');
 			else
@@ -121,6 +126,31 @@ export default {
 						uni.$u.toast(e.data?.message);
 					});
 		},
+		//清除
+		handleRemove() {
+			uni.$u.http
+				.post(`/alarm/${this.list.id}/clear`)
+				.then(res => {
+					if (res == '') {
+						uni.showToast({
+							title: '清除成功~',
+							icon: 'none'
+						});
+						let pages = getCurrentPages(); //获取所有页面栈实例列表
+						let nowPage = pages[pages.length - 1]; //当前页页面实例
+						let prevPage = pages[pages.length - 2]; //上一页页面实例
+						prevPage.$vm.detailStatus = true;
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							});
+						}, 500);
+					}
+				})
+				.catch(e => {
+					uni.$u.toast(e.data?.message);
+				});
+		},
 		formatDetailText(e) {
 			//去除字符串双引号
 			const jsonStr = JSON.stringify(e);

 .alarm-detail-page {
 	padding: 30rpx;
 }
-.alarm-detail-column {
-	border-radius: 20px;
+.alarm- {
+	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 || "";
 		}

@@ -12,7 +12,6 @@
 	"author": "",
 	"license": "ISC",
 	"dependencies": {
-		"crypto": "^1.0.1",
 		"moment": "^2.29.2"
 	}
 }

@@ -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: '',
@@ -297,7 +302,7 @@ export default {
 			this.selectTimeVal = e.value;
 			let curTime = new Date();
 			const formatS = curTime.getTime();
-			let addMinute = new Date(curTime.setMinutes(curTime.getMinutes() + this.selectTimeVal));
+			let addMinute = new Date(curTime.setMinutes(curTime.getMinutes() - this.selectTimeVal));
 			const formatE = addMinute.getTime();
 			this.timeData.getTimeGapS = formatS;
 			this.timeData.getTimeGapE = formatE;
@@ -318,8 +323,8 @@ export default {
 				this.startTimeArea = '';
 				this.endTimeArea = '';
 			} else {
-				this.startTimeArea = this.timeData.getTimeGapS;
-				this.endTimeArea = this.timeData.getTimeGapE;
+				this.startTimeArea = this.timeData.getTimeGapE;
+				this.endTimeArea = this.timeData.getTimeGapS;
 			}
 			this.loadData(
 				1,
@@ -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,18 @@
 		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;
+				line-height: 40rpx;
 
 				.text {
 					color: #666666;
@@ -152,7 +156,8 @@
 
 			.item-right {
 				flex-direction: row;
-				margin-top: -15rpx;
+				margin-top: -3rpx;
+				margin-right: 25rpx;
 
 				.right-image {
 					width: 30rpx;

@@ -5,12 +5,12 @@
 		<view class="org-sty">
 			<view @click="openOrg" class="org-item">
 				<view class="u-flex org-contact"><text class="text">组织关系</text></view>
-				<view class="u-flex org-device">
+				<view @click="openOrg" 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>
+			<view @click="openOrg" class="org-item"><image class="image" src="../../../static/arrow-right.png"></image></view>
 		</view>
 		<view style="height: 150rpx;"></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 || thirdObj.avatarUrl"></image>
 					</view>
 					<view class="u-flex-1">
 						<view class="nickName u-flex">
@@ -154,17 +154,19 @@ export default {
 				appUserKey: '',
 				appUserSecret: ''
 			},
-			thirdObj: {}
+			thirdObj: {},
+			getOpenId: ''
 		};
 	},
 	onLoad(e) {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
-		if (e.obj != null) {
-			const params = JSON.parse(decodeURIComponent(e.obj));
-			this.thirdObj = params;
-		}
-		console.log('UserInfo', this.userInfo);
+		// if (e.obj != null) {
+		// 	const params = JSON.parse(decodeURIComponent(e.obj));
+		// 	// uni.$u.toast('eee', params.avatarUrl);
+		// 	this.thirdObj = params;
+		// }
+		this.getOpenId = getApp().globalData.openId;
 	},
 	computed: {
 		...mapState(['userInfo'])
@@ -232,7 +234,7 @@ export default {
 					loginMethod: 'ACCOUNT',
 					...this.bindAccountObj,
 					platformName: 'WECHAT',
-					...this.thirdObj
+					thirdUserId: this.getOpenId
 				};
 				uni.$u.http
 					.post('/yt/third/bind', postData)
@@ -260,8 +262,8 @@ export default {
 						}
 					})
 					.catch(e => {
-						uni.$u.toast(e.data?.msg || e.data?.message);
-						this.show = false;
+						uni.$u.toast(e.data?.msg);
+						this.show = true;
 					});
 			} else {
 				const phoneRegular = /^1\d{10}$/;
@@ -295,7 +297,7 @@ export default {
 					loginMethod: 'PHONE',
 					...this.bindPhoneObj,
 					platformName: 'WECHAT',
-					...this.thirdObj
+					thirdUserId: this.getOpenId
 				};
 				uni.$u.http
 					.post('/yt/third/bind', postData)
@@ -321,8 +323,8 @@ export default {
 						this.saveUserInfo();
 					})
 					.catch(e => {
-						uni.$u.toast(e.data?.msg || e.data?.message);
-						this.show = false;
+						uni.$u.toast(e.data?.msg);
+						this.show = true;
 					});
 			}
 		},

@@ -11,8 +11,10 @@
 		width: 50px;
 		height: 50px;
 		border-radius: 25px;
-		background-color: #ccc;
+		background: #d8d8d8;
 		justify-content: center;
+		border: 2px solid #ffffff;
+		box-shadow: 0px 14px 26px 0px rgba(4, 7, 26, 0.2);
 	}
 	.click-login {
 		font-size: 18px;

 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);
+}

@@ -3,12 +3,12 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<view @click="upAvatar" class="u-flex set-main">
-			<view class="main-image"><image class="image" :src="avatar || '/static/logo.png'"></image></view>
+			<view class="main-image"><image class="image" :src="avatar || '../../static/logo.png'"></image></view>
 			<view class="main-right-image"><image class="image" src="../../static/arrow-right.png"></image></view>
 		</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>
@@ -46,8 +46,12 @@
 			</u--form>
 		</view>
 		<view class="basic-bottom u-flex">
-			<view class="item" v-if="info.data.isToken"><button class="submit" size="default" @click="clearAccountFunc" :style="{ background: InfoColor }">解绑</button></view>
-			<view class="item" style="margin-right: 60rpx;"><button class="submit" size="default" @click="onSubmitFunc" :style="{ background: PrimaryColor }">确认</button></view>
+			<view class="item" v-if="info.data.isThirdLogin">
+				<button class="submit" size="default" @click="clearAccountFunc" :style="{ background: InfoColor }"><text class="un-bind-text">解绑</text></button>
+			</view>
+			<view class="item" style="margin-right: 60rpx;" :style="[{ position: info.data.isThirdLogin ? '' : 'relative' }, { right: info.data.isThirdLogin ? '' : '-190rpx' }]">
+				<button class="submit" size="default" @click="onSubmitFunc" :style="{ background: PrimaryColor }"><text class="un-bind-text">确认</text></button>
+			</view>
 		</view>
 		<!-- #ifdef MP -->
 		<view class="u-m-t-40"><text style="visibility: hidden;">#</text></view>
@@ -67,12 +71,16 @@
 </template>
 
 <script>
+import { mapMutations } from 'vuex';
+import baseUrl from '@/config/baseUrl.js';
+import { mapState } from 'vuex';
+
 export default {
 	data() {
 		return {
 			showBind: false,
 			PrimaryColor: '#377DFF', //主题色
-			InfoColor: '#E3E4E5', //主题色
+			InfoColor: '#00C9A7', //主题色
 			myInfoModel: {
 				userInfo: {
 					realName: '',
@@ -86,56 +94,9 @@ 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: ''
+			openIds: '',
+			isUpdatePersonOrLoginInfo: false
 		};
 	},
 	onLoad(e) {
@@ -147,21 +108,23 @@ export default {
 			this.myInfoModel.userInfo.username = params.data.username;
 			this.myInfoModel.userInfo.email = params.data.email;
 			this.myInfoModel.userInfo.accountExpireTime = params.data.accountExpireTime;
-			this.avatar = params.data.avatar == undefined ? '../../static/avatar-test.png' : params.data.avatar;
+			this.avatar = params.data.avatar == undefined ? '../../static/logo.png' : params.data.avatar;
 			this.id = params.data.userId;
 		}
 	},
 	onShow() {
 		let getOpenId = getApp().globalData.openId;
-		console.log('获取全局openId', getOpenId);
 		if (getOpenId) {
 			this.openIds = getOpenId;
 		}
 	},
+	computed: {
+		...mapState(['userInfo'])
+	},
 	methods: {
+		...mapMutations(['setUserInfo']),
 		confrimBind(e) {
 			if (e) {
-				console.log('Bind', e.third?.thirdUserId);
 				//解绑
 				let httpData = {
 					appUserId: e.data?.userId,
@@ -186,8 +149,13 @@ export default {
 			this.showBind = true;
 		},
 		// 修改头像
-		upAvatar() {
-			var that = this;
+		async upAvatar() {
+			let token;
+			token = this.userInfo.isToken || uni.getStorageSync('userInfo').isToken || undefined;
+			// #ifdef H5
+			token = window.sessionStorage.getItem('userInfo').isToken;
+			// #endif
+			if (!token) return uni.$u.toast('请登录后上传图片');
 			uni.chooseImage({
 				count: 1,
 				sourceType: ['camera', 'album'],
@@ -216,52 +184,50 @@ export default {
 						});
 						return;
 					}
-					uni.$u.http
-						.upload('/yt/oss/upload', {
-							filePath: tempFilePaths[0],
-							name: 'file'
-						})
-						.then(res => {
-							if (res) {
-								that.avatar = res.fileStaticUri;
-								return uni.$u.toast('头像上传成功');
-							}
-						});
+					uni.uploadFile({
+						url: `${baseUrl.baseUrl}/yt/oss/upload`,
+						filePath: tempFilePaths[0],
+						name: 'file',
+						header: {
+							'content-type': 'multipart/form-data',
+							Authorization: 'Bearer ' + token
+						},
+						formData: {},
+						success: res => {
+							let objImage = JSON.parse(res.data);
+							this.avatar = objImage.fileStaticUri;
+							uni.$u.toast('头像上传成功');
+						}
+					});
 				}
 			});
 		},
 		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) {
+						this.setUserInfo(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() {

 <template>
-	<view class="login-page">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<view class="u-flex login-main">
-			<view class="content">
-				<view class="hello login-text-muted">您好,</view>
-				<view class="hello-welcome login-text-muted">欢迎来到ThingsKit!</view>
-				<view class="circleStyle"></view>
-			</view>
-		</view>
-		<view class="f__login">
-			<view class="loginPhone">
-				<view class="form-row u-flex">
-					<view class="v-input"><input type="text" v-model="loginForm.username" maxlength="32" placeholder="请输入登录账号" /></view>
-					<u-icon></u-icon>
-				</view>
-				<view class="form-row u-flex">
-					<view class="v-input"><input type="text" v-model="loginForm.password" maxlength="32" placeholder="请输入登录密码" :password="!showPassword" /></view>
-					<view class="v-password" @click="showPasswordMode"><u-icon color="#9a9a9a" size="25" :name="showPassword ? 'eye-fill' : 'eye-off'"></u-icon></view>
-					<u-icon></u-icon>
-				</view>
-				<button class="submit" size="default" @click="onSubmitFunc"><text class="text">登录</text></button>
-				<view class="u-flex row-item">
-					<view class="row-phone login-text-gray" @click="openCodeFunc">手机验证码登录</view>
-					<view class="row-reset login-text-gray" @click="findPassrordFunc">忘记密码</view>
-				</view>
-				<view class="u-flex link-login">
-					<view class="link-text login-text-gray">第三方账号登录</view>
-					<view style="height:20rpx"></view>
-					<view @click="onAuthorization" class="link-image"><image class="image" src="../../static/weixin.png" mode="aspectFill"></image></view>
-					<view class="circleStyleBottom"></view>
-				</view>
-			</view>
-		</view>
-	</view>
+  <view class="login-page">
+    <!-- 公共组件-每个页面必须引入 -->
+
+    <public-module></public-module>
+
+    <view class="u-flex login-main">
+      <view class="content">
+        <view class="hello login-text-muted">您好,</view>
+
+        <view class="hello-welcome login-text-muted">欢迎来到ThingsKit!</view>
+      </view>
+    </view>
+
+    <view class="f__login">
+      <view class="loginPhone">
+        <view class="form-row u-flex">
+          <view class="v-input"
+            ><input
+              type="text"
+              v-model="loginForm.username"
+              maxlength="32"
+              placeholder="请输入登录账号"
+          /></view>
+
+          <u-icon></u-icon>
+        </view>
+
+        <view class="form-row u-flex">
+          <view class="v-input"
+            ><input
+              type="text"
+              v-model="loginForm.password"
+              maxlength="32"
+              placeholder="请输入登录密码"
+              :password="!showPassword"
+          /></view>
+
+          <view class="v-password" @click="showPasswordMode">
+            <u-icon
+              color="#9a9a9a"
+              width="18"
+              height="15"
+              :name="showPassword ? '/static/eye.png' : '/static/eye-hide.png'"
+            ></u-icon>
+          </view>
+
+          <u-icon></u-icon>
+        </view>
+
+        <button class="submit" size="default" @click="onSubmitFunc">
+          <text class="text">登录</text>
+        </button>
+
+        <view class="u-flex row-item">
+          <view class="row-phone login-text-gray" @click="openCodeFunc"
+            >手机验证码登录</view
+          >
+
+          <view class="row-reset login-text-gray" @click="findPassrordFunc"
+            >忘记密码</view
+          >
+        </view>
+
+        <view class="u-flex link-login">
+          <view class="link-text login-text-gray">第三方账号登录</view>
+
+          <view style="height: 20rpx"></view>
+
+          <button class="link-image" @tap="onWenxinAuthorization">
+            <image
+              class="image"
+              src="../../static/weixin.png"
+              mode="aspectFill"
+            ></image>
+          </button>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-import { mapMutations, mapActions } from 'vuex';
-import { loginApp } from '@/config/login';
-import baseUrl from '@/config/baseUrl.js';
-import WXBizDataCrypt from '@/config/WXBizDataCrypt.js';
-import { appId, appSecrect } from '@/config/constant.js';
+import { mapMutations, mapActions } from "vuex";
+
+import { loginApp } from "@/config/login";
+
+import baseUrl from "@/config/baseUrl.js";
+
+import WXBizDataCrypt from "@/config/WXBizDataCrypt.js";
+
+import { appId, appSecrect } from "@/config/constant.js";
 
 export default {
-	data() {
-		return {
-			loginForm: {
-				username: '',
-				password: ''
-			},
-			showPassword: false,
-			code: '',
-			openid: '',
-			session_key: ''
-		};
-	},
-	onLoad() {
-		//#ifdef MP-WEIXIN
-		wx.login({
-			success: res => {
-				if (res.code) {
-					this.code = res.code;
-					wx.request({
-						url: `https://api.weixin.qq.com/sns/jscode2session?appid=${appId}&secret=${appSecrect}&js_code=${this.code}&grant_type=authorization_code`,
-						method: 'GET',
-						success: res => {
-							if (res.statusCode == 200) {
-								this.openid = res.data.openid;
-								this.session_key = res.data.session_key;
-								//设置全局变量openId
-								getApp().globalData.openId = res.data.openid;
-							}
-						},
-						complete: e => {
-							if (e.data.errcode != null) {
-								return;
-								// return uni.$u.toast('获取用户唯一id失败');
-							}
-						}
-					});
-				} else {
-				}
-			}
-		});
-		//#endif
-	},
-	methods: {
-		...mapMutations(['setUserInfo']),
-		...mapActions(['updateBadgeTotal']),
-		//微信授权登录
-		//#ifdef MP-WEIXIN
-		onAuthorization() {
-			/**
-			 * 注意：通过wx.getUserProfile并不能获取用户的openid，openid是唯一识别用户的标识，
-			 * 所以最好在用户授权登录时就获取。调用wx.login()获取
-			 */
-			wx.getUserProfile({
-				desc: '获取用户授权信息',
-				success: res => {
-					if (res) {
-						//微信官方自带解密（node.js实现）
-						let pc = new WXBizDataCrypt(appId, this.session_key);
-						let data = pc.decryptData(res.encryptedData, res.iv);
-						let obj = {
-							avatarUrl: data.avatarUrl,
-							nickName: data.nickName,
-							thirdUserId: this.openid
-						};
-						//判断是否需要绑定
-						uni.$u.http
-							.get(`/yt/third/login/${this.openid}`)
-							.then(res => {
-								if (res.token == '' || res.token == null) {
-									//需要绑定，跳转我的页面进行绑定,显示绑定按钮
-									uni.reLaunch({
-										url: '../../pages/personal/personal'
-									});
-									let userInfo = {
-										isThirdLogin: true //token用于判断是否登录
-									};
-									this.setUserInfo(userInfo);
-								} else {
-									// 不需要绑定
-									// 储存登录信息
-									let resObj = {
-										refreshToken: res.refreshToken,
-										isToken: res.token
-									};
-									let userInfo = {
-										...resObj,
-										token: true //token用于判断是否登录
-									};
-									if (userInfo.token) {
-										this.setUserInfo(userInfo);
-									}
-									uni.showToast({
-										title: '第三方账号登录成功~',
-										icon: 'none'
-									});
-									this.saveUserInfo();
-									this.getAlarmTotalData();
-									uni.reLaunch({
-										url: '../../pages/personal/personal'
-									});
-								}
-							})
-							.catch(e => {
-								uni.$u.toast(e.data?.message);
-							});
-						/**
-						 * 有些时候uni.navigatorBack({})没有返回到上级页面
-						 * 才使用uni.reLaunch()进行跳转
-						 */
-						// #ifdef MP
-						setTimeout(() => {
-							uni.reLaunch({
-								url: '../../pages/personal/personal?obj=' + encodeURIComponent(JSON.stringify(obj))
-							});
-						}, 500);
-						// #endif
-					}
-				}
-			});
-		},
-		//#endif
-		saveUserInfo() {
-			//储存个人信息
-			uni.$u.http.get('/yt/user/me/info').then(res => {
-				if (res) {
-					this.setUserInfo(res);
-				}
-			});
-		},
-		async getAlarmTotalData() {
-			const res = await uni.$u.http.get('/yt/homepage/app');
-			if (res) {
-				//异步实时更新告警徽标数
-				this.updateBadgeTotal(res.totalAlarm.activedAlarm);
-			}
-		},
-		onSubmitFunc() {
-			if (this.loginForm.username == '') {
-				return uni.$u.toast('请输入登录账号~');
-			}
-			const passReg = /^(?=.*?[A-Z])(?=(.*[a-z]){1,})(?=(.*[\d]){1,})(?=(.*[\W]){1,})(?!.*\s).{8,}$/;
-			if (this.loginForm.password == '') {
-				uni.showToast({
-					title: '请输入登录密码~',
-					icon: 'none'
-				});
-				return;
-			} else if (!passReg.test(this.loginForm.password)) {
-				uni.showToast({
-					title: '密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~',
-					icon: 'none',
-					duration: 3000
-				});
-				return;
-			}
-			uni.$u.http
-				.post('/auth/login', this.loginForm)
-				.then(res => {
-					if (res) {
-						// 储存登录信息
-						let resObj = {
-							refreshToken: res.refreshToken,
-							isToken: res.token
-						};
-						let userInfo = {
-							...resObj,
-							token: true, //token用于判断是否登录
-							isThirdLogin: false
-						};
-						if (userInfo.token) {
-							this.setUserInfo(userInfo);
-						}
-						uni
-							.showToast({
-								title: '登录成功~',
-								icon: 'none'
-							})
-							.then(async res => {
-								this.saveUserInfo();
-								await this.getAlarmTotalData();
-								// #ifdef APP-PLUS||MP
-								uni.reLaunch({
-									url: '/pages/personal/personal'
-								});
-								// #endif
-							});
-					}
-				})
-				.catch(e => {
-					uni.$u.toast(e.data?.message);
-				});
-		},
-		saveUserInfo() {
-			//储存个人信息
-			uni.$u.http.get('/yt/user/me/info').then(res => {
-				if (res) {
-					this.setUserInfo(res);
-				}
-			});
-		},
-		openCodeFunc() {
-			uni.navigateTo({
-				url: '../other/code'
-			});
-		},
-		findPassrordFunc() {
-			uni.navigateTo({
-				url: '../other/findPassword'
-			});
-		},
-		showPasswordMode() {
-			this.showPassword = !this.showPassword;
-		}
-	}
+  data() {
+    return {
+      loginForm: {
+        username: "",
+
+        password: "",
+      },
+
+      showPassword: false,
+
+      code: "",
+
+      openid: "",
+    };
+  },
+
+  onLoad() {
+    wx.login({
+      success: (res) => {
+        if (res.code) {
+          this.code = res.code;
+
+          //这里获取openid
+        } else {
+          return;
+        }
+      },
+    });
+  },
+
+  methods: {
+    ...mapMutations(["setUserInfo"]),
+
+    ...mapActions(["updateBadgeTotal"]),
+
+    //微信授权登录
+
+    //#ifdef MP-WEIXIN
+
+    onWenxinAuthorization() {
+      wx.getUserProfile({
+        desc: "微信第三方授权",
+
+        success: (reswenxin) => {
+          console.log("res=======>", reswenxin);
+
+          if (
+            reswenxin.errMsg === "getUserProfile:ok" &&
+            reswenxin.encryptedData
+          ) {
+            console.log("获取code", this.code);
+
+            //获取用户信息
+
+            let obj = {
+              avatarUrl: reswenxin.userInfo.avatarUrl,
+
+              thirdUserId: this.openid,
+            };
+
+            //判断是否需要绑定
+
+            uni.$u.http
+
+              .get(`/yt/third/login/${this.code}`)
+
+              .then((res) => {
+                console.log("Res", res);
+
+                //设置全局变量openId
+
+                // getApp().globalData.openId = res.data.openid;
+
+                if (
+                  res.token == "" ||
+                  (res.token == null && res.refreshToken)
+                ) {
+                  //需要绑定
+
+                  let userInfo = {
+                    isThirdLogin: true, //用于判断是否是第三方登录并且需要绑定账号
+
+                    avatar: obj.avatarUrl,
+                  };
+
+                  this.setUserInfo(userInfo);
+
+                  //设置全局变量openId
+
+                  getApp().globalData.openId = res.refreshToken;
+
+                  uni.reLaunch({
+                    url: "../../pages/personal/personal",
+                  });
+                } else {
+                  // 不需要绑定,直接第三方登录使用
+
+                  let resObj = {
+                    refreshToken: res.refreshToken,
+
+                    isToken: res.token,
+                  };
+
+                  let userInfo = {
+                    ...resObj,
+
+                    token: true, //token用于判断是否登录
+
+                    isThirdLoginAndNoDind: true, //用于判断是否是第三方登录并且不需要绑定账号
+                  };
+
+                  if (userInfo.token) {
+                    this.setUserInfo(userInfo);
+                  }
+
+                  uni.showToast({
+                    title: "第三方账号登录成功~",
+
+                    icon: "none",
+                  });
+
+                  this.saveUserInfo();
+
+                  this.getAlarmTotalData();
+
+                  uni.reLaunch({
+                    url: "../../pages/personal/personal",
+                  });
+                }
+              })
+
+              .catch((e) => {
+                uni.$u.toast(e.data?.message);
+              });
+          }
+        },
+
+        fail: (res) => {
+          //拒绝授权
+
+          return;
+        },
+      });
+    },
+
+    //#endif
+
+    saveUserInfo() {
+      //储存个人信息
+
+      uni.$u.http.get("/yt/user/me/info").then((res) => {
+        if (res) {
+          this.setUserInfo(res);
+        }
+      });
+    },
+
+    async getAlarmTotalData() {
+      const res = await uni.$u.http.get("/yt/homepage/app");
+      if (res) {
+        //异步实时更新告警徽标数
+        this.updateBadgeTotal(res.totalAlarm.activedAlarm);
+      }
+    },
+
+    onSubmitFunc() {
+      if (this.loginForm.username == "") {
+        return uni.$u.toast("请输入登录账号~");
+      }
+      const passReg =
+        /^(?=.*?[A-Z])(?=(.*[a-z]){1,})(?=(.*[\d]){1,})(?=(.*[\W]){1,})(?!.*\s).{8,}$/;
+
+      if (this.loginForm.password == "") {
+        uni.showToast({
+          title: "请输入登录密码~",
+
+          icon: "none",
+        });
+        return;
+      } else if (!passReg.test(this.loginForm.password)) {
+        uni.showToast({
+          title:
+            "密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~",
+
+          icon: "none",
+
+          duration: 3000,
+        });
+
+        return;
+      }
+      uni.$u.http
+        .post("/auth/login", this.loginForm)
+
+        .then((res) => {
+          if (res) {
+            // 储存登录信息
+
+            let resObj = {
+              refreshToken: res.refreshToken,
+
+              isToken: res.token,
+            };
+
+            let userInfo = {
+              ...resObj,
+
+              token: true, //token用于判断是否登录
+
+              isThirdLogin: false,
+            };
+
+            if (userInfo.token) {
+              this.setUserInfo(userInfo);
+            }
+
+            uni
+              .showToast({
+                title: "登录成功~",
+
+                icon: "none",
+              })
+              .then((res) => {
+                /**
+
+							 * 有些时候不起作用
+
+							 */
+
+                // uni.navigateBack({
+
+                // 	delta: 1
+
+                // });
+
+                // #ifdef APP-PLUS||MP
+
+                uni.reLaunch({
+                  url: "/pages/personal/personal",
+                });
+
+                // #endif
+              });
+
+            this.saveUserInfo();
+
+            this.getAlarmTotalData();
+          }
+        })
+
+        .catch((e) => {
+          uni.$u.toast(e.data?.message);
+        });
+    },
+
+    openCodeFunc() {
+      uni.navigateTo({
+        url: "../other/code",
+      });
+    },
+
+    findPassrordFunc() {
+      uni.navigateTo({
+        url: "../other/findPassword",
+      });
+    },
+
+    showPasswordMode() {
+      this.showPassword = !this.showPassword;
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
-@import './static/login.scss';
-</style>
+@import "./static/login.scss";
+
+/deep/ button {
+  background: rgba(0, 0, 0, 0);
+}
+</style>

 .login-page {
 	min-height: 100vh;
-	background-color: #fff;
+	width: 750rpx;
+	background: url(/static/login.png) no-repeat;
 	.login-main {
 		flex-direction: column;
 		.content {
 			height: 250rpx;
 			margin-top: 90rpx;
 			margin-left: -107rpx;
+			position: relative;
+			top: 50rpx;
+			left: -15rpx;
 			.hello {
 				font-size: 30px;
 				color: #3a4759;
@@ -21,16 +25,6 @@
 			}
 		}
 	}
-	.circleStyle {
-		position: absolute;
-		width: 145rpx;
-		height: 300rpx;
-		left: -31rpx;
-		top: 10rpx;
-		border-radius: 0 100rpx 100rpx 0/0 150rpx 150rpx 0;
-		background-color: #f0f2f5;
-		opacity: 0.5;
-	}
 }
 
 .f__login {
@@ -47,7 +41,7 @@
 		margin-top: 60rpx;
 		.v-input {
 			width: 690rpx;
-			border-bottom: 2px solid #e5e5e5;
+			border-bottom: 1px solid #e5e5e5;
 		}
 		.v-password {
 			position: absolute;
@@ -107,19 +101,4 @@
 			}
 		}
 	}
-	.circleStyleBottom {
-		position: absolute;
-		width: 145rpx;
-		height: 300rpx;
-		right: -31rpx;
-		top: 404rpx;
-		//#ifndef MP
-		top: 504rpx;
-		//#endif
-		border-radius: 0 100rpx 100rpx 0/0 150rpx 150rpx 0;
-		background: linear-gradient(241deg, #00c9a7 0%, rgba(0, 223, 252, 0.5) 100%);
-		opacity: 0.1;
-		transform: rotate(180deg);
-		z-index: -9999;
-	}
 }

@@ -14,6 +14,7 @@ export const mutations = {
 			// #endif
 			// #ifndef H5
 			uni.setStorageSync('userInfo', state.userInfo);
+			wx.setStorageSync('userInfo', state.userInfo);
 			// #endif
 		}
 	},
@@ -25,10 +26,11 @@ export const mutations = {
 		// #endif
 		// #ifndef H5
 		uni.removeStorageSync("userInfo");
+		uni.removeStorageSync('storagePre');
 		// #endif
-	},
-	setBadgeInfo(state,payload){
-		state.badgeInfo = payload;
+	},
+	setBadgeInfo(state,payload){
+		state.badgeInfo = payload;
 	}
 };
 export const actions = {
@@ -36,7 +38,7 @@ export const actions = {
 	updateBadgeTotal({
 		state,
 		commit
-	}, data) {
+	}, data) {
 		commit('setBadgeInfo',data)
 		console.log('Change total', data,state);
 	}

@@ -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 {
@@ -185,6 +185,13 @@ button {
 	font-weight: 400;
 	color: #333333 !important;
 }
+.un-bind-text {
+	font-size: 16px;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 400;
+	// color: #333333;
+	color: #ffffff;
+}
 // 定义flex等分
 @for $i from 0 through 12 {
 	.u-flex-#{$i} {

@@ -13,9 +13,9 @@
 				</u-list>
 				<view class="bottom-text">
 					<view class="u-flex column">
-						<text class="text">{{ notifyList.title }}</text>
+						<text class="text" style="font-weight: bold;">{{ notifyList.title }}</text>
 					</view>
-					<view style="margin-top: 20rpx;">
+					<view style="margin-top: 21rpx;">
 						<!-- 富文本解析 -->
 						<u-parse :content="notifyList.content"></u-parse>
 						<!-- 富文本解析 -->

@@ -2,9 +2,11 @@
 	<view class="notify-page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<view @click="openTypeClick" style="width: 700rpx;position: fixed;top: 0;z-index: 1;">
-			<u--input suffixIcon="arrow-down" shape="circle" disabled v-model="model1.userInfo.type" placeholder="请选择类型" border="surround"></u--input>
-			<u-action-sheet :show="showType" :actions="actions" title="请选择类型" @close="showType = false" @select="typeSelect"></u-action-sheet>
+		<view style="width: 750rpx;height:53rpx;background-color: #f8f9fa;position:fixed;top:0;z-index: 99999;">
+			<view @click="openTypeClick" style="background-color: #f8f9fa;width: 700rpx;position: relative;top: 10rpx;">
+				<u--input suffixIcon="arrow-down" shape="circle" disabled v-model="model1.userInfo.type" placeholder="请选择类型" border="surround"></u--input>
+				<u-action-sheet :show="showType" :actions="actions" title="请选择类型" @close="showType = false" @select="typeSelect"></u-action-sheet>
+			</view>
 		</view>
 		<view style="height: 76rpx;"></view>
 		<view class="notify-main">
@@ -82,7 +84,8 @@ export default {
 	onShow() {
 		this.pre = uni.getStorageSync('storagePre');
 		if (this.pre) {
-			this.loadData(1);
+			this.page.num = 1;
+			this.loadData(this.page.num);
 		}
 	},
 	onHide() {
@@ -97,25 +100,19 @@ export default {
 			uni.hideKeyboard();
 		},
 		typeSelect(e) {
-			this.topBack();
 			this.isJudgeNextPage = e.value;
 			this.page.num = 1;
 			this.model1.userInfo.type = e.name;
 			this.loadData(1, this.isJudgeNextPage == '' ? null : this.isJudgeNextPage);
 		},
-		//筛选数据让它回到顶部
-		topBack() {
-			uni.pageScrollTo({
-				scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
-				duration: 300 // 滚动动画的时长
-			});
-		},
 		/*下拉刷新的回调 */
 		downCallback() {
 			//联网加载数据
 			this.list.length = 0;
 			this.page.num = 1;
 			this.loadData(1);
+			this.isJudgeNextPage = '';
+			this.model1.userInfo.type = '';
 		},
 		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 		upCallback() {