Merge branch 'dev-ft' into 'main'

fix：修改告警分页问题隐藏样式问题 fix：移除解密插件

See merge request huang/thingskit-app!41

@@ -70,8 +70,12 @@
 			<view><u--textarea border="none" height="96" placeholder="请输入处理结果" v-model="formModel.result" count></u--textarea></view>
 		</view>
 		<!-- #endif -->
-		<view v-if="list.status !== 'CLEARED_ACK'" style="margin-top: 44rpx;display: flex;align-items: center;justify-content: center;">
-			<view class="u-flex" style="width: 400rpx"><u-button @click="handleSubmit" type="primary" shape="circle" text="处理"></u-button></view>
+		<view style="margin-top: 44rpx;display: flex;align-items: center;justify-content: space-between;">
+			<view v-if="list.status !== 'CLEARED_ACK' && list.status !== 'ACTIVE_ACK'" class="u-flex" style="width: 260rpx">
+				<u-button @click="handleSubmit" type="primary" shape="circle" text="处理"></u-button>
+			</view>
+			<view style="width: 30rpx;"></view>
+			<view v-if="list.status == 'ACTIVE_ACK'" class="u-flex" style="width: 260rpx"><u-button @click="handleRemove" type="error" shape="circle" text="清除"></u-button></view>
 		</view>
 	</view>
 </template>
@@ -95,6 +99,7 @@ export default {
 		uni.hideTabBar();
 	},
 	methods: {
+		//处理
 		handleSubmit() {
 			if (this.formModel.result == '') return uni.$u.toast('请输入处理结果');
 			else
@@ -121,6 +126,31 @@ export default {
 						uni.$u.toast(e.data?.message);
 					});
 		},
+		//清除
+		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(() => {
+							uni.navigateBack({
+								delta: 1
+							});
+						}, 500);
+					}
+				})
+				.catch(e => {
+					uni.$u.toast(e.data?.message);
+				});
+		},
 		formatDetailText(e) {
 			//去除字符串双引号
 			const jsonStr = JSON.stringify(e);

 .alarm-detail-page {
 	padding: 30rpx;
 }
-.alarm-detail-column {
+.alarm- {
 	border-radius: 10px;
 	width: 688rpx;
 	height: 573rpx;

@@ -12,7 +12,6 @@
 	"author": "",
 	"license": "ISC",
 	"dependencies": {
-		"crypto": "^1.0.1",
 		"moment": "^2.29.2"
 	}
 }

@@ -302,7 +302,7 @@ export default {
 			this.selectTimeVal = e.value;
 			let curTime = new Date();
 			const formatS = curTime.getTime();
-			let addMinute = new Date(curTime.setMinutes(curTime.getMinutes() + this.selectTimeVal));
+			let addMinute = new Date(curTime.setMinutes(curTime.getMinutes() - this.selectTimeVal));
 			const formatE = addMinute.getTime();
 			this.timeData.getTimeGapS = formatS;
 			this.timeData.getTimeGapE = formatE;
@@ -323,8 +323,8 @@ export default {
 				this.startTimeArea = '';
 				this.endTimeArea = '';
 			} else {
-				this.startTimeArea = this.timeData.getTimeGapS;
-				this.endTimeArea = this.timeData.getTimeGapE;
+				this.startTimeArea = this.timeData.getTimeGapE;
+				this.endTimeArea = this.timeData.getTimeGapS;
 			}
 			this.loadData(
 				1,

@@ -136,6 +136,7 @@
 				width: 400rpx;
 				text-align: left;
 				margin-top: 13rpx;
+				line-height: 40rpx;
 
 				.text {
 					color: #666666;

@@ -5,12 +5,12 @@
 		<view class="org-sty">
 			<view @click="openOrg" class="org-item">
 				<view class="u-flex org-contact"><text class="text">组织关系</text></view>
-				<view class="u-flex org-device">
+				<view @click="openOrg" class="u-flex org-device">
 					<image class="device-image" src="../../../static/org.png"></image>
 					<text class="device-text">摄像头数：{{ cameraTotal }}</text>
 				</view>
 			</view>
-			<view class="org-item"><image class="image" src="../../../static/arrow-right.png"></image></view>
+			<view @click="openOrg" class="org-item"><image class="image" src="../../../static/arrow-right.png"></image></view>
 		</view>
 		<view style="height: 150rpx;"></view>
 		<!-- 自带分页组件 -->

@@ -8,7 +8,7 @@
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 				<block v-if="userInfo.isToken || userInfo.isThirdLogin">
 					<view @click="openPersonalInfo" class="u-m-r-20">
-						<image class="avatar" mode="aspectFill" :src="!userInfo.avatar ? '../../static/logo.png' : userInfo.avatar"></image>
+						<image class="avatar" mode="aspectFill" :src="!userInfo.avatar ? '../../static/logo.png' : userInfo.avatar || thirdObj.avatarUrl"></image>
 					</view>
 					<view class="u-flex-1">
 						<view class="nickName u-flex">
@@ -154,17 +154,19 @@ export default {
 				appUserKey: '',
 				appUserSecret: ''
 			},
-			thirdObj: {}
+			thirdObj: {},
+			getOpenId: ''
 		};
 	},
 	onLoad(e) {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
-		if (e.obj != null) {
-			const params = JSON.parse(decodeURIComponent(e.obj));
-			this.thirdObj = params;
-		}
-		console.log('UserInfo', this.userInfo);
+		// if (e.obj != null) {
+		// 	const params = JSON.parse(decodeURIComponent(e.obj));
+		// 	// uni.$u.toast('eee', params.avatarUrl);
+		// 	this.thirdObj = params;
+		// }
+		this.getOpenId = getApp().globalData.openId;
 	},
 	computed: {
 		...mapState(['userInfo'])
@@ -232,7 +234,7 @@ export default {
 					loginMethod: 'ACCOUNT',
 					...this.bindAccountObj,
 					platformName: 'WECHAT',
-					...this.thirdObj
+					thirdUserId: this.getOpenId
 				};
 				uni.$u.http
 					.post('/yt/third/bind', postData)
@@ -260,8 +262,8 @@ export default {
 						}
 					})
 					.catch(e => {
-						uni.$u.toast(e.data?.msg || e.data?.message);
-						this.show = false;
+						uni.$u.toast(e.data?.msg);
+						this.show = true;
 					});
 			} else {
 				const phoneRegular = /^1\d{10}$/;
@@ -295,7 +297,7 @@ export default {
 					loginMethod: 'PHONE',
 					...this.bindPhoneObj,
 					platformName: 'WECHAT',
-					...this.thirdObj
+					thirdUserId: this.getOpenId
 				};
 				uni.$u.http
 					.post('/yt/third/bind', postData)
@@ -321,8 +323,8 @@ export default {
 						this.saveUserInfo();
 					})
 					.catch(e => {
-						uni.$u.toast(e.data?.msg || e.data?.message);
-						this.show = false;
+						uni.$u.toast(e.data?.msg);
+						this.show = true;
 					});
 			}
 		},

