- 更新依赖的的版本为1.0.26

App.vue

@@ -5,6 +5,7 @@
 		openApp() //创建在h5端全局悬浮引导用户下载app的功能
 	// #endif
 	import checkIsAgree from '@/pages/uni-agree/utils/uni-agree.js';
+	import uniIdPageInit from '@/uni_modules/uni-id-pages/init.js';
 	export default {
 		globalData: {
 			searchText: '',
@@ -17,9 +18,11 @@
 			console.log('App Launch')
 			this.globalData.$i18n = this.$i18n
 			this.globalData.$t = str => this.$t(str)
-
-			initApp();
 			
+			console.log('uni.getPushClientId',uni.getPushClientId);
+			
+			initApp();
+			uniIdPageInit()
 			
 			// #ifdef APP-PLUS
 			//checkIsAgree(); APP端暂时先用原生默认生成的。目前，自定义方式启动vue界面时，原生层已经请求了部分权限这并不符合国家的法规

changelog.md

+## 2.0.5（2022-10-19）
+- 更新依赖的`uni-id-pages`的版本为1.0.26
 ## 2.0.4（2022-09-21）
 - 新增 使用uni-id-pages的账号信息的状态管理功能
 ## 2.0.3（2022-09-20）

common/appInit.js

@@ -47,11 +47,11 @@ export default async function() {
 			methodName, // 云对象的方法名称
 			params // 参数列表
 		}) {
-			console.log('interceptObject',{
-				objectName, // 云对象名称
-				methodName, // 云对象的方法名称
-				params // 参数列表
-			});
+			// console.log('interceptObject',{
+			// 	objectName, // 云对象名称
+			// 	methodName, // 云对象的方法名称
+			// 	params // 参数列表
+			// });
 			if(objectName == "uni-id-co" && (methodName.includes('loginBy') ||  ['login','registerUser'].includes(methodName) )){
 				console.log('执行登录相关云对象');
 				params[0].inviteCode = await new Promise((callBack) => {
@@ -84,7 +84,7 @@ export default async function() {
 				})
 				// console.log(params);
 			}
-			console.log(params);
+			// console.log(params);
 		},
 		success(e) {
 			console.log(e);
@@ -94,17 +94,17 @@ export default async function() {
 		},
 		fail(e){
 			console.error(e);
-			if (debug) {
-				uni.showModal({
-					content: JSON.stringify(e),
-					showCancel: false
-				});
-			}else{
-				uni.showToast({
-					title: '系统错误请稍后再试',
-					icon:'error'
-				});
-			}
+			// if (debug) {
+			// 	uni.showModal({
+			// 		content: JSON.stringify(e),
+			// 		showCancel: false
+			// 	});
+			// }else{
+			// 	uni.showToast({
+			// 		title: '系统错误请稍后再试',
+			// 		icon:'error'
+			// 	});
+			// }
 		}
 	})
 

manifest.json

@@ -40,6 +40,9 @@
       "ios": {
       },
       "sdkConfigs": {
+        "push": {
+          "unipush": null
+        }
       }
     }
   },

