From ff8105039493c59e4b51fe4b74ac67c2074bd6b0 Mon Sep 17 00:00:00 2001
From: linju <linju@dcloud.io>
Date: Thu, 2 Feb 2023 20:58:17 +0800
Subject: [PATCH] 1.1.0

---
 manifest.json                                 |   2 +-
 pages.json                                    |  12 +-
 pages/index/index.vue                         |   4 +-
 uni_modules/uni-id-pages/changelog.md         |   7 +
 .../uni-id-pages/common/login-page.mixin.js   |   3 +-
 .../components/cloud-image/cloud-image.vue    |   8 +-
 .../uni-id-pages-agreements.vue               |   1 -
 .../uni-id-pages-avatar.vue                   |  39 +-
 .../uni-id-pages-bind-mobile.vue              |   7 +-
 .../uni-id-pages-email-form.vue               |   3 -
 .../uni-id-pages-fab-login.vue                | 133 +++--
 .../uni-id-pages-sms-form.vue                 |   3 -
 .../uni-id-pages-user-profile.vue             |  11 +-
 uni_modules/uni-id-pages/package-lock.json    |  29 --
 uni_modules/uni-id-pages/package.json         |   2 +-
 .../pages/common/webview/webview.vue          |   5 -
 .../pages/login/login-smscode.vue             |   3 -
 .../pages/login/login-withoutpwd.vue          | 464 +++++++++---------
 .../pages/register/register-admin.vue         |   3 -
 .../uni-id-pages/pages/register/register.vue  |   3 -
 .../pages/retrieve/retrieve-by-email.vue      |   5 -
 .../uni-id-pages/pages/retrieve/retrieve.vue  |  15 +-
 .../userinfo/bind-mobile/bind-mobile.vue      |   2 -
 .../pages/userinfo/change_pwd/change_pwd.vue  |   4 -
 .../pages/userinfo/deactivate/deactivate.vue  |   3 -
 .../pages/userinfo/set-pwd/set-pwd.vue        |   1 -
 .../uni-id-pages/pages/userinfo/userinfo.vue  |  19 +-
 uni_modules/uni-id-pages/pages_init.json      |  11 +-
 .../static/{login => app-plus}/apple.png      | Bin
 .../{ => app-plus}/uni-fab-login/alipay.png   | Bin
 .../{ => app-plus}/uni-fab-login/apple.png    | Bin
 .../{ => app-plus}/uni-fab-login/douyin.png   | Bin
 .../{ => app-plus}/uni-fab-login/facebook.png | Bin
 .../{ => app-plus}/uni-fab-login/google.png   | Bin
 .../{ => app-plus}/uni-fab-login/qq.png       | Bin
 .../uni-fab-login/sinaweibo.png               | Bin
 .../{ => app-plus}/uni-fab-login/taobao.png   | Bin
 .../uni-fab-login/univerify.png               | Bin
 .../static/login/uni-fab-login/sms.png        | Bin 0 -> 4285 bytes
 .../static/login/uni-fab-login/user.png       | Bin 0 -> 2997 bytes
 .../static/login/uni-fab-login/weixin.png     | Bin 0 -> 3934 bytes
 .../uni-id-pages/static/login/weixin.png      | Bin 11525 -> 11483 bytes
 .../uni-id-pages/static/uni-fab-login/sms.png | Bin 4411 -> 0 bytes
 .../static/uni-fab-login/user.png             | Bin 3071 -> 0 bytes
 .../static/uni-fab-login/weixin.png           | Bin 4168 -> 0 bytes
 .../uni-id-co/common/validator.test.js        | 343 -------------
 .../database/uni-id-users.schema.json         |   6 +-
 47 files changed, 378 insertions(+), 773 deletions(-)
 delete mode 100644 uni_modules/uni-id-pages/package-lock.json
 rename uni_modules/uni-id-pages/static/{login => app-plus}/apple.png (100%)
 rename uni_modules/uni-id-pages/static/{ => app-plus}/uni-fab-login/alipay.png (100%)
 rename uni_modules/uni-id-pages/static/{ => app-plus}/uni-fab-login/apple.png (100%)
 rename uni_modules/uni-id-pages/static/{ => app-plus}/uni-fab-login/douyin.png (100%)
 rename uni_modules/uni-id-pages/static/{ => app-plus}/uni-fab-login/facebook.png (100%)
 rename uni_modules/uni-id-pages/static/{ => app-plus}/uni-fab-login/google.png (100%)
 rename uni_modules/uni-id-pages/static/{ => app-plus}/uni-fab-login/qq.png (100%)
 rename uni_modules/uni-id-pages/static/{ => app-plus}/uni-fab-login/sinaweibo.png (100%)
 rename uni_modules/uni-id-pages/static/{ => app-plus}/uni-fab-login/taobao.png (100%)
 rename uni_modules/uni-id-pages/static/{ => app-plus}/uni-fab-login/univerify.png (100%)
 create mode 100644 uni_modules/uni-id-pages/static/login/uni-fab-login/sms.png
 create mode 100644 uni_modules/uni-id-pages/static/login/uni-fab-login/user.png
 create mode 100644 uni_modules/uni-id-pages/static/login/uni-fab-login/weixin.png
 delete mode 100644 uni_modules/uni-id-pages/static/uni-fab-login/sms.png
 delete mode 100644 uni_modules/uni-id-pages/static/uni-fab-login/user.png
 delete mode 100644 uni_modules/uni-id-pages/static/uni-fab-login/weixin.png
 delete mode 100644 uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/validator.test.js

diff --git a/manifest.json b/manifest.json
index fed5166..01a379a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -107,7 +107,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx1002f172d7719592",
         "setting" : {
             "urlCheck" : false
         },
diff --git a/pages.json b/pages.json
index 8ca282f..6563c18 100644
--- a/pages.json
+++ b/pages.json
@@ -23,13 +23,15 @@
 			"style": {
 				"navigationBarTitleText": "绑定手机号码"
 			}
-		},
+		},
+		// #ifndef MP-WEIXIN
 		{
 			"path": "uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage",
 			"style": {
 				"navigationBarTitleText": ""
 			}
-		},
+		},
+		// #endif
 		{
 			"path": "uni_modules/uni-id-pages/pages/login/login-withoutpwd",
 			"style": {
@@ -53,14 +55,16 @@
 			"style": {
 				"navigationBarTitleText": "注册"
 			}
-		},
+		},
+		// #ifndef MP-WEIXIN
 		{
 			"path": "uni_modules/uni-id-pages/pages/register/register-admin",
 			"style": {
 				"navigationBarTitleText": "注册管理员账号",
 				"enablePullDownRefresh": false
 			}
-		},
+		},
+		// #endif
 		{
 			"path": "uni_modules/uni-id-pages/pages/register/register-by-email",
 			"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index fcaa8ec..500028a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -43,7 +43,9 @@
 					})
 				} else {
 					uni.navigateTo({
-						url: "/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=" + this.loginType
+						url: "/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=" + this.loginType,
+						animationType:"none",
+						animationDuration:0
 					})
 				}
 			},
diff --git a/uni_modules/uni-id-pages/changelog.md b/uni_modules/uni-id-pages/changelog.md
index 2c5adcc..551506a 100644
--- a/uni_modules/uni-id-pages/changelog.md
+++ b/uni_modules/uni-id-pages/changelog.md
@@ -1,3 +1,10 @@
+## 1.1.1（2023-02-02）
+- 修复 Vue3下 一键登录条款勾选框选中状态未同步到页面 的问题
+## 1.1.0（2023-01-31）
+- 【重要】优化 小程序端资源包大小（运行时大小为：731KB，发行后为：583KB；注：可以直接将本插件作为分包使用）
+- 更新 微信小程序端 上传头像功能 用`wx.cropImage`实现图片裁剪
+- 修复 选择一键登录时会先显示 非密码登录页面的问题
+- 修复 一键登录 点击右上角的关闭按钮没有返回上一页的问题
 ## 1.0.41（2023-01-16）
 - 优化 压缩依赖的文件资源大小
 ## 1.0.40（2023-01-16）
diff --git a/uni_modules/uni-id-pages/common/login-page.mixin.js b/uni_modules/uni-id-pages/common/login-page.mixin.js
index 26936db..a30aafd 100644
--- a/uni_modules/uni-id-pages/common/login-page.mixin.js
+++ b/uni_modules/uni-id-pages/common/login-page.mixin.js
@@ -67,7 +67,8 @@ let mixin = {
 					}
 				}
 			},
