Merge branch 'dev-ft' into 'main'

feat:新增第三方登录和账号绑定功能，refractor:修改意见反馈样式,fix:DEFECT-346，去除通知筛选输入框

See merge request huang/thingskit-app!33

+var crypto = require('crypto')
+
+function WXBizDataCrypt(appId, sessionKey) {
+  this.appId = appId
+  this.sessionKey = sessionKey
+}
+
+WXBizDataCrypt.prototype.decryptData = function (encryptedData, iv) {
+  // base64 decode
+  var sessionKey = new Buffer(this.sessionKey, 'base64')
+  encryptedData = new Buffer(encryptedData, 'base64')
+  iv = new Buffer(iv, 'base64')
+
+  try {
+     // 解密
+    var decipher = crypto.createDecipheriv('aes-128-cbc', sessionKey, iv)
+    // 设置自动 padding 为 true，删除填充补位
+    decipher.setAutoPadding(true)
+    var decoded = decipher.update(encryptedData, 'binary', 'utf8')
+    decoded += decipher.final('utf8')
+    
+    decoded = JSON.parse(decoded)
+
+  } catch (err) {
+    throw new Error('Illegal Buffer')
+  }
+
+  if (decoded.watermark.appid !== this.appId) {
+    throw new Error('Illegal Buffer')
+  }
+
+  return decoded
+}
+
+module.exports = WXBizDataCrypt

-export default {
-	pageNumber: 1,
-	pageSize: 10
-}
+export const appId = 'wx0ad61d7bf6808e02'
+export const appSecrect = '74d43eca92c728b56d6e624bd0b146b8'