uni-starter.config.js

 //这是应用的配置页面，App.vue挂载到getApp().globalData.config
 export default {
-	//是否打开调试模式
-	"debug":false,
 	"h5": {
 		"url": "https://uni-starter.dcloud.net.cn", //	前端网页托管的域名	
 		 // 在h5端全局悬浮引导用户下载app的功能 更多自定义要求在/common/openApp.js中修改	
@@ -17,7 +15,7 @@ export default {
 	"mp": {
 		"weixin": {
 			//微信小程序原始id，微信小程序分享时
-			"id": "gh_33446d7f7a26"
+			"id": ""
 		}
 	},
 	//关于应用

uni_modules/uni-easyinput/changelog.md

+## 1.1.3（2022-09-22）
+- 修复，引入 uni.scss 引入默认主题色报错的问题
+## 1.1.2（2022-09-22）
+- 增加主题色 primaryColor 配置选项
 ## 1.1.1（2022-09-19）
 - 修复，输入后回车，change 事件触发两次，[详情](https://ask.dcloud.net.cn/question/152149)
 ## 1.1.0（2022-06-30）

uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue

@@ -18,7 +18,7 @@
 				<!-- 开启密码时显示小眼睛 -->
 				<uni-icons v-if="isVal" class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}"
 					:type="showPassword?'eye-slash-filled':'eye-filled'" :size="22"
-					:color="focusShow?'#2979ff':'#c0c4cc'" @click="onEyes">
+					:color="focusShow ? primaryColor :'#c0c4cc'" @click="onEyes">
 				</uni-icons>
 			</template>
 			<template v-else-if="suffixIcon">
@@ -28,7 +28,7 @@
 			<template v-else>
 				<uni-icons v-if="clearable && isVal && !disabled  && type !== 'textarea'" class="content-clear-icon"
 					:class="{'is-textarea-icon':type==='textarea'}" type="clear" :size="clearSize"
-					:color="msg?'#dd524d':(focusShow?'#2979ff':'#c0c4cc')" @click="onClear"></uni-icons>
+					:color="msg?'#dd524d':(focusShow? primaryColor :'#c0c4cc')" @click="onClear"></uni-icons>
 			</template>
 			<slot name="right"></slot>
 		</view>
@@ -59,6 +59,7 @@
 	 * @property {Number }	clearSize	清除图标的大小，单位px（默认15）
 	 * @property {String}	prefixIcon	输入框头部图标
 	 * @property {String}	suffixIcon	输入框尾部图标
+	 * @property {String}	primaryColor	设置主题色（默认#2979ff）
 	 * @property {Boolean}	trim	是否自动去除两端的空格
 	 * @value both	去除两端空格
 	 * @value left	去除左侧空格
@@ -177,6 +178,10 @@
 				type: Boolean,
 				default: true
 			},
+			primaryColor: {
+				type: String,
+				default: '#2979ff'
+			},
 			styles: {
 				type: Object,
 				default () {
@@ -202,7 +207,7 @@
 				showClearIcon: false,
 				showPassword: false,
 				focusShow: false,
-				localMsg: '',
+				localMsg: '',
 				isEnter: false // 用于判断当前是否是使用回车操作
 			};
 		},
@@ -244,7 +249,7 @@
 				})
 			},
 			inputContentStyle() {
-				const focusColor = this.focusShow ? '#2979ff' : this.styles.borderColor
+				const focusColor = this.focusShow ? this.primaryColor : this.styles.borderColor
 				const borderColor = this.inputBorder && this.msg ? '#dd524d' : focusColor
 				return obj2strStyle({
 					'border-color': borderColor || '#e5e5e5',
@@ -372,9 +377,9 @@
 				let value = event.detail.value;
 				this.focusShow = false
 				this.$emit('blur', event);
-				// 根据类型返回值，在event中获取的值理论上讲都是string
-				if (this.isEnter === false) {
-					this.$emit('change', this.val)
+				// 根据类型返回值，在event中获取的值理论上讲都是string
+				if (this.isEnter === false) {
+					this.$emit('change', this.val)
 				}
 				// 失去焦点时参与表单校验
 				if (this.form && this.formItem) {
@@ -392,12 +397,12 @@
 			 * @param {Object} e
 			 */
 			onConfirm(e) {
-				this.$emit('confirm', this.val);
+				this.$emit('confirm', this.val);
 				this.isEnter = true;
-				this.$emit('change', this.val)
-				this.$nextTick(() => {
-					this.isEnter = false
-				})
+				this.$emit('change', this.val)
+				this.$nextTick(() => {
+					this.isEnter = false
+				})
 			},
 
 			/**
@@ -597,4 +602,4 @@
 			font-size: 12px;
 		}
 	}
-</style>
+</style>

uni_modules/uni-easyinput/package.json

 {
   "id": "uni-easyinput",
   "displayName": "uni-easyinput 增强输入框",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Easyinput 组件是对原生input组件的增强",
   "keywords": [
     "uni-ui",

uni_modules/uni-id-pages/changelog.md

-## 1.0.21（2022-09-21）
-- 修复 store.hasLogin的值在某些情况下会出错的bug
-## 1.0.20（2022-09-21）
-- 新增 store 账号信息状态管理，详情：用户中心页面 路径：`/uni_modules/uni-id-pages/pages/userinfo/userinfo`
-## 1.0.19（2022-09-20）
-- 修复 小程序端，使用将自定义节点设置成[虚拟节点](https://uniapp.dcloud.net.cn/tutorial/vue-api.html#%E5%85%B6%E4%BB%96%E9%85%8D%E7%BD%AE)的uni-ui组件，样式错乱的问题
-## 1.0.18（2022-09-20）
-- 修复 微信小程序端 WXSS 编译报错的bug
-## 1.0.17（2022.09-19）
-- 修复 无法退出登录的bug
-## 1.0.16（2022-09-19）
-- 修复 在 Edge 浏览器下 input[type="password"] 会出现浏览器自带的密码查看按钮
-- 优化 退出登录重定向页面为 uniIdRouter.loginPage
-- 新增 注册账号页面支持返回登录页面
-## 1.0.15（2022-09-19）
-- 更新表结构，解决在uni-admin中部分clientDB操作没有权限的问题
-## 1.0.14（2022-09-16）
-- 修改 配置项`isAdmin`默认值为`false`
-## 1.0.13（2022-09-16）
-- 新增 管理员注册页面
-- 新增 配置项`isAdmin`区分是否为管理端
-- 新增 登录成功后自动跳转；跳转优先级：路由携带(`uniIdRedirectUrl`参数) > 返回上一路由 > 跳转首页
-- uni-id-co 优化 注册管理员时管理员存在提示文案
-## 1.0.12（2022-09-07）
-- 修复 getSupportedLoginType判断是否支持微信公众号、PC网页微信扫码登录方式报错的Bug
-- 优化 适配pc端样式
-- 新增 邮箱验证码注册
-- 新增 邮箱验证码找回密码
-- 新增 退出登录(全局)回调事件：`uni-id-pages-logout`，支持通过[uni.$on](https://uniapp.dcloud.net.cn/api/window/communication.html#on)监听;
-- 调整 抽离退出登录方法至`/uni_modules/uni-id-pages/common/common.js`中，方便在项目其他页面中调用
-- 调整 用户中心（路径：`/uni_modules/uni-id-pages/pages/userinfo/userinfo`）默认不再显示退出登录按钮。支持页面传参数`showLoginManage=true`恢复显示
-## 1.0.11（2022-09-01）
-- 修复 iOS端，一键登录功能卡在showLoading的问题
-- 更新 合并密码强度与长度配置 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#config)
-- uni-id-co 修复 调用 removeAuthorizedApp 接口报错的Bug
-- uni-id-co 新增 管理端接口 updateUser [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#update-user)
-- uni-id-co 调整 为兼容旧版本，未配置密码强度时提供最简单的密码规则校验（长度大于6即可）
-- uni-id-co 调整 注册、登录时如果携带了token则尝试对此token进行登出操作
-- uni-id-co 调整 管理端接口 addUser 增加 mobile、email等参数 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#add-user)
-## 1.0.10（2022-08-25）
-- 修复 导入uni-id-pages插件时未自动导入uni-open-bridge-common的Bug
-## 1.0.9（2022-08-23）
-- 修复 uni-id-co 缺失uni-open-bridge-common依赖的Bug
-## 1.0.8（2022-08-23）
-- 新增 H5端支持微信登录（含微信公众号内的网页授权登录 和 普通浏览器内网页生成二维码，实现手机微信扫码登录）[详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#weixinlogin)
-- 新增 登录成功(全局)回调事件：`uni-id-pages-login-success`，支持通过[uni.$on](https://uniapp.dcloud.net.cn/api/window/communication.html#on)监听;
-- 新增 密码强度（是否必须包含大小写字母、数字和特殊符号以及长度）配置 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#config)
-- 调整 uni-id-co 密码规则调整，废除之前的简单校验，允许配置密码强度 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#password-strength)
-- 调整 uni-id-co 存储用户 openid 时同时以客户端 AppId 为 Key 的副本，参考：[微信登录](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin)、[QQ登录](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-qq)
-- 调整 uni-id-co 依赖 uni-open-bridge-common 存储用户 session_key、access_token 等信息 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#save-user-token)
-- 新增 uni-id-co 增加 beforeRegister 钩子用户在注册前向用户记录内添加一些数据 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#before-register)
-## 1.0.7（2022-07-19）
-- 修复 uni-id-co接口 logout时没有删除token的Bug
-## 1.0.6（2022-07-13）
-- 新增 允许覆盖内置校验规则 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#custom-validator)
-- 修复 app端clientInfo.appVersionCode为数字导致校验无法通过的Bug
-## 1.0.5（2022-07-11）
-修复 微信小程序调用uni-id-co接口报错的Bug [详情](https://ask.dcloud.net.cn/question/148877)
-## 1.0.4（2022-07-06）
-- uni-id-co增加clientInfo字段类型校验
-- 监听token更新时机，同步客户端push_clientid至uni-id-device表，改为：同步客户端push_clientid至uni-id-device表和opendb-device表
-## 1.0.3（2022-07-05）
-新增监听token更新时机，同步客户端push_clientid至uni-id-device表
-## 1.0.2（2022-07-04）
-修复微信小程序登录时无unionid报错的Bug [详情](https://ask.dcloud.net.cn/question/148016)
-## 1.0.1（2022-06-28）
-添加相关uni-id表
-## 1.0.0（2022-06-23）
-正式版
+## 1.0.26（2022-10-18）
+- 修复 uni-id-pages 导入时异常的Bug
+## 1.0.25（2022-10-14）
+- uni-id-co 增加 微信授权手机号登录方式 [文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin-mobile)
+- uni-id-co 增加 解绑第三方平台账号 [文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#unbind-third-account)
+- uni-id-co 微信绑定手机号支持通过`getPhoneNumber`事件回调的`code`绑定 [文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-mp-weixin)
+- 修复 sendSmsCode 接口未在参数内传递 templateId 时 未能从配置文件读取 templateId 的Bug
+## 1.0.24（2022-10-08）
+- 修复 报uni-id-users表schema内错误的bug
+## 1.0.23（2022-10-08）
+- 修复 vue3下vite编译发行打包失败
+- 修复 某些情况下注册账号，报TypeErroe：Cannot read properties of undefined （reading ’showToast‘）的错误
+## 1.0.22（2022-09-23）
+- 修复 某些情况下，修改密码报“两次输入密码不一致”的bug
+## 1.0.21（2022-09-21）
+- 修复 store.hasLogin的值在某些情况下会出错的bug
+## 1.0.20（2022-09-21）
+- 新增 store 账号信息状态管理，详情：用户中心页面 路径：`/uni_modules/uni-id-pages/pages/userinfo/userinfo`
+## 1.0.19（2022-09-20）
+- 修复 小程序端，使用将自定义节点设置成[虚拟节点](https://uniapp.dcloud.net.cn/tutorial/vue-api.html#%E5%85%B6%E4%BB%96%E9%85%8D%E7%BD%AE)的uni-ui组件，样式错乱的问题
+## 1.0.18（2022-09-20）
+- 修复 微信小程序端 WXSS 编译报错的bug
+## 1.0.17（2022.09-19）
+- 修复 无法退出登录的bug
+## 1.0.16（2022-09-19）
+- 修复 在 Edge 浏览器下 input[type="password"] 会出现浏览器自带的密码查看按钮
+- 优化 退出登录重定向页面为 uniIdRouter.loginPage
+- 新增 注册账号页面支持返回登录页面
+## 1.0.15（2022-09-19）
+- 更新表结构，解决在uni-admin中部分clientDB操作没有权限的问题
+## 1.0.14（2022-09-16）
+- 修改 配置项`isAdmin`默认值为`false`
+## 1.0.13（2022-09-16）
+- 新增 管理员注册页面
+- 新增 配置项`isAdmin`区分是否为管理端
+- 新增 登录成功后自动跳转；跳转优先级：路由携带(`uniIdRedirectUrl`参数) > 返回上一路由 > 跳转首页
+- uni-id-co 优化 注册管理员时管理员存在提示文案
+## 1.0.12（2022-09-07）
+- 修复 getSupportedLoginType判断是否支持微信公众号、PC网页微信扫码登录方式报错的Bug
+- 优化 适配pc端样式
+- 新增 邮箱验证码注册
+- 新增 邮箱验证码找回密码
+- 新增 退出登录(全局)回调事件：`uni-id-pages-logout`，支持通过[uni.$on](https://uniapp.dcloud.net.cn/api/window/communication.html#on)监听;
+- 调整 抽离退出登录方法至`/uni_modules/uni-id-pages/common/common.js`中，方便在项目其他页面中调用
+- 调整 用户中心（路径：`/uni_modules/uni-id-pages/pages/userinfo/userinfo`）默认不再显示退出登录按钮。支持页面传参数`showLoginManage=true`恢复显示
+## 1.0.11（2022-09-01）
+- 修复 iOS端，一键登录功能卡在showLoading的问题
+- 更新 合并密码强度与长度配置 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#config)
+- uni-id-co 修复 调用 removeAuthorizedApp 接口报错的Bug
+- uni-id-co 新增 管理端接口 updateUser [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#update-user)
+- uni-id-co 调整 为兼容旧版本，未配置密码强度时提供最简单的密码规则校验（长度大于6即可）
+- uni-id-co 调整 注册、登录时如果携带了token则尝试对此token进行登出操作
+- uni-id-co 调整 管理端接口 addUser 增加 mobile、email等参数 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#add-user)
+## 1.0.10（2022-08-25）
+- 修复 导入uni-id-pages插件时未自动导入uni-open-bridge-common的Bug
+## 1.0.9（2022-08-23）
+- 修复 uni-id-co 缺失uni-open-bridge-common依赖的Bug
+## 1.0.8（2022-08-23）
+- 新增 H5端支持微信登录（含微信公众号内的网页授权登录 和 普通浏览器内网页生成二维码，实现手机微信扫码登录）[详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#weixinlogin)
+- 新增 登录成功(全局)回调事件：`uni-id-pages-login-success`，支持通过[uni.$on](https://uniapp.dcloud.net.cn/api/window/communication.html#on)监听;
+- 新增 密码强度（是否必须包含大小写字母、数字和特殊符号以及长度）配置 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#config)
+- 调整 uni-id-co 密码规则调整，废除之前的简单校验，允许配置密码强度 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#password-strength)
+- 调整 uni-id-co 存储用户 openid 时同时以客户端 AppId 为 Key 的副本，参考：[微信登录](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin)、[QQ登录](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-qq)
+- 调整 uni-id-co 依赖 uni-open-bridge-common 存储用户 session_key、access_token 等信息 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#save-user-token)
+- 新增 uni-id-co 增加 beforeRegister 钩子用户在注册前向用户记录内添加一些数据 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#before-register)
+## 1.0.7（2022-07-19）
+- 修复 uni-id-co接口 logout时没有删除token的Bug
+## 1.0.6（2022-07-13）
+- 新增 允许覆盖内置校验规则 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#custom-validator)
+- 修复 app端clientInfo.appVersionCode为数字导致校验无法通过的Bug
+## 1.0.5（2022-07-11）
+修复 微信小程序调用uni-id-co接口报错的Bug [详情](https://ask.dcloud.net.cn/question/148877)
+## 1.0.4（2022-07-06）
+- uni-id-co增加clientInfo字段类型校验
+- 监听token更新时机，同步客户端push_clientid至uni-id-device表，改为：同步客户端push_clientid至uni-id-device表和opendb-device表
+## 1.0.3（2022-07-05）
+新增监听token更新时机，同步客户端push_clientid至uni-id-device表
+## 1.0.2（2022-07-04）
+修复微信小程序登录时无unionid报错的Bug [详情](https://ask.dcloud.net.cn/question/148016)
+## 1.0.1（2022-06-28）
+添加相关uni-id表
+## 1.0.0（2022-06-23）
+正式版

uni_modules/uni-id-pages/common/password.js

@@ -66,7 +66,7 @@ function getPwdRules(pwdName = 'password', rePwdName = 'password2') {
 				},
 				{
 					validateFunction: function(rule, value, data, callback) {
-						if (value != data.password) {
+						if (value != data[pwdName]) {
 							callback(ERROR.normal.rePwdErr)
 						}
 						return true

uni_modules/uni-id-pages/common/store.js

 import pagesJson from '@/pages.json'
 const uniIdCo = uniCloud.importObject("uni-id-co")
-const db = uniCloud.database();
+const db = uniCloud.database();
 const usersTable = db.collection('uni-id-users')
-
 
 
-let hostUserInfo = uni.getStorageSync('uni-id-pages-userInfo')||{}
-console.log( hostUserInfo);
-const data = {
-	userInfo: hostUserInfo,
-	hasLogin: Object.keys(hostUserInfo).length != 0
-}
-
-console.log('data', data);
-// 定义 mutations, 修改属性
-export const mutations = {
-	// data不为空，表示传递要更新的值(注意不是覆盖是合并),什么也不传时，直接查库获取更新
-	async updateUserInfo(data = false) {
+
+let hostUserInfo = uni.getStorageSync('uni-id-pages-userInfo')||{}
+console.log( hostUserInfo);
+const data = {
+	userInfo: hostUserInfo,
+	hasLogin: Object.keys(hostUserInfo).length != 0
+}
+
+console.log('data', data);
+// 定义 mutations, 修改属性
+export const mutations = {
+	// data不为空，表示传递要更新的值(注意不是覆盖是合并),什么也不传时，直接查库获取更新
+	async updateUserInfo(data = false) {
 		if (data) {
 			usersTable.where('_id==$env.uid').update(data).then(e => {
 				console.log(e);
@@ -32,32 +32,32 @@ export const mutations = {
 						icon: 'none'
 					});
 				}
-			})
-			
-		} else {
+			})
+
+		} else {
 			try {
 				let res = await usersTable.where("'_id' == $cloudEnv_uid")
-						.field('mobile,nickname,user_name,email,avatar_file')
-						.get()
-				console.log('fromDbData',res.result.data);
-				this.setUserInfo(res.result.data[0])
-			} catch (e) {
-				this.setUserInfo({},{cover:true})
-				console.error(e.message, e.errCode);
-			}
-		}
-	},
-	async setUserInfo(data, {cover}={cover:false}) {
+						.field('mobile,nickname,username,email,avatar_file')
+						.get()
+				console.log('fromDbData',res.result.data);
+				this.setUserInfo(res.result.data[0])
+			} catch (e) {
+				this.setUserInfo({},{cover:true})
+				console.error(e.message, e.errCode);
+			}
+		}
+	},
+	async setUserInfo(data, {cover}={cover:false}) {
 		console.log('set-userInfo', data);
 		let userInfo = cover?data:Object.assign(store.userInfo,data)
-		store.userInfo = Object.assign({},userInfo)
-		store.hasLogin = Object.keys(store.userInfo).length != 0
-		console.log('store.userInfo', store.userInfo);
-		uni.setStorage({
-			key: "uni-id-pages-userInfo",
-			data:store.userInfo
-		})
-		return data
+		store.userInfo = Object.assign({},userInfo)
+		store.hasLogin = Object.keys(store.userInfo).length != 0
+		console.log('store.userInfo', store.userInfo);
+		uni.setStorage({
+			key: "uni-id-pages-userInfo",
+			data:store.userInfo
+		})
+		return data
 	},
 	async logout() {
 		await uniIdCo.logout()
@@ -69,7 +69,7 @@ export const mutations = {
 		uni.$emit('uni-id-pages-logout')
 		this.setUserInfo({},{cover:true})
 	},
-	loginSuccess(e){
+	loginSuccess(e = {}){
 		const {
 			showToast = true, toastText = '登录成功', autoBack = true, uniIdRedirectUrl = ''
 		} = e
@@ -94,7 +94,7 @@ export const mutations = {
 					delta++
 				}
 			})
-			console.log('判断需要返回几层:', pages, delta);
+			// console.log('判断需要返回几层:', delta);
 			if (uniIdRedirectUrl) {
 				return uni.reLaunch({
 					url: uniIdRedirectUrl
@@ -106,32 +106,32 @@ export const mutations = {
 				return window.history.go(-3)
 			}
 			// #endif
-		
+
 			if (delta) {
 				const page = pagesJson.pages[0]
 				return uni.reLaunch({
 					url: `/${page.path}`
 				})
 			}
-		
+
 			uni.navigateBack({
 				delta
 			})
 		}
 	}
-	
-}
-
-// #ifdef VUE2
-import Vue from 'vue'
-// 通过Vue.observable创建一个可响应的对象
-export const store = Vue.observable(data)
-// #endif
-
-// #ifdef VUE3
-import {
-	reactive
-} from 'vue'
-// 通过Vue.observable创建一个可响应的对象
-export const store = reactive(data)
+
+}
+
+// #ifdef VUE2
+import Vue from 'vue'
+// 通过Vue.observable创建一个可响应的对象
+export const store = Vue.observable(data)
+// #endif
+
+// #ifdef VUE3
+import {
+	reactive
+} from 'vue'
+// 通过Vue.observable创建一个可响应的对象
+export const store = reactive(data)
 // #endif

uni_modules/uni-id-pages/components/uni-id-pages-email-form/uni-id-pages-email-form.vue

-<template>
-	<view>
-		<uni-captcha :focus="focusCaptchaInput" ref="captcha" scene="send-email-code" v-model="captcha" />
-		<view class="box">
-			<uni-easyinput :focus="focusEmailCodeInput" @blur="focusEmailCodeInput = false" type="number" class="input-box" :inputBorder="false" v-model="modelValue" maxlength="6"
-				placeholder="请输入邮箱验证码">
-			</uni-easyinput>
-			<view class="short-code-btn" hover-class="hover" @click="start">
-				<text class="inner-text" :class="reverseNumber==0?'inner-text-active':''">{{innerText}}</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	function debounce(func, wait) {
-		let timer;
-		wait = wait || 500;
-		return function() {
-			let context = this;
-			let args = arguments;
-			if (timer) clearTimeout(timer);
-			let callNow = !timer;
-			timer = setTimeout(() => {
-				timer = null;
-			}, wait)
-			if (callNow) func.apply(context, args);
-		}
-	}
-	/**
-	 * email-code-form 
-	 * @description 获取邮箱验证码组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=
-	 * @property {Number} count 倒计时时长 s
-	 * @property {String} email 邮箱
-	 * @property {String} type = [login-by-email-code|reset-pwd-by-email-code|bind-email] 	验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定邮箱、unbind解绑邮箱
-	 * @property {false} focusCaptchaInput = [true|false] 验证码输入框是否默认获取焦点
-	 */
-	export default {
-		name: "uni-email-code-form",
-		model: {
-			prop: 'modelValue',
-			event: 'update:modelValue'
-		},
-		props: {
-			event: ['update:modelValue'],
-			/**
-			 * 倒计时时长 s
-			 */
-			count: {
-				type: [String, Number],
-				default: 60
-			},
-			/**
-			 * 邮箱
-			 */
-			email: {
-				type: [String],
-				default: ''
-			},
-			/*
-				验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定邮箱、unbind解绑邮箱
-			*/
-			type: {
-				type: String,
-				default () {
-					return 'register'
-				}
-			},
-			/*
-				验证码输入框是否默认获取焦点
-			*/
-			focusCaptchaInput: {
-				type: Boolean,
-				default () {
-					return false
-				}
-			},
-		},
-		data() {
-			return {
-				captcha: "",
-				reverseNumber: 0,
-				reverseTimer: null,
-				modelValue: "",
-				focusEmailCodeInput:false
-			};
-		},
-		watch: {
-			captcha(value, oldValue) {
-				if (value.length == 4 && oldValue.length != 4) {
-					this.start()
-				}
-			},
-			modelValue(value) {
-				// TODO 兼容 vue2
-				this.$emit('input', value);
-				// TODO　兼容　vue3
-				this.$emit('update:modelValue', value)
-			}
-		},
-		computed: {
-			innerText() {
-				if (this.reverseNumber == 0) return "获取邮箱验证码";
-				return "重新发送" + '(' + this.reverseNumber + 's)';
-			}
-		},
-		created() {
-			this.initClick();
-		},
-		methods: {
-			getImageCaptcha(focus) {
-				this.$refs.captcha.getImageCaptcha(focus)
-			},
-			initClick() {
-				this.start = debounce(() => {
-					if (this.reverseNumber != 0) return;
-					this.sendMsg();
-				})
-			},
-			sendMsg() {
-				if (this.captcha.length != 4) {
-					this.$refs.captcha.focusCaptchaInput = true
-					return uni.showToast({
-						title: '请先输入图形验证码',
-						icon: 'none'
-					});
-				}
-				if(!this.email) return uni.showToast({
-					title: "请输入邮箱",
-					icon: 'none'
-				});
-				let reg_email = /@/;
-				if (!reg_email.test(this.email)) return uni.showToast({
-					title: "邮箱格式错误",
-					icon: 'none'
-				});
-				const uniIdCo = uniCloud.importObject("uni-id-co", {
-					customUI: true
-				})
-				console.log('uniIdCo', uniIdCo)
-				console.log('sendEmailCode',{
-					"email": this.email,
-					"scene": this.type,
-					"captcha": this.captcha
-				});
-				uniIdCo.sendEmailCode({
-					"email": this.email,
-					"scene": this.type,
-					"captcha": this.captcha
-				}).then(result => {
-					console.log(result.code);
-					uni.showToast({
-						title: "邮箱验证码发送成功",
-						icon: 'none'
-					});
-					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({
-							title: '已启动测试模式,详情【控制台信息】',
-							icon: 'none',
-							duration: 3000
-						});
-						console.warn(e.message);
-					} else {
-						this.getImageCaptcha()
-						this.captcha = ""
-						uni.showToast({
-							title: e.message,
-							icon: 'none'
-						});
-					}
-				})
-			},
-			getCode() {
-				if (this.reverseNumber == 0) {
-					clearTimeout(this.reverseTimer);
-					this.reverseTimer = null;
-					return;
-				}
-				this.reverseNumber--;
-				this.reverseTimer = setTimeout(() => {
-					this.getCode();
-				}, 1000)
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.box {
-		position: relative;
-		margin-top: 10px;
-	}
-
-	.short-code-btn {
-		padding: 0;
-		position: absolute;
-		top: 0;
-		right: 8px;
-		width: 260rpx;
-		max-width: 130px;
-		height: 44px;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-		
-	}
-
-	.inner-text {
-		font-size: 14px;
-		color: #AAAAAA;
-	}
-
-	.inner-text-active {
-		color: #04498c;
-	}
-
-	.captcha {
-		width: 350rpx;
-	}
-
-	.input-box {
-		margin: 0;
-		padding: 4px;
-		background-color: #F8F8F8;
-		font-size: 14px;
-	}
-
-	.box ::v-deep .content-clear-icon {
-		margin-right: 100px;
-	}
-
-	.box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-	}
-</style>
+<template>
+	<view>
+		<uni-captcha :focus="focusCaptchaInput" ref="captcha" scene="send-email-code" v-model="captcha" />
+		<view class="box">
+			<uni-easyinput :focus="focusEmailCodeInput" @blur="focusEmailCodeInput = false" type="number" class="input-box" :inputBorder="false" v-model="modelValue" maxlength="6"
+				placeholder="请输入邮箱验证码">
+			</uni-easyinput>
+			<view class="short-code-btn" hover-class="hover" @click="start">
+				<text class="inner-text" :class="reverseNumber==0?'inner-text-active':''">{{innerText}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	function debounce(func, wait) {
+		let timer;
+		wait = wait || 500;
+		return function() {
+			let context = this;
+			let args = arguments;
+			if (timer) clearTimeout(timer);
+			let callNow = !timer;
+			timer = setTimeout(() => {
+				timer = null;
+			}, wait)
+			if (callNow) func.apply(context, args);
+		}
+	}
+	/**
+	 * email-code-form 
+	 * @description 获取邮箱验证码组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=
+	 * @property {Number} count 倒计时时长 s
+	 * @property {String} email 邮箱
+	 * @property {String} type = [login-by-email-code|reset-pwd-by-email-code|bind-email] 	验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定邮箱、unbind解绑邮箱
+	 * @property {false} focusCaptchaInput = [true|false] 验证码输入框是否默认获取焦点
+	 */
+	export default {
+		name: "uni-email-code-form",
+		model: {
+			prop: 'modelValue',
+			event: 'update:modelValue'
+		},
+		props: {
+			event: ['update:modelValue'],
+			/**
+			 * 倒计时时长 s
+			 */
+			count: {
+				type: [String, Number],
+				default: 60
+			},
+			/**
+			 * 邮箱
+			 */
+			email: {
+				type: [String],
+				default: ''
+			},
+			/*
+				验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定邮箱、unbind解绑邮箱
+			*/
+			type: {
+				type: String,
+				default () {
+					return 'register'
+				}
+			},
+			/*
+				验证码输入框是否默认获取焦点
+			*/
+			focusCaptchaInput: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+		},
+		data() {
+			return {
+				captcha: "",
+				reverseNumber: 0,
+				reverseTimer: null,
+				modelValue: "",
+				focusEmailCodeInput:false
+			};
+		},
+		watch: {
+			captcha(value, oldValue) {
+				if (value.length == 4 && oldValue.length != 4) {
+					this.start()
+				}
+			},
+			modelValue(value) {
+				// TODO 兼容 vue2
+				this.$emit('input', value);
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', value)
+			}
+		},
+		computed: {
+			innerText() {
+				if (this.reverseNumber == 0) return "获取邮箱验证码";
+				return "重新发送" + '(' + this.reverseNumber + 's)';
+			}
+		},
+		created() {
+			this.initClick();
+		},
+		methods: {
+			getImageCaptcha(focus) {
+				this.$refs.captcha.getImageCaptcha(focus)
+			},
+			initClick() {
+				this.start = debounce(() => {
+					if (this.reverseNumber != 0) return;
+					this.sendMsg();
+				})
+			},
+			sendMsg() {
+				if (this.captcha.length != 4) {
+					this.$refs.captcha.focusCaptchaInput = true
+					return uni.showToast({
+						title: '请先输入图形验证码',
+						icon: 'none'
+					});
+				}
+				if(!this.email) return uni.showToast({
+					title: "请输入邮箱",
+					icon: 'none'
+				});
+				let reg_email = /@/;
+				if (!reg_email.test(this.email)) return uni.showToast({
+					title: "邮箱格式错误",
+					icon: 'none'
+				});
+				const uniIdCo = uniCloud.importObject("uni-id-co", {
+					customUI: true
+				})
+				console.log('uniIdCo', uniIdCo)
+				console.log('sendEmailCode',{
+					"email": this.email,
+					"scene": this.type,
+					"captcha": this.captcha
+				});
+				uniIdCo.sendEmailCode({
+					"email": this.email,
+					"scene": this.type,
+					"captcha": this.captcha
+				}).then(result => {
+					console.log(result.code);
+					uni.showToast({
+						title: "邮箱验证码发送成功",
+						icon: 'none'
+					});
+					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({
+							title: '已启动测试模式,详情【控制台信息】',
+							icon: 'none',
+							duration: 3000
+						});
+						console.warn(e.message);
+					} else {
+						this.getImageCaptcha()
+						this.captcha = ""
+						uni.showToast({
+							title: e.message,
+							icon: 'none'
+						});
+					}
+				})
+			},
+			getCode() {
+				if (this.reverseNumber == 0) {
+					clearTimeout(this.reverseTimer);
+					this.reverseTimer = null;
+					return;
+				}
+				this.reverseNumber--;
+				this.reverseTimer = setTimeout(() => {
+					this.getCode();
+				}, 1000)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.box {
+		position: relative;
+		margin-top: 10px;
+	}
+
+	.short-code-btn {
+		padding: 0;
+		position: absolute;
+		top: 0;
+		right: 8px;
+		width: 260rpx;
+		max-width: 130px;
+		height: 44px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		
+	}
+
+	.inner-text {
+		font-size: 14px;
+		color: #AAAAAA;
+	}
+
+	.inner-text-active {
+		color: #04498c;
+	}
+
+	.captcha {
+		width: 350rpx;
+	}
+
+	.input-box {
+		margin: 0;
+		padding: 4px;
+		background-color: #F8F8F8;
+		font-size: 14px;
+	}
+
+	.box ::v-deep .content-clear-icon {
+		margin-right: 100px;
+	}
+
+	.box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+</style>

uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue

@@ -14,16 +14,16 @@
 </template>
 <script>
 	import config from '@/uni_modules/uni-id-pages/config.js'
-	//前一个窗口的页面地址。控制点击切换快捷登录方式是创建还是返回
-	import {
-			store,
-			mutations
-		} from '@/uni_modules/uni-id-pages/common/store.js'
-	
+	//前一个窗口的页面地址。控制点击切换快捷登录方式是创建还是返回
+	import {
+			store,
+			mutations
+		} from '@/uni_modules/uni-id-pages/common/store.js'
+
 	const db = uniCloud.database();
 	const usersTable = db.collection('uni-id-users')
-	let allServicesList = []
-	
+	let allServicesList = []
+
 	export default {
 		computed: {
 			agreements() {
@@ -45,17 +45,17 @@
 				]
 			},
 			agree: {
-				get() {
+				get() {
 					return this.getParentComponent().agree
 				},
-				set(agree) {
-					console.log('setAgree', agree);
+				set(agree) {
+					console.log('setAgree', agree);
 					return this.getParentComponent().agree = agree
 				}
 			}
 		},
-		data() {
-			return {
+		data() {
+			return {
 				servicesList: [{
 						"id": "username",
 						"text": "账号登录",
@@ -127,11 +127,11 @@
 						"list": []
 					},
 					"privacyTerms": {
-						"defaultCheckBoxState": false, // 条款勾选框初始状态 默认值： true   
-						"textColor": "#BBBBBB", // 文字颜色 默认值：#BBBBBB  
-						"termsColor": "#5496E3", //  协议文字颜色 默认值： #5496E3  
-						"prefix": "我已阅读并同意", // 条款前的文案 默认值：“我已阅读并同意”  
-						"suffix": "并使用本机号码登录", // 条款后的文案 默认值：“并使用本机号码登录”  
+						"defaultCheckBoxState": false, // 条款勾选框初始状态 默认值： true
+						"textColor": "#BBBBBB", // 文字颜色 默认值：#BBBBBB
+						"termsColor": "#5496E3", //  协议文字颜色 默认值： #5496E3
+						"prefix": "我已阅读并同意", // 条款前的文案 默认值：“我已阅读并同意”
+						"suffix": "并使用本机号码登录", // 条款后的文案 默认值：“并使用本机号码登录”
 						"privacyItems": []
 					}
 				}
@@ -147,14 +147,14 @@
 			let loginTypes = config.loginTypes
 
 			servicesList = servicesList.filter(item => {
-				
+
 				// #ifndef APP
 				//非app端去掉apple登录
 				if (item.id == 'apple') {
 					return false
 				}
 				// #endif
-				
+
 				// #ifdef APP
 				//去掉非ios系统上的apple登录
 				if (item.id == 'apple' && uni.getSystemInfoSync().osName != 'ios') {
@@ -196,7 +196,7 @@
 				// #ifndef H5
 				return this.$parent;
 				// #endif
-				
+
 				// #ifdef H5
 				return this.$parent.$parent;
 				// #endif
@@ -234,8 +234,8 @@
 					console.log('出乎意料的情况,path：' + path);
 				}
 			},
-			async login_before(type, navigateBack = true) {
-				console.log(type);
+			async login_before(type, navigateBack = true, options = {}) {
+				console.log(type);
 				//提示空实现
 				if (["qq",
 						"xiaomi",
@@ -251,7 +251,7 @@
 						icon: 'none'
 					});
 				}
-				
+
 				//检查当前环境是否支持这种登录方式
 				// #ifdef APP
 				let isAppExist = true
@@ -272,66 +272,65 @@
 					})
 				})
 				// #endif
-				
+
 				if (
 					// #ifdef APP
 					!isAppExist
 					// #endif
-					
+
 					//非app端使用了，app特有登录方式
 					// #ifndef APP
 					["univerify","apple"].includes(type)
 					// #endif
-					
+
 				) {
 					return uni.showToast({
 						title: '当前设备不支持此登录，请选择其他登录方式',
 						icon: 'none'
 					});
 				}
-				
+
 				//判断是否需要弹出隐私协议授权框
-				console.log(type, this.agree);
-				let needAgreements = (config?.agreements?.scope || []).includes('register')
+				console.log(type, this.agree);
+				let needAgreements = (config?.agreements?.scope || []).includes('register')
 				console.log({
 					needAgreements
 				});
-				if (type != 'univerify' && needAgreements && !this.agree) {
+				if (type != 'univerify' && needAgreements && !this.agree) {
 					let agreementsRef = this.getParentComponent().$refs.agreements
-					return agreementsRef.popup(() => {
+					return agreementsRef.popup(() => {
 						console.log(type, navigateBack);
-						this.login_before(type, navigateBack)
+						this.login_before(type, navigateBack, options)
 					})
-				}
-				
-				// #ifdef H5
-					if(type == 'weixin'){
-						// console.log('开始微信网页登录');
-						let redirectUrl = location.protocol +'//'+ 
-										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('在微信公众号内');
-							return window.open(`https://open.weixin.qq.com/connect/oauth2/authorize?
-										appid=${config.appid.weixin.h5}
-										&redirect_uri=${encodeURIComponent(redirectUrl)}
-										&response_type=code
-										&scope=snsapi_userinfo
-										&state=STATE&connect_redirect=1#wechat_redirect`);
-							
-						}else{
-							// console.log('非微信公众号内');
-							return location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=${config.appid.weixin.web}
-											&redirect_uri=${encodeURIComponent(redirectUrl)}
-											&response_type=code&scope=snsapi_login&state=STATE#wechat_redirect`
-						}
-					}
-				// #endif
-				
-				
+				}
+
+				// #ifdef H5
+					if(type == 'weixin'){
+						// console.log('开始微信网页登录');
+						let redirectUrl = location.protocol +'//'+
+										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('在微信公众号内');
+							return window.open(`https://open.weixin.qq.com/connect/oauth2/authorize?
+										appid=${config.appid.weixin.h5}
+										&redirect_uri=${encodeURIComponent(redirectUrl)}
+										&response_type=code
+										&scope=snsapi_userinfo
+										&state=STATE&connect_redirect=1#wechat_redirect`);
+
+						}else{
+							// console.log('非微信公众号内');
+							return location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=${config.appid.weixin.web}
+											&redirect_uri=${encodeURIComponent(redirectUrl)}
+											&response_type=code&scope=snsapi_login&state=STATE#wechat_redirect`
+						}
+					}
+				// #endif
+
 				uni.showLoading({
 					mask: true
 				})
@@ -397,6 +396,13 @@
 						}
 					})
 				}
+
+        if (type === 'weixinMobile') {
+          return this.login({
+            phoneCode: options.phoneNumberCode
+          }, type)
+        }
+
 				uni.login({
 					"provider": type,
 					"onlyAuthorize": true,
@@ -422,14 +428,14 @@
 					}
 				})
 			},
-			login(params, type) { //联网验证登录
+			login(params, type) { //联网验证登录
 				console.log('执行登录开始----');
 				console.log({
 					params,
 					type
 				});
 				//toLowerCase
-				let action = 'loginBy' + type.trim().toLowerCase().replace(type[0], type[0].toUpperCase())
+				let action = 'loginBy' + type.trim().replace(type[0], type[0].toUpperCase())
 				const uniIdCo = uniCloud.importObject("uni-id-co",{
 					customUI:true
 				})
@@ -441,17 +447,17 @@
 					});
 					// #ifdef MP-WEIXIN
 					//如果是微信小程序端的微信登录，且为首次登录，就弹出获取微信昵称+头像用于绑定资料
-					if (type == 'weixin' && result.type == "register") {
-						mutations.loginSuccess({
+					if (['weixin', 'weixinMobile'].includes(type) && result.type == "register") {
+            mutations.loginSuccess({
 							...result,
 							showToast: false,
 							autoBack: false
 						})
 						return this.$refs.userProfile.open(result.uid)
 					}
-					// #endif
-					// #ifdef H5
-					result.loginType = type
+					// #endif
+					// #ifdef H5
+					result.loginType = type
 					// #endif
 					mutations.loginSuccess(result)
 				})
@@ -514,10 +520,10 @@
 		flex-wrap: wrap;
 		width: 750rpx;
 		justify-content: space-around;
-		position: fixed;
+		position: fixed;
 		left: 0;
 	}
-	
+
 	.item {
 		flex-direction: column;
 		justify-content: center;
@@ -536,7 +542,7 @@
 			height: 160rpx;
 		}
 	}
-	
+
 	@media screen and (max-width: 690px) {
 		.fab-login-box {
 			bottom: 10rpx;
@@ -545,7 +551,7 @@
 
 	/* #endif */
 
-	
+
 
 	.logo {
 		width: 60rpx;

uni_modules/uni-id-pages/components/uni-id-pages-user-profile/uni-id-pages-user-profile.vue

-<template>
-	<uni-popup ref="popup" type="bottom">
-		<view class="box">
-			<text class="headBox">绑定资料</text>
-			<text class="tip">获取你的微信头像和昵称，完善你的个人资料</text>
-			<view class="btnBox">
-				<text @click="closeMe" class="close">关闭</text>
-				<button class="agree uni-btn" type="primary" @click="getUserProfile">确定</button>
-			</view>
-		</view>
-	</uni-popup>
-</template>
-
-<script>
-	const db = uniCloud.database();
-	const usersTable = db.collection('uni-id-users')
-	let userId = ''
-	export default {
-		emits:['next'],
-		data() {
-			return {}
-		},
-		methods: {
-			async open(uid){
-				userId = uid
-				this.$refs.popup.open()
-			},
-			async getUserProfile(){
-				uni.showLoading();
-				let res = await new Promise((callBack) => {
-					uni.getUserProfile({
-						desc: "用于设置账户昵称和头像",
-						complete: (e) => {
-							console.log("getUserProfile:", e);
-							callBack(e)
-						}
-					})
-				})
-				// console.log("userInfo", res.userInfo);
-				if(res.errMsg != "getUserProfile:ok"){
-					return this.closeMe()
-				}
-				let {avatarUrl,nickName} = res.userInfo;
-				
-				let tempFilePath = await new Promise((callBack)=>{
-					uni.downloadFile({
-					    url: avatarUrl,
-					    success: (res) => {
-					        if (res.statusCode === 200) {
-					            // console.log('下载成功');
-								callBack(res.tempFilePath)
-					        }
-							callBack()
-					    },
-						fail: (err) => {
-							console.error(err)
-						},
-						complete: (e) => {
-							// console.log("downloadFile",e);
-						}
-					});
-				})
-				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":{
-						name:cloudPath,
-						extname:"jpg",
-						url:result.fileID
-					}
-				}
-				this.doUpdate(userInfo,()=>{
-					this.$refs.popup.close()
-				})
-			},
-			closeMe(e){
-				uni.showLoading();
-				this.doUpdate({nickname:"匿名微信用户"},()=>{
-					uni.hideLoading()
-					this.$refs.popup.close()
-				})
-			},
-			doUpdate(data,callback){
-				// console.log('dododo',data);
-				// 使用 clientDB 提交数据
-				usersTable.where('_id==$env.uid').update(data).then((res) => {
-					callback(res)
-				}).catch((err) => {
-					uni.showModal({
-						content: err.message || '请求服务失败',
-						showCancel: false
-					})
-					callback(err)
-				}).finally(() => {
-					this.$emit('next')
-					uni.hideLoading()
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-view{
-	display: flex;
-}
-.box{
-	background-color: #FFFFFF;
-	height:200px;
-	width: 750rpx;
-	flex-direction: column;
-	border-top-left-radius: 15px;
-	border-top-right-radius: 15px;
-}
-.headBox{
-	padding:20rpx;
-	height:80rpx;
-	line-height:80rpx;
-	text-align: left;
-	font-size:16px;
-	color:#333333;
-	margin-left: 15rpx;
-}
-.tip{
-	color:#666666;
-	text-align: left;
-	justify-content: center;
-	margin:10rpx 30rpx;
-	font-size:18px;
-}
-.btnBox{
-	margin-top:45rpx;
-	justify-content: center;
-	flex-direction: row;
-}
-.close,.agree{
-	text-align: center;
-	width:200rpx;
-	height:80upx;
-	line-height:80upx;
-	border-radius:5px;
-	margin:0 20rpx;
-	font-size:14px;
-}
-.close{
-	color:#999999;
-	border-color: #EEEEEE;
-	border-style: solid;
-	border-width: 1px;
-	background-color:#FFFFFF;
-}
-.close:active{
-	color:#989898;
-	background-color:#E2E2E2;
-}
-.agree{
-	color:#FFFFFF;
-}
-/* #ifdef MP */
-.agree::after {
-   border: none;
-}
-/* #endif */
-.agree:active{
-	background-color:#F5F5F6;
-}
-</style>
+<template>
+	<uni-popup ref="popup" type="bottom">
+		<view class="box">
+			<text class="headBox">绑定资料</text>
+			<text class="tip">获取你的微信头像和昵称，完善你的个人资料</text>
+			<view class="btnBox">
+				<text @click="closeMe" class="close">关闭</text>
+				<button class="agree uni-btn" type="primary" @click="getUserProfile">确定</button>
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	const db = uniCloud.database();
+	const usersTable = db.collection('uni-id-users')
+	let userId = ''
+	export default {
+		emits:['next'],
+		data() {
+			return {}
+		},
+		methods: {
+			async open(uid){
+				userId = uid
+				this.$refs.popup.open()
+			},
+			async getUserProfile(){
+				uni.showLoading();
+				let res = await new Promise((callBack) => {
+					uni.getUserProfile({
+						desc: "用于设置账户昵称和头像",
+						complete: (e) => {
+							console.log("getUserProfile:", e);
+							callBack(e)
+						}
+					})
+				})
+				// console.log("userInfo", res.userInfo);
+				if(res.errMsg != "getUserProfile:ok"){
+					return this.closeMe()
+				}
+				let {avatarUrl,nickName} = res.userInfo;
+				
+				let tempFilePath = await new Promise((callBack)=>{
+					uni.downloadFile({
+					    url: avatarUrl,
+					    success: (res) => {
+					        if (res.statusCode === 200) {
+					            // console.log('下载成功');
+								callBack(res.tempFilePath)
+					        }
+							callBack()
+					    },
+						fail: (err) => {
+							console.error(err)
+						},
+						complete: (e) => {
+							// console.log("downloadFile",e);
+						}
+					});
+				})
+				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":{
+						name:cloudPath,
+						extname:"jpg",
+						url:result.fileID
+					}
+				}
+				this.doUpdate(userInfo,()=>{
+					this.$refs.popup.close()
+				})
+			},
+			closeMe(e){
+				uni.showLoading();
+				this.doUpdate({nickname:"匿名微信用户"},()=>{
+					uni.hideLoading()
+					this.$refs.popup.close()
+				})
+			},
+			doUpdate(data,callback){
+				// console.log('dododo',data);
+				// 使用 clientDB 提交数据
+				usersTable.where('_id==$env.uid').update(data).then((res) => {
+					callback(res)
+				}).catch((err) => {
+					uni.showModal({
+						content: err.message || '请求服务失败',
+						showCancel: false
+					})
+					callback(err)
+				}).finally(() => {
+					this.$emit('next')
+					uni.hideLoading()
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+view{
+	display: flex;
+}
+.box{
+	background-color: #FFFFFF;
+	height:200px;
+	width: 750rpx;
+	flex-direction: column;
+	border-top-left-radius: 15px;
+	border-top-right-radius: 15px;
+}
+.headBox{
+	padding:20rpx;
+	height:80rpx;
+	line-height:80rpx;
+	text-align: left;
+	font-size:16px;
+	color:#333333;
+	margin-left: 15rpx;
+}
+.tip{
+	color:#666666;
+	text-align: left;
+	justify-content: center;
+	margin:10rpx 30rpx;
+	font-size:18px;
+}
+.btnBox{
+	margin-top:45rpx;
+	justify-content: center;
+	flex-direction: row;
+}
+.close,.agree{
+	text-align: center;
+	width:200rpx;
+	height:80upx;
+	line-height:80upx;
+	border-radius:5px;
+	margin:0 20rpx;
+	font-size:14px;
+}
+.close{
+	color:#999999;
+	border-color: #EEEEEE;
+	border-style: solid;
+	border-width: 1px;
+	background-color:#FFFFFF;
+}
+.close:active{
+	color:#989898;
+	background-color:#E2E2E2;
+}
+.agree{
+	color:#FFFFFF;
+}
+/* #ifdef MP */
+.agree::after {
+   border: none;
+}
+/* #endif */
+.agree:active{
+	background-color:#F5F5F6;
+}
+</style>

uni_modules/uni-id-pages/init.js

@@ -34,7 +34,7 @@ export default async function() {
 			google: 'google',
 			alipay: 'alipay',
 			apple: "apple"
-		}
+		}
 		//遍历客户端配置的登录方式，与服务端比对。并在错误时抛出错误提示
 		let list = loginTypes.filter(type => !supportedLoginType.includes(data[type]))
 		if (list.length) {
@@ -55,7 +55,8 @@ export default async function() {
 		})
 	}
 	// #endif
-
+
+/* 注释此代码块原因：与uni-starter中的appinit逻辑一致
 	//3. 绑定clientDB错误事件
 	// clientDB对象
 	const db = uniCloud.database()
@@ -72,9 +73,9 @@ export default async function() {
 	}
 	// 解绑clientDB错误事件
 	//db.off('error', onDBError)
+*/
 
-
-	//4. 同步客户端push_clientid至device表
+	//4. 同步客户端push_clientid至uni-id-device表
 	if (uniCloud.onRefreshToken) {
 		uniCloud.onRefreshToken(() => {
 			console.log('onRefreshToken');
@@ -90,10 +91,14 @@ export default async function() {
 						console.log('getPushClientId', res);
 					},
 					fail(e) {
-						console.log(e)
+						console.error(e,
+						"uni-id-pages 默认在刷新token（登录、注销、切换用户）后获取push客户端标识同步至uni-id-device表;", 
+						"\n",
+						"如果你不使用push模块，请注释或删除，路径：/uni-starter/uni_modules/uni-id-pages/init.js 第79-103行代码"
+						)
 					}
 				})
 			}
 		})
-	}
+	}
 }

uni_modules/uni-id-pages/package.json

 {
 	"id": "uni-id-pages",
 	"displayName": "uni-id-pages",
-	"version": "1.0.21",
+	"version": "1.0.26",
 	"description": "云端一体简单、统一、可扩展的用户中心页面模版",
 	"keywords": [
         "用户管理",

uni_modules/uni-id-pages/pages/common/webview/webview.vue

-<!-- 网络链接内容展示页（uni-id-pages中用于展示隐私政策协议内容） -->
-<template>
-	<view>
-		<web-view v-if="url" :src="url"></web-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		onLoad({url,title}) {
-			if(url.substring(0, 4) != 'http'){
-				uni.showModal({
-					title:"错误",
-					content: '不是一个有效的网站链接,'+'"'+url+'"',
-					showCancel: false,
-					confirmText:"知道了",
-					complete: () => {
-						uni.navigateBack()
-					}
-				});
-				title = "页面路径错误"
-			}else{
-				console.log(url,title);
-				this.url = url;
-			}
-			if(title){
-				uni.setNavigationBarTitle({title});
-			}
-		},
-		data() {
-			return {
-				url:null
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>
+<!-- 网络链接内容展示页（uni-id-pages中用于展示隐私政策协议内容） -->
+<template>
+	<view>
+		<web-view v-if="url" :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad({url,title}) {
+			if(url.substring(0, 4) != 'http'){
+				uni.showModal({
+					title:"错误",
+					content: '不是一个有效的网站链接,'+'"'+url+'"',
+					showCancel: false,
+					confirmText:"知道了",
+					complete: () => {
+						uni.navigateBack()
+					}
+				});
+				title = "页面路径错误"
+			}else{
+				console.log(url,title);
+				this.url = url;
+			}
+			if(title){
+				uni.setNavigationBarTitle({title});
+			}
+		},
+		data() {
+			return {
+				url:null
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

uni_modules/uni-id-pages/pages/login/login-smscode.vue

-<!-- 短信验证码登录页 -->
-<template>
-	<view class="uni-content">
-		<view class="login-logo">
-			<image :src="logo"></image>
-		</view>
-		<!-- 顶部文字 -->
-		<text class="title">请输入验证码</text>
-		<text class="tip">先输入图形验证码，再获取短信验证码</text>
-		<uni-forms>
-			<uni-id-pages-sms-form focusCaptchaInput v-model="code" type="login-by-sms" ref="smsCode" :phone="phone">
-			</uni-id-pages-sms-form>
-			<button class="uni-btn send-btn" type="primary" @click="submit">登录</button>
-		</uni-forms>
-		<uni-popup-captcha @confirm="submit" v-model="captcha" scene="login-by-sms" ref="popup"></uni-popup-captcha>
-	</view>
-</template>
-<script>
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				"code": "",
-				"phone": "",
-				"captcha": "",
-				"logo": "/static/logo.png"
-			}
-		},
-		computed: {
-			tipText() {
-				return '验证码已通过短信发送至' + this.phone;
-			},
-		},
-		onLoad({
-			phoneNumber
-		}) {
-			this.phone = phoneNumber;
-		},
-		onShow() {
-			console.log('onShow');
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.submit()
-				}
-			};
-			// #endif
-		},
-		methods: {
-			submit() { //完成并提交
-				const uniIdCo = uniCloud.importObject("uni-id-co", {
-					errorOptions: {
-						type: 'toast'
-					}
-				})
-				if (this.code.length != 6) {
-					this.$refs.smsCode.focusSmsCodeInput = true
-					return uni.showToast({
-						title: '验证码不能为空',
-						icon: 'none'
-					});
-				}
-				uniIdCo.loginBySms({
-					"mobile": this.phone,
-					"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 = ''
-				})
-			}
-		}
-	}
-</script>
-<style scoped lang="scss">
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
-	.tip {
-		margin-top: -15px;
-		margin-bottom: 15px;
-	}
-
-	.popup-captcha {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		padding: 20rpx;
-		background-color: #FFF;
-		border-radius: 2px;
-		flex-direction: column;
-		position: relative;
-	}
-
-	.popup-captcha .title {
-		font-weight: normal;
-		padding: 0;
-		padding-bottom: 15px;
-		color: #666;
-	}
-
-	.popup-captcha .close {
-		position: absolute;
-		bottom: -40px;
-		margin-left: -13px;
-		left: 50%;
-	}
-
-	.popup-captcha .uni-btn {
-		margin: 0;
-	}
-</style>
+<!-- 短信验证码登录页 -->
+<template>
+	<view class="uni-content">
+		<view class="login-logo">
+			<image :src="logo"></image>
+		</view>
+		<!-- 顶部文字 -->
+		<text class="title">请输入验证码</text>
+		<text class="tip">先输入图形验证码，再获取短信验证码</text>
+		<uni-forms>
+			<uni-id-pages-sms-form focusCaptchaInput v-model="code" type="login-by-sms" ref="smsCode" :phone="phone">
+			</uni-id-pages-sms-form>
+			<button class="uni-btn send-btn" type="primary" @click="submit">登录</button>
+		</uni-forms>
+		<uni-popup-captcha @confirm="submit" v-model="captcha" scene="login-by-sms" ref="popup"></uni-popup-captcha>
+	</view>
+</template>
+<script>
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				"code": "",
+				"phone": "",
+				"captcha": "",
+				"logo": "/static/logo.png"
+			}
+		},
+		computed: {
+			tipText() {
+				return '验证码已通过短信发送至' + this.phone;
+			},
+		},
+		onLoad({
+			phoneNumber
+		}) {
+			this.phone = phoneNumber;
+		},
+		onShow() {
+			console.log('onShow');
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			submit() { //完成并提交
+				const uniIdCo = uniCloud.importObject("uni-id-co", {
+					errorOptions: {
+						type: 'toast'
+					}
+				})
+				if (this.code.length != 6) {
+					this.$refs.smsCode.focusSmsCodeInput = true
+					return uni.showToast({
+						title: '验证码不能为空',
+						icon: 'none'
+					});
+				}
+				uniIdCo.loginBySms({
+					"mobile": this.phone,
+					"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 = ''
+				})
+			}
+		}
+	}
+</script>
+<style scoped lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	.tip {
+		margin-top: -15px;
+		margin-bottom: 15px;
+	}
+
+	.popup-captcha {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		padding: 20rpx;
+		background-color: #FFF;
+		border-radius: 2px;
+		flex-direction: column;
+		position: relative;
+	}
+
+	.popup-captcha .title {
+		font-weight: normal;
+		padding: 0;
+		padding-bottom: 15px;
+		color: #666;
+	}
+
+	.popup-captcha .close {
+		position: absolute;
+		bottom: -40px;
+		margin-left: -13px;
+		left: 50%;
+	}
+
+	.popup-captcha .uni-btn {
+		margin: 0;
+	}
+</style>

uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue

-<!-- 免密登录页 -->
-<template>
-	<view class="uni-content">
-		<view class="login-logo">
-			<image :src="logo"></image>
-		</view>
-		<!-- 顶部文字 -->
-		<text class="title">请选择登录方式</text>
-		<!-- 快捷登录框 当url带参数时有效 -->
-		<template v-if="['apple','weixin'].includes(type)">
-			<text class="tip">将根据第三方账号服务平台的授权范围获取你的信息</text>
-			<view class="quickLogin">
-				<image @click="quickLogin" :src="imgSrc" mode="widthFix" class="quickLoginBtn"></image>
-				<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
-		},
-		methods: {
-			quickLogin() {
-				this.$refs.uniFabLogin.login_before(this.type)
-			},
-			toSmsPage() {
-				console.log('toSmsPage',this.agree);
-				if (!this.isPhone) {
-					this.focusPhone = true
-					return uni.showToast({
-						title: "手机号码格式不正确",
-						icon: 'none'
-					});
-				}
-				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'
-				});
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
-	.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;
-		}
-	}
-</style>
+<!-- 免密登录页 -->
+<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">微信授权手机号登录</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
+		},
+		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'
+					});
+				}
+				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'
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	.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;
+		}
+	}
+</style>

