Merge branch 'main_dev' into 'main'

merge main dev to main

See merge request yunteng/thingskit-app!115

@@ -30,7 +30,24 @@
 			// })
 			// #endif
 		},
-		onHide() {}
+		onHide() {},
+		onUnload(){
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: false
+			});
+		},
+		methods:{
+			// 判断是否是第三方登录没有绑定账号不请求数据
+			getBindNot(){
+				// #ifndef H5
+				const userInfo = uni.getStorageSync('userInfo');
+				// #endif
+				// #ifdef H5
+				const userInfo = JSON.parse(sessionStorage.getItem('userInfo') || localStorage.getItem('userInfo'));
+				// #endif
+				return userInfo.isThirdLogin
+			}
+		}
 	};
 </script>
 

@@ -36,6 +36,11 @@
 						class="text-device-muted text-clip">{{ list.details == null ? '暂无数据' : formatDetailText(list.details.data) }}</text>
 				</view>
 				<view class="column">
+					<text class="text-org-bold">告警场景：</text>
+					<text
+						class="text-device-muted text-clip">{{ list.type == null ? '暂无数据' : list.type }}</text>
+				</view>
+				<view class="column">
 					<text class="text-org-bold">告警时间：</text>
 					<text class="text-device-muted">{{ list.createdTime }}</text>
 				</view>
@@ -169,7 +174,7 @@
 				const jsonStr = JSON.stringify(e);
 				const str = jsonStr.substring(1, jsonStr.length - 1);
 				const newStr = str.replace(/\"/g, '');
-				return newStr;
+				return newStr.slice(0,26);
 			}
 		}
 	};

@@ -125,7 +125,9 @@ uni.$u.http.interceptors.response.use(
 			errorData = message || "";
 		}
 		// console.log('errorData', errorData);
-		uni.$u.toast(message);
+		if(message != "request:ok"){
+			uni.$u.toast(message);
+		}
 		// if (show) uni.$u.toast(errorData);
 		return Promise.reject(response);
 	}

@@ -243,4 +243,4 @@
 		height: 100vh;
 		background-color: #f8f9fa;
 	}
-</style>
+</style>

@@ -110,12 +110,22 @@
 					},
 					{
 						checked: false,
-						name: '成功',
+						name: '响应成功',
 						type: 'SUCCESSFUL'
 					},
 					{
 						checked: false,
-						name: '失败',
+						name: '发送成功',
+						type: 'DELIVERED'
+					},
+					{
+						checked: false,
+						name: '已过期',
+						type: 'EXPIRED'
+					},
+					{
+						checked: false,
+						name: '响应失败',
 						type: 'FAILED'
 					}
 				],

@@ -12,8 +12,8 @@
 					{{ deviceDetail.alias? deviceDetail.alias: deviceDetail.name }}
 				</view>
 				<view style="margin-left: 20rpx; font-size: 14px;"
-					:style="{ color: deviceDetail.deviceState === 'INACTIVE' ? '#666' : deviceDetail.deviceState === 'ONLINE' ? '#377DFF' : '#DE4437' }">
-					{{ deviceDetail.deviceState === 'INACTIVE' ? '待激活' : deviceDetail.deviceState === 'ONLINE' ? '在线' : '离线' }}
+					:style="{ color: deviceDetail.deviceState === 'INACTIVE' ? '#666' :  deviceDetail.deviceState === 'ONLINE' ? '#377DFF' : '#DE4437' }">
+					{{ deviceStatus }}
 				</view>
 			</view>
 			<view style="margin-right: 20rpx;"
@@ -126,8 +126,8 @@
 				</view>
 				<view style="margin-top: 28rpx;width: 100%;">
 					<div class="u-flex u-row-between">
-						<u--textarea placeholder="请输入下发内容(json格式)" v-model="inputCommandVal" />
-						<u-icon @click="handleCopy(copyTextValue)" name="question-circle" color="#2979ff" size="28"
+						<u--textarea :placeholder="`请输入下发内容${isShowTCP?'(字符串格式)':'(json格式)'}`" v-model="inputCommandVal" />
+						<u-icon v-if="!isShowTCP" @click="handleCopy(copyTextValue)" name="question-circle" color="#2979ff" size="28"
 							class="ml-10">
 						</u-icon>
 					</div>
@@ -187,10 +187,14 @@
 				showModel: false,
 				commandType: 'OneWay',
 				commandValue: {},
