pref:统一管理API 按模块区分

@@ -5,7 +5,8 @@
 		<view class="alarm-detail-column">
 			<view class="u-flex detail-column">
 				<view class="u-flex column">
-					<text class="text-org-bold">{{ list.deviceName == null ? '暂无数据' : list.deviceName }}</text>
+					<text
+						class="text-clip device-name text-org-bold">{{ list.deviceName == null ? '暂无数据' : list.deviceName }}</text>
 					<image class="image" src="/static/alarm-device.png"></image>
 				</view>
 				<view class="column">
@@ -98,6 +99,8 @@
 	import {
 		mapActions
 	} from 'vuex'
+	import api from '@/api/index.js'
+
 	export default {
 		data() {
 			return {
@@ -117,62 +120,48 @@
 		},
 		methods: {
 			//处理
-			handleSubmit() {
+			async handleSubmit() {
 				if (this.formModel.result == '') return uni.$u.toast('请输入处理结果');
-				else
-					uni.$u.http
-					.post(`/alarm/${this.list.id}/ack`)
-					.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);
+				const res = await api.alarmApi.postAlarmAckApi(this.list.id)
+				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);
+				}
 			},
 			// 清除
-			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(async () => {
-								uni.navigateBack({
-									delta: 1
-								});
-								const res = await uni.$u.http.get('/yt/homepage/app?login=true');
-								if (res) {
-									//异步实时更新告警徽标数
-									await this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
-								}
-							}, 500);
-						}
-					})
-					.catch(e => {
-						uni.$u.toast(e.data?.message);
+			async handleRemove() {
+				const res = await api.alarmApi.postAlarmClearApi(this.list.id)
+				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(async () => {
+						uni.navigateBack({
+							delta: 1
+						});
+						const res = await uni.$u.http.get('/yt/homepage/app?login=true');
+						if (res) {
+							//异步实时更新告警徽标数
+							await this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
+						}
+					}, 500);
+				}
 			},
 			...mapActions(['updateBadgeTotal']),
 			formatDetailText(e) {

@@ -23,6 +23,9 @@
 			height: 90rpx;
 			text-align: left;
 			border-bottom: 0.1rpx solid #f0f0f0;
+			.device-name{
+				width:222rpx;
+			}
 			.text {
 				color: #333333;
 				font-size: 15px;

+//获取告警分页API
+const getAlarmApi = (params = {}) => {
+	return uni.$u.http.get("/yt/alarm", params)
+};
+
+//告警处理API
+const postAlarmAckApi = (id) => {
+	return uni.$u.http
+		.post(`/alarm/${id}/ack`)
+};
+
+//告警清除API
+const postAlarmClearApi = (id) => {
+	return uni.$u.http
+		.post(`/alarm/${id}/clear`)
+};
+
+export default {
+	getAlarmApi,
+	postAlarmAckApi,
+	postAlarmClearApi
+}

+//获取设备分页API
+const getDeviceApi = (params = {}) => {
+	return uni.$u.http.get('/yt/device', params);
+};
+
+export default {
+	getDeviceApi
+}

+//意见反馈API
+const postFeedBackApi = (data = {}) => {
+	return uni.$u.http
+		.post("/yt/opinion", data)
+};
+
+export default {
+	postFeedBackApi
+}

+//获取首页统计数据API
+const getHomeStatisticsApi = () => {
+	return uni.$u.http.get("/yt/homepage/app?login=false")
+};
+
+//获取视频分页API
+const getCameraApi = (params = {}) => {
+	return uni.$u.http
+		.get('/yt/video', params)
+};
+
+//获取视频详情API
+const byCameraIdGetDetailApi = (id) => {
+	return uni.$u.http.get(`/yt/video/url/${id}`)
+};
+
+//获取组态分页API
+const getConfigurationApi = (params = {}) => {
+	return uni.$u.http
+		.get('/yt/configuration/center', params)
+}
+
+export default {
+	getHomeStatisticsApi,
+	getCameraApi,
+	byCameraIdGetDetailApi,
+	getConfigurationApi
+}

+/**
+ * 统一管理API
+ * 按模块划分API
+ */
+
+//登录
+import loginApi from './loginApi/index.js'
+
+//意见反馈
+import feedbackApi from './feebbackApi/index.js'
+
+//通知
+import notifyApi from './notifyApi/index.js'
+
+//首页
+import homeApi from './homeApi/index.js'
+
+//告警
+import alarmApi from './alarmApi/index.js'
+
+//设备
+import deviceApi from './deviceApi/index.js'
+
+export default {
+	loginApi,
+	feedbackApi,
+	notifyApi,
+	homeApi,
+	alarmApi,
+	deviceApi
+}

+//获取平台定制API
+const getPlateCustomApi = () => {
+	return uni.$u.http.get("/yt/app_design/get")
+};
+
+//第三方账号绑定API
+const getThirdLoginApi = (code) => {
+	return uni.$u.http.get(`/yt/third/login/${code}`)
+};
+
+//获取个人信息API
+const setUserInfoApi = () => {
+	return uni.$u.http.get("/yt/user/me/info")
+};
+
+//获取平台信息API
+const setPlateInfoApi = () => {
+	return uni.$u.http.get("/yt/platform/get")
+};
+
+//获取告警徽标数API
+const getAlarmTotalApi = () => {
+	return uni.$u.http.get("/yt/homepage/app?login=true")
+};
+
+//登录API
+const postLoginApi = (loginForm = {}) => {
+	return uni.$u.http
+		.post("/auth/login", loginForm)
+};
+
+//获取验证码API
+const postCodeApi = (phone) => {
+	return uni.$u.http
+		.post(`/yt/noauth/reset_code/${phone}`)
+}
+
+//重置密码API
+const postResetCodeApi = (phone, data = {}) => {
+	return uni.$u.http
+		.post(`/yt/noauth/reset/${phone}`, data)
+}
+
+//更新个人资料API
+const postPersonalInfoApi = (data = {}) => {
+	return uni.$u.http
+		.put('/yt/user/center', data)
+}
+
+//第三方登录需要解绑API
+const deleteBindApi = (data = {}) => {
+	return uni.$u.http.delete('/yt/third', data)
+}
+
+export default {
+	getPlateCustomApi,
+	getThirdLoginApi,
+	setUserInfoApi,
+	setPlateInfoApi,
+	getAlarmTotalApi,
+	postLoginApi,
+	postCodeApi,
+	postResetCodeApi,
+	postPersonalInfoApi,
+	deleteBindApi
+}

+//获取通知分页API
+const getNotifyApi = (params = {}) => {
+	return uni.$u.http.get("/yt/notice_user/page", params)
+};
+
+//获取通知详情API
+const byNotifyIdGetDetailApi = (id) => {
+	return uni.$u.http
+		.get(`/yt/notice_user/${id}`)
+}
+
+export default {
+	getNotifyApi,
+	byNotifyIdGetDetailApi
+}

@@ -26,6 +26,5 @@ export function getDeviceKeys(id) {
 };
 
 export function issueCommand(type, tbDeviceId, data) {
-	console.log(type, tbDeviceId)
 	return uni.$u.http.post(`/rpc/${type==='OneWay'?'oneway':'twoway'}/${tbDeviceId}`, data)
 }

@@ -6,15 +6,17 @@
 			<view class="form-page">
 				<u--form labelPosition="left" :model="feedbackData" :rules="rules" ref="myfeedBackFormRef">
 					<u-form-item required label="主题" prop="feedbackInfo.title" borderBottom ref="item1">
-						<u--input placeholder="请输入主题" v-model="feedbackData.feedbackInfo.title" border="none"></u--input>
+						<u--input placeholder="请输入主题" v-model="feedbackData.feedbackInfo.title" border="none">
+						</u--input>
 					</u-form-item>
 					<u-form-item required label="姓名" prop="feedbackInfo.name" borderBottom ref="item1">
 						<u--input placeholder="请输入姓名" v-model="feedbackData.feedbackInfo.name" border="none"></u--input>
 					</u-form-item>
 					<view class="info">
 						<view class="info-contain">
-							<u-form-item  required label="反馈" prop="feedbackInfo.message" borderBottom ref="item1">
-								<u--textarea placeholder="请输入反馈信息" v-model="feedbackData.feedbackInfo.message" count></u--textarea>
+							<u-form-item required label="反馈" prop="feedbackInfo.message" borderBottom ref="item1">
+								<u--textarea placeholder="请输入反馈信息" v-model="feedbackData.feedbackInfo.message" count>
+								</u--textarea>
 							</u-form-item>
 						</view>
 					</view>
@@ -22,244 +24,251 @@
 					<view class="info" style="margin-top: 15rpx;background: rgba(1, 1, 1, 0);">
 						<view class="info-contain">
 							<u-form-item label="图片" prop="feedbackInfo.images" borderBottom ref="item1">
-								<u-upload :sizeType="compressed" :fileList="fileList1" 
-								@afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="6"></u-upload>
+								<u-upload :sizeType="compressed" :fileList="fileList1" @afterRead="afterRead"
+									@delete="deletePic" name="1" multiple :maxCount="6"></u-upload>
 							</u-form-item>
 						</view>
 					</view>
 				</u--form>
 				<view style="width:427rpx;margin:0 auto;">
-						<u-button class="buttonSty button-sty" shape="circle" type="primary" text="提交" customStyle="margin-top: 129rpx" @click="submit"></u-button>
-					</view>
+					<u-button class="buttonSty button-sty" shape="circle" type="primary" text="提交"
+						customStyle="margin-top: 129rpx" @click="submit"></u-button>
 				</view>
-				<!-- #ifdef MP -->
-				<view style="height: 18rpx;"></view>
-				<!-- #endif -->
-				<!-- #ifndef MP -->
-				<view style="height: 52rpx;"></view>
-				<!-- #endif -->
 			</view>
-			<view style="height: 20rpx;"></view>
+			<!-- #ifdef MP -->
+			<view style="height: 18rpx;"></view>
+			<!-- #endif -->
+			<!-- #ifndef MP -->
+			<view style="height: 52rpx;"></view>
+			<!-- #endif -->
 		</view>
+		<view style="height: 20rpx;"></view>
+	</view>
 	</view>
 </template>
 
 <script>
-import baseUrl from '@/config/baseUrl.js';
-import { mapState } from 'vuex';
+	import baseUrl from '@/config/baseUrl.js';
+	import {
+		mapState
+	} from 'vuex';
+	import api from '@/api/index.js'
 
-export default {
-	data() {
-		return {
-			feedbackData: {
-				feedbackInfo: {
-					title: '',
-					name: '',
-					images: [],
-					message: ''
-				}
-			},
-			fileList1: [],
-			rules: {
-							'feedbackInfo.title': {
-								type: 'string',
-								required: true,
-								message: '请输入主题',
-								trigger: ['blur', 'change']
-							},
-							'feedbackInfo.name': {
-								type: 'string',
-								required: true,
-								message: '请输入姓名',
-								trigger: ['blur', 'change']
-							},
-							'feedbackInfo.message': {
-								type: 'string',
-								required: true,
-								message: '请输入意见反馈',
-								trigger: ['blur', 'change']
-							},
-							
+	export default {
+		data() {
+			return {
+				feedbackData: {
+					feedbackInfo: {
+						title: '',
+						name: '',
+						images: [],
+						message: ''
+					}
+				},
+				fileList1: [],
+				rules: {
+					'feedbackInfo.title': {
+						type: 'string',
+						required: true,
+						message: '请输入主题',
+						trigger: ['blur', 'change']
+					},
+					'feedbackInfo.name': {
+						type: 'string',
+						required: true,
+						message: '请输入姓名',
+						trigger: ['blur', 'change']
+					},
+					'feedbackInfo.message': {
+						type: 'string',
+						required: true,
+						message: '请输入意见反馈',
+						trigger: ['blur', 'change']
+					},
+
+				},
+			};
 		},
-		};
-	},
-	onReady() {
-		// 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
-		this.$refs.myfeedBackFormRef.setRules(this.rules);
-	},
-	onLoad() {
-		// 隐藏原生的tabbar
-		uni.hideTabBar();
-	},
-	computed: {
-		...mapState(['userInfo'])
-	},
-	methods: {
-		// 删除图片
-		deletePic(event) {
-			this[`fileList${event.name}`].splice(event.index, 1);
+		onReady() {
+			// 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
+			this.$refs.myfeedBackFormRef.setRules(this.rules);
 		},
-		// 新增图片
-		async afterRead(event) {
-			let lists = [].concat(event.file);
-			let fileListLen = this[`fileList${event.name}`].length;
-			lists.map(item => {
-				if(item.size>5242880){
-					this[`fileList${event.name}`].push({
-						...item,
-						status: 'error',
-						message: '上传失败'
-					});
-				}else{
-				this[`fileList${event.name}`].push({
-					...item,
-					status: 'uploading',
-					message: '上传中'
-				});
-				}
-			});
-			for (let i = 0; i < lists.length; i++) {
-				const judgeImageSize=lists[0].size
-				if(judgeImageSize>5242880){
-					return uni.$u.toast('图片限定5M')
-				}else{
-					const result = await this.uploadFilePromise(lists[i].url);
-					let item = this[`fileList${event.name}`][fileListLen];
-					this[`fileList${event.name}`].splice(
-						fileListLen,
-						1,
-						Object.assign(item, {
-							status: 'success',
-							message: '',
-							url: result
-						})
-					);
-					fileListLen++;
-				}
-			}
+		onLoad() {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
 		},
-		uploadFilePromise(url) {
-			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('请登录后上传图片');
-			return new Promise((resolve, reject) => {
-				let a = uni.uploadFile({
-					url: `${baseUrl.baseUrl}/yt/oss/upload`,
-					filePath: url,
-					name: 'file',
-					header: {
-						'content-type': 'multipart/form-data',
-						Authorization: 'Bearer ' + token
-					},
-					formData: {},
-					success: res => {
-						setTimeout(() => {
-							if(res.statusCode===200){
-								if(res.data){
-								let objImage = JSON.parse(res.data);
-								if (this.feedbackData.feedbackInfo.images.length < 6) {
-									this.feedbackData.feedbackInfo.images.push(objImage.fileStaticUri);
-								}
-								resolve(res.data?.fileStaticUri);
-								}
-							}else{
-								return uni.$u.toast('图片上传失败')
-							}
-						}, 1000);
+		computed: {
+			...mapState(['userInfo'])
+		},
+		methods: {
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1);
+			},
+			// 新增图片
+			async afterRead(event) {
+				let lists = [].concat(event.file);
+				let fileListLen = this[`fileList${event.name}`].length;
+				lists.map(item => {
+					if (item.size > 5242880) {
+						this[`fileList${event.name}`].push({
+							...item,
+							status: 'error',
+							message: '上传失败'
+						});
+					} else {
+						this[`fileList${event.name}`].push({
+							...item,
+							status: 'uploading',
+							message: '上传中'
+						});
 					}
 				});
-			});
-		},
-		submit() {
-			this.$refs.myfeedBackFormRef
-				.validate()
-				.then(res => {
-					if(res){
-						let httpData = {
-							title: this.feedbackData.feedbackInfo.title,
-							name: this.feedbackData.feedbackInfo.name,
-							images: this.feedbackData.feedbackInfo.images.length == 0 ? '' : JSON.stringify(this.feedbackData.feedbackInfo.images),
-							message: this.feedbackData.feedbackInfo.message
-						};
-						uni.$u.http
-							.post('/yt/opinion', httpData)
-							.then(res => {
-								if (res) {
-									uni.showToast({
-										title: '意见反馈提交成功~',
-										icon: 'none'
-									});
-									setTimeout(() => {
-										uni.navigateBack();
-									}, 500);
-								}
+				for (let i = 0; i < lists.length; i++) {
+					const judgeImageSize = lists[0].size
+					if (judgeImageSize > 5242880) {
+						return uni.$u.toast('图片限定5M')
+					} else {
+						const result = await this.uploadFilePromise(lists[i].url);
+						let item = this[`fileList${event.name}`][fileListLen];
+						this[`fileList${event.name}`].splice(
+							fileListLen,
+							1,
+							Object.assign(item, {
+								status: 'success',
+								message: '',
+								url: result
 							})
-							.catch(e => {
-								uni.$u.toast(e.data?.message);
-							});
+						);
+						fileListLen++;
 					}
-				})
-				.catch(errors => {
-					uni.$u.toast('请填写或者请填写正确格式的数据');
+				}
+			},
+			uploadFilePromise(url) {
+				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('请登录后上传图片');
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: `${baseUrl.baseUrl}/yt/oss/upload`,
+						filePath: url,
+						name: 'file',
+						header: {
+							'content-type': 'multipart/form-data',
+							Authorization: 'Bearer ' + token
+						},
+						formData: {},
+						success: res => {
+							setTimeout(() => {
+								if (res.statusCode === 200) {
+									if (res.data) {
+										let objImage = JSON.parse(res.data);
+										if (this.feedbackData.feedbackInfo.images.length < 6) {
+											this.feedbackData.feedbackInfo.images.push(objImage
+												.fileStaticUri);
+										}
+										resolve(res.data?.fileStaticUri);
+									}
+								} else {
+									return uni.$u.toast('图片上传失败')
+								}
+							}, 1000);
+						}
+					});
 				});
+			},
+			submit() {
+				this.$refs.myfeedBackFormRef
+					.validate()
+					.then(async res => {
+						if (res) {
+							let httpData = {
+								title: this.feedbackData.feedbackInfo.title,
+								name: this.feedbackData.feedbackInfo.name,
+								images: this.feedbackData.feedbackInfo.images.length == 0 ? '' : JSON
+									.stringify(
+										this.feedbackData.feedbackInfo.images),
+								message: this.feedbackData.feedbackInfo.message
+							};
+							const res = await api.feedbackApi.postFeedBackApi(httpData)
+							uni.showToast({
+								title: '意见反馈提交成功~',
+								icon: 'none'
+							});
+							setTimeout(() => {
+								uni.navigateBack();
+							}, 500);
+						}
+					})
+					.catch(errors => {
+						uni.$u.toast('请填写或者请填写正确格式的数据');
+					});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.feedback-page {
-	min-height: 100vh;
-	background-color: #f8f9fa;
-	padding-top: 9rpx;
-	padding-left: 27rpx;
-	overflow-y: scroll;
-	overflow: hidden;
-}
-.form-page {
-	width: 700rpx;
-	background-color: #ffffff;
-	border-radius: 10px;
-	margin-top: 20rpx;
-	padding-left: 15rpx;
-	padding: 0 20rpx;
-	height: 500rpx;
-	.info {
+	.feedback-page {
+		min-height: 100vh;
+		background-color: #f8f9fa;
+		padding-top: 9rpx;
+		padding-left: 27rpx;
+		overflow-y: scroll;
+		overflow: hidden;
+	}
+
+	.form-page {
 		width: 700rpx;
 		background-color: #ffffff;
 		border-radius: 10px;
-		margin-top: 100rpx;
-		height: 256rpx;
-		margin-left: -20rpx;
-		.info-contain {
-			margin: 0rpx 27rpx;
-			/deep/ .u-line {
-				display: none !important;
-			}
-			/deep/ .u-form-item__body__left__content__label {
-				display: none !important;
-			}
-			/deep/.u-form-item__body__right {
-				margin-left: -106rpx;
-			}
-			/deep/.u-textarea--radius {
-				border: none !important;
+		margin-top: 20rpx;
+		padding-left: 15rpx;
+		padding: 0 20rpx;
+		height: 500rpx;
+
+		.info {
+			width: 700rpx;
+			background-color: #ffffff;
+			border-radius: 10px;
+			margin-top: 100rpx;
+			height: 256rpx;
+			margin-left: -20rpx;
+
+			.info-contain {
+				margin: 0rpx 27rpx;
+
+				/deep/ .u-line {
+					display: none !important;
+				}
+
+				/deep/ .u-form-item__body__left__content__label {
+					display: none !important;
+				}
+
+				/deep/.u-form-item__body__right {
+					margin-left: -106rpx;
+				}
+
+				/deep/.u-textarea--radius {
+					border: none !important;
+				}
 			}
 		}
+
+		/deep/.u-button--primary {
+			background-color: #377DFF !important;
+			border-color: #377DFF !important;
+		}
 	}
-	/deep/.u-button--primary{
-		background-color: #377DFF!important;
-		border-color: #377DFF!important;
-	}
-}
-//#ifndef MP
-.buttonSty {
-	margin-top: 30rpx !important;
-}
-//#endif
 
+	//#ifndef MP
+	.buttonSty {
+		margin-top: 30rpx !important;
+	}
 
+	//#endif
 </style>

@@ -7,7 +7,10 @@
 			<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 class="search-left">
+							<u--input prefixIcon="search" placeholder="请输入告警名字" shape="circle" @change="inputChanged">
+							</u--input>
+						</view>
 					</view>
 					<view @click="openSearchDialog" class="search-right">
 						<text>筛选</text>
@@ -30,7 +33,8 @@
 		</u-sticky>
 		<!-- 吸顶组件 -->
 		<!-- 自带分页组件 -->
-		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
+		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
+			@up="upCallback">
 			<view class="device-list">
 				<view @click="openAlertDetail(item)" class="list-item" v-for="(item, index) in list" :key="index">
 					<view class="u-flex item">
@@ -38,7 +42,8 @@
 							<text class="text-bold">{{ item.deviceName == null ? '暂无数据' : item.deviceName }}</text>
 						</view>
 						<view class="item-text text-clip">
-							<text class="text-muted">{{ item.details == null ? '暂无数据' : formatDetailText(item.details.data) }}</text>
+							<text
+								class="text-muted">{{ item.details == null ? '暂无数据' : formatDetailText(item.details.data) }}</text>
 						</view>
 						<view class="item-text">
 							<text class="text-muted">
@@ -61,9 +66,7 @@
 						<view class="u-flex item-right">
 							<image class="right-image" :src="bindImageUrl(item.severity)"></image>
 							<view class="right-text">
-								<text
-									class="text-no-color"
-									:style="[
+								<text class="text-no-color" :style="[
 										item.severity == 'CRITICAL'
 											? { color: '#DE4437' }
 											: item.severity == 'MAJOR'
@@ -73,8 +76,7 @@
 											: item.severity == 'WARNING'
 											? { color: '#DE4437' }
 											: { color: '#00C9A7' }
-									]"
-								>
+									]">
 									{{
 										item.severity == 'CRITICAL'
 											? '危险'
@@ -104,76 +106,67 @@
 					<view>
 						<view class="popup-alarm-text"><text class="text">告警状态</text></view>
 						<view class="u-flex popup-alarm-child">
-							<view
-								class="alarm-text"
-								@click="getAlertStatus(item, index)"
+							<view class="alarm-text" @click="getAlertStatus(item, index)"
 								:style="[index == current1 ? { background: 'rgba(55, 125, 255, 0.05)', border: '1rpx solid rgba(55, 125, 255, 0.3)' } : { background: '#F6F6F6' }]"
-								v-for="(item, index) in alertStatus"
-								:key="index"
-							>
-								<text :class="[index == current1 ? 'select-text' : 'un-select-text']" class="text">{{ item.name }}</text>
+								v-for="(item, index) in alertStatus" :key="index">
+								<text :class="[index == current1 ? 'select-text' : 'un-select-text']"
+									class="text">{{ item.name }}</text>
 							</view>
 						</view>
 						<view style="margin-top: 169rpx;">
 							<view class="popup-alarm-text"><text class="text">设备类型</text></view>
 							<view class="u-flex popup-alarm-child">
-								<view
-									class="alarm-text"
-									@click="getTypeStatus(item, index)"
-									:style="[
+								<view class="alarm-text" @click="getTypeStatus(item, index)" :style="[
 										index == current2 ? { background: 'rgba(55, 125, 255, 0.05)', border: '1rpx solid rgba(55, 125, 255, 0.3)' } : { background: '#F6F6F6' }
-									]"
-									v-for="(item, index) in deviceType"
-									:key="index"
-								>
-									<text :class="[index == current2 ? 'select-text' : 'un-select-text']" class="text">{{ item.name }}</text>
+									]" v-for="(item, index) in deviceType" :key="index">
+									<text :class="[index == current2 ? 'select-text' : 'un-select-text']"
+										class="text">{{ item.name }}</text>
 								</view>
 							</view>
 
 							<view style="margin-top: 169rpx;">
 								<view class="popup-alarm-text"><text class="text">告警等级</text></view>
 								<view class="u-flex popup-alarm-child">
-									<view
-										class="alarm-text"
-										@click="getLevelStatus(item, index)"
-										:style="[
+									<view class="alarm-text" @click="getLevelStatus(item, index)" :style="[
 											index == current3 ? { background: 'rgba(55, 125, 255, 0.05)', border: '1rpx solid rgba(55, 125, 255, 0.3)' } : { background: '#F6F6F6' }
-										]"
-										v-for="(item, index) in alertLevel"
-										:key="index"
-									>
-										<text :class="[index == current3 ? 'select-text' : 'un-select-text']" class="text">{{ item.name }}</text>
+										]" v-for="(item, index) in alertLevel" :key="index">
+										<text :class="[index == current3 ? 'select-text' : 'un-select-text']"
+											class="text">{{ item.name }}</text>
 									</view>
 								</view>
 								<view style="margin-top: 169rpx;">
 									<view class="popup-alarm-text"><text class="text">选择时间</text></view>
 									<view class="u-flex popup-alarm-child">
-										<view
-											class="alarm-text"
-											@click="getTimeStatus(item, index)"
-											:style="[
+										<view class="alarm-text" @click="getTimeStatus(item, index)" :style="[
 												index == current4
 													? { background: 'rgba(55, 125, 255, 0.05)', border: '1rpx solid rgba(55, 125, 255, 0.3)' }
 													: { background: '#F6F6F6' }
-											]"
-											v-for="(item, index) in timeArea"
-											:key="index"
-										>
-											<text :class="[index == current4 ? 'select-text' : 'un-select-text']" class="text">{{ item.name }}</text>
+											]" v-for="(item, index) in timeArea" :key="index">
+											<text :class="[index == current4 ? 'select-text' : 'un-select-text']"
+												class="text">{{ item.name }}</text>
 										</view>
 									</view>
 									<view style="margin-top: 169rpx;margin-left: 22rpx;">
 										<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="datetimerange" rangeSeparator="至" />
+											<view
+												style="width: 623rpx;margin-left: 5rpx;margin-right: 70rpx;margin-top: 35rpx;">
+												<uni-datetime-picker v-model="range" type="datetimerange"
+													rangeSeparator="至" />
 											</view>
 										</view>
 									</view>
 									<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 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>
 									<view style="height: 90rpx;"></view>
 								</view>
@@ -188,264 +181,274 @@
 </template>
 
 <script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
-import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
-import { alertStatus, deviceType, alertLevel, timeArea } from './static/data.js';
+	import fTabbar from '@/components/module/f-tabbar/f-tabbar';
+	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
+	import {
+		alertStatus,
+		deviceType,
+		alertLevel,
+		timeArea
+	} from './static/data.js';
+	import api from '@/api/index.js'
 
-export default {
-	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
-	components: {
-		fTabbar
-	},
-	data() {
-		return {
-			range: [],
-			alertStatusVal: '',
-			deviceTypeVal: '',
-			alertLevelVal: '',
-			selectTimeVal: '',
-			current1: 0,
-			current2: 0,
-			current3: 0,
-			current4: 0,
-			page: {
-				num: 0,
-				size: 10
-			},
-			downOption: {
-				auto: false //是否在初始化后,自动执行downCallback; 默认true
-			},
-			upOption: {
-				auto: false // 不自动加载
-			},
-			timeData: {
-				selectTime: [],
-				getTimeGapS: '',
-				getTimeGapE: ''
-			},
-			show: false,
-			list: [],
-			alertStatus,
-			deviceType,
-			alertLevel,
-			timeArea,
-			ordId: '',
-			detailStatus: false,
-			alertTotal: 0,
-			searchAlarmText: '',
-			startTimeVa: '',
-			endTimeVa: '',
-			startTimeArea: '',
-			endTimeArea: '',
-			type: null
-		};
-	},
-	onShow() {
-		this.page.num = 1;
-		if (this.detailStatus) {
-			this.loadData(1, null, null, null, null, null, null);
-		}
-		if (this.ordId) {
-			this.loadData(1, null, null, null, null, null, this.ordId);
-		}
-	},
-	onHide() {
-		this.ordId = '';
-		this.detailStatus = false;
-		this.type = null;
-	},
-	onLoad(e) {
-		// 隐藏原生的tabbar
-		uni.hideTabBar();
-		if (e.type == undefined) {
-			this.loadData(1, null, null, null, null, null, null);
-		} else {
-			let params = JSON.parse(e.type);
-			if (Array.isArray(params)) {
-				this.type = params.join(',');
-			} else {
-				this.type = params;
-			}
-			this.loadData(1, this.type, null, null, null, null, null);
-		}
-	},
-	watch: {
-		range(newval) {
-			this.timeData.selectTime = this.range;
-		}
-	},
-	methods: {
-		moveHandle() {
-			return false;
-		},
-		inputChanged(e) {
-			this.resetData();
-			this.topBack();
-			this.searchAlarmText = e;
-			this.page.num = 1;
-			this.loadData(1, null, null, null, null, null, null, e);
-		},
-		getAlertStatus(e, i) {
-			this.current1 = i;
-			this.alertStatusVal = e.value;
-		},
-		getTypeStatus(e, i) {
-			this.current2 = i;
-			this.deviceTypeVal = e.value;
+	export default {
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		components: {
+			fTabbar
 		},
-		getLevelStatus(e, i) {
-			this.current3 = i;
-			this.alertLevelVal = e.value;
-		},
-		getTimeStatus(e, i) {
-			this.current4 = i;
-			this.selectTimeVal = e.value;
-			let curTime = new Date();
-			const formatS = curTime.getTime();
-			let addMinute = new Date(curTime.setMinutes(curTime.getMinutes() - this.selectTimeVal));
-			const formatE = addMinute.getTime();
-			this.timeData.getTimeGapS = formatS;
-			this.timeData.getTimeGapE = formatE;
+		data() {
+			return {
+				range: [],
+				alertStatusVal: '',
+				deviceTypeVal: '',
+				alertLevelVal: '',
+				selectTimeVal: '',
+				current1: 0,
+				current2: 0,
+				current3: 0,
+				current4: 0,
+				page: {
+					num: 0,
+					size: 10
+				},
+				downOption: {
+					auto: false //是否在初始化后,自动执行downCallback; 默认true
+				},
+				upOption: {
+					auto: false // 不自动加载
+				},
+				timeData: {
+					selectTime: [],
+					getTimeGapS: '',
+					getTimeGapE: ''
+				},
+				show: false,
+				list: [],
+				alertStatus,
+				deviceType,
+				alertLevel,
+				timeArea,
+				ordId: '',
+				detailStatus: false,
+				alertTotal: 0,
+				searchAlarmText: '',
+				startTimeVa: '',
+				endTimeVa: '',
+				startTimeArea: '',
+				endTimeArea: '',
+				type: null
+			};
 		},
-		queryData() {
-			this.topBack();
+		onShow() {
 			this.page.num = 1;
-			let date1 = new Date(this.timeData.selectTime[0]);
-			let date2 = new Date(this.timeData.selectTime[1]);
-			if (this.timeData.selectTime.length == 0) {
-				this.startTimeVa = '';
-				this.endTimeVa = '';
-			} else {
-				this.startTimeVa = date1.getTime();
-				this.endTimeVa = date2.getTime();
+			if (this.detailStatus) {
+				this.loadData(1, null, null, null, null, null, null);
 			}
-			if (this.timeData.getTimeGapS == '') {
-				this.startTimeArea = '';
-				this.endTimeArea = '';
-			} else {
-				this.startTimeArea = this.timeData.getTimeGapE;
-				this.endTimeArea = this.timeData.getTimeGapS;
+			if (this.ordId) {
+				this.loadData(1, null, null, null, null, null, this.ordId);
 			}
-			this.loadData(
-				1,
-				this.alertStatusVal,
-				this.startTimeVa ? this.startTimeVa : this.startTimeArea,
-				this.endTimeVa ? this.endTimeVa : this.endTimeArea,
-				this.alertLevelVal,
-				this.deviceTypeVal
-			);
-			this.show = false;
 		},
-		resetData() {
-			this.current1 = 0;
-			this.alertStatusVal = '';
-			this.current2 = 0;
-			this.deviceTypeVal = '';
-			this.current3 = 0;
-			this.alertLevelVal = '';
-			this.current4 = 0;
-			this.selectTimeVal = '';
-			this.timeData.selectTime = [];
-			this.timeDatagetTimeGapS = '';
-			this.timeDatagetTimeGapE = '';
-			this.range = [];
-			this.searchAlarmText = '';
-			this.startTimeVa = '';
-			this.endTimeVa = '';
-			this.startTimeArea = '';
-			this.endTimeArea = '';
+		onHide() {
 			this.ordId = '';
+			this.detailStatus = false;
 			this.type = null;
 		},
-		bindImageUrl(e) {
-			switch (e) {
-				case 'CRITICAL':
-					return '../../static/danger.png';
-					break;
-				case 'MAJOR':
-					return '../../static/major.png';
-					break;
-				case 'MINOR':
-					return '../../static/secondary.png';
-					break;
-				case 'WARNING':
-					return '../../static/danger.png';
-					break;
-				case 'INDETERMINATE':
-					return '../../static/noshue.png';
-					break;
-				default:
-					return '';
-					break;
+		onLoad(e) {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			if (e.type == undefined) {
+				this.loadData(1, null, null, null, null, null, null);
+			} else {
+				let params = JSON.parse(e.type);
+				if (Array.isArray(params)) {
+					this.type = params.join(',');
+				} else {
+					this.type = params;
+				}
+				this.loadData(1, this.type, null, null, null, null, null);
 			}
 		},
-		//筛选数据让它回到顶部
-		topBack() {
-			uni.pageScrollTo({
-				scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
-				duration: 10 // 滚动动画的时长
-			});
-		},
-		/*下拉刷新的回调 */
-		downCallback() {
-			//联网加载数据
-			this.list.length = 0;
-			this.page.num = 1;
-			this.loadData(this.page.num, null, null, null, null, null, null, null);
-			this.resetData();
+		watch: {
+			range(newval) {
+				this.timeData.selectTime = this.range;
+			}
 		},
-		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-		upCallback() {
-			if (
-				this.type != null ||
-				this.alertStatusVal != '' ||
-				this.searchAlarmText != '' ||
-				this.deviceTypeVal != '' ||
-				this.alertLevelVal != '' ||
-				this.startTimeVa != '' ||
-				this.startTimeArea != '' ||
-				this.ordId != ''
-			) {
-				//联网加载数据
-				this.page.num += 1;
+		methods: {
+			moveHandle() {
+				return false;
+			},
+			inputChanged(e) {
+				this.resetData();
+				this.topBack();
+				this.searchAlarmText = e;
+				this.page.num = 1;
+				this.loadData(1, null, null, null, null, null, null, e);
+			},
+			getAlertStatus(e, i) {
+				this.current1 = i;
+				this.alertStatusVal = e.value;
+			},
+			getTypeStatus(e, i) {
+				this.current2 = i;
+				this.deviceTypeVal = e.value;
+			},
+			getLevelStatus(e, i) {
+				this.current3 = i;
+				this.alertLevelVal = e.value;
+			},
+			getTimeStatus(e, i) {
+				this.current4 = i;
+				this.selectTimeVal = e.value;
+				let curTime = new Date();
+				const formatS = curTime.getTime();
+				let addMinute = new Date(curTime.setMinutes(curTime.getMinutes() - this.selectTimeVal));
+				const formatE = addMinute.getTime();
+				this.timeData.getTimeGapS = formatS;
+				this.timeData.getTimeGapE = formatE;
+			},
+			queryData() {
+				this.topBack();
+				this.page.num = 1;
+				let date1 = new Date(this.timeData.selectTime[0]);
+				let date2 = new Date(this.timeData.selectTime[1]);
+				if (this.timeData.selectTime.length == 0) {
+					this.startTimeVa = '';
+					this.endTimeVa = '';
+				} else {
+					this.startTimeVa = date1.getTime();
+					this.endTimeVa = date2.getTime();
+				}
+				if (this.timeData.getTimeGapS == '') {
+					this.startTimeArea = '';
+					this.endTimeArea = '';
+				} else {
+					this.startTimeArea = this.timeData.getTimeGapE;
+					this.endTimeArea = this.timeData.getTimeGapS;
+				}
 				this.loadData(
-					this.page.num,
-					this.alertStatusVal ? this.alertStatusVal : this.type,
-					this.startTimeVa,
-					this.endTimeVa,
+					1,
+					this.alertStatusVal,
+					this.startTimeVa ? this.startTimeVa : this.startTimeArea,
+					this.endTimeVa ? this.endTimeVa : this.endTimeArea,
 					this.alertLevelVal,
-					this.deviceTypeVal,
-					this.ordId,
-					this.searchAlarmText
+					this.deviceTypeVal
 				);
-			} else {
+				this.show = false;
+			},
+			resetData() {
+				this.current1 = 0;
+				this.alertStatusVal = '';
+				this.current2 = 0;
+				this.deviceTypeVal = '';
+				this.current3 = 0;
+				this.alertLevelVal = '';
+				this.current4 = 0;
+				this.selectTimeVal = '';
+				this.timeData.selectTime = [];
+				this.timeDatagetTimeGapS = '';
+				this.timeDatagetTimeGapE = '';
+				this.range = [];
+				this.searchAlarmText = '';
+				this.startTimeVa = '';
+				this.endTimeVa = '';
+				this.startTimeArea = '';
+				this.endTimeArea = '';
+				this.ordId = '';
+				this.type = null;
+			},
+			bindImageUrl(e) {
+				switch (e) {
+					case 'CRITICAL':
+						return '../../static/danger.png';
+						break;
+					case 'MAJOR':
+						return '../../static/major.png';
+						break;
+					case 'MINOR':
+						return '../../static/secondary.png';
+						break;
+					case 'WARNING':
+						return '../../static/danger.png';
+						break;
+					case 'INDETERMINATE':
+						return '../../static/noshue.png';
+						break;
+					default:
+						return '';
+						break;
+				}
+			},
+			//筛选数据让它回到顶部
+			topBack() {
+				uni.pageScrollTo({
+					scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
+					duration: 10 // 滚动动画的时长
+				});
+			},
+			/*下拉刷新的回调 */
+			downCallback() {
 				//联网加载数据
-				this.page.num += 1;
-				this.loadData(this.page.num);
-			}
-		},
-		loadData(pageNo, statusV, startTimeV, endTimeV, severityV, deviceTypeV, organizationV, alarmName) {
-			let that = this;
-			let httpData = {
-				page: pageNo,
-				pageSize: 10,
-				status: statusV,
-				startTime: startTimeV,
-				endTime: endTimeV,
-				severity: severityV,
-				deviceType: deviceTypeV,
-				organizationId: organizationV,
-				alarmType: alarmName
-			};
-			if (statusV == '') {
-				delete httpData.status;
-			}
-			if (severityV == '') {
-				delete httpData.severity;
-			}
-			uni.$u.http
-				.get('/yt/alarm', { params: httpData, custom: { load: false } })
-				.then(res => {
+				this.list.length = 0;
+				this.page.num = 1;
+				this.loadData(this.page.num, null, null, null, null, null, null, null);
+				this.resetData();
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback() {
+				if (
+					this.type != null ||
+					this.alertStatusVal != '' ||
+					this.searchAlarmText != '' ||
+					this.deviceTypeVal != '' ||
+					this.alertLevelVal != '' ||
+					this.startTimeVa != '' ||
+					this.startTimeArea != '' ||
+					this.ordId != ''
+				) {
+					//联网加载数据
+					this.page.num += 1;
+					this.loadData(
+						this.page.num,
+						this.alertStatusVal ? this.alertStatusVal : this.type,
+						this.startTimeVa,
+						this.endTimeVa,
+						this.alertLevelVal,
+						this.deviceTypeVal,
+						this.ordId,
+						this.searchAlarmText
+					);
+				} else {
+					//联网加载数据
+					this.page.num += 1;
+					this.loadData(this.page.num);
+				}
+			},
+			async loadData(pageNo, statusV, startTimeV, endTimeV, severityV, deviceTypeV, organizationV, alarmName) {
+				let that = this;
+				let httpData = {
+					page: pageNo,
+					pageSize: 10,
+					status: statusV,
+					startTime: startTimeV,
+					endTime: endTimeV,
+					severity: severityV,
+					deviceType: deviceTypeV,
+					organizationId: organizationV,
+					alarmType: alarmName
+				};
+				if (statusV == '') {
+					delete httpData.status;
+				}
+				if (severityV == '') {
+					delete httpData.severity;
+				}
+				const res = await api.alarmApi.getAlarmApi({
+					params: httpData,
+					custom: {
+						load: false
+					}
+				})
+				if (res) {
 					uni.stopPullDownRefresh();
 					that.mescroll.endByPage(res.items.length, res.total); //必传参数(当前页的数据个数, 总页数)
 					that.alertTotal = res.total;
@@ -454,96 +457,103 @@ export default {
 					} else {
 						that.list = that.list.concat(res.items);
 					}
-				})
-				.catch(e => {
-					//联网失败, 结束加载
-					that.mescroll.endErr();
+				}
+			},
+			openOrg() {
+				uni.navigateTo({
+					url: './org/org'
 				});
-		},
-		openOrg() {
-			uni.navigateTo({
-				url: './org/org'
-			});
-		},
-		close() {
-			this.show = false;
-		},
-		openSearchDialog() {
-			this.show = true;
-			this.resetData();
-		},
-		//跳转告警详情
-		openAlertDetail(e) {
-			let obj = {
-				id: e.id,
-				deviceName: e.deviceName,
-				severity: e.severity,
-				organizationName: e.organizationName,
-				details: e.details,
-				createdTime: e.createdTime,
-				status: e.status
-			};
-			uni.navigateTo({
-				url: '/alarmSubPage/alarmDetailPage/alarmDetail?data=' + JSON.stringify(obj)
-			});
-		},
-		formatDetailText(e) {
-			//去除字符串双引号
-			const jsonStr = JSON.stringify(e);
-			const str = jsonStr.substring(1, jsonStr.length - 1);
-			const newStr = str.replace(/\"/g, '');
-			return newStr;
+			},
+			close() {
+				this.show = false;
+			},
+			openSearchDialog() {
+				this.show = true;
+				this.resetData();
+			},
+			//跳转告警详情
+			openAlertDetail(e) {
+				let obj = {
+					id: e.id,
+					deviceName: e.deviceName,
+					severity: e.severity,
+					organizationName: e.organizationName,
+					details: e.details,
+					createdTime: e.createdTime,
+					status: e.status
+				};
+				uni.navigateTo({
+					url: '/alarmSubPage/alarmDetailPage/alarmDetail?data=' + JSON.stringify(obj)
+				});
+			},
+			formatDetailText(e) {
+				//去除字符串双引号
+				const jsonStr = JSON.stringify(e);
+				const str = jsonStr.substring(1, jsonStr.length - 1);
+				const newStr = str.replace(/\"/g, '');
+				return newStr;
+			}
 		}
-	}
-};
+	};
 </script>
 
 <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;
-}
-/deep/ .uni-calendar--fixed {
-	bottom: 172rpx !important;
-}
-.pop-no-scroll {
-	overflow: hidden;
-	position: fixed;
-	height: 100%;
-	width: 100%;
-}
-.device-top {
-	padding: 10rpx 30rpx;
-	background-color: #fff;
-	.search {
-		display: flex;
-		justify-content: space-between;
-		padding-bottom: 10rpx;
-		.search-left {
-			width: 580rpx;
-			background-color: #f8f9fa;
-			border-radius: 200rpx;
-		}
-		.search-right {
+	@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;
+	}
+
+	/deep/ .uni-calendar--fixed {
+		bottom: 172rpx !important;
+	}
+
+	.pop-no-scroll {
+		overflow: hidden;
+		position: fixed;
+		height: 100%;
+		width: 100%;
+	}
+
+	.device-top {
+		padding: 10rpx 30rpx;
+		background-color: #fff;
+
+		.search {
 			display: flex;
-			align-items: center;
-			text {
-				color: #333;
-				font-size: 14px;
+			justify-content: space-between;
+			padding-bottom: 10rpx;
+
+			.search-left {
+				width: 580rpx;
+				background-color: #f8f9fa;
+				border-radius: 200rpx;
 			}
-			image {
-				width: 40rpx;
-				height: 40rpx;
+
+			.search-right {
+				display: flex;
+				align-items: center;
+
+				text {
+					color: #333;
+					font-size: 14px;
+				}
+
+				image {
+					width: 40rpx;
+					height: 40rpx;
+				}
 			}
 		}
 	}
-}
 </style>

@@ -4,7 +4,10 @@
 			<view class="device-top">
 				<view class="search">
 					<view>
-						<view class="search-left"><u--input prefixIcon="search" placeholder="输入设备SN或名称搜索" shape="circle" @change="inputChanged"></u--input></view>
+						<view class="search-left">
+							<u--input prefixIcon="search" placeholder="输入设备SN或名称搜索" shape="circle"
+								@change="inputChanged"></u--input>
+						</view>
 					</view>
 					<view @click="openSearchDialog" class="search-right">
 						<text>筛选</text>
@@ -25,22 +28,22 @@
 				</view>
 			</view>
 		</u-sticky>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :up="upOption" :down="downOption" @down="downCallback" @up="upCallback">
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :up="upOption" :down="downOption" @down="downCallback"
+			@up="upCallback">
 			<view class="device-list">
-				<view @click="openDeviceDetail(item.id, item.alarmStatus, item.lastOnlineTime, item.tbDeviceId)" class="list-item" v-for="item in list" :key="item.id">
-					<view
-						class="u-flex item"
-						style="
+				<view @click="openDeviceDetail(item.id, item.alarmStatus, item.lastOnlineTime, item.tbDeviceId)"
+					class="list-item" v-for="item in list" :key="item.id">
+					<view class="u-flex item" style="
 			          justify-content: flex-start;
 			          flex-direction: column;
 			          align-items: center;
-			        "
-					>
+			        ">
 						<view style="width: 450rpx; text-align: left">
 							<view class="text-clip" style="width:450rpx">
-								<text class="" style="color: #333; font-size: 15px;font-weight: bold;">{{ item.alias ? item.alias : item.name }}</text>
+								<text class=""
+									style="color: #333; font-size: 15px;font-weight: bold;">{{ item.alias ? item.alias : item.name }}</text>
 							</view>
-							
+
 						</view>
 						<view style="width: 450rpx; text-align: left; margin-top: 10rpx">
 							<view style="color: #666; font-size: 14px;display: flex;">
@@ -57,32 +60,26 @@
 					</view>
 					<view class="item">
 						<view class="u-flex" style="margin-top: -6rpx">
-							<image
-								style="
+							<image style="
 			              width: 30rpx;
 			              height: 30rpx;
 			              margin-top: 5rpx;
 			              margin-right: 5rpx;
-			            "
-								:src="
+			            " :src="
 									item.deviceState === 'ONLINE'
 										? '../../static/online.png'
 										: item.deviceState === 'INACTIVE'
 										? '../../static/unonline.png'
 										: '../../static/baojing.png'
-								"
-							/>
+								" />
 
 							<view>
-								<text
-									style="
+								<text style="
 			                color: #377dff;
 			                font-size: 13px;
 			                margin-left: 5rpx;
 			                margin-top: 20rpx;
-			              "
-									:style="{ color: item.deviceState === 'ONLINE' ? '#377DFF' : item.deviceState === 'INACTIVE' ? '#666666' : '#DE4437' }"
-								>
+			              " :style="{ color: item.deviceState === 'ONLINE' ? '#377DFF' : item.deviceState === 'INACTIVE' ? '#666666' : '#DE4437' }">
 									{{ item.deviceState === 'ONLINE' ? '在线' : item.deviceState === 'INACTIVE' ? '待激活' : '离线' }}
 								</text>
 							</view>
@@ -92,15 +89,24 @@
 			</view>
 		</mescroll-body>
 		<!-- 设备筛选 -->
-		<u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20" @touchmove.stop.prevent="disabledScroll">
+		<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="deviceStatus" title="设备状态" @clickTag="currentIndex => handleClickTag(currentIndex, deviceStatus)"></FilterItem>
-				<FilterItem :filterList="alarmStatus" title="告警状态" @clickTag="currentIndex => handleClickTag(currentIndex, alarmStatus)"></FilterItem>
-				<FilterItem :filterList="typeStatus" title="设备类型" @clickTag="currentIndex => handleClickTag(currentIndex, typeStatus)"></FilterItem>
+				<FilterItem :filterList="deviceStatus" title="设备状态"
+					@clickTag="currentIndex => handleClickTag(currentIndex, deviceStatus)"></FilterItem>
+				<FilterItem :filterList="alarmStatus" title="告警状态"
+					@clickTag="currentIndex => handleClickTag(currentIndex, alarmStatus)"></FilterItem>
+				<FilterItem :filterList="typeStatus" title="设备类型"
+					@clickTag="currentIndex => handleClickTag(currentIndex, typeStatus)"></FilterItem>
 				<view class="button-group">
-					<view><u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" text="重置" @click="resetFilter"></u-button></view>
-					<view><u-button color="#3388ff" shape="circle" text="确认" @click="confirmFilter"></u-button></view>
+					<view>
+						<u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" text="重置"
+							@click="resetFilter"></u-button>
+					</view>
+					<view>
+						<u-button color="#3388ff" shape="circle" text="确认" @click="confirmFilter"></u-button>
+					</view>
 				</view>
 			</view>
 		</u-popup>
@@ -109,306 +115,319 @@
 </template>
 
 <script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
-import FilterItem from './FilterItem.vue';
-import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
-import { debounce } from '@/plugins/throttle.js';
-export default {
-	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
-	components: {
-		fTabbar,
-		FilterItem
-	},
-	data() {
-		return {
-			downOption: {
-				auto: false //是否在初始化后,自动执行downCallback; 默认true
-			},
-			upOption: {
-				isBounce: false,
-				auto: false // 不自动加载
-			},
-			show: false,
-			deviceStatus: [
-				{
-					checked: true,
-					name: '全部',
-					type: ''
-				},
-				{
-					checked: false,
-					name: '在线',
-					type: 'ONLINE'
-				},
-				{
-					checked: false,
-					name: '离线',
-					type: 'OFFLINE'
-				},
-				{
-					checked: false,
-					name: '待激活',
-					type: 'INACTIVE'
-				}
-			],
-			alarmStatus: [
-				{
-					checked: true,
-					name: '全部',
-					type: ''
-				},
-				{
-					checked: false,
-					name: '告警',
-					type: '1'
+	import fTabbar from '@/components/module/f-tabbar/f-tabbar';
+	import FilterItem from './FilterItem.vue';
+	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
+	import {
+		debounce
+	} from '@/plugins/throttle.js';
+	import api from '@/api/index.js'
+
+	export default {
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		components: {
+			fTabbar,
+			FilterItem
+		},
+		data() {
+			return {
+				downOption: {
+					auto: false //是否在初始化后,自动执行downCallback; 默认true
 				},
-				{
-					checked: false,
-					name: '正常',
-					type: '0'
-				}
-			],
-			typeStatus: [
-				{
-					checked: true,
-					name: '全部',
-					type: ''
+				upOption: {
+					isBounce: false,
+					auto: false // 不自动加载
 				},
+				show: false,
+				deviceStatus: [{
+						checked: true,
+						name: '全部',
+						type: ''
+					},
+					{
+						checked: false,
+						name: '在线',
+						type: 'ONLINE'
+					},
+					{
+						checked: false,
+						name: '离线',
+						type: 'OFFLINE'
+					},
+					{
+						checked: false,
+						name: '待激活',
+						type: 'INACTIVE'
+					}
+				],
+				alarmStatus: [{
+						checked: true,
+						name: '全部',
+						type: ''
+					},
+					{
+						checked: false,
+						name: '告警',
+						type: '1'
+					},
+					{
+						checked: false,
+						name: '正常',
+						type: '0'
+					}
+				],
+				typeStatus: [{
+						checked: true,
+						name: '全部',
+						type: ''
+					},
 
-				{
-					checked: false,
-					name: '直连设备',
-					type: 'DIRECT_CONNECTION'
-				},
-				{
-					checked: false,
-					name: '网关设备',
-					type: 'GATEWAY'
+					{
+						checked: false,
+						name: '直连设备',
+						type: 'DIRECT_CONNECTION'
+					},
+					{
+						checked: false,
+						name: '网关设备',
+						type: 'GATEWAY'
+					},
+					{
+						checked: false,
+						name: '网关子设备',
+						type: 'SENSOR'
+					}
+				],
+				total: 0,
+				list: [],
+				page: {
+					num: 0,
+					size: 10
 				},
-				{
-					checked: false,
-					name: '网关子设备',
-					type: 'SENSOR'
-				}
-			],
-			total: 0,
-			list: [],
-			page: {
-				num: 0,
-				size: 10
-			},
-			deviceState: '',
-			deviceName: ''
-		};
-	},
-	async onLoad(options) {
-		// 隐藏原生的tabbar
-		uni.hideTabBar();
-		this.page.num = 1;
-		const { deviceState } = options;
-		this.deviceState = deviceState;
-		if (deviceState) {
-			this.deviceStatus.forEach(item => {
-				item.type === deviceState ? (item.checked = true) : (item.checked = false);
-			});
-			await this.loadData(1, {
-				deviceState
-			});
-		} else {
-			await this.loadData(1);
-		}
-		if (!this.list.length) {
-			this.mescroll.showEmpty();
-		}
-	},
-	onShow() {
-		if (this.orgId) {
-			this.loadData(1, {
-				organizationId: this.orgId
-			});
-		}
-	},
-	methods: {
-		disabledScroll() {
-			return;
+				deviceState: '',
+				deviceName: ''
+			};
 		},
-		/*下拉刷新的回调 */
-		downCallback() {
-			this.deviceName = '';
-			this.orgId = '';
-			//联网加载数据
-			this.list = [];
+		async onLoad(options) {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
 			this.page.num = 1;
-			//联网加载数据
-			this.resetFilter();
-			this.loadData(this.page.num);
+			const {
+				deviceState
+			} = options;
+			this.deviceState = deviceState;
+			if (deviceState) {
+				this.deviceStatus.forEach(item => {
+					item.type === deviceState ? (item.checked = true) : (item.checked = false);
+				});
+				await this.loadData(1, {
+					deviceState
+				});
+			} else {
+				await this.loadData(1);
+			}
+			if (!this.list.length) {
+				this.mescroll.showEmpty();
+			}
 		},
-
-		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-		upCallback() {
-			//联网加载数据
-			this.page.num += 1;
-			const deviceState = this.deviceStatus.find(item => item.checked);
-			const alarmStatus = this.alarmStatus.find(item => item.checked);
-			const deviceType = this.typeStatus.find(item => item.checked);
-			this.loadData(this.page.num, {
-				deviceState: deviceState.type ? deviceState.type : undefined,
-				deviceType: deviceType.type ? deviceType.type : undefined,
-				alarmStatus: alarmStatus.type === '0' || alarmStatus.type === '1' ? alarmStatus.type : undefined,
-				name: this.deviceName == null ? null : this.deviceName,
-				organizationId: this.orgId == null ? null : this.orgId
-			});
+		onShow() {
+			if (this.orgId) {
+				this.loadData(1, {
+					organizationId: this.orgId
+				});
+			}
 		},
+		methods: {
+			disabledScroll() {
+				return;
+			},
+			/*下拉刷新的回调 */
+			downCallback() {
+				this.deviceName = '';
+				this.orgId = '';
+				//联网加载数据
+				this.list = [];
+				this.page.num = 1;
+				//联网加载数据
+				this.resetFilter();
+				this.loadData(this.page.num);
+			},
 
-		//获取设备
-		async loadData(pageNo, params = {}) {
-			try {
-				let httpData = {
-					page: pageNo,
-					pageSize: 10,
-					...params
-				};
-				const { total, items } = await uni.$u.http.get('/yt/device', {
-					params: httpData,
-					custom: {
-						load: false
-					}
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback() {
+				//联网加载数据
+				this.page.num += 1;
+				const deviceState = this.deviceStatus.find(item => item.checked);
+				const alarmStatus = this.alarmStatus.find(item => item.checked);
+				const deviceType = this.typeStatus.find(item => item.checked);
+				this.loadData(this.page.num, {
+					deviceState: deviceState.type ? deviceState.type : undefined,
+					deviceType: deviceType.type ? deviceType.type : undefined,
+					alarmStatus: alarmStatus.type === '0' || alarmStatus.type === '1' ? alarmStatus.type :
+						undefined,
+					name: this.deviceName == null ? null : this.deviceName,
+					organizationId: this.orgId == null ? null : this.orgId
 				});
-				this.total = total;
-				uni.stopPullDownRefresh();
-				this.mescroll.endByPage(items.length, total); //必传参数(当前页的数据个数, 总页数)
-				if (pageNo == 1) {
-					this.list = items;
-				} else {
-					this.list = this.list.concat(items);
+			},
+
+			//获取设备
+			async loadData(pageNo, params = {}) {
+				try {
+					let httpData = {
+						page: pageNo,
+						pageSize: 10,
+						...params
+					};
+					const {
+						total,
+						items
+					} = await api.deviceApi.getDeviceApi({
+						params: httpData,
+						custom: {
+							load: false
+						}
+					})
+					this.total = total;
+					uni.stopPullDownRefresh();
+					this.mescroll.endByPage(items.length, total); //必传参数(当前页的数据个数, 总页数)
+					if (pageNo == 1) {
+						this.list = items;
+					} else {
+						this.list = this.list.concat(items);
+					}
+				} catch {
+					this.mescroll.endErr();
 				}
-			} catch {
-				this.mescroll.endErr();
+			},
+			openOrg() {
+				uni.navigateTo({
+					url: './org/org'
+				});
+			},
+			close() {
+				this.show = false;
+			},
+			openSearchDialog() {
+				this.show = true;
+			},
+			openDeviceDetail(id, alarmStatus, lastOnlineTime, tbDeviceId) {
+				uni.navigateTo({
+					url: `/deviceSubPage/deviceDetailPage/deviceDetail?id=${id}&alarmStatus=${alarmStatus}&lastOnlineTime=${lastOnlineTime}&tbDeviceId=${tbDeviceId}`
+				});
+			},
+			handleClickTag(currentIndex, list) {
+				list.map((item, index) => {
+					item.checked = index === currentIndex;
+				});
+			},
+			resetFilter() {
+				const {
+					deviceStatus,
+					alarmStatus,
+					typeStatus
+				} = this;
+				[deviceStatus, alarmStatus, typeStatus].forEach(item => item.map((item, index) => (item.checked = index ===
+					0)));
+			},
+			confirmFilter() {
+				const deviceState = this.deviceStatus.find(item => item.checked);
+				const alarmStatus = this.alarmStatus.find(item => item.checked);
+				const deviceType = this.typeStatus.find(item => item.checked);
+				this.loadData(1, {
+					deviceState: deviceState.type ? deviceState.type : undefined,
+					deviceType: deviceType.type ? deviceType.type : undefined,
+					alarmStatus: alarmStatus.type === '0' || alarmStatus.type === '1' ? alarmStatus.type :
+						undefined
+				});
+				this.show = false;
+			},
+			inputChanged(e) {
+				this.page.num = 1;
+				this.deviceName = e;
+				this.loadData(1, {
+					name: this.deviceName
+				});
 			}
-		},
-		openOrg() {
-			uni.navigateTo({
-				url: './org/org'
-			});
-		},
-		close() {
-			this.show = false;
-		},
-		openSearchDialog() {
-			this.show = true;
-		},
-		openDeviceDetail(id, alarmStatus, lastOnlineTime, tbDeviceId) {
-			uni.navigateTo({
-				url: `/deviceSubPage/deviceDetailPage/deviceDetail?id=${id}&alarmStatus=${alarmStatus}&lastOnlineTime=${lastOnlineTime}&tbDeviceId=${tbDeviceId}`
-			});
-		},
-		handleClickTag(currentIndex, list) {
-			list.map((item, index) => {
-				item.checked = index === currentIndex;
-			});
-		},
-		resetFilter() {
-			const { deviceStatus, alarmStatus, typeStatus } = this;
-			[deviceStatus, alarmStatus, typeStatus].forEach(item => item.map((item, index) => (item.checked = index === 0)));
-		},
-		confirmFilter() {
-			const deviceState = this.deviceStatus.find(item => item.checked);
-			const alarmStatus = this.alarmStatus.find(item => item.checked);
-			const deviceType = this.typeStatus.find(item => item.checked);
-			this.loadData(1, {
-				deviceState: deviceState.type ? deviceState.type : undefined,
-				deviceType: deviceType.type ? deviceType.type : undefined,
-				alarmStatus: alarmStatus.type === '0' || alarmStatus.type === '1' ? alarmStatus.type : undefined
-			});
-			this.show = false;
-		},
-		inputChanged(e) {
-			this.page.num = 1;
-			this.deviceName = e;
-			this.loadData(1, {
-				name: this.deviceName
-			});
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.device-page {
-	min-height: 100vh;
-	background-color: #f8f9fa;
-}
-
-.device-top {
-	padding: 10rpx 30rpx;
-	background-color: #fff;
-
-	.search {
-		display: flex;
-		justify-content: space-between;
-		padding-bottom: 10rpx;
+	.device-page {
+		min-height: 100vh;
+		background-color: #f8f9fa;
+	}
 
-		.search-left {
-			width: 580rpx;
-			background-color: #f8f9fa;
-			border-radius: 200rpx;
-		}
+	.device-top {
+		padding: 10rpx 30rpx;
+		background-color: #fff;
 
-		.search-right {
+		.search {
 			display: flex;
-			align-items: center;
+			justify-content: space-between;
+			padding-bottom: 10rpx;
 
-			text {
-				color: #333;
-				font-size: 14px;
+			.search-left {
+				width: 580rpx;
+				background-color: #f8f9fa;
+				border-radius: 200rpx;
 			}
 
-			image {
-				width: 40rpx;
-				height: 40rpx;
+			.search-right {
+				display: flex;
+				align-items: center;
+
+				text {
+					color: #333;
+					font-size: 14px;
+				}
+
+				image {
+					width: 40rpx;
+					height: 40rpx;
+				}
 			}
 		}
 	}
-}
 
-.device-list {
-	display: flex;
-	flex-direction: column;
-	padding-left: 20rpx;
-
-	.list-item {
-		width: 713rpx;
-		height: 200rpx;
-		background-color: #fff;
-		margin-top: 24rpx;
+	.device-list {
 		display: flex;
-		border-radius: 10px;
-		justify-content: space-between;
+		flex-direction: column;
+		padding-left: 20rpx;
 
-		.item {
-			margin: 30rpx;
+		.list-item {
+			width: 713rpx;
+			height: 200rpx;
+			background-color: #fff;
+			margin-top: 24rpx;
+			display: flex;
+			border-radius: 10px;
+			justify-content: space-between;
+
+			.item {
+				margin: 30rpx;
+			}
 		}
 	}
-}
 
-.filter {
-	padding: 0 30rpx;
+	.filter {
+		padding: 0 30rpx;
 
-	.filter-title {
-		text-align: center;
-		margin-top: 14px;
-		font-size: 16px;
-		font-weight: 700;
-	}
+		.filter-title {
+			text-align: center;
+			margin-top: 14px;
+			font-size: 16px;
+			font-weight: 700;
+		}
 
-	.button-group {
-		display: flex;
-		margin-top: 40rpx;
-		justify-content: space-between;
+		.button-group {
+			display: flex;
+			margin-top: 40rpx;
+			justify-content: space-between;
 
-		view {
-			width: 330rpx;
+			view {
+				width: 330rpx;
+			}
 		}
 	}
-}
 </style>

@@ -10,7 +10,7 @@
 					<text class="device-text">摄像头数：{{ cameraTotal }}</text>
 				</view>
 			</view>
-			<view @click="openOrg" class="org-item" >
+			<view @click="openOrg" class="org-item">
 				<image class="image" src="../../../static/arrow-right.png"></image>
 			</view>
 		</view>
@@ -25,12 +25,12 @@
 							:id="'video' + item.id" class="video" :src="item.videoUrl || commonVideoUrl" controls
 							:title="item.name" x5-video-player-type="h5" x5-video-orientation="portraint" show-mute-btn
 							:poster="item.avatar" @play="playVideo"></video>
-						<view class="bottom-text">
+						<view style="width:300rpx" class="bottom-text text-clip">
 							<text class="text">{{ item.name }}</text>
 						</view>
 					</view>
 				</view>
-			</view>
+			</view>
 			<mescroll-empty v-if="!list.length" />
 		</mescroll-body>
 		<!-- 自带分页组件 -->
@@ -40,6 +40,7 @@
 
 <script>
 	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
+	import api from '@/api/index.js'
 
 	export default {
 		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
@@ -88,38 +89,33 @@
 				this.page.num += 1;
 				this.loadData(this.page.num);
 			},
-			loadData(pageNo, organizationV) {
+			async loadData(pageNo, organizationV) {
 				let httpData = {
 					page: pageNo,
 					pageSize: 10,
 					organizationId: organizationV
 				};
-				uni.$u.http
-					.get('/yt/video', {
-						params: httpData,
-						custom: {
-							load: false
-						}
-					})
-					.then(res => {
-						uni.stopPullDownRefresh();
-						this.mescroll.endByPage(res.items.length, res.total);
-						this.cameraTotal = res.total;
-						if (pageNo == 1) {
-							this.list = res.items;
-						} else {
-							this.list = this.list.concat(res.items);
-						}
-					})
-					.catch(e => {
-						//联网失败, 结束加载
-						this.mescroll.endErr();
-					});
+				const res = await api.homeApi.getCameraApi({
+					params: httpData,
+					custom: {
+						load: false
+					}
+				})
+				if (res) {
+					uni.stopPullDownRefresh();
+					this.mescroll.endByPage(res.items.length, res.total);
+					this.cameraTotal = res.total;
+					if (pageNo == 1) {
+						this.list = res.items;
+					} else {
+						this.list = this.list.concat(res.items);
+					}
+				}
 			},
 			hideImageUrl(item, index) {
 				this.current = index;
 			},
-			playVideo(e) {
+			async playVideo(e) {
 				const {
 					currentTarget: {
 						dataset: {
@@ -130,28 +126,27 @@
 				} = e
 				const isExistVideoUrl = this.list.find(item => item.id == id).videoUrl
 				if (accessmode === 1 && !isExistVideoUrl) {
-					uni.$u.http.get(`/yt/video/url/${id}`)
-						.then(res => {
-							const {
-								data: {
-									url
-								} = {}
-							} = res
-							const index = this.list.findIndex(item => item.id === id)
-							if (~index && url) {
-								this.list.splice(index, 1, {
-									...this.list[index],
-									videoUrl: url
-								})
-								this.$nextTick(() => {
-									let currentId = 'video' + id;
-									const videoContext = uni.createVideoContext(currentId, this);
-									videoContext.play()
-								})
-							}
-						})
+					const res = api.homeApi.byCameraIdGetDetailApi(id)
+					if (res) {
+						const {
+							data: {
+								url
+							} = {}
+						} = res
+						const index = this.list.findIndex(item => item.id === id)
+						if (~index && url) {
+							this.list.splice(index, 1, {
+								...this.list[index],
+								videoUrl: url
+							})
+							this.$nextTick(() => {
+								let currentId = 'video' + id;
+								const videoContext = uni.createVideoContext(currentId, this);
+								videoContext.play()
+							})
+						}
+					}
 				}
-
 				/**
 				 * 点击全屏播放当前视频，暂停其余视频
 				 * 兼容APP和MP端

@@ -3,14 +3,18 @@
 		<view style="margin-left:15rpx;background-color: #f8f9fa;position:fixed;top:0rpx;z-index: 99999;">
 			<view style="height:35rpx;background-color: #f8f9fa;"></view>
 			<view class="u-flex search-top">
-				<view class="search-main"><u--input @change="inputChanged" prefixIcon="search" placeholder="请输入组态名称" border="surround" shape="circle"></u--input></view>
+				<view class="search-main">
+					<u--input @change="inputChanged" prefixIcon="search" placeholder="请输入组态名称" border="surround"
+						shape="circle"></u--input>
+				</view>
 			</view>
 		</view>
 		<view style="height:35rpx"></view>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<!-- 自带分页组件 -->
-		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
+		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
+			@up="upCallback">
 			<view class="configuation-container">
 				<view class="configuation-item">
 					<view @click="openConfigDetail(item.id)" v-for="(item, index) in list" :key="index" class="item">
@@ -27,71 +31,76 @@
 </template>
 
 <script>
-import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
+	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
+	import api from '@/api/index.js'
 
-export default {
-	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
-	data() {
-		return {
-			defaultConfigImage: '../../../static/test.png',
-			page: {
-				num: 0,
-				size: 10
-			},
-			downOption: {
-				auto: true //是否在初始化后,自动执行downCallback; 默认true
-			},
-			upOption: {
-				auto: false // 不自动加载
-			},
-			list: []
-		};
-	},
-	onLoad() {
-		// 隐藏原生的tabbar
-		uni.hideTabBar();
-		uni.setStorageSync('getConfiguration', {
-			isConfiguration: false
-		});
-	},
-	onUnload() {
-		uni.setStorageSync('getConfiguration', {
-			isConfiguration: false
-		});
-		uni.removeStorageSync('getConfiguration');
-	},
-	methods: {
-		inputChanged(e) {
-			this.page.num = 1;
-			this.loadData(1, e);
+	export default {
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		data() {
+			return {
+				defaultConfigImage: '../../../static/test.png',
+				page: {
+					num: 0,
+					size: 10
+				},
+				downOption: {
+					auto: true //是否在初始化后,自动执行downCallback; 默认true
+				},
+				upOption: {
+					auto: false // 不自动加载
+				},
+				list: []
+			};
 		},
-		openConfigDetail(e) {
-			uni.navigateTo({
-				url: 'configurationDetail?configId=' + e
+		onLoad() {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: false
 			});
 		},
-		/*下拉刷新的回调 */
-		downCallback() {
-			//联网加载数据
-			this.page.num = 1;
-			this.loadData(1);
-		},
-		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-		upCallback() {
-			//联网加载数据
-			this.page.num += 1;
-			this.loadData(this.page.num);
+		onUnload() {
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: false
+			});
+			uni.removeStorageSync('getConfiguration');
 		},
-		loadData(pageNo, organizationV) {
-			let httpData = {
-				page: pageNo,
-				pageSize: 10,
-				name: organizationV,
-				platform: 'phone'
-			};
-			uni.$u.http
-				.get('/yt/configuration/center', { params: httpData, custom: { load: false } })
-				.then(res => {
+		methods: {
+			inputChanged(e) {
+				this.page.num = 1;
+				this.loadData(1, e);
+			},
+			openConfigDetail(e) {
+				uni.navigateTo({
+					url: 'configurationDetail?configId=' + e
+				});
+			},
+			/*下拉刷新的回调 */
+			downCallback() {
+				//联网加载数据
+				this.page.num = 1;
+				this.loadData(1);
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback() {
+				//联网加载数据
+				this.page.num += 1;
+				this.loadData(this.page.num);
+			},
+			async loadData(pageNo, organizationV) {
+				let httpData = {
+					page: pageNo,
+					pageSize: 10,
+					name: organizationV,
+					platform: 'phone'
+				};
+				const res = await api.homeApi.getConfigurationApi({
+					params: httpData,
+					custom: {
+						load: false
+					}
+				})
+				if (res) {
 					uni.stopPullDownRefresh();
 					this.mescroll.endByPage(res.items.length, res.total);
 					this.cameraTotal = res.total;
@@ -100,16 +109,12 @@ export default {
 					} else {
 						this.list = this.list.concat(res.items);
 					}
-				})
-				.catch(e => {
-					//联网失败, 结束加载
-					this.mescroll.endErr();
-				});
+				}
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-@import '../static/configuration.scss';
+	@import '../static/configuration.scss';
 </style>

-<template>
-	<view class="content">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<web-view :src="showConfiguration" bindload="bindload" binderror="binderror"></web-view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			showConfiguration: '',
-			defauleConfigImage: 'https://dev.thingskit.com',
-			params: ''
-		};
-	},
-	onLoad(e) {
-		uni.setStorageSync('getConfiguration', {
-			isConfiguration: true
-		});
-		if (e.configId !== null) {
-			this.params = e.configId;
-			this.requestUrl(this.params);
-		}
-		// 隐藏原生的tabbar
-		uni.hideTabBar();
-	},
-	onShow() {
-		uni.setStorageSync('getConfiguration', {
-			isConfiguration: true
-		});
-	},
-	onUnload() {
-		uni.setStorageSync('getConfiguration', {
-			isConfiguration: false
-		});
-		uni.removeStorageSync('config');
-	},
-	methods: {
-		// 网页加载成功时候触发此事件
-		bindload(res) {
-			console.log(res, res.detail);
-		},
-		// 网页加载失败的时候触发此事件
-		binderror(err) {
-			console.log(err, err.detail);
-		},
-		async requestUrl(e) {
-			const httpData = {
-				configurationId: e,
-				lightbox: 1
-			};
-			const getUrl = await uni.$u.http.get('/', { params: httpData, custom: { load: false } });
-			const pathUrl = uni.getStorageSync('config');
-			const userInfo = uni.getStorageSync('userInfo') 
-			this.showConfiguration = `${pathUrl.baseURL}/?configurationId=${e}&userId=${userInfo.userId}&lightbox=1`
-			// this.showConfiguration = pathUrl.baseURL + '/' + '?' + 'configurationId=' + e + '&' + 'lightbox=' + 1;
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.content {
-	background: #f8f9fa;
-	min-height: 100vh;
-}
+<template>
+	<view class="content">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<web-view :src="showConfiguration" bindload="bindload" binderror="binderror"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				showConfiguration: '',
+				defauleConfigImage: 'https://dev.thingskit.com',
+				params: ''
+			};
+		},
+		onLoad(e) {
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: true
+			});
+			if (e.configId !== null) {
+				this.params = e.configId;
+				this.requestUrl(this.params);
+			}
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+		},
+		onShow() {
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: true
+			});
+		},
+		onUnload() {
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: false
+			});
+			uni.removeStorageSync('config');
+		},
+		methods: {
+			// 网页加载成功时候触发此事件
+			bindload(res) {
+				console.log(res, res.detail);
+			},
+			// 网页加载失败的时候触发此事件
+			binderror(err) {
+				console.log(err, err.detail);
+			},
+			async requestUrl(e) {
+				const httpData = {
+					configurationId: e,
+					lightbox: 1
+				};
+				const getUrl = await uni.$u.http.get('/', {
+					params: httpData,
+					custom: {
+						load: false
+					}
+				});
+				const pathUrl = uni.getStorageSync('config');
+				const userInfo = uni.getStorageSync('userInfo')
+				this.showConfiguration =
+					`${pathUrl.baseURL}/?configurationId=${e}&userId=${userInfo.userId}&lightbox=1`
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		background: #f8f9fa;
+		min-height: 100vh;
+	}
 </style>

@@ -105,6 +105,7 @@
 	import {
 		mapActions
 	} from 'vuex';
+	import api from '@/api/index.js'
 
 	export default {
 		components: {
@@ -135,19 +136,18 @@
 		},
 		methods: {
 			...mapActions(['updateBadgeTotal']),
-			getDeviceTotalData() {
-				uni.$u.http.get('/yt/homepage/app?login=false').then(res => {
-					if (res) {
-						this.deviceData.onLine = res.totalDevice?.onLine;
-						this.deviceData.unLine = res.totalDevice?.offLine;
-						this.deviceData.noActive = res.totalDevice?.inActive;
-						this.alertData.noHandle = res.totalAlarm?.activedAlarm;
-						this.alertData.doneHandle = res.totalAlarm?.clearedAck;
-						this.alertData.errorReport = res.totalAlarm?.clearedUnack;
-						//异步实时更新告警徽标数
-						this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
-					}
-				});
+			async getDeviceTotalData() {
+				const res = await api.homeApi.getHomeStatisticsApi()
+				if (res) {
+					this.deviceData.onLine = res.totalDevice?.onLine;
+					this.deviceData.unLine = res.totalDevice?.offLine;
+					this.deviceData.noActive = res.totalDevice?.inActive;
+					this.alertData.noHandle = res.totalAlarm?.activedAlarm;
+					this.alertData.doneHandle = res.totalAlarm?.clearedAck;
+					this.alertData.errorReport = res.totalAlarm?.clearedUnack;
+					//异步实时更新告警徽标数
+					this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
+				}
 			},
 			showToastWip() {
 				uni.$u.toast('拼命开发中 ...');

@@ -8,65 +8,69 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
-export default {
-	data() {
-		return {
-			staticLogo: '../../static/logo.png',
-			mpOwnConfig: {}
-		};
-	},
-	onLoad() {
-		this.getPlateForm();
-		if (!this.userInfo.isToken) {
-			setTimeout(() => {
-				uni.reLaunch({
-					url: '/publicLoginSubPage/public/login'
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				staticLogo: '../../static/logo.png',
+				mpOwnConfig: {}
+			};
+		},
+		onLoad() {
+			this.getPlateForm();
+			if (!this.userInfo.isToken) {
+				setTimeout(() => {
+					uni.reLaunch({
+						url: '/publicLoginSubPage/public/login'
+					});
+				}, 2500);
+			} else {
+				setTimeout(() => {
+					uni.reLaunch({
+						url: '/pages/index/index'
+					});
+				}, 2500);
+			}
+		},
+		computed: {
+			...mapState(['userInfo'])
+		},
+		methods: {
+			getPlateForm() {
+				uni.$u.http.get('/yt/app_design/get').then(res => {
+					if (res) {
+						this.mpOwnConfig = {
+							bg: res.background,
+							logo: res.logo,
+							name: res.name
+						};
+					}
 				});
-			}, 2500);
-		} else {
-			setTimeout(() => {
-				uni.reLaunch({
-					url: '/pages/index/index'
-				});
-			}, 2500);
-		}
-	},
-	computed: {
-		...mapState(['userInfo'])
-	},
-	methods: {
-		getPlateForm() {
-			uni.$u.http.get('/yt/app_design/get').then(res => {
-				if (res) {
-					this.mpOwnConfig = {
-						bg: res.background,
-						logo: res.logo,
-						name: res.name
-					};
-				}
-			});
+			}
 		}
-	}
-};
+	};
 </script>
 
-<style lang="less">
-.container {
-	width: 100%;
-	height: 100%;
-	margin-top: 300rpx;
-	.container-box {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		flex-direction: column;
-		image {
-			width: 100rpx;
-			height: 100rpx;
-		}
-		text {
+<style lang="scss">
+	.container {
+		width: 100%;
+		height: 100%;
+		margin-top: 300rpx;
+
+		.container-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			flex-direction: column;
+
+			image {
+				width: 100rpx;
+				height: 100rpx;
+			}
+
+			text {}
 		}
 	}
-}
 </style>

@@ -51,6 +51,8 @@
 </template>
 
 <script>
+	import api from '@/api/index.js'
+
 	var clear;
 	export default {
 		data() {
@@ -109,8 +111,7 @@
 				}
 				let httpData = {};
 				// 获取验证码接口
-				uni.$u.http
-					.post(`/yt/noauth/reset_code/${this.phone}`)
+				api.loginApi.postCodeApi(this.phone)
 					.then(res => {
 						this.getCodeState(); //开始倒计时
 					})
@@ -177,24 +178,17 @@
 					phoneNumber: this.phone,
 					userId: this.vCode
 				};
-				uni.$u.http
-					.post(`/yt/noauth/reset/${this.phone}`, httpData)
-					.then(res => {
-						uni.showToast({
-							title: '重置密码成功~',
-							icon: 'none'
-						}).then(res => {
-							uni.reLaunch({
-								url: '/publicLoginSubPage/public/login'
-							});
-						});
-					})
-					.catch(err => {
-						uni.showToast({
-							title: err.data.msg,
-							icon: 'none'
+				const res = api.loginApi.postResetCodeApi(this.phone, httpData)
+				if (res) {
+					uni.showToast({
+						title: '重置密码成功~',
+						icon: 'none'
+					}).then(res => {
+						uni.reLaunch({
+							url: '/publicLoginSubPage/public/login'
 						});
 					});
+				}
 			},
 			showPasswordMode() {
 				this.showPasswordF = !this.showPasswordF;

@@ -3,8 +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-right-image"><image class="image" src="../../static/arrow-right.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">
@@ -21,43 +25,28 @@
 				<u-form-item labelWidth="80px" label="邮箱地址" prop="email" borderBottom ref="item1">
 					<u--input placeholder="请输入邮箱地址" v-model="myInfoModel.email" border="none"></u--input>
 				</u-form-item>
-				<u-form-item
-					@click="
+				<u-form-item @click="
 						showDate = true;
 						hideKeyboard();
-					"
-					labelWidth="80px"
-					label="有效期"
-					prop="accountExpireTime"
-					ref="item1"
-				>
+					" labelWidth="80px" label="有效期" prop="accountExpireTime" ref="item1">
 					<u--input v-model="myInfoModel.accountExpireTime" placeholder="请选择有效期" border="none"></u--input>
-					<u-datetime-picker
-						:formatter="formatter"
-						:show="showDate"
-						:value="datetime"
-						mode="dateTime"
-						closeOnClickOverlay
-						@confirm="dateConfirm"
-						@cancel="dateClose"
-						@close="dateClose"
-					></u-datetime-picker>
+					<u-datetime-picker :formatter="formatter" :show="showDate" :value="datetime" mode="dateTime"
+						closeOnClickOverlay @confirm="dateConfirm" @cancel="dateClose" @close="dateClose">
+					</u-datetime-picker>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="basic-bottom u-flex">
 			<view class="item" v-if="info.data.isThirdLoginAndNoDind && isJudgeBindBtn">
-				<button class="submit" size="default" @click="clearAccountFunc" :style="{ background: InfoColor }"><text class="un-bind-text">解绑</text></button>
+				<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="[
+			<view class="item" style="margin-right: 60rpx;" :style="[
 					{ position: info.data.isThirdLoginAndNoDind && isJudgeBindBtn ? '' : 'relative' },
 					{ right: info.data.isThirdLoginAndNoDind && isJudgeBindBtn ? '' : '-190rpx' }
-				]"
-			>
-				<button class="submit" size="default" @click="onSubmitFunc" :style="{ background: PrimaryColor }"><text class="un-bind-text">确认</text></button>
+				]">
+				<button class="submit" size="default" @click="onSubmitFunc" :style="{ background: PrimaryColor }"><text
+						class="un-bind-text">确认</text></button>
 			</view>
 		</view>
 		<!-- #ifdef MP -->
@@ -78,258 +67,256 @@
 </template>
 
 <script>
-import { mapMutations } from 'vuex';
-import baseUrl from '@/config/baseUrl.js';
-import { mapState } from 'vuex';
+	import {
+		mapMutations
+	} from 'vuex';
+	import baseUrl from '@/config/baseUrl.js';
+	import {
+		mapState
+	} from 'vuex';
+	import api from '@/api/index.js'
 
-export default {
-	data() {
-		return {
-			showBind: false,
-			PrimaryColor: '#377DFF', //主题色
-			InfoColor: '#00C9A7', //主题色
-			myInfoModel: {
-				realName: '',
-				phoneNumber: '',
-				username: '',
-				email: '',
-				accountExpireTime: ''
-			},
+	export default {
+		data() {
+			return {
+				showBind: false,
+				PrimaryColor: '#377DFF', //主题色
+				InfoColor: '#00C9A7', //主题色
+				myInfoModel: {
+					realName: '',
+					phoneNumber: '',
+					username: '',
+					email: '',
+					accountExpireTime: ''
+				},
 
-			rules: {
-				phoneNumber: [
-					{
-						required: true,
-						message: '请输入正确的手机号码',
-						trigger: 'change'
-					},
-					{
-						pattern: /^1[3-9][0-9]{9}$/,
-						message: '请输入正确的手机号码'
-					}
-				],
-				email: [
-					{
-						required: true,
-						message: '请输入正确的邮箱号',
-						trigger: 'change'
-					},
-					{
-						pattern: /^[0-9a-zA-Z]+@(([0-9a-zA-Z]+)[.])+[a-z]{3}$/,
-						message: '请输入正确的邮箱号'
-					}
-				]
-			},
-			showDate: false,
-			dateTime: Number(new Date()),
-			avatar: '',
-			id: '',
-			info: {},
-			openIds: '',
-			isUpdatePersonOrLoginInfo: false,
-			isJudgeBindBtn: true
-		};
-	},
-	onReady() {
-		this.$refs.myForm.setRules(this.rules);
-	},
-	onLoad(e) {
-		console.log(e);
-		if (e.data !== null) {
-			let params = JSON.parse(e.data);
-			this.info = params;
-			this.myInfoModel.realName = params.data.realName;
-			this.myInfoModel.phoneNumber = params.data.phoneNumber;
-			this.myInfoModel.username = params.data.username;
-			this.myInfoModel.email = params.data.email;
-			this.myInfoModel.accountExpireTime = params.data.accountExpireTime;
-			this.avatar = params.data.avatar == undefined ? '../../static/logo.png' : params.data.avatar;
-			this.id = params.data.userId;
-		}
-	},
-	onShow() {
-		let getOpenId = getApp().globalData.openId;
-		if (getOpenId) {
-			this.openIds = getOpenId;
-			console.log('OPenid', this.openIds);
-		}
-	},
-	computed: {
-		...mapState(['userInfo'])
-	},
-	methods: {
-		...mapMutations(['setUserInfo', 'emptyUserInfo']),
-		confrimBind(e) {
-			if (e) {
-				//解绑
-				let httpData = {
-					appUserId: e.data?.userId,
-					thirdUserId: e.data?.thirdUserId == null ? this.openIds : e.data?.thirdUserId
-				};
-				uni.$u.http.delete('/yt/third', httpData).then(res => {
-					if (res) {
-						uni.showToast({
-							title: '解绑成功'
-						});
-						this.showBind = false;
-						this.isJudgeBindBtn = false;
-						uni.reLaunch({
-							url: '/publicLoginSubPage/public/login'
-						});
-						this.emptyUserInfo();
-					} else {
-						uni.showToast({
-							title: '解绑失败'
-						});
-						this.showBind = false;
-					}
-				});
+				rules: {
+					phoneNumber: [{
+							required: true,
+							message: '请输入正确的手机号码',
+							trigger: 'change'
+						},
+						{
+							pattern: /^1[3-9][0-9]{9}$/,
+							message: '请输入正确的手机号码'
+						}
+					],
+					email: [{
+							required: true,
+							message: '请输入正确的邮箱号',
+							trigger: 'change'
+						},
+						{
+							pattern: /^[0-9a-zA-Z]+@(([0-9a-zA-Z]+)[.])+[a-z]{3}$/,
+							message: '请输入正确的邮箱号'
+						}
+					]
+				},
+				showDate: false,
+				dateTime: Number(new Date()),
+				avatar: '',
+				id: '',
+				info: {},
+				openIds: '',
+				isUpdatePersonOrLoginInfo: false,
+				isJudgeBindBtn: true
+			};
+		},
+		onReady() {
+			this.$refs.myForm.setRules(this.rules);
+		},
+		onLoad(e) {
+			console.log(e);
+			if (e.data !== null) {
+				let params = JSON.parse(e.data);
+				this.info = params;
+				this.myInfoModel.realName = params.data.realName;
+				this.myInfoModel.phoneNumber = params.data.phoneNumber;
+				this.myInfoModel.username = params.data.username;
+				this.myInfoModel.email = params.data.email;
+				this.myInfoModel.accountExpireTime = params.data.accountExpireTime;
+				this.avatar = params.data.avatar == undefined ? '../../static/logo.png' : params.data.avatar;
+				this.id = params.data.userId;
 			}
 		},
-		clearAccountFunc() {
-			this.showBind = true;
+		onShow() {
+			let getOpenId = getApp().globalData.openId;
+			if (getOpenId) {
+				this.openIds = getOpenId;
+				console.log('OPenid', this.openIds);
+			}
 		},
-		// 修改头像
-		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'],
-				success: res => {
-					const tempFilePaths = res.tempFilePaths;
-					//限制上传的图片大小不超过5M
-					let resSize = res.tempFiles[0].size;
-					if (resSize > 5242880) {
-						uni.showToast({
-							title: '上传的图片大小不能超过5M',
-							icon: 'none',
-							duration: 2000,
-							mask: true
-						});
-						return;
-					}
-					//获取图片扩展名
-					const fileTxt = res.tempFilePaths[0].split('.').pop();
-					const judgeType = fileTxt == 'jpg' || fileTxt == 'jpeg' || fileTxt == 'png';
-					if (!judgeType) {
-						uni.showToast({
-							title: '请上传指定图片类型（jpg、jpeg、png）',
-							icon: 'none',
-							duration: 2000,
-							mask: true
-						});
-						return;
-					}
-					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('头像上传成功');
+		computed: {
+			...mapState(['userInfo'])
+		},
+		methods: {
+			...mapMutations(['setUserInfo', 'emptyUserInfo']),
+			confrimBind(e) {
+				if (e) {
+					//解绑
+					let httpData = {
+						appUserId: e.data?.userId,
+						thirdUserId: e.data?.thirdUserId == null ? this.openIds : e.data?.thirdUserId
+					};
+					api.loginApi.deleteBindApi(httpData).then(res => {
+						if (res) {
+							uni.showToast({
+								title: '解绑成功'
+							});
+							this.showBind = false;
+							this.isJudgeBindBtn = false;
+							uni.reLaunch({
+								url: '/publicLoginSubPage/public/login'
+							});
+							this.emptyUserInfo();
+						} else {
+							uni.showToast({
+								title: '解绑失败'
+							});
+							this.showBind = false;
 						}
 					});
 				}
-			});
-		},
-		onSubmitFunc() {
-			let httpData = {
-				avatar: this.avatar,
-				email: this.myInfoModel.email,
-				id: this.id,
-				phoneNumber: this.myInfoModel.phoneNumber,
-				realName: this.myInfoModel.realName
-			};
-			this.$refs.myForm
-				.validate()
-				.then(res => {
-					uni.$u.http
-						.put('/yt/user/center', httpData)
-						.then(res => {
-							if (res) {
-								this.setUserInfo(res);
-								uni.showToast({
-									title: '更新个人资料成功~',
-									icon: 'none'
-								});
-								setTimeout(() => {
-									uni.navigateBack({
-										delta: 1
-									});
-								}, 500);
+			},
+			clearAccountFunc() {
+				this.showBind = true;
+			},
+			// 修改头像
+			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'],
+					success: res => {
+						const tempFilePaths = res.tempFilePaths;
+						//限制上传的图片大小不超过5M
+						let resSize = res.tempFiles[0].size;
+						if (resSize > 5242880) {
+							uni.showToast({
+								title: '上传的图片大小不能超过5M',
+								icon: 'none',
+								duration: 2000,
+								mask: true
+							});
+							return;
+						}
+						//获取图片扩展名
+						const fileTxt = res.tempFilePaths[0].split('.').pop();
+						const judgeType = fileTxt == 'jpg' || fileTxt == 'jpeg' || fileTxt == 'png';
+						if (!judgeType) {
+							uni.showToast({
+								title: '请上传指定图片类型（jpg、jpeg、png）',
+								icon: 'none',
+								duration: 2000,
+								mask: true
+							});
+							return;
+						}
+						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('头像上传成功');
 							}
-						})
-						.catch(e => {
-							uni.$u.toast(e.data.message);
 						});
-				})
-				.catch(errors => {
-					uni.$u.toast('校验失败');
+					}
 				});
-		},
-		dateClose() {
-			this.showDate = false;
-		},
-		dateConfirm(e) {
-			this.showDate = false;
-			this.myInfoModel.userInfo.accountExpireTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss');
-		},
-		//格式化日期
-		formatter(type, value) {
-			if (type === 'year') {
-				return `${value}年`;
-			}
-			if (type === 'month') {
-				return `${value}月`;
-			}
-			if (type === 'day') {
-				return `${value}日`;
-			}
-			if (type === 'hour') {
-				return `${value}时`;
-			}
-			if (type === 'minute') {
-				return `${value}分`;
+			},
+			onSubmitFunc() {
+				let httpData = {
+					avatar: this.avatar,
+					email: this.myInfoModel.email,
+					id: this.id,
+					phoneNumber: this.myInfoModel.phoneNumber,
+					realName: this.myInfoModel.realName
+				};
+				this.$refs.myForm
+					.validate()
+					.then(async res => {
+						const resp = await api.loginApi.postPersonalInfoApi(httpData)
+						if (res) {
+							this.setUserInfo(resp);
+							uni.showToast({
+								title: '更新个人资料成功~',
+								icon: 'none'
+							});
+							setTimeout(() => {
+								uni.navigateBack({
+									delta: 1
+								});
+							}, 500);
+						}
+					})
+					.catch(errors => {
+						uni.$u.toast('校验失败');
+					});
+			},
+			dateClose() {
+				this.showDate = false;
+			},
+			dateConfirm(e) {
+				this.showDate = false;
+				this.myInfoModel.userInfo.accountExpireTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss');
+			},
+			//格式化日期
+			formatter(type, value) {
+				if (type === 'year') {
+					return `${value}年`;
+				}
+				if (type === 'month') {
+					return `${value}月`;
+				}
+				if (type === 'day') {
+					return `${value}日`;
+				}
+				if (type === 'hour') {
+					return `${value}时`;
+				}
+				if (type === 'minute') {
+					return `${value}分`;
+				}
+				return value;
+			},
+			//隐藏输入框
+			hideKeyboard() {
+				uni.hideKeyboard();
 			}
-			return value;
-		},
-		//隐藏输入框
-		hideKeyboard() {
-			uni.hideKeyboard();
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.userName {
-	background-color: green;
-}
-@import './static/set.scss';
+	.userName {
+		background-color: green;
+	}
 
-/deep/ .u-line {
-	width: 662rpx !important;
-}
+	@import './static/set.scss';
 
-/deep/ .u-form-item {
-	height: 100rpx !important;
-}
+	/deep/ .u-line {
+		width: 662rpx !important;
+	}
+
+	/deep/ .u-form-item {
+		height: 100rpx !important;
+	}
 
-/deep/ .u-form-item:nth-child(3) {
-	.u-form-item__body {
-		background: #f5f7fa !important;
-		width: 663rpx !important;
+	/deep/ .u-form-item:nth-child(3) {
+		.u-form-item__body {
+			background: #f5f7fa !important;
+			width: 663rpx !important;
+		}
 	}
-}
 </style>

 <template>
-	<view class="login-page" style="background-size: 100% 100%; min-height: 100vh" :style="{
+	<view class="login-page" :style="{
       backgroundImage:
         'url(' +
         (mpOwnConfig.bg !== undefined ? mpOwnConfig.bg : `${defaultLogo}`) +
@@ -10,8 +10,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 style="width: 587rpx" class="text-clip hello-welcome login-text-muted">欢迎来到{{
+				<view style="width: 587rpx;" class="text-clip hello-welcome login-text-muted">欢迎来到{{
             mpOwnConfig.name !== undefined ? mpOwnConfig.name : "ThingsKit"
           }}!</view>
 			</view>
@@ -22,7 +21,6 @@
 				<view class="form-row u-flex">
 					<u-input v-model="loginForm.username" type="text" placeholder="请输入登录账号" border="bottom" />
 				</view>
-
 				<view class="form-row u-flex">
 					<u-input v-model="loginForm.password" :password="showPassword" placeholder="请输入登录密码"
 						border="bottom">
@@ -35,29 +33,25 @@
 						</template>
 					</u-input>
 				</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">
+					<!-- #ifdef MP-WEIXIN -->
+					<button class="link-image" @tap="handleWenxinAuthorization">
 						<image class="image" src="../../static/weixin.png" mode="aspectFill"></image>
 					</button>
+					<!-- #endif -->
 					<!-- #ifdef APP-PLUS -->
-					<!-- <button class="link-image" @click="onWenxinAppAuthorization">
+					<button class="link-image" @click="handleAppPlusAuthorization">
 						<image class="image" src="../../static/weixin.png" mode="aspectFill"></image>
-					</button> -->
+					</button>
 					<!-- #endif -->
 				</view>
 			</view>
@@ -71,18 +65,13 @@
 		mapActions,
 		mapState
 	} from "vuex";
-	import {
-		loginApp
-	} from "@/config/login";
-	import baseUrl from "@/config/baseUrl.js";
-	import WXBizDataCrypt from "@/config/WXBizDataCrypt.js";
+	import api from '@/api'
 
 	export default {
 		data() {
 			return {
 				loginForm: {
 					username: "",
-
 					password: "",
 				},
 				showPassword: true,
@@ -117,25 +106,24 @@
 		},
 		methods: {
 			//获取平台定制信息
-			getPlateForm() {
-				uni.$u.http.get("/yt/app_design/get").then((res) => {
-					if (res) {
-						this.mpOwnConfig = {
-							bg: res.background,
-							logo: res.logo,
-							name: res.name,
-						};
-					}
-				});
+			async getPlateForm() {
+				const res = await api.loginApi.getPlateCustomApi()
+				if (res) {
+					this.mpOwnConfig = {
+						bg: res.background,
+						logo: res.logo,
+						name: res.name,
+					};
+				}
 			},
 			...mapMutations(["setUserInfo", "setPlateInfo"]),
 			...mapActions(["updateBadgeTotal"]),
 			//微信授权登录
 			//#ifdef MP-WEIXIN
-			onWenxinAuthorization() {
+			handleWenxinAuthorization() {
 				wx.getUserProfile({
 					desc: "微信第三方授权",
-					success: (reswenxin) => {
+					success: async (reswenxin) => {
 						if (
 							reswenxin.errMsg === "getUserProfile:ok" &&
 							reswenxin.encryptedData
@@ -145,99 +133,81 @@
 								avatarUrl: reswenxin.userInfo.avatarUrl,
 								thirdUserId: this.openid,
 							};
-							//判断是否需要绑定
-							uni.$u.http
-								.get(`/yt/third/login/${this.code}`)
-								.then((res) => {
-									if (res.token == "" || (res.token == null && res.thirdUserId)) {
-										//需要绑定
-										let userInfo = {
-											isThirdLogin: true, //用于判断是否是第三方登录并且需要绑定账号
-											avatar: obj.avatarUrl,
-											thirdUserId: res.thirdUserId,
-										};
-										this.setUserInfo(userInfo);
-										//设置全局变量openId
-										getApp().globalData.openId = res.thirdUserId;
+							const res = await api.loginApi.getThirdLoginApi(this.code)
+							if (res.token == "" || (res.token == null && res.thirdUserId)) {
+								//需要绑定
+								let userInfo = {
+									isThirdLogin: true, //用于判断是否是第三方登录并且需要绑定账号
+									avatar: obj.avatarUrl,
+									thirdUserId: res.thirdUserId,
+								};
+								this.setUserInfo(userInfo);
+								//设置全局变量openId
+								getApp().globalData.openId = res.thirdUserId;
+								uni.reLaunch({
+									url: "../../pages/personal/personal",
+								});
+							} else {
+								// 不需要绑定,直接第三方登录使用
+								let resObj = {
+									refreshToken: res.refreshToken,
+									isToken: res.token,
+								};
+								let userInfo = {
+									...resObj,
+									token: true, //token用于判断是否登录
+									isThirdLoginAndNoDind: true, //用于判断是否是第三方登录并且不需要绑定账号
+									thirdUserId: res.thirdUserId,
+								};
+								//设置全局变量openId
+								getApp().globalData.openId = res.thirdUserId;
+								if (userInfo.token) {
+									this.setUserInfo(userInfo);
+								}
+								uni
+									.showToast({
+										title: "第三方账号登录成功",
+										icon: "none",
+									})
+									.then(async (res) => {
+										this.saveUserInfo();
+										await this.getAlarmTotalData();
 										uni.reLaunch({
-											url: "../../pages/personal/personal",
+											url: "/pages/personal/personal",
 										});
-									} else {
-										// 不需要绑定,直接第三方登录使用
-										let resObj = {
-											refreshToken: res.refreshToken,
-											isToken: res.token,
-										};
-										let userInfo = {
-											...resObj,
-											token: true, //token用于判断是否登录
-											isThirdLoginAndNoDind: true, //用于判断是否是第三方登录并且不需要绑定账号
-											thirdUserId: res.thirdUserId,
-										};
-										//设置全局变量openId
-										getApp().globalData.openId = res.thirdUserId;
-										if (userInfo.token) {
-											this.setUserInfo(userInfo);
-										}
-										uni
-											.showToast({
-												title: "第三方账号登录成功",
-												icon: "none",
-											})
-											.then(async (res) => {
-												this.saveUserInfo();
-												await this.getAlarmTotalData();
-												uni.reLaunch({
-													url: "/pages/personal/personal",
-												});
-											});
-									}
-								})
-								.catch((e) => {
-									if (e?.data?.data === null) {
-										uni.$u.toast(e.data?.msg);
-									}
-								});
+									});
+							}
 						}
 					},
-
 					fail: (res) => {
 						//拒绝授权
-
 						return;
 					},
 				});
 			},
 			//#endif
-
 			//#ifdef APP-PLUS
-			// onWenxinAppAuthorization() {
-
-			// },
+			handleAppPlusAuthorization() {
+				console.log('TODO');
+			},
 			//#endif
-
-			saveUserInfo() {
-				//储存个人信息
-				uni.$u.http.get("/yt/user/me/info").then((res) => {
-					if (res) {
-						this.setUserInfo(res);
-					}
-				});
-				//储存平台信息
-				uni.$u.http.get("/yt/platform/get").then((res) => {
-					if (res) {
-						this.setPlateInfo(res);
-					}
-				});
+			async saveUserInfo() {
+				const userInfoRes = await api.loginApi.setUserInfoApi()
+				const plateInfoRes = await api.loginApi.setPlateInfoApi()
+				if (userInfoRes) {
+					this.setUserInfo(userInfoRes);
+				}
+				if (plateInfoRes) {
+					this.setPlateInfo(plateInfoRes);
+				}
 			},
 			async getAlarmTotalData() {
-				const res = await uni.$u.http.get("/yt/homepage/app?login=true");
+				const res = await api.loginApi.getAlarmTotalApi()
 				if (res) {
-					//异步实时更新告警徽标数
 					this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
 				}
 			},
-			onSubmitFunc() {
+			async onSubmitFunc() {
 				if (this.loginForm.username == "") {
 					return uni.$u.toast("请输入登录账号~");
 				}
@@ -247,12 +217,10 @@
 				if (this.loginForm.password == "") {
 					uni.showToast({
 						title: "请输入登录密码~",
-
 						icon: "none",
 					});
 					return;
 				} else if (!passReg.test(this.loginForm.password)) {
-					//uni.showToast，字数过长，会造成手机上显示不完全，官方bug，采用uni.showModal
 					uni.showModal({
 						title: "提示",
 						content: "密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~",
@@ -260,51 +228,35 @@
 					});
 					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,
-								isThirdLoginAndNoDind: false,
-							};
-
-							if (userInfo.token) {
-								this.setUserInfo(userInfo);
-							}
-
-							uni
-								.showToast({
-									title: "登录成功~",
-
-									icon: "none",
-								})
-								.then(async (res) => {
-									this.saveUserInfo();
-									uni.reLaunch({
-										url: "/pages/personal/personal",
-									});
-									await this.getAlarmTotalData();
-								});
-						}
-					})
-
-					.catch((e) => {
-						uni.$u.toast(e.data?.message);
-					});
+				const res = await api.loginApi.postLoginApi(this.loginForm)
+				if (res) {
+					// 储存登录信息
+					let resObj = {
+						refreshToken: res.refreshToken,
+						isToken: res.token,
+					};
+					let userInfo = {
+						...resObj,
+						token: true, //token用于判断是否登录
+						isThirdLogin: false,
+						isThirdLoginAndNoDind: false,
+					};
+					if (userInfo.token) {
+						this.setUserInfo(userInfo);
+					}
+					uni
+						.showToast({
+							title: "登录成功~",
+							icon: "none",
+						})
+						.then(async (res) => {
+							await this.saveUserInfo();
+							await this.getAlarmTotalData();
+							uni.reLaunch({
+								url: "/pages/personal/personal",
+							});
+						});
+				}
 			},
 			openCodeFunc() {
 				uni.navigateTo({

@@ -2,7 +2,7 @@
 	min-height: 100vh;
 	width: 750rpx;
 	background: url(/static/login.png) no-repeat;
-	background-size: 750rpx 1400rpx;
+	background-size: 100% 100%;
 	.login-main {
 		flex-direction: column;
 		.content {

@@ -4,17 +4,24 @@
 		<public-module></public-module>
 		<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: 35rpx;">
-				<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>
+				<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: 110rpx;"></view>
 		<view class="notify-main">
-			<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
+			<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback"
+				@up="upCallback">
 				<view class="u-flex main">
-					<view @click="clickNotifyDetail(item, index)" class="u-flex main-item" v-for="(item, index) in list" :key="index">
+					<view @click="clickNotifyDetail(item, index)" class="u-flex main-item" v-for="(item, index) in list"
+						:key="index">
 						<view class="u-flex item">
-							<view class="item-avatar"><u-avatar class="avatar" shape="circle" size="40" :src="item.sysNotice.avatar"></u-avatar></view>
+							<view class="item-avatar">
+								<u-avatar class="avatar" shape="circle" size="40" :src="item.sysNotice.avatar">
+								</u-avatar>
+							</view>
 							<view class="u-flex item-content">
 								<text class="text-top text-clip">{{ item.sysNotice.title }}</text>
 								<text class="text-bottom text-clip">{{ item.sysNotice.createTime }}</text>
@@ -22,7 +29,8 @@
 						</view>
 						<view class="item-right u-flex" style="justify-content: space-between;">
 							<text class="text">{{ formatType(item.sysNotice) }}</text>
-							<u-badge style="margin-right: 10rpx;" v-if="item.readStatus == '0'" numberType="overflow" isDot />
+							<u-badge style="margin-right: 10rpx;" v-if="item.readStatus == '0'" numberType="overflow"
+								isDot />
 						</view>
 					</view>
 				</view>
@@ -32,151 +40,146 @@
 </template>
 
 <script>
-import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
-
-export default {
-	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
+	import api from '@/api/index.js'
 
-	data() {
-		return {
-			model1: {
-				userInfo: {
-					type: ''
-				}
-			},
-			showType: false,
-			actions: [
-				{
-					name: '全部',
-					value: ''
+	export default {
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		data() {
+			return {
+				model1: {
+					userInfo: {
+						type: ''
+					}
 				},
-				{
-					name: '会议',
-					value: 'MEETING'
+				showType: false,
+				actions: [{
+						name: '全部',
+						value: ''
+					},
+					{
+						name: '会议',
+						value: 'MEETING'
+					},
+					{
+						name: '公告',
+						value: 'NOTICE'
+					},
+					{
+						name: '其他',
+						value: 'OTHER'
+					}
+				],
+				page: {
+					num: 0,
+					size: 10
 				},
-				{
-					name: '公告',
-					value: 'NOTICE'
+				downOption: {
+					auto: false //是否在初始化后,自动执行downCallback; 默认true
 				},
-				{
-					name: '其他',
-					value: 'OTHER'
-				}
-			],
-			page: {
-				num: 0,
-				size: 10
-			},
-			downOption: {
-				auto: false //是否在初始化后,自动执行downCallback; 默认true
-			},
-			list: [],
-			pre: false,
-			isJudgeNextPage: '',
-			distance: 0,
-			scrollDistance: 0
-		};
-	},
-	onLoad(e) {
-		// 隐藏原生的tabbar
-		uni.hideTabBar();
-		this.pre = false;
-		uni.removeStorageSync('storagePre');
-	},
-	onShow() {
-		this.pre = uni.getStorageSync('storagePre');
-		if (this.pre) {
-		}
-	},
-	onHide() {
-		uni.removeStorageSync('storagePre');
-	},
-	methods: {
-		formatType(e) {
-			return e?.type == 'OTHER' ? '其他' : e?.type == 'MEETING' ? '会议' : '公告';
-		},
-		openTypeClick() {
-			this.showType = true;
-			uni.hideKeyboard();
+				list: [],
+				pre: false,
+				isJudgeNextPage: '',
+				distance: 0,
+				scrollDistance: 0
+			};
 		},
-		typeSelect(e) {
-			this.isJudgeNextPage = e.value;
-			this.page.num = 1;
-			this.model1.userInfo.type = e.name;
-			this.loadData(1, this.isJudgeNextPage == '' ? null : this.isJudgeNextPage);
-			uni.pageScrollTo({
-				scrollTop: this.scrollDistance + 20,
-				duration: 50
-			});
-			uni.pageScrollTo({
-				scrollTop: this.scrollDistance - 20,
-				duration: 50
-			});
+		onLoad(e) {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			this.pre = false;
+			uni.removeStorageSync('storagePre');
 		},
-		onPageScroll(e) {
-			this.scrollDistance = e.scrollTop;
+		onShow() {
+			this.pre = uni.getStorageSync('storagePre');
+			if (this.pre) {}
 		},
-		/*下拉刷新的回调 */
-		downCallback() {
-			//联网加载数据
-			this.list.length = 0;
-			this.page.num = 1;
-			this.loadData(1);
-			this.isJudgeNextPage = '';
-			this.model1.userInfo.type = '';
+		onHide() {
+			uni.removeStorageSync('storagePre');
 		},
-		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-		upCallback() {
-			if (this.isJudgeNextPage != '') {
-				//联网加载数据
-				this.page.num += 1;
-				this.loadData(this.page.num, this.isJudgeNextPage);
-			} else {
+		methods: {
+			formatType(e) {
+				return e?.type == 'OTHER' ? '其他' : e?.type == 'MEETING' ? '会议' : '公告';
+			},
+			openTypeClick() {
+				this.showType = true;
+				uni.hideKeyboard();
+			},
+			typeSelect(e) {
+				this.isJudgeNextPage = e.value;
+				this.page.num = 1;
+				this.model1.userInfo.type = e.name;
+				this.loadData(1, this.isJudgeNextPage == '' ? null : this.isJudgeNextPage);
+				uni.pageScrollTo({
+					scrollTop: this.scrollDistance + 20,
+					duration: 50
+				});
+				uni.pageScrollTo({
+					scrollTop: this.scrollDistance - 20,
+					duration: 50
+				});
+			},
+			onPageScroll(e) {
+				this.scrollDistance = e.scrollTop;
+			},
+			/*下拉刷新的回调 */
+			downCallback() {
 				//联网加载数据
-				this.page.num += 1;
-				this.loadData(this.page.num);
-			}
-		},
+				this.list.length = 0;
+				this.page.num = 1;
+				this.loadData(1);
+				this.isJudgeNextPage = '';
+				this.model1.userInfo.type = '';
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback() {
+				if (this.isJudgeNextPage != '') {
+					//联网加载数据
+					this.page.num += 1;
+					this.loadData(this.page.num, this.isJudgeNextPage);
+				} else {
+					//联网加载数据
+					this.page.num += 1;
+					this.loadData(this.page.num);
+				}
+			},
 
-		loadData(pageNo, t) {
-			let httpData = {
-				page: pageNo,
-				pageSize: 10,
-				type: t
-			};
-			uni.$u.http
-				.get('/yt/notice_user/page', { params: httpData, custom: { load: false } })
-				.then(res => {
-					uni.stopPullDownRefresh();
-					this.mescroll.endByPage(res.items.length, res.total);
-					if (pageNo == 1) {
-						this.list = res.items;
-					} else {
-						this.list = this.list.concat(res.items);
+			async loadData(pageNo, t) {
+				let httpData = {
+					page: pageNo,
+					pageSize: 10,
+					type: t
+				};
+				const res = await api.notifyApi.getNotifyApi({
+					params: httpData,
+					custom: {
+						load: false
 					}
 				})
-				.catch(e => {
-					this.mescroll.endErr();
+				uni.stopPullDownRefresh();
+				this.mescroll.endByPage(res.items.length, res.total);
+				if (pageNo == 1) {
+					this.list = res.items;
+				} else {
+					this.list = this.list.concat(res.items);
+				}
+			},
+			async clickNotifyDetail(e, i) {
+				this.list[i].readStatus = 1;
+				await api.notifyApi.byNotifyIdGetDetailApi(e.sysNotice.id)
+				uni.navigateTo({
+					url: './notifyDetail?data=' + encodeURIComponent(JSON.stringify(e.sysNotice))
 				});
-		},
-		clickNotifyDetail(e, i) {
-			this.list[i].readStatus = 1;
-			uni.$u.http
-				.get(`/yt/notice_user/${e.sysNotice.id}`)
-				.then(res => {})
-				.catch(e => {});
-			uni.navigateTo({
-				url: './notifyDetail?data=' + encodeURIComponent(JSON.stringify(e.sysNotice))
-			});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-@import './static/systemNotify.scss';
-/deep/ .u-badge--error {
-	position: relative;
-	right: 11rpx;
-}
+	@import './static/systemNotify.scss';
+
+	/deep/ .u-badge--error {
+		position: relative;
+		right: 11rpx;
+	}
 </style>