uni_modules/uni-id-pages/pages/register/register-admin.vue

-<!-- 创建超级管理员 -->
-<template>
-	<view class="uni-content">
-		<match-media :min-width="690">
-			<view class="login-logo">
-				<image :src="logo"></image>
-			</view>
-			<!-- 顶部文字 -->
-			<text class="title title-box">创建超级管理员</text>
-		</match-media>
-		<uni-forms ref="form" :value="formData" :rules="rules" validate-trigger="submit" err-show-type="toast">
-			<uni-forms-item name="username" required>
-				<uni-easyinput :inputBorder="false" :focus="focusUsername" @blur="focusUsername = false"
-					class="input-box" placeholder="请输入用户名" v-model="formData.username" trim="both" />
-			</uni-forms-item>
-			<uni-forms-item name="nickname">
-				<uni-easyinput :inputBorder="false" :focus="focusNickname" @blur="focusNickname = false" class="input-box" placeholder="请输入用户昵称" v-model="formData.nickname"
-					trim="both" />
-			</uni-forms-item>
-			<uni-forms-item name="password" v-model="formData.password" required>
-				<uni-easyinput :inputBorder="false" :focus="focusPassword" @blur="focusPassword = false"
-					class="input-box" maxlength="20" :placeholder="'请输入' + (config.passwordStrength == 'weak'?'6':'8') + '-16位密码'" type="password"
-					v-model="formData.password" trim="both" />
-			</uni-forms-item>
-			<uni-forms-item name="password2" v-model="formData.password2" required>
-				<uni-easyinput :inputBorder="false" :focus="focusPassword2" @blur="focusPassword2 =false"
-					class="input-box" placeholder="再次输入密码" maxlength="20" type="password" v-model="formData.password2"
-					trim="both" />
-			</uni-forms-item>
-			<uni-forms-item>
-				<uni-captcha ref="captcha" scene="register" v-model="formData.captcha" />
-			</uni-forms-item>
-			<uni-id-pages-agreements scope="register" ref="agreements" ></uni-id-pages-agreements>
-			<button class="uni-btn" type="primary" @click="submit">注册</button>
-			<button @click="navigateBack" class="register-back">返回</button>
-			<match-media :min-width="690">
-				<view class="link-box">
-					<text class="link" @click="toLogin">已有账号？点此登录</text>
-				</view>
-			</match-media>
-		</uni-forms>
-	</view>
-</template>
-
-<script>
-	import rules from './validator.js';
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	import config from '@/uni_modules/uni-id-pages/config.js'
-	const uniIdCo = uniCloud.importObject("uni-id-co", {customUI: true})
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				formData: {
-					username: "",
-					nickname: "",
-					password: "",
-					password2: "",
-					captcha: ""
-				},
-				rules,
-				focusUsername:false,
-				focusNickname:false,
-				focusPassword:false,
-				focusPassword2:false,
-				logo: "/static/logo.png"
-			}
-		},
-		onReady() {
-			this.$refs.form.setRules(this.rules)
-		},
-		onShow() {
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.submit()
-				}
-			};
-			// #endif
-		},
-		methods: {
-			/**
-			 * 触发表单提交
-			 */
-			submit() {
-				this.$refs.form.validate().then((res) => {
-					if(this.formData.captcha.length != 4){
-						this.$refs.captcha.focusCaptchaInput = true
-						return uni.showToast({
-							title: '请输入验证码',
-							icon: 'none'
-						});
-					}
-					if (this.needAgreements && !this.agree) {
-						return this.$refs.agreements.popup(()=>{
-							this.submitForm(res)
-						})
-					}
-					this.submitForm(res)
-				}).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.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({
-						title: '提示',
-						content: e.errMsg || `创建失败: ${e.errCode}`,
-						showCancel: false
-					})
-				})
-			},
-			navigateBack() {
-				uni.navigateBack()
-			},
-			toLogin() {
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
-				})
-			},
-			registerByEmail() {
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/register/register-by-email'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-	
-	@media screen and (max-width: 690px) {
-		.uni-content{
-			margin-top: 15px;
-			height: 100%;
-			background-color: #fff;
-		}
-	}
-	@media screen and (min-width: 690px) {
-		.uni-content{
-			padding: 30px 40px 60px;
-		}
-		
-		.link-box {
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex-direction: row;
-			justify-content: space-between;
-			margin-top: 10px;
-		}
-		
-		.link {
-			font-size: 12px;
-		}
-	}
-	
-	.uni-content ::v-deep .uni-forms-item__label {
-		position: absolute;
-		left: -15px;
-	}
-
-	button {
-		margin-top: 15px;
-	}
-</style>
+<!-- 创建超级管理员 -->
+<template>
+	<view class="uni-content">
+		<match-media :min-width="690">
+			<view class="login-logo">
+				<image :src="logo"></image>
+			</view>
+			<!-- 顶部文字 -->
+			<text class="title title-box">创建超级管理员</text>
+		</match-media>
+		<uni-forms ref="form" :value="formData" :rules="rules" validate-trigger="submit" err-show-type="toast">
+			<uni-forms-item name="username" required>
+				<uni-easyinput :inputBorder="false" :focus="focusUsername" @blur="focusUsername = false"
+					class="input-box" placeholder="请输入用户名" v-model="formData.username" trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="nickname">
+				<uni-easyinput :inputBorder="false" :focus="focusNickname" @blur="focusNickname = false" class="input-box" placeholder="请输入用户昵称" v-model="formData.nickname"
+					trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="password" v-model="formData.password" required>
+				<uni-easyinput :inputBorder="false" :focus="focusPassword" @blur="focusPassword = false"
+					class="input-box" maxlength="20" :placeholder="'请输入' + (config.passwordStrength == 'weak'?'6':'8') + '-16位密码'" type="password"
+					v-model="formData.password" trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="password2" v-model="formData.password2" required>
+				<uni-easyinput :inputBorder="false" :focus="focusPassword2" @blur="focusPassword2 =false"
+					class="input-box" placeholder="再次输入密码" maxlength="20" type="password" v-model="formData.password2"
+					trim="both" />
+			</uni-forms-item>
+			<uni-forms-item>
+				<uni-captcha ref="captcha" scene="register" v-model="formData.captcha" />
+			</uni-forms-item>
+			<uni-id-pages-agreements scope="register" ref="agreements" ></uni-id-pages-agreements>
+			<button class="uni-btn" type="primary" @click="submit">注册</button>
+			<button @click="navigateBack" class="register-back">返回</button>
+			<match-media :min-width="690">
+				<view class="link-box">
+					<text class="link" @click="toLogin">已有账号？点此登录</text>
+				</view>
+			</match-media>
+		</uni-forms>
+	</view>
+</template>
+
+<script>
+	import rules from './validator.js';
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	import config from '@/uni_modules/uni-id-pages/config.js'
+	const uniIdCo = uniCloud.importObject("uni-id-co", {customUI: true})
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				formData: {
+					username: "",
+					nickname: "",
+					password: "",
+					password2: "",
+					captcha: ""
+				},
+				rules,
+				focusUsername:false,
+				focusNickname:false,
+				focusPassword:false,
+				focusPassword2:false,
+				logo: "/static/logo.png"
+			}
+		},
+		onReady() {
+			this.$refs.form.setRules(this.rules)
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			/**
+			 * 触发表单提交
+			 */
+			submit() {
+				this.$refs.form.validate().then((res) => {
+					if(this.formData.captcha.length != 4){
+						this.$refs.captcha.focusCaptchaInput = true
+						return uni.showToast({
+							title: '请输入验证码',
+							icon: 'none'
+						});
+					}
+					if (this.needAgreements && !this.agree) {
+						return this.$refs.agreements.popup(()=>{
+							this.submitForm(res)
+						})
+					}
+					this.submitForm(res)
+				}).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.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({
+						title: '提示',
+						content: e.errMsg || `创建失败: ${e.errCode}`,
+						showCancel: false
+					})
+				})
+			},
+			navigateBack() {
+				uni.navigateBack()
+			},
+			toLogin() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+				})
+			},
+			registerByEmail() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/register/register-by-email'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+	
+	@media screen and (max-width: 690px) {
+		.uni-content{
+			margin-top: 15px;
+			height: 100%;
+			background-color: #fff;
+		}
+	}
+	@media screen and (min-width: 690px) {
+		.uni-content{
+			padding: 30px 40px 60px;
+		}
+		
+		.link-box {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			/* #endif */
+			flex-direction: row;
+			justify-content: space-between;
+			margin-top: 10px;
+		}
+		
+		.link {
+			font-size: 12px;
+		}
+	}
+	
+	.uni-content ::v-deep .uni-forms-item__label {
+		position: absolute;
+		left: -15px;
+	}
+
+	button {
+		margin-top: 15px;
+	}
+</style>

