From b86eab58ddaad299e6ef005836b5c7789dc4166a Mon Sep 17 00:00:00 2001
From: anne-lxm <1076217653@qq.com>
Date: Thu, 2 Feb 2023 20:14:11 +0800
Subject: [PATCH] =?UTF-8?q?pages=E5=88=86=E5=8C=85=E8=B0=83=E6=95=B4/?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9vue2/3=E4=B8=80=E9=94=AE=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=9A=90=E7=A7=81=E5=8D=8F=E8=AE=AE=E6=A1=86=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=89=93=E5=8B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    | 32 +++++++++----------
 .../uni-id-pages-fab-login.vue                | 10 +++++-
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/pages.json b/pages.json
index 524a4a70..52816922 100644
--- a/pages.json
+++ b/pages.json
@@ -116,73 +116,73 @@
 			}]
 		},
 		{
-			"root": "uni_modules/uni-id-pages",
+			"root": "uni_modules/uni-id-pages/pages",
 			"pages": [{
-					"path": "pages/userinfo/userinfo",
+					"path": "userinfo/userinfo",
 					"style": {
 						"navigationBarTitleText": "个人资料"
 					}
 				},
 				{
-					"path": "pages/login/login-withoutpwd"
+					"path": "login/login-withoutpwd"
 				},
 				{
-					"path": "pages/login/login-withpwd"
+					"path": "login/login-withpwd"
 				},
 				{
-					"path": "pages/userinfo/deactivate/deactivate",
+					"path": "userinfo/deactivate/deactivate",
 					"style": {
 						"navigationBarTitleText": "注销账号"
 					}
 				},
 				{
-					"path": "pages/userinfo/bind-mobile/bind-mobile",
+					"path": "userinfo/bind-mobile/bind-mobile",
 					"style": {
 						"navigationBarTitleText": "绑定手机号码"
 					}
 				},
 				{
-					"path": "pages/login/login-smscode",
+					"path": "login/login-smscode",
 					"style": {
 						"navigationBarTitleText": "手机验证码登录"
 					}
 				},
 				{
-					"path": "pages/register/register",
+					"path": "register/register",
 					"style": {
 						"navigationBarTitleText": "注册"
 					}
 				},
 				{
-					"path": "pages/retrieve/retrieve",
+					"path": "retrieve/retrieve",
 					"style": {
 						"navigationBarTitleText": "重置密码"
 					}
 				}, {
-					"path": "pages/common/webview/webview",
+					"path": "common/webview/webview",
 					"style": {
 						"enablePullDownRefresh": false,
 						"navigationBarTitleText": ""
 					}
 				}, {
-					"path": "pages/userinfo/change_pwd/change_pwd",
+					"path": "userinfo/change_pwd/change_pwd",
 					"style": {
 						"enablePullDownRefresh": false,
 						"navigationBarTitleText": "修改密码"
 					}
 				}, {
-					"path": "pages/register/register-by-email",
+					"path": "register/register-by-email",
 					"style": {
 						"navigationBarTitleText": "邮箱验证码注册"
 					}
 				}, {
-					"path": "pages/retrieve/retrieve-by-email",
+					"path": "retrieve/retrieve-by-email",
 					"style": {
 						"navigationBarTitleText": "通过邮箱重置密码"
 					}
 				},
 				{
-					"path": "pages/userinfo/set-pwd/set-pwd",
+					"path": "userinfo/set-pwd/set-pwd",
 					"style": {
 						"enablePullDownRefresh": false,
 						"navigationBarTitleText": "设置密码"
@@ -191,10 +191,10 @@
 				// #ifdef H5
 				,
 				{
-					"path": "pages/userinfo/cropImage/cropImage"
+					"path": "userinfo/cropImage/cropImage"
 				},
 				{
-					"path": "pages/register/register-admin",
+					"path": "register/register-admin",
 					"style": {
 						"enablePullDownRefresh": false,
 						"navigationBarTitleText": "注册管理员账号"
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue b/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
index defcaa45..7750e8bf 100644
--- a/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
@@ -330,8 +330,16 @@
 					let onButtonsClickFn = async res => {
 						console.log('点击了第三方登录，provider：', res, res.provider, this.univerifyStyle.buttons.list);
 						clickAnotherButtons = true
+						let checkBoxState = await uni.getCheckBoxState();
 						// 同步一键登录弹出层隐私协议框是否打勾
-						let agree = (await uni.getCheckBoxState())[1].state
+						// #ifdef VUE2
+						let agree = checkBoxState[1].state
+						// #endif
+						
+						// #ifdef VUE3
+						let agree = checkBoxState.state
+						// #endif
+						
 						this.agree = agree
 						let {
 							path
-- 
GitLab