- 更新依赖的uni-id-pages的版本为1.1.13 修复启用摇树优化后切换登陆方式报错的问题

66775f09 · DCloud_JSON · a214c0b2 · 66775f09 · 66775f09 · 66775f09
195 changed file
--- a/changelog.md
+++ b/changelog.md
+## 2.1.3（2023-05-10）
+- 更新 依赖的uni-id-pages的版本为1.1.13 修复 启用摇树优化后切换登陆方式报错的问题
 ## 2.1.2（2023-02-10）
 - 新增 微信小程序端 首页需强制登录时，隐藏返回首页按钮
 ## 2.1.1（2023-02-02）

--- a/manifest.json
+++ b/manifest.json
 {
-    "name" : "uni-starter",
-    "appid" : "__UNI__07F7150",
-    "description" : "云端一体应用快速开发基本项目模版",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "modules" : {},
-        "distribute" : {
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            "ios" : {},
-            "sdkConfigs" : {
-                "push" : {
-                    "unipush" : null
-                }
-            }
-        }
-    },
-    "quickapp" : {},
-    "mp-weixin" : {
-        "appid" : "wx999bf02c8e05dfc9",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true,
-        "optimization" : {
-            "subPackages" : true
-        }
+  "name": "",
+  "appid": "",
+  "description": "云端一体应用快速开发基本项目模版",
+  "versionName": "",
+  "versionCode": "100",
+  "transformPx": false,
+  "app-plus": {
+    "usingComponents": true,
+    "nvueStyleCompiler": "uni-app",
+    "compilerVersion": 3,
+    "splashscreen": {
+      "alwaysShowBeforeRender": true,
+      "waiting": true,
+      "autoclose": true,
+      "delay": 0
    },
-    "mp-alipay" : {
-        "usingComponents" : true
+    "modules": {
    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
+    "distribute": {
+      "android": {
+        "permissions": [
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+        ]
+      },
+      "ios": {
+      },
+      "sdkConfigs": {
+        "push": {
+          "unipush": null
+        }
+      }
+    }
+  },
+  "quickapp": {
+  },
+  "mp-weixin": {
+    "appid": "",
+    "setting": {
+      "urlCheck": false
    },
-    "vueVersion" : "2"
-}
+    "usingComponents": true,
+    "optimization": {
+      "subPackages": true
+    }
+  },
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "uniStatistics": {
+    "enable": false
+  },
+  "vueVersion": "2"
+}
\ No newline at end of file
--- a/package.json
+++ b/package.json
 {
 	"id": "uni-starter",
 	"displayName": "uni-starter",
-	"version": "2.1.2",
+	"version": "2.1.3",
 	"description": "云端一体应用快速开发基本项目模版",
 	"keywords": [
        "login",

--- a/uni_modules/uni-cloud-s2s/changelog.md
+++ b/uni_modules/uni-cloud-s2s/changelog.md
+## 1.0.1（2023-03-02）
+- 修复 方法名错误
--- a/uni_modules/uni-cloud-s2s/package.json
+++ b/uni_modules/uni-cloud-s2s/package.json
+{
+  "id": "uni-cloud-s2s",
+  "displayName": "服务空间与服务器安全通讯模块",
+  "version": "1.0.1",
+  "description": "用于解决服务空间与服务器通讯时互相信任问题",
+  "keywords": [
+    "安全通讯",
+    "服务器请求云函数",
+    "云函数请求服务器"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "unicloud-template-function",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "u",
+          "vue3": "u"
+        },
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
--- a/uni_modules/uni-cloud-s2s/readme.md
+++ b/uni_modules/uni-cloud-s2s/readme.md
+# uni-cloud-s2s
+
+文档见：[外部服务器如何与uniCloud安全通讯](https://uniapp.dcloud.net.cn/uniCloud/uni-cloud-s2s.html)
\ No newline at end of file
--- a/uni_modules/uni-cloud-s2s/uniCloud/cloudfunctions/common/uni-cloud-s2s/index.js
+++ b/uni_modules/uni-cloud-s2s/uniCloud/cloudfunctions/common/uni-cloud-s2s/index.js
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("crypto"),t=require("path");function s(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}require("fs");var o=s(e),n=s(t);const i="uni-cloud-s2s",r={code:5e4,message:"Config error"},c={code:51e3,message:"Access denied"};class a extends Error{constructor(e){super(e.message),this.errMsg=e.message||"",this.code=this.errCode=e.code,this.errSubject=e.subject,this.forceReturn=e.forceReturn||!1,this.cause=e.cause,Object.defineProperties(this,{message:{get(){return this.errMsg},set(e){this.errMsg=e}}})}toJSON(e=0){if(!(e>=10))return e++,{errCode:this.errCode,errMsg:this.errMsg,errSubject:this.errSubject,cause:this.cause&&this.cause.toJSON?this.cause.toJSON(e):this.cause}}}const d=Object.prototype.toString;const h=50002,u=Object.create(null);["string","boolean","number","null"].forEach((e=>{u[e]=function(t,s){if(function(e){return d.call(e).slice(8,-1).toLowerCase()}(t)!==e)return{code:h,message:`${s} is invalid`}}}));const f="Unicloud-S2s-Authorization";class g{constructor(e){const{config:t}=e||{};this.config=t;const{connectCode:s}=t||{};if(this.connectCode=s,!s||"string"!=typeof s)throw new a({subject:i,code:r.code,message:"Invalid connectCode in config"})}getHeadersValue(e={},t,s){const o=Object.keys(e||{}).find((e=>e.toLowerCase()===t.toLowerCase()));return o?e[o]:s}verifyHttpInfo(e){const t=this.getHeadersValue(e.headers,f,""),[s="",o=""]=t.split(" ");if(s.toLowerCase()==="CONNECTCODE".toLowerCase()&&o===this.config.connectCode)return!0;throw new a({subject:i,code:c.code,message:`Invalid CONNECTCODE in headers['${f}']`})}getSecureHeaders(e){return{[f]:`CONNECTCODE ${this.config.connectCode}`}}}function l(e){return function(t){const{content:s,signKey:n}=t||{};return o.default.createHash(e).update(s+"\n"+n).digest("hex")}}const p={md5:l("md5"),sha1:l("sha1"),sha256:l("md5"),"hmac-sha256":function(e){const{content:t,signKey:s}=e||{};return o.default.createHmac("sha256",s).update(t).digest("hex")}};function m(e){const{timestamp:t,data:s={},signKey:o,hashMethod:n="hmac-sha256"}=e||{},i=p[n],r=["number","string","boolean"],c=Object.keys(s).sort(),a=[];for(let e=0;e<c.length;e++){const t=c[e],o=s[t],n=typeof o;r.includes(n)&&a.push(`${t}=${o}`)}return i({content:`${t}\n${a.join("&")}`,signKey:o})}class w{constructor(e){const{config:t}=e||{};this.config=t;const{signKey:s,hashMethod:o="hmac-sha256",timeDiffTolerance:n=60}=t;if(!p[o])throw new a({subject:i,code:r.code,message:`Invalid hashMethod in config, expected "md5", "sha1", "sha256" or "hmac-sha256", got "${o}"`});if(!s||"string"!=typeof s)throw new a({subject:i,code:r.code,message:"Invalid signKey in config"});this.signKey=s,this.hashMethod=o,this.timeDiffTolerance=n}getHttpHeaders(e){return e.headers||{}}getHeadersValue(e,t,s){const o=Object.keys(e||{}).find((e=>e.toLowerCase()===t.toLowerCase()));return o?e[o]:s}getHttpData(e){const t=e.httpMethod.toLowerCase(),s=this.getHttpHeaders(e),o=this.getHeadersValue(s,"Content-Type","");if("get"===t)return e.queryStringParameters;if("post"!==t)throw new a({subject:i,code:c.code,message:`Invalid http method, expected "POST" or "get", got "${t}"`});if(0===o.indexOf("application/json"))return JSON.parse(e.body);if(0===o.indexOf("application/x-www-form-urlencoded"))return require("querystring").parse(e.body);throw new a({subject:i,code:c.code,message:`Invalid content type of POST method, expected "application/json" or "application/x-www-form-urlencoded", got "${o}"`})}verifyHttpInfo(e){const t=e.headers||{},s=this.getHeadersValue(t,"Unicloud-S2s-Timestamp","0");let[o,n]=this.getHeadersValue(t,"Unicloud-S2s-Signature","").split(" ");if(o=o.toLowerCase(),o!==this.hashMethod)throw new a({subject:i,code:c.code,message:`Invalid hash method, expected "${this.hashMethod}", got "${o}"`});const r=parseInt(s),d=Date.now();if(Math.abs(d-r)>1e3*this.timeDiffTolerance)throw new a({subject:i,code:c.code,message:`Invalid timestamp, server timestamp is ${d}, ${r} exceed max timeDiffTolerance(${this.timeDiffTolerance} seconds)`});return m({timestamp:r,data:this.getHttpData(e),signKey:this.signKey,hashMethod:this.hashMethod})===n}getSecureHeaders(e){const{data:t}=e||{},s=Date.now(),o=m({timestamp:s,data:t,signKey:this.signKey,hashMethod:this.hashMethod});return{"Unicloud-S2s-Timestamp":s+"","Unicloud-S2s-Signature":this.hashMethod+" "+o}}}const y=require("uni-config-center")({pluginId:i});class b{constructor(){this.config=y.config();const e=n.default.resolve(require.resolve("uni-config-center"),i,"config.json");if(!this.config)throw new a({subject:i,code:r.code,message:`${i} config required, please check your config file: ${e}`});if("connectCode"===this.config.type)this.verifier=new g({config:this.config});else{if(!function(e){return"sign"===e.type}(this.config))throw new a({subject:i,code:r.code,message:`Invalid ${i} config, expected policy is "code" or "sign", got ${this.config.policy}`});this.verifier=new w({config:this.config})}}verifyHttpInfo(e){if(!e)throw new a({subject:i,code:c.code,message:"Access denied, httpInfo required"});return this.verifier.verifyHttpInfo(e)}getSecureHeaders(e){return this.verifier.getSecureHeaders(e)}}exports.getSecureHeaders=function(e){return(new b).getSecureHeaders(e)},exports.verifyHttpInfo=function(e){const t=(new b).verifyHttpInfo(e);if(!t)throw new a({subject:i,code:c.code,message:c.message});return t};
--- a/uni_modules/uni-cloud-s2s/uniCloud/cloudfunctions/common/uni-cloud-s2s/package.json
+++ b/uni_modules/uni-cloud-s2s/uniCloud/cloudfunctions/common/uni-cloud-s2s/package.json
+{
+  "name": "uni-cloud-s2s",
+  "version": "1.0.1",
+  "description": "",
+  "keywords": [],
+  "author": "DCloud",
+  "main": "index.js",
+  "dependencies": {
+    "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
+  }
+}
\ No newline at end of file
--- a/uni_modules/uni-easyinput/changelog.md
+++ b/uni_modules/uni-easyinput/changelog.md
+## 1.1.9（2023-04-11）
+- 修复 vue3 下 keyboardheightchange 事件报错的bug
+## 1.1.8（2023-03-29）
+- 优化 trim 属性默认值
+## 1.1.7（2023-03-29）
+- 新增 cursor-spacing 属性
 ## 1.1.6（2023-01-28）
 - 新增 keyboardheightchange 事件，可监听键盘高度变化
 ## 1.1.5（2022-11-29）

--- a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -15,6 +15,7 @@
 				:maxlength="inputMaxlength"
 				:focus="focused"
 				:autoHeight="autoHeight"
+				:cursor-spacing="cursorSpacing"
 				@input="onInput"
 				@blur="_Blur"
 				@focus="_Focus"
@@ -36,6 +37,7 @@
 				:maxlength="inputMaxlength"
 				:focus="focused"
 				:confirmType="confirmType"
+				:cursor-spacing="cursorSpacing"
 				@focus="_Focus"
 				@blur="_Blur"
 				@input="onInput"
@@ -99,6 +101,7 @@
 * @property {String}	suffixIcon	输入框尾部图标
 * @property {String}	primaryColor	设置主题色（默认#2979ff）
 * @property {Boolean}	trim	是否自动去除两端的空格
+ * @property {Boolean}	cursorSpacing	指定光标与键盘的距离，单位 px
 * @value both	去除两端空格
 * @value left	去除左侧空格
 * @value right	去除右侧空格
@@ -137,7 +140,7 @@ function obj2strStyle(obj) {
 }
 export default {
 	name: 'uni-easyinput',
-	emits: ['click', 'iconClick', 'update:modelValue', 'input', 'focus', 'blur', 'confirm', 'clear', 'eyes', 'change'],
+	emits: ['click', 'iconClick', 'update:modelValue', 'input', 'focus', 'blur', 'confirm', 'clear', 'eyes', 'change', 'keyboardheightchange'],
 	model: {
 		prop: 'modelValue',
 		event: 'update:modelValue'
@@ -210,7 +213,11 @@ export default {
 		},
 		trim: {
 			type: [Boolean, String],
-			default: true
+			default: false
+		},
+		cursorSpacing: {
+			type: Number,
+			default: 0
 		},
 		passwordIcon: {
 			type: Boolean,

--- a/uni_modules/uni-easyinput/package.json
+++ b/uni_modules/uni-easyinput/package.json
 {
  "id": "uni-easyinput",
  "displayName": "uni-easyinput 增强输入框",
-  "version": "1.1.6",
+  "version": "1.1.9",
  "description": "Easyinput 组件是对原生input组件的增强",
  "keywords": [
    "uni-ui",

--- a/uni_modules/uni-id-common/changelog.md
+++ b/uni_modules/uni-id-common/changelog.md
+## 1.0.16（2023-04-25）
+- 新增maxTokenLength配置，用于限制数据库用户记录token数组的最大长度
+## 1.0.15（2023-04-06）
+- 修复部分语言国际化出错的Bug
+## 1.0.14（2023-03-07）
+- 修复 admin用户包含其他角色时未包含在token的Bug
 ## 1.0.13（2022-07-21）
 - 修复 创建token时未传角色权限信息生成的token不正确的bug
 ## 1.0.12（2022-07-15）

--- a/uni_modules/uni-id-common/package.json
+++ b/uni_modules/uni-id-common/package.json
 {
 	"id": "uni-id-common",
 	"displayName": "uni-id-common",
-	"version": "1.0.13",
+	"version": "1.0.16",
 	"description": "包含uni-id token生成、校验、刷新功能的云函数公共模块",
 	"keywords": [
        "uni-id-common",
@@ -13,12 +13,8 @@
 	"engines": {
 		"HBuilderX": "^3.1.0"
 	},
-	"dcloudext": {
-		"category": [
-			"uniCloud",
-			"云函数模板"
-		],
-		"sale": {
+    "dcloudext": {
+        "sale": {
 			"regular": {
 				"price": "0.00"
 			},
@@ -34,7 +30,8 @@
 			"data": "无",
 			"permissions": "无"
 		},
-		"npmurl": ""
+        "npmurl": "",
+        "type": "unicloud-template-function"
 	},
 	"uni_modules": {
 		"dependencies": ["uni-config-center"],

--- a/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
+++ b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
--- a/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json
+++ b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json
 {
  "name": "uni-id-common",
-  "version": "1.0.13",
+  "version": "1.0.16",
  "description": "uni-id token生成、校验、刷新",
  "main": "index.js",
  "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id-common.html",

--- a/uni_modules/uni-id-pages/changelog.md
+++ b/uni_modules/uni-id-pages/changelog.md
--- a/uni_modules/uni-id-pages/common/check-id-card.js
+++ b/uni_modules/uni-id-pages/common/check-id-card.js
+export default function checkIdCard (idCardNumber) {
+  if (!idCardNumber || typeof idCardNumber !== 'string' || idCardNumber.length !== 18) return false
+
+  const coefficient = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]
+  const checkCode = [1, 0, 'x', 9, 8, 7, 6, 5, 4, 3, 2]
+  const code = idCardNumber.substring(17)
+
+  let sum = 0
+  for (let i = 0; i < 17; i++) {
+    sum += Number(idCardNumber.charAt(i)) * coefficient[i]
+  }
+
+  return checkCode[sum % 11].toString() === code.toLowerCase()
+}
--- a/uni_modules/uni-id-pages/common/login-page.mixin.js
+++ b/uni_modules/uni-id-pages/common/login-page.mixin.js
-import {
-		store,
-		mutations
-	} from '@/uni_modules/uni-id-pages/common/store.js'
+import {
+	mutations
+} from '@/uni_modules/uni-id-pages/common/store.js'
 import config from '@/uni_modules/uni-id-pages/config.js'
-let mixin = {
+const mixin = {
 	data() {
 		return {
 			config,
@@ -17,7 +16,7 @@ let mixin = {
 		// #endif
 	},
 	mounted() {
-		this.isMounted = true;
+		this.isMounted = true
 	},
 	onLoad(e) {
 		if (e.is_weixin_redirect) {
@@ -25,12 +24,12 @@ let mixin = {
 				mask: true
 			})

-			if( window.location.href.includes('#') ){
+			if (window.location.href.includes('#')) {
 				// 将url通过 ? 分割获取后面的参数字符串 再通过 & 将每一个参数单独分割出来
-				let paramsArr = window.location.href.split('?')[1].split('&')
-				paramsArr.forEach(item=>{
-					let arr = item.split('=')
-					if(arr[0] == 'code'){
+				const paramsArr = window.location.href.split('?')[1].split('&')
+				paramsArr.forEach(item => {
+					const arr = item.split('=')
+					if (arr[0] == 'code') {
 						e.code = arr[1]
 					}
 				})
@@ -38,19 +37,21 @@ let mixin = {
 			this.$nextTick(n => {
 				// console.log(this.$refs.uniFabLogin);
 				this.$refs.uniFabLogin.login({
-					code:e.code
+					code: e.code
 				}, 'weixin')
 			})
 		}

 		if (e.uniIdRedirectUrl) {
 			this.uniIdRedirectUrl = decodeURIComponent(e.uniIdRedirectUrl)
-		}
-		
-		if(getCurrentPages().length === 1){
-			uni.hideHomeButton()
-			console.log('已隐藏：返回首页按钮');
-		}
+		}
+
+		// #ifdef MP-WEIXIN
+		if (getCurrentPages().length === 1) {
+			uni.hideHomeButton()
+			console.log('已隐藏：返回首页按钮');
+		}
+		// #endif
 	},
 	computed: {
 		needAgreements() {
@@ -90,4 +91,5 @@ let mixin = {
 		}
 	}
 }
-export default mixin
+
+export default mixin
--- a/uni_modules/uni-id-pages/common/store.js
+++ b/uni_modules/uni-id-pages/common/store.js
-import pagesJson from '@/pages.json'
-import config from '@/uni_modules/uni-id-pages/config.js'
-
-const uniIdCo = uniCloud.importObject("uni-id-co")
-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) {
-		if (data) {
-			usersTable.where('_id==$env.uid').update(data).then(e => {
-				// console.log(e);
-				if (e.result.updated) {
-					uni.showToast({
-						title: "更新成功",
-						icon: 'none',
-						duration: 3000
-					});
-					this.setUserInfo(data)
-				} else {
-					uni.showToast({
-						title: "没有改变",
-						icon: 'none',
-						duration: 3000
-					});
-				}
-			})
-
-		} else {
-			try {
-				let res = await usersTable.where("'_id' == $cloudEnv_uid")
-						.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
-	},
-	async logout() {
-		// 1. 已经过期就不需要调用服务端的注销接口	2.即使调用注销接口失败，不能阻塞客户端
-		if(uniCloud.getCurrentUserInfo().tokenExpired > Date.now()){
-			try{
-				await uniIdCo.logout()
-			}catch(e){
-				console.error(e);
-			}
-		}
-		uni.removeStorageSync('uni_id_token');
-		uni.setStorageSync('uni_id_token_expired', 0)
-		uni.redirectTo({
-			url: `/${pagesJson.uniIdRouter?.loginPage ?? 'uni_modules/uni-id-pages/pages/login/login-withoutpwd'}`,
-		});
-		uni.$emit('uni-id-pages-logout')
-		this.setUserInfo({},{cover:true})
-	},
-
-	loginBack (e = {}) {
-		const {uniIdRedirectUrl = ''} = e
-		let delta = 0; //判断需要返回几层
-		let pages = getCurrentPages();
-		// console.log(pages);
-		pages.forEach((page, index) => {
-			if (pages[pages.length - index - 1].route.split('/')[3] == 'login') {
-				delta++
-			}
-		})
-		// console.log('判断需要返回几层:', delta);
-		if (uniIdRedirectUrl) {
-			return uni.reLaunch({
-				url: uniIdRedirectUrl
-			})
-		}
-		// #ifdef H5
-		if (e.loginType == 'weixin') {
-			// console.log('window.history', window.history);
-			return window.history.go(-3)
-		}
-		// #endif
-
-		if (delta) {
-			const page = pagesJson.pages[0]
-			return uni.reLaunch({
-				url: `/${page.path}`
-			})
-		}
-
-		uni.navigateBack({
-			delta
-		})
-	},
-	loginSuccess(e = {}){
-		const {
-			showToast = true, toastText = '登录成功', autoBack = true, uniIdRedirectUrl = '', passwordConfirmed
-		} = e
-		// console.log({toastText,autoBack});
-		if (showToast) {
-			uni.showToast({
-				title: toastText,
-				icon: 'none',
-				duration: 3000
-			});
-		}
-		this.updateUserInfo()
-
-		uni.$emit('uni-id-pages-login-success')
-
-		if (config.setPasswordAfterLogin && !passwordConfirmed) {
-			return uni.redirectTo({
-				url: uniIdRedirectUrl ? `/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd?uniIdRedirectUrl=${uniIdRedirectUrl}&loginType=${e.loginType}`: `/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd?loginType=${e.loginType}`,
-				fail: (err) => {
-					console.log(err)
-				}
-			})
-		}
-
-		if (autoBack) {
-			this.loginBack(uniIdRedirectUrl)
-		}
-	}
-
-}
-
-// #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
+import pagesJson from '@/pages.json'
+import config from '@/uni_modules/uni-id-pages/config.js'
+
+const uniIdCo = uniCloud.importObject("uni-id-co")
+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) {
+		if (data) {
+			usersTable.where('_id==$env.uid').update(data).then(e => {
+				// console.log(e);
+				if (e.result.updated) {
+					uni.showToast({
+						title: "更新成功",
+						icon: 'none',
+						duration: 3000
+					});
+					this.setUserInfo(data)
+				} else {
+					uni.showToast({
+						title: "没有改变",
+						icon: 'none',
+						duration: 3000
+					});
+				}
+			})
+
+		} else {
+			const uniIdCo = uniCloud.importObject("uni-id-co", {
+				customUI: true
+			})
+			try {
+				let res = await usersTable.where("'_id' == $cloudEnv_uid")
+					.field('mobile,nickname,username,email,avatar_file')
+					.get()
+
+				const realNameRes = await uniIdCo.getRealNameInfo()
+
+				// console.log('fromDbData',res.result.data);
+				this.setUserInfo({
+					...res.result.data[0],
+					realNameAuth: realNameRes
+				})
+			} 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.setStorageSync('uni-id-pages-userInfo', store.userInfo)
+		return data
+	},
+	async logout() {
+		// 1. 已经过期就不需要调用服务端的注销接口	2.即使调用注销接口失败，不能阻塞客户端
+		if(uniCloud.getCurrentUserInfo().tokenExpired > Date.now()){
+			try{
+				await uniIdCo.logout()
+			}catch(e){
+				console.error(e);
+			}
+		}
+		uni.removeStorageSync('uni_id_token');
+		uni.setStorageSync('uni_id_token_expired', 0)
+		uni.redirectTo({
+			url: `/${pagesJson.uniIdRouter && pagesJson.uniIdRouter.loginPage ? 'uni_modules/uni-id-pages/pages/login/login-withoutpwd': ''}`,
+		});
+		uni.$emit('uni-id-pages-logout')
+		this.setUserInfo({},{cover:true})
+	},
+
+	loginBack (e = {}) {
+		const {uniIdRedirectUrl = ''} = e
+		let delta = 0; //判断需要返回几层
+		let pages = getCurrentPages();
+		// console.log(pages);
+		pages.forEach((page, index) => {
+			if (pages[pages.length - index - 1].route.split('/')[3] == 'login') {
+				delta++
+			}
+		})
+		// console.log('判断需要返回几层:', delta);
+		if (uniIdRedirectUrl) {
+			return uni.redirectTo({
+				url: uniIdRedirectUrl,
+				fail: (err1) => {
+					uni.switchTab({
+						url:uniIdRedirectUrl,
+						fail: (err2) => {
+							console.log(err1,err2)
+						}
+					})
+				}
+			})
+		}
+		// #ifdef H5
+		if (e.loginType == 'weixin') {
+			// console.log('window.history', window.history);
+			return window.history.go(-3)
+		}
+		// #endif
+
+		if (delta) {
+			const page = pagesJson.pages[0]
+			return uni.reLaunch({
+				url: `/${page.path}`
+			})
+		}
+
+		uni.navigateBack({
+			delta
+		})
+	},
+	loginSuccess(e = {}){
+		const {
+			showToast = true, toastText = '登录成功', autoBack = true, uniIdRedirectUrl = '', passwordConfirmed
+		} = e
+		// console.log({toastText,autoBack});
+		if (showToast) {
+			uni.showToast({
+				title: toastText,
+				icon: 'none',
+				duration: 3000
+			});
+		}
+		this.updateUserInfo()
+
+		uni.$emit('uni-id-pages-login-success')
+
+		if (config.setPasswordAfterLogin && !passwordConfirmed) {
+			return uni.redirectTo({
+				url: uniIdRedirectUrl ? `/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd?uniIdRedirectUrl=${uniIdRedirectUrl}&loginType=${e.loginType}`: `/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd?loginType=${e.loginType}`,
+				fail: (err) => {
+					console.log(err)
+				}
+			})
+		}
+
+		if (autoBack) {
+			this.loginBack({uniIdRedirectUrl})
+		}
+	}
+
+}
+
+// #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
--- a/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
@@ -71,31 +71,8 @@
 				let avatar_file = {
 					extname: avatarUrl.split('.')[avatarUrl.split('.').length - 1],
 					name:'',
-					url:avatarUrl
+					url:''
 				}
-				
-				// 裁剪
-				let filePath = await new Promise((callback) => {
-					wx.cropImage({
-						src:avatarUrl,
-						cropScale:"1:1",
-						success: res => {
-							callback(res.tempFilePath)
-						},
-						fail(e){
-							console.error(e)
-							uni.showModal({
-								content: 'wx.cropImage ' + e.errMsg,
-								showCancel: false,
-								confirmText:"跳过裁剪",
-								complete() {
-									callback(avatarUrl)
-								}
-							});
-						}
-					})
-				})
-				
 				//上传到服务器
 				let cloudPath = this.userInfo._id + '' + Date.now()
 				avatar_file.name = cloudPath
@@ -107,7 +84,7 @@
 					let {
 						fileID
 					} = await uniCloud.uploadFile({
-						filePath,
+						filePath:avatarUrl,
 						cloudPath,
 						fileType: "image"
 					});
@@ -116,82 +93,83 @@
 				}catch(e){
 					console.error(e);
 				}
+				console.log('avatar_file',avatar_file);
 				this.setAvatarFile(avatar_file)
 			},
 			uploadAvatarImg(res) {
-				
 				// #ifdef MP-WEIXIN
 				return false // 微信小程序走 bindchooseavatar方法
 				// #endif
 				
-				if(!this.hasLogin){
-					return uni.navigateTo({
-						url:'/uni_modules/uni-id-pages/pages/login/login-withoutpwd'
-					})
+				// #ifndef MP-WEIXIN
+				if(!this.hasLogin){
+					return uni.navigateTo({
+						url:'/uni_modules/uni-id-pages/pages/login/login-withoutpwd'
+					})
 				}
-				
-				const crop = {
-					quality: 100,
-					width: 600,
-					height: 600,
-					resize: true
-				};
-				uni.chooseImage({
-					count: 1,
-					crop,
-					success: async (res) => {
-						let tempFile = res.tempFiles[0],
-							avatar_file = {
-								// #ifdef H5
-								extname: tempFile.name.split('.')[tempFile.name.split('.').length - 1],
-								// #endif
-								// #ifndef H5
-								extname: tempFile.path.split('.')[tempFile.path.split('.').length - 1]
-								// #endif
-							},
-							filePath = res.tempFilePaths[0]
-							
-						//非app端剪裁头像，app端用内置的原生裁剪
-						// #ifndef APP-PLUS
-						filePath = await new Promise((callback) => {
-							// #ifdef H5
-							if (!this.isPC) {
-								uni.navigateTo({
-									url: '/uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage?path=' +
-										filePath + `&options=${JSON.stringify(crop)}`,
-									animationType: "fade-in",
-									events: {
-										success: url => {
-											callback(url)
-										}
-									},
-									complete(e) {
-										// console.log(e);
-									}
-								});
-							}
-							// #endif
-						})
-						// #endif
-						
-						let cloudPath = this.userInfo._id + '' + Date.now()
-						avatar_file.name = cloudPath
-						uni.showLoading({
-							title: "更新中",
-							mask: true
-						});
-						let {
-							fileID
-						} = await uniCloud.uploadFile({
-							filePath,
-							cloudPath,
-							fileType: "image"
-						});
-						avatar_file.url = fileID
-						uni.hideLoading()
-						this.setAvatarFile(avatar_file)
-					}
-				})
+				const crop = {
+					quality: 100,
+					width: 600,
+					height: 600,
+					resize: true
+				};
+				uni.chooseImage({
+					count: 1,
+					crop,
+					success: async (res) => {
+						let tempFile = res.tempFiles[0],
+							avatar_file = {
+								// #ifdef H5
+								extname: tempFile.name.split('.')[tempFile.name.split('.').length - 1],
+								// #endif
+								// #ifndef H5
+								extname: tempFile.path.split('.')[tempFile.path.split('.').length - 1]
+								// #endif
+							},
+							filePath = res.tempFilePaths[0]
+							
+						//非app端剪裁头像，app端用内置的原生裁剪
+						// #ifndef APP-PLUS
+						filePath = await new Promise((callback) => {
+							// #ifdef H5
+							if (!this.isPC) {
+								uni.navigateTo({
+									url: '/uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage?path=' +
+										filePath + `&options=${JSON.stringify(crop)}`,
+									animationType: "fade-in",
+									events: {
+										success: url => {
+											callback(url)
+										}
+									},
+									complete(e) {
+										// console.log(e);
+									}
+								});
+							}
+							// #endif
+						})
+						// #endif
+						
+						let cloudPath = this.userInfo._id + '' + Date.now()
+						avatar_file.name = cloudPath
+						uni.showLoading({
+							title: "更新中",
+							mask: true
+						});
+						let {
+							fileID
+						} = await uniCloud.uploadFile({
+							filePath,
+							cloudPath,
+							fileType: "image"
+						});
+						avatar_file.url = fileID
+						uni.hideLoading()
+						this.setAvatarFile(avatar_file)
+					}
+				})
+				// #endif
 			}
 		}
 	}

--- a/uni_modules/uni-id-pages/components/uni-id-pages-email-form/uni-id-pages-email-form.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-email-form/uni-id-pages-email-form.vue
-<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',
-						duration: 3000
-					});
-				}
-				if(!this.email) return uni.showToast({
-					title: "请输入邮箱",
-					icon: 'none',
-					duration: 3000
-				});
-				let reg_email = /@/;
-				if (!reg_email.test(this.email)) return uni.showToast({
-					title: "邮箱格式错误",
-					icon: 'none',
-					duration: 3000
-				});
-				const uniIdCo = uniCloud.importObject("uni-id-co", {
-					customUI: true
-				})
-				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 => {
-					uni.showToast({
-						title: "邮箱验证码发送成功",
-						icon: 'none',
-						duration: 3000
-					});
-					this.reverseNumber = Number(this.count);
-					this.getCode();
-				}).catch(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',
-							duration: 3000
-						});
-					}
-				})
-			},
-			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',
+						duration: 3000
+					});
+				}
+				if(!this.email) return uni.showToast({
+					title: "请输入邮箱",
+					icon: 'none',
+					duration: 3000
+				});
+				let reg_email = /@/;
+				if (!reg_email.test(this.email)) return uni.showToast({
+					title: "邮箱格式错误",
+					icon: 'none',
+					duration: 3000
+				});
+				const uniIdCo = uniCloud.importObject("uni-id-co", {
+					customUI: true
+				})
+				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 => {
+					uni.showToast({
+						title: "邮箱验证码发送成功",
+						icon: 'none',
+						duration: 3000
+					});
+					this.reverseNumber = Number(this.count);
+					this.getCode();
+				}).catch(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',
+							duration: 3000
+						});
+					}
+				})
+			},
+			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>
--- a/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
@@ -61,7 +61,7 @@
 						"id": "weixin",
 						"text": "微信登录",
 						"logo": "/uni_modules/uni-id-pages/static/login/uni-fab-login/weixin.png",
-					},
+					},
 					// #ifndef MP-WEIXIN
 					{
 						"id": "apple",
@@ -107,7 +107,7 @@
 						"id": "sinaweibo",
 						"text": "新浪微博", //暂未提供该登录方式的接口示例
 						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/sinaweibo.png",
-					}
+					}
 					// #endif
 				],
 				univerifyStyle: { //一键登录弹出窗的样式配置参数
@@ -201,8 +201,7 @@
 				}
 				return '/' + pages[pages.length - n].route
 			},