uni_modules/uni-id-pages/pages/register/register-by-email.vue

-<!-- 邮箱验证码注册 -->
-<template>
-	<view class="uni-content">
-		<match-media :min-width="690">
-			<view class="login-logo">
-				<image :src="logo"></image>
-			</view>
-			<!-- 顶部文字 -->
-			<text class="title title-box">邮箱验证码注册</text>
-		</match-media>
-		<uni-forms ref="form" :value="formData" :rules="rules" validate-trigger="submit" err-show-type="toast">
-			<uni-forms-item name="email" required>
-				<uni-easyinput :inputBorder="false" :focus="focusEmail" @blur="focusEmail = false"
-					class="input-box" placeholder="请输入邮箱" v-model="formData.email" trim="both" />
-			</uni-forms-item>
-			<uni-forms-item name="nickname">
-				<uni-easyinput :inputBorder="false" :focus="focusNickname" @blur="focusNickname = false" class="input-box" placeholder="请输入用户昵称" 
-				v-model="formData.nickname" trim="both" />
-			</uni-forms-item>
-			<uni-forms-item name="password" v-model="formData.password" required>
-				<uni-easyinput :inputBorder="false" :focus="focusPassword" @blur="focusPassword = false"
-					class="input-box" maxlength="20" :placeholder="'请输入' + (config.passwordStrength == 'weak'?'6':'8') + '-16位密码'" type="password"
-					v-model="formData.password" trim="both" />
-			</uni-forms-item>
-			<uni-forms-item name="password2" v-model="formData.password2" required>
-				<uni-easyinput :inputBorder="false" :focus="focusPassword2" @blur="focusPassword2 =false"
-					class="input-box" placeholder="再次输入密码" maxlength="20" type="password" v-model="formData.password2"
-					trim="both" />
-			</uni-forms-item>
-			<uni-forms-item name="code" >
-				<uni-id-pages-email-form ref="shortCode" :email="formData.email" type="register" v-model="formData.code">
-				</uni-id-pages-email-form>
-			</uni-forms-item>
-			<uni-id-pages-agreements scope="register" ref="agreements" ></uni-id-pages-agreements>
-			<button class="uni-btn" type="primary" @click="submit">注册</button>
-			<button @click="navigateBack" class="register-back">返回</button>
-			<match-media :min-width="690">
-				<view class="link-box">
-					<text class="link" @click="registerByUserName">用户名密码注册</text>
-					<text class="link" @click="toLogin">已有账号？点此登录</text>
-				</view>
-			</match-media>
-		</uni-forms>
-	</view>
-</template>
-
-<script>
-	import rules from './validator.js';
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	import config from '@/uni_modules/uni-id-pages/config.js'
-	import passwordMod from '@/uni_modules/uni-id-pages/common/password.js'
-	const uniIdCo = uniCloud.importObject("uni-id-co")
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				formData: {
-					email: "",
-					nickname: "",
-					password: "",
-					password2: "",
-					code: ""
-				},
-				rules: {
-					email: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入邮箱',
-							},{
-								format:'email',
-								errorMessage: '邮箱格式不正确',
-							}
-						]
-					},
-					nickname: {
-						rules: [{
-								minLength: 3,
-								maxLength: 32,
-								errorMessage: '昵称长度在 {minLength} 到 {maxLength} 个字符',
-							},
-							{
-								validateFunction: function(rule, value, data, callback) {
-									// console.log(value);
-									if (/^1\d{10}$/.test(value) || /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/.test(value)) {
-										callback('昵称不能是：手机号或邮箱')
-									};
-									if (/^\d+$/.test(value)) {
-										callback('昵称不能为纯数字')
-									};
-									if(/[\u4E00-\u9FA5\uF900-\uFA2D]{1,}/.test(value)){
-										callback('昵称不能包含中文')
-									}
-									return true
-								}
-							}
-						],
-						label: "昵称"
-					},
-					...passwordMod.getPwdRules(),
-					code: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入邮箱验证码',
-							},
-							{
-								pattern: /^.{6}$/,
-								errorMessage: '邮箱验证码不正确',
-							}
-						]
-					}
-				},
-				focusEmail:false,
-				focusNickname:false,
-				focusPassword:false,
-				focusPassword2:false,
-				logo: "/static/logo.png"
-			}
-		},
-		onReady() {
-			this.$refs.form.setRules(this.rules)
-		},
-		onShow() {
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.submit()
-				}
-			};
-			// #endif
-		},
-		methods: {
-			/**
-			 * 触发表单提交
-			 */
-			submit() {
-				this.$refs.form.validate().then((res) => {
-					if (this.needAgreements && !this.agree) {
-						return this.$refs.agreements.popup(()=>{
-							this.submitForm(res)
-						})
-					}
-					this.submitForm(res)
-				}).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.registerUserByEmail(this.formData).then(e => {
-					console.log(e);
-					uni.navigateTo({
-						url: '/uni_modules/uni-id-pages/pages/login/login-withpwd',
-						complete: (e) => {
-							console.log(e);
-						}
-					})
-				})
-				.catch(e => {
-					console.log(e);
-					console.log(e.message);
-				})
-			},
-			navigateBack() {
-				uni.navigateBack()
-			},
-			toLogin() {
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
-				})
-			},
-			registerByUserName() {
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/register/register'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-	
-	@media screen and (max-width: 690px) {
-		.uni-content{
-			margin-top: 15px;
-		}
-	}
-	@media screen and (min-width: 690px) {
-		.uni-content{
-			padding: 30px 40px;
-			max-height: 650px;
-		}
-		.link-box {
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex-direction: row;
-			justify-content: space-between;
-			margin-top: 10px;
-		}
-		.link {
-			font-size: 12px;
-		}
-	}
-	.uni-content ::v-deep .uni-forms-item__label {
-		position: absolute;
-		left: -15px;
-	}
-
-	button {
-		margin-top: 15px;
-	}
-</style>
+<!-- 邮箱验证码注册 -->
+<template>
+	<view class="uni-content">
+		<match-media :min-width="690">
+			<view class="login-logo">
+				<image :src="logo"></image>
+			</view>
+			<!-- 顶部文字 -->
+			<text class="title title-box">邮箱验证码注册</text>
+		</match-media>
+		<uni-forms ref="form" :value="formData" :rules="rules" validate-trigger="submit" err-show-type="toast">
+			<uni-forms-item name="email" required>
+				<uni-easyinput :inputBorder="false" :focus="focusEmail" @blur="focusEmail = false"
+					class="input-box" placeholder="请输入邮箱" v-model="formData.email" trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="nickname">
+				<uni-easyinput :inputBorder="false" :focus="focusNickname" @blur="focusNickname = false" class="input-box" placeholder="请输入用户昵称" 
+				v-model="formData.nickname" trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="password" v-model="formData.password" required>
+				<uni-easyinput :inputBorder="false" :focus="focusPassword" @blur="focusPassword = false"
+					class="input-box" maxlength="20" :placeholder="'请输入' + (config.passwordStrength == 'weak'?'6':'8') + '-16位密码'" type="password"
+					v-model="formData.password" trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="password2" v-model="formData.password2" required>
+				<uni-easyinput :inputBorder="false" :focus="focusPassword2" @blur="focusPassword2 =false"
+					class="input-box" placeholder="再次输入密码" maxlength="20" type="password" v-model="formData.password2"
+					trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="code" >
+				<uni-id-pages-email-form ref="shortCode" :email="formData.email" type="register" v-model="formData.code">
+				</uni-id-pages-email-form>
+			</uni-forms-item>
+			<uni-id-pages-agreements scope="register" ref="agreements" ></uni-id-pages-agreements>
+			<button class="uni-btn" type="primary" @click="submit">注册</button>
+			<button @click="navigateBack" class="register-back">返回</button>
+			<match-media :min-width="690">
+				<view class="link-box">
+					<text class="link" @click="registerByUserName">用户名密码注册</text>
+					<text class="link" @click="toLogin">已有账号？点此登录</text>
+				</view>
+			</match-media>
+		</uni-forms>
+	</view>
+</template>
+
+<script>
+	import rules from './validator.js';
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	import config from '@/uni_modules/uni-id-pages/config.js'
+	import passwordMod from '@/uni_modules/uni-id-pages/common/password.js'
+	const uniIdCo = uniCloud.importObject("uni-id-co")
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				formData: {
+					email: "",
+					nickname: "",
+					password: "",
+					password2: "",
+					code: ""
+				},
+				rules: {
+					email: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入邮箱',
+							},{
+								format:'email',
+								errorMessage: '邮箱格式不正确',
+							}
+						]
+					},
+					nickname: {
+						rules: [{
+								minLength: 3,
+								maxLength: 32,
+								errorMessage: '昵称长度在 {minLength} 到 {maxLength} 个字符',
+							},
+							{
+								validateFunction: function(rule, value, data, callback) {
+									// console.log(value);
+									if (/^1\d{10}$/.test(value) || /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/.test(value)) {
+										callback('昵称不能是：手机号或邮箱')
+									};
+									if (/^\d+$/.test(value)) {
+										callback('昵称不能为纯数字')
+									};
+									if(/[\u4E00-\u9FA5\uF900-\uFA2D]{1,}/.test(value)){
+										callback('昵称不能包含中文')
+									}
+									return true
+								}
+							}
+						],
+						label: "昵称"
+					},
+					...passwordMod.getPwdRules(),
+					code: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入邮箱验证码',
+							},
+							{
+								pattern: /^.{6}$/,
+								errorMessage: '邮箱验证码不正确',
+							}
+						]
+					}
+				},
+				focusEmail:false,
+				focusNickname:false,
+				focusPassword:false,
+				focusPassword2:false,
+				logo: "/static/logo.png"
+			}
+		},
+		onReady() {
+			this.$refs.form.setRules(this.rules)
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			/**
+			 * 触发表单提交
+			 */
+			submit() {
+				this.$refs.form.validate().then((res) => {
+					if (this.needAgreements && !this.agree) {
+						return this.$refs.agreements.popup(()=>{
+							this.submitForm(res)
+						})
+					}
+					this.submitForm(res)
+				}).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.registerUserByEmail(this.formData).then(e => {
+					console.log(e);
+					uni.navigateTo({
+						url: '/uni_modules/uni-id-pages/pages/login/login-withpwd',
+						complete: (e) => {
+							console.log(e);
+						}
+					})
+				})
+				.catch(e => {
+					console.log(e);
+					console.log(e.message);
+				})
+			},
+			navigateBack() {
+				uni.navigateBack()
+			},
+			toLogin() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+				})
+			},
+			registerByUserName() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/register/register'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+	
+	@media screen and (max-width: 690px) {
+		.uni-content{
+			margin-top: 15px;
+		}
+	}
+	@media screen and (min-width: 690px) {
+		.uni-content{
+			padding: 30px 40px;
+			max-height: 650px;
+		}
+		.link-box {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			/* #endif */
+			flex-direction: row;
+			justify-content: space-between;
+			margin-top: 10px;
+		}
+		.link {
+			font-size: 12px;
+		}
+	}
+	.uni-content ::v-deep .uni-forms-item__label {
+		position: absolute;
+		left: -15px;
+	}
+
+	button {
+		margin-top: 15px;
+	}
+</style>

