Merge branch 'ft_local_dev' into 'main'

fix：修改手机号登录，告警数未显示

See merge request huang/thingskit-app!80

@@ -26,7 +26,7 @@
 
 
 <script>
 <script>
 var clear;
 var clear;
-import { mapState, mapMutations } from 'vuex';
+import { mapState, mapMutations, mapActions } from 'vuex';
 export default {
 export default {
 	data() {
 	data() {
 		return {
 		return {
@@ -38,6 +38,7 @@ export default {
 	},
 	},
 	methods: {
 	methods: {
 		...mapMutations(['setUserInfo']),
 		...mapMutations(['setUserInfo']),
+		...mapActions(['updateBadgeTotal']),
 		//验证码按钮文字状态
 		//验证码按钮文字状态
 		getCodeState() {
 		getCodeState() {
 			const _this = this;
 			const _this = this;
@@ -143,15 +144,23 @@ export default {
 					uni.showToast({
 					uni.showToast({
 						title: '登录成功~',
 						title: '登录成功~',
 						icon: 'none'
 						icon: 'none'
-					}).then(res => {
+					}).then(async res => {
+						this.saveUserInfo();
+						await this.getAlarmTotalData();
 						uni.reLaunch({
 						uni.reLaunch({
 							url: '/pages/personal/personal'
 							url: '/pages/personal/personal'
 						});
 						});
 					});
 					});
-					this.saveUserInfo();
 				}
 				}
 			});
 			});
 		},
 		},
+		async getAlarmTotalData() {
+			const res = await uni.$u.http.get('/yt/homepage/app');
+			if (res) {
+				//异步实时更新告警徽标数
+				this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
+			}
+		},
 		saveUserInfo() {
 		saveUserInfo() {
 			//储存个人信息
 			//储存个人信息
 			uni.$u.http.get('/yt/user/me/info').then(res => {
 			uni.$u.http.get('/yt/user/me/info').then(res => {