@@ -11,8 +11,10 @@
 		width: 50px;
 		height: 50px;
 		border-radius: 25px;
-		background-color: #ccc;
+		background: #d8d8d8;
 		justify-content: center;
+		border: 2px solid #ffffff;
+		box-shadow: 0px 14px 26px 0px rgba(4, 7, 26, 0.2);
 	}
 	.click-login {
 		font-size: 18px;

@@ -3,7 +3,7 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<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-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>
@@ -46,8 +46,12 @@
 			</u--form>
 		</view>
 		<view class="basic-bottom u-flex">
-			<view class="item" v-if="info.data.isToken"><button class="submit" size="default" @click="clearAccountFunc" :style="{ background: InfoColor }">解绑</button></view>
-			<view class="item" style="margin-right: 60rpx;"><button class="submit" size="default" @click="onSubmitFunc" :style="{ background: PrimaryColor }">确认</button></view>
+			<view class="item" v-if="info.data.isThirdLogin">
+				<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="[{ position: info.data.isThirdLogin ? '' : 'relative' }, { right: info.data.isThirdLogin ? '' : '-190rpx' }]">
+				<button class="submit" size="default" @click="onSubmitFunc" :style="{ background: PrimaryColor }"><text class="un-bind-text">确认</text></button>
+			</view>
 		</view>
 		<!-- #ifdef MP -->
 		<view class="u-m-t-40"><text style="visibility: hidden;">#</text></view>
@@ -67,12 +71,16 @@
 </template>
 
 <script>
+import { mapMutations } from 'vuex';
+import baseUrl from '@/config/baseUrl.js';
+import { mapState } from 'vuex';
+
 export default {
 	data() {
 		return {
 			showBind: false,
 			PrimaryColor: '#377DFF', //主题色
-			InfoColor: '#E3E4E5', //主题色
+			InfoColor: '#00C9A7', //主题色
 			myInfoModel: {
 				userInfo: {
 					realName: '',
@@ -87,7 +95,8 @@ export default {
 			avatar: '',
 			id: '',
 			info: {},
-			openIds: ''
+			openIds: '',
+			isUpdatePersonOrLoginInfo: false
 		};
 	},
 	onLoad(e) {
@@ -99,7 +108,7 @@ export default {
 			this.myInfoModel.userInfo.username = params.data.username;
 			this.myInfoModel.userInfo.email = params.data.email;
 			this.myInfoModel.userInfo.accountExpireTime = params.data.accountExpireTime;
-			this.avatar = params.data.avatar == undefined ? '../../static/avatar-test.png' : params.data.avatar;
+			this.avatar = params.data.avatar == undefined ? '../../static/logo.png' : params.data.avatar;
 			this.id = params.data.userId;
 		}
 	},
@@ -109,7 +118,11 @@ export default {
 			this.openIds = getOpenId;
 		}
 	},
+	computed: {
+		...mapState(['userInfo'])
+	},
 	methods: {
+		...mapMutations(['setUserInfo']),
 		confrimBind(e) {
 			if (e) {
 				//解绑
@@ -136,8 +149,13 @@ export default {
 			this.showBind = true;
 		},
 		// 修改头像
-		upAvatar() {
-			var that = this;
+		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'],
@@ -166,17 +184,21 @@ export default {
 						});
 						return;
 					}
-					uni.$u.http
-						.upload('/yt/oss/upload', {
-							filePath: tempFilePaths[0],
-							name: 'file'
-						})
-						.then(res => {
-							if (res) {
-								that.avatar = res.fileStaticUri;
-								return uni.$u.toast('头像上传成功');
-							}
-						});
+					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('头像上传成功');
+						}
+					});
 				}
 			});
 		},