-			toPage(path,index = 0) {
-				let type = ['navigateTo','redirectTo'][index]
+			toPage(path,index = 0) {
 				//console.log('比较', this.getRoute(1),this.getRoute(2), path)
 				if (this.getRoute(1) == path.split('?')[0] && this.getRoute(1) ==
 					'/uni_modules/uni-id-pages/pages/login/login-withoutpwd') {
@@ -212,13 +211,23 @@
 				} else if (this.getRoute(2) == path) { // 如果上一个页面就是，马上要打开的页面，直接返回。防止重复开启
 					uni.navigateBack();
 				} else if (this.getRoute(1) != path) {
-					uni[type]({
-						url: path,
-						animationType: 'slide-in-left',
-						complete(e) {
-							// console.log(e);
-						}
-					})
+					if(index === 0){
+						uni.navigateTo({
+							url: path,
+							animationType: 'slide-in-left',
+							complete(e) {
+								// console.log(e);
+							}
+						})
+					}else{
+						uni.redirectTo({
+							url: path,
+							animationType: 'slide-in-left',
+							complete(e) {
+								// console.log(e);
+							}
+						})
+					}
 				} else {
 					console.log('出乎意料的情况,path：' + path);
 				}
@@ -294,10 +303,25 @@
 				// #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'
+						// 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'
+            // #ifdef VUE2
+            const baseUrl = process.env.BASE_URL
+            // #endif
+            // #ifdef VUE3
+            const baseUrl = import.meta.env.BASE_URL
+            // #endif
+
+            let redirectUrl = location.protocol +
+                '//' +
+                location.host +
+                baseUrl.replace(/\/$/, '') +
+                (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('在微信公众号内');
@@ -327,20 +351,20 @@
 					let onButtonsClickFn = async res => {
 						console.log('点击了第三方登录，provider：', res, res.provider, this.univerifyStyle.buttons.list);
 						clickAnotherButtons = true
-						let checkBoxState = await uni.getCheckBoxState();
-						// 同步一键登录弹出层隐私协议框是否打勾
-						// #ifdef VUE2
-						this.agree = checkBoxState[1].state
-						// #endif
-						// #ifdef VUE3
-						this.agree = checkBoxState.state
+						let checkBoxState = await uni.getCheckBoxState();
+						// 同步一键登录弹出层隐私协议框是否打勾
+						// #ifdef VUE2
+						this.agree = checkBoxState[1].state
+						// #endif
+						// #ifdef VUE3
+						this.agree = checkBoxState.state
 						// #endif
 						let {
 							path
 						} = this.univerifyStyle.buttons.list[res.index]
-						if (path) {
-							if( this.getRoute(1).includes('login-withoutpwd') && path.includes('login-withoutpwd') ){
-								this.getParentComponent().showCurrentWebview()
+						if (path) {
+							if( this.getRoute(1).includes('login-withoutpwd') && path.includes('login-withoutpwd') ){
+								this.getParentComponent().showCurrentWebview()
 							}
 							this.toPage(path,1)
 							closeUniverify()

--- a/uni_modules/uni-id-pages/config.js
+++ b/uni_modules/uni-id-pages/config.js
 export default {
-	//调试模式
-	"debug": false,
-	/*
+  // 调试模式
+  debug: false,
+  /*
 		登录类型 未列举到的或运行环境不支持的，将被自动隐藏。
 		如果需要在不同平台有不同的配置，直接用条件编译即可
 	*/
-	"isAdmin": false, // 区分管理端与用户端
-	"loginTypes": [
-		// "qq",
-		// "xiaomi",
-		// "sinaweibo",
-		// "taobao",
-		// "facebook",
-		// "google",
-		// "alipay",
-		// "douyin",
+  isAdmin: false, // 区分管理端与用户端
+  loginTypes: [
+    // "qq",
+    // "xiaomi",
+    // "sinaweibo",
+    // "taobao",
+    // "facebook",
+    // "google",
+    // "alipay",
+    // "douyin",

-		// #ifdef APP
-		"univerify",
-		// #endif
-		"weixin",
-		"username",
-		// #ifdef APP
-		"apple",
-		// #endif
-		"smsCode"
-	],
-	//政策协议
-	"agreements": {
-		"serviceUrl": "https://xxx", //用户服务协议链接
-		"privacyUrl": "https://xxx", //隐私政策条款链接
-		// 哪些场景下显示，1.注册（包括登录并注册，如：微信登录、苹果登录、短信验证码登录）、2.登录（如：用户名密码登录）
-		"scope": [
-			'register', 'login'
-		]
-	},
-	// 提供各类服务接入（如微信登录服务）的应用id
-	"appid": {
-		"weixin": {
-			// 微信公众号的appid，来源:登录微信公众号（https://mp.weixin.qq.com）-> 设置与开发 -> 基本配置 -> 公众号开发信息 -> AppID
-			"h5": "xxxxxx",
-			// 微信开放平台的appid，来源:登录微信开放平台（https://open.weixin.qq.com） -> 管理中心 -> 网站应用 -> 选择对应的应用名称，点击查看 -> AppID
-			"web": "xxxxxx"
-		}
-	},
-	/**
+    // #ifdef APP
+    'univerify',
+    // #endif
+    'weixin',
+    'username',
+    // #ifdef APP
+    'apple',
+    // #endif
+    'smsCode'
+  ],
+  // 政策协议
+  agreements: {
+    serviceUrl: 'https://xxx', // 用户服务协议链接
+    privacyUrl: 'https://xxx', // 隐私政策条款链接
+    // 哪些场景下显示，1.注册（包括登录并注册，如：微信登录、苹果登录、短信验证码登录）、2.登录（如：用户名密码登录）
+    scope: [
+      'register', 'login', 'realNameVerify'
+    ]
+  },
+  // 提供各类服务接入（如微信登录服务）的应用id
+  appid: {
+    weixin: {
+      // 微信公众号的appid，来源:登录微信公众号（https://mp.weixin.qq.com）-> 设置与开发 -> 基本配置 -> 公众号开发信息 -> AppID
+      h5: 'xxxxxx',
+      // 微信开放平台的appid，来源:登录微信开放平台（https://open.weixin.qq.com） -> 管理中心 -> 网站应用 -> 选择对应的应用名称，点击查看 -> AppID
+      web: 'xxxxxx'
+    }
+  },
+  /**
 	 * 密码强度
 	 * super（超强：密码必须包含大小写字母、数字和特殊符号，长度范围：8-16位之间）
 	 * strong（强: 密密码必须包含字母、数字和特殊符号，长度范围：8-16位之间）
@@ -52,8 +52,8 @@ export default {
 	 * weak（弱：密码必须包含字母和数字，长度范围：6-16位之间）
 	 * 为空或false则不验证密码强度
 	 */
-	"passwordStrength":"medium",
-	/**
+  passwordStrength: 'medium',
+  /**
 	 * 登录后允许用户设置密码（只针对未设置密码得用户）
 	 * 开启此功能将 setPasswordAfterLogin 设置为 true 即可
 	 * "setPasswordAfterLogin": false
@@ -63,5 +63,5 @@ export default {
 	 *   "allowSkip": true
 	 * }
 	 * */
-	"setPasswordAfterLogin": false
+  setPasswordAfterLogin: false
 }
--- a/uni_modules/uni-id-pages/init.js
+++ b/uni_modules/uni-id-pages/init.js
 // 导入配置
-import config from '@/uni_modules/uni-id-pages/config.js';
+import config from '@/uni_modules/uni-id-pages/config.js'
 // uni-id的云对象
-const uniIdCo = uniCloud.importObject("uni-id-co", {
-	customUI: true
+const uniIdCo = uniCloud.importObject('uni-id-co', {
+  customUI: true
 })
 // 用户配置的登录方式、是否打开调试模式
 const {
-	loginTypes,
-	debug
+  loginTypes,
+  debug
 } = config

-export default async function() {
-
-	// 有打开调试模式的情况下
-	if (debug) {
-		// 1. 检查本地uni-id-pages中配置的登录方式，服务器端是否已经配置正确。否则提醒并引导去配置
-		//调用云对象，获取服务端已正确配置的登录方式
-		let {
-			supportedLoginType
-		} = await uniIdCo.getSupportedLoginType()
-		console.log("supportedLoginType: " + JSON.stringify(supportedLoginType));
-		//登录方式，服务端和客户端的映射关系
-		let data = {
-			smsCode: 'mobile-code',
-			univerify: 'univerify',
-			username: 'username-password',
-			weixin: 'weixin',
-			qq: 'qq',
-			xiaomi: 'xiaomi',
-			sinaweibo: 'sinaweibo',
-			taobao: 'taobao',
-			facebook: 'facebook',
-			google: 'google',
-			alipay: 'alipay',
-			apple: "apple"
-		}
-		//遍历客户端配置的登录方式，与服务端比对。并在错误时抛出错误提示
-		let list = loginTypes.filter(type => !supportedLoginType.includes(data[type]))
-		if (list.length) {
-			console.error(
+export default async function () {
+  // 有打开调试模式的情况下
+  if (debug) {
+    // 1. 检查本地uni-id-pages中配置的登录方式，服务器端是否已经配置正确。否则提醒并引导去配置
+    // 调用云对象，获取服务端已正确配置的登录方式
+    const {
+      supportedLoginType
+    } = await uniIdCo.getSupportedLoginType()
+    console.log('supportedLoginType: ' + JSON.stringify(supportedLoginType))
+    // 登录方式，服务端和客户端的映射关系
+    const data = {
+      smsCode: 'mobile-code',
+      univerify: 'univerify',
+      username: 'username-password',
+      weixin: 'weixin',
+      qq: 'qq',
+      xiaomi: 'xiaomi',
+      sinaweibo: 'sinaweibo',
+      taobao: 'taobao',
+      facebook: 'facebook',
+      google: 'google',
+      alipay: 'alipay',
+      apple: 'apple',
+      weixinMobile: 'weixin'
+    }
+    // 遍历客户端配置的登录方式，与服务端比对。并在错误时抛出错误提示
+    const list = loginTypes.filter(type => !supportedLoginType.includes(data[type]))
+    if (list.length) {
+      console.error(
 				`错误：前端启用的登录方式:${list.join('，')};没有在服务端完成配置。配置文件路径："/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json"`
-			);
-		}
-	}
-
-	// #ifdef APP-PLUS
-	//如果uni-id-pages配置的登录功能有一键登录，有则执行预登录（异步）
-	if (loginTypes.includes('univerify')) {
-		uni.preLogin({
-			provider: 'univerify',
-			complete: e => {
-				// console.log(e);
-			}
-		})
-	}
-	// #endif
+      )
+    }
+  }

-	//3. 绑定clientDB错误事件
-	// clientDB对象
-	const db = uniCloud.database()
-	db.on('error', onDBError)
-	//clientDB的错误提示
-	function onDBError({
-		code, // 错误码详见https://uniapp.dcloud.net.cn/uniCloud/clientdb?id=returnvalue
-		message
-	}) {
-		// console.error('onDBError', {code,message});
-	}
-	// 解绑clientDB错误事件
-	//db.off('error', onDBError)
+  // #ifdef APP-PLUS
+  // 如果uni-id-pages配置的登录功能有一键登录，有则执行预登录（异步）
+  if (loginTypes.includes('univerify')) {
+    uni.preLogin({
+      provider: 'univerify',
+      complete: e => {
+        // console.log(e);
+      }
+    })
+  }
+  // #endif

+  // 3. 绑定clientDB错误事件
+  // clientDB对象
+  const db = uniCloud.database()
+  db.on('error', onDBError)
+  // clientDB的错误提示
+  function onDBError ({
+    code, // 错误码详见https://uniapp.dcloud.net.cn/uniCloud/clientdb?id=returnvalue
+    message
+  }) {
+    // console.error('onDBError', {code,message});
+  }
+  // 解绑clientDB错误事件
+  // db.off('error', onDBError)

-	//4. 同步客户端push_clientid至device表
-	if (uniCloud.onRefreshToken) {
-		uniCloud.onRefreshToken(() => {
-			// console.log('onRefreshToken');
-			if (uni.getPushClientId) {
-				uni.getPushClientId({
-					success: async function(e) {
-						// console.log(e)
-						let pushClientId = e.cid
-						// console.log(pushClientId);
-						let res = await uniIdCo.setPushCid({
-							pushClientId
-						})
-						// console.log('getPushClientId', res);
-					},
-					fail(e) {
-						console.log(e)
-					}
-				})
-			}
-		})
-	}
-}
+  // 4. 同步客户端push_clientid至device表
+  if (uniCloud.onRefreshToken) {
+    uniCloud.onRefreshToken(() => {
+      // console.log('onRefreshToken');
+      if (uni.getPushClientId) {
+        uni.getPushClientId({
+          success: async function (e) {
+            // console.log(e)
+            const pushClientId = e.cid
+            // console.log(pushClientId);
+            const res = await uniIdCo.setPushCid({
+              pushClientId
+            })
+            // console.log('getPushClientId', res);
+          },
+          fail (e) {
+            // console.log(e)
+          }
+        })
+      }
+    })
+  }
+}
--- a/uni_modules/uni-id-pages/package.json
+++ b/uni_modules/uni-id-pages/package.json
 {
 	"id": "uni-id-pages",
 	"displayName": "uni-id-pages",
-	"version": "1.1.2",
+	"version": "1.1.13",
 	"description": "云端一体简单、统一、可扩展的用户中心页面模版",
 	"keywords": [
        "用户管理",
@@ -48,7 +48,8 @@
 			"uni-popup",
 			"uni-scss",
 			"uni-transition",
-			"uni-open-bridge-common"
+			"uni-open-bridge-common",
+			"uni-cloud-s2s"
 		],
 		"encrypt": [],
 		"platforms": {

--- a/uni_modules/uni-id-pages/pages/common/webview/webview.vue
+++ b/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{
-				this.url = url;
-			}
-			if(title){
-				uni.setNavigationBarTitle({title});
-			}
-		},
-		data() {
-			return {
-				url:null
-			};
-		}
-	}
-</script>
+<!-- 网络链接内容展示页（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{
+				this.url = url;
+			}
+			if(title){
+				uni.setNavigationBarTitle({title});
+			}
+		},
+		data() {
+			return {
+				url:null
+			};
+		}
+	}
+</script>
--- a/uni_modules/uni-id-pages/pages/login/login-smscode.vue
+++ b/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() {
-			// #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',
-						duration: 3000
-					});
-				}
-				uniIdCo.loginBySms({
-					"mobile": this.phone,
-					"code": this.code,
-					"captcha": this.captcha
-				}).then(e => {
-					this.loginSuccess(e)
-				}).catch(e => {
-					if (e.errCode == 'uni-id-captcha-required') {
-						this.$refs.popup.open()
-					} else {
-						console.log(e.errMsg);
-					}
-				}).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() {
+			// #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',
+						duration: 3000
+					});
+				}
+				uniIdCo.loginBySms({
+					"mobile": this.phone,
+					"code": this.code,
+					"captcha": this.captcha
+				}).then(e => {
+					this.loginSuccess(e)
+				}).catch(e => {
+					if (e.errCode == 'uni-id-captcha-required') {
+						this.$refs.popup.open()
+					} else {
+						console.log(e.errMsg);
+					}
+				}).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>
--- a/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
+++ b/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', 'weixinMobile'].includes(type)">
-			<text class="tip">将根据第三方账号服务平台的授权范围获取你的信息</text>
-			<view class="quickLogin">
-				<image v-if="type !== 'weixinMobile'" @click="quickLogin" :src="imgSrc" mode="widthFix"
-					class="quickLoginBtn"></image>
-				<button v-else type="primary" open-type="getPhoneNumber" @getphonenumber="quickLogin"
-					class="uni-btn">微信授权手机号登录</button>
-				<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
-			</view>
-		</template>
-		<template v-else>
-			<text class="tip">未注册的账号验证通过后将自动注册</text>
-			<view class="phone-box">
-				<view @click="chooseArea" class="area">+86</view>
-				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" type="number"
-					:inputBorder="false" v-model="phone" maxlength="11" placeholder="请输入手机号" />
-			</view>
-			<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
-			<button class="uni-btn" type="primary" @click="toSmsPage">获取验证码</button>
-		</template>
-		<!-- 固定定位的快捷登录按钮 -->
-		<uni-id-pages-fab-login ref="uniFabLogin"></uni-id-pages-fab-login>
-	</view>
-</template>
-
-<script>
-	let currentWebview; //当前窗口对象
-	import config from '@/uni_modules/uni-id-pages/config.js'
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				type: "", //快捷登录方式
-				phone: "", //手机号码
-				focusPhone: false,
-				logo: "/static/logo.png"
-			}
-		},
-		computed: {
-			async loginTypes() { //读取配置的登录优先级
-				return config.loginTypes
-			},
-			isPhone() { //手机号码校验正则
-				return /^1\d{10}$/.test(this.phone);
-			},
-			imgSrc() { //大快捷登录按钮图
-				return this.type == 'weixin' ? '/uni_modules/uni-id-pages/static/login/weixin.png' :
-					'/uni_modules/uni-id-pages/static/app-plus/apple.png'
-			}
-		},
-		async onLoad(e) {
-			//获取通过url传递的参数type设置当前登录方式，如果没传递直接默认以配置的登录
-			let type = e.type || config.loginTypes[0]
-			this.type = type
-
-			// console.log("this.type: -----------",this.type);
-			if (type != 'univerify') {
-				this.focusPhone = true
-			}
-			this.$nextTick(() => {
-				//关闭重复显示的登录快捷方式
-				if (['weixin', 'apple'].includes(type)) {
-					this.$refs.uniFabLogin.servicesList = this.$refs.uniFabLogin.servicesList.filter(item =>
-						item.id != type)
-				}
-			})
-			uni.$on('uni-id-pages-setLoginType', type => {
-				this.type = type
-			})
-		},
-		onShow() {
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.toSmsPage()
-				}
-			};
-			// #endif
-		},
-		onUnload() {
-			uni.$off('uni-id-pages-setLoginType')
-		},
-		onReady() {
-			// 是否优先启动一键登录。即：页面一加载就启动一键登录
-			//#ifdef APP-PLUS
-			if (this.type == "univerify") {
-				const pages = getCurrentPages();
-				currentWebview = pages[pages.length - 1].$getAppWebview();
-				currentWebview.setStyle({
-					"top": "2000px" // 隐藏当前页面窗体
-				})
-				this.type == this.loginTypes[1]
-				// console.log('开始一键登录');
-				this.$refs.uniFabLogin.login_before('univerify')
-			}
-			//#endif
-		},
-		methods: {
-			showCurrentWebview(){
-				// 恢复当前页面窗体的显示 一键登录，默认不显示当前窗口
-				currentWebview.setStyle({
-					"top": 0
-				})
-			},
-			quickLogin(e) {
-				let options = {}
-
-				if (e.detail?.code) {
-					options.phoneNumberCode = e.detail.code
-				}
-
-				if (this.type === 'weixinMobile' && !e.detail?.code) return
-
-				this.$refs.uniFabLogin.login_before(this.type, true, options)
-			},
-			toSmsPage() {
-				if (!this.isPhone) {
-					this.focusPhone = true
-					return uni.showToast({
-						title: "手机号码格式不正确",
-						icon: 'none',
-						duration: 3000
-					});
-				}
-				if (this.needAgreements && !this.agree) {
-					return this.$refs.agreements.popup(this.toSmsPage)
-				}
-				// 发送验证吗
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/login/login-smscode?phoneNumber=' + this.phone
-				});
-			},
-			//去密码登录页
-			toPwdLogin() {
-				uni.navigateTo({
-					url: '../login/password'
-				})
-			},
-			chooseArea() {
-				uni.showToast({
-					title: '暂不支持其他国家',
-					icon: 'none',
-					duration: 3000
-				});
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
-	@media screen and (min-width: 690px) {
-		.uni-content {
-			height: 350px;
-		}
-	}
-
-	.uni-content,
-	.quickLogin {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		flex-direction: column;
-		/* #endif */
-	}
-
-	.phone-box {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-	}
-
-	.area {
-		position: absolute;
-		left: 10px;
-		z-index: 9;
-		top: 12px;
-		font-size: 14px;
-	}
-
-	.area::after {
-		content: "";
-		border: 3px solid transparent;
-		border-top-color: #000;
-		top: 12px;
-		left: 3px;
-		position: relative;
-	}
-
-	/* #ifdef MP */
-	// 解决小程序端开启虚拟节点virtualHost引起的 class = input-box丢失的问题 [详情参考](https://uniapp.dcloud.net.cn/matter.html#%E5%90%84%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%AE%9E%E7%8E%B0%E6%9C%BA%E5%88%B6%E4%B8%8D%E5%90%8C-%E5%8F%AF%E8%83%BD%E5%AD%98%E5%9C%A8%E7%9A%84%E5%B9%B3%E5%8F%B0%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98)
-	.phone-box ::v-deep .uni-easyinput__content,
-	/* #endif */
-	.input-box {
-		/* #ifndef APP-NVUE */
-		box-sizing: border-box;
-		/* #endif */
-		flex: 1;
-		padding-left: 45px;
-		margin-bottom: 10px;
-		border-radius: 0;
-	}
-
-	.quickLogin {
-		height: 350px;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.quickLoginBtn {
-		margin: 20px 0;
-		width: 450rpx;
-		/* #ifndef APP-NVUE */
-		max-width: 230px;
-		/* #endif */
-		height: 82rpx;
-	}
-
-	.tip {
-		margin-top: -15px;
-		margin-bottom: 20px;
-	}
-
-	@media screen and (min-width: 690px) {
-		.quickLogin {
-			height: auto;
-		}
-	}
-</style>
+<!-- 免密登录页 -->
+<template>
+	<view class="uni-content">
+		<view class="login-logo">
+			<image :src="logo"></image>
+		</view>
+		<!-- 顶部文字 -->
+		<text class="title">请选择登录方式</text>
+		<!-- 快捷登录框 当url带参数时有效 -->
+		<template v-if="['apple','weixin', 'weixinMobile'].includes(type)">
+			<text class="tip">将根据第三方账号服务平台的授权范围获取你的信息</text>
+			<view class="quickLogin">
+				<image v-if="type !== 'weixinMobile'" @click="quickLogin" :src="imgSrc" mode="widthFix"
+					class="quickLoginBtn"></image>
+				<button v-else type="primary" open-type="getPhoneNumber" @getphonenumber="quickLogin"
+					class="uni-btn">微信授权手机号登录</button>
+				<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
+			</view>
+		</template>
+		<template v-else>
+			<text class="tip">未注册的账号验证通过后将自动注册</text>
+			<view class="phone-box">
+				<view @click="chooseArea" class="area">+86</view>
+				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" type="number"
+					:inputBorder="false" v-model="phone" maxlength="11" placeholder="请输入手机号" />
+			</view>
+			<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
+			<button class="uni-btn" type="primary" @click="toSmsPage">获取验证码</button>
+		</template>
+		<!-- 固定定位的快捷登录按钮 -->
+		<uni-id-pages-fab-login ref="uniFabLogin"></uni-id-pages-fab-login>
+	</view>
+</template>
+
+<script>
+	let currentWebview; //当前窗口对象
+	import config from '@/uni_modules/uni-id-pages/config.js'
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				type: "", //快捷登录方式
+				phone: "", //手机号码
+				focusPhone: false,
+				logo: "/static/logo.png"
+			}
+		},
+		computed: {
+			async loginTypes() { //读取配置的登录优先级
+				return config.loginTypes
+			},
+			isPhone() { //手机号码校验正则
+				return /^1\d{10}$/.test(this.phone);
+			},
+			imgSrc() { //大快捷登录按钮图
+				return this.type == 'weixin' ? '/uni_modules/uni-id-pages/static/login/weixin.png' :
+					'/uni_modules/uni-id-pages/static/app-plus/apple.png'
+			}
+		},
+		async onLoad(e) {
+			//获取通过url传递的参数type设置当前登录方式，如果没传递直接默认以配置的登录
+			let type = e.type || config.loginTypes[0]
+			this.type = type
+
+			// console.log("this.type: -----------",this.type);
+			if (type != 'univerify') {
+				this.focusPhone = true
+			}
+			this.$nextTick(() => {
+				//关闭重复显示的登录快捷方式
+				if (['weixin', 'apple'].includes(type)) {
+					this.$refs.uniFabLogin.servicesList = this.$refs.uniFabLogin.servicesList.filter(item =>
+						item.id != type)
+				}
+			})
+			uni.$on('uni-id-pages-setLoginType', type => {
+				this.type = type
+			})
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.toSmsPage()
+				}
+			};
+			// #endif
+		},
+		onUnload() {
+			uni.$off('uni-id-pages-setLoginType')
+		},
+		onReady() {
+			// 是否优先启动一键登录。即：页面一加载就启动一键登录
+			//#ifdef APP-PLUS
+			if (this.type == "univerify") {
+				const pages = getCurrentPages();
+				currentWebview = pages[pages.length - 1].$getAppWebview();
+				currentWebview.setStyle({
+					"top": "2000px" // 隐藏当前页面窗体
+				})
+				this.type == this.loginTypes[1]
+				// console.log('开始一键登录');
+				this.$refs.uniFabLogin.login_before('univerify')
+			}
+			//#endif
+		},
+		methods: {
+			showCurrentWebview(){
+				// 恢复当前页面窗体的显示 一键登录，默认不显示当前窗口
+				currentWebview.setStyle({
+					"top": 0
+				})
+			},
+			quickLogin(e) {
+				let options = {}
+
+				if (e.detail?.code) {
+					options.phoneNumberCode = e.detail.code
+				}
+
+				if (this.type === 'weixinMobile' && !e.detail?.code) return
+
+				this.$refs.uniFabLogin.login_before(this.type, true, options)
+			},
+			toSmsPage() {
+				if (!this.isPhone) {
+					this.focusPhone = true
+					return uni.showToast({
+						title: "手机号码格式不正确",
+						icon: 'none',
+						duration: 3000
+					});
+				}
+				if (this.needAgreements && !this.agree) {
+					return this.$refs.agreements.popup(this.toSmsPage)
+				}
+				// 发送验证吗
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-smscode?phoneNumber=' + this.phone
+				});
+			},
+			//去密码登录页
+			toPwdLogin() {
+				uni.navigateTo({
+					url: '../login/password'
+				})
+			},
+			chooseArea() {
+				uni.showToast({
+					title: '暂不支持其他国家',
+					icon: 'none',
+					duration: 3000
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	@media screen and (min-width: 690px) {
+		.uni-content {
+			height: 350px;
+		}
+	}
+
+	.uni-content,
+	.quickLogin {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+	}
+
+	.phone-box {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+	}
+
+	.area {
+		position: absolute;
+		left: 10px;
+		z-index: 9;
+		top: 12px;
+		font-size: 14px;
+	}
+
+	.area::after {
+		content: "";
+		border: 3px solid transparent;
+		border-top-color: #000;
+		top: 12px;
+		left: 3px;
+		position: relative;
+	}
+
+	/* #ifdef MP */
+	// 解决小程序端开启虚拟节点virtualHost引起的 class = input-box丢失的问题 [详情参考](https://uniapp.dcloud.net.cn/matter.html#%E5%90%84%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%AE%9E%E7%8E%B0%E6%9C%BA%E5%88%B6%E4%B8%8D%E5%90%8C-%E5%8F%AF%E8%83%BD%E5%AD%98%E5%9C%A8%E7%9A%84%E5%B9%B3%E5%8F%B0%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98)
+	.phone-box ::v-deep .uni-easyinput__content,
+	/* #endif */
+	.input-box {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		flex: 1;
+		padding-left: 45px;
+		margin-bottom: 10px;
+		border-radius: 0;
+	}
+
+	.quickLogin {
+		height: 350px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.quickLoginBtn {
+		margin: 20px 0;
+		width: 450rpx;
+		/* #ifndef APP-NVUE */
+		max-width: 230px;
+		/* #endif */
+		height: 82rpx;
+	}
+
+	.tip {
+		margin-top: -15px;
+		margin-bottom: 20px;
+	}
+
+	@media screen and (min-width: 690px) {
+		.quickLogin {
+			height: auto;
+		}
+	}
+</style>
--- a/uni_modules/uni-id-pages/pages/register/register-admin.vue
+++ b/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',
-							duration: 3000
-						});
-					}
-					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 => {
-					uni.navigateBack()
-				})
-				.catch(e => {
-					//更好的体验：登录错误，直接刷新验证码
-					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;
-			max-height: 520px;
-		}
-		
-		.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',
+							duration: 3000
+						});
+					}
+					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 => {
+					uni.navigateBack()
+				})
+				.catch(e => {
+					//更好的体验：登录错误，直接刷新验证码
+					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;
+			max-height: 520px;
+		}
+		
+		.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>
--- a/uni_modules/uni-id-pages/pages/register/register-by-email.vue
+++ b/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>
--- a/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue
+++ b/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() {
-				this.$refs.form.validate()
-					.then(res => {
-						let {
-							email,
-							password: password,
-							captcha,
-							code
-						} = this.formData
-						uniIdCo.resetPwdByEmail({
-								email,
-								code,
-								password,
-								captcha
-							}).then(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'){
-							return this.$refs.shortCode.focusSmsCodeInput = true
-						}
-						key = key.replace(key[0], key[0].toUpperCase())
-						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() {
+				this.$refs.form.validate()
+					.then(res => {
+						let {
+							email,
+							password: password,
+							captcha,
+							code
+						} = this.formData
+						uniIdCo.resetPwdByEmail({
+								email,
+								code,
+								password,
+								captcha
+							}).then(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'){
+							return this.$refs.shortCode.focusSmsCodeInput = true
+						}
+						key = key.replace(key[0], key[0].toUpperCase())
+						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>
--- a/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
+++ b/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() {
-				this.$refs.form.validate()
-					.then(res => {
-						let {
-							"phone": mobile,
-							"password": password,
-							captcha,
-							code
-						} = this.formData
-						uniIdCo.resetPwdBySms({
-								mobile,
-								code,
-								password,
-								captcha
-							}).then(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'){
-							return this.$refs.shortCode.focusSmsCodeInput = true
-						}
-						key = key.replace(key[0], key[0].toUpperCase())
-						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() {
+				this.$refs.form.validate()
+					.then(res => {
+						let {
+							"phone": mobile,
+							"password": password,
+							captcha,
+							code
+						} = this.formData
+						uniIdCo.resetPwdBySms({
+								mobile,
+								code,
+								password,
+								captcha
+							}).then(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'){
+							return this.$refs.shortCode.focusSmsCodeInput = true
+						}
+						key = key.replace(key[0], key[0].toUpperCase())
+						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>
--- a/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue
-<!-- 绑定手机号码页 -->
-<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',
-						duration: 3000
-					});
-				}
-				if(! /^\d{6}$/.test(this.formData.code)){
-					this.$refs.smsForm.focusSmsCodeInput = true 
-					return uni.showToast({
-						title: '验证码格式不正确',
-						icon: 'none',
-						duration: 3000
-					});
-				}
-				
-				const uniIdCo = uniCloud.importObject("uni-id-co")
-				uniIdCo.bindMobileBySms(this.formData).then(e => {
-					uni.showToast({
-						title: e.errMsg,
-						icon: 'none',
-						duration: 3000
-					});
-					// #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',
+						duration: 3000
+					});
+				}
+				if(! /^\d{6}$/.test(this.formData.code)){
+					this.$refs.smsForm.focusSmsCodeInput = true 
+					return uni.showToast({
+						title: '验证码格式不正确',
+						icon: 'none',
+						duration: 3000
+					});
+				}
+				
+				const uniIdCo = uniCloud.importObject("uni-id-co")
+				uniIdCo.bindMobileBySms(this.formData).then(e => {
+					uni.showToast({
+						title: e.errMsg,
+						icon: 'none',
+						duration: 3000
+					});
+					// #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>
--- a/uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage.vue
--- a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/README.md
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/README.md
--- a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/photo.svg
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/photo.svg
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#606060;}
-	.st1{fill:none;stroke:#FFFFFF;stroke-width:2.4306;stroke-miterlimit:10;}
-	.st2{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st2" d="M11.6,11c0.4,0.4,0.6,0.9,0.6,1.5c0,0.6-0.2,1.1-0.6,1.4c-0.4,0.4-0.9,0.6-1.5,0.6c-0.6,0-1.1-0.2-1.5-0.6
-		c-0.4-0.4-0.6-0.9-0.6-1.4s0.2-1.1,0.6-1.5c0.4-0.4,0.9-0.6,1.5-0.6C10.8,10.4,11.2,10.6,11.6,11z M24.6,18.4V6.7H5.4v12l1.8-1.8
-		c0.3-0.3,0.6-0.4,1-0.4c0.4,0,0.7,0.1,1,0.4l1.8,1.8l5.8-7c0.3-0.3,0.6-0.5,1.1-0.5c0.4,0,0.8,0.2,1.1,0.5
-		C18.8,11.6,24.6,18.4,24.6,18.4z M25.6,5.7C25.9,6,26,6.3,26,6.7v16.1c0,0.4-0.1,0.7-0.4,1c-0.3,0.3-0.6,0.4-1,0.4H5.4
-		c-0.4,0-0.7-0.1-1-0.4c-0.3-0.3-0.4-0.6-0.4-1V6.7c0-0.4,0.1-0.7,0.4-1c0.3-0.3,0.6-0.4,1-0.4h19.3C25,5.3,25.3,5.4,25.6,5.7z"/>
-	<path class="st1" d="M24.3,21.5H5.7c-0.2,0-0.3-0.2-0.3-0.3V7c0-0.2,0.2-0.3,0.3-0.3h18.6c0.2,0,0.3,0.2,0.3,0.3v14.2
-		C24.6,21.3,24.5,21.5,24.3,21.5z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#606060;}
+	.st1{fill:none;stroke:#FFFFFF;stroke-width:2.4306;stroke-miterlimit:10;}
+	.st2{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st2" d="M11.6,11c0.4,0.4,0.6,0.9,0.6,1.5c0,0.6-0.2,1.1-0.6,1.4c-0.4,0.4-0.9,0.6-1.5,0.6c-0.6,0-1.1-0.2-1.5-0.6
+		c-0.4-0.4-0.6-0.9-0.6-1.4s0.2-1.1,0.6-1.5c0.4-0.4,0.9-0.6,1.5-0.6C10.8,10.4,11.2,10.6,11.6,11z M24.6,18.4V6.7H5.4v12l1.8-1.8
+		c0.3-0.3,0.6-0.4,1-0.4c0.4,0,0.7,0.1,1,0.4l1.8,1.8l5.8-7c0.3-0.3,0.6-0.5,1.1-0.5c0.4,0,0.8,0.2,1.1,0.5
+		C18.8,11.6,24.6,18.4,24.6,18.4z M25.6,5.7C25.9,6,26,6.3,26,6.7v16.1c0,0.4-0.1,0.7-0.4,1c-0.3,0.3-0.6,0.4-1,0.4H5.4
+		c-0.4,0-0.7-0.1-1-0.4c-0.3-0.3-0.4-0.6-0.4-1V6.7c0-0.4,0.1-0.7,0.4-1c0.3-0.3,0.6-0.4,1-0.4h19.3C25,5.3,25.3,5.4,25.6,5.7z"/>
+	<path class="st1" d="M24.3,21.5H5.7c-0.2,0-0.3-0.2-0.3-0.3V7c0-0.2,0.2-0.3,0.3-0.3h18.6c0.2,0,0.3,0.2,0.3,0.3v14.2
+		C24.6,21.3,24.5,21.5,24.3,21.5z"/>
+</g>
+</svg>
--- a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/rotate.svg
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/rotate.svg
--- a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/index.css
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/index.css
--- a/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/limeClipper.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/limeClipper.vue
--- a/uni_modules/uni-id-pages/pages/userinfo/realname-verify/face-verify-icon.svg
+++ b/uni_modules/uni-id-pages/pages/userinfo/realname-verify/face-verify-icon.svg
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1675667510055" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4003" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M807.936 106.656h-76a24.32 24.32 0 0 0-17.92 7.936 27.744 27.744 0 0 0-7.424 19.104c0 6.944 2.464 13.792 7.424 19.104a24.32 24.32 0 0 0 17.92 7.904h76v81.088c0 6.944 2.432 13.76 7.424 19.104a24.32 24.32 0 0 0 35.808 0 27.744 27.744 0 0 0 7.424-19.104V160.704c0-29.824-22.72-54.048-50.656-54.048zM833.248 512a25.12 25.12 0 0 0-17.92 7.392 25.12 25.12 0 0 0-7.392 17.92v76h-76a25.12 25.12 0 0 0-17.92 7.424c-1.344 1.344-2.08 3.072-3.072 4.704-28.576-27.52-60.704-50.112-96.256-65.152 72.192-43.136 117.888-126.08 103.872-219.296-13.216-87.456-81.056-160.576-167.648-178.656a228.16 228.16 0 0 0-46.944-4.896 217.056 217.056 0 0 0-217.12 217.12c0 79.264 42.976 147.936 106.368 185.824-35.456 15.04-67.648 37.632-96.256 65.152-0.96-1.632-1.696-3.36-3.072-4.704a25.12 25.12 0 0 0-17.92-7.424H200v-76a25.12 25.12 0 0 0-7.424-17.92 25.12 25.12 0 0 0-17.92-7.424 25.12 25.12 0 0 0-17.92 7.424 25.12 25.12 0 0 0-7.392 17.92v76c0 27.936 22.72 50.656 50.656 50.656H262.4c-42.336 54.816-71.712 123.488-80.96 200.192-3.424 28.224 19.104 53.12 47.488 53.12h550.048c28.416 0 50.848-24.96 47.488-53.12-9.216-76.8-38.624-145.472-80.96-200.288h62.4c27.968 0 50.688-22.72 50.688-50.656V537.28a25.12 25.12 0 0 0-7.424-17.92 25.12 25.12 0 0 0-17.92-7.392zM174.72 268.8a24.32 24.32 0 0 0 17.888-7.904 27.744 27.744 0 0 0 7.424-19.104V160.704h76a24.32 24.32 0 0 0 17.92-7.904 27.744 27.744 0 0 0 7.392-19.104 27.744 27.744 0 0 0-7.424-19.104 24.32 24.32 0 0 0-17.92-7.936H200c-27.968 0-50.656 24.224-50.656 54.08v81.056c0 6.944 2.432 13.76 7.392 19.104a24.32 24.32 0 0 0 17.92 7.904z" fill="#72a7ff" p-id="4004"></path></svg>
--- a/uni_modules/uni-id-pages/pages/userinfo/realname-verify/realname-verify.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/realname-verify/realname-verify.vue
--- a/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd.vue
--- a/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
--- a/uni_modules/uni-id-pages/readme.md
+++ b/uni_modules/uni-id-pages/readme.md
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/constants.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/constants.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/error.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/error.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/sensitive-aes-cipher.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/sensitive-aes-cipher.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/universal.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/universal.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/utils.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/utils.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/validator.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/validator.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/config/permission.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/config/permission.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/en.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/en.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/zh-hans.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/zh-hans.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/README.md
+++ b/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
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/protocols.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/protocols.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/alipayBase.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/alipayBase.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/account/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/account/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/rsa-public-key-pem.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/rsa-public-key-pem.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/account/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/account/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/normalize.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/normalize.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/share/create-api.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/share/create-api.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/account/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/account/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/normalize.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/normalize.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/utils.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/utils.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/account.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/account.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/captcha.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/captcha.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/config.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/config.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/fission.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/fission.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/login.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/login.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/logout.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/logout.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/password.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/password.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/qq.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/qq.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/register.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/register.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/relate.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/relate.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/sms.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/sms.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/unified-login.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/unified-login.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/univerify.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/univerify.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/update-user-info.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/update-user-info.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/utils.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/utils.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/verify-code.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/verify-code.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/weixin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/weixin.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/access-control.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/access-control.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/auth.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/auth.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/rbac.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/rbac.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/uni-id-log.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/uni-id-log.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/validate.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/validate.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/verify-request-sign.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/verify-request-sign.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/close-account.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/close-account.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/get-account-info.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/get-account-info.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/get-realname-info.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/get-realname-info.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-email.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-email.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-sms.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-sms.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/set-pwd.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/set-pwd.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/update-pwd.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/update-pwd.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/add-user.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/add-user.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/update-user.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/update-user.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/get-supported-login-type.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/get-supported-login-type.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/login.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/login.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/register.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/register.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/update-user-info.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/external/update-user-info.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/facial-recognition-verify/get-auth-result.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/facial-recognition-verify/get-auth-result.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/facial-recognition-verify/get-certify-id.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/facial-recognition-verify/get-certify-id.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/facial-recognition-verify/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/facial-recognition-verify/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/accept-invite.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/accept-invite.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/get-invited-user.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/get-invited-user.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-alipay.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-alipay.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-apple.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-apple.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-baidu.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-baidu.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-dingtalk.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-dingtalk.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-douyin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-douyin.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-code.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-code.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-link.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-link.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-facebook.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-facebook.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-google.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-google.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-qq.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-qq.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-sms.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-sms.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-taobao.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-taobao.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-toutiao.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-toutiao.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-univerify.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-univerify.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weibo.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weibo.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin-mobile.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin-mobile.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/logout.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/logout.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/authorize-app-login.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/authorize-app-login.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/remove-authorized-app.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/remove-authorized-app.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/set-authorized-app.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/set-authorized-app.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/utils.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/utils.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-admin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-admin.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user-by-email.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user-by-email.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-alipay.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-alipay.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-apple.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-apple.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-mp-weixin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-mp-weixin.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-sms.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-sms.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-univerify.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-univerify.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-qq.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-qq.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-weixin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-weixin.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-alipay.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-alipay.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-apple.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-apple.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-qq.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-qq.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-weixin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/unbind-weixin.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/refresh-token.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/refresh-token.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/secure-network-handshake-by-weixin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/secure-network-handshake-by-weixin.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/set-push-cid.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/set-push-cid.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/create-captcha.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/create-captcha.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/index.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/index.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/refresh-captcha.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/refresh-captcha.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-code.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-code.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-link.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-link.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-sms-code.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-sms-code.js
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json
--- a/uni_modules/uni-id-pages/uniCloud/database/opendb-device.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/opendb-device.schema.json
--- a/uni_modules/uni-id-pages/uniCloud/database/opendb-frv-logs.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/opendb-frv-logs.schema.json
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-device.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-device.schema.json
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-log.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-log.schema.json
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-permissions.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-permissions.schema.json
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-roles.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-roles.schema.json
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
--- a/uni_modules/uni-list/changelog.md
+++ b/uni_modules/uni-list/changelog.md
--- a/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
+++ b/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
--- a/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
+++ b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
--- a/uni_modules/uni-list/package.json
+++ b/uni_modules/uni-list/package.json
--- a/uni_modules/uni-open-bridge-common/changelog.md
+++ b/uni_modules/uni-open-bridge-common/changelog.md
--- a/uni_modules/uni-open-bridge-common/package.json
+++ b/uni_modules/uni-open-bridge-common/package.json
--- a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/config.js
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/config.js
--- a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/consts.js
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/consts.js
--- a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/index.js
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/index.js
--- a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/storage.js
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/storage.js
--- a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/weixin-server.js
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/weixin-server.js
--- a/uni_modules/uni-open-bridge-common/uniCloud/database/opendb-open-data.schema.json
+++ b/uni_modules/uni-open-bridge-common/uniCloud/database/opendb-open-data.schema.json
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
--- a/uni_modules/uni-transition/changelog.md
+++ b/uni_modules/uni-transition/changelog.md
--- a/uni_modules/uni-transition/components/uni-transition/createAnimation.js
+++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
--- a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
--- a/uni_modules/uni-transition/package.json
+++ b/uni_modules/uni-transition/package.json
--- a/uni_modules/uni-transition/readme.md
+++ b/uni_modules/uni-transition/readme.md