@@ -17,7 +17,7 @@ uni.$u.http.setConfig((config) => {
 	config.baseURL = base.baseUrl; /* 根域名 */
 	config.header = {
 		"Content-Type": "application/json",
-		Authorization: "Bearer " + token,
+		'X-Authorization': "Bearer " + token,
 	};
 	config.custom = {
 		load: true, //是否显示加载动画
@@ -36,7 +36,7 @@ uni.$u.http.interceptors.request.use(
 		config.data = config.data || {};
 		// 根据custom参数中配置的是否需要token，添加对应的请求头
 		if (config?.custom?.auth) {
-			config.header.Authorization =
+			config.header['X-Authorization'] =
 				"Bearer " + store.state.userInfo.isToken ||
 				uni.getStorageSync("userInfo").isToken ||
 				undefined;
@@ -114,7 +114,7 @@ uni.$u.http.interceptors.response.use(
 			});
 			store.commit("emptyUserInfo");
 		} else {
-			errorData = message || "请检查网络或服务器";
+			errorData = message || "";
 		}
 		uni.$u.toast(errorData);
 		return Promise.reject(response);

 <template>
 	<view class="feedback-page">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<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-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>
-				<u-form-item label="手机" prop="feedbackInfo.phone" borderBottom ref="item1">
-					<u--input placeholder="请输入手机" v-model="feedbackData.feedbackInfo.phone" border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="QQ" prop="feedbackInfo.qq" borderBottom ref="item1">
-					<u--input placeholder="请输入QQ" v-model="feedbackData.feedbackInfo.qq" border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="邮箱" prop="feedbackInfo.email" borderBottom ref="item1">
-					<u--input placeholder="请输入邮箱" v-model="feedbackData.feedbackInfo.email" border="none"></u--input>
-				</u-form-item>
-				<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-form-item>
-				<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>
-			</u--form>
-			<u-button class="buttonSty" shape="circle" type="primary" text="提交" customStyle="margin-top: 17rpx" @click="submit"></u-button>
-			<!-- #ifdef MP -->
-			<view style="height: 18rpx;"></view>
-			<!-- #endif -->
-			<!-- #ifndef MP -->
-			<view style="height: 52rpx;"></view>
-			<!-- #endif -->
+		<view style="overflow-y: scroll;overflow: hidden;height: 1500rpx;">
+			<!-- 公共组件-每个页面必须引入 -->
+			<public-module></public-module>
+			<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-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>
+					<u-form-item label="手机" prop="feedbackInfo.phone" borderBottom ref="item1">
+						<u--input placeholder="请输入手机" v-model="feedbackData.feedbackInfo.phone" border="none"></u--input>
+					</u-form-item>
+					<u-form-item label="QQ" prop="feedbackInfo.qq" borderBottom ref="item1">
+						<u--input placeholder="请输入QQ" v-model="feedbackData.feedbackInfo.qq" border="none"></u--input>
+					</u-form-item>
+					<u-form-item label="邮箱" prop="feedbackInfo.email" borderBottom ref="item1">
+						<u--input placeholder="请输入邮箱" v-model="feedbackData.feedbackInfo.email" border="none"></u--input>
+					</u-form-item>
+					<view class="info">
+						<view class="info-contain">
+							<u-form-item label="反馈" prop="feedbackInfo.message" borderBottom ref="item1">
+								<u--textarea placeholder="请输入反馈信息" v-model="feedbackData.feedbackInfo.message" count></u--textarea>
+							</u-form-item>
+						</view>
+					</view>
+					<view class="feed-back-text" style="margin: 15px 0px 0px -16rpx;">上传图片(最多6张)</view>
+					<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-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>
+				</view>
+				<!-- #ifdef MP -->
+				<view style="height: 18rpx;"></view>
+				<!-- #endif -->
+				<!-- #ifndef MP -->
+				<view style="height: 52rpx;"></view>
+				<!-- #endif -->
+			</view>
+			<view style="height: 20rpx;"></view>
+			<f-tabbar></f-tabbar>
 		</view>
-		<view style="height: 20rpx;"></view>
-		<f-tabbar></f-tabbar>
 	</view>
 </template>
 
@@ -261,18 +275,50 @@ export default {
 	background-color: #f8f9fa;
 	padding-top: 9rpx;
 	padding-left: 27rpx;
+	overflow-y: scroll;
+	overflow: hidden;
 }
 .form-page {
 	width: 700rpx;
 	background-color: #ffffff;
-	border-radius: 20px;
+	border-radius: 10px;
 	margin-top: 20rpx;
 	padding-left: 15rpx;
 	padding: 0 20rpx;
+	height: 500rpx;
+	.info {
+		width: 700rpx;
+		background-color: #ffffff;
+		border-radius: 10px;
+		margin-top: 80rpx;
+		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;
+	}
 }
 //#ifndef MP
 .buttonSty {
 	margin-top: 30rpx !important;
 }
 //#endif
+
+
 </style>

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

@@ -7,11 +7,13 @@
 			<!-- 登录 -->
 			<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">
-					<view @click="openPersonalInfo" class="u-m-r-20"><image class="avatar" mode="aspectFill" :src="userInfo.avatar || '/static/default.png'"></image></view>
+					<view @click="openPersonalInfo" class="u-m-r-20">
+						<image class="avatar" mode="aspectFill" :src="userInfo.avatar || userInfo.avatarUrl || '/static/default.png'"></image>
+					</view>
 					<view @click="openPersonalInfo" class="u-flex-1">
 						<view class="nickName u-flex">
-							<view class="name u-m-r-10" v-if="userInfo.realName">
-								<text style="#FFFFFF;font-size: 18px;">{{ userInfo.realName }}</text>
+							<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>
 						<view style="color:#FFFFFF;font-size: 14px;" v-if="userInfo.phoneNumber">{{ userInfo.phoneNumber | phone }}</view>
@@ -22,9 +24,9 @@
 					<view class="u-m-r-20" @click="openLoginFunc">
 						<view class="avatar u-flex"><u-icon name="account-fill" color="black" size="30"></u-icon></view>
 					</view>
-					<view class="u-flex-1" @click="openLoginFunc">
-						<view class="u-font-lg click-login login-btn ">请点击登录</view>
-						<view v-if="userInfo.isToken" @click="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
+					<view class="u-flex-1">
+						<view @click="openLoginFunc" class="u-font-lg click-login login-btn ">请点击登录</view>
+						<view @click="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
 					</view>
 				</block>
 				<view v-if="userInfo.isToken"><u-icon name="arrow-right" color="white" size="13"></u-icon></view>
@@ -34,11 +36,13 @@
 			<!-- 登录 -->
 			<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">
-					<view @click="openPersonalInfo" class="u-m-r-20"><image class="avatar" mode="aspectFill" :src="userInfo.avatar || '/static/default.png'"></image></view>
+					<view @click="openPersonalInfo" class="u-m-r-20">
+						<image class="avatar" mode="aspectFill" :src="userInfo.avatar || userInfo.avatarUrl || '/static/default.png'"></image>
+					</view>
 					<view @click="openPersonalInfo" class="u-flex-1">
 						<view class="nickName u-flex">
-							<view class="name u-m-r-10" v-if="userInfo.realName">
-								<text style="#FFFFFF;font-size: 18px;">{{ userInfo.realName }}</text>
+							<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>
 						<view style="color:#FFFFFF;font-size: 14px;" v-if="userInfo.phoneNumber">{{ userInfo.phoneNumber | phone }}</view>
@@ -49,9 +53,9 @@
 					<view class="u-m-r-20" @click="openLoginFunc">
 						<view class="avatar u-flex" style="justify-content: center"><u-icon name="account-fill" color="black" size="30"></u-icon></view>
 					</view>
-					<view class="u-flex-1" @click="openLoginFunc">
-						<view class="u-font-lg login-btn">登录</view>
-						<view v-if="userInfo.isToken" @click="clickAccountFunc" style="color: black" class="detail">绑定账号</view>
+					<view class="u-flex-1">
+						<view @click="openLoginFunc" class="u-font-lg login-btn">登录</view>
+						<view @click="clickAccountFunc" style="color: black" class="detail">绑定账号</view>
 					</view>
 				</block>
 				<view><u-icon name="arrow-right" color="black" size="13"></u-icon></view>
@@ -80,7 +84,7 @@
 			<u-modal :showConfirmButton="false" :show="show" :title="title">
 				<view v-if="!bindPhone" class="loginPhone">
 					<view class="form-row">
-						<u--input shape="circle" class="input" prefixIcon="account-fill" type="text" placeholder="登录账号" v-model="bindAccountObj.account"></u--input>
+						<u--input shape="circle" class="input" prefixIcon="account-fill" type="text" placeholder="登录账号" v-model="bindAccountObj.appUserKey"></u--input>
 					</view>
 					<view class="form-row item-bind">
 						<u--input
@@ -90,7 +94,7 @@
 							suffixIconStyle="color: #909399"
 							type="password"
 							placeholder="登录密码"
-							v-model="bindAccountObj.password"
+							v-model="bindAccountObj.appUserSecret"
 							@change="passwordChange"
 						></u--input>
 					</view>
@@ -105,7 +109,7 @@
 							shape="circle"
 							class="input"
 							type="text"
-							v-model="bindPhoneObj.phoneNumber"
+							v-model="bindPhoneObj.appUserKey"
 							placeholder="请输入手机号码"
 							placeholder-style="font-weight:normal;color:#bbbbbb;"
 						></u--input>
@@ -115,7 +119,7 @@
 							shape="circle"
 							class="input"
 							type="text"
-							v-model="bindPhoneObj.code"
+							v-model="bindPhoneObj.appUserSecret"
 							placeholder="请输入验证码"
 							placeholder-style="font-weight:normal;color:#bbbbbb;"
 						></u--input>
@@ -167,7 +171,6 @@ export default {
 			showLogout: false,
 			readonly: false,
 			codeText: '获取验证码',
-			phone: '', //号码
 			tips: '验证码',
 			bindPhone: false,
 			show: false,
@@ -175,24 +178,29 @@ export default {
 			systemInfo: base.systemInfo,
 			PrimaryButtonColor: '#0079fe', //主题色
 			bindAccountObj: {
-				username: '',
-				password: ''
+				appUserKey: '',
+				appUserSecret: ''
 			},
 			bindPhoneObj: {
-				phoneNumber: '',
-				code: ''
-			}
+				appUserKey: '',
+				appUserSecret: ''
+			},
+			thirdObj: {}
 		};
 	},
-	onLoad() {
+	onLoad(e) {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
+		if (e.obj !== null) {
+			const params = JSON.parse(e.obj);
+			this.thirdObj = params;
+		}
 	},
 	computed: {
 		...mapState(['userInfo'])
 	},
 	methods: {
-		...mapMutations(['emptyUserInfo']),
+		...mapMutations(['emptyUserInfo', 'setUserInfo']),
 		// 跳转前判断登录
 		onTokenJump(url) {
 			this.judgeLogin(() => {
@@ -221,14 +229,136 @@ export default {
 		},
 		clickAccountFunc() {
 			this.show = true;
+			this.resetFunc();
+		},
+		resetFunc() {
+			this.bindPhone = false;
+			this.bindAccountObj = {};
+			this.bindPhoneObj = {};
 		},
 		bindConfirm() {
+			//需要绑定
 			if (!this.bindPhone) {
-				console.log('Account submit', this.bindAccountObj);
+				if (this.bindAccountObj.appUserKey == '') {
+					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)) {
+					uni.showToast({
+						title: '密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~',
+						icon: 'none',
+						duration: 3000
+					});
+					return;
+				}
+				const postData = {
+					loginMethod: 'ACCOUNT',
+					...this.bindAccountObj,
+					platformName: 'WECHAT',
+					...this.thirdObj
+				};
+				uni.$u.http
+					.post('/yt/third/bind', postData)
+					.then(res => {
+						if (res) {
+							this.show = false;
+							// 储存登录信息
+							let resObj = {
+								refreshToken: res.refreshToken,
+								isToken: res.token
+							};
+							let userInfo = {
+								...resObj,
+								token: true //token用于判断是否登录
+							};
+							if (userInfo.token) {
+								this.setUserInfo(userInfo);
+							}
+							uni.showToast({
+								title: '账号绑定成功~',
+								icon: 'none'
+							});
+							this.saveUserInfo();
+						}
+					})
+					.catch(e => {
+						uni.$u.toast(e.data?.message);
+					});
 			} else {
-				console.log('Phone submit', this.bindPhoneObj);
+				const phoneRegular = /^1\d{10}$/;
+				if (this.bindPhoneObj.appUserKey == '') {
+					uni.showToast({
+						title: '请输入手机号码~',
+						icon: 'none'
+					});
+					return;
+				} else if (!phoneRegular.test(this.bindPhoneObj.appUserKey)) {
+					uni.showToast({
+						title: '手机号格式不正确~',
+						icon: 'none'
+					});
+					return;
+				}
+				if (this.bindPhoneObj.appUserSecret == '') {
+					uni.showToast({
+						title: '请输入验证码~',
+						icon: 'none'
+					});
+					return;
+				} else if (!/^\d{6}$/.test(this.bindPhoneObj.appUserSecret)) {
+					uni.showToast({
+						title: '验证码格式不正确~',
+						icon: 'none'
+					});
+					return;
+				}
+				const postData = {
+					loginMethod: 'PHONE',
+					...this.bindPhoneObj,
+					platformName: 'WECHAT',
+					...this.thirdObj
+				};
+				uni.$u.http
+					.post('/yt/third/bind', postData)
+					.then(res => {
+						this.show = false;
+						// 储存登录信息
+						let resObj = {
+							refreshToken: res.refreshToken,
+							isToken: res.token
+						};
+						let userInfo = {
+							...resObj,
+							token: true //token用于判断是否登录
+						};
+						if (userInfo.token) {
+							this.setUserInfo(userInfo);
+						}
+						uni.showToast({
+							title: '手机绑定成功~',
+							icon: 'none'
+						});
+						this.saveUserInfo();
+					})
+					.catch(e => {
+						uni.$u.toast(e.data?.message);
+					});
 			}
 		},
+		saveUserInfo() {
+			//储存个人信息
+			uni.$u.http.get('/yt/user/me/info').then(res => {
+				if (res) {
+					this.setUserInfo(res);
+				}
+			});
+		},
 		bindPhoneFunc() {
 			this.bindPhone = true;
 		},
@@ -253,7 +383,6 @@ export default {
 		},
 		//获取验证码
 		getVcode() {
-			console.log('getVcode');
 			if (this.readonly) {
 				uni.showToast({
 					title: '验证码已发送~',
@@ -261,7 +390,7 @@ export default {
 				});
 				return;
 			}
-			if (this.phone == '') {
+			if (this.bindPhoneObj.appUserKey == '') {
 				uni.showToast({
 					title: '请输入手机号~',
 					icon: 'none'
@@ -269,7 +398,7 @@ export default {
 				return;
 			}
 			const phoneRegular = /^1\d{10}$/;
-			if (!phoneRegular.test(this.phone)) {
+			if (!phoneRegular.test(this.bindPhoneObj.appUserKey)) {
 				uni.showToast({
 					title: '手机号格式不正确~',
 					icon: 'none'
@@ -278,9 +407,11 @@ export default {
 			}
 			let httpData = {};
 			// 获取验证码接口
-			// uni.$u.http.post('您的接口', httpData).then(res => {
-			this.getCodeState(); //开始倒计时
-			// })
+			uni.$u.http.post(`/yt/noauth/sendLoginSmsCode/${this.bindPhoneObj.appUserKey}`).then(res => {
+				if (res) {
+					this.getCodeState(); //开始倒计时
+				}
+			});
 		},
 		onLoginoutFunc() {
 			this.showLogout = true;

@@ -85,7 +85,9 @@
 				}
 				// 获取验证码接口
 				uni.$u.http.post(`/yt/noauth/sendLoginSmsCode/${this.phone}` ).then(res => {
+					if(res){
 				     this.getCodeState(); //开始倒计时
+					}
 				})
 			},
 			onSubmit() {

@@ -9,7 +9,7 @@
 	}
 }
 .set-main {
-	border-radius: 20px;
+	border-radius: 10px;
 	margin-top: 37rpx;
 	padding-left: 15rpx;
 	justify-content: space-between;
@@ -41,7 +41,7 @@
 }
 .basic-main {
 	background-color: #ffffff;
-	border-radius: 20px;
+	border-radius: 10px;
 	margin-top: 20rpx;
 	padding-left: 15rpx;
 }

@@ -38,8 +38,10 @@
 
 <script>
 import { mapMutations } from 'vuex';
-import { getUserInfo } from '@/components/module/f-login/f-login.js';
 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 {
 	data() {
@@ -49,46 +51,97 @@ export default {
 				password: ''
 			},
 			showPassword: false,
-			code: ''
+			code: '',
+			openid: '',
+			session_key: ''
 		};
 	},
 	onLoad() {
-		uni.login({
+		//#ifdef MP-WEIXIN
+		wx.login({
 			success: res => {
-				if (res.errMsg == 'login:ok') {
+				if (res.code) {
 					this.code = res.code;
-					console.log('This code', this.code);
-				} else {
-					uni.showToast({
-						title: '系统异常'
+					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;
+							}
+						}
 					});
+				} else {
 				}
 			}
 		});
+		//#endif
 	},
 	methods: {
 		...mapMutations(['setUserInfo']),
 		//微信授权登录
 		onAuthorization(e) {
-			getUserInfo(
-				info => {
-					console.log('授权信息', info);
-					let httpData = {
-						code: this.code,
-						nickName: info.nickName || '', //昵称
-						avatarUrl: info.avatarUrl || '', //头像
-						gender: info.gender || '' //性别 0:未知 1:男 2:女
-					};
-					// #ifdef APP-PLUS||MP
-					setTimeout(() => {
-						uni.reLaunch({
-							url: '/pages/personal/personal'
-						});
-					}, 500);
-					// #endif
-				},
-				err => {}
-			);
+			wx.getUserProfile({
+				desc: '获取用户信息',
+				success: res => {
+					if (res) {
+						let pc = new WXBizDataCrypt(appId, this.session_key);
+						let data = pc.decryptData(res.encryptedData, res.iv);
+						let obj = {
+							avatarUrl: data.avatarUrl,
+							nickName: data.nickName,
+							thirdUserId: this.openid
+						};
+						//判断是否需要绑定
+						uni.$u.http
+							.get(`/yt/third/login/${this.openid}`)
+							.then(res => {
+								if (res.token == '' || res.token == null) {
+								} else {
+									// 储存登录信息
+									let resObj = {
+										refreshToken: res.refreshToken,
+										isToken: res.token
+									};
+									let userInfo = {
+										...resObj,
+										token: true //token用于判断是否登录
+									};
+									if (userInfo.token) {
+										this.setUserInfo(userInfo);
+									}
+									uni.showToast({
+										title: '第三方账号登录成功~',
+										icon: 'none'
+									});
+									this.saveUserInfo();
+									// return uni.showToast({
+									// 	title: '不需要绑定'
+									// });
+								}
+							})
+							.catch(e => {
+								uni.$u.toast(e.data?.message);
+							});
+						// #ifdef APP-PLUS||MP
+						setTimeout(() => {
+							uni.reLaunch({
+								url: '/pages/personal/personal?obj=' + JSON.stringify(obj)
+							});
+						}, 500);
+						// #endif
+					}
+				}
+			});
+		},
+		saveUserInfo() {
+			//储存个人信息
+			uni.$u.http.get('/yt/user/me/info').then(res => {
+				if (res) {
+					this.setUserInfo(res);
+				}
+			});
 		},
 		onSubmitFunc() {
 			if (this.loginForm.username == '') {

@@ -93,6 +93,9 @@
 		justify-content: center;
 		flex-direction: column;
 		margin-top: 370rpx;
+		/* #ifdef APP-PLUS */
+		margin-top: 250rpx;
+		/* #endif */
 		.link-text {
 			color: #999999;
 			font-size: 13px;

@@ -166,6 +166,12 @@ button {
 	font-weight: 400;
 	color: #ffffff;
 }
+.feed-back-text {
+	font-size: 15px;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #2f384e;
+}
 // 定义flex等分
 @for $i from 0 through 12 {
 	.u-flex-#{$i} {

@@ -6,7 +6,7 @@
 }
 .notify-column {
 	.column-list {
-		border-radius: 20px;
+		border-radius: 10px;
 		margin-top: 20rpx;
 		width: 696rpx;
 		height: 1000rpx;

@@ -7,7 +7,7 @@
 /deep/.u-list-item {
 	background: #ffffff;
 	width: 695rpx;
-	border-radius: 20px;
+	border-radius: 10px;
 	margin-top: 20rpx;
 }
 .notify-main {
@@ -21,7 +21,7 @@
 			width: 700rpx;
 			height: 136rpx;
 			background: #ffffff;
-			border-radius: 20px;
+			border-radius: 10px;
 			.item {
 				justify-content: space-between;
 				flex-direction: row;

@@ -2,10 +2,11 @@
 	<view class="notify-page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<view @click="openTypeClick" style="width: 700rpx;">
-			<u--input suffixIcon="arrow-down" shape="circle" v-model="model1.userInfo.type" placeholder="请选择类型" border="surround"></u--input>
+		<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>
+		<view style="height: 76rpx;"></view>
 		<view class="notify-main">
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
 				<view class="u-flex main">