@@ -192,6 +214,7 @@ export default {
 				.put('/yt/user/center', httpData)
 				.then(res => {
 					if (res) {
+						this.setUserInfo(res);
 						uni.showToast({
 							title: '更新个人资料成功~',
 							icon: 'none'

@@ -6,7 +6,6 @@
 			<view class="content">
 				<view class="hello login-text-muted">您好,</view>
 				<view class="hello-welcome login-text-muted">欢迎来到ThingsKit!</view>
-				<view class="circleStyle"></view>
 			</view>
 		</view>
 		<view class="f__login">
@@ -17,7 +16,9 @@
 				</view>
 				<view class="form-row u-flex">
 					<view class="v-input"><input type="text" v-model="loginForm.password" maxlength="32" placeholder="请输入登录密码" :password="!showPassword" /></view>
-					<view class="v-password" @click="showPasswordMode"><u-icon color="#9a9a9a" size="25" :name="showPassword ? 'eye-fill' : 'eye-off'"></u-icon></view>
+					<view class="v-password" @click="showPasswordMode">
+						<u-icon color="#9a9a9a" width="18" height="15" :name="showPassword ? '/static/eye.png' : '/static/eye-hide.png'"></u-icon>
+					</view>
 					<u-icon></u-icon>
 				</view>
 				<button class="submit" size="default" @click="onSubmitFunc"><text class="text">登录</text></button>
@@ -28,8 +29,7 @@
 				<view class="u-flex link-login">
 					<view class="link-text login-text-gray">第三方账号登录</view>
 					<view style="height:20rpx"></view>
-					<view @click="onAuthorization" class="link-image"><image class="image" src="../../static/weixin.png" mode="aspectFill"></image></view>
-					<view class="circleStyleBottom"></view>
+					<button class="link-image" @tap="onWenxinAuthorization"><image class="image" src="../../static/weixin.png" mode="aspectFill"></image></button>
 				</view>
 			</view>
 		</view>
@@ -52,79 +52,59 @@ export default {
 			},
 			showPassword: false,
 			code: '',
-			openid: '',
-			session_key: ''
+			openid: ''
 		};
 	},
 	onLoad() {
-		//#ifdef MP-WEIXIN
 		wx.login({
 			success: res => {
 				if (res.code) {
 					this.code = res.code;
-					wx.request({
-						url: `https://api.weixin.qq.com/sns/jscode2session?appid=${appId}&secret=${appSecrect}&js_code=${this.code}&grant_type=authorization_code`,
-						method: 'GET',
-						success: res => {
-							if (res.statusCode == 200) {
-								this.openid = res.data.openid;
-								this.session_key = res.data.session_key;
-								//设置全局变量openId
-								getApp().globalData.openId = res.data.openid;
-							}
-						},
-						complete: e => {
-							if (e.data.errcode != null) {
-								return;
-								// return uni.$u.toast('获取用户唯一id失败');
-							}
-						}
-					});
+					//这里获取openid
 				} else {
+					return;
 				}
 			}
 		});
-		//#endif
 	},
 	methods: {
 		...mapMutations(['setUserInfo']),
 		...mapActions(['updateBadgeTotal']),
 		//微信授权登录
 		//#ifdef MP-WEIXIN
-		onAuthorization() {
-			/**
-			 * 注意：通过wx.getUserProfile并不能获取用户的openid，openid是唯一识别用户的标识，
-			 * 所以最好在用户授权登录时就获取。调用wx.login()获取
-			 */
+		onWenxinAuthorization() {
 			wx.getUserProfile({
-				desc: '获取用户授权信息',
-				success: res => {
-					if (res) {
-						//微信官方自带解密（node.js实现）
-						let pc = new WXBizDataCrypt(appId, this.session_key);
-						let data = pc.decryptData(res.encryptedData, res.iv);
+				desc: '微信第三方授权',
+				success: reswenxin => {
+					console.log('res=======>', reswenxin);
+					if (reswenxin.errMsg === 'getUserProfile:ok' && reswenxin.encryptedData) {
+						console.log('获取code', this.code);
+						//获取用户信息
 						let obj = {
-							avatarUrl: data.avatarUrl,
-							nickName: data.nickName,
+							avatarUrl: reswenxin.userInfo.avatarUrl,
 							thirdUserId: this.openid
 						};
 						//判断是否需要绑定
 						uni.$u.http
-							.get(`/yt/third/login/${this.openid}`)
+							.get(`/yt/third/login/${this.code}`)
 							.then(res => {
-								if (res.token == '' || res.token == null) {
-									//需要绑定，跳转我的页面进行绑定,显示绑定按钮
-									uni.reLaunch({
-										url: '../../pages/personal/personal'
-									});
+								console.log('Res', res);
+								//设置全局变量openId
+								// getApp().globalData.openId = res.data.openid;
+								if (res.token == '' || (res.token == null && res.refreshToken)) {
+									//需要绑定
 									let userInfo = {
-										isThirdLogin: true, //token用于判断是否登录
-										avatar: data.avatarUrl
+										isThirdLogin: true, //用于判断是否是第三方登录并且需要绑定账号
+										avatar: obj.avatarUrl
 									};
 									this.setUserInfo(userInfo);
+									//设置全局变量openId
+									getApp().globalData.openId = res.refreshToken;
+									uni.reLaunch({
+										url: '../../pages/personal/personal'
+									});
 								} else {
-									// 不需要绑定
-									// 储存登录信息
+									// 不需要绑定,直接第三方登录使用
 									let resObj = {
 										refreshToken: res.refreshToken,
 										isToken: res.token
@@ -132,7 +112,7 @@ export default {
 									let userInfo = {
 										...resObj,
 										token: true, //token用于判断是否登录
-										isThirdLogin: false
+										isThirdLoginAndNoDind: true //用于判断是否是第三方登录并且不需要绑定账号
 									};
 									if (userInfo.token) {
 										this.setUserInfo(userInfo);
@@ -151,18 +131,11 @@ export default {
 							.catch(e => {
 								uni.$u.toast(e.data?.message);
 							});
-						/**
-						 * 有些时候uni.navigatorBack({})没有返回到上级页面
-						 * 才使用uni.reLaunch()进行跳转
-						 */
-						// #ifdef MP
-						setTimeout(() => {
-							uni.reLaunch({
-								url: '../../pages/personal/personal?obj=' + encodeURIComponent(JSON.stringify(obj))
-							});
-						}, 500);
-						// #endif
 					}
+				},
+				fail: res => {
+					//拒绝授权
+					return;
 				}
 			});
 		},
@@ -243,14 +216,6 @@ export default {
 					uni.$u.toast(e.data?.message);
 				});
 		},
-		saveUserInfo() {
-			//储存个人信息
-			uni.$u.http.get('/yt/user/me/info').then(res => {
-				if (res) {
-					this.setUserInfo(res);
-				}
-			});
-		},
 		openCodeFunc() {
 			uni.navigateTo({
 				url: '../other/code'
@@ -270,4 +235,7 @@ export default {
 
 <style lang="scss" scoped>
 @import './static/login.scss';
+/deep/ button {
+	background: rgba(0, 0, 0, 0);
+}
 </style>

 .login-page {
 	min-height: 100vh;
-	background-color: #fff;
+	width: 750rpx;
+	background: url(/static/login.png) no-repeat;
 	.login-main {
 		flex-direction: column;
 		.content {
 			height: 250rpx;
 			margin-top: 90rpx;
 			margin-left: -107rpx;
+			position: relative;
+			top: 50rpx;
+			left: -15rpx;
 			.hello {
 				font-size: 30px;
 				color: #3a4759;
@@ -21,16 +25,6 @@
 			}
 		}
 	}
-	.circleStyle {
-		position: absolute;
-		width: 145rpx;
-		height: 300rpx;
-		left: -31rpx;
-		top: 10rpx;
-		border-radius: 0 100rpx 100rpx 0/0 150rpx 150rpx 0;
-		background-color: #f0f2f5;
-		opacity: 0.5;
-	}
 }
 
 .f__login {
@@ -47,7 +41,7 @@
 		margin-top: 60rpx;
 		.v-input {
 			width: 690rpx;
-			border-bottom: 2px solid #e5e5e5;
+			border-bottom: 1px solid #e5e5e5;
 		}
 		.v-password {
 			position: absolute;
@@ -107,19 +101,4 @@
 			}
 		}
 	}
-	.circleStyleBottom {
-		position: absolute;
-		width: 145rpx;
-		height: 300rpx;
-		right: -31rpx;
-		top: 404rpx;
-		//#ifndef MP
-		top: 504rpx;
-		//#endif
-		border-radius: 0 100rpx 100rpx 0/0 150rpx 150rpx 0;
-		background: linear-gradient(241deg, #00c9a7 0%, rgba(0, 223, 252, 0.5) 100%);
-		opacity: 0.1;
-		transform: rotate(180deg);
-		z-index: -9999;
-	}
 }

@@ -14,6 +14,7 @@ export const mutations = {
 			// #endif
 			// #ifndef H5
 			uni.setStorageSync('userInfo', state.userInfo);
+			wx.setStorageSync('userInfo', state.userInfo);
 			// #endif
 		}
 	},

@@ -185,6 +185,13 @@ button {
 	font-weight: 400;
 	color: #333333 !important;
 }
+.un-bind-text {
+	font-size: 16px;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 400;
+	// color: #333333;
+	color: #ffffff;
+}
 // 定义flex等分
 @for $i from 0 through 12 {
 	.u-flex-#{$i} {

@@ -13,9 +13,9 @@
 				</u-list>
 				<view class="bottom-text">
 					<view class="u-flex column">
-						<text class="text">{{ notifyList.title }}</text>
+						<text class="text" style="font-weight: bold;">{{ notifyList.title }}</text>
 					</view>
-					<view style="margin-top: 20rpx;">
+					<view style="margin-top: 21rpx;">
 						<!-- 富文本解析 -->
 						<u-parse :content="notifyList.content"></u-parse>
 						<!-- 富文本解析 -->

@@ -2,9 +2,11 @@
 	<view class="notify-page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<view @click="openTypeClick" style="width: 700rpx;position: fixed;top: 0;z-index: 1;">
-			<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 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: 10rpx;">
+				<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: 76rpx;"></view>
 		<view class="notify-main">
@@ -82,7 +84,8 @@ export default {
 	onShow() {
 		this.pre = uni.getStorageSync('storagePre');
 		if (this.pre) {
-			this.loadData(1);
+			this.page.num = 1;
+			this.loadData(this.page.num);
 		}
 	},
 	onHide() {
@@ -97,19 +100,11 @@ export default {
 			uni.hideKeyboard();
 		},
 		typeSelect(e) {
-			this.topBack();
 			this.isJudgeNextPage = e.value;
 			this.page.num = 1;
 			this.model1.userInfo.type = e.name;
 			this.loadData(1, this.isJudgeNextPage == '' ? null : this.isJudgeNextPage);
 		},
-		//筛选数据让它回到顶部
-		topBack() {
-			uni.pageScrollTo({
-				scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
-				duration: 300 // 滚动动画的时长
-			});
-		},
 		/*下拉刷新的回调 */
 		downCallback() {
 			//联网加载数据