-				inputCommandVal: ''
+				inputCommandVal: '',
+				isShowTCP:false,//用于下发命令时判断是否是TCP/UDP
 			};
 		},
 		computed: {
+			deviceStatus(){
+				return  this.deviceDetail.deviceState === 'INACTIVE' ? '待激活' :  this.deviceDetail.deviceState === 'ONLINE' ? '在线' : '离线'
+			},
 			deviceType() {
 				return this.deviceDetail.deviceType === 'DIRECT_CONNECTION' ?
 					'直连设备' :
@@ -218,18 +222,20 @@
 		methods: {
 			handleCopy(value) {
 				uni.showModal({
-					content: JSON.stringify(value), //模板中提示的内容
+					content: JSON.stringify(value), 
 					confirmText: '复制内容',
-					success: () => { //点击复制内容的后调函数
+					showCancel:false,
+					success: () => { 
 						uni.setClipboardData({
-							data: JSON.stringify(value), //要被复制的内容
-							success: () => { //复制成功的回调函数
-								uni.showToast({ //提示
+							data: JSON.stringify(value),
+							success: () => { 
+								uni.showToast({
 									title: '复制成功'
 								})
 							}
 						});
-					}
+					},
+					
 				});
 			},
 			radioChange: function(evt) {
@@ -252,11 +258,15 @@
 			},
 			showModal(e) {
 				this.modalName = e.currentTarget.dataset.target
+				const {transportType} = this.deviceDetail.deviceProfile
+				this.isShowTCP = transportType=='TCP'?true:false
 				this.showNodal = true
 			},
 			showModalBtn() {
 				this.showModel = true;
 				this.inputCommandVal = '';
+				const {transportType} = this.deviceDetail.deviceProfile
+				this.isShowTCP = transportType=='TCP'?true:false
 			},
 			disabledScroll() {
 				return;
@@ -271,13 +281,22 @@
 			},
 			async confirmCommand() {
 				try {
-					const commandJsonValue = JSON.parse(this.inputCommandVal);
+					this.commandValue.method = 'methodThingskit';
 					this.commandValue.persistent = true;
 					this.commandValue.additionalInfo = {
 						cmdType: 'API'
 					};
-					this.commandValue.method = 'methodThingskit';
-					this.commandValue.params = commandJsonValue
+					if(this.isShowTCP){//TCP的格式只能是字符串
+						const zg = /^[0-9a-zA-Z]*$/
+						if(!zg.test(this.inputCommandVal)) {
+							uni.$u.toast('输入的内容只能是字母和数字的组合')
+							return 
+						}
+						this.commandValue.params = this.inputCommandVal
+					}else{
+						const commandJsonValue = JSON.parse(this.inputCommandVal);
+						this.commandValue.params = commandJsonValue
+					}
 					await issueCommand(this.commandType, this.deviceDetail.tbDeviceId, this.commandValue);
 					this.hiddenModal();
 					uni.$u.toast('下发成功~');
@@ -390,4 +409,4 @@
 			width: 300rpx;
 		}
 	}
-</style>
+</style>

@@ -16,7 +16,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"disableScroll": true
+				"enablePullDownRefresh": true
 			}
 		},
 		{

@@ -8,7 +8,7 @@
 				<view class="search">
 					<view>
 						<view class="search-left">
-							<u--input prefixIcon="search" placeholder="请输入告警名字" shape="circle" @change="inputChanged">
+							<u--input prefixIcon="search" placeholder="请输入告警设备" shape="circle" @change="inputChanged">
 							</u--input>
 						</view>
 					</view>
@@ -241,6 +241,9 @@
 		},
 		onShow() {
 			this.page.num = 1;
+			if(getApp().getBindNot()){
+				return
+			}
 			if (this.detailStatus) {
 				this.loadData(1, null, null, null, null, null, null);
 			}
@@ -256,6 +259,9 @@
 		onLoad(e) {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
+			if(getApp().getBindNot()){
+				return
+			}
 			if (e.type == undefined) {
 				this.loadData(1, null, null, null, null, null, null);
 			} else {
@@ -303,8 +309,9 @@
 				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;
+				this.timeData.getTimeGapS = i>0?formatS:'';
+				this.timeData.getTimeGapE = i>0?formatE:'';
+				console.log(this.timeData.getTimeGapS,'this.timeData.getTimeGapS',this.timeData.getTimeGapE)
 			},
 			queryData() {
 				this.topBack();
@@ -345,8 +352,8 @@
 				this.current4 = 0;
 				this.selectTimeVal = '';
 				this.timeData.selectTime = [];
-				this.timeDatagetTimeGapS = '';
-				this.timeDatagetTimeGapE = '';
+				this.timeData.getTimeGapS = '';
+				this.timeData.getTimeGapE = '';
 				this.range = [];
 				this.searchAlarmText = '';
 				this.startTimeVa = '';
@@ -434,7 +441,7 @@
 					severity: severityV,
 					deviceType: deviceTypeV,
 					organizationId: organizationV,
-					alarmType: alarmName
+					deviceName: alarmName
 				};
 				if (statusV == '') {
 					delete httpData.status;
@@ -480,7 +487,8 @@
 					organizationName: e.organizationName,
 					details: e.details,
 					createdTime: e.createdTime,
-					status: e.status
+					status: e.status,
+					type: e.type
 				};
 				uni.navigateTo({
 					url: '/alarmSubPage/alarmDetailPage/alarmDetail?data=' + JSON.stringify(obj)

@@ -211,6 +211,9 @@
 		async onLoad(options) {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
+			if(getApp().getBindNot()){
+				return
+			}
 			this.page.num = 1;
 			const {
 				deviceState
@@ -231,6 +234,9 @@
 			}
 		},
 		onShow() {
+			if(getApp().getBindNot()){
+				return
+			}
 			if (this.orgId) {
 				this.loadData(1, {
 					organizationId: this.orgId

@@ -21,13 +21,13 @@
 							</view>
 							<view @click="navigatorDeviceStatus('OFFLINE')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{ deviceData.unLine }}</text>
+									<text class="home-text-total">{{ deviceData.offLine }}</text>
 								</view>
 								<view class="sigle-value"><text class="home-text-total-bottom">离线</text></view>
 							</view>
 							<view @click="navigatorDeviceStatus('INACTIVE')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{ deviceData.noActive }}</text>
+									<text class="home-text-total">{{ deviceData.inActive }}</text>
 								</view>
 								<view class="sigle-value"><text class="home-text-total-bottom">待激活</text></view>
 							</view>
@@ -39,22 +39,22 @@
 							<text class="item-text home-text-muted">告警统计</text>
 						</view>
 						<view class="item-child-bottom u-flex">
-							<view @click="navigatorAlarmStatus(['ACTIVE_UNACK', 'ACTIVE_ACK'])"
+							<view @click="navigatorAlarmStatus(['ACTIVE_UNACK'])"
 								class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{ alertData.noHandle }}</text>
+									<text class="home-text-total">{{ alertData.activedAlarm }}</text>
 								</view>
 								<view class="sigle-value"><text class="home-text-total-bottom">未处理</text></view>
 							</view>
 							<view @click="navigatorAlarmStatus('CLEARED_ACK')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{ alertData.doneHandle }}</text>
+									<text class="home-text-total">{{ alertData.clearedAck }}</text>
 								</view>
 								<view class="sigle-value"><text class="home-text-total-bottom">已处理</text></view>
 							</view>
 							<view @click="navigatorAlarmStatus('CLEARED_UNACK')" class="u-flex sigle-child">
 								<view class="sigle-text">
-									<text class="home-text-total">{{ alertData.errorReport }}</text>
+									<text class="home-text-total">{{ alertData.clearedUnack }}</text>
 								</view>
 								<view class="sigle-value"><text class="home-text-total-bottom">误报</text></view>
 							</view>
@@ -105,7 +105,8 @@
 	import {
 		mapActions
 	} from 'vuex';
-	import api from '@/api/index.js'
+	import api from '@/api/index.js'
+	import { useNavigateTo } from '@/plugins/utils.js'
 
 	export default {
 		components: {
@@ -115,36 +116,42 @@
 			return {
 				deviceData: {
 					onLine: 0,
-					unLine: 0,
-					noActive: 0
+					offLine: 0,
+					inActive: 0
 				},
 				alertData: {
-					noHandle: 0,
-					doneHandle: 0,
-					errorReport: 0
+					activedAlarm: 0,
+					clearedAck: 0,
+					clearedUnack: 0
 				}
 			};
 		},
 		onLoad() {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
+			if(getApp().getBindNot()){
+				return
+			}
 			this.getDeviceTotalData();
 			uni.setStorageSync('getConfiguration', {
 				isConfiguration: false
 			});
 			uni.removeStorageSync('getConfiguration');
+		},
+		onPullDownRefresh() {
+			this.getDeviceTotalData();
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+				uni.$u.toast('下拉刷新成功...');
+			}, 1000);
 		},
 		methods: {
 			...mapActions(['updateBadgeTotal']),
 			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;
+				if (res) {
+					for(let i in this.deviceData) Reflect.set(this.deviceData,i,res.totalDevice[i])
+					for(let i in this.alertData) Reflect.set(this.alertData,i,res.totalAlarm[i])
 					//异步实时更新告警徽标数
 					this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
 				}
@@ -152,15 +159,11 @@
 			showToastWip() {
 				uni.$u.toast('拼命开发中 ...');
 			},
-			openCamera() {
-				uni.navigateTo({
-					url: 'camera/camera'
-				});
+			openCamera() {
+				useNavigateTo('camera/camera')
 			},
-			openOrgStatus() {
-				uni.navigateTo({
-					url: 'configuration/configuration'
-				});
+			openOrgStatus() {
+				useNavigateTo('configuration/configuration')
 			},
 			//告警状态查询
 			navigatorAlarmStatus(e) {

@@ -21,6 +21,9 @@
 			};
 		},
 		onLoad() {
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: false
+			});
 			this.getPlateForm();
 		},
 		created() {

@@ -135,6 +135,7 @@
 		mapState,
 		mapMutations
 	} from 'vuex';
+	import { loginPasswordReg } from '@/plugins/utils.js'
 
 	export default {
 		components: {
@@ -244,14 +245,13 @@
 					if (this.bindAccountObj.appUserKey == '' || this.bindAccountObj.appUserKey == undefined) {
 						return uni.$u.toast('请输入登录账号~');
 					}
-					const passReg = /^(?=.*?[A-Z])(?=(.*[a-z]){1,})(?=(.*[\d]){1,})(?=(.*[\W]){1,})(?!.*\s).{8,}$/;
 					if (this.bindAccountObj.appUserSecret == '') {
 						uni.showToast({
 							title: '请输入登录密码~',
 							icon: 'none'
 						});
 						return;
-					} else if (!passReg.test(this.bindAccountObj.appUserSecret)) {
+					} else if (!loginPasswordReg.test(this.bindAccountObj.appUserSecret)) {
 						uni.showModal({
 							title: '提示',
 							content: '密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~',

-import Vue from "vue";
-import moment from "moment";
-const DATE_TIME_FORMAT = "YYYY-MM-DD HH:mm:ss";
-//手机号中间4位为*
-Vue.filter("phone", function (val) {
-  var tel = val;
-  tel = "" + tel;
-  var telShort = tel.replace(tel.substring(3, 7), "****");
-  return telShort;
-});
-//获取系统信息、判断ipX安全距离
-export const getTabbarHeight = function () {
-  var systemInfo = uni.getSystemInfoSync();
-  var data = {
-    ...systemInfo,
-    tabbarH: 50, //tabbar高度--单位px
-    tabbarPaddingB: 0, //tabbar底部安全距离高度--单位px
-    device: systemInfo.system.indexOf("iOS") != -1 ? "iOS" : "Android", //苹果或者安卓设备
-  };
-  let modelArr = [
-    "10,3",
-    "10,6",
-    "X",
-    "XR",
-    "XS",
-    "11",
-    "12",
-    "13",
-    "14",
-    "15",
-    "16",
-  ];
-  let model = systemInfo.model;
-  model &&
-    modelArr.forEach((item) => {
-      //适配iphoneX以上的底部，给tabbar一定高度的padding-bottom
-      if (
-        model.indexOf(item) != -1 &&
-        (model.indexOf("iPhone") != -1 || model.indexOf("iphone") != -1)
-      ) {
-        data.tabbarH = 70;
-        data.tabbarPaddingB = 20;
-      }
-    });
-  return data;
-};
-
-// px转upx
-export const px2upx = function (n) {
-  return n / (uni.upx2px(n) / n);
-};
-
-// 小程序获取定位权限判断
-// isOpenSetting  默认false:不检验授权，true:检验授权后获取地址
-function getMpLocation(successCallback, errCallback, isOpenSetting) {
-  uni.getSetting({
-    success: (res) => {
-      if (res.authSetting["scope.userLocation"] || !isOpenSetting) {
-        uni.getLocation({
-          // #ifndef MP-ALIPAY
-          type: "gcj02",
-          // #endif
-          success(res) {
-            console.log("successCallback");
-            successCallback(res);
-          },
-          fail(err) {
-            console.log("位置信息错误", err);
-            errCallback("位置信息获取失败");
-          },
-        });
-      } else {
-        errCallback("“位置信息”未授权");
-        isOpenSetting &&
-          uni.showModal({
-            title: "提示",
-            content: "请先在设置页面打开“位置信息”使用权限",
-            confirmText: "去设置",
-            cancelText: "再逛会",
-            success: (res) => {
-              if (res.confirm) {
-                uni.openSetting();
-              }
-            },
-          });
-      }
-    },
-  });
-}
-// 获取地址信息
-let locationAuthorize = true;
-export const getAppLatLon = function (
-  successCallback,
-  errCallback,
-  isOpenSetting
-) {
-  const _this = this;
-  // #ifdef MP-WEIXIN
-  if (locationAuthorize && isOpenSetting) {
-    uni.authorize({
-      scope: "scope.userLocation",
-      success: () => {
-        getMpLocation(successCallback, errCallback, isOpenSetting);
-        locationAuthorize = false;
-      },
-      fail: () => {
-        locationAuthorize = false;
-      },
-    });
-  } else {
-    getMpLocation(successCallback, errCallback, isOpenSetting);
-  }
-  // #endif
-  // #ifdef MP-ALIPAY
-  getMpLocation(successCallback, errCallback, false);
-  // #endif
-  // #ifdef H5
-  uni.getLocation({
-    type: "gcj02",
-    success(res) {
-      console.log("successCallback");
-      successCallback(res);
-    },
-    fail(err) {
-      console.log("位置信息错误", err);
-      errCallback("位置信息获取失败");
-    },
-  });
-  // #endif
-};
-
-export function formatToDate(date = undefined, format = DATE_TIME_FORMAT) {
-  return moment(date).format(format);
-}
+import Vue from "vue";
+import moment from "moment";
+const DATE_TIME_FORMAT = "YYYY-MM-DD HH:mm:ss";
+
+/**
+   登录密码正则验证
+   最短8位，最长16位
+   必须包含1个数字
+   必须包含1个小写字母
+   必须包含1个大写字母
+   必须包含1个特殊字符
+ */
+export const loginPasswordReg =/^.*(?=.{6,16})(?=.*\d)(?=.*[A-Z]{1,})(?=.*[a-z]{1,})(?=.*[_!@#$%^&*?\(\)]).*$/;	
+
+//手机号中间4位为*
+Vue.filter("phone", function (val) {
+  var tel = val;
+  tel = "" + tel;
+  var telShort = tel.replace(tel.substring(3, 7), "****");
+  return telShort;
+});
+//获取系统信息、判断ipX安全距离
+export const getTabbarHeight = function () {
+  var systemInfo = uni.getSystemInfoSync();
+  var data = {
+    ...systemInfo,
+    tabbarH: 50, //tabbar高度--单位px
+    tabbarPaddingB: 0, //tabbar底部安全距离高度--单位px
+    device: systemInfo.system.indexOf("iOS") != -1 ? "iOS" : "Android", //苹果或者安卓设备
+  };
+  let modelArr = [
+    "10,3",
+    "10,6",
+    "X",
+    "XR",
+    "XS",
+    "11",
+    "12",
+    "13",
+    "14",
+    "15",
+    "16",
+  ];
+  let model = systemInfo.model;
+  model &&
+    modelArr.forEach((item) => {
+      //适配iphoneX以上的底部，给tabbar一定高度的padding-bottom
+      if (
+        model.indexOf(item) != -1 &&
+        (model.indexOf("iPhone") != -1 || model.indexOf("iphone") != -1)
+      ) {
+        data.tabbarH = 70;
+        data.tabbarPaddingB = 20;
+      }
+    });
+  return data;
+};
+
+// px转upx
+export const px2upx = function (n) {
+  return n / (uni.upx2px(n) / n);
+};
+
+// 小程序获取定位权限判断
+// isOpenSetting  默认false:不检验授权，true:检验授权后获取地址
+function getMpLocation(successCallback, errCallback, isOpenSetting) {
+  uni.getSetting({
+    success: (res) => {
+      if (res.authSetting["scope.userLocation"] || !isOpenSetting) {
+        uni.getLocation({
+          // #ifndef MP-ALIPAY
+          type: "gcj02",
+          // #endif
+          success(res) {
+            console.log("successCallback");
+            successCallback(res);
+          },
+          fail(err) {
+            console.log("位置信息错误", err);
+            errCallback("位置信息获取失败");
+          },
+        });
+      } else {
+        errCallback("“位置信息”未授权");
+        isOpenSetting &&
+          uni.showModal({
+            title: "提示",
+            content: "请先在设置页面打开“位置信息”使用权限",
+            confirmText: "去设置",
+            cancelText: "再逛会",
+            success: (res) => {
+              if (res.confirm) {
+                uni.openSetting();
+              }
+            },
+          });
+      }
+    },
+  });
+}
+// 获取地址信息
+let locationAuthorize = true;
+export const getAppLatLon = function (
+  successCallback,
+  errCallback,
+  isOpenSetting
+) {
+  const _this = this;
+  // #ifdef MP-WEIXIN
+  if (locationAuthorize && isOpenSetting) {
+    uni.authorize({
+      scope: "scope.userLocation",
+      success: () => {
+        getMpLocation(successCallback, errCallback, isOpenSetting);
+        locationAuthorize = false;
+      },
+      fail: () => {
+        locationAuthorize = false;
+      },
+    });
+  } else {
+    getMpLocation(successCallback, errCallback, isOpenSetting);
+  }
+  // #endif
+  // #ifdef MP-ALIPAY
+  getMpLocation(successCallback, errCallback, false);
+  // #endif
+  // #ifdef H5
+  uni.getLocation({
+    type: "gcj02",
+    success(res) {
+      console.log("successCallback");
+      successCallback(res);
+    },
+    fail(err) {
+      console.log("位置信息错误", err);
+      errCallback("位置信息获取失败");
+    },
+  });
+  // #endif
+};
+
+export function formatToDate(date = undefined, format = DATE_TIME_FORMAT) {
+  return moment(date).format(format);
+}
+
+//封装uniapp跳转 navigateTo
+export const useNavigateTo=(path,param)=>{
+	if (!path) return
+	if(param){
+		uni.navigateTo({
+			url: path + encodeURIComponent(JSON.stringify(param))
+		});
+	}else{
+		uni.navigateTo({
+			url:path
+		});
+	}
+}
\ No newline at end of file

@@ -52,6 +52,7 @@
 
 <script>
 	import api from '@/api/index.js'
+	import { loginPasswordReg } from '@/plugins/utils.js'
 
 	var clear;
 	export default {
@@ -156,14 +157,13 @@
 				this.nextStatus = false;
 			},
 			onSubmit() {
-				const passReg = /^(?=.*?[A-Z])(?=(.*[a-z]){1,})(?=(.*[\d]){1,})(?=(.*[\W]){1,})(?!.*\s).{8,}$/;
 				if (this.password == '' && this.rePassword == '') {
 					uni.showToast({
 						title: '请输入密码~',
 						icon: 'none'
 					});
 					return;
-				} else if (!passReg.test(this.password) && !passReg.test(this.rePassword)) {
+				} else if (!loginPasswordReg.test(this.password) && !loginPasswordReg.test(this.rePassword)) {
 					//uni.showToast，字数过长，会造成手机上显示不完全，官方bug，采用uni.showModal
 					uni.showModal({
 						title: '提示',

@@ -69,6 +69,7 @@
 		mapState
 	} from "vuex";
 	import api from '@/api'
+	import { loginPasswordReg } from '@/plugins/utils.js'
 
 	export default {
 		data() {
@@ -97,14 +98,17 @@
 				},
 			});
 			//#endif
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: false
+			});
 		},
 		computed: {
 			...mapState(["plateInfo"]),
 		},
-		mounted() {
-			this.getPlateForm();
-		},
 		onShow() {
+			uni.setStorageSync('getConfiguration', {
+				isConfiguration: false
+			});
 			this.getPlateForm();
 		},
 		methods: {
@@ -237,18 +241,15 @@
 				if (this.loginForm.username == "") {
 					return uni.$u.toast("请输入登录账号~");
 				}
-				const passReg =
-					/^(?=.*?[A-Z])(?=(.*[a-z]){1,})(?=(.*[\d]){1,})(?=(.*[\W]){1,})(?!.*\s).{8,}$/;
-
 				if (this.loginForm.password == "") {
 					uni.showToast({
 						title: "请输入登录密码~",
 						icon: "none",
 					});
 					return;
-				} else if (!passReg.test(this.loginForm.password)) {
+				} else if (!loginPasswordReg.test(this.loginForm.password)) {
 					uni.showModal({
-						title: "提示",
+						title: "提示",	
 						content: "密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~",
 						showCancel: false,
 					});

-<template>
-	<view class="notify-detail-page">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<view class="notify-column">
-			<view class="column-list">
-				<view style="margin-left: 36rpx;position: relative;top: 21rpx;">
-					<view class="text-clip" style="width:500rpx">
-						<text class="notify-detail-text ">{{ notifyList.title }}</text>
-					</view>
-				</view>
-				<view style="height: 25rpx;"></view>
-				<u-list height="140rpx">
-					<u-list-item>
-						<u-cell :value="`${notifyList.senderDate}`" :title="`${notifyList.senderName}`">
-							<u-avatar slot="icon" shape="circle" size="35" :src="notifyList.avatar"></u-avatar>
-						</u-cell>
-					</u-list-item>
-				</u-list>
-				<view class="bottom-text">
-					<view class="u-flex column"></view>
-					<view style="margin-top: 21rpx;">
-						<!-- 富文本解析 -->
-						<u-parse :content="notifyList.content"></u-parse>
-						<!-- 富文本解析 -->
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			notifyList: {}
-		};
-	},
-	onLoad(e) {
-		// 隐藏原生的tabbar
-		uni.hideTabBar();
-		if (e.data !== null) {
-			let params = JSON.parse(decodeURIComponent(e.data));
-			if (params) this.notifyList = params;
-			uni.setStorageSync('storagePre', true);
-		}
-	},
-	onHide() {
-		uni.setStorageSync('storagePre', false);
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import './static/notifyDetail.scss';
-/deep/ .u-line {
-	position: relative !important;
-	width: 640rpx !important;
-	left: 31rpx !important;
-}
-</style>
+<template>
+	<view class="notify-detail-page">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<view class="notify-column">
+			<view class="column-list">
+				<view class="column-title">
+					<view class="text-clip" style="width:500rpx">
+						<text class="notify-detail-text ">{{ notifyList.title }}</text>
+					</view>
+				</view>
+				<view style="height: 25rpx;"></view>
+				<u-list height="140rpx">
+					<u-list-item>
+						<u-cell :value="`${notifyList.senderDate}`" :title="`${notifyList.senderName}`">
+							<u-avatar slot="icon" shape="circle" size="35" :src="notifyList.avatar"></u-avatar>
+						</u-cell>
+					</u-list-item>
+				</u-list>
+				<view class="bottom-text">
+					<view class="u-flex column"></view>
+					<view style="margin-top: 21rpx;">
+						<!-- 富文本解析 -->
+						<u-parse :content="notifyList.content"></u-parse>
+						<!-- 富文本解析 -->
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			notifyList: {}
+		};
+	},
+	onLoad(e) {
+		// 隐藏原生的tabbar
+		uni.hideTabBar();
+		if (e.data !== null) {
+			let params = JSON.parse(decodeURIComponent(e.data));
+			if (params) this.notifyList = params;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import './static/notifyDetail.scss';
+/deep/ .u-line {
+	position: relative !important;
+	width: 640rpx !important;
+	left: 31rpx !important;
+}
+</style>

-.notify-detail-page {
-	min-height: 100vh;
-	background-color: #f8f9fa;
-	padding-top: 10rpx;
-	padding-left: 27rpx;
-}
-.notify-column {
-	.column-list {
-		border-radius: 10px;
-		margin-top: 20rpx;
-		width: 696rpx;
-		height: 1000rpx;
-		background-color: #ffffff;
-		.bottom-text {
-			margin-left: 33rpx;
-			.text {
-				color: #2e384d;
-				font-size: 15px;
-			}
-			.column {
-				margin-top: 20rpx;
-				.text {
-					font-size: 16px;
-					font-family: PingFangSC-Medium, PingFang SC;
-					font-weight: 500;
-					color: #2e384d;
-				}
-			}
-		}
-	}
-}
+.notify-detail-page {
+	min-height: 100vh;
+	background-color: #f8f9fa;
+	padding-top: 10rpx;
+	padding-left: 27rpx;
+}
+.notify-column {
+	.column-list {
+		border-radius: 10px;
+		margin-top: 20rpx;
+		width: 696rpx;
+		height: 1000rpx;
+		background-color: #ffffff;
+		.column-title{
+			margin-left: 36rpx;
+			position: relative;
+			top: 21rpx;
+		}
+		.bottom-text {
+			margin-left: 33rpx;
+			.text {
+				color: #2e384d;
+				font-size: 15px;
+			}
+			.column {
+				margin-top: 20rpx;
+				.text {
+					font-size: 16px;
+					font-family: PingFangSC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #2e384d;
+				}
+			}
+		}
+	}
+}

-.notify-page {
-	min-height: 100vh;
-	background-color: #f8f9fa;
-	padding-top: 10rpx;
-	padding-left: 27rpx;
-}
-/deep/.u-list-item {
-	background: #ffffff;
-	width: 695rpx;
-	border-radius: 10px;
-	margin-top: 20rpx;
-}
-.notify-main {
-	.main {
-		flex-direction: column;
-		margin-left: -22rpx;
-		.main-item {
-			justify-content: space-between;
-			flex-direction: row;
-			margin: 15rpx;
-			width: 700rpx;
-			height: 136rpx;
-			background: #ffffff;
-			border-radius: 10px;
-			.item {
-				justify-content: space-between;
-				flex-direction: row;
-				.item-avatar {
-					margin-left: 30rpx;
-					.avatar {
-						margin-left: 30rpx;
-					}
-				}
-				.item-content {
-					margin-left: 30rpx;
-					text-align: left;
-					justify-content: space-between;
-					flex-direction: column;
-					.text-top {
-						width: 400rpx;
-						color: #2e384d;
-						font-size: 15px;
-					}
-					.text-bottom {
-						width: 400rpx;
-						color: #999999;
-						font-size: 13px;
-					}
-				}
-			}
-			.item-right {
-				.text {
-					margin-right: 30rpx;
-					color: #999999;
-					font-size: 13px;
-				}
-			}
-		}
-	}
-}
+.notify-page {
+	min-height: 100vh;
+	background-color: #f8f9fa;
+	padding-top: 10rpx;
+	padding-left: 27rpx;
+	.notify-page-top-select{
+		width: 750rpx;
+		height:53rpx;
+		background-color: #f8f9fa;
+		position:fixed;
+		top:0;
+		z-index: 99999;
+	}
+	.top-select{
+		background-color: #f8f9fa;
+		width: 700rpx;
+		position: relative;
+		top: 35rpx;
+	}
+}
+/deep/.u-list-item {
+	background: #ffffff;
+	width: 695rpx;
+	border-radius: 10px;
+	margin-top: 20rpx;
+}
+.notify-main {
+	.main {
+		flex-direction: column;
+		margin-left: -22rpx;
+		.main-item {
+			justify-content: space-between;
+			flex-direction: row;
+			margin: 15rpx;
+			width: 700rpx;
+			height: 136rpx;
+			background: #ffffff;
+			border-radius: 10px;
+			.item {
+				justify-content: space-between;
+				flex-direction: row;
+				.item-avatar {
+					margin-left: 30rpx;
+					.avatar {
+						margin-left: 30rpx;
+					}
+				}
+				.item-content {
+					margin-left: 30rpx;
+					text-align: left;
+					justify-content: space-between;
+					flex-direction: column;
+					.text-top {
+						width: 400rpx;
+						color: #2e384d;
+						font-size: 15px;
+					}
+					.text-bottom {
+						width: 400rpx;
+						color: #999999;
+						font-size: 13px;
+					}
+				}
+			}
+			.item-right {
+				.text {
+					margin-right: 30rpx;
+					color: #999999;
+					font-size: 13px;
+				}
+			}
+		}
+	}
+}

-<template>
-	<view class="notify-page">
-		<!-- 公共组件-每个页面必须引入 -->
-		<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>
-			</view>
-		</view>
-		<view style="height: 110rpx;"></view>
-		<view class="notify-main">
-			<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 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="u-flex item-content">
-								<text class="text-top text-clip">{{ item.sysNotice.title }}</text>
-								<text class="text-bottom text-clip">{{ item.sysNotice.createTime }}</text>
-							</view>
-						</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 />
-						</view>
-					</view>
-				</view>
-			</mescroll-body>
-		</view>
-	</view>
-</template>
-
-<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注册全局组件)
-		data() {
-			return {
-				model1: {
-					userInfo: {
-						type: ''
-					}
-				},
-				showType: false,
-				actions: [{
-						name: '全部',
-						value: ''
-					},
-					{
-						name: '会议',
-						value: 'MEETING'
-					},
-					{
-						name: '公告',
-						value: 'NOTICE'
-					},
-					{
-						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();
-			},
-			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.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);
-				}
-			},
-
-			async loadData(pageNo, t) {
-				let httpData = {
-					page: pageNo,
-					pageSize: 10,
-					type: t
-				};
-				const res = await api.notifyApi.getNotifyApi({
-					params: httpData,
-					custom: {
-						load: false
-					}
-				})
-				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))
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import './static/systemNotify.scss';
-
-	/deep/ .u-badge--error {
-		position: relative;
-		right: 11rpx;
-	}
-</style>
+<template>
+	<view class="notify-page">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<view class="notify-page-top-select">
+			<view @click="handleTypeClick" class="top-select">
+				<u--input suffixIcon="arrow-down" shape="circle" disabled v-model="notifyType"
+					placeholder="请选择类型" border="surround"></u--input>
+				<u-action-sheet safe-area-inset-bottom :show="showType" :actions="actions" title="请选择类型" @close="showType = false"
+					@select="handleTypeSelect"></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">
+				<view class="u-flex main">
+					<view @click="handleNotifyDetail(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="u-flex item-content">
+								<text class="text-top text-clip">{{ item.sysNotice.title }}</text>
+								<text class="text-bottom text-clip">{{ item.sysNotice.senderDate }}</text>
+							</view>
+						</view>
+						<view class="item-right u-flex" style="justify-content: space-between;">
+							<text class="text">{{ formatType(item.sysNotice.type) }}</text>
+							<!-- readStatus===0则阅读状态表示未阅读 -->
+							<u-badge style="margin-right: 10rpx;" v-if="item.readStatus == '0'" numberType="overflow"
+								isDot />
+						</view>
+					</view>
+				</view>
+			</mescroll-body>
+		</view>
+	</view>
+</template>
+
+<script>
+	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
+	import api from '@/api/index.js'
+	import { useNavigateTo } from '@/plugins/utils.js'
+
+	export default {
+		mixins: [MescrollMixin],
+		data() {
+			return {
+				notifyType:'',
+				showType: false,
+				actions: [{
+						name: '全部',
+						value: ''
+					},
+					{
+						name: '会议',
+						value: 'MEETING'
+					},
+					{
+						name: '公告',
+						value: 'NOTICE'
+					},
+					{
+						name: '其他',
+						value: 'OTHER'
+					}
+				],
+				page: {
+					page: 0,
+					pageSize: 10
+				},
+				downOption: {
+					auto: false //是否在初始化后,自动执行downCallback; 默认true
+				},
+				list: [],
+				selectType: '',
+				distance: 0,
+			};
+		},
+		onLoad(e) {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+		},
+		methods: {
+			formatType(e) {
+				return this.actions.find((item)=>item.value===e && item.value!=='').name
+			},
+			handleTypeClick() {
+				this.showType = true;
+				uni.hideKeyboard();
+			},
+			handleTypeSelect(e) {
+				this.selectType = e.value;
+				this.page.page = 1;
+				this.notifyType = e.name;
+				this.loadData(1, !this.selectType ? null : this.selectType);
+			},
+			downCallback() {
+				this.list.length = 0;
+				this.page.page = 1;
+				this.loadData(1);
+				this.selectType = '';
+				this.notifyType = '';
+			},
+			upCallback() {
+				if (this.selectType) {
+					this.page.page += 1;
+					this.loadData(this.page.page, this.selectType);
+				} else {
+					this.page.page += 1;
+					this.loadData(this.page.page);
+				}
+			},
+			async loadData(page, type) {
+				let params = {
+					page,
+					pageSize: 10,
+					type
+				};
+				const res = await api.notifyApi.getNotifyApi({
+					params,
+					custom: {
+						load: false
+					}
+				})
+				uni.stopPullDownRefresh();
+				this.mescroll.endByPage(res.items.length, res.total);
+				if (page == 1) {
+					this.list = res.items;
+				} else {
+					this.list = this.list.concat(res.items);
+				}
+			},
+			async handleNotifyDetail(item, index) {
+				this.list[index].readStatus = 1;//点击了则说明阅读了
+				await api.notifyApi.byNotifyIdGetDetailApi(item.sysNotice.id)
+				useNavigateTo('./notifyDetail?data=', item.sysNotice)
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import './static/systemNotify.scss';
+
+	/deep/ .u-badge--error {
+		position: relative;
+		right: 11rpx;
+	}
+</style>