-			set(agree) {
+			set(agree) {
+				console.log('set(agree)',agree);
 				if (this.$refs.agreements) {
 					this.$refs.agreements.isAgree = agree
 				} else {
diff --git a/uni_modules/uni-id-pages/components/cloud-image/cloud-image.vue b/uni_modules/uni-id-pages/components/cloud-image/cloud-image.vue
index f36bb91..5f99a39 100644
--- a/uni_modules/uni-id-pages/components/cloud-image/cloud-image.vue
+++ b/uni_modules/uni-id-pages/components/cloud-image/cloud-image.vue
@@ -1,5 +1,5 @@
 <template>
-	<view @click="onClick" :style="{width,height}">
+	<view @click="onClick" :style="{width,height}" style="justify-content: center;">
 		<image v-if="cSrc" :style="{width,height}" :src="cSrc" :mode="mode"></image>
 	</view>
 </template>
@@ -46,13 +46,10 @@
 		watch: {
 			src:{
 				handler(src) {
-					// console.log(src);
-					// console.log(src.substring(0, 8));
 					if (src&&src.substring(0, 8) == "cloud://") {
 						uniCloud.getTempFileURL({
 							fileList: [src]
 						}).then(res=>{
-							// console.log(res);
 							this.cSrc = res.fileList[0].tempFileURL
 						})
 					}else{
@@ -61,9 +58,6 @@
 				},
 				immediate: true
 			}
-		},
-		async mounted() {
-
 		},
 		methods:{
 			onClick(){
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-agreements/uni-id-pages-agreements.vue b/uni_modules/uni-id-pages/components/uni-id-pages-agreements/uni-id-pages-agreements.vue
index d2660a9..861e388 100644
--- a/uni_modules/uni-id-pages/components/uni-id-pages-agreements/uni-id-pages-agreements.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-agreements/uni-id-pages-agreements.vue
@@ -67,7 +67,6 @@
 		},
 		methods: {
 			popupConfirm(){
-				// console.log("popupConfirm");
 				this.isAgree = true
 				retryFun()
 				// this.$emit('popupConfirm')
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue b/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
index e9b3ae1..694594a 100644
--- a/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
@@ -48,7 +48,6 @@
 		async mounted() {
 			// #ifdef H5
 			this.isPC = !['ios', 'android'].includes(uni.getSystemInfoSync().platform);
-			// console.log(' this.isPC', this.isPC, uni.getSystemInfoSync().platform);
 			// #endif
 		},
 		computed: {
@@ -68,7 +67,6 @@
 				mutations.updateUserInfo({avatar_file})
 			},
 			uploadAvatarImg(res) {
-				// console.log(this.hasLogin);
 				if(!this.hasLogin){
 					return uni.navigateTo({
 						url:'/uni_modules/uni-id-pages/pages/login/login-withoutpwd'
@@ -84,7 +82,6 @@
 					count: 1,
 					crop,
 					success: async (res) => {
-						// console.log(res);
 						let tempFile = res.tempFiles[0],
 							avatar_file = {
 								// #ifdef H5
@@ -95,10 +92,12 @@
 								// #endif
 							},
 							filePath = res.tempFilePaths[0]
+							
+						//非app端剪裁头像，app端用内置的原生裁剪
 						// #ifndef APP-PLUS
-						//非app端用前端组件剪裁头像，app端用内置的原生裁剪
-						if (!this.isPC) {
-							filePath = await new Promise((callback) => {
+						filePath = await new Promise((callback) => {
+							// #ifdef H5
+							if (!this.isPC) {
 								uni.navigateTo({
 									url: '/uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage?path=' +
 										filePath + `&options=${JSON.stringify(crop)}`,
@@ -112,10 +111,32 @@
 										// console.log(e);
 									}
 								});
+							}
+							// #endif
+							
+							// #ifdef MP-WEIXIN
+							wx.cropImage({
+								src:filePath,
+								cropScale:"1:1",
+								success: res => {
+									callback(res.tempFilePath)
+								},
+								fail(e){
+									console.error(e)
+									uni.showModal({
+										content: 'wx.cropImage ' + e.errMsg,
+										showCancel: false,
+										confirmText:"跳过裁剪",
+										complete() {
+											callback(filePath)
+										}
+									});
+								}
 							})
-						}
+							// #endif
+						})
 						// #endif
-						// console.log(this.userInfo);
+						
 						let cloudPath = this.userInfo._id + '' + Date.now()
 						avatar_file.name = cloudPath
 						uni.showLoading({
@@ -129,9 +150,7 @@
 							cloudPath,
 							fileType: "image"
 						});
-						// console.log(result)
 						avatar_file.url = fileID
-						// console.log({avatar_file});
 						uni.hideLoading()
 						this.setAvatarFile(avatar_file)
 					}
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-bind-mobile/uni-id-pages-bind-mobile.vue b/uni_modules/uni-id-pages/components/uni-id-pages-bind-mobile/uni-id-pages-bind-mobile.vue
index 5f0b5f0..c67b260 100644
--- a/uni_modules/uni-id-pages/components/uni-id-pages-bind-mobile/uni-id-pages-bind-mobile.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-bind-mobile/uni-id-pages-bind-mobile.vue
@@ -41,13 +41,11 @@
 									uniCloud.importObject("uni-id-co",{
 										customUI:true
 									}).loginByWeixin({code}).then(e=>{
-										// console.log(e);
 										resolve()
 									}).catch(e=>{
 										console.log(e);
 										reject()
 									}).finally(e=>{
-										// console.log(e);
 										uni.hideLoading()
 									})
 								},
@@ -61,13 +59,10 @@
 				})
 			},
 			async bindMobileByMpWeixin(e) {
-				// console.log(e);
 				if (e.detail.errMsg == "getPhoneNumber:ok") {
-					// console.log(e.detail);
 					//检查登录信息是否过期，否则通过重新登录刷新session_key
 					await this.beforeGetphonenumber()
 					uniIdCo.bindMobileByMpWeixin(e.detail).then(e => {
-						// console.log(e);
 						this.$emit('success')
 					}).finally(e => {
 						this.closeMe()
@@ -157,8 +152,8 @@
 	.agree::after {
 		border: none;
 	}
-
 	/* #endif */
+	
 	.agree:active {
 		background-color: #F5F5F6;
 	}
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-email-form/uni-id-pages-email-form.vue b/uni_modules/uni-id-pages/components/uni-id-pages-email-form/uni-id-pages-email-form.vue
index ba53d73..b10d7dc 100644
--- a/uni_modules/uni-id-pages/components/uni-id-pages-email-form/uni-id-pages-email-form.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-email-form/uni-id-pages-email-form.vue
@@ -141,7 +141,6 @@
 				const uniIdCo = uniCloud.importObject("uni-id-co", {
 					customUI: true
 				})
-				// console.log('uniIdCo', uniIdCo)
 				console.log('sendEmailCode',{
 					"email": this.email,
 					"scene": this.type,
@@ -152,7 +151,6 @@
 					"scene": this.type,
 					"captcha": this.captcha
 				}).then(result => {
-					// console.log(result.code);
 					uni.showToast({
 						title: "邮箱验证码发送成功",
 						icon: 'none',
@@ -161,7 +159,6 @@
 					this.reverseNumber = Number(this.count);
 					this.getCode();
 				}).catch(e => {
-					// console.log(JSON.stringify(e));
 					if (e.code == "uni-id-invalid-mail-template") {
 						this.modelValue = "123456"
 						uni.showToast({
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 c652a56..2cf1ba9 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
@@ -2,7 +2,7 @@
 	<view>
 		<view class="fab-login-box">
 			<view class="item" v-for="(item,index) in servicesList" :key="index"
-				@click="item.path?navigateTo(item.path):login_before(item.id,false)">
+				@click="item.path?toPage(item.path):login_before(item.id,false)">
 				<image class="logo" :src="item.logo" mode="scaleToFill"></image>
 				<text class="login-title">{{item.text}}</text>
 			</view>
@@ -15,15 +15,8 @@
 <script>
 	import config from '@/uni_modules/uni-id-pages/config.js'
 	//前一个窗口的页面地址。控制点击切换快捷登录方式是创建还是返回
-	import {
-			store,
-			mutations
-		} from '@/uni_modules/uni-id-pages/common/store.js'
-
-	const db = uniCloud.database();
-	const usersTable = db.collection('uni-id-users')
+	import {store,mutations} from '@/uni_modules/uni-id-pages/common/store.js'
 	let allServicesList = []
-
 	export default {
 		computed: {
 			agreements() {
@@ -49,7 +42,6 @@
 					return this.getParentComponent().agree
 				},
 				set(agree) {
-					// console.log('setAgree', agree);
 					return this.getParentComponent().agree = agree
 				}
 			}
@@ -59,65 +51,67 @@
 				servicesList: [{
 						"id": "username",
 						"text": "账号登录",
-						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/user.png",
+						"logo": "/uni_modules/uni-id-pages/static/login/uni-fab-login/user.png",
 						"path": "/uni_modules/uni-id-pages/pages/login/login-withpwd"
 					},
 					{
 						"id": "smsCode",
 						"text": "短信验证码",
-						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/sms.png",
+						"logo": "/uni_modules/uni-id-pages/static/login/uni-fab-login/sms.png",
 						"path": "/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=smsCode"
 					},
 					{
 						"id": "weixin",
 						"text": "微信登录",
-						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/weixin.png",
-					},
+						"logo": "/uni_modules/uni-id-pages/static/login/uni-fab-login/weixin.png",
+					},
+					// #ifndef MP-WEIXIN
 					{
 						"id": "apple",
 						"text": "苹果登录",
-						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/apple.png",
+						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/apple.png",
 					},
 					{
 						"id": "univerify",
 						"text": "一键登录",
-						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/univerify.png",
+						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/univerify.png",
 					},
 					{
 						"id": "taobao",
 						"text": "淘宝登录", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/taobao.png",
+						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/taobao.png",
 					},
 					{
 						"id": "facebook",
 						"text": "脸书登录", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/facebook.png",
+						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/facebook.png",
 					},
 					{
 						"id": "alipay",
 						"text": "支付宝登录", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/alipay.png",
+						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/alipay.png",
 					},
 					{
 						"id": "qq",
 						"text": "QQ登录", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/qq.png",
+						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/qq.png",
 					},
 					{
 						"id": "google",
 						"text": "谷歌登录", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/google.png",
+						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/google.png",
 					},
 					{
 						"id": "douyin",
 						"text": "抖音登录", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/douyin.png",
+						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/douyin.png",
 					},
 					{
 						"id": "sinaweibo",
 						"text": "新浪微博", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/sinaweibo.png",
-					}
+						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/sinaweibo.png",
+					}
+					// #endif
 				],
 				univerifyStyle: { //一键登录弹出窗的样式配置参数
 					"fullScreen": true, // 是否全屏显示，true表示全屏模式，false表示非全屏模式，默认值为false。
@@ -189,7 +183,6 @@
 				let path = item.path ? item.path.split('?')[0] : '';
 				return path != this.getRoute(1)
 			})
-			//console.log('servicesList', servicesList, this.servicesList);
 		},
 		methods: {
 			getParentComponent(){
@@ -206,24 +199,23 @@
 			},
 			getRoute(n = 0) {
 				let pages = getCurrentPages();
-				// console.log('route-pages-length', pages.length);
 				if (n > pages.length) {
 					return ''
 				}
 				return '/' + pages[pages.length - n].route
 			},
-			navigateTo(path) {
+			toPage(path,index = 0) {
+				let type = ['navigateTo','redirectTo'][index]
 				//console.log('比较', this.getRoute(1),this.getRoute(2), path)
 				if (this.getRoute(1) == path.split('?')[0] && this.getRoute(1) ==
 					'/uni_modules/uni-id-pages/pages/login/login-withoutpwd') {
 					//如果要被打开的页面已经打开，且这个页面是 /uni_modules/uni-id-pages/pages/index/index 则把类型参数传给他
-					let type = path.split('?')[1].split('=')[1]
-					uni.$emit('uni-id-pages-set-login-type', type)
+					let loginType = path.split('?')[1].split('=')[1]
+					uni.$emit('uni-id-pages-setLoginType', loginType)
 				} else if (this.getRoute(2) == path) { // 如果上一个页面就是，马上要打开的页面，直接返回。防止重复开启
 					uni.navigateBack();
 				} else if (this.getRoute(1) != path) {
-					//console.log(3);
-					uni.navigateTo({
+					uni[type]({
 						url: path,
 						animationType: 'slide-in-left',
 						complete(e) {
@@ -248,7 +240,7 @@
 					].includes(type)) {
 					return uni.showToast({
 						title: '该登录方式暂未实现，欢迎提交pr',
-						icon: 'none',
+						icon: 'none',
 						duration: 3000
 					});
 				}
@@ -265,7 +257,7 @@
 						}else{
 							return uni.showToast({
 								title: '当前设备不支持此登录，请选择其他登录方式',
-								icon: 'none',
+								icon: 'none',
 								duration: 3000
 							});
 						}
@@ -288,19 +280,16 @@
 				) {
 					return uni.showToast({
 						title: '当前设备不支持此登录，请选择其他登录方式',
-						icon: 'none',
+						icon: 'none',
 						duration: 3000
 					});
 				}
 
 				//判断是否需要弹出隐私协议授权框
-				// console.log(type, this.agree);
 				let needAgreements = (config?.agreements?.scope || []).includes('register')
-				// console.log({needAgreements});
 				if (type != 'univerify' && needAgreements && !this.agree) {
 					let agreementsRef = this.getParentComponent().$refs.agreements
 					return agreementsRef.popup(() => {
-						// console.log(type, navigateBack);
 						this.login_before(type, navigateBack, options)
 					})
 				}
@@ -312,7 +301,6 @@
 										document.domain +
 										(window.location.href.includes('#')?'/#':'') +
 										'/uni_modules/uni-id-pages/pages/login/login-withoutpwd?is_weixin_redirect=true&type=weixin'
-						// console.log('redirectUrl----',redirectUrl);
 						let ua = window.navigator.userAgent.toLowerCase();
 						if (ua.match(/MicroMessenger/i) == 'micromessenger'){
 							// console.log('在微信公众号内');
@@ -335,32 +323,40 @@
 				uni.showLoading({
 					mask: true
 				})
+
 				if (type == 'univerify') {
 					let univerifyManager = uni.getUniverifyManager()
+					let clickAnotherButtons = false
 					let onButtonsClickFn = async res => {
-						// console.log('点击了第三方登录，provider：', res, res.provider, this.univerifyStyle.buttons.list);
-						//同步一键登录弹出层隐私协议框是否打勾
-						let agree = (await uni.getCheckBoxState())[1].state
-						//console.log('agree',agree);
-						this.agree = agree
+						console.log('点击了第三方登录，provider：', res, res.provider, this.univerifyStyle.buttons.list);
+						clickAnotherButtons = true
+						let checkBoxState = await uni.getCheckBoxState();
+						// 同步一键登录弹出层隐私协议框是否打勾
+						// #ifdef VUE2
+						this.agree = checkBoxState[1].state
+						// #endif
+						// #ifdef VUE3
+						this.agree = checkBoxState.state
+						// #endif
 						let {
 							path
 						} = this.univerifyStyle.buttons.list[res.index]
-						if (path) {
-							this.navigateTo(path)
+						if (path) {
+							if( this.getRoute(1).includes('login-withoutpwd') && path.includes('login-withoutpwd') ){
+								this.getParentComponent().showCurrentWebview()
+							}
+							this.toPage(path,1)
 							closeUniverify()
 						} else {
-							if (agree) {
+							if (this.agree) {
 								closeUniverify()
 								setTimeout(() => {
-									//console.log('login_before');
 									this.login_before(res.provider)
 								}, 500)
 							} else {
-								//console.log("你未同意隐私政策协议");
 								uni.showToast({
 									title: "你未同意隐私政策协议",
-									icon: 'none',
+									icon: 'none',
 									duration: 3000
 								});
 							}
@@ -379,32 +375,34 @@
 					return univerifyManager.login({
 						"univerifyStyle": this.univerifyStyle,
 						success: res => {
-							// console.log('login success', res)
 							this.login(res.authResult, 'univerify')
 						},
 						fail(err) {
-							uni.showToast({
-								title: JSON.stringify(err),
-								icon: 'none',
-								duration: 3000
-							});
+							console.log(err)
+							if(!clickAnotherButtons){
+								uni.navigateBack()
+							}
+							// uni.showToast({
+							// 	title: JSON.stringify(err),
+							// 	icon: 'none',
+							// 	duration: 3000
+							// });
 						},
 						complete: async e => {
-							// console.log(e);
 							uni.hideLoading()
 							//同步一键登录弹出层隐私协议框是否打勾
-							this.agree = (await uni.getCheckBoxState())[1].state
+							// this.agree = (await uni.getCheckBoxState())[1].state
 							// 取消订阅自定义按钮点击事件
 							univerifyManager.offButtonsClick(onButtonsClickFn)
 						}
 					})
 				}
 
-        if (type === 'weixinMobile') {
-          return this.login({
-            phoneCode: options.phoneNumberCode
-          }, type)
-        }
+				if (type === 'weixinMobile') {
+					return this.login({
+						phoneCode: options.phoneNumberCode
+					}, type)
+				}
 
 				uni.login({
 					"provider": type,
@@ -413,7 +411,6 @@
 					"univerifyStyle": this.univerifyStyle,
 					// #endif
 					success: async e => {
-						// console.log(e);
 						if (type == 'apple') {
 							let res = await this.getUserInfo({
 								provider: "apple"
@@ -440,16 +437,15 @@
 					customUI:true
 				})
 				uniIdCo[action](params).then(result => {
-					// console.log("login-result", result);
 					uni.showToast({
 						title: '登录成功',
-						icon: 'none',
+						icon: 'none',
 						duration: 2000
 					});
 					// #ifdef MP-WEIXIN
 					//如果是微信小程序端的微信登录，且为首次登录，就弹出获取微信昵称+头像用于绑定资料
 					if (['weixin', 'weixinMobile'].includes(type) && result.type == "register") {
-            mutations.loginSuccess({
+						mutations.loginSuccess({
 							...result,
 							showToast: false,
 							autoBack: false
@@ -463,7 +459,6 @@
 					mutations.loginSuccess(result)
 				})
 				.catch(e=>{
-					// console.log(e);
 					uni.showModal({
 						content: e.message,
 						confirmText:"知道了",
@@ -513,7 +508,6 @@
 		box-sizing: border-box;
 		flex-direction: column;
 	}
-
 	/* #endif */
 
 	.fab-login-box {
@@ -552,8 +546,6 @@
 
 	/* #endif */
 
-
-
 	.logo {
 		width: 60rpx;
 		height: 60rpx;
@@ -563,7 +555,6 @@
 		border: solid 1px #F6F6F6;
 	}
 
-
 	.login-title {
 		text-align: center;
 		margin-top: 6px;
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-sms-form/uni-id-pages-sms-form.vue b/uni_modules/uni-id-pages/components/uni-id-pages-sms-form/uni-id-pages-sms-form.vue
index c5605f1..0a4eba3 100644
--- a/uni_modules/uni-id-pages/components/uni-id-pages-sms-form/uni-id-pages-sms-form.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-sms-form/uni-id-pages-sms-form.vue
@@ -146,7 +146,6 @@
 					"scene": this.type,
 					"captcha": this.captcha
 				}).then(result => {
-					// console.log(result.code);
 					uni.showToast({
 						title: "短信验证码发送成功",
 						icon: 'none',
@@ -155,7 +154,6 @@
 					this.reverseNumber = Number(this.count);
 					this.getCode();
 				}).catch(e => {
-					// console.log(JSON.stringify(e));
 					if (e.code == "uni-id-invalid-sms-template-id") {
 						this.modelValue = "123456"
 						uni.showToast({
@@ -209,7 +207,6 @@
 		/* #endif */
 		justify-content: center;
 		align-items: center;
-
 	}
 
 	.inner-text {
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-user-profile/uni-id-pages-user-profile.vue b/uni_modules/uni-id-pages/components/uni-id-pages-user-profile/uni-id-pages-user-profile.vue
index 2c7b2e3..7b78f9b 100644
--- a/uni_modules/uni-id-pages/components/uni-id-pages-user-profile/uni-id-pages-user-profile.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-user-profile/uni-id-pages-user-profile.vue
@@ -31,12 +31,10 @@
 					uni.getUserProfile({
 						desc: "用于设置账户昵称和头像",
 						complete: (e) => {
-							// console.log("getUserProfile:", e);
 							callBack(e)
 						}
 					})
 				})
-				// console.log("userInfo", res.userInfo);
 				if(res.errMsg != "getUserProfile:ok"){
 					return this.closeMe()
 				}
@@ -46,10 +44,10 @@
 					uni.downloadFile({
 					    url: avatarUrl,
 					    success: (res) => {
-					        if (res.statusCode === 200) {
+								if (res.statusCode === 200) {
 					            // console.log('下载成功');
-								callBack(res.tempFilePath)
-					        }
+									callBack(res.tempFilePath)
+								}
 							callBack()
 					    },
 						fail: (err) => {
@@ -62,13 +60,11 @@
 				})
 				const extName = tempFilePath.split('.').pop() || 'jpg'
 				const cloudPath = 'user/avatar/'+ userId+'/'+Date.now()+'-avatar.'+extName;
-				// console.log(tempFilePath);
 				const result = await uniCloud.uploadFile({
 					filePath: tempFilePath,
 					cloudPath,
 					fileType:'image'
 				});
-				// console.log("上传成功",{result});
 				let userInfo = {
 					"nickname":nickName,
 					"avatar_file":{
@@ -89,7 +85,6 @@
 				})
 			},
 			doUpdate(data,callback){
-				// console.log('dododo',data);
 				// 使用 clientDB 提交数据
 				usersTable.where('_id==$env.uid').update(data).then((res) => {
 					callback(res)
diff --git a/uni_modules/uni-id-pages/package-lock.json b/uni_modules/uni-id-pages/package-lock.json
deleted file mode 100644
index 02e97b7..0000000
--- a/uni_modules/uni-id-pages/package-lock.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"name": "uni-id-pages",
-	"version": "1.0.19",
-	"lockfileVersion": 2,
-	"requires": true,
-	"packages": {
-		"": {
-			"version": "1.0.19",
-			"dependencies": {
-				"jweixin-module": "^1.6.0"
-			},
-			"engines": {
-				"HBuilderX": "^3.4.17"
-			}
-		},
-		"node_modules/jweixin-module": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
-			"integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
-		}
-	},
-	"dependencies": {
-		"jweixin-module": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
-			"integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
-		}
-	}
-}
diff --git a/uni_modules/uni-id-pages/package.json b/uni_modules/uni-id-pages/package.json
index ae1ae1f..1c8e2ff 100644
--- a/uni_modules/uni-id-pages/package.json
+++ b/uni_modules/uni-id-pages/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-id-pages",
 	"displayName": "uni-id-pages",
-	"version": "1.0.41",
+	"version": "1.1.0",
 	"description": "云端一体简单、统一、可扩展的用户中心页面模版",
 	"keywords": [
         "用户管理",
diff --git a/uni_modules/uni-id-pages/pages/common/webview/webview.vue b/uni_modules/uni-id-pages/pages/common/webview/webview.vue
index cacf97d..71ff55c 100644
--- a/uni_modules/uni-id-pages/pages/common/webview/webview.vue
+++ b/uni_modules/uni-id-pages/pages/common/webview/webview.vue
@@ -20,7 +20,6 @@
 				});
 				title = "页面路径错误"
 			}else{
-				// console.log(url,title);
 				this.url = url;
 			}
 			if(title){
@@ -34,7 +33,3 @@
 		}
 	}
 </script>
-
-<style lang="scss">
-
-</style>
diff --git a/uni_modules/uni-id-pages/pages/login/login-smscode.vue b/uni_modules/uni-id-pages/pages/login/login-smscode.vue
index 2294825..f847cc5 100644
--- a/uni_modules/uni-id-pages/pages/login/login-smscode.vue
+++ b/uni_modules/uni-id-pages/pages/login/login-smscode.vue
@@ -38,7 +38,6 @@
 			this.phone = phoneNumber;
 		},
 		onShow() {
-			// console.log('onShow');
 			// #ifdef H5
 			document.onkeydown = event => {
 				var e = event || window.event;
@@ -68,14 +67,12 @@
 					"code": this.code,
 					"captcha": this.captcha
 				}).then(e => {
-					// console.log(e);
 					this.loginSuccess(e)
 				}).catch(e => {
 					if (e.errCode == 'uni-id-captcha-required') {
 						this.$refs.popup.open()
 					} else {
 						console.log(e.errMsg);
-						// console.log(e.errCode);
 					}
 				}).finally(e => {
 					this.captcha = ''
diff --git a/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue b/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
index 8567641..99f72d9 100644
--- a/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
+++ b/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
@@ -1,229 +1,241 @@
-<!-- 免密登录页 -->
-<template>
-	<view class="uni-content">
-		<view class="login-logo">
-			<image :src="logo"></image>
-		</view>
-		<!-- 顶部文字 -->
-		<text class="title">请选择登录方式</text>
-		<!-- 快捷登录框 当url带参数时有效 -->
-		<template v-if="['apple','weixin', 'weixinMobile'].includes(type)">
-			<text class="tip">将根据第三方账号服务平台的授权范围获取你的信息</text>
-			<view class="quickLogin">
-				<image v-if="type !== 'weixinMobile'" @click="quickLogin" :src="imgSrc" mode="widthFix" class="quickLoginBtn"></image>
-				<button v-else type="primary" open-type="getPhoneNumber" @getphonenumber="quickLogin" class="uni-btn">微信授权手机号登录</button>
-				<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
-			</view>
-		</template>
-		<template v-else>
-			<text class="tip">未注册的账号验证通过后将自动注册</text>
-			<view class="phone-box">
-				<view @click="chooseArea" class="area">+86</view>
-				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" type="number" :inputBorder="false"
-					v-model="phone" maxlength="11" placeholder="请输入手机号" />
-			</view>
-			<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
-			<button class="uni-btn" type="primary" @click="toSmsPage">获取验证码</button>
-		</template>
-		<!-- 固定定位的快捷登录按钮 -->
-		<uni-id-pages-fab-login ref="uniFabLogin"></uni-id-pages-fab-login>
-	</view>
-</template>
-
-<script>
-	let currentWebview; //当前窗口对象
-	import config from '@/uni_modules/uni-id-pages/config.js'
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				type: "", //快捷登录方式
-				phone: "", //手机号码
-				focusPhone:false,
-				logo: "/static/logo.png"
-			}
-		},
-		computed: {
-			async loginTypes() { //读取配置的登录优先级
-				return config.loginTypes
-			},
-			isPhone() { //手机号码校验正则
-				return /^1\d{10}$/.test(this.phone);
-			},
-			imgSrc() { //大快捷登录按钮图
-				return '/uni_modules/uni-id-pages/static/login/' + this.type + '.png'
-			}
-		},
-		async onLoad(e) {
-			// console.log(e);
-			//获取通过url传递的参数type设置当前登录方式，如果没传递直接默认以配置的登录
-			let type = e.type || config.loginTypes[0]
-			this.type = type
-			if(type != 'univerify'){
-				this.focusPhone = true
-			}
-			this.$nextTick(() => {
-				//关闭重复显示的登录快捷方式
-				if (['weixin', 'apple'].includes(type)) {
-					this.$refs.uniFabLogin.servicesList = this.$refs.uniFabLogin.servicesList.filter(item =>item.id != type)
-				}
-			})
-			uni.$on('uni-id-pages-set-login-type', type => {
-				this.type = type
-			})
-		},
-		onShow() {
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.toSmsPage()
-				}
-			};
-			// #endif
-		},
-		onUnload() {
-			uni.$off('uni-id-pages-set-login-type')
-		},
-		onReady() {
-			//是否优先启动一键登录。即：页面一加载就启动一键登录
-			//#ifdef APP-PLUS
-			if (this.type == "univerify") {
-				this.type == this.loginTypes[1]
-				// console.log('开始一键登录');
-				setTimeout(() => {
-					this.$refs.uniFabLogin.login_before('univerify')
-				}, 100)
-			}
-			//#endif
-		},
+<!-- 免密登录页 -->
+<template>
+	<view class="uni-content">
+		<view class="login-logo">
+			<image :src="logo"></image>
+		</view>
+		<!-- 顶部文字 -->
+		<text class="title">请选择登录方式</text>
+		<!-- 快捷登录框 当url带参数时有效 -->
+		<template v-if="['apple','weixin', 'weixinMobile'].includes(type)">
+			<text class="tip">将根据第三方账号服务平台的授权范围获取你的信息</text>
+			<view class="quickLogin">
+				<image v-if="type !== 'weixinMobile'" @click="quickLogin" :src="imgSrc" mode="widthFix"
+					class="quickLoginBtn"></image>
+				<button v-else type="primary" open-type="getPhoneNumber" @getphonenumber="quickLogin"
+					class="uni-btn">微信授权手机号登录</button>
+				<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
+			</view>
+		</template>
+		<template v-else>
+			<text class="tip">未注册的账号验证通过后将自动注册</text>
+			<view class="phone-box">
+				<view @click="chooseArea" class="area">+86</view>
+				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" type="number"
+					:inputBorder="false" v-model="phone" maxlength="11" placeholder="请输入手机号" />
+			</view>
+			<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
+			<button class="uni-btn" type="primary" @click="toSmsPage">获取验证码</button>
+		</template>
+		<!-- 固定定位的快捷登录按钮 -->
+		<uni-id-pages-fab-login ref="uniFabLogin"></uni-id-pages-fab-login>
+	</view>
+</template>
+
+<script>
+	let currentWebview; //当前窗口对象
+	import config from '@/uni_modules/uni-id-pages/config.js'
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				type: "", //快捷登录方式
+				phone: "", //手机号码
+				focusPhone: false,
+				logo: "/static/logo.png"
+			}
+		},
+		computed: {
+			async loginTypes() { //读取配置的登录优先级
+				return config.loginTypes
+			},
+			isPhone() { //手机号码校验正则
+				return /^1\d{10}$/.test(this.phone);
+			},
+			imgSrc() { //大快捷登录按钮图
+				return this.type == 'weixin' ? '/uni_modules/uni-id-pages/static/login/weixin.png' :
+					'/uni_modules/uni-id-pages/static/app-plus/apple.png'
+			}
+		},
+		async onLoad(e) {
+			//获取通过url传递的参数type设置当前登录方式，如果没传递直接默认以配置的登录
+			let type = e.type || config.loginTypes[0]
+			this.type = type
+
+			// console.log("this.type: -----------",this.type);
+			if (type != 'univerify') {
+				this.focusPhone = true
+			}
+			this.$nextTick(() => {
+				//关闭重复显示的登录快捷方式
+				if (['weixin', 'apple'].includes(type)) {
+					this.$refs.uniFabLogin.servicesList = this.$refs.uniFabLogin.servicesList.filter(item =>
+						item.id != type)
+				}
+			})
+			uni.$on('uni-id-pages-setLoginType', type => {
+				this.type = type
+			})
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.toSmsPage()
+				}
+			};
+			// #endif
+		},
+		onUnload() {
+			uni.$off('uni-id-pages-setLoginType')
+		},
+		onReady() {
+			// 是否优先启动一键登录。即：页面一加载就启动一键登录
+			//#ifdef APP-PLUS
+			if (this.type == "univerify") {
+				const pages = getCurrentPages();
+				currentWebview = pages[pages.length - 1].$getAppWebview();
+				currentWebview.setStyle({
+					"top": "2000px" // 隐藏当前页面窗体
+				})
+				this.type == this.loginTypes[1]
+				// console.log('开始一键登录');
+				this.$refs.uniFabLogin.login_before('univerify')
+			}
+			//#endif
+		},
 		methods: {
-			quickLogin(e) {
-        let options = {}
-
-        if (e.detail?.code) {
-          options.phoneNumberCode = e.detail.code
-        }
-
-        if (this.type === 'weixinMobile' && !e.detail?.code) return
-
-				this.$refs.uniFabLogin.login_before(this.type, true, options)
-			},
-			toSmsPage() {
-				// console.log('toSmsPage',this.agree);
-				if (!this.isPhone) {
-					this.focusPhone = true
-					return uni.showToast({
-						title: "手机号码格式不正确",
-						icon: 'none',
-						duration: 3000
-					});
-				}
-				if (this.needAgreements && !this.agree) {
-					return this.$refs.agreements.popup(this.toSmsPage)
-				}
-				// 发送验证吗
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/login/login-smscode?phoneNumber=' + this.phone
-				});
-			},
-			//去密码登录页
-			toPwdLogin() {
-				uni.navigateTo({
-					url: '../login/password'
+			showCurrentWebview(){
+				// 恢复当前页面窗体的显示 一键登录，默认不显示当前窗口
+				currentWebview.setStyle({
+					"top": 0
 				})
-			},
-			chooseArea() {
-				uni.showToast({
-					title: '暂不支持其他国家',
-					icon: 'none',
-					duration: 3000
-				});
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-	
-	@media screen and (min-width: 690px) {
-		.uni-content{
-			height: 350px;
-		}
-	}
-	
-	.uni-content,
-	.quickLogin {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		flex-direction: column;
-		/* #endif */
-	}
-
-	.phone-box {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-	}
-
-	.area {
-		position: absolute;
-		left: 10px;
-		z-index: 9;
-		top: 12px;
-		font-size: 14px;
-	}
-
-	.area::after {
-		content: "";
-		border: 3px solid transparent;
-		border-top-color: #000;
-		top: 12px;
-		left: 3px;
-		position: relative;
-	}
-	
-	/* #ifdef MP */
-	// 解决小程序端开启虚拟节点virtualHost引起的 class = input-box丢失的问题 [详情参考](https://uniapp.dcloud.net.cn/matter.html#%E5%90%84%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%AE%9E%E7%8E%B0%E6%9C%BA%E5%88%B6%E4%B8%8D%E5%90%8C-%E5%8F%AF%E8%83%BD%E5%AD%98%E5%9C%A8%E7%9A%84%E5%B9%B3%E5%8F%B0%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98)
-	.phone-box ::v-deep .uni-easyinput__content,
-	/* #endif */
-	.input-box {
-		/* #ifndef APP-NVUE */
-		box-sizing: border-box;
-		/* #endif */
-		flex: 1;
-		padding-left: 45px;
-		margin-bottom: 10px;
-		border-radius: 0;
-	}
-
-	.quickLogin {
-		// width: 650rpx;
-		height: 350px;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.quickLoginBtn {
-		margin: 20px 0;
-		width: 450rpx;
-		/* #ifndef APP-NVUE */
-		max-width: 230px;
-		/* #endif */
-		height: 82rpx;
-	}
-
-	.tip {
-		margin-top: -15px;
-		margin-bottom: 20px;
-	}
-
-	@media screen and (min-width: 690px) {
-		.quickLogin{
-			height: auto;
-		}
-	}
+			},
+			quickLogin(e) {
+				let options = {}
+
+				if (e.detail?.code) {
+					options.phoneNumberCode = e.detail.code
+				}
+
+				if (this.type === 'weixinMobile' && !e.detail?.code) return
+
+				this.$refs.uniFabLogin.login_before(this.type, true, options)
+			},
+			toSmsPage() {
+				if (!this.isPhone) {
+					this.focusPhone = true
+					return uni.showToast({
+						title: "手机号码格式不正确",
+						icon: 'none',
+						duration: 3000
+					});
+				}
+				if (this.needAgreements && !this.agree) {
+					return this.$refs.agreements.popup(this.toSmsPage)
+				}
+				// 发送验证吗
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-smscode?phoneNumber=' + this.phone
+				});
+			},
+			//去密码登录页
+			toPwdLogin() {
+				uni.navigateTo({
+					url: '../login/password'
+				})
+			},
+			chooseArea() {
+				uni.showToast({
+					title: '暂不支持其他国家',
+					icon: 'none',
+					duration: 3000
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	@media screen and (min-width: 690px) {
+		.uni-content {
+			height: 350px;
+		}
+	}
+
+	.uni-content,
+	.quickLogin {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+	}
+
+	.phone-box {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+	}
+
+	.area {
+		position: absolute;
+		left: 10px;
+		z-index: 9;
+		top: 12px;
+		font-size: 14px;
+	}
+
+	.area::after {
+		content: "";
+		border: 3px solid transparent;
+		border-top-color: #000;
+		top: 12px;
+		left: 3px;
+		position: relative;
+	}
+
+	/* #ifdef MP */
+	// 解决小程序端开启虚拟节点virtualHost引起的 class = input-box丢失的问题 [详情参考](https://uniapp.dcloud.net.cn/matter.html#%E5%90%84%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%AE%9E%E7%8E%B0%E6%9C%BA%E5%88%B6%E4%B8%8D%E5%90%8C-%E5%8F%AF%E8%83%BD%E5%AD%98%E5%9C%A8%E7%9A%84%E5%B9%B3%E5%8F%B0%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98)
+	.phone-box ::v-deep .uni-easyinput__content,
+	/* #endif */
+	.input-box {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		flex: 1;
+		padding-left: 45px;
+		margin-bottom: 10px;
+		border-radius: 0;
+	}
+
+	.quickLogin {
+		height: 350px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.quickLoginBtn {
+		margin: 20px 0;
+		width: 450rpx;
+		/* #ifndef APP-NVUE */
+		max-width: 230px;
+		/* #endif */
+		height: 82rpx;
+	}
+
+	.tip {
+		margin-top: -15px;
+		margin-bottom: 20px;
+	}
+
+	@media screen and (min-width: 690px) {
+		.quickLogin {
+			height: auto;
+		}
+	}
 </style>
diff --git a/uni_modules/uni-id-pages/pages/register/register-admin.vue b/uni_modules/uni-id-pages/pages/register/register-admin.vue
index 8366cd4..fcaf88a 100644
--- a/uni_modules/uni-id-pages/pages/register/register-admin.vue
+++ b/uni_modules/uni-id-pages/pages/register/register-admin.vue
@@ -108,12 +108,9 @@
 			},
 			submitForm(params) {
 				uniIdCo.registerAdmin(this.formData).then(e => {
-					// console.log(e);
 					uni.navigateBack()
 				})
 				.catch(e => {
-					// console.log(e);
-					// console.log(e.message);
 					//更好的体验：登录错误，直接刷新验证码
 					this.$refs.captcha.getImageCaptcha()
 					uni.showModal({
diff --git a/uni_modules/uni-id-pages/pages/register/register.vue b/uni_modules/uni-id-pages/pages/register/register.vue
index 9008696..8ea3234 100644
--- a/uni_modules/uni-id-pages/pages/register/register.vue
+++ b/uni_modules/uni-id-pages/pages/register/register.vue
@@ -109,17 +109,14 @@
 				}).catch((errors) => {
 					let key = errors[0].key
 					key = key.replace(key[0], key[0].toUpperCase())
-					// console.log(key);
 					this['focus' + key] = true
 				})
 			},
 			submitForm(params) {
 				uniIdCo.registerUser(this.formData).then(e => {
-						// console.log(e);
 						this.loginSuccess(e)
 					})
 					.catch(e => {
-						// console.log(e);
 						console.log(e.message);
 						//更好的体验：登录错误，直接刷新验证码
 						this.$refs.captcha.getImageCaptcha()
diff --git a/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue b/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue
index d3cf17c..b6e7704 100644
--- a/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue
+++ b/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue
@@ -137,8 +137,6 @@
 			 * 完成并提交
 			 */
 			submit() {
-				// console.log("formData", this.formData);
-				// console.log('rules', this.rules);
 				this.$refs.form.validate()
 					.then(res => {
 						let {
@@ -153,7 +151,6 @@
 								password,
 								captcha
 							}).then(e => {
-								// console.log(e);
 								uni.navigateTo({
 									url: '/uni_modules/uni-id-pages/pages/login/login-withpwd',
 									complete: (e) => {
@@ -171,11 +168,9 @@
 					}).catch(errors=>{
 						let key = errors[0].key
 						if(key == 'code'){
-							// console.log(this.$refs.shortCode);
 							return this.$refs.shortCode.focusSmsCodeInput = true
 						}
 						key = key.replace(key[0], key[0].toUpperCase())
-						// console.log(key,'focus'+key);
 						this['focus'+key] = true
 					})
 			},
diff --git a/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue b/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
index 183c405..6e1976b 100644
--- a/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
+++ b/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
@@ -166,8 +166,6 @@
 			 * 完成并提交
 			 */
 			submit() {
-				// console.log("formData", this.formData);
-				// console.log('rules', this.rules);
 				this.$refs.form.validate()
 					.then(res => {
 						let {
@@ -182,7 +180,6 @@
 								password,
 								captcha
 							}).then(e => {
-								// console.log(e);
 								uni.navigateBack()
 							})
 							.catch(e => {
@@ -195,11 +192,9 @@
 					}).catch(errors=>{
 						let key = errors[0].key
 						if(key == 'code'){
-							// console.log(this.$refs.shortCode);
 							return this.$refs.shortCode.focusSmsCodeInput = true
 						}
 						key = key.replace(key[0], key[0].toUpperCase())
-						// console.log(key,'focus'+key);
 						this['focus'+key] = true
 					})
 			},
@@ -208,11 +203,11 @@
 					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email'
 				})
 			},
-      backLogin () {
-        uni.redirectTo({
-          url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
-        })
-      }
+			backLogin () {
+				uni.redirectTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+				})
+			}
 		}
 	}
 </script>
diff --git a/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue b/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue
index 1fcf786..a6b2b1f 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue
@@ -65,10 +65,8 @@
 					});
 				}
 				
-				// console.log(this.formData);
 				const uniIdCo = uniCloud.importObject("uni-id-co")
 				uniIdCo.bindMobileBySms(this.formData).then(e => {
-					// console.log(e);
 					uni.showToast({
 						title: e.errMsg,
 						icon: 'none',
diff --git a/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue b/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue
index 8396358..75e0e04 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue
@@ -82,8 +82,6 @@
 			 * 完成并提交
 			 */
 			submit() {
-				// console.log("formData", this.formData);
-				// console.log('rules', this.rules);
 				this.$refs.form.validate()
 					.then(res => {
 						let {
@@ -94,7 +92,6 @@
 								oldPassword,
 								newPassword
 							}).then(e => {
-								// console.log(e);
 								uni.removeStorageSync('uni_id_token');
 								uni.setStorageSync('uni_id_token_expired', 0)
 								uni.redirectTo({
@@ -109,7 +106,6 @@
 					}).catch(errors => {
 						let key = errors[0].key
 						key = key.replace(key[0], key[0].toUpperCase())
-						// console.log(key, 'focus' + key);
 						this['focus' + key] = true
 					})
 			}
diff --git a/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate.vue b/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate.vue
index d1c9467..6d96421 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate.vue
@@ -39,11 +39,8 @@
 					content: '已经仔细阅读注销提示，知晓可能带来的后果，并确认要注销',
 					complete: (e) => {
 						if (e.confirm) {
-							const db = uniCloud.database();
-							
 							const uniIdco = uniCloud.importObject("uni-id-co");
 							uniIdco.closeAccount().then((e) => {
-								// console.log(e);
 								uni.showToast({
 									title: '注销成功',
 									duration: 3000
diff --git a/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd.vue b/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd.vue
index 1329b7f..0b48260 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd.vue
@@ -115,7 +115,6 @@ export default {
               this.$refs.popup.open()
             } else {
               console.log(e.errMsg);
-              // console.log(e.errCode);
             }
           }).finally(e => {
             this.formData.captcha = ''
diff --git a/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue b/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
index 36b34b1..5124c4c 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
@@ -14,9 +14,11 @@
 			<uni-list-item v-if="hasPwd" class="item" @click="changePassword" title="修改密码" link>
 			</uni-list-item>
 		</uni-list>
+		<!-- #ifndef MP -->
 		<uni-list class="mt10">
 			<uni-list-item @click="deactivate" title="注销账号" link="navigateTo"></uni-list-item>
 		</uni-list>
+		<!-- #endif -->
 		<uni-popup ref="dialog" type="dialog">
 			<uni-popup-dialog mode="input" :value="userInfo.nickname" @confirm="setNickname" title="设置昵称"
 				placeholder="请输入要设置的昵称">
@@ -30,8 +32,6 @@
 	</view>
 </template>
 <script>
-	const db = uniCloud.database();
-	const usersTable = db.collection('uni-id-users')
 	const uniIdCo = uniCloud.importObject("uni-id-co")
   import {
     store,
@@ -82,12 +82,12 @@
 					}
 				})
 			},
-      logout(){
-        mutations.logout()
-      },
-      bindMobileSuccess(){
-        mutations.updateUserInfo()
-      },
+			logout(){
+			  mutations.logout()
+			},
+			bindMobileSuccess(){
+			  mutations.updateUserInfo()
+			},
 			changePassword(){
 				uni.navigateTo({
 					url: '/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd',
@@ -123,9 +123,7 @@
 					"provider": 'univerify',
 					"univerifyStyle": this.univerifyStyle,
 					success: async e => {
-						// console.log(e.authResult);
 						uniIdCo.bindMobileByUniverify(e.authResult).then(res => {
-							// console.log(res);
 							mutations.updateUserInfo()
 						}).catch(e => {
 							console.log(e);
@@ -148,7 +146,6 @@
 				})
 			},
 			setNickname(nickname) {
-				// console.log(nickname);
 				if (nickname) {
 					mutations.updateUserInfo({nickname})
 					this.$refs.dialog.close()
diff --git a/uni_modules/uni-id-pages/pages_init.json b/uni_modules/uni-id-pages/pages_init.json
index f740558..e1a3d23 100644
--- a/uni_modules/uni-id-pages/pages_init.json
+++ b/uni_modules/uni-id-pages/pages_init.json
@@ -18,13 +18,13 @@
 			"style": {
 				"navigationBarTitleText": "绑定手机号码"
 			}
-		},
+		},
 		{
 			"path": "uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage",
 			"style": {
 				"navigationBarTitleText": ""
 			}
-		},
+		},
 		{
 			"path": "uni_modules/uni-id-pages/pages/login/login-withoutpwd",
 			"style": {
@@ -81,14 +81,15 @@
 	            "navigationBarTitleText": "修改密码",
 	            "enablePullDownRefresh": false
 	        }
-
-	    },{
+	    },
+		{
 			"path": "uni_modules/uni-id-pages/pages/register/register-admin",
 			"style": {
 				"navigationBarTitleText": "注册管理员账号",
 				"enablePullDownRefresh": false
 			}
-		},{
+		},
+		{
 			"path": "uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd",
 			"style": {
 				"navigationBarTitleText": "设置密码",
diff --git a/uni_modules/uni-id-pages/static/login/apple.png b/uni_modules/uni-id-pages/static/app-plus/apple.png
similarity index 100%
rename from uni_modules/uni-id-pages/static/login/apple.png
rename to uni_modules/uni-id-pages/static/app-plus/apple.png
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/alipay.png b/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/alipay.png
similarity index 100%
rename from uni_modules/uni-id-pages/static/uni-fab-login/alipay.png
rename to uni_modules/uni-id-pages/static/app-plus/uni-fab-login/alipay.png
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/apple.png b/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/apple.png
similarity index 100%
rename from uni_modules/uni-id-pages/static/uni-fab-login/apple.png
rename to uni_modules/uni-id-pages/static/app-plus/uni-fab-login/apple.png
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/douyin.png b/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/douyin.png
similarity index 100%
rename from uni_modules/uni-id-pages/static/uni-fab-login/douyin.png
rename to uni_modules/uni-id-pages/static/app-plus/uni-fab-login/douyin.png
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/facebook.png b/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/facebook.png
similarity index 100%
rename from uni_modules/uni-id-pages/static/uni-fab-login/facebook.png
rename to uni_modules/uni-id-pages/static/app-plus/uni-fab-login/facebook.png
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/google.png b/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/google.png
similarity index 100%
rename from uni_modules/uni-id-pages/static/uni-fab-login/google.png
rename to uni_modules/uni-id-pages/static/app-plus/uni-fab-login/google.png
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/qq.png b/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/qq.png
similarity index 100%
rename from uni_modules/uni-id-pages/static/uni-fab-login/qq.png
rename to uni_modules/uni-id-pages/static/app-plus/uni-fab-login/qq.png
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/sinaweibo.png b/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/sinaweibo.png
similarity index 100%
rename from uni_modules/uni-id-pages/static/uni-fab-login/sinaweibo.png
rename to uni_modules/uni-id-pages/static/app-plus/uni-fab-login/sinaweibo.png
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/taobao.png b/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/taobao.png
similarity index 100%
rename from uni_modules/uni-id-pages/static/uni-fab-login/taobao.png
rename to uni_modules/uni-id-pages/static/app-plus/uni-fab-login/taobao.png
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/univerify.png b/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/univerify.png
similarity index 100%
rename from uni_modules/uni-id-pages/static/uni-fab-login/univerify.png
rename to uni_modules/uni-id-pages/static/app-plus/uni-fab-login/univerify.png
diff --git a/uni_modules/uni-id-pages/static/login/uni-fab-login/sms.png b/uni_modules/uni-id-pages/static/login/uni-fab-login/sms.png
new file mode 100644
index 0000000000000000000000000000000000000000..5533743a21e39f8a89ae2faee1d89ab9581bf29a
GIT binary patch
literal 4285
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
F^iP+OC9nVh

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-id-pages/static/login/uni-fab-login/user.png b/uni_modules/uni-id-pages/static/login/uni-fab-login/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..268420b7343d9b2c7c58233e024927363928dc5f
GIT binary patch
literal 2997
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

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-id-pages/static/login/uni-fab-login/weixin.png b/uni_modules/uni-id-pages/static/login/uni-fab-login/weixin.png
new file mode 100644
index 0000000000000000000000000000000000000000..af7175b6fed8670ce6e6d1a7a64a4812a4db8cfe
GIT binary patch
literal 3934
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
CN=BRj

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-id-pages/static/login/weixin.png b/uni_modules/uni-id-pages/static/login/weixin.png
index 3d1ff0098190a0260735295c7d84b19a15d20dfb..df70aac5092588d7ccb87d75f024d0c9dc804607 100644
GIT binary patch
delta 9719
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
FV1f&cjtT$(

delta 9760
zcmV+*Cg0iHS%q4VBe6K%29YBbe*ySVOjJcja7;pOLPUB*NU2Cki%3YNNJy(jKDj(O
zyEsarNJFziLbX6dbwWgVL_%&tK({_egGNY(NJxW5N|Q)Lc0@{^NJ@@KMz2Ijrbt3=
zLQ0lON|8xJaYIU)NIthdLAO9cZbCb|Iz)IxMX^Lea6(F*N<^|lMt(+0N}EVVdqqg8
zMo5W9Lvuq$envuaLPmi`NT*0hhekqlLP(29MuA2|c|=O1NJ^tfN|Q=Pd`3igL`Ho^
zN{vcFZbC+QL<qYE|NsA!)(0(r3%v;ty$&3|8Xv(O8Ne7Qza|#H77DuvHoY_!zZ4U{
z5$XBqBf}vv$1f7S5DvWz{Qvy$`|sHG*SPGr<M-njzZQt!hl1UKUejHL-GgJ*VIsjG
zD8(i#zbQ`7Oh3y#GQTk0_uVYTD)asGaoKRk@W-v`td-)F_5Jm2*KAdP(Nr_PGCIjR
zNzO;g@yd<hjOF>|qUNI0^U}QSyV3K{o#mV*zat#M8hhJ%lHroi@y+@D`H<m{f82cS
z`|ZK+!LRABr{||6!6KRCm{8A7Hpw=2+I2L&G-=jnMa@G*%R*VvSl{>G>-p=S<(@FV
zFdn}gTGLv?@59gY&#C8sr`7Y*vFWiczbtVnVJ83p06%n6PE!B`V)3u*^Zowk`ujdm
z2>pqhk;yvZz4z@9(ZU(n{re34R{0{{`F`DJ@u@C+9)s_pHnV|U=jp|4Om(>wN>$g#
z1^@sc07*naRCodHUHO+BwY6@Dcb0*$IBW;Z7D6C6+kxcey{_qh?wRRX+cU<VF~%OS
z4c-7h+h8BI5Fil38VJeB0@*lu`8S_*ul7=@q^jz!a<}@2F0EJhUg^_vrBbz875wi1
z?ya{xeBacb*AJ|<<1cDpEHtoo;PpLI_dR^et>3KxA*D(D;1}Pz`}K&fv1nOQh%62K
zW8<1{{o)6u!BUiez&$r^-Laa*TMUmH7%vU1?$~<cJw>rnJl{`l*?wre6d9$78pzYY
zq3yT)q&Q~6b6)$<j?FxtVtmxVIBH;X$6Y@PM@*3%KZ+<D#|9K-^47rS_7Pz1d-ug<
znRkuEgyX7#)!jcUGDvyndF<|e<EpwSSJXg=2KHTZgEwq{LKFUQPY5S5ZPdVcYhcg!
zLlNYa{_3gmR$G)VY9LetQ&)RICnV9GTaSiv5z|KvjJpPoZoMr8Mfque{QkJBEXo%(
zP(%YS{x}~!-YMd&u}BrfJd>e;%I1%8);JjrCQ4aQ0~O65uiH_u{Fp6jU_vyo<67_8
zVP?Yb$Fuo=6Vh6un8h`4wydT9p1pC0y14pd&WX{$zVF<VIaYZ@T(>bXnu>x(4V2Qr
z#&sTm%1H9q*-}Nv%uxdqq=B<HWWXplcuRcaY=YWJ6t%1d4&ImxDQkjT<2n7Zs*m|6
zN&`plumUM3@UCbEnW$D0g)Ogv&4+S8Wr^NdzSu~AA!=aKH1N0uO0J-*c2AmyqP$T9
zRcK(_RW4km;<i>%W~31{FnJo-ngWv};P%PWPn0-npb`zN-{k<75p~CAB}GOeQ3DgG
zflY7Q<CbXGpTPDJMXpK%tDgI5kHvlJs#G57Or!>$yup|vTD>=aF_FrNLPrf$rh)fw
zwn9sP58Pf^agk8ez=UdGyN)TFFB<kIv~5JOtJJ_w8@AN2E%D%0mHLjfCR78PTU1n~
z-PgtUsVB5$M6s*Yz?$>*wCm%Gp4F;5Qkz%}Y+Ron$3)1siB(G!JZhj~4eS-LN;w{l
zJJl5{JCd7R4XkE={5pQbVse{Bl)Q2c>`9G(WGvu`%8QBwqXs5e15enI_DH;nXM!6=
z6uo*4oW0YEv}g&bUe%G}L~CHL4QSC4GSO`!3O@u5SnVNGLntVcj2f6|4NRqnv`055
zS|d^TsDUA9VDqObq&+x<Vj{_?feF{ZZWCzt#=YtZZxT`bVQ660{Gd}bISxb3k><pI
zYhbTFq}~7A#A{@z3YeK0D*2%i?_Z&O4^1J#grB=#Lt4C-I9P*08K#q7m;RQ6a*@PC
zZs>gnKmCQd`DDeBAV&FUKzjxBw*5X?Vw%Dlm`(7v7)YT%Kda|hn6^M~#f29=zv1i5
zFIec2L`wu@^fzy0sM<SNsG4Ha=$*ZPO&QW|Z5nr13P1hjfgh{IaMqqndP`aXT|%ha
zHCktqEDol%WWJu|B<am9S+KT%3@3?Ryf59nbevmKj3G;2&MPloeb;)|mB+q6$1@$J
zA@w^8)9}m4-=~oazLnqU`L;xCx4v{abA6g^ps?SjKueVgVaZ~LXY+p&{^@UjJ~cy}
zVKGVYWH+zyerK5smMGIKEoDxXFE2O5FVH&lNePu%KrKGBz0>THBibWJy>ksS;rh8V
zm;dkB;b$*?dg8-Nm(RRWO<7CxYGav(hL!i%^(uNAW>-D0c^j7K)jE{2$$&$C^UA0K
zA;x@;%}aa6EK{MA<pdy;5_;)>9$*fNCVyVyWffovUjf1(65xys$Dxd4Zv%AZVd<Ot
z<J|<Lu`n^pphJ%cq}?^jax=<WfAja}K`rv{{Ch8DB=!&PL#4<LyF#FK7^hzAE=(H;
zG|p^K_W4k#(GRd>X|Uv~iBAwMEq#gCL+F4&xLE|dPe=dJFiH!%g#mGYiBZ!_gNiT;
z&^VWlXDD^0plY1A3!v?(hF}RQhdw!GRn@T%4wj(WZZj~*&YrhjYiT0TXvuaKL_6_m
ziby&TXlRen=2jrkKxYWy($fRId^lnzbGF2MP%ws1TT(5|rC}JyfH0vtvxrJj2W*W}
zrY8(&UX__yRs|8_lE?pl*{pzCDH0zX7H!;g9R8#XcWiQ!h+fUr3}n%Mbt5``%Yb02
z18Ii=jr9@~1}n>SZAlyu2FPCQkQE4&jOnasG1)Nu3{2M9Ax=^U%CyzUoZ)q782bX8
zl+H4o_2g_LgJ3#13}`<6V7iP7LpJ$^SUW2uT7=Xazm!ef;yPA;W&+8peZUyweoHwr
zC~X_Ci^T?nWL{3~><Qa#Bpw7b#wvgw1})l7CD4E(v{G!j!H8(L)e=&SuO!QbwhbH_
z9zY@3KXq}q?pi^fVnz=L16qM8wO(9l-vey!xKWx?DFUy`7M|hyZ3+5(8N%9lpDY}f
zs4;3fwIRg@ki@@#j}4eSh69ZeM-W5n9S}80pg}_g#X!3&GIJatR|KN{bQh4>c}%;p
z;Q$)T$S0+wbTQh@bUmg8ycu+H_kT`V1Y(sM|JVbiMdNfv^<;C$AFPh5Kx;WCGti|5
ze^!D;)V6)pSyF13rPHnHR*q#LM{%Oik+G@^r3tBX?6%o|>JnNn%`JgO<8ej|w2PSG
zaZsU)Fd&P~x2rT?=^UV84=^Iop$aJ6z$!5Y%Dlt{Eb<9C!#6Q@3Vo1yq+CY}Qe_=j
zrI|fOS@PcbpTsL3w|Hk5M#A4>6U_NPcBpXKGuWI|8$YA9FfZXZ!={1rqVBy4<dYa^
zLv*Oj>g`c~J|s@|>XvfnGYt1Eoenf0LyLxD(MF$3Ff9+;7NEF6B;-^Ak9GsC-$^S0
zXN!Dt%QqDkg|cR;UBuX$PxBibg0&Nzt@;e#hPmV3>IwT({Fv8X&hx`{f0{;0K9}M3
z%%aKu8u>930=IyLZl3a^RdBu`M+7aJ_wEL-!pm@fHedlD1MQjt5jxPY6^lkINaQ-$
z$U<{g2sB%<(BkRHi9ZysD~1|wvMOK~;Uuk37=QCLZOvJ6Af9*JsF-R1x%F4I*5~rP
z8$i}b${MY*8$}Z^Y{5tXJt`?Zyr%gyh_)gZ`(|8D_2aHC?*^FJf^uyE8UzWmDoy11
z!=WC3=A6R?8g_MZ%w<Cw?;EDYqRl;4dWt2Jfzpf2sU?YOT(C&1bBXqX(*6#={nlrS
zmpG4q{NA%N<oUufqgf$!{s8+?x-?)tYLU4MGg&Ot-dXaR?{Wi;bq$N6&xfW;6<`4x
z3>O0$8TP~GpTO`qT%ZAms<nm<X~?fw=q|2*2zkRK$w-aUjf%mWQI<Ox7HM@Z(G<J>
zrGtc5b%4A0CJEU8Z`o##xP@`V(q=SB$K#x9ab^j7RP&&GI)g2QHWRk6ldR^uTtJ(_
zwM8Ov)&^E-@jB23Gzbb)=f!=GB_PSi&`e1vQ%7bILEDG&uZZN;bf>$xASJ{R(P}P#
z);+-lV!$ZN^uUq(k7`ITH_+@Z(t`rZfz(ZMsIhdBR^t-wl&rn4P)=n`I|CtK$|SE8
zR>e%uZsWi@PB-hIg60!`Xj!tF?{Wcc8aYxAQ3AdwTRPBa<HcsoTOFH)xyUo=W*C#;
zrDv&GxbrbX4d{Hz=SWFK5d6awRiC(j<J6d>C~1VsS2T{;4pv7JMHgwiMpBZskP}i*
zf5QYHi;!p5AmnKgkR&fziTDKCUId}}*dZWVMyMG?6gw+S`=qgFb*_L9QV4Xn%iZq0
z8wo1}FKF&&lc@}#(e(!(5fnu+bEII=>R>D-*2t29Xu@UdMl8q}Sg<cy<cni}b-42>
zn{|$w%o(0)r=vd1S<=uG{Po#FUQ<-VhO5tI&^h4u4>BP6%pyU#AYn9=JE!FcX68mQ
zyhaU5W46b(mDuh%G**gIXkma?I!;iyDxHPYl^e&vC7ME#p#V+UIADi}O=C@;4ZXl}
zYWWNdy8Z%y<{~q)xD5g{963gRR-{spf~q8WnMS;EQMQ$Do}(eZlL1Nc1q~_pTVdxy
z7!}s7tFMX7(%I2U$76mJ!U>Au4YW3%Vx(&`I5NS9A5|N~P4L7wrSzD5pa~O1h!oyw
znbnlY%eFC7lEbPKnGPM!2p9f9%h!arP$d$swOTiq$X+t5GIJyvfA`FPU!H$PZ7zpT
z{`s%}QUj6?N)|}6`__=$^eJB^rGRpznp+-mV0W(H=BFw(bpX)p5X^60d_WT;+H{AW
zQqEYaLGMFScw+(?Cg;b{F-Qx_r@ZobNIFes2tB9*({TC+Y+L?7SxvC+6ESXX{V-FQ
zVMkmrT1~e1@bS~9&Ruwa;f?*}S@H#1k+bkF?ohZ;pt0d<KC6Eqcmlx8K{JCgz`0_q
zh|-*i0ZjnSj##r&(v<8W%&s^<%b)esHM4puwpBZ+qM@if@2;U}F@E{J-MY&!;Sf@(
zOEj}S75}e32D|?LH~#$6KTmymq4)_A5P{XMLf`JpZK;6@!BRqhfri|YO}Z|=Ov!DF
z_*^7YN3=PjJqF6~Y*=DI8xqhMV<@)$7$ZN8Q)o!@P(P}s>WcIz*p}q>8m;>;+ncx^
zdg9e~d;QDH?})YYiAyg7@NCj}g!%Q`N##ailqwKt*eC0TaYIIcBAe$z8Gb-h)W8WU
zL3$NvKAt-N$)|>YBs<-k6B9jf5W{O%RB3UGuagTLv;$S{q*x+yZ|lJlxyxmJUaLX7
z=XAUM!rv~MamQaPJg#ALQfeJ&t1n#O<TA$=(ib*;)Pe4uo=dHfP=vr*#{tcCE)1bK
zKqjCJuOd{NAFsr!fyNJWo0Vtt_xM&MXQqlL3e*Vee!KmDU~8%hnF`T(%cgQI?3*L)
z{cmd_-1FgUg^J`yAe78NQEi=AKS~OllO_^pD2Q7D)(m+mAazewA!7)l$Z3{AC^DF*
zM6q!WVd_eiC#o7~c$$Uk3HY-9&5ON>AwUgv!^NxlIn~-z8wVd)b*}_|-d;bccy;IR
zaxEjvoz4n>+M*UZ9ez<~3PwP+5YSY9211McJeSdvVq&!%kt5TAEya}w_p8_*72?vB
zoR`Fm@5mDmoJMWwV>6G0Tlhk(j$|v4Ed%Eq2=4OJW|WmV^%xm1Sbvh&++gy-t_-wT
z8kHab@gfZ%^-o$rH{{(?z1;G?J+0Tv6DdgH3|4f1=KtsI_VLWfBsqL8r(8WRYk)%n
znzAxt?Mn%vd?GVGC=gO1ieRh+42TG_IYnAehb;4PWMb=mT>N_!!M2l`eiX7*I_cpS
z`kPbEQDTVlPlQvJa>;z&4JAs}B2Ew8RH*`$*6XbUs&}OBBW_(CZ$G7+D7K|N<7QXS
zGF+g4DeEX^I5$if$V^a8<FpDEi@GSx*JYD4ek>k==GF;~WtR7ZjWqcg3Z&pi80m?d
z6|{sXV-4*l$ZxJoH&NIWfQ#rHc6g$K&mi>|klK;uKdmnuvBQm8|CLK$U$yt0cg54V
zKRFrHbF-=3kVZ7M3i*^tV-A^7lWEZwkBS3-T@>ac!vUn>W2Yz3xK(|gohr5zT{>ui
zuglnA>m-O*Z*mdMvszkKo~Yn6MEzR1<vj;#Jb~4I+oi7~?N?mU826^j`lx4Ty29p5
z`&0IVRB5YYj%pVM>}qj&)=1=FLz;fYFESHQ(|mphWOY%Pk4`GdJCkBF7!NfGHnJRl
z{E*2Ko6hod<nV{FuH-S|>5+t{Wp5u4Gl-|We40rGv#${u3syb&2YRw2<gL)L)>^HQ
zS|F*H94dOg{gxw^M_oMRD3T|_Cril22|do@bI{eIa2V0I-E2b|7U5sh!Z;44Sr}xN
z&Y4AFLIBZVNvCmWdf13YjwT^h9xp6^k@~JU`j|*Q`-^gb@;@uw=jfO3lykPUC*hdg
z0nYnL`9#x^v0n$#C;}N|{nf9PT7_q|PN1!SWo<w-u-ATC#y$Ji=?|sv*C&5_Sol77
zC_y9w2TM2#pxK5rWX8Xyh20zYUZm|uS>!BHBN|=ckQEoPjNk;#6KHsc16@LYB2Pet
z{0X4xdNX`^5{S`^zIbH0#EzFHpM4le@jC{2H~qVIH?hm(^Jqz5y6XHI<Z7K$$M%;-
zElTfc#o&0DE+gOLao_A~x7Xg`zT^*5kEV;-fazoiTM&yK1<>&PAvL(kA2OWROhtO^
zo@pi#WOvNK0SkzOQDI<DriIdf(UOjX$P<sM0%)_62)!2qm7Vb&3Np^H-UQ(T>$>~_
znX{XE<^wI2WrP81H5x;RnD1g;r~aQ=-7mxbNEc$8AF+UQR6BCgd7OIPKdgL~W+Xu4
zLz=SYLGFElCUKSrG(-ys2XeZ4bfKnc>;sS|9*Sy`YPY*`BpC2qa09V_r?MFbGvp&!
zKE@Nyu<>j*(7veAyiXLh_6)BW{rN9-h4ul}=&A-ZWhi{w(0AHv0h*Es3RasBwhkqQ
z(`j3yNdvmfit?%D$heeC!C5ZQKsvA>fTd5Y*iuB*0DPSsdE()f0IkjX7~Jk)%F*jK
z?c*G@XZ+s+oK-edFn<Pr(DGko5XBGEaiGQxYbw`kX|>aklkH<N;%jn<c=ZzZzeDUF
zN6vF!lKe4OJ);L2--T69Pa(rzK;!mz08TE@U<?7eP=wQHXQ&E!;(_Gk1YX3TtObP=
z&Q^5DQQ%zqw4dUs{D4+ux=8LVGw+_j!W5N*V8nPk;1bsPe7(khBUn`K_0w3}#{ao>
zHQ=N7E}xM86Cc0LM>iUnKX<GFXzY}t@_lIJ-wSALROsR0z*@&NIaw(;A-eMGo{)-m
z@7T~-a<2#S<drlaQCEJuU}!*t^_=k{8!Jqoe8NS7a2H^J1j9(Wr?q_;WCLh^jMc6G
zufL)D9loz}%c=o?Xw(4H)n;)hfgjKSX}wtuIec4<YeKBWAcFc}N6)$4YibH<nW1I<
zv(hw(5;%kg4#Gz?Hb2$34;aw2A&p(wS?nUgvWn31Pt|yOpD}Whw;lPs*#4{Z<hY*I
z<gt0`0NTQwF~>qF9BoeHoV27RV~8@;Ab<we5ZYE@VW%2@IyH(m50bRSR1`KOpoy1!
zv=>Sl&{TU0!x@oNs;eT=LdooEZ41p(dHPf8Ob{ynaQlqWuCl!sbNQ(QXep*p0AHZB
z=g15QTMnmWXh60cDjq%VxJXl^Oawf;?TI99F%^Xk325y;$V%l_x-$+maZ;u&4uX-C
zgNj5dN@iPsjaL~6o-cfeRWAOYZJ!eEJjd69OqRm}H0AIE(1(vMvp_rqkwwf5XVsgF
zAQU4vnM&RhXkaBJH<3aKO2bo0+1<z!k0WmcaA(%D&+g{RiZ{cD1vGK(s`>>Q4m2@(
zq4}5y*)yjXCZ8kl-&Nz~JW{;lSmpA+eNMV_T*oATnGBZ&XgM@VbOx<d@JNBiRx^})
zIidjv3ur;%2l-QMS_4oEJc^w$&e~o^8)(qfl#R&_`~nBzYc#^L*Z~n;3)Tc>6N1G1
z13@3W<I1S~`NKM|n`6?fzkoHa{Qu^t;&D5Fm#dR82U?r9tvPIY<N#y94;3pixb=*&
z65k?!o5O)^e<(oXNRviJEQ|t>T7>v(r-^PcaWFgFsGD0YvM*Kh?-Q)VPoEW4{in8K
z&ljOq$E&%_k2}!l(W@T7O*I7Ms>M8lWxw*+(0R}raF`=n8!n6#-~S<Ja1dx6inM`v
z*|ZndGk7SiSQ2u9YRx;=l<#k7ZGL+CxwSukzx>`S=P!PgJoEeZ-;5g0@_zJOuH+V=
z$ur+Lk(WDE?9%PVO&!6CpPD+tBngb&c>G;C^OdWX6wpvlS&GJR$LM4!a0xQ03t(k&
zOq~#4XzEB#Q_HXMPIn2O7|>t~lfP`REVmjg?2RypUJ1TygymU_x<J(Z>B%Qa+&Vdb
z)wpl}3m0B^y8Rcd*xdiiR+3tv1!zh<l%TdBgr1VZ>BQ>Ie*pspQOj|XrIARQB?AxZ
zo+&MGF2S0NEv`sl*vt_&29(uk^*|Hm2$VkKzaY@seK=1^E=4DU7?GR-jn64bVL=~)
z%B_x42_7Us+ggf31(`1=U!Pt}(fKBSqgwRfk31&6O#m9~CI`L{r2!2F2OVfL<n$G&
zO&A7(aGWusse`*R@ON;K2rFT@K*J_OVMg9klR)FUZ1ZyYmTFuh51^lI`u506)eAiI
z%gb~$Gk<UDh|2K&$;@W)2Leq?ZXu@!AsVtqG<H^S1t)f8fCg<=0~+iS!Q7F5@jzQ!
z&<}MgvY_BuP;$o#BASEr1U^44PnZW`MhfYR5sj_S0!R0-VuMrD4-sCUzsd=w8<OG4
zFYKu=dDPJ*dsaPELr!X92&E{ki(Or#lgReDfhNWpCW}%|Hc1|%jc5Q>cBqRITgE+G
zG)}Pn+t4l?nc~H<_x7?_ECMut$dkQ9V@mN}4+~DYV_NFBBZ0=OI;>aXX={BRyovy=
z_S248D)=|Ah|K3Z`?B(?;Tq7eYLsXoE?XD>GM<vc>2w1P4;M@RgVyF6&|n*ju_@`X
zi(7HP3_9mXg+e+)JU5iwv4Ti|18*lLH%12JQIje!b0_3N2UHh@7dv@>)eyrzWf?ve
z-`c5i-yrvIzE)b4&3VFOfkx!ffTnq<us|5bf<8Bc(I8(vxPivX=FErfC#yiiGsS3B
zl;~yW<XOLNoMz9L0NE1h+)#4I3L-Yg0<&7^aZ5?h|MfFHEA_#B&`hyl^^id0FU5&(
z9;b7UID{_I>R+T~3Vq>!Q{F<Y&+|`b=F}oIY-t{n3|lZxGt{-aM#1690UDUz1@~dI
z85L--+F>~53%-QC{vpZ;MH=!YgmXj59V>{W9DQm=u^ARYjBeP*9H-tVFJp@zGcGDX
z<L?6|O)-ejC0hN9G_Jk$^MY&k_~F5H25X3hEnLpXbZYhRn?*@~75YxY_(f?w^07eM
zPnzBd(J-8`xe!oA&TxItamDX)Q!EaFNW-Qo*mgt79V>{K4tATD_R0{XVdHW)Z0irQ
zDoZoPhOgG7wDC6rYPdve?jntBs{LN{Tc+dlO|wq3{2I`V#-+^cNp>-$@kX3Ql7*``
z$0v5EVd13I`GFmOirGadBO2}wu-+e$#ouOR^G1|QJ<Xm?n8z5pa6`!*%Soo6D1|&y
z&r_hT!_H39y!{ov8%^0)w#qc1Nu(w7D+RF3xvb`iOSD$&fojMNh02$&U~@?Q|JAd&
zX*ScE$F(=ok$JIt1{i?zNMh3S!-Ra@38~tkM%z<&xwGVdM^W-cToPz(sO2>1sLU*k
z9O^wju7!-6hA!Mta>r_n>mKY0OukU0H2(CwDc^#aH&f;nm~nN9a+D6J=kfWBR7q6^
zJODGtR_nUWDyddY>z|)tgE0R8<yDTnnUiEEK<MKhtjvoYD_=v<GP*0gLCaKDmx(iy
zcR4jhGC!n$W~F2glt9DQC3c2p#d}!fqGI@wk&L%MtKq?30Ol2O2&F7*JeE|zLWpxj
z<5L9qK6uvlqhQH&h$#nUeNksdAJLTQ2~A6|R^Pa``Ev%e#v1sUo{yY-MXr6%AAj}b
zUs2tynYCc?t7~SOCq3ri_lRKMm*gLG^vbi46hX#+#~CPj`s;RbZ`P(HJYMY*Kx3;i
z$r|el=+O}P(HSGZ(kGEub_iB89GF=|BG4GgjECewWXp9}hcuY~g-;yWjv?W$XYLxB
zKr_FdLGC!N32S`j*lOLLtE{>coc+tGmp^&_^dDb4vPoEZ>LdZ)sa&4;o|xKbmX!;0
zatO?SI9nCBNhH0&bVt@dl+`2m=+IBIas1MP=$DqJ$qmEg8!C8lXln2?+2KHAB@I&X
ze6fNnGdaK-UA>u4_)#yyTM^Lcg<1GrIyN(~4QU{gGRi@Jx6;W)9-rJ>UNTDojU0wl
zYd-MxbD@^<jwkql)_TNmL#lj{l~H*5a`NwgJYw7;NP0i@gUQL_TxTg8Lj(>h<OqM4
zwBmuI1gut4k!a}?M}hRJb@=knOEI9ak<+v&%2vc<B+~T7OO_PO?kA#+W@+U;TW^Al
zHodbFaRdq~Sq`Lb+l$6m1;iQ+2*@Tt$`n)YEZRc~f9k&l(CR<IA1>p$OJBG%iPbQF
zPBNB+pVc#d85gfIq~9)Ax2rLUW346{HE-qQ47r@%I$Dy58o0S9vDl`FgC2qC>CDVZ
zX}I}OoQR-B$iVDkSYII$ToFKn?E)Q5C;+=h#E6=adQ!$uA@WEZyClw9TSii1rG>0-
z{>Dv@ub~tuh*s|9aE&><{?yu=VJF;wy@<O%PXv+)ppmQObi4h6f(f-{3Hawu!Ds<?
zpp`zoKim<Gochp*GcuW^eI)PYRCRzB#ayG<);Q28_qRm>+Er`iXf-l7HapdVER^nr
zg@H>dcEge}m0I#1);vyQDL^CNj8T5ma!Dv&F~(?yG{5b3JJ1Y?M6rnNtXPqMj1R<K
z8crut=wvxfC~=Dr5;J276|8kvx0zK`CE@SGfnpA}ot4mR7!hc8szHJ%eZafEbS0Z1
z?k*56rLa`%?8-7XQkVo)Ki^Prs0<DEwgh5Al(M6N{l}PQ+9=R4_Kuv0c0&nc-8unM
zLmtrtyWGJx8JTjeJpr9-cyP{tDOUT$bB-Kn_di!H^=42beRdiOOLIOzAoXUgGbtFc
zr)Q2F^c&4&-RCH1APHr;uxZ<4Vd`o#<kQQa(lT3#Fhqzr94E7+Ms7Sv6Vd4hv)E7X
z=R{e$11z#&lhwohd@8clsl1lkYtKc?QIY51{TyTX+*=XdW|3L3Lt%D*p~Jt;rH(SH
zo7}pV*G6Xa#X^?k<a@N1pKjZ*=Ebqs8U@#_nO}KeDVID3OGwJ*T%rIJ-wm|7EO&xQ
zi-TEDDf{|T){=JgL3?$awXR(qJr5%&(Fqo4|KfH1B?bp=Ipk!~Kc$mQRwOq3tk^*o
zBC;~1!f}j}F9f-PhW&+qQ=h34Mid|p#rW@$j)=2%`yjbzPXFy5S=q55FAcEylvm;U
zbf^FT1Aa+FK~&m8iO9}5{qelB=xrpFIFI%x+5KLeTPfY~*ol`6-KL|A`0m{-Nit@S
z8mLDDGtKQBR_{##?MmFVuBTpOsZj&I8lczAnZK(K`R0!4q6VUW27EMd=xP&X)W6jy
zYfKY05H;Ydfvq;2weEb;H-AhQH4rtBuYm)1T7lNOH9u=i5j7As;H!aK?Ko@I{NZ?C
z_G7xJfh$4-@`X<maF31WuJsjBE0M`@)4;0L5`vi9Hg3X3d7=jD(!gGG98>()|8HGf
z#d4zt#!CYm*DJt(N;$uGaJ;0A(nJl^qk*;SQsB}8ZmNf^SZdV3cxga=uUbPG_r$}+
z<5l5Nnp!llo8u|-d1qXv)lxID&~ehh-<6xMvY-~1Y2#GmQI<M1aPWIs=u*SC#ND(y
zDkqjXHX2yXU7#V}?${g~k)t3{10&bK<{j#|<#OM?Z{*B>#R8)S#zX`AZg*izj~mO|
z=f<QSqZkd>0RKpn4yg=ZJd4%v+KlWqRRi{S&@yn=YTegVIU-+C15MUI`Zk_SjA6v%
zO_nC|7B$dF4Xo?;66atHqaWIAq$rW8sDZ|6VBbw%&@vL;akQ}lMaH5A8mNJznXgnE
z&@#L?#-sdy4Xn+`Qd2dscB26xZ|@Cfn<`V}D{7!=8aVr3-oQ#FymzB%(nNlu2AZjX
z9XT(crNE^H-1D7yNTiwd8o6qe2KMdMzBj0W$j`IoAB_?yG7~k>Kn<Mzz8{)gsqWp=
zK*1tQQ3DOqz>aHO2=a})Do!68RHu=Z#%W-4XW40gBZuPEQ;icYG88q?5DiTIl;fm=
z=a1vP{0*tr$VRg?aKQ5=PhSw;wl$s;X;uwKZW^G0LpyKtMUZ#8IDc$F#YPqyrGcrR
zd&4Ir;f+&qQ>{_;9GR(81N-hSeB>$@b&p;Xp;l+z#<Clufz4fy=E9{+f}ib<cVsoD
zvLhpZb!lLAca^3_J0P!pXk)!D`C_?I1NCcQedB>jHmL3RQbVtP{6F=J8##y?s6zw)
zdED{cGZiJ(xNq1U&p_5u&9Tf{HE?#@4b|W$fXY=rd1%*xIEk#a-ecjT)4=+HT@O80
z)mf_moMF;y?|69ofzb&YONtt(Ljwo4Km5c)h?Zqe2tIbxckbT!`-|_NU3;nyHN-Nb
u2CCP<Q)_46fAQ}d*KED%yUxb%8TtS6!@ui-jpz^n0000<MNUMnLSTZHu&^5d

diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/sms.png b/uni_modules/uni-id-pages/static/uni-fab-login/sms.png
deleted file mode 100644
index 320ab618fa2ceb88c0a2868e32d6b7533c097136..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4411
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
G`9A<bJ9*>)

diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/user.png b/uni_modules/uni-id-pages/static/uni-fab-login/user.png
deleted file mode 100644
index 37980045dd1b273ade39557ff2c41b80020f88a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3071
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

diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/weixin.png b/uni_modules/uni-id-pages/static/uni-fab-login/weixin.png
deleted file mode 100644
index 9dfbea6bf0318030c6f5386e42c7ec8185b351f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4168
zcmb_g3se(l+KyV4rGf?d0V&!vQWlX(CX?GF1up>tp@0FYTBJ%YlMo0=NFoGOs^X=H
zmueSpt*cZK5Fy5hKqDeQQkr6*h)4kuBTXqFMMR8<l${_@cmHntpFKP0OfvI*@B6&Z
zdwKGmlT1!{ke#iYEe3<JV+RLBqTf>MZ8Hn~9Nc}^fWgc?DUMpNS|1k5;L8&6T!D;-
z;MIw8bRUE9U7?n9`3Z;$%R@wBsUL1YUx~wt1%9}7lrS(%?vKQYgVPkqnzZmJep&*b
zF2Jo=j`dYDP=G{4#l@-<B~m3r?T4GdWuVX2WdaU6VWLX#!>zIg#I6tHVEttZ1WUnF
z0X~roV`+3ekxB+hR39t^66pjGCJ;#gNMwLi28D*5yl`kVg+R!N3}8*hLf`ywaVnLZ
zK_H~0q~KFXc$q>(Akyh521I}$0JQ*=sZteJ4M>$srVs)UC0`+ytHd%X){4mG$u_I}
za46GPDJ06LVWrB+GNA<{sJU_i5f55ZnlKdbr|smM6_SbI0zLteAc=@nr9^Fs)3)+B
znM$UNll>d$>Fs|CfR;8aY&yp8a!E{_4xv;9CZlOg7UXxWl~Jj3gb;}+Wt$azBrqAJ
zxx|`{oZ+uPxGI?<N+y#`HHtGu84ICVW4+dir2<)sa_MUhNB~!b_~9TBA_7DR0O?Ug
z3WG>vfaGN$%mBexreQLHSeQC(YHck*Bt{YGXm=S9_)n(j$OyP9?w=Y9_za;;k;p|8
z7AJB=2th6t;jq(XWcbS@G6fnKWk-5_o$c?>QOJa13A&+-3}Ry0f&Nq?ok|5DJaK|<
zSQsNf#@}phAv<7dnguexSitxV9wb9N3Y9_yU^<r%aCu}hKnEcK08tS-MM$SXJR&@W
z#+E8oTqz&1qM@b6i%}#JNTg6GbUwi2Av}P`CBp!nh=2f>NF-A!L?M~aqfYs+R)|qS
zawUJxicW+CAjGEtGz0<x3XMzzcr+Rx;KO__moDTA>0Gi^1i$4mg}Dmlr$qa&oD><8
zE1G<gh?iSQ3noZ&$vhH-0AvA$29RkKlr&8M13W(3e=bbqLLkqVU{w_A^h&I+d87G~
zNJ6p@far8CKqewY02ZL+=%^zZMqhbU`fJ`3IIn0B{+RECN*KXnEC1BVxNDH4X$IH{
zVKBIStKj``eCwnm0^H=X_;<QPAqfOD5)T1jM2L>6fJ_DGJV*#o=`cb;(C+YP$drFd
z9D;)WfdXDdSIUH{6s`hUB|_)wPZdV^cjT4a<UgiPMEi`;1yq0rqcaJCWDwv{XcU0Y
zr_=c`1>y09|CjpfibVBGol@j~LVdEV{5Y;ugrKJf0r#IL^Z!%HE0)uJcs-fde_sB3
z$xMvqs|h3g>+ntNy>`H$jht9QPc7@?^l^#4Odq(26s?m2Jx<$1oYm-2{1<ufM@kIl
z%>~wb2Il0Kt{BYBGEQhz;Q07BUgyr#L!fSPa0MKoCx=up&_$M>ihg=&omZBFJ~}sV
ztt+_%=b?Gax7=rWIUX+c#A)7QlzPLZUQh|vx73?j;=w5O3a(%<%OR))=dE?_wwPTD
z-@q2lYaMLPYTn_gbs8HVTU<0RSP#1u&S92=Dq~!1P2}O0y`dGpH9eI$js3t#|MGGl
zrXFPJVK1#y*RaXA)JNSQ=^N=;Tx1(l6HYGi@X$Ec^i`IcwY7cKZbddL%kf{df9|Pq
zJl1-kqPui-Y}D9qh&RME4K!5uR5T74PqZJ#>)eLNhV|Vgxt*s*#w@#=(uPKd4z=ud
zFSHpP9V|5ETE>P8O=r7?JNrlala2A(u0pe=%TwdDw`psfAqK0l@3C|rXx?$EJ-g4+
z(>c_h*O|l8lLfVFsimHc19kC+jSc;ETN~sjS`U5Rnpxdb>0V?*E%97m9U`scr8P(m
zebuZAIJ@<LZ@IT+%o0__s_M~aHm4tG&H!~-wNX-F%4z5~eBPQ>)l;FU6Y9H5oeSSE
z51YPdKkTh_%jq~)WXe6=kv%##;#xSzxp3y-$iShNz2@Prn3_=2P{)qO<j$cEiD6^w
zV2iMJee*!$;OIb!SrbzoT58q==pnsXXBzJC(Yi)e1(ch0;gu_kOnD6hb(KAOc^$8y
zGe^^vceo{UN2BUcbH<!pOif=^c1u=mUsXw$CZkCW>9FaIif&7HU4N}xp^dS>HmBpn
z)<#7}W3s|11WT}ShUkIOfdD;qZ54}C#pG13Y#D6w(YdoKsOgQWj-giDTnwj@IX*sS
z8t%jv*{{@t$qn&qtAYi!>#3z4;g!o{s>5~WqW+OSji~@ES)A8-dT4Yox;j)?8$C8Y
z8d|~d(Ykr-Tr(Qg5<{$ek!`s8Y6?2oHmb<*HG}A+qL=w?aru`R%<Qe~fK^d(v-^*Y
zCAbH=*6Mup9j)ePWwZhOmScK%!;epHd&H!@<%oOt`1!>9UVk~_R(|xzF6WcygW8x{
z*{Tg!)_zs;{im@GS3-RDh1IcV{)*kVFWQl_e`(R(+!wMk-IinRdWoo;8uZC$+tSOv
zNKO7}<k3)vNSM4VIm*|+Jz~b+3tG#d?-H}bS?v7nAA9d&9-gPG@rcNj?*}|{I3Cp!
zB0CD_&d*|dIT^qWp^n)$wLkD2Z3CfO&ZNBCrrqmgcKxl*NBTBA|LgxK!HPTBvU^Vb
z{d@NE_$|Ph@13A~y*A6XcxgJ{V;60-Y;Wp$(UbbYO2?SGb*okfKYViZ!PdpUo{oQW
z<;;5z_nuvKTqFj(V8X$_)st$0RIjV9dtPK;5AIx+J2Nav`}MhZ4|HK&%ojp_JYiz7
zW(Nj;i>Q;<d>_&hWIw$4hqjxsV&4V#<~q21#lCZTSX6NFoaDyXeG%Kie2X<ddqK;Q
zTlsXuXm?d?=NHlG>EjzQ$y>%gt-o_1`)0K$#Wy;0=RQlsE$6B%Moj#i;XP~e?P{J=
z?ku7BNL!R_r_a0kn&o!nUhw6c`7|Rbe{TDxH5!LsW0Mvvb~@ZO^An4=>Hg#R$5&nV
z`Bg7-ab*X0Xx<IT;leS-v|>g+|HIhc_d~WM?}X>w$k>maou>Z!Y;|g0Xc@ac&ol4k
zx0!q31Mv~WyQ@#d%-`+)WMHm7{rIB}uN`}g#cjC-dDt_Do+Om#*e{7R?r0iys_%W8
zTkNuFG4B5IB;GIQhDV_gpM;AI^t?xZEj>tUga&#JBPrF63mx{pt;nxAmLd67N7h`t
zO1h|1Qt?auT@92=&iR!eobk3lMy)@X-7$KD&W(zCb~P-6E$Y28;&{_^KBl)`yD&20
z(!#VE*V;o1-roL;n^RjZqI)9=zEoVC@Nw{+P}DqQ;7Tu4XO};(PAKwqb{Ue`*|v*T
zj<+YNOg3rqlf?K4t;#if**BNUIt~`)F5DTrY0-Cf(2Cn_^qU{rLj9jPy;DbezQ84G
zRwtZw`mJvFnO}Zg;qGwyoaXs8FJswg$cwFWI@~U9+i9??%$&hl^ejit_~1oVhE10H
z(}?%v>sXwVzHNb)_djb{4Lndke{`cc+gO{ibE&>nUA)~_#JP8V`{iHSIDu>Hyef8e
zdn;BLL*-|#7lVEc6>LWFE;HOqc<-l;4v5S3Gi3hdG|@rJ={?MJQjF0UF%~a$uS>a-
zaj=Wol_E<i)a;53>Uxs-=<g4t{|h9O+>ej<Z+iOm5y~px$4A#BRLhor=MeSIlKt;r
z`7WyXif10!bK)V!m5r++D^oRL@PhJ<=^aTwmlt?`T9zBMeU|d)2X`;FR}haH@!j4p
zTyFZc*GV6beq>+2CnMj{qqkeNAwui?<l5~YpUFS=139Ax^R8Pd$&BmQE?p?@X0oo&
zt={H(QjB;jYnK?AT_2o@*RDwB|MGKnt%x-8^M>e4&rHwcg$|bP*)MMP-cj6RGVO!4
zKeVWuB7083A7W-bNCU^qIk%kd;!Q_LF3R-2p!#<lhF>ma<@~tz`Zu?4C9#?+z3#Jh
zf-=SBmbk6=Mc%^n{Nl~Mn=@Ww7gS_!lZRjuV9>?RoO1Qc3k7K%ix$#=hd1&JZC{=J
zEJy0P<mtvjSpNLlCkN(3-+G9TuAUuxVbeQ5lqD{ldt=9f+T$}m`f1Ufn)Bt~Y&!e0
z_PNDLHLLx`QeEL~i_|io5H7<!_F|1+Zi3%Cm9ho?7;EmIv5`7<XW0__?aD*8&*z-F
z{O|^U7IR18wX&VxvlhKAI=3(IG;lu9wEui7&#i#hD9RE?z-Pr*kFzeUf7;56cB+p%
v37kLd?Y!;kap&Enlfo=9>e4yB;np}t70pQwnqO&e{R4m<7#>i}jNSPUWD)0!

diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/validator.test.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/validator.test.js
deleted file mode 100644
index bad62e7..0000000
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/validator.test.js
+++ /dev/null
@@ -1,343 +0,0 @@
-const assert = require('assert')
-const {
-  Validator
-} = require('./validator')
-const {
-  ERROR
-} = require('./error')
-const {
-  getType
-} = require('./utils')
-
-const testCaseList = [{
-  value: {
-    username: 'uname'
-  },
-  schema: {
-    username: 'username'
-  },
-  expected: undefined
-}, {
-  value: {
-    username: '123456'
-  },
-  schema: {
-    username: 'username'
-  },
-  expected: {
-    errCode: ERROR.INVALID_USERNAME
-  }
-}, {
-  value: {
-    username: '数字天堂'
-  },
-  schema: {
-    username: 'username'
-  },
-  expected: {
-    errCode: ERROR.INVALID_USERNAME
-  }
-}, {
-  value: {
-    password: '123456abc'
-  },
-  schema: {
-    password: 'password'
-  }
-}, {
-  value: {
-    password: '123456def'
-  },
-  schema: {
-    password: 'password'
-  },
-  mixin: [{
-    type: 'password',
-    handler: function (password) {
-      if (typeof password !== 'string' || password.length < 10) {
-        return {
-          errCode: ERROR.INVALID_PASSWORD
-        }
-      }
-    }
-  }],
-  expected: {
-    errCode: ERROR.INVALID_PASSWORD
-  }
-}, {
-  value: {
-    numberOrString: '123456'
-  },
-  schema: {
-    numberOrString: 'number|string'
-  }
-}, {
-  value: {
-    numberOrString: 123456
-  },
-  schema: {
-    numberOrString: 'number|string'
-  }
-}, {
-  value: {
-    numberOrString: '123456'
-  },
-  schema: {
-    numberOrString: 'string|number'
-  }
-}, {
-  value: {
-    numberOrString: 123456
-  },
-  schema: {
-    numberOrString: 'string|number'
-  }
-}, {
-  value: {
-    numberOrString: ['123456']
-  },
-  schema: {
-    numberOrString: 'array<number|string>'
-  }
-}, {
-  value: {
-    numberOrString: [123456]
-  },
-  schema: {
-    numberOrString: 'array<number|string>'
-  }
-}, {
-  value: {
-    numberOrString: [123456, '123456']
-  },
-  schema: {
-    numberOrString: 'array<number|string>'
-  }
-}, {
-  value: {
-    numberOrString: ['123456']
-  },
-  schema: {
-    numberOrString: 'array<string|number>'
-  }
-}, {
-  value: {
-    numberOrString: [123456]
-  },
-  schema: {
-    numberOrString: 'array<string|number>'
-  }
-}, {
-  value: {
-    numberOrString: [123456, '123456']
-  },
-  schema: {
-    numberOrString: 'array<string|number>'
-  }
-}, {
-  value: {
-    numberOrString: ['123456']
-  },
-  mixin: [{
-    type: '1to6',
-    handler: function (val) {
-      if (val !== '123456') {
-        return {
-          errCode: ERROR.INVALID_PARAM
-        }
-      }
-    }
-  }],
-  schema: {
-    numberOrString: 'array<number|1to6>'
-  }
-}, {
-  value: {
-    username: ''
-  },
-  schema: {
-    username: {
-      required: false,
-      type: 'username'
-    }
-  }
-}, {
-  value: {
-    username: '   '
-  },
-  schema: {
-    username: {
-      required: false,
-      type: 'username'
-    }
-  }
-}, {
-  value: {
-    username: '   '
-  },
-  schema: {
-    username: 'username'
-  },
-  expected: {
-    errCode: ERROR.PARAM_REQUIRED
-  }
-}, {
-  value: {
-    username: ''
-  },
-  schema: {
-    username: 'username'
-  },
-  expected: {
-    errCode: ERROR.PARAM_REQUIRED
-  }
-}, {
-  value: {
-    mobile: '18811112222'
-  },
-  schema: {
-    mobile: 'mobile'
-  }
-}, {
-  value: {
-    mobile: '18811112222'
-  },
-  schema: {
-    mobile: {
-      required: false,
-      type: 'mobile'
-    }
-  }
-}, {
-  value: {
-    mobile: ''
-  },
-  schema: {
-    mobile: 'mobile'
-  },
-  expected: {
-    errCode: ERROR.PARAM_REQUIRED
-  }
-}, {
-  value: {
-    mobile: ''
-  },
-  schema: {
-    mobile: {
-      required: false,
-      type: 'mobile'
-    }
-  }
-}, {
-  value: {
-    mobile: '123456'
-  },
-  schema: {
-    mobile: 'mobile'
-  },
-  expected: {
-    errCode: ERROR.INVALID_MOBILE
-  }
-}, {
-  value: {
-    email: 'test@dcloud.io'
-  },
-  schema: {
-    email: 'email'
-  }
-}, {
-  value: {
-    email: 'test@dcloud.io'
-  },
-  schema: {
-    email: {
-      required: false,
-      type: 'email'
-    }
-  }
-}, {
-  value: {
-    email: ''
-  },
-  schema: {
-    email: 'email'
-  },
-  expected: {
-    errCode: ERROR.PARAM_REQUIRED
-  }
-}, {
-  value: {
-    email: ''
-  },
-  schema: {
-    email: {
-      required: false,
-      type: 'email'
-    }
-  }
-}, {
-  value: {
-    email: 'test'
-  },
-  schema: {
-    email: 'email'
-  },
-  expected: {
-    errCode: ERROR.INVALID_EMAIL
-  }
-}]
-
-function execTestCase ({
-  value = {},
-  schema = {},
-  mixin = [],
-  expected = undefined,
-  error = ''
-} = {}) {
-  const validator = new Validator()
-  for (let i = 0; i < mixin.length; i++) {
-    const {
-      type,
-      handler
-    } = mixin[i]
-    validator.mixin(type, handler)
-  }
-  let validateResult,
-      validateError
-  try {
-    validateResult = validator.validate(value, schema)
-  } catch (err) {
-    validateError = err
-  }
-  const tag = JSON.stringify({ value, schema })
-  if (error) {
-    if (typeof error === 'string') {
-      assert.strictEqual(validateError.message.indexOf(error) > -1, true, `[${tag}] error message error`)
-    } else if (getType(error) === 'regexp') {
-      assert.strictEqual(error.test(validateError), true, `[${tag}] error message error`)
-    } else {
-      throw new Error(`[${tag}] invalid test case`)
-    }
-    return
-  }
-  if (expected === undefined) {
-    assert.strictEqual(validateResult, undefined, `[${tag}] validate result error`)
-    return
-  }
-  const expectedKeys = Object.keys(expected)
-  let passResultCheck = true
-  for (let i = 0; i < expectedKeys.length; i++) {
-    const key = expectedKeys[i]
-    if (expected[key] !== validateResult[key]) {
-      passResultCheck = false
-      break
-    }
-  }
-  assert.strictEqual(passResultCheck, true, `[${tag}] validate result error`)
-}
-
-for (let i = 0; i < testCaseList.length; i++) {
-  console.log(`test case: ${i}`)
-  execTestCase(testCaseList[i])
-  console.log(`test case: ${i}, pass`)
-}
diff --git a/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
index 53cc584..dc9f6a6 100644
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
@@ -32,7 +32,7 @@
 			"title": "头像地址",
 			"trim": "both",
 			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"read": true,
 				"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
 			}
 		},
@@ -41,7 +41,7 @@
 			"description": "用file类型方便使用uni-file-picker组件",
 			"title": "头像文件",
 			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"read": true,
 				"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
 			}
 		},
@@ -209,7 +209,7 @@
 			"title": "昵称",
 			"trim": "both",
 			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"read": true,
 				"write": "doc._id == auth.uid || 'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
 			}
 		},
-- 
GitLab