Merge branch 'ft-dev' into 'main'

fix:修改第三方登录获取openid  合并冲突

See merge request huang/thingskit-app!46

@@ -71,11 +71,26 @@
 		</view>
 		<!-- #endif -->
 		<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">
+			<view
+				:style="[
+					{ position: list.status !== 'CLEARED_ACK' && list.status !== 'ACTIVE_ACK' ? 'relative' : '' },
+					{ right: list.status !== 'CLEARED_ACK' && list.status !== 'ACTIVE_ACK' ? '-210rpx' : '' }
+				]"
+				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
+				:style="[{ position: list.status == 'ACTIVE_ACK' ? 'relative' : '' }, { right: list.status == 'ACTIVE_ACK' ? '207rpx' : '' }]"
+				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>
@@ -126,7 +141,7 @@ export default {
 						uni.$u.toast(e.data?.message);
 					});
 		},
-		//清除
+		// 清除
 		handleRemove() {
 			uni.$u.http
 				.post(`/alarm/${this.list.id}/clear`)

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

 <template>
-	<view class="alert-page">
+	<view class="alert-page" :class="show ? 'pop-no-scroll' : ''">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<!-- 吸顶组件 -->
@@ -278,6 +278,9 @@ export default {
 		}
 	},
 	methods: {
+		moveHandle() {
+			return false;
+		},
 		inputChanged(e) {
 			this.resetData();
 			this.topBack();
@@ -514,4 +517,10 @@ export default {
 /deep/ .uni-calendar--fixed {
 	bottom: 172rpx !important;
 }
+.pop-no-scroll {
+	overflow: hidden;
+	position: fixed;
+	height: 100%;
+	width: 100%;
+}
 </style>

@@ -7,17 +7,17 @@
 			<!-- 登录 -->
 			<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">
+					<view @click.top="openPersonalInfo" class="u-m-r-20">
 						<image class="avatar" mode="aspectFill" :src="!userInfo.avatar ? '../../static/logo.png' : userInfo.avatar || thirdObj.avatarUrl"></image>
 					</view>
-					<view class="u-flex-1">
+					<view class="u-flex-1" @click.top="openPersonalInfo">
 						<view class="nickName u-flex">
-							<view @click="openPersonalInfo" class="name u-m-r-10" v-if="userInfo.realName || userInfo.nickName">
+							<view class="name u-m-r-10" v-if="userInfo.realName || userInfo.nickName">
 								<text style="#FFFFFF;font-size: 18px;">{{ userInfo.realName || userInfo.nickName }}</text>
 							</view>
-							<view v-if="userInfo.isThirdLogin" @click="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
+							<view v-if="userInfo.isThirdLogin" @click.stop="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
 						</view>
-						<view @click="openPersonalInfo" style="color:#FFFFFF;font-size: 14px;" v-if="userInfo.phoneNumber">{{ userInfo.phoneNumber | phone }}</view>
+						<view style="color:#FFFFFF;font-size: 14px;" v-if="userInfo.phoneNumber">{{ userInfo.phoneNumber | phone }}</view>
 					</view>
 				</block>
 				<block v-else>

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

@@ -166,7 +166,7 @@
 							icon: 'none'
 						}).then(res=>{
 							uni.reLaunch({
-								url: '/pages/personal/personal'	
+								url: '/publicLoginSubPage/public/login'	
 							});
 							/**
 							 * 有些时候不起作用

@@ -46,10 +46,14 @@
 			</u--form>
 		</view>
 		<view class="basic-bottom u-flex">
-			<view class="item" v-if="info.data.isThirdLogin">
+			<view class="item" v-if="info.data.isThirdLoginAndNoDind">
 				<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' }]">
+			<view
+				class="item"
+				style="margin-right: 60rpx;"
+				:style="[{ position: info.data.isThirdLoginAndNoDind ? '' : 'relative' }, { right: info.data.isThirdLoginAndNoDind ? '' : '-190rpx' }]"
+			>
 				<button class="submit" size="default" @click="onSubmitFunc" :style="{ background: PrimaryColor }"><text class="un-bind-text">确认</text></button>
 			</view>
 		</view>
@@ -116,6 +120,7 @@ export default {
 		let getOpenId = getApp().globalData.openId;
 		if (getOpenId) {
 			this.openIds = getOpenId;
+			console.log('OPenid', this.openIds);
 		}
 	},
 	computed: {
@@ -128,7 +133,7 @@ export default {
 				//解绑
 				let httpData = {
 					appUserId: e.data?.userId,
-					thirdUserId: e.third?.thirdUserId == null ? this.openIds : e.third?.thirdUserId
+					thirdUserId: e.data?.thirdUserId == null ? this.openIds : e.data?.thirdUserId
 				};
 				uni.$u.http.delete('/yt/third', httpData).then(res => {
 					if (res) {

 .code-page {
 	min-height: 100vh;
 	background-color: #fff;
+	width: 750rpx;
+	background: url(/static/login.png) no-repeat;
 }
 .f__login {
 	padding: 48rpx 32rpx;
@@ -19,18 +21,7 @@
 			font-family: PingFangSC-Semibold, PingFang SC;
 			font-weight: 600;
 		}
-		.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;
-		}
 	}
-
 	.form-row {
 		position: relative;
 		border-bottom: 1rpx solid #e8e8e8;
@@ -45,7 +36,6 @@
 			padding: 0;
 			font-weight: bold;
 		}
-
 		.getvcode {
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 400;
@@ -53,7 +43,6 @@
 			height: 80rpx;
 			color: #6299ff;
 			line-height: 80rpx;
-			// background: #eee;
 			min-width: 188rpx;
 			text-align: center;
 			border-radius: 8rpx;
@@ -64,12 +53,9 @@
 			z-index: 11;
 
 			&.forhidden {
-				// background: #eee;
-				// color: #cccccc;
 			}
 		}
 	}
-
 	.submit {
 		margin-top: 60rpx;
 		width: 100%;
@@ -80,20 +66,6 @@
 			color: #ffffff;
 		}
 	}
-	.circleStyleBottom {
-		position: absolute;
-		width: 145rpx;
-		height: 300rpx;
-		right: -31rpx;
-		top: 804rpx;
-		//#ifndef MP
-		top: 804rpx;
-		//#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);
-	}
 	.account-style {
 		flex-direction: row;
 		margin-top: 48rpx;

 <template>
 	<view class="login-page">
 		<!-- 公共组件-每个页面必须引入 -->
-
 		<public-module></public-module>
-
 		<view class="u-flex login-main">
 			<view class="content">
 				<view class="hello login-text-muted">您好,</view>
@@ -11,17 +9,15 @@
 				<view class="hello-welcome login-text-muted">欢迎来到ThingsKit!</view>
 			</view>
 		</view>
-
 		<view class="f__login">
 			<view class="loginPhone">
 				<view class="form-row u-flex">
 					<view class="v-input"><input type="text" v-model="loginForm.username" maxlength="32" placeholder="请输入登录账号" /></view>
 					<u-icon></u-icon>
 				</view>
-
 				<view class="form-row u-flex">
 					<view class="v-input"><input type="text" v-model="loginForm.password" maxlength="32" placeholder="请输入登录密码" :password="!showPassword" /></view>
-					<view class="v-password" style="padding: 30rpx;" @click="showPasswordMode">
+					<view class="v-password" style="padding: 30rpx" @click="showPasswordMode">
 						<u-icon color="#9a9a9a" :name="showPassword ? '/static/eye.png' : '/static/eye-hide.png'"></u-icon>
 					</view>
 
@@ -50,13 +46,9 @@
 
 <script>
 import { mapMutations, mapActions } from 'vuex';
-
 import { loginApp } from '@/config/login';
-
 import baseUrl from '@/config/baseUrl.js';
-
 import WXBizDataCrypt from '@/config/WXBizDataCrypt.js';
-
 import { appId, appSecrect } from '@/config/constant.js';
 
 export default {
@@ -67,21 +59,16 @@ export default {
 
 				password: ''
 			},
-
 			showPassword: false,
-
 			code: '',
-
 			openid: ''
 		};
 	},
-
 	onLoad() {
 		wx.login({
 			success: res => {
 				if (res.code) {
 					this.code = res.code;
-
 					//这里获取openid
 				} else {
 					return;
@@ -92,93 +79,59 @@ export default {
 
 	methods: {
 		...mapMutations(['setUserInfo']),
-
 		...mapActions(['updateBadgeTotal']),
-
 		//微信授权登录
-
 		//#ifdef MP-WEIXIN
-
 		onWenxinAuthorization() {
 			wx.getUserProfile({
 				desc: '微信第三方授权',
-
 				success: reswenxin => {
-					console.log('res=======>', reswenxin);
-
 					if (reswenxin.errMsg === 'getUserProfile:ok' && reswenxin.encryptedData) {
-						console.log('获取code', this.code);
-
 						//获取用户信息
-
 						let obj = {
 							avatarUrl: reswenxin.userInfo.avatarUrl,
-
 							thirdUserId: this.openid
 						};
-
 						//判断是否需要绑定
-
 						uni.$u.http
-
 							.get(`/yt/third/login/${this.code}`)
-
 							.then(res => {
-								console.log('Res', res);
-
-								//设置全局变量openId
-
-								// getApp().globalData.openId = res.data.openid;
-
-								if (res.token == '' || (res.token == null && res.refreshToken)) {
+								if (res.token == '' || (res.token == null && res.thirdUserId)) {
 									//需要绑定
-
 									let userInfo = {
 										isThirdLogin: true, //用于判断是否是第三方登录并且需要绑定账号
-
-										avatar: obj.avatarUrl
+										avatar: obj.avatarUrl,
+										thirdUserId: res.thirdUserId
 									};
-
 									this.setUserInfo(userInfo);
-
 									//设置全局变量openId
-
-									getApp().globalData.openId = res.refreshToken;
-
+									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 //用于判断是否是第三方登录并且不需要绑定账号
+										isThirdLoginAndNoDind: true, //用于判断是否是第三方登录并且不需要绑定账号
+										thirdUserId: res.thirdUserId
 									};
-
+									//设置全局变量openId
+									getApp().globalData.openId = res.thirdUserId;
 									if (userInfo.token) {
 										this.setUserInfo(userInfo);
 									}
-
 									uni.showToast({
 										title: '第三方账号登录成功~',
-
 										icon: 'none'
 									});
-
 									this.saveUserInfo();
-
 									this.getAlarmTotalData();
-
 									uni.reLaunch({
 										url: '../../pages/personal/personal'
 									});
@@ -210,7 +163,6 @@ export default {
 				}
 			});
 		},
-
 		async getAlarmTotalData() {
 			const res = await uni.$u.http.get('/yt/homepage/app');
 			if (res) {
@@ -218,7 +170,6 @@ export default {
 				this.updateBadgeTotal(res.totalAlarm.activedAlarm);
 			}
 		},
-
 		onSubmitFunc() {
 			if (this.loginForm.username == '') {
 				return uni.$u.toast('请输入登录账号~');
@@ -268,19 +219,17 @@ export default {
 							this.setUserInfo(userInfo);
 						}
 
-						uni
-							.showToast({
-								title: '登录成功~',
+						uni.showToast({
+							title: '登录成功~',
 
-								icon: 'none'
-							})
-							.then(async res => {
-								this.saveUserInfo();
-								await this.getAlarmTotalData();
-								uni.reLaunch({
-									url: '/pages/personal/personal'
-								});
+							icon: 'none'
+						}).then(async res => {
+							this.saveUserInfo();
+							await this.getAlarmTotalData();
+							uni.reLaunch({
+								url: '/pages/personal/personal'
 							});
+						});
 					}
 				})
 
@@ -288,19 +237,16 @@ export default {
 					uni.$u.toast(e.data?.message);
 				});
 		},
-
 		openCodeFunc() {
 			uni.navigateTo({
 				url: '../other/code'
 			});
 		},
-
 		findPassrordFunc() {
 			uni.navigateTo({
 				url: '../other/findPassword'
 			});
 		},
-
 		showPasswordMode() {
 			this.showPassword = !this.showPassword;
 		}
@@ -314,4 +260,4 @@ export default {
 /deep/ button {
 	background: rgba(0, 0, 0, 0);
 }
-</style>
+</style>

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

@@ -4,6 +4,10 @@
 		<public-module></public-module>
 		<view class="notify-column">
 			<view class="column-list">
+				<view style="margin-left: 36rpx;position: relative;top: 21rpx;">
+					<text class="notify-detail-text">{{ notifyList.title }}</text>
+				</view>
+				<view style="height: 25rpx;"></view>
 				<u-list height="140rpx">
 					<u-list-item>
 						<u-cell :value="`${notifyList.senderDate}`" :title="`${notifyList.senderName}`">
@@ -12,9 +16,7 @@
 					</u-list-item>
 				</u-list>
 				<view class="bottom-text">
-					<view class="u-flex column">
-						<text class="text" style="font-weight: bold;">{{ notifyList.title }}</text>
-					</view>
+					<view class="u-flex column"></view>
 					<view style="margin-top: 21rpx;">
 						<!-- 富文本解析 -->
 						<u-parse :content="notifyList.content"></u-parse>

@@ -3,7 +3,7 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<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: 10rpx;">
+			<view @click="openTypeClick" style="background-color: #f8f9fa;width: 700rpx;position: relative;top: 16rpx;">
 				<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>