合并冲突

@@ -93,7 +93,7 @@ export default {
 		background-color: #fff;
 		color: #333;
 		border-radius: 20rpx;
-		font-size: 30rpx;
+		font-size: 15px;
 		margin-top: 30rpx;
 		padding: 30rpx;
 	}
@@ -108,11 +108,11 @@ export default {
 			align-items: center;
 			.detail-label {
 				color: #333;
-				font-size: 30rpx;
+				font-size: 15px;
 			}
 			.detail-value {
 				color: #666;
-				font-size: 28rpx;
+				font-size: 14px;
 				margin-left: 30rpx;
 			}
 		}

@@ -236,7 +236,7 @@ export default {
 		.item {
 			padding: 30rpx;
 			view {
-				font-size: 28rpx;
+				font-size: 14px;
 				margin-bottom: 10rpx;
 			}
 			.time {
@@ -247,7 +247,7 @@ export default {
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				font-size: 30rpx;
+				font-size: 15px;
 				font-weight: 500;
 				align-items: center;
 				.item-right {
@@ -256,7 +256,7 @@ export default {
 					align-items: center;
 					width: 104rpx;
 					height: 36rpx;
-					font-size: 20rpx;
+					font-size: 10px;
 					border-radius: 20rpx;
 				}
 				.item-fail {
@@ -276,7 +276,7 @@ export default {
 	.filter-title {
 		text-align: center;
 		margin-top: 14px;
-		font-size: 32rpx;
+		font-size: 16px;
 		font-weight: 700;
 	}
 	.button-group {

@@ -44,7 +44,10 @@
 							</text>
 						</view>
 					</view>
-					<view>{{ Object.entries(item.details.data)[0][0] }} :  <text style="font-weight: bold; margin-left:4rpx;">{{ Object.entries(item.details.data)[0][1] }}</text></view>
+					<view>
+						{{ Object.entries(item.details.data)[0][0] }} :
+						<text style="font-weight: bold; margin-left:4rpx;">{{ Object.entries(item.details.data)[0][1] }}</text>
+					</view>
 					<view v-if="item.status">
 						告警状态:{{
 							item.status === 'CLEARED_UNACK' ? '清除未确认' : item.status === 'CLEARED_ACK' ? '清除已确认' : item.status === 'ACTIVE_UNACK' ? '激活未确认' : '激活已确认'
@@ -55,8 +58,8 @@
 			</view>
 		</mescroll-body>
 		<!-- 告警筛选 -->
-		<u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20">
-			<view class="filter">
+		<u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20"  @touchmove.stop.prevent="disabledScroll">
+			<view class="filter" @touchmove.stop.prevent="disabledScroll">
 				<view class="filter-title"><text>筛选条件</text></view>
 				<FilterItem :filterList="alarmStatus" title="告警状态" @clickTag="currentIndex => handleClickTag(currentIndex, alarmStatus)"></FilterItem>
 				<FilterItem :filterList="typeStatus" title="设备类型" @clickTag="currentIndex => handleClickTag(currentIndex, typeStatus)"></FilterItem>
@@ -208,7 +211,7 @@ export default {
 				{
 					checked: false,
 					name: '近一天',
-					type: '1440000'
+					type: '86400000'
 				}
 			],
 			downOption: {
@@ -221,6 +224,9 @@ export default {
 		};
 	},
 	methods: {
+		disabledScroll(){
+			return;
+		},
 		/*下拉刷新的回调 */
 		downCallback() {
 			//联网加载数据
@@ -333,7 +339,7 @@ export default {
 
 <style lang="scss" scoped>
 .filter-button {
-	font-size: 24rpx;
+	font-size: 12px;
 	width: 160rpx;
 	height: 64rpx;
 	border-radius: 32rpx;
@@ -360,7 +366,7 @@ export default {
 		.item {
 			padding: 30rpx;
 			view {
-				font-size: 28rpx;
+				font-size: 14px;
 				margin-bottom: 10rpx;
 			}
 			.time {
@@ -369,7 +375,7 @@ export default {
 			.item-first {
 				display: flex;
 				justify-content: space-between;
-				font-size: 30rpx;
+				font-size: 15px;
 				font-weight: 500;
 				align-items: center;
 				.item-right {
@@ -391,7 +397,7 @@ export default {
 	.filter-title {
 		text-align: center;
 		margin-top: 14px;
-		font-size: 32rpx;
+		font-size: 16px;
 		font-weight: 700;
 	}
 	.button-group {

@@ -53,7 +53,7 @@
 			<view style="width: 100%; padding: 0 30rpx;">
 				<view style="text-align: center; font-weight:700;margin-bottom: 40rpx;">命令下发</view>
 				<view class="u-flex">
-					<text style="color: #333; font-size: 28rpx;font-weight:700;margin-right: 30rpx;">下发类型:</text>
+					<text style="color: #333; font-size: 14px;font-weight:700;margin-right: 30rpx;">下发类型:</text>
 
 					<u-radio-group v-model="commandType" placement="row">
 						<u-radio activeColor="#3388FF" label="OneWay" name="OneWay"></u-radio>
@@ -138,6 +138,7 @@ export default {
 				};
 				await issueCommand(this.commandType, this.deviceDetail.tbDeviceId, commandValue);
 				this.hiddenModal();
+				uni.$u.toast('下发成功~');
 			} catch (e) {
 				uni.$u.toast('下发失败~');
 			}
@@ -171,11 +172,11 @@ export default {
 			align-items: center;
 			.detail-label {
 				color: #333;
-				font-size: 30rpx;
+				font-size: 15px;
 			}
 			.detail-value {
 				color: #666;
-				font-size: 28rpx;
+				font-size: 14px;
 				margin-left: 30rpx;
 			}
 		}

@@ -35,7 +35,7 @@ export default {
 			display: flex;
 			justify-content: space-between;
 			color: #333;
-			font-size: 32rpx;
+			font-size: 16px;
 			font-family: PingFangSC-Medium, PingFang SC;
 			font-weight: bold;
 			.item-value {
@@ -44,7 +44,7 @@ export default {
 		}
 		.item-time {
 			margin-top: 4rpx;
-			font-size: 26rpx;
+			font-size: 13px;
 			color: #999;
 		}
 	}

@@ -37,7 +37,7 @@
 			        "
 						>
 							<view style="width: 450rpx; text-align: left">
-								<text style="color: #333; font-size: 30rpx;font-weight: bold;">{{ item.name }}</text>
+								<text style="color: #333; font-size: 15px;font-weight: bold;">{{ item.name }}</text>
 							</view>
 							<view style="width: 450rpx; text-align: left; margin-top: 10rpx">
 								<view style="color: #666; font-size: 14px;display: flex;">
@@ -194,6 +194,7 @@ export default {
 	async onLoad(options) {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
+		this.page.num = 1;
 		const { deviceState } = options;
 		this.deviceState = deviceState;
 		if (deviceState) {
@@ -371,7 +372,7 @@ export default {
 	.filter-title {
 		text-align: center;
 		margin-top: 14px;
-		font-size: 32rpx;
+		font-size: 16px;
 		font-weight: 700;
 	}
 	.button-group {
@@ -383,4 +384,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

@@ -64,7 +64,7 @@
 			<!-- 基础统计 -->
 			<!-- 四宫格CSS最新网格布局-->
 			<view class="grid-container">
-				<view class="grid-item">
+				<view class="grid-item" @click="showToastWip()">
 					<view class="item-center">
 						<view class="center"><image class="image" src="../../static/form.png"></image></view>
 						<view class="center-text"><text class="text text-muted">维修工单</text></view>
@@ -76,7 +76,7 @@
 						<view class="center-text"><text class="text text-muted" style="">摄像头管理</text></view>
 					</view>
 				</view>
-				<view class="grid-item">
+				<view class="grid-item" @click="showToastWip()">
 					<view class="item-center">
 						<view class="center"><image class="image" src="../../static/device.png"></image></view>
 						<view class="center-text"><text class="text text-muted">设备接入</text></view>
@@ -138,15 +138,21 @@ export default {
 				}
 			});
 		},
+		showToastWip(){
+			uni.$u.toast('拼命开发中 ...')
+		},
 		openCamera() {
-			uni.navigateTo({
-				url: 'camera/camera'
-			});
+			// uni.navigateTo({
+			// 	url: 'camera/camera'
+			// });
+			this.showToastWip()
 		},
 		openOrgStatus() {
 			// uni.navigateTo({
 			// 	url: 'configuration/configuration'
 			// });
+			this.showToastWip()
+
 		},
 		//告警状态查询
 		navigatorAlarmStatus(e) {

@@ -5,6 +5,7 @@
 		<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>
@@ -16,19 +17,26 @@
 				</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.stop="showPasswordMode">
-						<u-icon color="#9a9a9a" width="18" height="15" :name="showPassword ? '/static/eye.png' : '/static/eye-hide.png'"></u-icon>
+					<view class="v-password" style="padding: 30rpx" @click="showPasswordMode">
+						<u-icon color="#9a9a9a" :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>
@@ -129,20 +137,26 @@ export default {
 									});
 								}
 							})
+
 							.catch(e => {
-								// uni.$u.toast(e.data?.message);
+								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);
@@ -161,39 +175,53 @@ export default {
 				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();
@@ -204,6 +232,7 @@ export default {
 						});
 					}
 				})
+
 				.catch(e => {
 					uni.$u.toast(e.data?.message);
 				});
@@ -231,4 +260,4 @@ export default {
 /deep/ button {
 	background: rgba(0, 0, 0, 0);
 }
-</style>
+</style>