uni_modules/uni-id-pages/pages/register/register.vue

@@ -53,9 +53,6 @@
 		mutations
 	} from '@/uni_modules/uni-id-pages/common/store.js'
 
-	const {
-		loginSuccess
-	} = mutations
 	const uniIdCo = uniCloud.importObject("uni-id-co")
 	export default {
 		mixins: [mixin],
@@ -118,7 +115,7 @@
 			submitForm(params) {
 				uniIdCo.registerUser(this.formData).then(e => {
 						console.log(e);
-						loginSuccess()
+						this.loginSuccess(e)
 					})
 					.catch(e => {
 						console.log(e);

uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue

-<!-- 找回密码页 -->
-<template>
-	<view class="uni-content">
-		<match-media :min-width="690">
-			<view class="login-logo">
-				<image :src="logo"></image>
-			</view>
-			<!-- 顶部文字 -->
-			<text class="title title-box">通过邮箱验证码找回密码</text>
-		</match-media>
-		<uni-forms ref="form" :value="formData" err-show-type="toast">
-			<uni-forms-item name="email">
-				<uni-easyinput :focus="focusEmail" @blur="focusEmail = false" class="input-box" :disabled="lock" :inputBorder="false"
-					v-model="formData.email" placeholder="请输入邮箱">
-				</uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="code">
-				<uni-id-pages-email-form ref="shortCode" :email="formData.email" type="reset-pwd-by-email" v-model="formData.code">
-				</uni-id-pages-email-form>
-			</uni-forms-item>
-			<uni-forms-item name="password">
-				<uni-easyinput :focus="focusPassword" @blur="focusPassword = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password"
-					placeholder="请输入新密码"></uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="password2">
-				<uni-easyinput :focus="focusPassword2" @blur="focusPassword2 = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password2"
-					placeholder="请再次输入新密码"></uni-easyinput>
-			</uni-forms-item>
-			<button class="uni-btn send-btn-box" type="primary" @click="submit">提交</button>
-			<match-media :min-width="690">
-				<view class="link-box">
-					<text class="link" @click="retrieveByPhone">通过手机验证码找回密码</text>
-					<view></view>
-          <text class="link" @click="backLogin">返回登录</text>
-        </view>
-			</match-media>
-		</uni-forms>
-		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="reset-pwd-by-sms" ref="popup"></uni-popup-captcha>
-	</view>
-</template>
-
-<script>
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	import passwordMod from '@/uni_modules/uni-id-pages/common/password.js'
-	const uniIdCo = uniCloud.importObject("uni-id-co",{
-		errorOptions:{
-			type:'toast'
-		}
-	})
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				lock: false,
-				focusEmail:true,
-				focusPassword:false,
-				focusPassword2:false,
-				formData: {
-					"email": "",
-					"code": "",
-					'password': '',
-					'password2': '',
-					"captcha": ""
-				},
-				rules: {
-					email: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入邮箱',
-							},
-							{
-								format:'email',
-								errorMessage: '邮箱格式不正确',
-							}
-						]
-					},
-					code: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入邮箱验证码',
-							},
-							{
-								pattern: /^.{6}$/,
-								errorMessage: '请输入6位验证码',
-							}
-						]
-					},
-					...passwordMod.getPwdRules()
-				},
-				logo: "/static/logo.png"
-			}
-		},
-		computed: {
-			isEmail() {
-				let reg_email = /@/;
-				let isEmail = reg_email.test(this.formData.email);
-				return isEmail;
-			},
-			isPwd() {
-				let reg_pwd = /^.{6,20}$/;
-				let isPwd = reg_pwd.test(this.formData.password);
-				return isPwd;
-			},
-			isCode() {
-				let reg_code = /^\d{6}$/;
-				let isCode = reg_code.test(this.formData.code);
-				return isCode;
-			}
-		},
-		onLoad(event) {
-			if (event && event.emailNumber) {
-				this.formData.email = event.emailNumber;
-				if(event.lock){
-					this.lock = event.lock //如果是已经登录的账号，点击找回密码就锁定指定的账号绑定的邮箱码
-					this.focusEmail = true
-				}
-			}
-		},
-		onReady() {
-			if (this.formData.email) {
-				this.$refs.shortCode.start();
-			}
-			this.$refs.form.setRules(this.rules)
-		},
-		onShow() {
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.submit()
-				}
-			};
-			// #endif
-		},
-		methods: {
-			/**
-			 * 完成并提交
-			 */
-			submit() {
-				console.log("formData", this.formData);
-				console.log('rules', this.rules);
-				this.$refs.form.validate()
-					.then(res => {
-						let {
-							email,
-							password: password,
-							captcha,
-							code
-						} = this.formData
-						uniIdCo.resetPwdByEmail({
-								email,
-								code,
-								password,
-								captcha
-							}).then(e => {
-								console.log(e);
-								uni.navigateTo({
-									url: '/uni_modules/uni-id-pages/pages/login/login-withpwd',
-									complete: (e) => {
-										console.log(e);
-									}
-								})
-							})
-							.catch(e => {
-								if (e.errCode == 'uni-id-captcha-required') {
-									this.$refs.popup.open()
-								}
-							}).finally(e => {
-								this.formData.captcha = ""
-							})
-					}).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
-					})
-			},
-			retrieveByPhone() {
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve'
-				})
-			},
-      backLogin () {
-        uni.redirectTo({
-          url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
-        })
-      }
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
-	@media screen and (max-width: 690px) {
-		.uni-content{
-			margin-top: 15px;
-		}
-	}
-	@media screen and (min-width: 690px) {
-		.uni-content{
-			padding: 30px 40px 40px;
-			max-height: 650px;
-		}
-
-		.link-box {
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex-direction: row;
-			justify-content: space-between;
-			margin-top: 10px;
-		}
-
-		.link {
-			font-size: 12px;
-		}
-	}
-</style>
+<!-- 找回密码页 -->
+<template>
+	<view class="uni-content">
+		<match-media :min-width="690">
+			<view class="login-logo">
+				<image :src="logo"></image>
+			</view>
+			<!-- 顶部文字 -->
+			<text class="title title-box">通过邮箱验证码找回密码</text>
+		</match-media>
+		<uni-forms ref="form" :value="formData" err-show-type="toast">
+			<uni-forms-item name="email">
+				<uni-easyinput :focus="focusEmail" @blur="focusEmail = false" class="input-box" :disabled="lock" :inputBorder="false"
+					v-model="formData.email" placeholder="请输入邮箱">
+				</uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="code">
+				<uni-id-pages-email-form ref="shortCode" :email="formData.email" type="reset-pwd-by-email" v-model="formData.code">
+				</uni-id-pages-email-form>
+			</uni-forms-item>
+			<uni-forms-item name="password">
+				<uni-easyinput :focus="focusPassword" @blur="focusPassword = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password"
+					placeholder="请输入新密码"></uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="password2">
+				<uni-easyinput :focus="focusPassword2" @blur="focusPassword2 = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password2"
+					placeholder="请再次输入新密码"></uni-easyinput>
+			</uni-forms-item>
+			<button class="uni-btn send-btn-box" type="primary" @click="submit">提交</button>
+			<match-media :min-width="690">
+				<view class="link-box">
+					<text class="link" @click="retrieveByPhone">通过手机验证码找回密码</text>
+					<view></view>
+          <text class="link" @click="backLogin">返回登录</text>
+        </view>
+			</match-media>
+		</uni-forms>
+		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="reset-pwd-by-sms" ref="popup"></uni-popup-captcha>
+	</view>
+</template>
+
+<script>
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	import passwordMod from '@/uni_modules/uni-id-pages/common/password.js'
+	const uniIdCo = uniCloud.importObject("uni-id-co",{
+		errorOptions:{
+			type:'toast'
+		}
+	})
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				lock: false,
+				focusEmail:true,
+				focusPassword:false,
+				focusPassword2:false,
+				formData: {
+					"email": "",
+					"code": "",
+					'password': '',
+					'password2': '',
+					"captcha": ""
+				},
+				rules: {
+					email: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入邮箱',
+							},
+							{
+								format:'email',
+								errorMessage: '邮箱格式不正确',
+							}
+						]
+					},
+					code: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入邮箱验证码',
+							},
+							{
+								pattern: /^.{6}$/,
+								errorMessage: '请输入6位验证码',
+							}
+						]
+					},
+					...passwordMod.getPwdRules()
+				},
+				logo: "/static/logo.png"
+			}
+		},
+		computed: {
+			isEmail() {
+				let reg_email = /@/;
+				let isEmail = reg_email.test(this.formData.email);
+				return isEmail;
+			},
+			isPwd() {
+				let reg_pwd = /^.{6,20}$/;
+				let isPwd = reg_pwd.test(this.formData.password);
+				return isPwd;
+			},
+			isCode() {
+				let reg_code = /^\d{6}$/;
+				let isCode = reg_code.test(this.formData.code);
+				return isCode;
+			}
+		},
+		onLoad(event) {
+			if (event && event.emailNumber) {
+				this.formData.email = event.emailNumber;
+				if(event.lock){
+					this.lock = event.lock //如果是已经登录的账号，点击找回密码就锁定指定的账号绑定的邮箱码
+					this.focusEmail = true
+				}
+			}
+		},
+		onReady() {
+			if (this.formData.email) {
+				this.$refs.shortCode.start();
+			}
+			this.$refs.form.setRules(this.rules)
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			/**
+			 * 完成并提交
+			 */
+			submit() {
+				console.log("formData", this.formData);
+				console.log('rules', this.rules);
+				this.$refs.form.validate()
+					.then(res => {
+						let {
+							email,
+							password: password,
+							captcha,
+							code
+						} = this.formData
+						uniIdCo.resetPwdByEmail({
+								email,
+								code,
+								password,
+								captcha
+							}).then(e => {
+								console.log(e);
+								uni.navigateTo({
+									url: '/uni_modules/uni-id-pages/pages/login/login-withpwd',
+									complete: (e) => {
+										console.log(e);
+									}
+								})
+							})
+							.catch(e => {
+								if (e.errCode == 'uni-id-captcha-required') {
+									this.$refs.popup.open()
+								}
+							}).finally(e => {
+								this.formData.captcha = ""
+							})
+					}).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
+					})
+			},
+			retrieveByPhone() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve'
+				})
+			},
+      backLogin () {
+        uni.redirectTo({
+          url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+        })
+      }
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	@media screen and (max-width: 690px) {
+		.uni-content{
+			margin-top: 15px;
+		}
+	}
+	@media screen and (min-width: 690px) {
+		.uni-content{
+			padding: 30px 40px 40px;
+			max-height: 650px;
+		}
+
+		.link-box {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			/* #endif */
+			flex-direction: row;
+			justify-content: space-between;
+			margin-top: 10px;
+		}
+
+		.link {
+			font-size: 12px;
+		}
+	}
+</style>

