refractor:修改页面样式（告警，通知，摄像头，等),

@@ -38,7 +38,7 @@
 				</view>
 				<view class="column">
 					<text class="text-org-bold">告警状态：</text>
-					<text class="text-device-muted">
+					<text class="text-device-muted" style="color: #DE4437;">
 						{{
 							list.status == 'CLEARED_UNACK'
 								? '清除未确认'
@@ -70,8 +70,8 @@
 			<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;">
-			<view class="u-flex" style="justify-content: center;align-items: center;"><u-button @click="handleSubmit" type="primary" shape="circle" text="处理"></u-button></view>
+		<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>
 	</view>
 </template>
@@ -134,4 +134,8 @@ export default {
 
 <style lang="scss" scoped>
 @import './static/alarmDetail.scss';
+/deep/ .u-button--primary {
+	background-color: #377dff !important;
+	border-color: #377dff !important;
+}
 </style>

@@ -53,7 +53,7 @@
 	margin-top: 20rpx;
 }
 .hanle-main {
-	margin-top: 20rpx;
+	margin-top: 30rpx;
 	border-radius: 20px;
 	width: 688rpx;
 	height: 273rpx;

@@ -30,6 +30,7 @@
 
 <script>
 import base from '@/config/baseUrl.js';
+import { mapState } from 'vuex';
 
 export default {
 	name: 'f-tabbar',
@@ -108,7 +109,12 @@ export default {
 					icon: '../../../static/my-un.png',
 					iconFill: '../../../static/my-yes.png'
 				}
-			]
+			],
+			badgeTotal: {
+				t1: 0,
+				t2: 0,
+				t3: 0
+			}
 		};
 	},
 	onLoad() {
@@ -119,8 +125,6 @@ export default {
 		let currentPages = getCurrentPages();
 		let page = currentPages[currentPages.length - 1];
 		this.path = page.route;
-		//获取页面路径
-		console.log('页面路径', this.list);
 		if (this.list.length > 0) {
 			this.list?.forEach((item, index) => {
 				if (this.path == item.url) {
@@ -128,19 +132,20 @@ export default {
 				}
 			});
 		}
-		this.loadData();
+	},
+	computed: {
+		...mapState({
+			info: state => state.badgeInfo
+		})
 	},
 	methods: {
 		loadData() {
-			let httpData = {
-				page: 1,
-				pageSize: 10
-			};
-			uni.$u.http.get('/yt/alarm', { params: httpData }).then(res => {
-				this.list[2].badge = res.total;
-			});
+			this.list[2].badge = this.info;
 		},
 		onTabbar(index) {
+			setTimeout(() => {
+				this.loadData();
+			}, 100);
 			if (this.list[index].url) {
 				if (this.path !== this.list[index].url) {
 					uni.switchTab({

@@ -104,13 +104,11 @@ uni.$u.http.interceptors.response.use(
 		} else if (message == "request:fail timeout") {
 			errorData = "请求超时:请检查网络";
 		} else if (message == "Token has expired") {
-			errorData = "Token失效，请重新登录";
 			uni.reLaunch({
 				url: "/publicLoginSubPage/public/login",
 			});
 			store.commit("emptyUserInfo");
 		} else if (message == "Invalid username or password") {
-			// errorData = "用户名或者密码无效";
 			uni.reLaunch({
 				url: "/publicLoginSubPage/public/login",
 			});

@@ -23,7 +23,6 @@
 		{
 			"path": "pages/alarm/alarm",
 			"style": {
-				"navigationStyle": "custom",
 				"navigationBarTitleText": "告警"
 			}
 		},
@@ -180,4 +179,4 @@
 			}
 		]
 	}
-}
+}

@@ -2,26 +2,32 @@
 	<view class="alert-page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<!-- 自定义导航栏 -->
-		<u-navbar :safeAreaInsetTop="false" height="115" border="false" title="告警" :fixed="true" left-text="返回" rightIcon="map">
-			<view class="u-nav-slot" slot="right">
-				<view @click="openSearchDialog" class="u-flex navbar-sty">
-					<view><text class="text-muted">筛选</text></view>
-					<view><image class="img" src="../../static/shaixuan.png"></image></view>
+		<!-- 吸顶组件 -->
+		<u-sticky>
+			<view class="device-top">
+				<view class="search">
+					<view>
+						<view class="search-left"><u--input prefixIcon="search" placeholder="请输入告警名字" shape="circle" @change="inputChanged"></u--input></view>
+					</view>
+					<view @click="openSearchDialog" class="search-right">
+						<text>筛选</text>
+						<image src="../../static/shaixuan.png" />
+					</view>
 				</view>
-			</view>
-		</u-navbar>
-		<!-- 自定义导航栏 -->
-		<view @click="openOrg" class="org-sty">
-			<view class="org-item">
-				<view class="u-flex item"><text class="text-bold">组织关系</text></view>
-				<view class="u-flex item-child">
-					<image class="image" src="../../static/org.png" mode=""></image>
-					<text class="text-12">告警数：{{ alertTotal }}</text>
+				<view class="org">
+					<u-cell @click="openOrg" isLink title="组织关系" :border="false">
+						<view slot="label" class="label" style="display: flex; align-items: center;margin-top: 20rpx;">
+							<image src="../../static/org.png" style="width: 24rpx;height: 28rpx;top: -30rpx;"></image>
+							<view style="margin-left: 10rpx; color: #666;">
+								告警数:
+								<text class="text-org-total" style="margin-left: 20rpx;">{{ alertTotal }}</text>
+							</view>
+						</view>
+					</u-cell>
 				</view>
 			</view>
-			<view class="org-item "><image class="org-image" src="../../static/right-arrow.png"></image></view>
-		</view>
+		</u-sticky>
+		<!-- 吸顶组件 -->
 		<!-- 自带分页组件 -->
 		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
 			<view class="device-list">
@@ -157,7 +163,8 @@
 											</view>
 										</view>
 									</view>
-									<view class="u-flex" style="flex-direction: row; margin-top: 128rpx; margin-left: 10rpx">
+									<view style="height: 130rpx;"></view>
+									<view class="u-flex" style="position: fixed;bottom: 10rpx;z-index: 9999;flex-direction: row; margin-top: 128rpx; margin-left: 10rpx">
 										<view style="width: 300rpx"><u-button @click="resetData" type="info" shape="circle" text="重置"></u-button></view>
 										<view style="width: 300rpx; margin-left: 46rpx"><u-button @click="queryData" type="primary" shape="circle" text="确认"></u-button></view>
 									</view>
@@ -188,6 +195,7 @@ import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 import { pageNumber, pageSize } from '@/config/constant.js';
 import { alertStatus, deviceType, alertLevel, timeArea } from './static/data.js';
+import { mapActions } from 'vuex';
 
 export default {
 	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
@@ -255,8 +263,6 @@ export default {
 			let type;
 			if (Array.isArray(params)) {
 				type = params.join(',');
-				// type = params[0];
-				console.log('Type', type);
 			} else {
 				type = params;
 			}
@@ -266,6 +272,10 @@ export default {
 		}
 	},
 	methods: {
+		...mapActions(['updateBadgeTotal']),
+		inputChanged(e) {
+			this.loadData(1, null, null, null, null, null, null, e);
+		},
 		getAlertStatus(e, i) {
 			this.current1 = i;
 			this.alertStatusVal = e.value;
@@ -343,7 +353,7 @@ export default {
 			this.page.num += 1;
 			this.loadData(this.page.num);
 		},
-		loadData(pageNo, statusV, startTimeV, endTimeV, severityV, deviceTypeV, organizationV) {
+		loadData(pageNo, statusV, startTimeV, endTimeV, severityV, deviceTypeV, organizationV, alarmName) {
 			let httpData = {
 				page: pageNo,
 				pageSize: 10,
@@ -352,13 +362,16 @@ export default {
 				endTime: endTimeV,
 				severity: severityV,
 				deviceType: deviceTypeV,
-				organizationId: organizationV
+				organizationId: organizationV,
+				alarmType: alarmName
 			};
 			uni.$u.http
 				.get('/yt/alarm', { params: httpData, custom: { load: false } })
 				.then(res => {
 					uni.stopPullDownRefresh();
 					this.mescroll.endByPage(res.items.length, res.total);
+					//异步实时更新告警徽标数
+					this.updateBadgeTotal(httpData);
 					this.alertTotal = res.total;
 					if (pageNo == 1) {
 						this.list = res.items;
@@ -367,7 +380,7 @@ export default {
 					}
 				})
 				.catch(e => {
-					uni.$u.toast(e.data.message);
+					uni.$u.toast(e.data?.message);
 					//联网失败, 结束加载
 					this.mescroll.endErr();
 				});
@@ -425,4 +438,15 @@ export default {
 
 <style lang="scss" scoped>
 @import './static/alarm.scss';
+/deep/ .u-button--primary {
+	background-color: #377dff !important;
+	border-color: #377dff !important;
+}
+/deep/ .u-button--info {
+	background-color: #e3e3e5 !important;
+	border-color: #e3e3e5 !important;
+}
+/deep/ .u-cell__right-icon-wrap {
+	margin-top: -55rpx !important;
+}
 </style>

 .alert-page {
-	margin-top: 5rpx;
-	.u-nav-slot {
-		.navbar-sty {
-			position: relative;
-			top: 86rpx;
+	.device-top {
+		padding: 10rpx 30rpx;
+		background-color: #fff;
+		.search {
+			display: flex;
 			justify-content: space-between;
-			align-items: center;
-			.img {
-				width: 40rpx;
-				height: 40rpx;
+			padding-bottom: 10rpx;
+			border-bottom: 1px solid #f5f5f5;
+			.search-left {
+				width: 580rpx;
+				background-color: #f8f9fa;
+				border-radius: 200rpx;
+			}
+			.search-right {
+				display: flex;
+				align-items: center;
+				text {
+					color: #333;
+					font-size: 14px;
+				}
+				image {
+					width: 40rpx;
+					height: 40rpx;
+				}
 			}
 		}
 	}
@@ -49,7 +63,7 @@
 	display: flex;
 	flex-direction: row;
 	justify-content: space-between;
-	margin-top: 229rpx;
+	margin-top: 277rpx;
 
 	.org-item {
 		width: 350rpx;

@@ -32,7 +32,7 @@ const alertStatus = [{
 		value: 'CLEARED_ACK',
 		bgColor: '#F6F6F6',
 		textColor: '#F6F6F6'
-	}
+	},
 ]
 const deviceType = [{
 		index: 1,

@@ -12,6 +12,7 @@
 			</view>
 			<view class="org-item"><image class="image" src="../../../static/right-arrow.png"></image></view>
 		</view>
+		<view style="height: 150rpx;"></view>
 		<!-- 自带分页组件 -->
 		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
 			<view class="camera-container">
@@ -31,7 +32,7 @@
 			</view>
 		</mescroll-body>
 		<!-- 自带分页组件 -->
-		<view style="height: 30rpx;"></view>
+		<view style="height: 60rpx;"></view>
 	</view>
 </template>
 
@@ -54,9 +55,20 @@ export default {
 			},
 			current: 0,
 			deviceTotal: 0,
-			list: []
+			list: [],
+			ordId: ''
 		};
 	},
+	onShow() {
+		if (this.ordId == '') {
+		} else {
+			this.loadData(1, this.ordId);
+		}
+	},
+	onHide() {
+		this.ordId = '';
+		this.loadData(1, null);
+	},
 	onLoad() {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
@@ -75,10 +87,11 @@ export default {
 			this.page.num += 1;
 			this.loadData(this.page.num);
 		},
-		loadData(pageNo) {
+		loadData(pageNo, organizationV) {
 			let httpData = {
 				page: pageNo,
-				pageSize: 10
+				pageSize: 10,
+				organizationId: organizationV
 			};
 			uni.$u.http
 				.get('/yt/video', { params: httpData, custom: { load: false } })

@@ -5,87 +5,87 @@
 		<view>
 			<!-- 基础统计 -->
 			<view class="basic-sty">
-				<view class="basic-text"><text class="text">基础统计</text></view>
+				<view class="basic-text"><text class="text text-bold">基础统计</text></view>
 				<view class="basic">
 					<view class="basic-item">
 						<view class="item-child-top u-flex">
 							<image class="item-image" src="../../static/device-total.png"></image>
-							<text class="item-text" style="">设备统计</text>
+							<text class="item-text home-text-muted">设备统计</text>
 						</view>
 						<view class="item-child-bottom u-flex">
 							<view @click="navigatorDeviceStatus('ONLINE')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text>{{ deviceData.onLine }}</text>
+									<text class="home-text-total">{{ deviceData.onLine }}</text>
 								</view>
-								<view class="sigle-value"><text>在线</text></view>
+								<view class="sigle-value"><text class="home-text-total-bottom">在线</text></view>
 							</view>
 							<view @click="navigatorDeviceStatus('OFFLINE')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text>{{ deviceData.unLine }}</text>
+									<text class="home-text-total">{{ deviceData.unLine }}</text>
 								</view>
-								<view class="sigle-value"><text>离线</text></view>
+								<view class="sigle-value"><text class="home-text-total-bottom">离线</text></view>
 							</view>
 							<view @click="navigatorDeviceStatus('INACTIVE')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text>{{ deviceData.noActive }}</text>
+									<text class="home-text-total">{{ deviceData.noActive }}</text>
 								</view>
-								<view class="sigle-value"><text>待激活</text></view>
+								<view class="sigle-value"><text class="home-text-total-bottom">待激活</text></view>
 							</view>
 						</view>
 					</view>
 					<view class="basic-item">
 						<view class="item-child-top u-flex">
 							<image class="item-image" src="../../static/alert.png"></image>
-							<text class="item-text">告警统计</text>
+							<text class="item-text home-text-muted">告警统计</text>
 						</view>
 						<view class="item-child-bottom u-flex">
 							<view @click="navatorAlertUnhandle()" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text>{{ alertData.noHandle }}</text>
+									<text class="home-text-total">{{ alertData.noHandle }}</text>
 								</view>
-								<view class="sigle-value"><text>未处理</text></view>
+								<view class="sigle-value"><text class="home-text-total-bottom">未处理</text></view>
 							</view>
 							<view @click="navatorAlertHandle('CLEARED_ACK')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text>{{ alertData.doneHandle }}</text>
+									<text class="home-text-total">{{ alertData.doneHandle }}</text>
 								</view>
-								<view class="sigle-value"><text>已处理</text></view>
+								<view class="sigle-value"><text class="home-text-total-bottom">已处理</text></view>
 							</view>
 							<view @click="navatorAlertFalseAlarm('CLEARED_UNACK')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text>{{ alertData.errorReport }}</text>
+									<text class="home-text-total">{{ alertData.errorReport }}</text>
 								</view>
-								<view class="sigle-value"><text>误报</text></view>
+								<view class="sigle-value"><text class="home-text-total-bottom">误报</text></view>
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
 			<!-- 基础统计 -->
-			<!-- 四宫格 -->
+			<!-- 四宫格CSS最新网格布局-->
 			<view class="grid-container">
 				<view class="grid-item">
 					<view class="item-center">
 						<view class="center"><image class="image" src="../../static/form.png"></image></view>
-						<view class="center-text"><text class="text">维修工单</text></view>
+						<view class="center-text"><text class="text text-muted">维修工单</text></view>
 					</view>
 				</view>
 				<view @click="openCamera" class="grid-item">
 					<view class="item-center">
 						<view class="center"><image class="image" src="../../static/camer.png"></image></view>
-						<view class="center-text"><text class="text" style="">摄像头管理</text></view>
+						<view class="center-text"><text class="text text-muted" style="">摄像头管理</text></view>
 					</view>
 				</view>
 				<view class="grid-item">
 					<view class="item-center">
 						<view class="center"><image class="image" src="../../static/device.png"></image></view>
-						<view class="center-text"><text class="text">设备接入</text></view>
+						<view class="center-text"><text class="text text-muted">设备接入</text></view>
 					</view>
 				</view>
 				<view @click="openOrgStatus" class="grid-item">
 					<view class="item-center">
 						<view class="center"><image class="image" src="../../static/status.png"></image></view>
-						<view class="center-text"><text class="text">组态</text></view>
+						<view class="center-text"><text class="text text-muted">组态</text></view>
 					</view>
 				</view>
 			</view>

@@ -10,6 +10,9 @@
 	display: flex;
 	flex-direction: row;
 	justify-content: space-between;
+	position: fixed;
+	z-index: 999999;
+	top: -1rpx;
 	.org-item {
 		width: 350rpx;
 		height: 200rpx;
@@ -24,7 +27,7 @@
 			}
 		}
 		.org-device {
-			margin-top: 5rpx;
+			margin-top: 23rpx;
 			margin-left: 15rpx;
 			flex-direction: row;
 			.device-image {
@@ -43,7 +46,7 @@
 			height: 10px;
 			float: right;
 			margin-right: 34rpx;
-			margin-top: 58rpx;
+			margin-top: 37rpx;
 		}
 	}
 }
@@ -52,25 +55,24 @@
 	border: 0.1px solid gray;
 }
 .camera-container {
-	padding: 0 28rpx;
-	margin-top: -27rpx;
 	.container-item {
-		width: 717rpx;
+		width: 750rpx;
 		display: flex;
 		justify-content: space-between;
 		flex-direction: row;
 		flex-wrap: wrap;
-		margin-left: -42rpx;
+		margin-top: -50rpx;
 		.item {
-			margin-top: 83rpx;
-			width: 300rpx;
+			margin-top: 80rpx;
+			width: 330rpx;
 			height: 200rpx;
 			background-color: #fff;
 			border-radius: 20px;
-			margin-left: 58rpx;
+			margin-left: 25rpx;
+			margin-right: 21rpx;
 			.video {
 				border-radius: 20px;
-				width: 300rpx;
+				width: 330rpx;
 				height: 200rpx;
 			}
 			.bottom-text {
@@ -88,7 +90,7 @@
 				border: 0.1rpx splid #fff;
 				height: 200rpx;
 				.image {
-					width: 300rpx;
+					width: 330rpx;
 					height: 200rpx;
 					border-radius: 20px;
 				}

@@ -9,17 +9,18 @@
 	display: grid;
 	width: 750rpx;
 	height: 400rpx;
-	grid-template-columns: repeat(2, 350rpx);
+	grid-template-columns: repeat(2, 339rpx);
 	grid-template-rows: repeat(2, 200rpx);
 	grid-gap: 20rpx;
 	margin-top: 50rpx;
+	margin-left: 10rpx;
 }
 
 .grid-item {
 	background-color: #fff;
 	border: 0.01rpx solid #fff;
 	padding: 40rpx;
-	border-radius: 7px;
+	border-radius: 20px;
 	.item-center {
 		width: 290rpx;
 		height: 150rpx;
@@ -43,10 +44,14 @@
 			text-align: left;
 			width: 140rpx;
 			font-size: 13px;
-			line-height: 144rpx;
+			height: 100rpx;
+			display: flex;
+			align-items: center;
+			top: -6rpx;
 			.text {
 				font-size: 13px;
 				color: #333333;
+				text-align: center;
 			}
 		}
 	}
@@ -75,6 +80,7 @@
 			justify-content: space-between;
 			align-items: flex-start;
 			flex-direction: column;
+			border-radius: 20px;
 			.item-child-top {
 				justify-content: space-between;
 				padding: 30rpx;

@@ -14,8 +14,8 @@
 								<text style="#FFFFFF;font-size: 18px;">{{ userInfo.realName }}</text>
 							</view>
 						</view>
-						<view style="#FFFFFF;font-size: 14px;" v-if="userInfo.phoneNumber">手机号：{{ userInfo.phoneNumber | phone }}</view>
-						<view v-else><text style="#FFFFFF;font-size: 14px;">手机号:未绑定</text></view>
+						<view style="color:#FFFFFF;font-size: 14px;" v-if="userInfo.phoneNumber">{{ userInfo.phoneNumber | phone }}</view>
+						<view v-else><text style="color:#FFFFFF;font-size: 14px;">手机号:未绑定</text></view>
 					</view>
 				</block>
 				<block v-else>
@@ -23,11 +23,11 @@
 						<view class="avatar u-flex"><u-icon name="account-fill" color="black" size="30"></u-icon></view>
 					</view>
 					<view class="u-flex-1" @click="openLoginFunc">
-						<view class="u-font-lg click-login">请点击登录</view>
-						<view @click="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
+						<view class="u-font-lg click-login login-btn ">请点击登录</view>
+						<view v-if="userInfo.isToken" @click="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
 					</view>
 				</block>
-				<view><u-icon name="arrow-right" color="black" size="13"></u-icon></view>
+				<view v-if="userInfo.isToken"><u-icon name="arrow-right" color="white" size="13"></u-icon></view>
 			</view>
 			<!-- #endif -->
 			<!-- #ifndef MP -->
@@ -41,8 +41,8 @@
 								<text style="#FFFFFF;font-size: 18px;">{{ userInfo.realName }}</text>
 							</view>
 						</view>
-						<view style="#FFFFFF;font-size: 14px;" v-if="userInfo.phoneNumber">手机号：{{ userInfo.phoneNumber | phone }}</view>
-						<view v-else><text style="#FFFFFF;font-size: 14px;">手机号:未绑定</text></view>
+						<view style="color:#FFFFFF;font-size: 14px;" v-if="userInfo.phoneNumber">{{ userInfo.phoneNumber | phone }}</view>
+						<view v-else><text style="color:#FFFFFF;font-size: 14px;">手机号:未绑定</text></view>
 					</view>
 				</block>
 				<block v-else>
@@ -50,8 +50,8 @@
 						<view class="avatar u-flex" style="justify-content: center"><u-icon name="account-fill" color="black" size="30"></u-icon></view>
 					</view>
 					<view class="u-flex-1" @click="openLoginFunc">
-						<view class="u-font-lg" style="color: black; font-weight: bold">登录</view>
-						<view @click="clickAccountFunc" style="color: black" class="detail">绑定账号</view>
+						<view class="u-font-lg login-btn">登录</view>
+						<view v-if="userInfo.isToken" @click="clickAccountFunc" style="color: black" class="detail">绑定账号</view>
 					</view>
 				</block>
 				<view><u-icon name="arrow-right" color="black" size="13"></u-icon></view>
@@ -72,14 +72,16 @@
 				</view>
 			</view>
 			<view v-if="userInfo.isToken" class="u-flex" style="justify-content: center; width: 600rpx">
-				<u-button @click.top="onLoginoutFunc" type="primary" shape="circle" text="退出账号"></u-button>
+				<button class="submit" size="default" @click.top="onLoginoutFunc"><text class="text">退出账号</text></button>
 			</view>
 		</view>
 		<!-- 绑定账号 -->
 		<view>
 			<u-modal :showConfirmButton="false" :show="show" :title="title">
 				<view v-if="!bindPhone" class="loginPhone">
-					<view class="form-row"><u--input shape="circle" class="input" prefixIcon="account-fill" type="text" placeholder="登录账号" v-model="account"></u--input></view>
+					<view class="form-row">
+						<u--input shape="circle" class="input" prefixIcon="account-fill" type="text" placeholder="登录账号" v-model="bindAccountObj.account"></u--input>
+					</view>
 					<view class="form-row item-bind">
 						<u--input
 							class="input"
@@ -88,7 +90,7 @@
 							suffixIconStyle="color: #909399"
 							type="password"
 							placeholder="登录密码"
-							v-model="password"
+							v-model="bindAccountObj.password"
 							@change="passwordChange"
 						></u--input>
 					</view>
@@ -103,7 +105,7 @@
 							shape="circle"
 							class="input"
 							type="text"
-							v-model="phone"
+							v-model="bindPhoneObj.phoneNumber"
 							placeholder="请输入手机号码"
 							placeholder-style="font-weight:normal;color:#bbbbbb;"
 						></u--input>
@@ -113,7 +115,7 @@
 							shape="circle"
 							class="input"
 							type="text"
-							v-model="vCode"
+							v-model="bindPhoneObj.code"
 							placeholder="请输入验证码"
 							placeholder-style="font-weight:normal;color:#bbbbbb;"
 						></u--input>
@@ -138,7 +140,7 @@
 				<view class="u-flex logout-main">
 					<view class="main"><text style="color: #999999">确定要退出当前账号？</text></view>
 					<view @click.top="logoutBtn" class="main"><text style="color: #f95e5a">退出登录</text></view>
-					<view class="main"><text @click.top="closeLogout" style="color: #3478f7">取消</text></view>
+					<view class="main1"><text @click.top="closeLogout" style="color: #3478f7">取消</text></view>
 				</view>
 			</u-popup>
 		</view>
@@ -166,13 +168,20 @@ export default {
 			readonly: false,
 			codeText: '获取验证码',
 			phone: '', //号码
-			vCode: '', //验证码
 			tips: '验证码',
 			bindPhone: false,
 			show: false,
 			title: '绑定账号',
 			systemInfo: base.systemInfo,
-			PrimaryButtonColor: '#0079fe' //主题色
+			PrimaryButtonColor: '#0079fe', //主题色
+			bindAccountObj: {
+				username: '',
+				password: ''
+			},
+			bindPhoneObj: {
+				phoneNumber: '',
+				code: ''
+			}
 		};
 	},
 	onLoad() {
@@ -213,7 +222,13 @@ export default {
 		clickAccountFunc() {
 			this.show = true;
 		},
-		bindConfirm() {},
+		bindConfirm() {
+			if (!this.bindPhone) {
+				console.log('Account submit', this.bindAccountObj);
+			} else {
+				console.log('Phone submit', this.bindPhoneObj);
+			}
+		},
 		bindPhoneFunc() {
 			this.bindPhone = true;
 		},

@@ -15,8 +15,10 @@
 		justify-content: center;
 	}
 	.click-login {
-		color: black;
-		font-weight: bold;
+		font-size: 18px;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 500;
+		color: #ffffff;
 	}
 
 	.nickName {
@@ -93,6 +95,15 @@
 		justify-content: space-between;
 		height: 147rpx;
 	}
+	.submit {
+		margin-top: 60rpx;
+		background: linear-gradient(90deg, #5dc2fc 0%, #377dff 100%);
+		width: 100%;
+		border-radius: 46px;
+		.text {
+			color: #ffffff;
+		}
+	}
 	.nav-link {
 		flex-direction: row;
 		justify-content: space-between;
@@ -109,8 +120,10 @@
 			left: -58rpx;
 			width: 420rpx;
 			.text {
-				color: #333333;
 				font-size: 15px;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #333333;
 			}
 		}
 		.nav-right {
@@ -118,8 +131,8 @@
 			right: -112rpx;
 			width: 100rpx;
 			.image {
-				width: 13rpx;
-				height: 17rpx;
+				width: 12rpx;
+				height: 20rpx;
 			}
 		}
 	}
@@ -241,4 +254,10 @@
 		text-align: center;
 		line-height: 86rpx;
 	}
+	.main1 {
+		width: 669rpx;
+		height: 100rpx;
+		text-align: center;
+		line-height: 86rpx;
+	}
 }

@@ -5,7 +5,7 @@
 		<view class="f__login">
 			<view class="loginPhone">
 				<view class="phone-main" style="margin-top: 173rpx;">
-					<text class="text" style="">手机验证码登录</text>
+					<text class="text">手机验证码登录</text>
 					<view class="circleStyle"></view>
 				</view>
 				<view class="form-row">

@@ -26,12 +26,12 @@
 			<view class="loginPhone">
 				<view style="margin-top:50rpx" class="form-row u-flex">
 					<view class="v-input"><input type="text" v-model="password" maxlength="32" placeholder="请设置6-20位新的登录密码" :password="!showPasswordF" /></view>
-					<view class="v-password"><u-icon @click="showPasswordModeF" :name="showPasswordF ? 'eye-fill' : 'eye-off'"></u-icon></view>
+					<view class="v-password"><u-icon  size="25" @click="showPasswordModeF" :name="showPasswordF ? 'eye-fill' : 'eye-off'"></u-icon></view>
 					<u-icon></u-icon>
 				</view>
-				<view style="margin-top:50rpx" class="form-row u-flex">
+				<view style="margin-top:70rpx" class="form-row u-flex">
 					<view class="v-input"><input type="text" v-model="rePassword" maxlength="32" placeholder="请再次输入新的登录密码" :password="!showPasswordS" /></view>
-					<view class="v-password"><u-icon @click="showPasswordModeS" :name="showPasswordS ? 'eye-fill' : 'eye-off'"></u-icon></view>
+					<view class="v-password"><u-icon  size="25" @click="showPasswordModeS" :name="showPasswordS ? 'eye-fill' : 'eye-off'"></u-icon></view>
 					<u-icon></u-icon>
 				</view>
 				<button class="submit" size="default" @click="onSubmit">

@@ -29,7 +29,6 @@
 					labelWidth="80px"
 					label="有效期"
 					prop="userInfo.accountExpireTime"
-					borderBottom
 					ref="item1"
 				>
 					<u--input v-model="myInfoModel.userInfo.accountExpireTime" placeholder="请选择有效期" border="none"></u--input>
@@ -249,4 +248,10 @@ export default {
 
 <style lang="scss" scoped>
 @import './static/set.scss';
+/deep/ .u-line {
+	width: 662rpx !important;
+}
+/deep/ .u-form-item {
+	height: 100rpx !important;
+}
 </style>

@@ -15,6 +15,9 @@
 			font-size: 22px;
 			color: #3a4759;
 			position: relative;
+			z-index: 9999;
+			font-family: PingFangSC-Semibold, PingFang SC;
+			font-weight: 600;
 		}
 		.circleStyle {
 			position: absolute;
@@ -31,6 +34,7 @@
 	.form-row {
 		position: relative;
 		border-bottom: 1rpx solid #e8e8e8;
+		margin-top: 30rpx;
 		.input {
 			font-size: 34rpx;
 			line-height: 102rpx;
@@ -43,7 +47,9 @@
 		}
 
 		.getvcode {
-			font-size: 26rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			font-size: 15px;
 			height: 80rpx;
 			color: #6299ff;
 			line-height: 80rpx;
@@ -90,7 +96,7 @@
 	}
 	.account-style {
 		flex-direction: row;
-		margin-top: 20rpx;
+		margin-top: 48rpx;
 		justify-content: space-between;
 		.content {
 			color: #999999;

@@ -21,7 +21,6 @@
 			border-radius: 50px;
 			width: 130rpx;
 			height: 130rpx;
-			border: 0.1rpx solid #e5e5e5;
 		}
 	}
 	.main-right-image {
@@ -34,8 +33,10 @@
 }
 .basic-text {
 	.text {
-		color: #8f9ca2;
 		font-size: 14px;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #666666;
 	}
 }
 .basic-main {

@@ -4,33 +4,31 @@
 		<public-module></public-module>
 		<view class="u-flex login-main">
 			<view class="content">
-				<view class="hello">您好,</view>
-				<view class="hello-welcome">欢迎来到ThingsKit!</view>
+				<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">
-					<u-icon name="account-fill"></u-icon>
 					<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">
-					<u-icon name="lock-fill"></u-icon>
 					<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 :name="showPassword ? 'eye-fill' : 'eye-off'"></u-icon></view>
+					<view class="v-password" @click="showPasswordMode"><u-icon 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" @click="openCodeFunc">手机验证码登录</view>
-					<view class="row-reset" @click="findPassrordFunc">忘记密码</view>
+					<view class="row-phone login-text-gray" @click="openCodeFunc">手机验证码登录</view>
+					<view class="row-reset login-text-gray" @click="findPassrordFunc">忘记密码</view>
 				</view>
-				<view @click="onAuthorization" class="u-flex link-login">
-					<view class="link-text">第三方账号登录</view>
+				<view class="u-flex link-login">
+					<view class="link-text login-text-gray">第三方账号登录</view>
 					<view style="height:20rpx"></view>
-					<view class="link-image"><image class="image" src="../../static/weixin.png" mode="aspectFill"></image></view>
+					<view @click="onAuthorization" class="link-image"><image class="image" src="../../static/weixin.png" mode="aspectFill"></image></view>
 					<view class="circleStyleBottom"></view>
 				</view>
 			</view>
@@ -41,6 +39,7 @@
 <script>
 import { mapMutations } from 'vuex';
 import { getUserInfo } from '@/components/module/f-login/f-login.js';
+import { loginApp } from '@/config/login';
 
 export default {
 	data() {
@@ -49,39 +48,46 @@ export default {
 				username: '',
 				password: ''
 			},
-			showPassword: false
+			showPassword: false,
+			code: ''
 		};
 	},
+	onLoad() {
+		uni.login({
+			success: res => {
+				if (res.errMsg == 'login:ok') {
+					this.code = res.code;
+					console.log('This code', this.code);
+				} else {
+					uni.showToast({
+						title: '系统异常'
+					});
+				}
+			}
+		});
+	},
 	methods: {
 		...mapMutations(['setUserInfo']),
+		//微信授权登录
 		onAuthorization(e) {
 			getUserInfo(
 				info => {
-					console.log(info, '授权信息');
+					console.log('授权信息', info);
 					let httpData = {
 						code: this.code,
 						nickName: info.nickName || '', //昵称
 						avatarUrl: info.avatarUrl || '', //头像
 						gender: info.gender || '' //性别 0:未知 1:男 2:女
 					};
-					// uni.$u.http.post('您的接口', httpData).then(res => {
-					let userInfo = {
-						// ...res,
-						token: true //token用于判断是否登录
-					};
-					// this.setUserInfo(userInfo)
-					// setTimeout(()=>{
-					//     uni.showToast({
-					//     	title: '登录成功',
-					//     	icon: 'none'
-					//     });
-					//     this.closeLogin();
-					// },100)
-					// })
+					// #ifdef APP-PLUS||MP
+					setTimeout(() => {
+						uni.reLaunch({
+							url: '/pages/personal/personal'
+						});
+					}, 500);
+					// #endif
 				},
-				err => {
-					// this.closeLogin();
-				}
+				err => {}
 			);
 		},
 		onSubmitFunc() {

@@ -10,11 +10,14 @@
 			.hello {
 				font-size: 30px;
 				color: #3a4759;
+				z-index: 9999;
+				position: relative;
 			}
 			.hello-welcome {
 				position: relative;
 				font-size: 30px;
 				color: #3a4759;
+				z-index: 9999;
 			}
 		}
 	}
@@ -41,14 +44,14 @@
 	.form-row {
 		position: relative;
 		justify-content: space-between;
-		margin-top: 30rpx;
+		margin-top: 60rpx;
 		.v-input {
-			width: 620rpx;
-			border-bottom: 0.1rpx solid #e5e5e5;
+			width: 690rpx;
+			border-bottom: 2px solid #e5e5e5;
 		}
 		.v-password {
 			position: absolute;
-			right: 18rpx;
+			right: 0rpx;
 			z-index: 66666;
 		}
 		.input {
@@ -74,7 +77,7 @@
 	}
 	.row-item {
 		flex-direction: row;
-		margin-top: 20rpx;
+		margin-top: 60rpx;
 		justify-content: space-between;
 		.row-phone {
 			color: #999999;
@@ -89,7 +92,7 @@
 	.link-login {
 		justify-content: center;
 		flex-direction: column;
-		margin-top: 220rpx;
+		margin-top: 370rpx;
 		.link-text {
 			color: #999999;
 			font-size: 13px;

 export const state = {
 	//用户数据
 	userInfo: {},
+	//存储告警徽标数据
+	badgeInfo: 0
 };
 export const mutations = {
 	//储存用户信息
@@ -27,5 +29,34 @@ export const mutations = {
 	},
 };
 export const actions = {
-
+	//更新告警徽标数
+	updateBadgeTotal({
+		state,
+		commit
+	}, data) {
+		let httpData = {
+			page: 1,
+			pageSize: 10,
+			status: data.status == 'CLEARED_ACK' ? null : data.status,
+			startTime: data.startTime,
+			endTime: data.endTime,
+			severity: data.severity,
+			deviceType: data.deviceType,
+			organizationId: data.organizationId,
+			alarmType: data.alarmType
+		};
+		uni.$u.http
+			.get('/yt/alarm', {
+				params: httpData,
+				custom: {
+					load: false
+				}
+			})
+			.then(res => {
+				state.badgeInfo = res.total
+			})
+			.catch(e => {
+				uni.$u.toast(e.data?.message);
+			});
+	}
 };

@@ -70,7 +70,7 @@ button {
 //（设备、告警,适用设备详情基础信息文本（右边的值的文本））第二个文本
 .text-device-muted {
 	font-size: 14px;
-	font-family: PingFangSC-Regular, PingFang SC;
+	font-family: PingFang SC-Regular, PingFang SC;
 	font-weight: 400;
 	color: #666666;
 }
@@ -122,7 +122,50 @@ button {
 .border-line {
 	border-radius: 20px;
 }
-
+//首页
+.home-text-muted {
+	font-size: 14px;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 500;
+	color: #333333;
+}
+.home-text-total {
+	font-size: 17px;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 500;
+	color: #333333;
+}
+.home-text-total-bottom {
+	font-size: 12px;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #999999;
+}
+//登录
+.login-text-muted {
+	font-size: 30px;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 600;
+	color: #3a4759;
+}
+.login-text-gray {
+	font-size: 13px;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #999999;
+}
+.login-btn {
+	font-size: 18px;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+}
+.login-phone {
+	font-size: 14px;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #ffffff;
+}
 // 定义flex等分
 @for $i from 0 through 12 {
 	.u-flex-#{$i} {

@@ -3,9 +3,6 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<view class="notify-column">
-			<view class="u-flex column">
-				<text class="text">{{ notifyList.title }}</text>
-			</view>
 			<view class="column-list">
 				<u-list height="140rpx">
 					<u-list-item>
@@ -15,9 +12,14 @@
 					</u-list-item>
 				</u-list>
 				<view class="bottom-text">
-					<!-- 富文本解析 -->
-					<u-parse :content="notifyList.content"></u-parse>
-					<!-- 富文本解析 -->
+					<view class="u-flex column">
+						<text class="text">{{ notifyList.title }}</text>
+					</view>
+					<view style="margin-top: 20rpx;">
+						<!-- 富文本解析 -->
+						<u-parse :content="notifyList.content"></u-parse>
+						<!-- 富文本解析 -->
+					</view>
 				</view>
 			</view>
 		</view>
@@ -51,4 +53,9 @@ export default {
 
 <style lang="scss" scoped>
 @import './static/notifyDetail.scss';
+/deep/ .u-line {
+	position: relative !important;
+	width: 640rpx !important;
+	left: 31rpx !important;
+}
 </style>

@@ -5,14 +5,6 @@
 	padding-left: 27rpx;
 }
 .notify-column {
-	.column {
-		margin-top: 10rpx;
-		justify-content: center;
-		.text {
-			color: #2e384d;
-			font-size: 18px;
-		}
-	}
 	.column-list {
 		border-radius: 20px;
 		margin-top: 20rpx;
@@ -20,10 +12,20 @@
 		height: 1000rpx;
 		background-color: #ffffff;
 		.bottom-text {
+			margin-left: 33rpx;
 			.text {
 				color: #2e384d;
 				font-size: 15px;
 			}
+			.column {
+				margin-top: 20rpx;
+				.text {
+					font-size: 16px;
+					font-family: PingFangSC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #2e384d;
+				}
+			}
 		}
 	}
 }

@@ -2,13 +2,8 @@
 	<view class="notify-page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<view>
-			<u--form labelPosition="left" :model="model1" ref="form1">
-				<u-form-item label="类型" prop="userInfo.sex" @click="openTypeClick" ref="item1">
-					<u--input v-model="model1.userInfo.type" placeholder="请选择类型" border="surround"></u--input>
-					<u-icon slot="right" name="arrow-right"></u-icon>
-				</u-form-item>
-			</u--form>
+		<view @click="openTypeClick" style="width: 700rpx;">
+			<u--input suffixIcon="arrow-down" shape="circle" 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 class="notify-main">