uni_modules/uni-id-pages/pages/retrieve/retrieve.vue

-<!-- 找回密码页 -->
-<template>
-	<view class="uni-content">
-		<match-media :min-width="690">
-		<view class="login-logo">
-			<image :src="logo"></image>
-		</view>
-		<!-- 顶部文字 -->
-		<text class="title title-box">通过手机验证码找回密码</text>
-		</match-media>
-		<uni-forms ref="form" :value="formData" err-show-type="toast">
-			<uni-forms-item name="phone">
-				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" :disabled="lock" type="number" :inputBorder="false"
-					v-model="formData.phone" maxlength="11" placeholder="请输入手机号">
-				</uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="code">
-				<uni-id-pages-sms-form ref="shortCode" :phone="formData.phone" type="reset-pwd-by-sms" v-model="formData.code">
-				</uni-id-pages-sms-form>
-			</uni-forms-item>
-			<uni-forms-item name="password">
-				<uni-easyinput :focus="focusPassword" @blur="focusPassword = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password"
-					placeholder="请输入新密码"></uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="password2">
-				<uni-easyinput :focus="focusPassword2" @blur="focusPassword2 = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password2"
-					placeholder="请再次输入新密码"></uni-easyinput>
-			</uni-forms-item>
-			<button class="uni-btn send-btn-box" type="primary" @click="submit">提交</button>
-			<match-media :min-width="690">
-				<view class="link-box">
-					<text class="link" @click="retrieveByEmail">通过邮箱验证码找回密码</text>
-					<view></view>
-          <text class="link" @click="backLogin">返回登录</text>
-        </view>
-			</match-media>
-		</uni-forms>
-		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="reset-pwd-by-sms" ref="popup"></uni-popup-captcha>
-	</view>
-</template>
-
-<script>
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	const uniIdCo = uniCloud.importObject("uni-id-co",{
-		errorOptions:{
-			type:'toast'
-		}
-	})
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				lock: false,
-				focusPhone:true,
-				focusPassword:false,
-				focusPassword2:false,
-				formData: {
-					"phone": "",
-					"code": "",
-					'password': '',
-					'password2': '',
-					"captcha": ""
-				},
-				rules: {
-					phone: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入手机号',
-							},
-							{
-								pattern: /^1\d{10}$/,
-								errorMessage: '手机号码格式不正确',
-							}
-						]
-					},
-					code: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入短信验证码',
-							},
-							{
-								pattern: /^.{6}$/,
-								errorMessage: '请输入6位验证码',
-							}
-						]
-					},
-					password: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入新密码',
-							},
-							{
-								pattern: /^.{6,20}$/,
-								errorMessage: '密码为6 - 20位',
-							}
-						]
-					},
-					password2: {
-						rules: [{
-								required: true,
-								errorMessage: '请确认密码',
-							},
-							{
-								pattern: /^.{6,20}$/,
-								errorMessage: '密码为6 - 20位',
-							},
-							{
-								validateFunction: function(rule, value, data, callback) {
-									// console.log(value);
-									if (value != data.password) {
-										callback('两次输入密码不一致')
-									};
-									return true
-								}
-							}
-						]
-					}
-				},
-				logo: "/static/logo.png"
-			}
-		},
-		computed: {
-			isPhone() {
-				let reg_phone = /^1\d{10}$/;
-				let isPhone = reg_phone.test(this.formData.phone);
-				return isPhone;
-			},
-			isPwd() {
-				let reg_pwd = /^.{6,20}$/;
-				let isPwd = reg_pwd.test(this.formData.password);
-				return isPwd;
-			},
-			isCode() {
-				let reg_code = /^\d{6}$/;
-				let isCode = reg_code.test(this.formData.code);
-				return isCode;
-			}
-		},
-		onLoad(event) {
-			if (event && event.phoneNumber) {
-				this.formData.phone = event.phoneNumber;
-				if(event.lock){
-					this.lock = event.lock //如果是已经登录的账号，点击找回密码就锁定指定的账号绑定的手机号码
-					this.focusPhone = true
-				}
-			}
-		},
-		onReady() {
-			if (this.formData.phone) {
-				this.$refs.shortCode.start();
-			}
-			this.$refs.form.setRules(this.rules)
-		},
-		onShow() {
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.submit()
-				}
-			};
-			// #endif
-		},
-		methods: {
-			/**
-			 * 完成并提交
-			 */
-			submit() {
-				console.log("formData", this.formData);
-				console.log('rules', this.rules);
-				this.$refs.form.validate()
-					.then(res => {
-						let {
-							"phone": mobile,
-							"password": password,
-							captcha,
-							code
-						} = this.formData
-						uniIdCo.resetPwdBySms({
-								mobile,
-								code,
-								password,
-								captcha
-							}).then(e => {
-								console.log(e);
-								uni.navigateBack()
-							})
-							.catch(e => {
-								if (e.errCode == 'uni-id-captcha-required') {
-									this.$refs.popup.open()
-								}
-							}).finally(e => {
-								this.formData.captcha = ""
-							})
-					}).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
-					})
-			},
-			retrieveByEmail() {
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email'
-				})
-			},
-      backLogin () {
-        uni.redirectTo({
-          url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
-        })
-      }
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
-	@media screen and (max-width: 690px) {
-		.uni-content{
-			margin-top: 15px;
-		}
-	}
-	@media screen and (min-width: 690px) {
-		.uni-content{
-			padding: 30px 40px 40px;
-			max-height: 650px;
-		}
-		.link-box {
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex-direction: row;
-			justify-content: space-between;
-			margin-top: 10px;
-		}
-
-		.link {
-			font-size: 12px;
-		}
-	}
-</style>
+<!-- 找回密码页 -->
+<template>
+	<view class="uni-content">
+		<match-media :min-width="690">
+		<view class="login-logo">
+			<image :src="logo"></image>
+		</view>
+		<!-- 顶部文字 -->
+		<text class="title title-box">通过手机验证码找回密码</text>
+		</match-media>
+		<uni-forms ref="form" :value="formData" err-show-type="toast">
+			<uni-forms-item name="phone">
+				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" :disabled="lock" type="number" :inputBorder="false"
+					v-model="formData.phone" maxlength="11" placeholder="请输入手机号">
+				</uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="code">
+				<uni-id-pages-sms-form ref="shortCode" :phone="formData.phone" type="reset-pwd-by-sms" v-model="formData.code">
+				</uni-id-pages-sms-form>
+			</uni-forms-item>
+			<uni-forms-item name="password">
+				<uni-easyinput :focus="focusPassword" @blur="focusPassword = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password"
+					placeholder="请输入新密码"></uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="password2">
+				<uni-easyinput :focus="focusPassword2" @blur="focusPassword2 = false" class="input-box" type="password" :inputBorder="false" v-model="formData.password2"
+					placeholder="请再次输入新密码"></uni-easyinput>
+			</uni-forms-item>
+			<button class="uni-btn send-btn-box" type="primary" @click="submit">提交</button>
+			<match-media :min-width="690">
+				<view class="link-box">
+					<text class="link" @click="retrieveByEmail">通过邮箱验证码找回密码</text>
+					<view></view>
+          <text class="link" @click="backLogin">返回登录</text>
+        </view>
+			</match-media>
+		</uni-forms>
+		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="reset-pwd-by-sms" ref="popup"></uni-popup-captcha>
+	</view>
+</template>
+
+<script>
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	const uniIdCo = uniCloud.importObject("uni-id-co",{
+		errorOptions:{
+			type:'toast'
+		}
+	})
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				lock: false,
+				focusPhone:true,
+				focusPassword:false,
+				focusPassword2:false,
+				formData: {
+					"phone": "",
+					"code": "",
+					'password': '',
+					'password2': '',
+					"captcha": ""
+				},
+				rules: {
+					phone: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入手机号',
+							},
+							{
+								pattern: /^1\d{10}$/,
+								errorMessage: '手机号码格式不正确',
+							}
+						]
+					},
+					code: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入短信验证码',
+							},
+							{
+								pattern: /^.{6}$/,
+								errorMessage: '请输入6位验证码',
+							}
+						]
+					},
+					password: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入新密码',
+							},
+							{
+								pattern: /^.{6,20}$/,
+								errorMessage: '密码为6 - 20位',
+							}
+						]
+					},
+					password2: {
+						rules: [{
+								required: true,
+								errorMessage: '请确认密码',
+							},
+							{
+								pattern: /^.{6,20}$/,
+								errorMessage: '密码为6 - 20位',
+							},
+							{
+								validateFunction: function(rule, value, data, callback) {
+									// console.log(value);
+									if (value != data.password) {
+										callback('两次输入密码不一致')
+									};
+									return true
+								}
+							}
+						]
+					}
+				},
+				logo: "/static/logo.png"
+			}
+		},
+		computed: {
+			isPhone() {
+				let reg_phone = /^1\d{10}$/;
+				let isPhone = reg_phone.test(this.formData.phone);
+				return isPhone;
+			},
+			isPwd() {
+				let reg_pwd = /^.{6,20}$/;
+				let isPwd = reg_pwd.test(this.formData.password);
+				return isPwd;
+			},
+			isCode() {
+				let reg_code = /^\d{6}$/;
+				let isCode = reg_code.test(this.formData.code);
+				return isCode;
+			}
+		},
+		onLoad(event) {
+			if (event && event.phoneNumber) {
+				this.formData.phone = event.phoneNumber;
+				if(event.lock){
+					this.lock = event.lock //如果是已经登录的账号，点击找回密码就锁定指定的账号绑定的手机号码
+					this.focusPhone = true
+				}
+			}
+		},
+		onReady() {
+			if (this.formData.phone) {
+				this.$refs.shortCode.start();
+			}
+			this.$refs.form.setRules(this.rules)
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			/**
+			 * 完成并提交
+			 */
+			submit() {
+				console.log("formData", this.formData);
+				console.log('rules', this.rules);
+				this.$refs.form.validate()
+					.then(res => {
+						let {
+							"phone": mobile,
+							"password": password,
+							captcha,
+							code
+						} = this.formData
+						uniIdCo.resetPwdBySms({
+								mobile,
+								code,
+								password,
+								captcha
+							}).then(e => {
+								console.log(e);
+								uni.navigateBack()
+							})
+							.catch(e => {
+								if (e.errCode == 'uni-id-captcha-required') {
+									this.$refs.popup.open()
+								}
+							}).finally(e => {
+								this.formData.captcha = ""
+							})
+					}).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
+					})
+			},
+			retrieveByEmail() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email'
+				})
+			},
+      backLogin () {
+        uni.redirectTo({
+          url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+        })
+      }
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	@media screen and (max-width: 690px) {
+		.uni-content{
+			margin-top: 15px;
+		}
+	}
+	@media screen and (min-width: 690px) {
+		.uni-content{
+			padding: 30px 40px 40px;
+			max-height: 650px;
+		}
+		.link-box {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			/* #endif */
+			flex-direction: row;
+			justify-content: space-between;
+			margin-top: 10px;
+		}
+
+		.link {
+			font-size: 12px;
+		}
+	}
+</style>

uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue

-<!-- 绑定手机号码页 -->
-<template>
-	<view class="uni-content">
-		<match-media :min-width="690">
-			<view class="login-logo">
-				<image :src="logo"></image>
-			</view>
-			<!-- 顶部文字 -->
-			<text class="title title-box">绑定手机号</text>
-		</match-media>
-		<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
-		<uni-easyinput clearable :focus="focusMobile" @blur="focusMobile = false" type="number" class="input-box" :inputBorder="false" v-model="formData.mobile"
-			maxlength="11" placeholder="请输入手机号"></uni-easyinput>
-		<uni-id-pages-sms-form ref="smsForm" type="bind-mobile-by-sms" v-model="formData.code" :phone="formData.mobile">
-		</uni-id-pages-sms-form>
-		<button class="uni-btn send-btn-box" type="primary" @click="submit">提交</button>
-		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="bind-mobile-by-sms" ref="popup">
-		</uni-popup-captcha>
-	</view>
-</template>
-<script>
-	import {
-		store,
-		mutations
-	} from '@/uni_modules/uni-id-pages/common/store.js'
-	export default {
-		data() {
-			return {
-				formData: {
-					mobile: "",
-					code: "",
-					captcha: ""
-				},
-				focusMobile:true,
-				logo: "/static/logo.png"
-			}
-		},
-		computed: {
-			tipText() {
-				return `验证码已通过短信发送至 ${this.formData.mobile}。密码为6 - 20位`
-			}
-		},
-		onLoad(event) {},
-		onReady() {},
-
-		methods: {
-			/**
-			 * 完成并提交
-			 */
-			submit() {
-				if(! /^1\d{10}$/.test(this.formData.mobile)){
-					this.focusMobile = true 
-					return uni.showToast({
-						title: '手机号码格式不正确',
-						icon: 'none'
-					});
-				}
-				if(! /^\d{6}$/.test(this.formData.code)){
-					this.$refs.smsForm.focusSmsCodeInput = true 
-					return uni.showToast({
-						title: '验证码格式不正确',
-						icon: 'none'
-					});
-				}
-				
-				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'
-					});
-					// #ifdef APP-NVUE
-					const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
-					// #endif
-					// #ifndef APP-NVUE
-					const eventChannel = this.getOpenerEventChannel();
-					// #endif
-					mutations.setUserInfo(this.formData)
-					uni.navigateBack()
-				}).catch(e => {
-					console.log(e);
-					if (e.errCode == 'uni-id-captcha-required') {
-						this.$refs.popup.open()
-					}
-				}).finally(e => {
-					this.formData.captcha = ""
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
-	.uni-content {
-		padding: 0;
-		align-items: center;
-		justify-content: center;
-		padding: 50rpx;
-		padding-top: 10px;
-	}
-	
-	
-	@media screen and (min-width: 690px) {
-		.uni-content{
-			padding: 30px 40px 40px;
-		}
-	}
-
-	/* #ifndef APP-NVUE  || VUE3 */
-	.uni-content ::v-deep .uni-easyinput__content {}
-
-	/* #endif */
-	.input-box {
-		width: 100%;
-		margin-top: 16px;
-		background-color: #f9f9f9;
-		border-radius: 6rpx;
-		flex-direction: row;
-		flex-wrap: nowrap;
-		margin-bottom: 10px;
-	}
-
-	.send-btn-box {
-		margin-top: 15px;
-	}
-</style>
+<!-- 绑定手机号码页 -->
+<template>
+	<view class="uni-content">
+		<match-media :min-width="690">
+			<view class="login-logo">
+				<image :src="logo"></image>
+			</view>
+			<!-- 顶部文字 -->
+			<text class="title title-box">绑定手机号</text>
+		</match-media>
+		<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
+		<uni-easyinput clearable :focus="focusMobile" @blur="focusMobile = false" type="number" class="input-box" :inputBorder="false" v-model="formData.mobile"
+			maxlength="11" placeholder="请输入手机号"></uni-easyinput>
+		<uni-id-pages-sms-form ref="smsForm" type="bind-mobile-by-sms" v-model="formData.code" :phone="formData.mobile">
+		</uni-id-pages-sms-form>
+		<button class="uni-btn send-btn-box" type="primary" @click="submit">提交</button>
+		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="bind-mobile-by-sms" ref="popup">
+		</uni-popup-captcha>
+	</view>
+</template>
+<script>
+	import {
+		store,
+		mutations
+	} from '@/uni_modules/uni-id-pages/common/store.js'
+	export default {
+		data() {
+			return {
+				formData: {
+					mobile: "",
+					code: "",
+					captcha: ""
+				},
+				focusMobile:true,
+				logo: "/static/logo.png"
+			}
+		},
+		computed: {
+			tipText() {
+				return `验证码已通过短信发送至 ${this.formData.mobile}。密码为6 - 20位`
+			}
+		},
+		onLoad(event) {},
+		onReady() {},
+
+		methods: {
+			/**
+			 * 完成并提交
+			 */
+			submit() {
+				if(! /^1\d{10}$/.test(this.formData.mobile)){
+					this.focusMobile = true 
+					return uni.showToast({
+						title: '手机号码格式不正确',
+						icon: 'none'
+					});
+				}
+				if(! /^\d{6}$/.test(this.formData.code)){
+					this.$refs.smsForm.focusSmsCodeInput = true 
+					return uni.showToast({
+						title: '验证码格式不正确',
+						icon: 'none'
+					});
+				}
+				
+				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'
+					});
+					// #ifdef APP-NVUE
+					const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
+					// #endif
+					// #ifndef APP-NVUE
+					const eventChannel = this.getOpenerEventChannel();
+					// #endif
+					mutations.setUserInfo(this.formData)
+					uni.navigateBack()
+				}).catch(e => {
+					console.log(e);
+					if (e.errCode == 'uni-id-captcha-required') {
+						this.$refs.popup.open()
+					}
+				}).finally(e => {
+					this.formData.captcha = ""
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	.uni-content {
+		padding: 0;
+		align-items: center;
+		justify-content: center;
+		padding: 50rpx;
+		padding-top: 10px;
+	}
+	
+	
+	@media screen and (min-width: 690px) {
+		.uni-content{
+			padding: 30px 40px 40px;
+		}
+	}
+
+	/* #ifndef APP-NVUE  || VUE3 */
+	.uni-content ::v-deep .uni-easyinput__content {}
+
+	/* #endif */
+	.input-box {
+		width: 100%;
+		margin-top: 16px;
+		background-color: #f9f9f9;
+		border-radius: 6rpx;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		margin-bottom: 10px;
+	}
+
+	.send-btn-box {
+		margin-top: 15px;
+	}
+</style>

uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage.vue

-<!-- 图片裁剪页 -->
-<template>
-	<view class="content" >
-		<limeClipper :width="options.width" :scale-ratio="2" :is-lock-width="false" :is-lock-height="false" :height="options.height" :image-url="path"  
-			@success="successFn" @cancel="cancel"  />
-	</view>
-</template>
-<script>
-import limeClipper from './limeClipper/limeClipper.vue';
-export default {
-	components: {limeClipper},
-	data() {return {path: '',options:{"width":600,"height":600}}},
-	onLoad({path,options}) {
-		this.path = path
-		console.log('path-path-path-path',path);
-		if(options){
-			this.options = JSON.parse(options)
-		}
-	},
-	methods:{
-		successFn(e){
-			this.getOpenerEventChannel().emit('success',e.url)
-			uni.navigateBack()
-		},
-		cancel(){
-			uni.navigateBack()
-		}
-	}
-}
-</script>
-
-<style>
-	.box{
-		width: 400rpx;
-	}
-	.mt{
-		margin-top: -10px;
-	}
+<!-- 图片裁剪页 -->
+<template>
+	<view class="content" >
+		<limeClipper :width="options.width" :scale-ratio="2" :is-lock-width="false" :is-lock-height="false" :height="options.height" :image-url="path"  
+			@success="successFn" @cancel="cancel"  />
+	</view>
+</template>
+<script>
+import limeClipper from './limeClipper/limeClipper.vue';
+export default {
+	components: {limeClipper},
+	data() {return {path: '',options:{"width":600,"height":600}}},
+	onLoad({path,options}) {
+		this.path = path
+		console.log('path-path-path-path',path);
+		if(options){
+			this.options = JSON.parse(options)
+		}
+	},
+	methods:{
+		successFn(e){
+			this.getOpenerEventChannel().emit('success',e.url)
+			uni.navigateBack()
+		},
+		cancel(){
+			uni.navigateBack()
+		}
+	}
+}
+</script>
+
+<style>
+	.box{
+		width: 400rpx;
+	}
+	.mt{
+		margin-top: -10px;
+	}
 </style>
\ No newline at end of file

uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/README.md

-> 插件来源：[https://ext.dcloud.net.cn/plugin?id=3594](https://ext.dcloud.net.cn/plugin?id=3594)
-##### 以下是作者写的插件介绍：
-
-# Clipper 图片裁剪
-> uniapp 图片裁剪，可用于图片头像等裁剪处理
-> [查看更多](http://liangei.gitee.io/limeui/#/clipper) <br>
-> Q群：458377637
-
-
-## 平台兼容
-
-| H5  | 微信小程序 | 支付宝小程序 | 百度小程序 | 头条小程序 | QQ 小程序 | App |
-| --- | ---------- | ------------ | ---------- | ---------- | --------- | --- |
-| √   | √          | √         | 未测       | √          | √      | √   |
-
-
-## 代码演示
-### 基本用法
-`@success` 事件点击 👉 **确定** 后会返回生成的图片信息，包含 `url`、`width`、`height`
-
-```html
-<image :src="url" v-if="url" mode="widthFix"></image>
-<l-clipper v-if="show" @success="url = $event.url; show = false" @cancel="show = false"  ></l-clipper>
-<button @tap="show = true">裁剪</button>
-```
-
-```js
-// 非uni_modules引入
-import lClipper from '@/components/lime-clipper/'
-// uni_modules引入
-import lClipper from '@/uni_modules/lime-clipper/components/lime-clipper/'
-export default {
-	components: {lClipper},
-    data() {
-        return {
-            show: false,
-			url: '',
-        }
-    }
-}
-```
-
-
-### 传入图片
-`image-url`可传入**相对路径**、**临时路径**、**本地路径**、**网络图片**<br>
-
-* **当为网络地址时**
-* H5：👉 需要解决跨域问题。 <br>
-* 小程序：👉 需要配置 downloadFile 域名 <br>
-
-
-```html
-<image :src="url" v-if="url" mode="widthFix"></image>
-<l-clipper v-if="show" :image-url="imageUrl"  @success="url = $event.url; show = false" @cancel="show = false"  ></l-clipper>
-<button @tap="show = true">裁剪</button>
-```
-
-```js
-export default {
-	components: {lClipper},
-    data() {
-        return {
-			imageUrl: 'https://img12.360buyimg.com/pop/s1180x940_jfs/t1/97205/26/1142/87801/5dbac55aEf795d962/48a4d7a63ff80b8b.jpg',
-            show: false,
-			url: '',
-        }
-    }
-}
-```
-
-
-### 确定按钮颜色
-样式变量名：`--l-clipper-confirm-color`
-可放到全局样式的 `page` 里或节点的 `style`
-```html
-<l-clipper class="clipper" style="--l-clipper-confirm-color: linear-gradient(to right, #ff6034, #ee0a24)"  ></l-clipper>
-```
-```css
-// css 中为组件设置 CSS 变量
-.clipper {
-	--l-clipper-confirm-color: linear-gradient(to right, #ff6034, #ee0a24)
-}
-// 全局
-page {
-	--l-clipper-confirm-color: linear-gradient(to right, #ff6034, #ee0a24)
-}
-```
-
-
-### 使用插槽
-共五个插槽 `cancel` 取消按钮、 `photo` 选择图片按钮、 `rotate` 旋转按钮、 `confirm` 确定按钮和默认插槽。
-
-```html
-<image :src="url" v-if="url" mode="widthFix"></image>
-<l-clipper 
-	v-if="show" 
-	:isLockWidth="isLockWidth"
-	:isLockHeight="isLockHeight"
-	:isLockRatio="isLockRatio"
-	:isLimitMove="isLimitMove"
-	:isDisableScale="isDisableScale"
-	:isDisableRotate="isDisableRotate"
-	:isShowCancelBtn="isShowCancelBtn"
-	:isShowPhotoBtn="isShowPhotoBtn"
-	:isShowRotateBtn="isShowRotateBtn"
-	:isShowConfirmBtn="isShowConfirmBtn"
-	@success="url = $event.url; show = false" 
-	@cancel="show = false" >
-	<!-- 四个基本按钮插槽 -->
-	<view slot="cancel">取消</view>
-	<view slot="photo">选择图片</view>
-	<view slot="rotate">旋转</view>
-	<view slot="confirm">确定</view>
-	<!-- 默认插槽 -->
-	<view class="tools">
-		<view>显示取消按钮
-			<switch :checked="isShowCancelBtn" @change="isShowCancelBtn = $event.target.value" ></switch>
-		</view>
-		<view>显示选择图片按钮
-			<switch :checked="isShowPhotoBtn" @change="isShowPhotoBtn = $event.target.value" ></switch>
-		</view>
-		<view>显示旋转按钮
-			<switch :checked="isShowRotateBtn" @change="isShowRotateBtn = $event.target.value" ></switch>
-		</view>
-		<view>显示确定按钮
-			<switch :checked="isShowConfirmBtn" @change="isShowConfirmBtn = $event.target.value" ></switch>
-		</view>
-		<view>锁定裁剪框宽度
-			<switch :checked="isLockWidth" @change="isLockWidth = $event.target.value" ></switch>
-		</view>
-		<view>锁定裁剪框高度
-			<switch :checked="isLockHeight" @change="isLockHeight = $event.target.value" ></switch>
-		</view>
-		<view>锁定裁剪框比例
-			<switch :checked="isLockRatio" @change="isLockRatio = $event.target.value" ></switch>
-		</view>
-		<view>限制移动范围
-			<switch :checked="isLimitMove" @change="isLimitMove = $event.target.value" ></switch>
-		</view>
-		<view>禁止缩放
-			<switch :checked="isDisableScale" @change="isDisableScale = $event.target.value" ></switch>
-		</view>
-		<view>禁止旋转
-			<switch :checked="isDisableRotate" @change="isDisableRotate = $event.target.value" ></switch>
-		</view>
-	</view>
-</l-clipper>
-<button @tap="show = true">裁剪</button>
-```
-
-```js
-export default {
-	components: {lClipper},
-    data() {
-        return {
-            show: false,
-            url: '',
-            isLockWidth: false,
-            isLockHeight: false,
-            isLockRatio: true,
-            isLimitMove: false,
-            isDisableScale: false,
-            isDisableRotate: false,
-            isShowCancelBtn: true,
-            isShowPhotoBtn: true,
-            isShowRotateBtn: true,
-            isShowConfirmBtn: true
-        }
-    }
-}
-```
-
-
-## API
-
-### Props
-
-| 参数           | 说明         | 类型             | 默认值       |
-| ------------- | ------------ | ---------------- | ------------ |
-| image-url     | 图片路径     | <em>string</em>   |              |
-| quality       | 图片的质量，取值范围为 [0, 1]，不在范围内时当作1处理   | <em>number</em>  |    `1`      |
-| source       | `{album: '从相册中选择'}`key为图片来源类型，value为选项说明   | <em>Object</em>  |         |
-| width | 裁剪框宽度，单位为 `rpx` | <em>number</em> | `400`      |
-| height | 裁剪框高度 | <em>number</em> | `400`      |
-| min-width | 裁剪框最小宽度 | <em>number</em> | `200`      |
-| min-height |裁剪框最小高度 | <em>number</em> | `200`  |
-| max-width | 裁剪框最大宽度 | <em>number</em> | `600`  |
-| max-height | 裁剪框最大宽度 | <em>number</em> | `600`  |
-| min-ratio | 图片最小缩放比 | <em>number</em> | `0.5`  |
-| max-ratio | 图片最大缩放比 | <em>number</em> | `2`  |
-| rotate-angle | 旋转按钮每次旋转的角度 | <em>number</em> | `90`  |
-| scale-ratio | 生成图片相对于裁剪框的比例， **比例越高生成图片越清晰**	 | <em>number</em> | `1`  |
-| is-lock-width | 是否锁定裁剪框宽度 | <em>boolean</em> | `false`  |
-| is-lock-height | 是否锁定裁剪框高度上 | <em>boolean</em> | `false`  |
-| is-lock-ratio | 是否锁定裁剪框比例 | <em>boolean</em> | `true`  |
-| is-disable-scale | 是否禁止缩放 | <em>boolean</em> | `false`  |
-| is-disable-rotate | 是否禁止旋转 | <em>boolean</em> | `false`  |
-| is-limit-move | 是否限制移动范围 | <em>boolean</em> | `false`  |
-| is-show-photo-btn | 是否显示选择图片按钮 | <em>boolean</em> | `true`  |
-| is-show-rotate-btn | 是否显示转按钮 | <em>boolean</em> | `true`  |
-| is-show-confirm-btn | 是否显示确定按钮 | <em>boolean</em> | `true`  |
-| is-show-cancel-btn | 是否显示关闭按钮 | <em>boolean</em> | `true`  |
-
-
-
-### 事件 Events
-
-| 事件名  | 说明         | 回调           |
-| ------- | ------------ | -------------- |
-| success | 生成图片成功 | {`width`, `height`, `url`} |
-| fail | 生成图片失败 | `error` |
-| cancel | 关闭 | `false` |
-| ready   | 图片加载完成 | {`width`, `height`, `path`, `orientation`, `type`} |
-| change | 图片大小改变时触发 | {`width`, `height`} |
-| rotate | 图片旋转时触发 | `angle` |
-
-## 常见问题
-> 1、H5端使用网络图片需要解决跨域问题。<br>
-> 2、小程序使用网络图片需要去公众平台增加下载白名单！二级域名也需要配！<br>
-> 3、H5端生成图片是base64，有时显示只有一半可以使用原生标签`<IMG/>`<br>
-> 4、IOS APP 请勿使用HBX2.9.3.20201014的版本！这个版本无法生成图片。<br>
-> 5、APP端无成功反馈、也无失败反馈时，请更新基座和HBX。<br>
-
-
-## 打赏
-如果你觉得本插件，解决了你的问题，赠人玫瑰，手留余香。<br>
+> 插件来源：[https://ext.dcloud.net.cn/plugin?id=3594](https://ext.dcloud.net.cn/plugin?id=3594)
+##### 以下是作者写的插件介绍：
+
+# Clipper 图片裁剪
+> uniapp 图片裁剪，可用于图片头像等裁剪处理
+> [查看更多](http://liangei.gitee.io/limeui/#/clipper) <br>
+> Q群：458377637
+
+
+## 平台兼容
+
+| H5  | 微信小程序 | 支付宝小程序 | 百度小程序 | 头条小程序 | QQ 小程序 | App |
+| --- | ---------- | ------------ | ---------- | ---------- | --------- | --- |
+| √   | √          | √         | 未测       | √          | √      | √   |
+
+
+## 代码演示
+### 基本用法
+`@success` 事件点击 👉 **确定** 后会返回生成的图片信息，包含 `url`、`width`、`height`
+
+```html
+<image :src="url" v-if="url" mode="widthFix"></image>
+<l-clipper v-if="show" @success="url = $event.url; show = false" @cancel="show = false"  ></l-clipper>
+<button @tap="show = true">裁剪</button>
+```
+
+```js
+// 非uni_modules引入
+import lClipper from '@/components/lime-clipper/'
+// uni_modules引入
+import lClipper from '@/uni_modules/lime-clipper/components/lime-clipper/'
+export default {
+	components: {lClipper},
+    data() {
+        return {
+            show: false,
+			url: '',
+        }
+    }
+}
+```
+
+
+### 传入图片
+`image-url`可传入**相对路径**、**临时路径**、**本地路径**、**网络图片**<br>
+
+* **当为网络地址时**
+* H5：👉 需要解决跨域问题。 <br>
+* 小程序：👉 需要配置 downloadFile 域名 <br>
+
+
+```html
+<image :src="url" v-if="url" mode="widthFix"></image>
+<l-clipper v-if="show" :image-url="imageUrl"  @success="url = $event.url; show = false" @cancel="show = false"  ></l-clipper>
+<button @tap="show = true">裁剪</button>
+```
+
+```js
+export default {
+	components: {lClipper},
+    data() {
+        return {
+			imageUrl: 'https://img12.360buyimg.com/pop/s1180x940_jfs/t1/97205/26/1142/87801/5dbac55aEf795d962/48a4d7a63ff80b8b.jpg',
+            show: false,
+			url: '',
+        }
+    }
+}
+```
+
+
+### 确定按钮颜色
+样式变量名：`--l-clipper-confirm-color`
+可放到全局样式的 `page` 里或节点的 `style`
+```html
+<l-clipper class="clipper" style="--l-clipper-confirm-color: linear-gradient(to right, #ff6034, #ee0a24)"  ></l-clipper>
+```
+```css
+// css 中为组件设置 CSS 变量
+.clipper {
+	--l-clipper-confirm-color: linear-gradient(to right, #ff6034, #ee0a24)
+}
+// 全局
+page {
+	--l-clipper-confirm-color: linear-gradient(to right, #ff6034, #ee0a24)
+}
+```
+
+
+### 使用插槽
+共五个插槽 `cancel` 取消按钮、 `photo` 选择图片按钮、 `rotate` 旋转按钮、 `confirm` 确定按钮和默认插槽。
+
+```html
+<image :src="url" v-if="url" mode="widthFix"></image>
+<l-clipper 
+	v-if="show" 
+	:isLockWidth="isLockWidth"
+	:isLockHeight="isLockHeight"
+	:isLockRatio="isLockRatio"
+	:isLimitMove="isLimitMove"
+	:isDisableScale="isDisableScale"
+	:isDisableRotate="isDisableRotate"
+	:isShowCancelBtn="isShowCancelBtn"
+	:isShowPhotoBtn="isShowPhotoBtn"
+	:isShowRotateBtn="isShowRotateBtn"
+	:isShowConfirmBtn="isShowConfirmBtn"
+	@success="url = $event.url; show = false" 
+	@cancel="show = false" >
+	<!-- 四个基本按钮插槽 -->
+	<view slot="cancel">取消</view>
+	<view slot="photo">选择图片</view>
+	<view slot="rotate">旋转</view>
+	<view slot="confirm">确定</view>
+	<!-- 默认插槽 -->
+	<view class="tools">
+		<view>显示取消按钮
+			<switch :checked="isShowCancelBtn" @change="isShowCancelBtn = $event.target.value" ></switch>
+		</view>
+		<view>显示选择图片按钮
+			<switch :checked="isShowPhotoBtn" @change="isShowPhotoBtn = $event.target.value" ></switch>
+		</view>
+		<view>显示旋转按钮
+			<switch :checked="isShowRotateBtn" @change="isShowRotateBtn = $event.target.value" ></switch>
+		</view>
+		<view>显示确定按钮
+			<switch :checked="isShowConfirmBtn" @change="isShowConfirmBtn = $event.target.value" ></switch>
+		</view>
+		<view>锁定裁剪框宽度
+			<switch :checked="isLockWidth" @change="isLockWidth = $event.target.value" ></switch>
+		</view>
+		<view>锁定裁剪框高度
+			<switch :checked="isLockHeight" @change="isLockHeight = $event.target.value" ></switch>
+		</view>
+		<view>锁定裁剪框比例
+			<switch :checked="isLockRatio" @change="isLockRatio = $event.target.value" ></switch>
+		</view>
+		<view>限制移动范围
+			<switch :checked="isLimitMove" @change="isLimitMove = $event.target.value" ></switch>
+		</view>
+		<view>禁止缩放
+			<switch :checked="isDisableScale" @change="isDisableScale = $event.target.value" ></switch>
+		</view>
+		<view>禁止旋转
+			<switch :checked="isDisableRotate" @change="isDisableRotate = $event.target.value" ></switch>
+		</view>
+	</view>
+</l-clipper>
+<button @tap="show = true">裁剪</button>
+```
+
+```js
+export default {
+	components: {lClipper},
+    data() {
+        return {
+            show: false,
+            url: '',
+            isLockWidth: false,
+            isLockHeight: false,
+            isLockRatio: true,
+            isLimitMove: false,
+            isDisableScale: false,
+            isDisableRotate: false,
+            isShowCancelBtn: true,
+            isShowPhotoBtn: true,
+            isShowRotateBtn: true,
+            isShowConfirmBtn: true
+        }
+    }
+}
+```
+
+
+## API
+
+### Props
+
+| 参数           | 说明         | 类型             | 默认值       |
+| ------------- | ------------ | ---------------- | ------------ |
+| image-url     | 图片路径     | <em>string</em>   |              |
+| quality       | 图片的质量，取值范围为 [0, 1]，不在范围内时当作1处理   | <em>number</em>  |    `1`      |
+| source       | `{album: '从相册中选择'}`key为图片来源类型，value为选项说明   | <em>Object</em>  |         |
+| width | 裁剪框宽度，单位为 `rpx` | <em>number</em> | `400`      |
+| height | 裁剪框高度 | <em>number</em> | `400`      |
+| min-width | 裁剪框最小宽度 | <em>number</em> | `200`      |
+| min-height |裁剪框最小高度 | <em>number</em> | `200`  |
+| max-width | 裁剪框最大宽度 | <em>number</em> | `600`  |
+| max-height | 裁剪框最大宽度 | <em>number</em> | `600`  |
+| min-ratio | 图片最小缩放比 | <em>number</em> | `0.5`  |
+| max-ratio | 图片最大缩放比 | <em>number</em> | `2`  |
+| rotate-angle | 旋转按钮每次旋转的角度 | <em>number</em> | `90`  |
+| scale-ratio | 生成图片相对于裁剪框的比例， **比例越高生成图片越清晰**	 | <em>number</em> | `1`  |
+| is-lock-width | 是否锁定裁剪框宽度 | <em>boolean</em> | `false`  |
+| is-lock-height | 是否锁定裁剪框高度上 | <em>boolean</em> | `false`  |
+| is-lock-ratio | 是否锁定裁剪框比例 | <em>boolean</em> | `true`  |
+| is-disable-scale | 是否禁止缩放 | <em>boolean</em> | `false`  |
+| is-disable-rotate | 是否禁止旋转 | <em>boolean</em> | `false`  |
+| is-limit-move | 是否限制移动范围 | <em>boolean</em> | `false`  |
+| is-show-photo-btn | 是否显示选择图片按钮 | <em>boolean</em> | `true`  |
+| is-show-rotate-btn | 是否显示转按钮 | <em>boolean</em> | `true`  |
+| is-show-confirm-btn | 是否显示确定按钮 | <em>boolean</em> | `true`  |
+| is-show-cancel-btn | 是否显示关闭按钮 | <em>boolean</em> | `true`  |
+
+
+
+### 事件 Events
+
+| 事件名  | 说明         | 回调           |
+| ------- | ------------ | -------------- |
+| success | 生成图片成功 | {`width`, `height`, `url`} |
+| fail | 生成图片失败 | `error` |
+| cancel | 关闭 | `false` |
+| ready   | 图片加载完成 | {`width`, `height`, `path`, `orientation`, `type`} |
+| change | 图片大小改变时触发 | {`width`, `height`} |
+| rotate | 图片旋转时触发 | `angle` |
+
+## 常见问题
+> 1、H5端使用网络图片需要解决跨域问题。<br>
+> 2、小程序使用网络图片需要去公众平台增加下载白名单！二级域名也需要配！<br>
+> 3、H5端生成图片是base64，有时显示只有一半可以使用原生标签`<IMG/>`<br>
+> 4、IOS APP 请勿使用HBX2.9.3.20201014的版本！这个版本无法生成图片。<br>
+> 5、APP端无成功反馈、也无失败反馈时，请更新基座和HBX。<br>
+
+
+## 打赏
+如果你觉得本插件，解决了你的问题，赠人玫瑰，手留余香。<br>
 ![输入图片说明](https://images.gitee.com/uploads/images/2020/1122/222521_bb543f96_518581.jpeg "微信图片编辑_20201122220352.jpg")
\ No newline at end of file

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/README.md

-# 说明
-
+# 说明
+
 此目录内为uni-id-co基础能力，不建议直接修改。如果你发现有些逻辑加入会更好，或者此部分代码有Bug可以向我们提交PR，仓库地址：[]()。如果有特殊的需求也可以在[论坛](https://ask.dcloud.net.cn/)提出，我们可以讨论下如何实现。
\ No newline at end of file