diff --git a/.gitignore b/.gitignore
index 78df13555fa2898860ecf3ca7fd7762a11bace49..ba04d33b4b5754f3fb805ecf941c2e6cfe1ae5f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
+.DS_Store
 unpackage/
 .hbuilderx
 node_modules
-.DS_Store
+.vite/
 uni_modules_tools/copy
-package-lock.json
\ No newline at end of file
+package-lock.json
+/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json 
\ No newline at end of file
diff --git a/App.vue b/App.vue
index 9967daa3a0adf48e6c5e25c0153247178c99f8fe..0682c7d72b392374b1d7480740507a3952db6ff0 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,9 @@
 <script>
 	import initApp from '@/common/appInit.js';
-	import openApp from '@/common/openApp.js';
+	import openApp from '@/common/openApp.js';
+	// #ifdef H5
+		openApp() //创建在h5端全局悬浮引导用户下载app的功能
+	// #endif
 	import checkIsAgree from '@/pages/uni-agree/utils/uni-agree.js';
 	export default {
 		globalData: {
@@ -17,9 +20,7 @@
 
 			initApp();
 			
-			// #ifdef H5
-				openApp() //创建在h5端全局悬浮引导用户下载app的功能
-			// #endif
+			
 			// #ifdef APP-PLUS
 			//checkIsAgree(); APP端暂时先用原生默认生成的。目前，自定义方式启动vue界面时，原生层已经请求了部分权限这并不符合国家的法规
 			// #endif
@@ -29,7 +30,17 @@
 			// #endif
 
 			// #ifdef APP-PLUS
-			//idfa有需要的用户在应用首次启动时自己获取存储到storage中
+			//idfa有需要的用户在应用首次启动时自己获取存储到storage中
+			var idfa = '';
+			var manager = plus.ios.invoke('ASIdentifierManager', 'sharedManager');
+			if(plus.ios.invoke(manager, 'isAdvertisingTrackingEnabled')){
+				var identifier = plus.ios.invoke(manager, 'advertisingIdentifier');
+				idfa = plus.ios.invoke(identifier, 'UUIDString');
+				plus.ios.deleteObject(identifier);
+			}
+			plus.ios.deleteObject(manager);
+			console.log('idfa = '+idfa);
+			
 			//https://ask.dcloud.net.cn/article/36107
 			/*if(~plus.storage.getItem('idfa')){
 				plus.device.getInfo({//需要勾选IDFA
diff --git a/changelog.md b/changelog.md
index a07a73c288c2620e2d7fc135539b8e5053b00f03..52f753f64260a8f7a0050c748d08a588dea35f59 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,9 @@
+## 2.0.0（2022-08-10）
+应用`uni-id-pages`、`uniIdRouter`
+## 1.2.7（2022-08-10）
+- 修复微信小程序绑定手机号失败的问题
+## 1.2.6（2022-06-29）
+- 支持 ios 安全区
 ## 1.2.5（2022-05-29）
 升级预置的`uni_modules`->`uni-captcha`版本为：0.6.0。[详情](https://ext.dcloud.net.cn/plugin?name=uni-captcha)
 ## 1.2.4（2022-05-20）
diff --git a/common/appInit.js b/common/appInit.js
index da70ffd2acfb32c8c1fac8f2652fdd5db79550d2..10f49a1dae57b3bd6e16f6d5ea15efae51b9a9c3 100644
--- a/common/appInit.js
+++ b/common/appInit.js
@@ -1,60 +1,17 @@
 import uniStarterConfig from '@/uni-starter.config.js';
-import store from '@/store'
 //应用初始化页
 // #ifdef APP-PLUS
 import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
 import callCheckVersion from '@/uni_modules/uni-upgrade-center-app/utils/call-check-version';
+
+// 实现，路由拦截。当应用无访问摄像头/相册权限，引导跳到设置界面
 import interceptorChooseImage from '@/uni_modules/json-interceptor-chooseImage/js_sdk/main.js';
+interceptorChooseImage()
+
 // #endif
 const db = uniCloud.database()
 export default async function() {
-	let loginConfig = uniStarterConfig.router.login;
-	const debug = uniStarterConfig.debug;
-	//清除有配置但设备环境不支持的登录项
-	// #ifdef APP-PLUS
-	await new Promise((callBack) => {
-		plus.oauth.getServices(oauthServices => {
-			loginConfig = loginConfig.filter(item => {
-				if (["univerify", "weixin", "apple"].includes(item)) {
-					let index = oauthServices.findIndex(e => e.id == item)
-					if (index == -1) {
-						return false
-					} else {
-						return oauthServices[index].nativeClient
-					}
-				} else {
-					return true
-				}
-			})
-			if (loginConfig.includes('univerify')) { //一键登录 功能预登录
-				uni.preLogin({
-					provider: 'univerify',
-					complete: e => {
-						console.log(e);
-					}
-				})
-			}
-			callBack()
-		}, err => {
-			console.error('获取服务供应商失败：' + JSON.stringify(err));
-		})
-	})
-	// #endif
-
-	//非app移除：一键登录、苹果登录；h5移除微信登录，如果你做微信公众号登录需要将此行移除
-	// #ifndef APP-PLUS
-	loginConfig = loginConfig.filter(item => {
-		return ![
-			'univerify',
-			'apple',
-			// #ifdef H5
-			'weixin'
-			// #endif
-		].includes(item)
-	})
-	// #endif
-
-	uniStarterConfig.router.login = loginConfig
+	const debug = uniStarterConfig.debug;
 
 	// uniStarterConfig挂载到getApp().globalData.config
 	setTimeout(() => {
@@ -67,12 +24,6 @@ export default async function() {
 	// 初始化appVersion（仅app生效）
 	initAppVersion();
 
-	// #ifdef APP-PLUS
-	// 实现，路由拦截。当应用无访问摄像头/相册权限，引导跳到设置界面
-	interceptorChooseImage()
-	// #endif
-
-
 	//clientDB的错误提示
 	function onDBError({
 		code, // 错误码详见https://uniapp.dcloud.net.cn/uniCloud/clientdb?id=returnvalue
@@ -84,307 +35,75 @@ export default async function() {
 		});
 		// 处理错误
 		console.error(code, message);
-		if ([
-				'TOKEN_INVALID_INVALID_CLIENTID',
-				'TOKEN_INVALID',
-				'TOKEN_INVALID_TOKEN_EXPIRED',
-				'TOKEN_INVALID_WRONG_TOKEN',
-				'TOKEN_INVALID_ANONYMOUS_USER'
-			].includes(code)) {
-			uni.navigateTo({
-				url: '/pages/ucenter/login-page/index/index'
-			})
-		}
 	}
 	// 绑定clientDB错误事件
 	db.on('error', onDBError)
 
-	// 解绑clientDB错误事件
-	//db.off('error', onDBError)
-	db.on('refreshToken', function({
-		token,
-		tokenExpired
-	}) {
-		console.log('监听到clientDB的refreshToken', {
-			token,
-			tokenExpired
-		});
-		store.commit('user/login', {
-			token,
-			tokenExpired
-		})
-	})
-	
-	uni.addInterceptor('setStorage', {
-		invoke(args) {
-			if (args.data && args.key == 'uni_id_token') {
-				let oldToken = uni.getStorageSync('uni_id_token')
-				if(oldToken.length){
-					console.log('监听到token更新，就刷新push_clientid的有效期');
-					// #ifdef APP-PLUS
-					let push_clientid;
-					try {
-						push_clientid = plus.push.getClientInfo().clientid
-					} catch (e) {
-						uni.showModal({
-							content: '获取推送标识失败。如果你的应用不需要推送功能，请注释掉本代码块',
-							showCancel: false,
-							confirmText: "好的"
-						});
-						console.log(e)
-					}
-					uniCloud.callFunction({
-						name:'uni-id-cf',
-						data:{
-							"action": "renewDeviceTokenExpiredxpired",
-							"params": {push_clientid}
-						},
-						complete: (e) => {
-							console.log(e);
-						}
-					})
-					// #endif
-				}
-			}
-			// console.log('interceptor-complete', args)
-		},
-		complete(e) {
-			// console.log(e);
-		}
-	})
 
-	//拦截器封装callFunction
-	let callFunctionOption;
-	uniCloud.addInterceptor('callFunction', {
-		async invoke(option) {
-			// 判断如果是执行登录（无论是哪种登录方式），就记录用户的相关设备id
-			// 注意：注册可能不仅仅走register接口，还有登录并注册的接口
-			if (option.name == 'uni-id-cf' &&
-				(option.data.action == 'register' || option.data.action.slice(0, 5) == 'login')
-			) {
-				option.data.deviceInfo = await getDeviceInfo()
-				console.log("重新登录/注册，获取设备id", option.data.deviceInfo);
-				option.data.inviteCode = await new Promise((callBack) => {
-					uni.getClipboardData({
-						success: function(res) {
-							if (res.data.slice(0, 18) == 'uniInvitationCode:') {
-								let uniInvitationCode = res.data.slice(18, 38)
-								console.log('当前用户是其他用户推荐下载的,推荐者的code是：' +
-									uniInvitationCode);
-								// uni.showModal({
-								// 	content: '当前用户是其他用户推荐下载的,推荐者的code是：'+uniInvitationCode,
-								// 	showCancel: false
-								// });
-								callBack(uniInvitationCode)
-								//当前用户是其他用户推荐下载的。这里登记他的推荐者id 为当前用户的myInviteCode。判断如果是注册
-							} else {
-								callBack(false)
-							}
-						},
-						fail() {
-							callBack(false)
+	//拦截云对象请求
+	uniCloud.interceptObject({
+		async invoke({
+			objectName, // 云对象名称
+			methodName, // 云对象的方法名称
+			params // 参数列表
+		}) {
+			console.log('interceptObject',{
+				objectName, // 云对象名称
+				methodName, // 云对象的方法名称
+				params // 参数列表
+			});
+			if(objectName == "uni-id-co" && (methodName.includes('loginBy') ||  ['login','registerUser'].includes(methodName) )){
+				console.log('执行登录相关云对象');
+				params[0].inviteCode = await new Promise((callBack) => {
+					uni.getClipboardData({
+						success: function(res) {
+							console.log('剪切板内容：'+res.data);
+							if (res.data.slice(0, 18) == 'uniInvitationCode:') {
+								let uniInvitationCode = res.data.slice(18, 38)
+								console.log('当前用户是其他用户推荐下载的,推荐者的code是：' +
+									uniInvitationCode);
+								// uni.showModal({
+								// 	content: '当前用户是其他用户推荐下载的,推荐者的code是：'+uniInvitationCode,
+								// 	showCancel: false
+								// });
+								callBack(uniInvitationCode)
+								//当前用户是其他用户推荐下载的。这里登记他的推荐者id 为当前用户的myInviteCode。判断如果是注册
+							} else {
+								callBack(false)
+							}
+						},
+						fail() {
+							console.log('error--');
+							callBack(false)
 						},
-						complete(){
+						complete() {
 							// #ifdef MP-WEIXIN
 							uni.hideToast()
 							// #endif
-						}
-					});
-				})
+						}
+					});
+				})
+				console.log(7897897897899,params);
 			}
-			// console.log(JSON.stringify(option));
-			callFunctionOption = option
-		},
-		complete(e) {
-			// console.log(JSON.stringify(e));
+			console.log(params);
 		},
-		fail(e) { // 失败回调拦截
-			console.error('网络请求错误码：',JSON.stringify(e));
-			if (debug) {
-				uni.showModal({
-					content: JSON.stringify(e),
-					showCancel: false
-				});
-				console.error(e);
-			} else {
-				uni.showModal({
-					content: "系统错误请稍后再试！",
-					showCancel: false,
-					confirmText: "知道了"
-				});
-			}
-			//如果执行错误，检查是否断网
-			uni.getNetworkType({
-				complete: res => {
-					// console.log(res);
-					if (res.networkType == 'none') {
-						uni.showToast({
-							title: '手机网络异常',
-							icon: 'none'
-						});
-						console.log('手机网络异常');
-						let callBack = res => {
-							console.log(res);
-							if (res.isConnected) {
-								uni.showToast({
-									title: '恢复联网自动重新执行',
-									icon: 'none'
-								});
-								console.log(res.networkType, "恢复联网自动重新执行");
-								uni.offNetworkStatusChange(e => {
-									console.log("移除监听成功", e);
-								})
-								//恢复联网自动重新执行
-								uniCloud.callFunction(callFunctionOption)
-								uni.offNetworkStatusChange(callBack);
-							}
-						}
-						uni.onNetworkStatusChange(callBack);
-					}
-				}
-			});
+		success(e) {
+			console.log(e);
 		},
-		success: (e) => {
-			const {
-				token,
-				tokenExpired
-			} = e.result
-			if (token && tokenExpired) {
-				store.commit('user/login', {
-					token,
-					tokenExpired
-				})
-			}
-			switch (e.result.code) {
-				case 403:
-					uni.navigateTo({
-						url: "/pages/ucenter/login-page/index/index"
-					})
-					break;
-				case 30203:
-					uni.navigateTo({
-						url: "/pages/ucenter/login-page/index/index"
-					})
-					break;
-				case 50101:
-					uni.showToast({
-						title: e.result.msg,
-						icon: 'none',
-						duration: 2000
-					});
-					break;
-				default:
-					console.log('code的值是：' + e.result.code, '可以在上面添加case，自动处理响应体');
-					break;
-			}
-
-			switch (e.result.errCode) {
-				case 'uni-id-token-not-exist':
-					uni.showToast({
-						title: '登录信息失效',
-						icon: 'none'
-					});
-					uni.navigateTo({
-						url: "/pages/ucenter/login-page/index/index"
-					})
-					break;
-				default:
-					break;
-			}
+		complete() {
+
+		},
+		fail(e){
+			if (debug) {
+				uni.showModal({
+					content: JSON.stringify(e),
+					showCancel: false
+				});
+				console.error(e);
+			}
 		}
 	})
 
-	//自定义路由拦截
-	const {
-		"router": {
-			needLogin,
-			visitor,
-			login
-		}
-	} = uniStarterConfig //需要登录的页面
-
-	let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"];
-	list.forEach(item => { //用遍历的方式分别为,uni.navigateTo,uni.redirectTo,uni.reLaunch,uni.switchTab这4个路由方法添加拦截器
-		uni.addInterceptor(item, {
-			invoke(e) { // 调用前拦截
-				//获取用户的token
-				const token = uni.getStorageSync('uni_id_token'),
-					//token是否已失效
-					tokenExpired = uni.getStorageSync('uni_id_token_expired') < Date.now(),
-					//获取要跳转的页面路径（url去掉"?"和"?"后的参数）
-					url = e.url.split('?')[0];
-				//获取要前往的页面路径（即url去掉"?"和"?"后的参数）
-				const pages = getCurrentPages();
-				if (!pages.length) {
-					console.log("首页启动调用了");
-					return e
-				}
-				const fromUrl = pages[pages.length - 1].route;
-
-				let inLoginPage = fromUrl.split('/')[2] == 'login-page'
-
-				//控制登录优先级
-				if ( //判断当前窗口是否为登录页面，如果是则不重定向路由
-					url == '/pages/ucenter/login-page/index/index' &&
-					!inLoginPage
-				) {
-					//一键登录（univerify）、账号（username）、验证码登录（短信smsCode）
-					if (login[0] == 'username') {
-						e.url = "/pages/ucenter/login-page/pwd-login/pwd-login"
-					} else {
-						if (e.url == url) {
-							e.url += '?'
-						} //添加参数之前判断是否带了`？`号如果没有就补上，因为当开发场景本身有参数的情况下是已经带了`？`号
-						e.url += "type=" + login[0]
-					}
-				} else {
-					//拦截强制登录页面
-					let pass = true
-					//pattern
-					if (needLogin) {
-						pass = needLogin.every((item) => {
-							if (typeof(item) == 'object' && item.pattern) {
-								return !item.pattern.test(url)
-							}
-							return url != item
-						})
-						// console.log({pass})
-					}
-					if (visitor) {
-						pass = visitor.some((item) => {
-							if (typeof(item) == 'object' && item.pattern) {
-								return item.pattern.test(url)
-							}
-							return url == item
-						})
-						// console.log({pass})
-					}
-
-					if (!pass && (token == '' || tokenExpired)) {
-						uni.showToast({
-							title: '请先登录',
-							icon: 'none'
-						})
-						uni.navigateTo({
-							url: "/pages/ucenter/login-page/index/index"
-						})
-						return false
-					}
-				}
-				return e
-			},
-			fail(err) { // 失败回调拦截 
-				console.log(err);
-				if (debug) {
-					console.log(err);
-					uni.showModal({
-						content: JSON.stringify(err),
-						showCancel: false
-					});
-				}
-			}
-		})
-	})
 
 	// #ifdef APP-PLUS
 	// 监听并提示设备网络状态变化
@@ -511,4 +230,4 @@ async function getDeviceInfo() {
 	});
 	// #endif
 	return deviceInfo
-}
\ No newline at end of file
+}
diff --git a/components/uni-agreements/uni-agreements.vue b/components/uni-agreements/uni-agreements.vue
deleted file mode 100644
index d94a5b76d88a0422f894cd84871e0b4c2ad60752..0000000000000000000000000000000000000000
--- a/components/uni-agreements/uni-agreements.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-	<view class="root">
-		<checkbox-group @change="setAgree" class="checkbox-group">
-			<checkbox :checked="isAgree" style="transform: scale(0.7);" />
-			<text>{{$t('common.agree')}}</text>
-		</checkbox-group>
-		<view class="item" v-for="(agreement,index) in agreements" :key="index">
-			<text class="agreement" @click="navigateTo(agreement)">{{agreement.title}}</text>
-			<text class="hint" v-if="hasAnd(agreements,index)">&</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"uni-agreements",
-		computed:{
-			agreements(){
-				return getApp().globalData.config.about.agreements||[]
-			}
-		},
-		methods:{
-			navigateTo({url,title}){
-				uni.navigateTo({
-					url: '/pages/common/webview/webview?url='+url+'&title='+title,
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			hasAnd(agreements,index){
-				return agreements.length-1>index
-			},
-			setAgree(e){
-				this.isAgree = !this.isAgree
-				this.$emit('setAgree',this.isAgree)
-			}
-		},
-		created() {
-			uni.$on('setAgreementsAgree',state=>{
-				console.log('setAgreementsAgree',state);
-				this.isAgree = state
-				this.$emit('setAgree',state)
-			})
-		},
-		data() {
-			return {
-				isAgree:false
-			};
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-/* #ifndef APP-NVUE */
-view{
-	display: flex;
-	box-sizing: border-box;
-	flex-direction: column;
-}
-/* #endif */
-.root{
-	flex-direction: row;
-	align-items: center;
-	font-size: 28rpx;
-	color: #8a8f8b;
-}
-.checkbox-group{
-	align-items: center;
-	display: flex;
-	flex-direction: row;
-}
-.item{
-	flex-direction: row;
-}
-.agreement{
-	color:#04498c;
-}
-</style>
diff --git a/components/uni-bindMobileByMpWeixin/uni-bindMobileByMpWeixin.vue b/components/uni-bindMobileByMpWeixin/uni-bindMobileByMpWeixin.vue
deleted file mode 100644
index d36b9c38c91e93099939fdb1d4c5daa83b3a05eb..0000000000000000000000000000000000000000
--- a/components/uni-bindMobileByMpWeixin/uni-bindMobileByMpWeixin.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-<template>
-	<uni-popup ref="popup" type="bottom">
-		<view class="box">
-			<text class="headBox">绑定资料</text>
-			<text class="tip">将一键获取你的手机号码绑定你的个人资料</text>
-			<view class="btnBox">
-				<text @click="closeMe" class="close">关闭</text>
-				<button class="agree" type="warn" @click="beforeGetphonenumber" open-type="getPhoneNumber"
-					@getphonenumber="bindMobileByMpWeixin">获取</button>
-			</view>
-		</view>
-	</uni-popup>
-</template>
-
-<script>
-	import {
-		mapMutations,
-		mapGetters
-	} from 'vuex';
-	const db = uniCloud.database();
-	const usersTable = db.collection('uni-id-users')
-	let userId = ''
-	export default {
-		emits: ['next'],
-		computed: {
-			...mapGetters({
-				userInfo: 'user/info',
-				login: 'user/hasLogin'
-			})
-		},
-		data() {
-			return {}
-		},
-		methods: {
-			...mapMutations({
-				setUserInfo: 'user/login'
-			}),
-			beforeGetphonenumber() {
-				uni.showLoading({
-					mask:true
-				})
-				wx.checkSession({
-					success() {
-						console.log('session_key 未过期');
-						uni.hideLoading()
-					},
-					fail() {
-						console.log('session_key 已经失效，正在执行更新');
-						wx.login({
-							success({code}) {
-								uniCloud.callFunction({
-									name: "uni-id-cf",
-									data: {
-										"action": "refreshSessionKey",
-										"params": {
-											code
-										}
-									},
-									complete: (e) => {
-										console.log(e);
-										uni.hideLoading()
-									}
-								})
-							},
-							fail: (err) => {
-								console.error(err);
-							}
-						})
-					}
-				})
-			},
-			bindMobileByMpWeixin(e) {
-				console.log(e.detail);
-				if(e.detail.errMsg == "getPhoneNumber:ok"){
-					uniCloud.callFunction({
-						name: "uni-id-cf",
-						data: {
-							"action": "bindMobileByMpWeixin",
-							"params": e.detail
-						},
-						complete: (e) => {
-							console.log(e);
-						},
-						success: (e) => {
-							uni.showToast({
-								title: e.result.msg||'绑定成功',
-								icon: 'none'
-							});
-							if(e.result.code === 0){
-								this.setUserInfo({
-									"mobile": e.result.mobile
-								})
-							}
-							this.closeMe()
-						}
-					})
-				}else{
-					this.closeMe()
-				}
-			},
-			async open(uid) {
-				userId = uid
-				this.$refs.popup.open()
-				this.beforeGetphonenumber()
-			},
-			closeMe(e) {
-				this.$refs.popup.close()
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	view {
-		display: flex;
-	}
-
-	.box {
-		background-color: #FFFFFF;
-		height: 200px;
-		width: 750rpx;
-		flex-direction: column;
-		border-top-left-radius: 15px;
-		border-top-right-radius: 15px;
-	}
-
-	.headBox {
-		padding: 20rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		text-align: left;
-		font-size: 32upx;
-		color: #333333;
-		margin-left: 15rpx;
-	}
-
-	.tip {
-		color: #666666;
-		text-align: left;
-		justify-content: center;
-		margin: 10rpx 30rpx;
-		font-size: 36rpx;
-	}
-
-	.btnBox {
-		margin-top: 45rpx;
-		justify-content: center;
-		flex-direction: row;
-	}
-
-	.close,
-	.agree {
-		text-align: center;
-		width: 200rpx;
-		height: 80upx;
-		line-height: 80upx;
-		border-radius: 50px;
-		margin: 0 20rpx;
-		font-size: 36rpx;
-	}
-
-	.close {
-		color: #999999;
-		border-color: #EEEEEE;
-		border-style: solid;
-		border-width: 1px;
-		background-color: #FFFFFF;
-	}
-
-	.close:active {
-		color: #989898;
-		background-color: #E2E2E2;
-	}
-
-	.agree {
-		background-color: #DD524D;
-		color: #FFFFFF;
-	}
-
-	/* #ifdef MP */
-	.agree::after {
-		border: none;
-	}
-
-	.agree {
-		background-color: #DD524D;
-	}
-
-	/* #endif */
-	.agree:active {
-		background-color: #F5F5F6;
-	}
-</style>
diff --git a/components/uni-quick-login/i18n/en.json b/components/uni-quick-login/i18n/en.json
deleted file mode 100644
index f4f3dfa984c54d88eb82ffc504eaf892a37faa73..0000000000000000000000000000000000000000
--- a/components/uni-quick-login/i18n/en.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"accountLogin": "Account",
-	"SMSLogin": "SMS",
-	"wechatLogin": "wechat",
-	"appleLogin": "Apple",
-	"oneClickLogin": "One click login",
-	"QQLogin": "QQ",
-	"xiaomiLogin": "Xiaomi",
-	"getProviderFail": "Failed to get service provider",
-	"loginErr": "Login service initialization error",
-	"chooseOtherLogin": "Click the third-party login",
-	"weibo":"weibo",
-	"noAgree": "You have not agreed to the privacy policy agreement",
-	"gotIt": "got it"
-}
diff --git a/components/uni-quick-login/i18n/index.js b/components/uni-quick-login/i18n/index.js
deleted file mode 100644
index 5d5703a2c6113fd63367695a6a4c1d4c9cc005be..0000000000000000000000000000000000000000
--- a/components/uni-quick-login/i18n/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import en from './en.json'
-import zhHans from './zh-Hans.json'
-export default {
-	en,
-	'zh-Hans': zhHans
-}
diff --git a/components/uni-quick-login/i18n/zh-Hans.json b/components/uni-quick-login/i18n/zh-Hans.json
deleted file mode 100644
index 91dacb419c2493510e0a83c6ed6d6aa797daefef..0000000000000000000000000000000000000000
--- a/components/uni-quick-login/i18n/zh-Hans.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"accountLogin": "账号登录",
-	"SMSLogin": "短信验证码",
-	"wechatLogin": "微信登录",
-	"appleLogin": "苹果登录",
-	"oneClickLogin": "一键登录",
-	"QQLogin": "QQ登录",
-	"xiaomiLogin": "小米登录",
-	"getProviderFail": "获取服务供应商失败",
-	"loginErr": "登录服务初始化错误",
-	"chooseOtherLogin": "点击了第三方登录",
-	"weibo": "微博",
-	"noAgree": "你未同意隐私政策协议",
-	"gotIt": "知道了"
-}
diff --git a/components/uni-quick-login/uni-quick-login.vue b/components/uni-quick-login/uni-quick-login.vue
deleted file mode 100644
index 1dc4204f7adb547e9c0b0a4aef0ba2a655b137cc..0000000000000000000000000000000000000000
--- a/components/uni-quick-login/uni-quick-login.vue
+++ /dev/null
@@ -1,379 +0,0 @@
-<template>
-	<view>
-		<view class="quick-login-box">
-			<view class="item" v-for="(item,index) in servicesList" :key="index"
-				@click="item.path?to(item.path):login_before(item.id,false)">
-				<image class="logo" :src="item.logo" mode="widthFix"></image>
-				<text class="login-title">{{item.text}}</text>
-			</view>
-		</view>
-		<!-- #ifdef MP-WEIXIN -->
-		<uni-user-profile @next="doUserProfileNext" ref="userProfile"></uni-user-profile>
-		<!-- #endif -->
-	</view>
-</template>
-<script>
-	import {
-		initVueI18n
-	} from '@dcloudio/uni-i18n'
-	import messages from './i18n/index.js'
-	const {
-		t
-	} = initVueI18n(messages)
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex';
-	//前一个窗口的页面地址。控制点击切换快捷登录方式是创建还是返回
-	import loginSuccess from '@/pages/ucenter/login-page/common/loginSuccess.js';
-	const db = uniCloud.database();
-	const usersTable = db.collection('uni-id-users')
-	let allServicesList = []
-	export default {
-		computed: {
-			loginConfig() {
-				return getApp().globalData.config.router.login
-			},
-			agreements() {
-				return getApp().globalData.config.about.agreements || []
-			}
-		},
-		data() {
-			return {
-				servicesList: [{
-						"id": "username",
-						"text": t('accountLogin'),
-						"logo": "/static/uni-quick-login/user.png",
-						"path": "/pages/ucenter/login-page/pwd-login/pwd-login"
-					},
-					{
-						"id": "smsCode",
-						"text": t('SMSLogin'),
-						"logo": "/static/uni-quick-login/sms.png",
-						"path": "/pages/ucenter/login-page/index/index?type=smsCode"
-					},
-					{
-						"id": "weixin",
-						"text": t('wechatLogin'),
-						"logo": "/static/uni-quick-login/wechat.png",
-					},
-					{
-						"id": "apple",
-						"text": t('appleLogin'),
-						"logo": "/static/uni-quick-login/apple.png",
-					},
-					{
-						"id": "univerify",
-						"text": t('oneClickLogin'),
-						"logo": "/static/uni-quick-login/univerify.png",
-					},
-					{
-						"id": "qq",
-						"text": t('QQLogin'), //暂未提供该登录方式的接口示例
-						"logo": "/static/uni-quick-login/univerify.png",
-					},
-					{
-						"id": "xiaomi",
-						"text": t('xiaomiLogin'), //暂未提供该登录方式的接口示例
-						"logo": "/static/uni-quick-login/univerify.png",
-					},
-					{
-						"id": "sinaweibo",
-						"text": t('weibo'), //暂未提供该登录方式的接口示例
-						"logo": "/static/uni-quick-login/univerify.png",
-					}
-				],
-				config: {},
-				univerifyStyle: { //一键登录弹出窗的样式配置参数
-					"fullScreen": true, // 是否全屏显示，true表示全屏模式，false表示非全屏模式，默认值为false。
-					"backgroundColor": "#ffffff", // 授权页面背景颜色，默认值：#ffffff
-					"buttons": { // 自定义登录按钮
-						"iconWidth": "45px", // 图标宽度（高度等比例缩放） 默认值：45px
-						"list": []
-					},
-					"privacyTerms": {
-						"defaultCheckBoxState": false, // 条款勾选框初始状态 默认值： true   
-						"textColor": "#BBBBBB", // 文字颜色 默认值：#BBBBBB  
-						"termsColor": "#5496E3", //  协议文字颜色 默认值： #5496E3  
-						"prefix": "我已阅读并同意", // 条款前的文案 默认值：“我已阅读并同意”  
-						"suffix": "并使用本机号码登录", // 条款后的文案 默认值：“并使用本机号码登录”  
-						"privacyItems": []
-					}
-				}
-			}
-		},
-		watch: {
-			agree(agree) {
-				this.univerifyStyle.privacyTerms.defaultCheckBoxState = agree
-			}
-		},
-		props: {
-			agree: {
-				type: Boolean,
-				default () {
-					return false
-				}
-			}
-		},
-		async created() {
-			let servicesList = this.servicesList
-			//去掉配置中不存在的 注意，在/common/appInit.js中已清除有配置但设备环境不支持的登录项
-			servicesList = servicesList.filter(item => this.loginConfig.includes(item.id))
-			//处理一键登录
-			if (this.loginConfig.includes('univerify')) {
-				this.univerifyStyle.privacyTerms.privacyItems = this.agreements
-				//设置一键登录功能底下的快捷登录按钮
-				servicesList.forEach(({
-					id,
-					logo,
-					path
-				}) => {
-					if (id != 'univerify') {
-						this.univerifyStyle.buttons.list.push({
-							"iconPath": logo,
-							"provider": id,
-							// path
-						})
-					}
-				})
-			}
-			console.log(servicesList);
-			//如果当前页面为默认登录界面。当前第一优先级的“微信和苹果登录”要隐藏，因为他已经被渲染在默认登录界面顶部
-			if (
-				this.getRoute(1) == '/pages/ucenter/login-page/index/index' && ['weixin', 'apple'].includes(this
-					.loginConfig[0])
-			) {
-				servicesList = servicesList.filter(item => item.id != this.loginConfig[0])
-			}
-			//去掉当前页面对应的登录选项
-			this.servicesList = servicesList.filter(item => {
-				let path = item.path ? item.path.split('?')[0] : '';
-				return path != this.getRoute(1)
-			})
-			console.log('servicesList', servicesList, this.servicesList);
-		},
-		mounted() {},
-		methods: {
-			...mapMutations({
-				setUserInfo: 'user/login'
-			}),
-			getRoute(n = 0) {
-				let pages = getCurrentPages();
-				// console.log('route-pages-length', pages.length);
-				if (n > pages.length) {
-					return ''
-				}
-				return '/' + pages[pages.length - n].route
-			},
-			to(path) {
-				console.log('比较', this.getRoute(1),this.getRoute(2), path)
-				if(this.getRoute(1) == path.split('?')[0] && this.getRoute(1) == '/pages/ucenter/login-page/index/index'){
-					//如果要被打开的页面已经打开，且这个页面是 /pages/ucenter/login-page/index/index 则把类型参数传给他
-					let type = path.split('?')[1].split('=')[1]
-					uni.$emit('setLoginType',type)
-				}else if(this.getRoute(2) == path) { // 如果上一个页面就是，马上要打开的页面，直接返回。防止重复开启
-					uni.navigateBack();
-				}else if(this.getRoute(1) != path) {
-					uni.navigateTo({
-						url: path,
-						animationType: 'slide-in-left'
-					})
-				}else{
-					console.log('出乎意料的情况,path：'+path);
-				}
-			},
-			login_before(type, navigateBack = true) {
-				console.log(type);
-				if (!this.agree && type != 'univerify') {
-					return uni.showToast({
-						title: t('noAgree'),
-						icon: 'none'
-					});
-				}
-				if (type == 'univerify') {
-					let univerifyManager = uni.getUniverifyManager()
-					let onButtonsClickFn =	async res =>{
-						console.log('点击了第三方登录，provider：',res, res.provider,this.univerifyStyle.buttons.list);
-						//同步一键登录弹出层隐私协议框是否打勾
-						let agree = (await uni.getCheckBoxState())[1].state
-						console.log('agree',agree);
-						uni.$emit('setAgreementsAgree', agree)
-						let {
-							path
-						} = this.univerifyStyle.buttons.list[res.index]
-						console.log('path', path,this.getRoute(1));
-						if (path) {
-							this.to(path)
-							closeUniverify()
-						} else {
-							if(agree){
-								closeUniverify()
-								setTimeout(() => {
-									console.log('login_before');
-									this.login_before(res.provider)
-								}, 500)
-							}else{
-								console.log(t('noAgree'));
-								uni.showToast({
-									title: t('noAgree'),
-									icon: 'none'
-								});
-							}
-						}
-					}
-					function closeUniverify(){
-						uni.hideLoading()
-						univerifyManager.close()
-						// 取消订阅自定义按钮点击事件
-						univerifyManager.offButtonsClick(onButtonsClickFn)
-					}
-					// 订阅自定义按钮点击事件
-					univerifyManager.onButtonsClick(onButtonsClickFn)
-					// 调用一键登录弹框
-					console.log(this.univerifyStyle,univerifyManager.login);
-					return univerifyManager.login({
-						"univerifyStyle": this.univerifyStyle,
-						success:res=> {
-							console.log('login success', res)
-							this.login(res.authResult, 'univerify')
-						},
-						fail(err) {
-							uni.showToast({
-								title: JSON.stringify(err),
-								icon: 'none'
-							});
-						},
-						complete(e){
-							console.log(e);
-							uni.hideLoading()
-							// 取消订阅自定义按钮点击事件
-							univerifyManager.offButtonsClick(onButtonsClickFn)
-						}
-					})
-				}
-				uni.showLoading({mask: true})
-				uni.login({
-					"provider": type,
-					"onlyAuthorize": true, //请勿直接使用前端获取的unionid或openid直接用于登录，前端的数据都是不可靠的
-					complete: (e) => {
-						console.log(e);
-						uni.hideLoading()
-					},
-					success: async e => {
-						console.log(e);
-						if (type == 'apple') {
-							let res = await this.getUserInfo({
-								provider: "apple"
-							})
-							Object.assign(e.authResult, res.userInfo)
-						}
-						this.login(type == 'weixin' ? e.code : e.authResult, type)
-					},
-					fail: async (err) => {
-						console.log(err);
-					}
-				})
-			},
-			login(params, type) { //联网验证登录
-				console.log({
-					params,
-					type
-				});
-				let action = 'loginBy' + type.trim().toLowerCase().replace(type[0], type[0].toUpperCase())
-				uniCloud.callFunction({
-					name: 'uni-id-cf',
-					data: {
-						action,
-						params
-					},
-					success: async ({
-						result
-					}) => {
-						console.log("login-result", result);
-						if (result.code === 0) {
-							delete result.userInfo.token
-							// #ifdef MP-WEIXIN
-							if (type == 'weixin' && !result.userInfo.nickname) {
-								return this.$refs.userProfile.open(result.uid)
-							}
-							// #endif
-							if (result.type == "register") {  
-								result.userInfo._id = result.uid  
-							}
-							this.setUserInfo(result.userInfo)
-							loginSuccess(result)
-						} else {
-							uni.showModal({
-								content: result.msg,
-								showCancel: false
-							});
-						}
-					},
-					complete: (e) => {
-						console.log(e);
-						if (type == 'univerify') {
-							uni.closeAuthView()
-						}
-						uni.hideLoading()
-					}
-				})
-			},
-			doUserProfileNext() {
-				loginSuccess()
-			},
-			async getUserInfo(e) {
-				return new Promise((resolve, reject) => {
-					uni.getUserInfo({
-						...e,
-						success: (res) => {
-							resolve(res);
-						},
-						fail: (err) => {
-							uni.showModal({
-								content: JSON.stringify(err),
-								showCancel: false
-							});
-							reject(err);
-						}
-					})
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	/* #ifndef APP-NVUE */
-	view {
-		display: flex;
-		box-sizing: border-box;
-		flex-direction: column;
-	}
-
-	/* #endif */
-	.quick-login-box {
-		flex-direction: row;
-		width: 750rpx;
-		justify-content: space-around;
-		position: fixed;
-		bottom: 10rpx;
-		left: 0;
-	}
-
-	.item {
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		height: 200rpx;
-	}
-
-	.logo {
-		width: 60rpx;
-		height: 60rpx;
-	}
-
-	.login-title {
-		margin-top: 4px;
-		font-size: 26rpx;
-	}
-</style>
diff --git a/components/uni-send-sms-code/uni-send-sms-code.vue b/components/uni-send-sms-code/uni-send-sms-code.vue
deleted file mode 100644
index 3b32c79da11de3d66d0c8d31b3e82254442ab67a..0000000000000000000000000000000000000000
--- a/components/uni-send-sms-code/uni-send-sms-code.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<template>
-	<view class="short-code-btn" hover-class="hover" @click="start">
-		<text class="inner-text" :class="reverseNumber==0?'inner-text-active':''">{{innerText}}</text>
-	</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);
-		}
-	}
-	export default {
-		name: "uni-send-sms-code",
-		props: {
-			/**
-			 * 倒计时时长 s
-			 */
-			count: {
-				type: [String, Number],
-				default: 60
-			},
-			/**
-			 * 手机号码
-			 */
-			phone: {
-				type: [String, Number],
-				default: ''
-			},
-			/*
-				验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定手机、unbind解绑手机
-			*/
-			codeType:{
-				type: String,
-				default(){
-					return 'login'
-				}
-			}
-		},
-		data() {
-			return {
-				reverseNumber: 0,
-				reverseTimer: null
-			};
-		},
-		computed: {
-			innerText() {
-				if (this.reverseNumber == 0) return this.$t('common.getVerifyCode');
-				return this.$t('smsCode.resendVerifyCode')+ '('+this.reverseNumber+'s)';
-			}
-		},
-		created() {
-			this.initClick();
-		},
-		methods: {
-			initClick() {
-				this.start = debounce(() => {
-					if (this.reverseNumber != 0) return;
-					this.sendMsg();
-				})
-			},
-			sendMsg() {
-				let reg_phone = /^1\d{10}$/;
-				if(!reg_phone.test(this.phone))return uni.showToast({
-					title: this.$t('smsCode.phoneErrTip'),
-					icon: 'none'
-				});
-				uniCloud.callFunction({
-					name:'uni-id-cf',
-					data:{
-						action:'sendSmsCode',
-						params:{
-							"mobile": this.phone,
-							"type": this.codeType
-						},
-					},
-					success: ({result}) => {
-						console.log(result);
-						if(result.code===0){
-							uni.showToast({
-								title: this.$t('smsCode.sendSuccessTip'),
-								icon: 'none'
-							});
-							this.reverseNumber = Number(this.count);
-							this.getCode();
-							this.$emit('getCode');
-						}else{
-							uni.showModal({
-								content: result.msg,
-								showCancel: false
-							});
-						}
-					}
-				})
-			},
-			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>
-/* #ifndef APP-NVUE */
-view{
-	display: flex;
-	box-sizing: border-box;
-	flex-direction: column;
-}
-/* #endif */
-	.short-code-btn {
-		width: 200rpx;
-		height: 85rpx;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-	}
-	.inner-text {
-		font-size: 28rpx;
-		color: #AAAAAA;
-	}
-	.inner-text-active {
-		color: #007aff;
-	}
-</style>
diff --git a/main.js b/main.js
index 10c0fc2f9da22582a48625cff891eab79a67beab..dc60f268d26411f50c490210f771fc419c1541b9 100644
--- a/main.js
+++ b/main.js
@@ -1,16 +1,13 @@
 import App from './App'
-import store from './store'
 import i18n from './lang/i18n'
 
 
 // #ifndef VUE3
 import Vue from 'vue'
 Vue.config.productionTip = false
-Vue.prototype.$store = store
 App.mpType = 'app'
 const app = new Vue({
 	i18n,
-	store,
 	...App
 })
 app.$mount()
@@ -23,7 +20,6 @@ import {createSSRApp} from 'vue'
 export function createApp() {
 	const app = createSSRApp(App)
 	app.use(i18n)
-	app.use(store)
 	return {app}
 }
 // #endif
diff --git a/manifest.json b/manifest.json
index 8f82c59dd129eeb7205440cc020029c818a7a27f..27e5549d8d50cb084c3331c6a18800196451e7aa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,11 +1,10 @@
 {
     "name" : "uni-starter",
-    "appid" : "__UNI__EC87F46",
+    "appid" : "__UNI__07F7150",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
-    /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
@@ -16,11 +15,8 @@
             "autoclose" : true,
             "delay" : 0
         },
-        /* 模块配置 */
         "modules" : {},
-        /* 应用发布信息 */
         "distribute" : {
-            /* android打包配置 */
             "android" : {
                 "permissions" : [
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
@@ -40,15 +36,11 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-            /* ios打包配置 */
             "ios" : {},
-            /* SDK配置 */
             "sdkConfigs" : {}
         }
     },
-    /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 */
     "mp-weixin" : {
         "appid" : "",
         "setting" : {
diff --git a/package.json b/package.json
index 965e57888c111c9c37509c7cf703efef8157d23d..b19828b0f4024885de7843f8557abe784155c475 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-starter",
 	"displayName": "uni-starter",
-	"version": "1.2.5",
+	"version": "1.2.7",
 	"description": "云端一体应用快速开发基本项目模版",
 	"keywords": [
         "login",
@@ -36,8 +36,7 @@
 	},
 	"uni_modules": {
 		"dependencies": [
-			"uni-id-cf",
-			"uni-captcha"
+			"uni-id-pages"
 		],
 		"encrypt": [],
 		"platforms": {
diff --git a/pages.json b/pages.json
index bcb5ccbe8e440fa7ca1a87763c28db0dba0b6514..a5070a2b2915e484b4e0a57e6ab7116592a12560 100644
--- a/pages.json
+++ b/pages.json
@@ -1,12 +1,11 @@
 {
-	"pages": [
-		{
+	"pages": [{
 			"path": "pages/list/list",
-			"style": {
-				// #ifndef APP-PLUS
-				"enablePullDownRefresh": true,
+			"style": {
+				// #ifndef APP-PLUS
+				"enablePullDownRefresh": true,
 				// #endif
-				"navigationStyle": "custom"
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -16,19 +15,10 @@
 				"navigationStyle": "custom"
 				//#endif
 			}
-		}, {
-			"path": "pages/ucenter/login-page/index/index",
-			"style": {
-				"navigationBarTitleText": "",
-				"app-plus": {
-					"animationType": "none",
-					"popGesture": "none"
-				}
-			}
 		}, {
 			"path": "pages/list/search/search",
-			"style": {
-				"navigationBarTitleText":"搜索"
+			"style": {
+				"navigationBarTitleText": "搜索"
 			}
 		}, {
 			"path": "pages/list/detail",
@@ -48,11 +38,6 @@
 				},
 				"navigationBarTitleText": "文章详情"
 			}
-		}, {
-			"path": "pages/ucenter/userinfo/bind-mobile/bind-mobile",
-			"style": {
-				"navigationBarTitleText": "绑定手机号码"
-			}
 		},
 		{
 			"path": "pages/ucenter/ucenter",
@@ -106,82 +91,106 @@
 			}
 
 		}, {
-			"path": "pages/ucenter/userinfo/userinfo",
+			"path": "pages/common/webview/webview",
 			"style": {
-				"navigationBarTitleText": "个人资料"
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/ucenter/read-news-log/read-news-log",
+			"style": {
+				"navigationBarTitleText": "阅读记录",
+				"enablePullDownRefresh": true
 			}
 		}, {
-			"path": "pages/ucenter/userinfo/cropImage",
+			"path": "pages/ucenter/invite/invite",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
 			}
+
 		}, {
-			"path": "pages/ucenter/login-page/pwd-login/pwd-login",
+			"path": "uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "意见反馈",
+				"enablePullDownRefresh": false
 			}
 		}, {
-			"path": "pages/ucenter/login-page/pwd-retrieve/pwd-retrieve",
+			"path": "uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate",
 			"style": {
-				"navigationBarTitleText": "重置密码"
+				"navigationBarTitleText": "注销账号"
+			}
+		}, {
+			"path": "uni_modules/uni-id-pages/pages/userinfo/userinfo",
+			"style": {
+				"navigationBarTitleText": "个人资料"
+			}
+		}, {
+			"path": "uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile",
+			"style": {
+				"navigationBarTitleText": "绑定手机号码"
 			}
 		}, {
-			"path": "pages/ucenter/login-page/phone-code/phone-code",
+			"path": "uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage",
 			"style": {
 				"navigationBarTitleText": ""
 			}
-
 		}, {
-			"path": "pages/common/webview/webview",
+			"path": "uni_modules/uni-id-pages/pages/login/login-withoutpwd",
 			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": ""
 			}
-
 		}, {
-			"path": "pages/ucenter/login-page/register/register",
+			"path": "uni_modules/uni-id-pages/pages/login/login-withpwd",
 			"style": {
-				"navigationBarTitleText": "注册",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": ""
 			}
-		},
-		{
-			"path": "pages/ucenter/read-news-log/read-news-log",
+		}, {
+			"path": "uni_modules/uni-id-pages/pages/login/login-smscode",
 			"style": {
-				"navigationBarTitleText": "阅读记录",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "手机验证码登录"
 			}
 		}, {
-			"path": "pages/ucenter/invite/invite",
+			"path": "uni_modules/uni-id-pages/pages/register/register",
 			"style": {
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "注册"
 			}
-
 		}, {
-			"path": "pages/ucenter/settings/deactivate/deactivate",
+			"path": "uni_modules/uni-id-pages/pages/retrieve/retrieve",
 			"style": {
-				"navigationBarTitleText": "注销提醒",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "重置密码"
 			}
 		}, {
-			"path": "uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback",
+			"path": "uni_modules/uni-id-pages/pages/common/webview/webview",
 			"style": {
-				"navigationBarTitleText": "意见反馈",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": ""
+			}
+		}, {
+			"path": "uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "修改密码"
 			}
 		}
-    ],
-	"globalStyle": {
+	],
+	"globalStyle": {
+		// #ifdef H5
+		"h5": {
+			"titleNView":false
+		},
+		// #endif
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-starter",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#F8F8F8",
-		"enablePullDownRefresh": false,
-		// "maxWidth":375,
-		"rpxCalcMaxDeviceWidth":375,
-		"rpxCalcBaseDeviceWidth":375
-		// "rpxCalcIncludeWidth":0
+		"enablePullDownRefresh": false,
+		// "maxWidth":375,
+		"rpxCalcMaxDeviceWidth": 375,
+		"rpxCalcBaseDeviceWidth": 375
+		// "rpxCalcIncludeWidth":0
 	},
 	"condition": {
 		"list": [{
@@ -189,11 +198,6 @@
 			}, {
 				"path": "pages/list/list"
 			},
-			{
-				"path": "pages/ucenter/login-page/index/index"
-			}, {
-				"path": "pages/ucenter/userinfo/userinfo"
-			},
 			{
 				"path": "pages/ucenter/settings/settings"
 			}
@@ -215,12 +219,18 @@
 			"iconPath": "static/tabbar/grid.png",
 			"selectedIconPath": "static/tabbar/grid_active.png",
 			"text": "宫格"
-		}
-		, {
+		}, {
 			"pagePath": "pages/ucenter/ucenter",
 			"iconPath": "static/tabbar/me.png",
 			"selectedIconPath": "static/tabbar/me_active.png",
 			"text": "我的"
 		}]
+	},
+	"uniIdRouter": {
+		"loginPage": "uni_modules/uni-id-pages/pages/login/login-withoutpwd",
+		"needLogin": [
+			"/uni_modules/uni-id-pages/pages/userinfo/userinfo"
+		],
+		"resToLogin": true
 	}
 }
diff --git a/pages/grid/grid.vue b/pages/grid/grid.vue
index 55a04b76fc31a492a8195f73fc112e02563944fb..601821a7e05397aa8f05ec09d8333b815db6b1ce 100644
--- a/pages/grid/grid.vue
+++ b/pages/grid/grid.vue
@@ -24,14 +24,15 @@
 		
 	<!-- 宫格 -->
 		<uni-section :title="$t('grid.grid')" style="margin: 0;" type="line"></uni-section>
-		<view class="example-body">
+		<view class="example-body">
 			<uni-grid :column="3" :highlight="true" @change="change">
 				<template v-for="(item,i) in gridList">
 					<uni-grid-item :index="i" :key="i"
 						v-if="i<3 || i>2&&i<6&&hasLogin || i>5&&uniIDHasRole('admin')"
 					>
 						<view class="grid-item-box" style="background-color: #fff;">
-							<image :src="'/static/grid/c'+(i+1)+'.png'" class="image" mode="aspectFill" />
+							<!-- <image :src="'/static/grid/c'+(i+1)+'.png'" class="image" mode="aspectFill" /> -->
+							<text class="big-number">{{i+1}}</text>
 							<text class="text">{{item}}</text>
 						</view>
 					</uni-grid-item>
@@ -42,9 +43,6 @@
 </template>
 
 <script>
-	import {
-		mapGetters,
-	} from 'vuex';
 	import statusBar from "@/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar";
 	export default {
 		components: {
@@ -57,10 +55,10 @@
 				swiperDotIndex: 0
 			}
 		},
-		computed: {
-			...mapGetters({
-				hasLogin: 'user/hasLogin'
-			})
+		computed: {
+			hasLogin(){
+				return uniCloud.getCurrentUserInfo().tokenExpired > Date.now()
+			}
 		},
 		onLoad() {
 			let gridList = []
@@ -78,7 +76,7 @@
 		methods: {
 			change(e) {
 				uni.showToast({
-					title:this.$t('grid.clickTip') + " " + `${e.detail.index}` + " " + this.$t('grid.clickTipGrid'),
+					title:this.$t('grid.clickTip') + " " + `${e.detail.index + 1}` + " " + this.$t('grid.clickTipGrid'),
 					icon: 'none'
 				})
 			},
@@ -155,7 +153,14 @@
 		width: 50rpx;
 		height: 50rpx;
 	}
-
+	
+	.big-number{
+		font-size: 50rpx;
+		font-weight: 700;
+		font-stretch: condensed;
+		font-style:oblique;
+	}
+	
 	.text {
 		text-align: center;
 		font-size: 26rpx;
diff --git a/pages/list/detail.vue b/pages/list/detail.vue
index 9d1d55879b67c606321730fa5e394a59b240286d..87ca7bb2fd69f6170191e8eaf3747d88bdd24e2e 100644
--- a/pages/list/detail.vue
+++ b/pages/list/detail.vue
@@ -56,9 +56,6 @@
 	// #endif
 	const db = uniCloud.database();
 	const readNewsLog = db.collection('read-news-log')
-	import {
-		mapGetters
-	} from 'vuex';
 	export default {
 		// #ifdef APP
 		onBackPress({from}) {
@@ -87,10 +84,6 @@
 			}
 		},
 		computed: {
-			...mapGetters({
-				'userInfo': 'user/info',
-				'hasLogin': 'user/hasLogin'
-			}),
 			uniStarterConfig() {
 				return getApp().globalData.config
 			},
@@ -155,7 +148,7 @@
 				console.log(readNewsLog);
 			},
 			setFavorite() {
-				if (!this.hasLogin){
+				if ( uniCloud.getCurrentUserInfo().tokenExpired < Date.now() ){
 					return console.log('未登录用户');
 				}
 				let article_id = this.id,
diff --git a/pages/list/list.nvue b/pages/list/list.nvue
index b273cfe825a2077d471401dcaf813bea23427d5e..a1b0ac02342cf7acbe7730a0aca5b445faf815c3 100644
--- a/pages/list/list.nvue
+++ b/pages/list/list.nvue
@@ -124,7 +124,7 @@
 			let location = await gps.getLocation({
 				geocode: true
 			})
-			console.log(location);
+			// console.log(location);
 			// #endif
 			// if(location){
 			// 	uni.showToast({
diff --git a/pages/ucenter/about/about.vue b/pages/ucenter/about/about.vue
index a30fad239d7e389d293dac5065d5f294080ac94a..81eb7f92a520c337bfe2679e65b48a4ea6dff060 100644
--- a/pages/ucenter/about/about.vue
+++ b/pages/ucenter/about/about.vue
@@ -8,10 +8,10 @@
 			<Sansnn-uQRCode :text="about.download" :makeOnLoad="true" class="qrcode"></Sansnn-uQRCode>
 			<text class="tip">{{$t('about.sacnQR')}} {{about.appName}} {{$t('about.client')}}</text>
 		</view>
-		<view class="copyright">
-			<view class="agreement-box" v-for="(agreement,index) in about.agreements" :key="index">
+		<view class="copyright">
+			<view class="agreement-box" v-for="(agreement,index) in agreements" :key="index">
 				<text class="agreement" @click="navigateTo(agreement)">《{{agreement.title}}》</text>
-				<text class="hint" v-if="about.agreements.length-1>index">{{$t('about.and')}}</text>
+				<text class="hint" v-if="agreements.length-1>index">{{$t('about.and')}}</text>
 			</view>
 			<text class="hint">Copyright © {{year}}</text>
 			<text class="hint">{{about.company}}</text>
@@ -22,7 +22,8 @@
 // #ifdef APP
 	import UniShare from '@/uni_modules/uni-share/js_sdk/uni-share.js';
 	const uniShare = new UniShare()
-// #endif
+// #endif
+	import uniIdPagesConfig from '@/uni_modules/uni-id-pages/config.js';
 	export default {
 		// #ifdef APP
 		onBackPress({from}) {
@@ -43,6 +44,22 @@
 			uniStarterConfig() {
 				console.log(getApp());
 				return getApp().globalData.config
+			},
+			agreements() {
+				if(!uniIdPagesConfig.agreements){
+					return []
+				}
+				let {serviceUrl,privacyUrl} = uniIdPagesConfig.agreements
+				return [
+					{
+						url:serviceUrl,
+						title:"用户服务协议"
+					},
+					{
+						url:privacyUrl,
+						title:"隐私政策条款"
+					}
+				]
 			}
 		},
 		data() {
diff --git a/pages/ucenter/login-page/common/login-page.css b/pages/ucenter/login-page/common/login-page.css
deleted file mode 100644
index 4189236f739afe71edf8c02fdefd22c9f70d1796..0000000000000000000000000000000000000000
--- a/pages/ucenter/login-page/common/login-page.css
+++ /dev/null
@@ -1,61 +0,0 @@
-/* #ifndef APP-NVUE */
-view {
-	display: flex;
-	box-sizing: border-box;
-	flex-direction: column;
-}
-
-/* #endif */
-
-.content {
-	padding: 0 50rpx;
-	/* width: 750rpx; */
-	flex: 1;
-}
-
-.input-box {
-	padding: 0 15px;
-	margin-bottom: 10px;
-	background-color: #F8F8F8;
-	border-radius: 6px;
-	font-size: 28rpx;
-}
-
-.get-code {
-	margin: 0;
-	margin-top: 15px;
-	background-color: #007aff;
-	color: #FFFFFF;
-}
-
-.input-box,
-.get-code {
-	height: 45px;
-	line-height: 45px;
-}
-
-.title {
-	text-align: center;
-	padding-bottom: 5px;
-}
-
-.tip {
-	color: #666666;
-	font-size: 26rpx;
-	margin: 6px 0;
-}
-
-.easyinput {
-	background-color: #F8F8F8;
-	border-radius: 6rpx;
-}
-
-.send-btn {
-	width: 100%;
-	margin-top: 15px;
-	border-radius: 6rpx;
-}
-
-.link {
-	color: #04498c;
-}
diff --git a/pages/ucenter/login-page/common/login-page.mixin.js b/pages/ucenter/login-page/common/login-page.mixin.js
deleted file mode 100644
index a53b8c677f2d3b9800635e4d097508f7d4e059e9..0000000000000000000000000000000000000000
--- a/pages/ucenter/login-page/common/login-page.mixin.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import {mapMutations} from 'vuex';
-import loginSuccess from './loginSuccess.js';
-let mixin = {
-	methods:{
-		...mapMutations({
-			setUserInfo: 'user/login'
-		}),
-		loginSuccess(result){
-			loginSuccess(result)
-			delete result.userInfo.token
-			if (result.type == "register") {
-				result.userInfo._id = result.uid  
-			}
-			this.setUserInfo(result.userInfo)
-		}
-	}
-}
-export default mixin
\ No newline at end of file
diff --git a/pages/ucenter/login-page/common/loginSuccess.js b/pages/ucenter/login-page/common/loginSuccess.js
deleted file mode 100644
index db1540f381ae82913c3a555bd411fb49a1568049..0000000000000000000000000000000000000000
--- a/pages/ucenter/login-page/common/loginSuccess.js
+++ /dev/null
@@ -1,20 +0,0 @@
-export default function(result){
-	uni.showToast({
-		title: '登录成功',
-		icon: 'none'
-	});
-	console.log('登录成功',result);
-	
-	var delta = 0//判断需要返回几层
-	let pages = getCurrentPages();
-	// console.log(pages);
-	pages.forEach((page,index)=>{
-		// console.log(pages[pages.length-index-1].route.split('/')[2]);
-		pages[pages.length-index-1].route.split('/')
-		if(pages[pages.length-index-1].route.split('/')[2] == 'login-page'){
-			delta ++
-		}
-	})
-	// console.log('判断需要返回几层',delta);
-	uni.navigateBack({delta})
-}
diff --git a/pages/ucenter/login-page/index/index.vue b/pages/ucenter/login-page/index/index.vue
deleted file mode 100644
index 332774f3009ce6a7884a605178c9591e187d8c7e..0000000000000000000000000000000000000000
--- a/pages/ucenter/login-page/index/index.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-	<view class="content">
-		<!-- 顶部文字 -->
-		<text class="title">{{$t('login.phoneLogin')}}</text>
-		<!-- 登录框 -->
-		<view v-if="['apple','weixin'].includes(type)" class="quickLogin">
-			<image @click="quickLogin" :src="imgSrc" mode="widthFix" class="quickLoginBtn"></image>
-			<uni-agreements @setAgree="agree = $event"></uni-agreements>
-		</view>
-		<template v-else>
-			<input type="number" class="input-box" :inputBorder="false" v-model="phone" maxlength="11"
-				:placeholder="$t('common.phonePlaceholder')" />
-			<uni-agreements @setAgree="agree = $event"></uni-agreements>
-			<button class="get-code" :disabled="!isPhone || !agree" :type="isPhone&&agree?'primary':'default'"
-				@click="sendShortMsg">{{$t('login.getVerifyCode')}}</button>
-			<text class="tip">{{$t('login.phoneLoginTip')}}</text>
-		</template>
-
-		<!-- 快捷登录按钮弹窗 -->
-		<uni-quick-login :agree="agree" ref="uniQuickLogin"></uni-quick-login>
-	</view>
-</template>
-
-<script>
-	let currentWebview; //是否一键登录优先
-	export default {
-		data() {
-			return {
-				type: "",
-				phone: "",
-				agree: false
-			}
-		},
-		computed: {
-			loginConfig() {
-				return getApp().globalData.config.router.login
-			},
-			isPhone() {
-				return /^1\d{10}$/.test(this.phone);
-			},
-			imgSrc() {
-				return '/static/login-index/' + this.type + '.png'
-			}
-		},
-		onLoad(e) {
-			this.type = e.type
-
-			//是否优先启动一键登录。即：页面一加载就启动一键登录
-			//#ifdef APP-PLUS
-			if (this.type == "univerify") {
-				const pages = getCurrentPages();
-				currentWebview = pages[pages.length - 1].$getAppWebview();
-				currentWebview.setStyle({
-					"top": "2000px" //隐藏当前页面窗体
-				})
-			}
-			//#endif
-			uni.$on('setLoginType',type=>{
-				this.type = type
-			})
-		},
-		onUnload() {
-			uni.$off('setLoginType')
-		},
-		onReady() {
-			//#ifdef APP-PLUS
-			if (this.type == "univerify") {
-				this.type == this.loginConfig[1]
-				// console.log('开始一键登录');
-				setTimeout(() => {
-					this.$refs.uniQuickLogin.login_before('univerify')
-				}, 100)
-				setTimeout(() => {
-					currentWebview.setStyle({
-						titleNView: {
-							autoBackButton: true,
-							backgroundColor: "#FFFFFF"
-						}
-					})
-					currentWebview.setStyle({
-						"top": "0"
-					})
-				}, 1500);
-			}
-			//#endif
-		},
-		methods: {
-			quickLogin() {
-				this.$refs.uniQuickLogin.login_before(this.type)
-			},
-			sendShortMsg() {
-				if (!this.agree) {
-					return uni.showToast({
-						title: this.$t('common.noAgree'),
-						icon: 'none'
-					});
-				}
-				// 发送验证吗
-				uni.showLoading();
-				uni.navigateTo({
-					url: '/pages/ucenter/login-page/phone-code/phone-code?phoneNumber=' + this.phone,
-					complete: () => {
-						uni.hideLoading();
-					}
-				});
-			},
-			//去密码登录页
-			toPwdLogin() {
-				uni.navigateTo({
-					url: '../pwd-login/pwd-login'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	/* #ifndef APP-NVUE */
-	view {
-		display: flex;
-		box-sizing: border-box;
-		flex-direction: column;
-	}
-	/* #endif */
-	
-	@import url("../common/login-page.css");
-
-	.quickLogin {
-		height: 350px;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.quickLoginBtn {
-		margin: 20px 0;
-		width: 450rpx;
-	}
-</style>
diff --git a/pages/ucenter/login-page/phone-code/phone-code.vue b/pages/ucenter/login-page/phone-code/phone-code.vue
deleted file mode 100644
index 687b67d31ca99dd9c3aef07981775b823dd67a6f..0000000000000000000000000000000000000000
--- a/pages/ucenter/login-page/phone-code/phone-code.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-	<view class="content">
-		<!-- 顶部文字 -->
-		<text class="tit">{{$t('common.verifyCodePlaceholder')}}</text>
-		<text class="tip">{{tipText}}</text>
-		<uni-forms>
-		<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
-			<uni-easyinput type="number" class="easyinput" :inputBorder="false"
-				v-model="code" maxlength="6" :placeholder="$t('common.verifyCodePlaceholder')">
-				<template v-slot:right>
-					<uni-send-sms-code :phone="phone" ref="sendSmsCode"></uni-send-sms-code>
-				</template>
-			</uni-easyinput>
-			<button class="send-btn" :disabled="!canSubmit" :type="canSubmit?'primary':'default'"
-				@click="submit">{{$t('common.login')}}</button>
-		</uni-forms>
-		<uni-quick-login agree></uni-quick-login>
-		<uni-popup-captcha @confirm="submit" ref="popup-captcha" v-model="captcha" scene="loginBySms"></uni-popup-captcha>
-	</view>
-</template>
-<script>
-	import mixin from '../common/login-page.mixin.js';
-	export default {
-		mixins:[mixin],
-		data() {
-			return {
-				code:'',
-				phone:'',
-				captcha:false
-			}
-		},
-		computed: {
-			tipText() {
-				return this.$t('common.verifyCodeSend')+ `${this.phone}。`;
-			},
-			canSubmit(){
-				return this.code.length==6;
-			}
-		},
-		onLoad({phoneNumber,phoneArea}) {
-			this.phone = phoneNumber;
-		},
-		onReady() {
-			if(this.phone.length==11){
-				this.$refs.sendSmsCode.start();
-			}
-		},
-		methods: {
-			submit(){ //完成并提交
-				uniCloud.callFunction({
-					name:'uni-id-cf',
-					data:{
-						action:'loginBySms',
-						params:{
-							"mobile":this.phone,
-							"code":this.code,
-							"captcha":this.captcha
-						},
-					},
-					success: ({result}) => {
-						uni.showToast({
-							title: result.msg || result.errMsg,
-							icon: 'none'
-						});
-						if(result.errCode == "CAPTCHA_REQUIRED"){
-							return this.$refs['popup-captcha'].open()
-						}
-						if(result.code === 0){
-							this.loginSuccess(result)
-						}
-					},
-					complete: () => {
-						this.captcha = false
-					}
-				})
-			}
-		}
-	}
-</script>
-<style>
-	@import url("../common/login-page.css");
-</style>
\ No newline at end of file
diff --git a/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue b/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue
deleted file mode 100644
index 2a5ae57bf38df0e08c6f555ac2059c5bf9976732..0000000000000000000000000000000000000000
--- a/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-	<view class="content">
-		<!-- 顶部文字 -->
-		<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
-		<uni-forms ref="form" :value="formData" >
-			<uni-forms-item name="phone">
-				<!-- focus规则如果上一页携带来“手机号码”数据就focus验证码输入框，否则focus手机号码输入框 -->
-				<uni-easyinput :disabled="lock" :focus="formData.phone.length!=11" type="number" class="easyinput" :inputBorder="false"
-					v-model="formData.phone" maxlength="11" :placeholder="$t('common.phonePlaceholder')"></uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="code">
-				<uni-easyinput :focus="formData.phone.length==11" type="number" class="easyinput" :inputBorder="false"
-					v-model="formData.code" maxlength="6" :placeholder="$t('common.verifyCodePlaceholder')">
-					<template v-slot:right>
-						<uni-send-sms-code ref="shortCode" :phone="formData.phone"></uni-send-sms-code>
-					</template>
-				</uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="pwd">
-				<uni-easyinput type="password" class="easyinput" :inputBorder="false" v-model="formData.pwd"
-					:placeholder="$t('common.newPasswordPlaceholder')"></uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="pwd2">
-				<uni-easyinput type="password" class="easyinput" :inputBorder="false" v-model="formData.pwd2"
-					:placeholder="$t('common.confirmNewPasswordPlaceholder')"></uni-easyinput>
-			</uni-forms-item>
-			<button class="send-btn-box" :disabled="!canSubmit" :type="canSubmit?'primary':'default'"
-				@click="submit">{{$t('common.complete')}}</button>
-		</uni-forms>
-	</view>
-</template>
-
-<script>
-	import mixin from '../common/login-page.mixin.js';
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				lock:false,
-				formData: {
-					"phone": "",
-					"code":"",
-					'pwd': '',
-					'pwd2': ''
-				},
-				rules: {
-					phone: {
-						rules: [{
-								required: true,
-								errorMessage: this.$t('common.phonePlaceholder'),
-							},
-							{
-								pattern: /^1\d{10}$/,
-								errorMessage: this.$t('common.formatErr'),
-							}
-						]
-					},
-					code: {
-						rules: [{
-								required: true,
-								errorMessage: this.$t('common.verifyCodePlaceholder'),
-							},
-							{
-								pattern: /^.{6}$/,
-								errorMessage: this.$t('common.sixDigitCode'),
-							}
-						]
-					},
-					pwd: {
-						rules: [{
-								required: true,
-								errorMessage:this.$t('common.newPasswordPlaceholder'),
-							},
-							{
-								pattern: /^.{6,20}$/,
-								errorMessage: this.$t('common.passwordDigits'),
-							}
-						]
-					},
-					pwd2: {
-						rules: [{
-								required: true,
-								errorMessage:this.$t('common.confirmPassword'),
-							},
-							{
-								pattern: /^.{6,20}$/,
-								errorMessage: this.$t('common.passwordDigits'),
-							},
-							{
-								validateFunction: function(rule, value, data, callback) {
-									// console.log(value);
-									if (value != data.pwd) {
-										callback('两次输入密码不一致')
-									};
-									return true
-								}
-							}
-						]
-					}
-				}
-			}
-		},
-		computed: {
-			canSubmit() {
-				return this.isPhone && this.isPwd && this.isCode;
-			},
-			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.pwd);
-				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;
-				this.lock = true
-			}
-			uni.setNavigationBarTitle({
-				title: this.$t('common.resetNavTitle')
-			})
-		},
-		onReady() {
-			if (this.formData.phone) {
-				this.$refs.shortCode.start();
-			}
-			this.$refs.form.setRules(this.rules)
-		},
-		methods: {
-			/**
-			 * 完成并提交
-			 */
-			submit() {
-				console.log("formData",this.formData);
-				console.log('rules',this.rules);
-				this.$refs.form.validate()
-					.then(res => {
-						uniCloud.callFunction({
-							name:'uni-id-cf',
-							data:{
-								action:'resetPwdBySmsCode',
-								params:{
-									"mobile": this.formData.phone,
-									"code": this.formData.code,
-									"password": this.formData.pwd
-								},
-							},
-							success: ({result}) => {
-								console.log(result);
-								uni.showToast({
-									title: result.msg||'更新成功',
-									icon: 'none'
-								});
-								if (result.code === 0) {
-									uni.navigateBack()
-								}
-							}
-						})
-					})
-			}
-		}
-	}
-</script>
-
-<style>
-	@import url("../common/login-page.css");
-	.content{
-		padding-top: 36rpx;
-	}
-</style>
diff --git a/pages/ucenter/login-page/register/validator.js b/pages/ucenter/login-page/register/validator.js
deleted file mode 100644
index d5b4c27c569cd62b36610ddafe97f7f8bfc84b88..0000000000000000000000000000000000000000
--- a/pages/ucenter/login-page/register/validator.js
+++ /dev/null
@@ -1,61 +0,0 @@
-export default {
-	"username": {
-		"rules": [{
-				required: true,
-				errorMessage: '请输入用户名',
-			},
-			{
-				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('用户名不能是：手机号或邮箱')
-					};
-					return true
-				}
-			}
-		],
-		"label": "用户名"
-	},
-	"password":{
-		"rules": [{
-				required: true,
-				errorMessage: '请输入密码',
-			},
-			{
-				minLength: 6,
-				maxLength: 20,
-				errorMessage: '密码长度在 {minLength} 到 {maxLength} 个字符',
-			}
-		],
-		"label": "密码"
-	},
-	"pwd2":{
-		"rules": [{
-		
-				required: true,
-				errorMessage: '再次输入密码',
-		
-			},
-			{
-				minLength: 6,
-				maxLength: 20,
-				errorMessage: '密码长度在 {minLength} 到 {maxLength} 个字符',
-			},
-			{
-				validateFunction:function(rule,value,data,callback){
-					console.log(value);
-					if(value!=data.password){
-						callback('两次输入密码不一致')
-					};
-					return true
-				}
-			}
-		],
-		"label": "确认密码"
-	}
-}
\ No newline at end of file
diff --git a/pages/ucenter/settings/deactivate/deactivate.vue b/pages/ucenter/settings/deactivate/deactivate.vue
deleted file mode 100644
index 09de453b9c40d440f0b7fe15984055eed339ac82..0000000000000000000000000000000000000000
--- a/pages/ucenter/settings/deactivate/deactivate.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-	<view class="content">
-		<text class="words" space="emsp">
-			一、注销是不可逆操作，注销后:\n 
-				1.帐号将无法登录、无法找回。\n
-				2.帐号所有信息都会清除(个人身份信息、粉丝数等;发布的作品、评论、点赞等;交易信息等)，你
-			的朋友将无法通过本应用帐号联系你，请自行备份相关
-			信息和数据。\n
-			
-			二、重要提示\n
-				1.封禁帐号(永久封禁、社交封禁、直播权限封禁)不能申请注销。\n
-				2.注销后，你的身份证、三方帐号(微信、QQ、微博、支付宝)、手机号等绑定关系将解除，解除后可以绑定到其他帐号。\n
-				3.注销后，手机号可以注册新的帐号，新帐号不会存在之前帐号的任何信息(作品、粉丝、评论、个人信息等)。\n
-				4.注销本应用帐号前，需尽快处理帐号下的资金问题。\n
-				5.视具体帐号情况而定，注销最多需要7天。\n
-		</text>
-		<view class="button-group">
-			<button @click="nextStep" class="next" type="default">{{$t('deactivate.nextStep')}}</button>
-			<button @click="cancel" type="warn">{{$t('deactivate.cancelText')}}</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		mapActions
-	} from 'vuex';
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		onLoad() {
-			uni.setNavigationBarTitle({
-				title: this.$t('deactivate.navigationBarTitle')
-			})
-		},
-		methods: {
-			...mapActions({
-				logout: 'user/logout'
-			}),
-			cancel(){
-				uni.navigateBack()
-			},
-			nextStep(){
-				uni.showModal({
-					content: '已经仔细阅读注销提示，知晓可能带来的后果，并确认要注销',
-					complete: (e) => {
-						if(e.confirm){
-							uniCloud.callFunction({
-								name:'uni-id-cf',
-								data:{
-									"action":"closeAccount"
-								},
-								complete: (e) => {
-									console.log(e);
-									if(e.result.code === 0){
-										uni.showToast({
-											title: '注销成功'
-										});
-										this.logout();
-										uni.navigateTo({
-											url:"/pages/ucenter/login-page/index/index"
-										})
-									}else{
-										uni.showToast({
-											icon:'error',
-											title: e.result.errMsg
-										});
-									}
-								}
-							})
-						}else{
-							uni.navigateBack()
-						}
-					}
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-.content{
-	display: flex;
-	flex-direction: column;
-	font-size: 28rpx;
-}
-.words{
-	padding: 0 26rpx;
-	line-height:46rpx;
-	margin-top:20rpx;
-	margin-bottom: 80px;
-}
-.button-group{
-	display: flex;
-	flex-direction: row;
-	position: fixed;
-	height: 50px;
-	bottom: 10px;
-	width: 750rpx;
-	justify-content: center;
-	align-items: center;
-	border-top: solid 1px #e4e6ec;
-	padding-top: 10px;
-	background-color: #FFFFFF;
-}
-.button-group button{
-	border-radius: 100px;
-	border: none;
-	width: 300rpx;
-	height: 42px;
-	line-height: 42px;
-	font-size: 32rpx;
-}
-.button-group button:after{
-	border: none;
-}
-.button-group button.next{
-	color: #e64340;
-	border:solid 1px #e64340 ;
-}
-</style>
diff --git a/pages/ucenter/settings/settings.vue b/pages/ucenter/settings/settings.vue
index d0c44b4a1057bcdc9fd579e6cf9a300202202ca5..2ffa6c004810df9445d3b73d4504288e29663883 100644
--- a/pages/ucenter/settings/settings.vue
+++ b/pages/ucenter/settings/settings.vue
@@ -2,7 +2,7 @@
 	<view class="content">
 		<!-- 功能列表 -->
 		<uni-list class="mt10" :border="false">
-			<uni-list-item :title="$t('settings.userInfo')" to="/pages/ucenter/userinfo/userinfo" link="navigateTo"></uni-list-item>
+			<uni-list-item :title="$t('settings.userInfo')" to="/uni_modules/uni-id-pages/pages/userinfo/userinfo" link="navigateTo"></uni-list-item>
 			<uni-list-item v-if="userInfo.mobile" :title="$t('settings.changePassword')" :to="'/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve?phoneNumber='+ userInfo.mobile" link="navigateTo"></uni-list-item>
 		</uni-list>
 		<uni-list class="mt10" :border="false">
@@ -32,25 +32,20 @@
 
 <script>
 	import pushServer from './dc-push/push.js';
-	import {
-		mapMutations,
-		mapGetters,
-		mapActions
-	} from 'vuex';
 	export default {
 		data() {
 			return {
 				pushServer:pushServer,
 				supportMode:[],
 				pushIsOn:"wait",
-				currentLanguage:""
+				currentLanguage:"",
+				userInfo:{}
 			}
 		},
 		computed: {
-			...mapGetters({
-				'userInfo': 'user/info',
-				'hasLogin': 'user/hasLogin',
-			}),
+			hasLogin(){
+				return uniCloud.getCurrentUserInfo().tokenExpired > Date.now()
+			},
 			i18nEnable(){
 				return getApp().globalData.config.i18n.enable
 			}
@@ -71,9 +66,9 @@
 					console.log(err);
 				}
 			})
-			// #endif
+			// #endif
 		},
-		onShow() {
+		onShow() {
 			// 检查手机端获取推送是否开启
 			//#ifdef APP-PLUS
 			setTimeout(()=>{
@@ -81,10 +76,7 @@
 			},300)
 			//#endif
 		},
-		methods: {
-			...mapActions({
-				logout: 'user/logout'
-			}),
+		methods: {
 			toEdit() {
 				uni.navigateTo({
 					url: '/pages/ucenter/userinfo/userinfo'
@@ -92,18 +84,9 @@
 			},
 			deactivate(){
 				uni.navigateTo({
-					url:"/pages/ucenter/settings/deactivate/deactivate"
+					url:"/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate"
 				})
 			},
-			changePwd() {
-				uni.navigateTo({
-					url: '/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve?phoneNumber='
-						+ (this.userInfo && this.userInfo.mobile ? this.userInfo.mobile : ''),
-					fail: err => {
-						console.log(err);
-					}
-				});
-			},
 			/**
 			 * 开始生物认证
 			 */
@@ -189,18 +172,22 @@
 						confirmText: this.$t('settings.confirmText'),
 						success: res => {
 							if (res.confirm) {
-								this.logout()
-								uni.navigateBack();
+								uni.removeStorageSync('uni_id_token');
+								uni.setStorageSync('uni_id_token_expired', 0)
+								uni.redirectTo({
+									url: '/uni_modules/uni-id-pages/pages/login/login-withoutpwd',
+								});
 							}
-						},
-						fail: () => {},
-						complete: () => {}
+						}
 					});
 				} else {
 					uni.navigateTo({
-						url: '/pages/ucenter/login-page/index/index'
+						url: '/uni_modules/uni-id-pages/pages/login/login-withoutpwd',
+						complete: (e) => {
+							console.log(6369696,e);
+						}
 					});
-				}
+				}
 			},
 			clearTmp() {
 				uni.showLoading({
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 0102de025e361a00d8e786b6946c50eda568fd94..372cf9acbdf8fc196de41c88ae56869a884ace49 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -31,10 +31,6 @@
 </template>
 
 <script>
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex';
 	import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
 	import callCheckVersion from '@/uni_modules/uni-upgrade-center-app/utils/call-check-version';
 	// #ifdef APP
@@ -136,11 +132,11 @@
 						"style": "solid", // 边框样式
 						"radius": "100%" // 边框圆角，支持百分比
 					}
-				}
+				},
+				userInfo:{}
 			}
 		},
 		onLoad() {
-			// console.log(313,this.userInfo,this.hasLogin);
 			//#ifdef APP-PLUS
 			this.ucenterList[this.ucenterList.length - 2].unshift({
 				title:this.$t('mine.checkUpdate'),// this.this.$t('mine.checkUpdate')"检查更新"
@@ -151,26 +147,46 @@
 			})
 			//#endif
 		},
+		onShow() {
+			console.log('this.hasLogin',this.hasLogin);
+			if(this.hasLogin){
+				this.getUserInfo()
+			}
+		},
 		computed: {
-			...mapGetters({
-				userInfo: 'user/info',
-				hasLogin: 'user/hasLogin'
-			})
 			// #ifdef APP-PLUS
-			,
 			appVersion() {
 				return getApp().appVersion
-			}
+			},
 			// #endif
-			,
 			appConfig() {
 				return getApp().globalData.config
+			},
+			hasLogin(){
+				return uniCloud.getCurrentUserInfo().tokenExpired > Date.now()
 			}
 		},
 		methods: {
-			...mapMutations({
-				setUserInfo: 'user/login'
-			}),
+			setUserInfo(data){
+				
+			},
+			getUserInfo(e) {
+				uni.showLoading({
+					mask: true
+				});
+				const db = uniCloud.database();
+				db.collection('uni-id-users').where("'_id' == $cloudEnv_uid").field('mobile,nickname,avatar_file').get().then(res => {
+					console.log({res});
+					this.userInfo = res.result.data[0]
+					console.log('this.userInfo', this.userInfo);
+				}).catch(e => {
+					this.userInfo = {}
+					console.log(e.message, e.errCode);
+				}).finally(e => {
+					// console.log(e);
+					uni.hideLoading()
+				})
+			},
 			toSettings() {
 				uni.navigateTo({
 					url: "/pages/ucenter/settings/settings"
@@ -204,7 +220,7 @@
 			},
 			toUserInfo() {
 				uni.navigateTo({
-					url: '/pages/ucenter/userinfo/userinfo'
+					url: '/uni_modules/uni-id-pages/pages/userinfo/userinfo'
 				})
 			},
 			tapGrid(index) {
@@ -222,7 +238,10 @@
 				if (uni.getSystemInfoSync().platform == "ios") {
 					// 这里填写appstore应用id
 					let appstoreid = this.appConfig.marketId.ios; // 'id1417078253';
-					plus.runtime.openURL("itms-apps://" + 'itunes.apple.com/cn/app/wechat/' + appstoreid + '?mt=8');
+					console.log({appstoreid});
+					plus.runtime.openURL("itms-apps://" + 'itunes.apple.com/cn/app/wechat/' + appstoreid + '?mt=8',err=>{
+						console.log('plus.runtime.openURL err:' + JSON.stringify(err));
+					});
 				}
 				if (uni.getSystemInfoSync().platform == "android") {
 					var Uri = plus.android.importClass("android.net.Uri");
@@ -265,17 +284,15 @@
 					})
 			},
 			async share() {
-				let {
-					result
-				} = await uniCloud.callFunction({
-					name: 'uni-id-cf',
-					data: {
-						action: 'getUserInviteCode'
-					}
-				})
-				console.log(result);
-				let myInviteCode = result.myInviteCode || result.userInfo.my_invite_code
-				console.log(myInviteCode);
+				let {result} = await db.collection('uni-id-users').where("'_id' == $cloudEnv_uid").field('my_invite_code').get()
+				let myInviteCode = result.data[0].my_invite_code
+				if(!myInviteCode){
+					return uni.showToast({
+						title: '请检查uni-config-center中uni-id配置，是否已启用 autoSetInviteCode',
+						icon: 'none'
+					});
+				}
+				console.log({myInviteCode});
 				let {
 					appName,
 					logo,
diff --git a/pages/ucenter/userinfo/bind-mobile/bind-mobile.vue b/pages/ucenter/userinfo/bind-mobile/bind-mobile.vue
deleted file mode 100644
index 4b19f593c07bb24e1f98856f231045dc1f4cd2ae..0000000000000000000000000000000000000000
--- a/pages/ucenter/userinfo/bind-mobile/bind-mobile.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-	<view class="uni-content">
-		<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
-		<uni-easyinput clearable focus type="number" class="input-box" :inputBorder="false" v-model="formData.mobile"
-			maxlength="11" placeholder="请输入手机号"></uni-easyinput>
-		<uni-easyinput clearable type="number" class="input-box" :inputBorder="false" v-model="formData.code"
-			maxlength="6" :placeholder="$t('common.verifyCodePlaceholder')">
-			<template v-slot:right>
-				<uni-send-sms-code ref="shortCode" code-type="bind" :phone="formData.mobile"></uni-send-sms-code>
-			</template>
-		</uni-easyinput>
-		<button class="uni-btn send-btn-box" :disabled="!canSubmit" :type="canSubmit?'primary':'default'"
-			@click="submit">提交</button>
-		<uni-popup-captcha ref="popup-captcha" @confirm="submit" v-model="formData.captcha" scene="bindMobileBySms"></uni-popup-captcha>
-	</view>
-</template>
-<script>
-	import {
-		mapMutations,
-		mapGetters
-	} from 'vuex';
-	export default {
-		data() {
-			return {
-				currenPhoneArea: '',
-				formData: {
-					phone: "",
-					code: "",
-					captcha: false
-				}
-			}
-		},
-		computed: {
-			tipText() {
-				return "验证码已通过短信发送至" + `${this.currenPhoneArea} ${this.formData.mobile}。` + "密码为6 - 20位"
-			},
-			canSubmit() {
-				return this.isPhone() && this.isCode();
-			}
-		},
-		onLoad(event) {},
-		onReady() {},
-		methods: {
-			...mapMutations({
-				setUserInfo: 'user/login'
-			}),
-			/**
-			 * 完成并提交
-			 */
-			submit() {
-				console.log(this.formData);
-				uniCloud.callFunction({
-					name: 'uni-id-cf',
-					data: {
-						action: 'bindMobileBySms',
-						params: this.formData
-					},
-					success: ({
-						result
-					}) => {
-						console.log(result);
-						uni.showToast({
-							title: result.msg || result.errMsg,
-							icon: 'none'
-						});
-						if(result.errCode == "CAPTCHA_REQUIRED"){
-							return this.$refs['popup-captcha'].open()
-						}
-						if (result.code === 0) {
-							this.setUserInfo({"mobile":result.mobile})
-							uni.navigateBack()
-						}
-					},
-					complete: () => {
-						this.formData.captcha = false
-					}
-				})
-				/*
-        const uniIdCo = uniCloud.importObject("uni-id-co")
-        uniIdCo.bindMobileBySms(this.formData).then(e => {
-          console.log(e);
-          uni.showToast({
-            title: e.errMsg,
-            icon: 'none'
-          });
-          uni.navigateBack()
-        }).catch(e => {
-          if( e.errCode == 'CAPTCHA_REQUIRED'){
-            this.$refs.popup.open()
-          }
-				}).finally(e=>{
-          this.formData.captcha = false
-        })
-		*/
-			},
-			isPhone() {
-				let reg_phone = /^1\d{10}$/;
-				let isPhone = reg_phone.test(this.formData.mobile);
-				return isPhone;
-			},
-			isCode() {
-				let reg_code = /^\d{6}$/;
-				let isCode = reg_code.test(this.formData.code);
-				return isCode;
-			}
-		}
-	}
-</script>
-
-<style>
-	.uni-content {
-		padding: 0;
-		align-items: center;
-		justify-content: center;
-		padding: 50rpx;
-		padding-top: 10px;
-	}
-
-	/* #ifndef APP-NVUE  || VUE3 */
-	.uni-content /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>
diff --git a/pages/ucenter/userinfo/userinfo.vue b/pages/ucenter/userinfo/userinfo.vue
deleted file mode 100644
index 7c38f725b3a4182d120bfae25383900e1634ec2b..0000000000000000000000000000000000000000
--- a/pages/ucenter/userinfo/userinfo.vue
+++ /dev/null
@@ -1,284 +0,0 @@
-<template>
-	<view>
-		<uni-list>
-			<uni-list-item class="item">
-				<template v-slot:body>
-					<view class="item">
-						<text>{{$t('userinfo.ProfilePhoto')}}</text>
-						<cloud-image @click="uploadAvatarImg" v-if="avatar_file" :src="avatar_file.url" width="50px" height="50px"></cloud-image>
-						<uni-icons @click="uploadAvatarImg" v-else class="chooseAvatar" type="plusempty" size="30" color="#dddddd"></uni-icons>
-					</view>
-				</template>
-			</uni-list-item>
-			<uni-list-item class="item" @click="setNickname('')" :title="$t('userinfo.nickname')" :rightText="userInfo.nickname||$t('userinfo.notSet')" link>
-			</uni-list-item>
-			<uni-list-item class="item" @click="bindMobile" :title="$t('userinfo.phoneNumber')" :rightText="userInfo.mobile||$t('userinfo.notSpecified')" link>
-			</uni-list-item>
-		</uni-list>
-		<uni-popup ref="dialog" type="dialog">
-			<uni-popup-dialog mode="input" :value="userInfo.nickname" @confirm="setNickname" :title="$t('userinfo.setNickname')"
-				:placeholder="$t('userinfo.setNicknamePlaceholder')">
-			</uni-popup-dialog>
-		</uni-popup>
-		<uni-bindMobileByMpWeixin ref="uni-bindMobileByMpWeixin"></uni-bindMobileByMpWeixin>
-	</view>
-</template>
-<script>
-	import {
-		mapMutations,
-		mapGetters
-	} from 'vuex';
-	const db = uniCloud.database();
-	const usersTable = db.collection('uni-id-users')
-	export default {
-		data() {
-			return {
-				univerifyStyle: {
-					authButton: {
-						"title": "本机号码一键绑定", // 授权按钮文案
-					},
-					otherLoginButton: {
-						"title": "其他号码绑定",
-					}
-				}
-			}
-		},
-		onLoad() {
-			this.univerifyStyle.authButton.title = this.$t('userinfo.bindPhoneNumber')
-			this.univerifyStyle.otherLoginButton.title = this.$t('userinfo.bindOtherLogin')
-			uni.setNavigationBarTitle({
-				title: this.$t('userinfo.navigationBarTitle')
-			})
-		},
-		computed: {
-			...mapGetters({
-				userInfo: 'user/info',
-				login: 'user/hasLogin'
-			}),
-			avatar_file() {
-				if (this.userInfo.avatar_file && this.userInfo.avatar_file.url) {
-					return this.userInfo.avatar_file
-				}
-			}
-		},
-		methods: {
-			...mapMutations({
-				setUserInfo: 'user/login'
-			}),
-			bindMobile() {
-				// #ifdef APP-PLUS
-				uni.preLogin({
-					provider: 'univerify',
-					success: this.univerify(), //预登录成功
-					fail: (res) => { // 预登录失败
-						// 不显示一键登录选项（或置灰）
-						console.log(res)
-						this.bindMobileBySmsCode()
-					}
-				})
-				// #endif
-				
-				// #ifdef MP-WEIXIN
-				this.$refs['uni-bindMobileByMpWeixin'].open()
-				// #endif
-				
-				// #ifdef H5
-					//...去用验证码绑定
-				this.bindMobileBySmsCode()
-				// #endif
-			},
-			univerify() {
-				uni.login({
-					"provider": 'univerify',
-					"univerifyStyle": this.univerifyStyle,
-					success: async e => {
-						console.log(e.authResult);
-						uniCloud.callFunction({
-							name: 'uni-id-cf',
-							data: {
-								action: 'bindMobileByUniverify',
-								params: e.authResult,
-							},
-							success: ({
-								result
-							}) => {
-								console.log(result);
-								if (result.code === 0) {
-									this.setUserInfo({
-										"mobile": result.mobile
-									})
-									uni.closeAuthView()
-								} else {
-									uni.showModal({
-										content: result.msg,
-										showCancel: false,
-										complete() {
-											uni.closeAuthView()
-										}
-									});
-								}
-							}
-						})
-					},
-					fail: (err) => {
-						console.log(err);
-						if (err.code == '30002' || err.code == '30001') {
-							this.bindMobileBySmsCode()
-						}
-					}
-				})
-			},
-			bindMobileBySmsCode() {
-				uni.navigateTo({
-					url: '/pages/ucenter/userinfo/bind-mobile/bind-mobile'
-				})
-			},
-			setNickname(nickname) {
-				console.log(nickname);
-				if (nickname) {
-					usersTable.where('_id==$env.uid').update({
-						nickname
-					}).then(e => {
-						console.log(e);
-						if (e.result.updated) {
-							uni.showToast({
-								title:this.$t('common.updateSucceeded'),
-								icon: 'none'
-							});
-							this.setUserInfo({
-								nickname
-							});
-						} else {
-							uni.showToast({
-								title: this.$t('userinfo.noChange'),
-								icon: 'none'
-							});
-						}
-					})
-					this.$refs.dialog.close()
-				} else {
-					this.$refs.dialog.open()
-				}
-			},
-			setAvatarFile(avatar_file) {
-				uni.showLoading({
-					title: this.$t('userinfo.setting'),
-					mask: true
-				});
-				// 使用 clientDB 提交数据
-				usersTable.where('_id==$env.uid').update({
-					avatar_file
-				}).then((res) => {
-					console.log(res);
-					if (avatar_file) {
-						uni.showToast({
-							icon: 'none',
-							title: this.$t('userinfo.setSucceeded')
-						})
-					} else {
-						uni.showToast({
-							icon: 'none',
-							title: this.$t('userinfo.deleteSucceeded')
-						})
-					}
-					this.setUserInfo({
-						avatar_file
-					});
-				}).catch((err) => {
-					uni.showModal({
-						content: err.message ||this.$t('userinfo.requestFail'),
-						showCancel: false
-					})
-				}).finally(() => {
-					uni.hideLoading()
-				})
-			},
-			uploadAvatarImg(res) {
-				const crop = {
-					quality: 100,
-					width: 600,
-					height: 600,
-					resize: true
-				};
-				uni.chooseImage({
-					count: 1,
-					crop,
-					success: async (res) => {
-						console.log(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]
-						// #ifndef APP-PLUS
-						//非app端用前端组件剪裁头像，app端用内置的原生裁剪
-						filePath = await new Promise((callback) => {
-							uni.navigateTo({
-								url: '/pages/ucenter/userinfo/cropImage?path=' + filePath +
-									`&options=${JSON.stringify(crop)}`,
-								animationType: "fade-in",
-								events: {
-									success: url => {
-										callback(url)
-									}
-								}
-							});
-						})
-						// #endif
-						console.log(this.userInfo);
-						let cloudPath = this.userInfo._id + '' + Date.now()
-						avatar_file.name = cloudPath
-						uni.showLoading({
-							title:this.$t('userinfo.uploading'),
-							mask: true
-						});
-						let {
-							fileID
-						} = await uniCloud.uploadFile({
-							filePath,
-							cloudPath,
-							fileType: "image"
-						});
-						// console.log(result)
-						avatar_file.url = fileID
-						console.log({
-							avatar_file
-						});
-						uni.hideLoading()
-
-						this.setAvatarFile(avatar_file)
-					}
-				})
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	/* #ifndef APP-NVUE */
-	view {
-		display: flex;
-		box-sizing: border-box;
-		flex-direction: column;
-	}
-	/* #endif */
-	.item {
-		width: 750rpx;
-		flex-direction: row;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.chooseAvatar {
-		border: dotted 1px #ddd;
-		border-radius: 10px;
-		text-align: center;
-		width: 50px;
-		height: 50px;
-		line-height: 50px;
-	}
-</style>
diff --git a/static/grid/c1.png b/static/grid/c1.png
deleted file mode 100644
index 9d38fdc45f54393919608143278902961ebfc03e..0000000000000000000000000000000000000000
Binary files a/static/grid/c1.png and /dev/null differ
diff --git a/static/grid/c2.png b/static/grid/c2.png
deleted file mode 100644
index ce956d76c7547cc90469647a2a1f6cd34731dbb7..0000000000000000000000000000000000000000
Binary files a/static/grid/c2.png and /dev/null differ
diff --git a/static/grid/c3.png b/static/grid/c3.png
deleted file mode 100644
index 216202ad01c5d093a15c247cf791bf66759cf54d..0000000000000000000000000000000000000000
Binary files a/static/grid/c3.png and /dev/null differ
diff --git a/static/grid/c4.png b/static/grid/c4.png
deleted file mode 100644
index fb8b4770c323cc87544a502c4efcd9792ec6047a..0000000000000000000000000000000000000000
Binary files a/static/grid/c4.png and /dev/null differ
diff --git a/static/grid/c5.png b/static/grid/c5.png
deleted file mode 100644
index 310bfb123ba811240a23883c589557cced22af97..0000000000000000000000000000000000000000
Binary files a/static/grid/c5.png and /dev/null differ
diff --git a/static/grid/c6.png b/static/grid/c6.png
deleted file mode 100644
index c3c45d8814b2657a1c603b1a44c8207da134cb40..0000000000000000000000000000000000000000
Binary files a/static/grid/c6.png and /dev/null differ
diff --git a/static/grid/c7.png b/static/grid/c7.png
deleted file mode 100644
index a1e73908c282c8ce053a037a9b0d0ff2bcdb5f28..0000000000000000000000000000000000000000
Binary files a/static/grid/c7.png and /dev/null differ
diff --git a/static/grid/c8.png b/static/grid/c8.png
deleted file mode 100644
index c32633c0b399d119fe940b19fb48ee0efd986ca1..0000000000000000000000000000000000000000
Binary files a/static/grid/c8.png and /dev/null differ
diff --git a/static/grid/c9.png b/static/grid/c9.png
deleted file mode 100644
index 51bcf6a1b39ff986d5e347f16a34c8d3e5dfccec..0000000000000000000000000000000000000000
Binary files a/static/grid/c9.png and /dev/null differ
diff --git a/static/grid/empty.png b/static/grid/empty.png
deleted file mode 100644
index c836ffa48680ae45bd5a125f2ca5cd66f5799774..0000000000000000000000000000000000000000
Binary files a/static/grid/empty.png and /dev/null differ
diff --git a/store/index.js b/store/index.js
deleted file mode 100644
index efbd986d90fd99dc02b3bf10d6e539a20bfda5aa..0000000000000000000000000000000000000000
--- a/store/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import user from '@/store/modules/user.js'
-
-// #ifndef VUE3
-import Vue from 'vue'
-import Vuex from 'vuex'
-Vue.use(Vuex)
-const store = new Vuex.Store({
-	modules: {
-		user
-	},
-	strict: true
-})
-// #endif
-
-// #ifdef VUE3
-import {createStore} from 'vuex'
-const store = createStore({
-	modules: {
-		user
-	}
-})
-// #endif
-
-export default store
\ No newline at end of file
diff --git a/store/modules/user.js b/store/modules/user.js
deleted file mode 100644
index e71aefacc3d188621ab63b86ef6d2d09ea70eeb0..0000000000000000000000000000000000000000
--- a/store/modules/user.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// 上次启动时的用户信息
-let userInfoHistory = uni.getStorageSync('userInfo') || {};
-let state = {
-		//是否已经登录
-		hasLogin: Boolean(Object.keys(userInfoHistory).length),
-		//用户信息
-		info: userInfoHistory
-	},
-	getters = {
-		info(state) {
-			return state.info;
-		},
-		hasLogin(state){
-			return state.hasLogin;
-		}
-	},
-	mutations = {
-		login(state, info) { //登录成功后的操作
-			//原有的结合传来的参数
-			let _info = state.info;
-			state.info = Object.assign({}, _info, info);
-			//设置为已经登录
-			state.hasLogin = true;
-			console.log('state.info',state.info);
-			//存储最新的用户数据到本地持久化存储
-			uni.setStorageSync('userInfo', state.info);
-			if(info.token){
-				uni.setStorage({
-					key: 'uni_id_token',
-					data: state.info.token,
-					complete(e){
-						// console.log('setStorage-------',e);
-					}
-				});
-				uni.setStorageSync('uni_id_token_expired', state.info.tokenExpired)
-			}
-		},
-		logout(state) {
-			state.info = {};
-			state.hasLogin = false;
-			uni.setStorageSync('userInfo', {});
-			uni.removeStorageSync('uni_id_token');
-			uni.setStorageSync('uni_id_token_expired', 0)
-		}
-	},
-	actions = {
-		logout(context){
-			uni.showLoading({mask:true})
-			uniCloud.callFunction({
-				name:'uni-id-cf',
-				data:{action:'logout'},
-				complete: (e) => {
-					console.log(e);
-					context.commit('logout')
-					uni.hideLoading()
-				}
-			})
-		}
-	}
-export default {
-	namespaced: true,
-	state,
-	getters,
-	mutations,
-	actions
-}
\ No newline at end of file
diff --git a/uni-starter.config.js b/uni-starter.config.js
index b133c59274ebbd4fbb31d48eb755987525f53470..ca6ad87b0e326dda4fccd695079d973e1cd38f0d 100644
--- a/uni-starter.config.js
+++ b/uni-starter.config.js
@@ -5,14 +5,14 @@ export default {
 	"h5": {
 		"url": "https://uni-starter.dcloud.net.cn", //	前端网页托管的域名	
 		 // 在h5端全局悬浮引导用户下载app的功能 更多自定义要求在/common/openApp.js中修改	
-		// "openApp": { //如不需要本功能直接移除本节点即可	
-		// 	//点击悬浮下载栏后打开的网页链接
-		// 	"openUrl": '/#/pages/ucenter/invite/invite',
-		// 	//左侧显示的应用名称	
-		// 	"appname": 'uni-starter',
-		// 	//应用的图标	
-		// 	"logo": './static/logo.png',
-		// }
+		"openApp": { //如不需要本功能直接移除本节点即可	
+			// //点击悬浮下载栏后打开的网页链接
+			// "openUrl": '/#/pages/ucenter/invite/invite',
+			// //左侧显示的应用名称	
+			// "appname": 'uni-starter',
+			// //应用的图标	
+			// "logo": './static/logo.png',
+		}
 	},
 	"mp": {
 		"weixin": {
@@ -20,38 +20,6 @@ export default {
 			"id": "gh_33446d7f7a26"
 		}
 	},
-	"router": {
-		/*
-			名词解释：“强制登录页”
-				在打开定义的需强制登录的页面之前会自动检查（前端校验）uni_id_token的值是否有效,
-				如果无效会自动跳转到登录页面
-			两种模式：
-				1.needLogin：黑名单模式。枚举游客不可访问的页面。
-				2.visitor：白名单模式。枚举游客可访问的页面。
-			* 注意：黑名单与白名单模式二选一
-		*/
-		// "needLogin" : [
-		//  	{pattern:/^\/pages\/list.*/},	//支持正则表达式
-		// 		"/uni_modules/uni-news-favorite/pages/uni-news-favorite/list",
-		// 		"/uni_modules/uni-feedback/pages/uni-feedback/add"
-		// ],
-		"visitor" : [
-			"/",//注意入口页必须直接写 "/"
-			{"pattern":/^\/pages\/list.*/},	//支持正则表达式
-			{"pattern":/^\/pages\/ucenter\/login-page.*/},
-			"/pages/common/webview/webview",
-			"/pages/grid/grid",
-			"/pages/ucenter/ucenter",
-			"/pages/ucenter/about/about",
-			"/pages/ucenter/settings/settings"
-		],
-		/*
-		login:配置登录类型与优先级
-			未列举到的，或设备环境不支持的选项，将被隐藏。如果你需要在不同平台有不同的配置，直接用条件编译即可
-			根据数组的第0项，决定登录方式的第一优先级。
-		*/
-		"login": ["weixin","univerify","username", "smsCode", "apple"]
-	},
 	//关于应用
 	"about": {
 		//应用名称
@@ -62,16 +30,6 @@ export default {
 		"company": "北京xx网络技术有限公司",
 		//口号
 		"slogan": "云端一体应用快速开发模版",
-		//政策协议
-		"agreements": [{
-				"title": "用户服务协议", //如果开启了多语言国际化，本配置将失效。请在 lang/en.js 和 lang/zh-Hans.js中配置
-				"url": "请填写用户服务协议链接" //对应的网络链接
-			},
-			{
-				"title": "隐私政策", //如果开启了多语言国际化，本配置将失效。请在 lang/en.js 和 lang/zh-Hans.js中配置
-				"url": "请填写隐私政策链接" //对应的网络链接
-			}
-		],
 		//应用的链接，用于分享到第三方平台和生成关于我们页的二维码
 		"download": "",
 		//version
diff --git a/uniCloud-aliyun/database/default.jql b/uniCloud-aliyun/database/default.jql
index 465356a46dcc688b3da922ce65ae05b56a04cc45..35d21de2a42fb399679c59fe2dda8b267029c726 100644
--- a/uniCloud-aliyun/database/default.jql
+++ b/uniCloud-aliyun/database/default.jql
@@ -5,8 +5,8 @@
 // 如果混写了普通js，最后一条语句需是数据库操作语句
 // 此处代码运行不受DB Schema的权限控制，移植代码到实际业务中注意在schema中配好permission
 // 不支持clientDB的action
-// 数据库查询有最大返回条数限制，详见：https://uniapp.dcloud.net.cn/uniCloud/cf-database?id=limit
-// 详细JQL语法，请参考 https://uniapp.dcloud.net.cn/uniCloud/clientdb?id=jsquery
+// 数据库查询有最大返回条数限制，详见：https://uniapp.dcloud.net.cn/uniCloud/cf-database.html#limit
+// 详细JQL语法，请参考：https://uniapp.dcloud.net.cn/uniCloud/jql.html
 
 // 下面示例查询uni-id-users表的所有数据
 db.collection('uni-id-users').get();
diff --git a/uni_modules.config.json b/uni_modules.config.json
deleted file mode 100644
index c1bde5147caf39d306fe6f52a02ab90fc23c88fe..0000000000000000000000000000000000000000
--- a/uni_modules.config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "scripts": {
-    // "preupload": "node uni_modules_tools/main.js change",
-    // "postupload": "node uni_modules_tools/main.js recovery"
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/json-gps/js_sdk/gps.js b/uni_modules/json-gps/js_sdk/gps.js
index 2b99ead5a9aed1d5acdd5b76d62f5b88aaa3951a..031ffd4992272371941b97a106151dcce1d9b7e9 100644
--- a/uni_modules/json-gps/js_sdk/gps.js
+++ b/uni_modules/json-gps/js_sdk/gps.js
@@ -33,7 +33,6 @@ class Gps {
 					// #ifdef APP-PLUS
 					await this.checkGpsIsOpen()
 					// #endif
-					
 					
 					// #ifdef MP-WEIXIN
 					if (err.errMsg == 'getLocation:fail auth deny') {
@@ -67,7 +66,7 @@ class Gps {
 	// #ifdef APP-PLUS
 	async checkGpsIsOpen() {
 		this.lock = true //加锁防止重复的请求
-		console.log('检查定位设置开启问题', permision.checkSystemEnableLocation());
+		// console.log('检查定位设置开启问题', permision.checkSystemEnableLocation());
 		if (!permision.checkSystemEnableLocation()) {
 			plus.nativeUI.confirm("手机定位权限没有开启，是否去开启？", (e) => {
 				this.lock = false
@@ -96,7 +95,7 @@ class Gps {
 			return false
 		}
 		let checkAppGpsRes = await this.checkAppGps()
-		console.log(checkAppGpsRes, 'checkAppGpsRes');
+		// console.log(checkAppGpsRes, 'checkAppGpsRes');
 		if (!checkAppGpsRes) {
 			plus.nativeUI.confirm("应用定位权限没有开启，是否去开启？", (e) => {
 				this.lock = false
diff --git a/uni_modules/json-gps/js_sdk/wa-permission/permission.js b/uni_modules/json-gps/js_sdk/wa-permission/permission.js
index 185dfae680144379771cbd964b063361d44a5512..51207bc74579b5b350e376b115110221d3dbffd3 100644
--- a/uni_modules/json-gps/js_sdk/wa-permission/permission.js
+++ b/uni_modules/json-gps/js_sdk/wa-permission/permission.js
@@ -45,7 +45,7 @@ function judgeIosPermissionLocation() {
 	var cllocationManger = plus.ios.import("CLLocationManager");
 	var status = cllocationManger.authorizationStatus();
 	result = (status != 2)
-	console.log("定位权限开启：" + result);
+	// console.log("定位权限开启：" + result);
 	// 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation
 	/* var enable = cllocationManger.locationServicesEnabled();
 	var status = cllocationManger.authorizationStatus();
@@ -250,7 +250,7 @@ function checkSystemEnableLocation() {
 		var result = false;
 		var cllocationManger = plus.ios.import("CLLocationManager");
 		var result = cllocationManger.locationServicesEnabled();
-		console.log("系统定位开启:" + result);
+		// console.log("系统定位开启:" + result);
 		plus.ios.deleteObject(cllocationManger);
 		return result;
 	} else {
diff --git a/uni_modules/uni-captcha/changelog.md b/uni_modules/uni-captcha/changelog.md
index 703a268752ab4ae27973fe597e1e6bc75eff543d..496672f1814afdb4628fe1350de3be4eecb43ac0 100644
--- a/uni_modules/uni-captcha/changelog.md
+++ b/uni_modules/uni-captcha/changelog.md
@@ -1,3 +1,5 @@
+## 0.6.1（2022-06-23）
+- 修复：部分返回值，不符合响应体规范的问题
 ## 0.6.0（2022-05-27）
 - 新增：支持在`uni-config-center`中根据场景值配置
 - 修复：弹窗式验证码，输入内容后点击取消，重新打开验证码的值仍然存在的问题
diff --git a/uni_modules/uni-captcha/package.json b/uni_modules/uni-captcha/package.json
index 9ba9206eb1b073ef79aed65d5ead3dbce8cf4ff6..cf586043e7397b09ac6835558dd011fb30a5cdc7 100644
--- a/uni_modules/uni-captcha/package.json
+++ b/uni_modules/uni-captcha/package.json
@@ -1,14 +1,14 @@
 {
   "id": "uni-captcha",
   "displayName": "uni-captcha",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "云端一体图形验证码组件",
   "keywords": [
-    "uniCloud",
     "captcha",
-    "验证码",
     "图形验证码",
-    "人机验证"
+    "人机验证",
+    "防刷",
+    "防脚本"
 ],
   "repository": "https://gitee.com/dcloud/uni-captcha",
   "engines": {
diff --git a/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/index.js b/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/index.js
index fe2692aed61362fefaeb8814e032f8a1e3fabeb6..b170e625aa27e334380c7eb1b4718ae8902d8f95 100644
--- a/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/index.js
+++ b/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/index.js
@@ -1 +1 @@
-"use strict";var e=require("assert"),t=require("path");function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var o=n(e),s=n(t);function r(e){const t=.2*Math.random()-.1;switch(e.type){case"M":case"L":e.x+=t,e.y+=t;break;case"Q":case"C":e.x+=t,e.y+=t,e.x1+=t,e.y1+=t}return e}function a(e,t,n,o,s,r,a){let i,l,c,u,p,h;if(e<=0||e>=1)throw RangeError("spliteCurveAt requires position > 0 && position < 1");return u=[],p=0,i={},l={},c={},i.x=t,i.y=n,l.x=o,l.y=s,c.x=r,c.y=a,h=e,u[p++]=i.x,u[p++]=i.y,u[p++]=i.x+=(l.x-i.x)*h,u[p++]=i.y+=(l.y-i.y)*h,l.x+=(c.x-l.x)*h,l.y+=(c.y-l.y)*h,u[p++]=i.x+(l.x-i.x)*h,u[p++]=i.y+(l.y-i.y)*h,u[p++]=l.x,u[p++]=l.y,u[p++]=c.x,u[p++]=c.y,u}function i(e,t){return Math.random()*(t-e)+e}var l=function(e,t){const n=e[0];o.default(n,"expect a string");const s=t.fontSize,l=s/t.font.unitsPerEm,c=t.font.charToGlyph(n),u=c.advanceWidth?c.advanceWidth*l:0,p=t.x-u/2,h=(t.ascender+t.descender)*l,f=t.y+h/2,d=c.getPath(p,f,s);d.commands.forEach(r),d.commands=function(e,t){const n=[];for(let o=0;o<e.length-1;o++){const s=e[o];if("L"===s.type){const r=e[o+1];if("L"===r.type&&Math.random()>t.truncateLineProbability){const e=i(-.1,.1);n.push(s),n.push({type:"L",x:(s.x+r.x)/2+e,y:(s.y+r.y)/2+e})}else n.push(s)}else if("Q"===s.type&&o>=1){const r=e[o-1];if(("L"===r.type||"M"===r.type)&&Math.random()>t.truncateCurveProbability){const e=r.x,o=r.y,l=i(-.1,.1),c=s.x1+l,u=s.y1+l,p=s.x+l,h=s.y+l,f=a(i(t.truncateCurvePositionMin,t.truncateCurvePositionMax),e,o,c,u,p,h),d={type:"Q",x1:f[2],y1:f[3],x:f[4],y:f[5]},g={type:"L",x:f[4],y:f[5]},m={type:"Q",x1:f[6],y1:f[7],x:f[8],y:f[9]},y={type:"L",x:f[8],y:f[9]};n.push(d),n.push(g),n.push(m),n.push(y)}}else n.push(s)}return n}(d.commands,t);return d.toPathData()};function c(){this.table=new Uint16Array(16),this.trans=new Uint16Array(288)}function u(e,t){this.source=e,this.sourceIndex=0,this.tag=0,this.bitcount=0,this.dest=t,this.destLen=0,this.ltree=new c,this.dtree=new c}var p=new c,h=new c,f=new Uint8Array(30),d=new Uint16Array(30),g=new Uint8Array(30),m=new Uint16Array(30),y=new Uint8Array([16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15]),v=new c,b=new Uint8Array(320);function S(e,t,n,o){var s,r;for(s=0;s<n;++s)e[s]=0;for(s=0;s<30-n;++s)e[s+n]=s/n|0;for(r=o,s=0;s<30;++s)t[s]=r,r+=1<<e[s]}var x=new Uint16Array(16);function U(e,t,n,o){var s,r;for(s=0;s<16;++s)e.table[s]=0;for(s=0;s<o;++s)e.table[t[n+s]]++;for(e.table[0]=0,r=0,s=0;s<16;++s)x[s]=r,r+=e.table[s];for(s=0;s<o;++s)t[n+s]&&(e.trans[x[t[n+s]]++]=s)}function T(e){e.bitcount--||(e.tag=e.source[e.sourceIndex++],e.bitcount=7);var t=1&e.tag;return e.tag>>>=1,t}function E(e,t,n){if(!t)return n;for(;e.bitcount<24;)e.tag|=e.source[e.sourceIndex++]<<e.bitcount,e.bitcount+=8;var o=e.tag&65535>>>16-t;return e.tag>>>=t,e.bitcount-=t,o+n}function O(e,t){for(;e.bitcount<24;)e.tag|=e.source[e.sourceIndex++]<<e.bitcount,e.bitcount+=8;var n=0,o=0,s=0,r=e.tag;do{o=2*o+(1&r),r>>>=1,++s,n+=t.table[s],o-=t.table[s]}while(o>=0);return e.tag=r,e.bitcount-=s,t.trans[n+o]}function w(e,t,n){var o,s,r,a,i,l;for(o=E(e,5,257),s=E(e,5,1),r=E(e,4,4),a=0;a<19;++a)b[a]=0;for(a=0;a<r;++a){var c=E(e,3,0);b[y[a]]=c}for(U(v,b,0,19),i=0;i<o+s;){var u=O(e,v);switch(u){case 16:var p=b[i-1];for(l=E(e,2,3);l;--l)b[i++]=p;break;case 17:for(l=E(e,3,3);l;--l)b[i++]=0;break;case 18:for(l=E(e,7,11);l;--l)b[i++]=0;break;default:b[i++]=u}}U(t,b,0,o),U(n,b,o,s)}function k(e,t,n){for(;;){var o,s,r,a,i=O(e,t);if(256===i)return 0;if(i<256)e.dest[e.destLen++]=i;else for(o=E(e,f[i-=257],d[i]),s=O(e,n),a=r=e.destLen-E(e,g[s],m[s]);a<r+o;++a)e.dest[e.destLen++]=e.dest[a]}}function R(e){for(var t,n;e.bitcount>8;)e.sourceIndex--,e.bitcount-=8;if((t=256*(t=e.source[e.sourceIndex+1])+e.source[e.sourceIndex])!==(65535&~(256*e.source[e.sourceIndex+3]+e.source[e.sourceIndex+2])))return-3;for(e.sourceIndex+=4,n=t;n;--n)e.dest[e.destLen++]=e.source[e.sourceIndex++];return e.bitcount=0,0}!function(e,t){var n;for(n=0;n<7;++n)e.table[n]=0;for(e.table[7]=24,e.table[8]=152,e.table[9]=112,n=0;n<24;++n)e.trans[n]=256+n;for(n=0;n<144;++n)e.trans[24+n]=n;for(n=0;n<8;++n)e.trans[168+n]=280+n;for(n=0;n<112;++n)e.trans[176+n]=144+n;for(n=0;n<5;++n)t.table[n]=0;for(t.table[5]=32,n=0;n<32;++n)t.trans[n]=n}(p,h),S(f,d,4,3),S(g,m,2,1),f[28]=0,d[28]=258;var D=function(e,t){var n,o,s=new u(e,t);do{switch(n=T(s),E(s,2,0)){case 0:o=R(s);break;case 1:o=k(s,p,h);break;case 2:w(s,s.ltree,s.dtree),o=k(s,s.ltree,s.dtree);break;default:o=-3}if(0!==o)throw new Error("Data error")}while(!n);return s.destLen<s.dest.length?"function"==typeof s.dest.slice?s.dest.slice(0,s.destLen):s.dest.subarray(0,s.destLen):s.dest};function C(e,t,n,o,s){return Math.pow(1-s,3)*e+3*Math.pow(1-s,2)*s*t+3*(1-s)*Math.pow(s,2)*n+Math.pow(s,3)*o}function L(){this.x1=Number.NaN,this.y1=Number.NaN,this.x2=Number.NaN,this.y2=Number.NaN}function I(){this.commands=[],this.fill="black",this.stroke=null,this.strokeWidth=1}function M(e){throw new Error(e)}function B(e,t){e||M(t)}L.prototype.isEmpty=function(){return isNaN(this.x1)||isNaN(this.y1)||isNaN(this.x2)||isNaN(this.y2)},L.prototype.addPoint=function(e,t){"number"==typeof e&&((isNaN(this.x1)||isNaN(this.x2))&&(this.x1=e,this.x2=e),e<this.x1&&(this.x1=e),e>this.x2&&(this.x2=e)),"number"==typeof t&&((isNaN(this.y1)||isNaN(this.y2))&&(this.y1=t,this.y2=t),t<this.y1&&(this.y1=t),t>this.y2&&(this.y2=t))},L.prototype.addX=function(e){this.addPoint(e,null)},L.prototype.addY=function(e){this.addPoint(null,e)},L.prototype.addBezier=function(e,t,n,o,s,r,a,i){const l=[e,t],c=[n,o],u=[s,r],p=[a,i];this.addPoint(e,t),this.addPoint(a,i);for(let e=0;e<=1;e++){const t=6*l[e]-12*c[e]+6*u[e],n=-3*l[e]+9*c[e]-9*u[e]+3*p[e],o=3*c[e]-3*l[e];if(0===n){if(0===t)continue;const n=-o/t;0<n&&n<1&&(0===e&&this.addX(C(l[e],c[e],u[e],p[e],n)),1===e&&this.addY(C(l[e],c[e],u[e],p[e],n)));continue}const s=Math.pow(t,2)-4*o*n;if(s<0)continue;const r=(-t+Math.sqrt(s))/(2*n);0<r&&r<1&&(0===e&&this.addX(C(l[e],c[e],u[e],p[e],r)),1===e&&this.addY(C(l[e],c[e],u[e],p[e],r)));const a=(-t-Math.sqrt(s))/(2*n);0<a&&a<1&&(0===e&&this.addX(C(l[e],c[e],u[e],p[e],a)),1===e&&this.addY(C(l[e],c[e],u[e],p[e],a)))}},L.prototype.addQuad=function(e,t,n,o,s,r){const a=e+2/3*(n-e),i=t+2/3*(o-t),l=a+1/3*(s-e),c=i+1/3*(r-t);this.addBezier(e,t,a,i,l,c,s,r)},I.prototype.moveTo=function(e,t){this.commands.push({type:"M",x:e,y:t})},I.prototype.lineTo=function(e,t){this.commands.push({type:"L",x:e,y:t})},I.prototype.curveTo=I.prototype.bezierCurveTo=function(e,t,n,o,s,r){this.commands.push({type:"C",x1:e,y1:t,x2:n,y2:o,x:s,y:r})},I.prototype.quadTo=I.prototype.quadraticCurveTo=function(e,t,n,o){this.commands.push({type:"Q",x1:e,y1:t,x:n,y:o})},I.prototype.close=I.prototype.closePath=function(){this.commands.push({type:"Z"})},I.prototype.extend=function(e){if(e.commands)e=e.commands;else if(e instanceof L){const t=e;return this.moveTo(t.x1,t.y1),this.lineTo(t.x2,t.y1),this.lineTo(t.x2,t.y2),this.lineTo(t.x1,t.y2),void this.close()}Array.prototype.push.apply(this.commands,e)},I.prototype.getBoundingBox=function(){const e=new L;let t=0,n=0,o=0,s=0;for(let r=0;r<this.commands.length;r++){const a=this.commands[r];switch(a.type){case"M":e.addPoint(a.x,a.y),t=o=a.x,n=s=a.y;break;case"L":e.addPoint(a.x,a.y),o=a.x,s=a.y;break;case"Q":e.addQuad(o,s,a.x1,a.y1,a.x,a.y),o=a.x,s=a.y;break;case"C":e.addBezier(o,s,a.x1,a.y1,a.x2,a.y2,a.x,a.y),o=a.x,s=a.y;break;case"Z":o=t,s=n;break;default:throw new Error("Unexpected path command "+a.type)}}return e.isEmpty()&&e.addPoint(0,0),e},I.prototype.draw=function(e){e.beginPath();for(let t=0;t<this.commands.length;t+=1){const n=this.commands[t];"M"===n.type?e.moveTo(n.x,n.y):"L"===n.type?e.lineTo(n.x,n.y):"C"===n.type?e.bezierCurveTo(n.x1,n.y1,n.x2,n.y2,n.x,n.y):"Q"===n.type?e.quadraticCurveTo(n.x1,n.y1,n.x,n.y):"Z"===n.type&&e.closePath()}this.fill&&(e.fillStyle=this.fill,e.fill()),this.stroke&&(e.strokeStyle=this.stroke,e.lineWidth=this.strokeWidth,e.stroke())},I.prototype.toPathData=function(e){function t(t){return Math.round(t)===t?""+Math.round(t):t.toFixed(e)}function n(){let e="";for(let n=0;n<arguments.length;n+=1){const o=arguments[n];o>=0&&n>0&&(e+=" "),e+=t(o)}return e}e=void 0!==e?e:2;let o="";for(let e=0;e<this.commands.length;e+=1){const t=this.commands[e];"M"===t.type?o+="M"+n(t.x,t.y):"L"===t.type?o+="L"+n(t.x,t.y):"C"===t.type?o+="C"+n(t.x1,t.y1,t.x2,t.y2,t.x,t.y):"Q"===t.type?o+="Q"+n(t.x1,t.y1,t.x,t.y):"Z"===t.type&&(o+="Z")}return o},I.prototype.toSVG=function(e){let t='<path d="';return t+=this.toPathData(e),t+='"',this.fill&&"black"!==this.fill&&(null===this.fill?t+=' fill="none"':t+=' fill="'+this.fill+'"'),this.stroke&&(t+=' stroke="'+this.stroke+'" stroke-width="'+this.strokeWidth+'"'),t+="/>",t},I.prototype.toDOMElement=function(e){const t=this.toPathData(e),n=document.createElementNS("http://www.w3.org/2000/svg","path");return n.setAttribute("d",t),n};var G={fail:M,argument:B,assert:B};const N={},P={},A={};function F(e){return function(){return e}}P.BYTE=function(e){return G.argument(e>=0&&e<=255,"Byte value should be between 0 and 255."),[e]},A.BYTE=F(1),P.CHAR=function(e){return[e.charCodeAt(0)]},A.CHAR=F(1),P.CHARARRAY=function(e){const t=[];for(let n=0;n<e.length;n+=1)t[n]=e.charCodeAt(n);return t},A.CHARARRAY=function(e){return e.length},P.USHORT=function(e){return[e>>8&255,255&e]},A.USHORT=F(2),P.SHORT=function(e){return e>=32768&&(e=-(65536-e)),[e>>8&255,255&e]},A.SHORT=F(2),P.UINT24=function(e){return[e>>16&255,e>>8&255,255&e]},A.UINT24=F(3),P.ULONG=function(e){return[e>>24&255,e>>16&255,e>>8&255,255&e]},A.ULONG=F(4),P.LONG=function(e){return e>=2147483648&&(e=-(4294967296-e)),[e>>24&255,e>>16&255,e>>8&255,255&e]},A.LONG=F(4),P.FIXED=P.ULONG,A.FIXED=A.ULONG,P.FWORD=P.SHORT,A.FWORD=A.SHORT,P.UFWORD=P.USHORT,A.UFWORD=A.USHORT,P.LONGDATETIME=function(e){return[0,0,0,0,e>>24&255,e>>16&255,e>>8&255,255&e]},A.LONGDATETIME=F(8),P.TAG=function(e){return G.argument(4===e.length,"Tag should be exactly 4 ASCII characters."),[e.charCodeAt(0),e.charCodeAt(1),e.charCodeAt(2),e.charCodeAt(3)]},A.TAG=F(4),P.Card8=P.BYTE,A.Card8=A.BYTE,P.Card16=P.USHORT,A.Card16=A.USHORT,P.OffSize=P.BYTE,A.OffSize=A.BYTE,P.SID=P.USHORT,A.SID=A.USHORT,P.NUMBER=function(e){return e>=-107&&e<=107?[e+139]:e>=108&&e<=1131?[247+((e-=108)>>8),255&e]:e>=-1131&&e<=-108?[251+((e=-e-108)>>8),255&e]:e>=-32768&&e<=32767?P.NUMBER16(e):P.NUMBER32(e)},A.NUMBER=function(e){return P.NUMBER(e).length},P.NUMBER16=function(e){return[28,e>>8&255,255&e]},A.NUMBER16=F(3),P.NUMBER32=function(e){return[29,e>>24&255,e>>16&255,e>>8&255,255&e]},A.NUMBER32=F(5),P.REAL=function(e){let t=e.toString();const n=/\.(\d*?)(?:9{5,20}|0{5,20})\d{0,2}(?:e(.+)|$)/.exec(t);if(n){const o=parseFloat("1e"+((n[2]?+n[2]:0)+n[1].length));t=(Math.round(e*o)/o).toString()}let o="";for(let e=0,n=t.length;e<n;e+=1){const n=t[e];o+="e"===n?"-"===t[++e]?"c":"b":"."===n?"a":"-"===n?"e":n}o+=1&o.length?"f":"ff";const s=[30];for(let e=0,t=o.length;e<t;e+=2)s.push(parseInt(o.substr(e,2),16));return s},A.REAL=function(e){return P.REAL(e).length},P.NAME=P.CHARARRAY,A.NAME=A.CHARARRAY,P.STRING=P.CHARARRAY,A.STRING=A.CHARARRAY,N.UTF8=function(e,t,n){const o=[],s=n;for(let n=0;n<s;n++,t+=1)o[n]=e.getUint8(t);return String.fromCharCode.apply(null,o)},N.UTF16=function(e,t,n){const o=[],s=n/2;for(let n=0;n<s;n++,t+=2)o[n]=e.getUint16(t);return String.fromCharCode.apply(null,o)},P.UTF16=function(e){const t=[];for(let n=0;n<e.length;n+=1){const o=e.charCodeAt(n);t[t.length]=o>>8&255,t[t.length]=255&o}return t},A.UTF16=function(e){return 2*e.length};const H={"x-mac-croatian":"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®Š™´¨≠ŽØ∞±≤≥∆µ∂∑∏š∫ªºΩžø¿¡¬√ƒ≈Ć«Č… ÀÃÕŒœĐ—“”‘’÷◊©⁄€‹›Æ»–·‚„‰ÂćÁčÈÍÎÏÌÓÔđÒÚÛÙıˆ˜¯πË˚¸Êæˇ","x-mac-cyrillic":"АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ†°Ґ£§•¶І®©™Ђђ≠Ѓѓ∞±≤≥іµґЈЄєЇїЉљЊњјЅ¬√ƒ≈∆«»… ЋћЌќѕ–—“”‘’÷„ЎўЏџ№Ёёяабвгдежзийклмнопрстуфхцчшщъыьэю","x-mac-gaelic":"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØḂ±≤≥ḃĊċḊḋḞḟĠġṀæøṁṖṗɼƒſṠ«»… ÀÃÕŒœ–—“”‘’ṡẛÿŸṪ€‹›Ŷŷṫ·Ỳỳ⁊ÂÊÁËÈÍÎÏÌÓÔ♣ÒÚÛÙıÝýŴŵẄẅẀẁẂẃ","x-mac-greek":"Ĺ²É³ÖÜ΅àâä΄¨çéèê룙î‰ôö¦€ùûü†ΓΔΘΛΞΠß®©ΣΪ§≠°·Α±≤≥¥ΒΕΖΗΙΚΜΦΫΨΩάΝ¬ΟΡ≈Τ«»… ΥΧΆΈœ–―“”‘’÷ΉΊΌΎέήίόΏύαβψδεφγηιξκλμνοπώρστθωςχυζϊϋΐΰ­","x-mac-icelandic":"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûüÝ°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄€ÐðÞþý·‚„‰ÂÊÁËÈÍÎÏÌÓÔÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ","x-mac-inuit":"ᐃᐄᐅᐆᐊᐋᐱᐲᐳᐴᐸᐹᑉᑎᑏᑐᑑᑕᑖᑦᑭᑮᑯᑰᑲᑳᒃᒋᒌᒍᒎᒐᒑ°ᒡᒥᒦ•¶ᒧ®©™ᒨᒪᒫᒻᓂᓃᓄᓅᓇᓈᓐᓯᓰᓱᓲᓴᓵᔅᓕᓖᓗᓘᓚᓛᓪᔨᔩᔪᔫᔭ… ᔮᔾᕕᕖᕗ–—“”‘’ᕘᕙᕚᕝᕆᕇᕈᕉᕋᕌᕐᕿᖀᖁᖂᖃᖄᖅᖏᖐᖑᖒᖓᖔᖕᙱᙲᙳᙴᙵᙶᖖᖠᖡᖢᖣᖤᖥᖦᕼŁł","x-mac-ce":"ÄĀāÉĄÖÜáąČäčĆć鏟ĎíďĒēĖóėôöõúĚěü†°Ę£§•¶ß®©™ę¨≠ģĮįĪ≤≥īĶ∂∑łĻļĽľĹĺŅņѬ√ńŇ∆«»… ňŐÕőŌ–—“”‘’÷◊ōŔŕŘ‹›řŖŗŠ‚„šŚśÁŤťÍŽžŪÓÔūŮÚůŰűŲųÝýķŻŁżĢˇ",macintosh:"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄€‹›fifl‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ","x-mac-romanian":"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ĂȘ∞±≤≥¥µ∂∑∏π∫ªºΩăș¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄€‹›Țț‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ","x-mac-turkish":"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸĞğİıŞş‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔÒÚÛÙˆ˜¯˘˙˚¸˝˛ˇ"};N.MACSTRING=function(e,t,n,o){const s=H[o];if(void 0===s)return;let r="";for(let o=0;o<n;o++){const n=e.getUint8(t+o);r+=n<=127?String.fromCharCode(n):s[127&n]}return r};const z="function"==typeof WeakMap&&new WeakMap;let W;function _(e){return e>=-128&&e<=127}function q(e,t,n){let o=0;const s=e.length;for(;t<s&&o<64&&0===e[t];)++t,++o;return n.push(128|o-1),t}function X(e,t,n){let o=0;const s=e.length;let r=t;for(;r<s&&o<64;){const t=e[r];if(!_(t))break;if(0===t&&r+1<s&&0===e[r+1])break;++r,++o}n.push(o-1);for(let o=t;o<r;++o)n.push(e[o]+256&255);return r}function V(e,t,n){let o=0;const s=e.length;let r=t;for(;r<s&&o<64;){const t=e[r];if(0===t)break;if(_(t)&&r+1<s&&_(e[r+1]))break;++r,++o}n.push(64|o-1);for(let o=t;o<r;++o){const t=e[o];n.push(t+65536>>8&255,t+256&255)}return r}P.MACSTRING=function(e,t){const n=function(e){if(!W){W={};for(let e in H)W[e]=new String(e)}const t=W[e];if(void 0===t)return;if(z){const e=z.get(t);if(void 0!==e)return e}const n=H[e];if(void 0===n)return;const o={};for(let e=0;e<n.length;e++)o[n.charCodeAt(e)]=e+128;return z&&z.set(t,o),o}(t);if(void 0===n)return;const o=[];for(let t=0;t<e.length;t++){let s=e.charCodeAt(t);if(s>=128&&(s=n[s],void 0===s))return;o[t]=s}return o},A.MACSTRING=function(e,t){const n=P.MACSTRING(e,t);return void 0!==n?n.length:0},P.VARDELTAS=function(e){let t=0;const n=[];for(;t<e.length;){const o=e[t];t=0===o?q(e,t,n):o>=-128&&o<=127?X(e,t,n):V(e,t,n)}return n},P.INDEX=function(e){let t=1;const n=[t],o=[];for(let s=0;s<e.length;s+=1){const r=P.OBJECT(e[s]);Array.prototype.push.apply(o,r),t+=r.length,n.push(t)}if(0===o.length)return[0,0];const s=[],r=1+Math.floor(Math.log(t)/Math.log(2))/8|0,a=[void 0,P.BYTE,P.USHORT,P.UINT24,P.ULONG][r];for(let e=0;e<n.length;e+=1){const t=a(n[e]);Array.prototype.push.apply(s,t)}return Array.prototype.concat(P.Card16(e.length),P.OffSize(r),s,o)},A.INDEX=function(e){return P.INDEX(e).length},P.DICT=function(e){let t=[];const n=Object.keys(e),o=n.length;for(let s=0;s<o;s+=1){const o=parseInt(n[s],0),r=e[o];t=t.concat(P.OPERAND(r.value,r.type)),t=t.concat(P.OPERATOR(o))}return t},A.DICT=function(e){return P.DICT(e).length},P.OPERATOR=function(e){return e<1200?[e]:[12,e-1200]},P.OPERAND=function(e,t){let n=[];if(Array.isArray(t))for(let o=0;o<t.length;o+=1)G.argument(e.length===t.length,"Not enough arguments given for type"+t),n=n.concat(P.OPERAND(e[o],t[o]));else if("SID"===t)n=n.concat(P.NUMBER(e));else if("offset"===t)n=n.concat(P.NUMBER32(e));else if("number"===t)n=n.concat(P.NUMBER(e));else{if("real"!==t)throw new Error("Unknown operand type "+t);n=n.concat(P.REAL(e))}return n},P.OP=P.BYTE,A.OP=A.BYTE;const j="function"==typeof WeakMap&&new WeakMap;function Y(e,t,n){for(let e=0;e<t.length;e+=1){const n=t[e];this[n.name]=n.value}if(this.tableName=e,this.fields=t,n){const e=Object.keys(n);for(let t=0;t<e.length;t+=1){const o=e[t],s=n[o];void 0!==this[o]&&(this[o]=s)}}}function Z(e,t,n){void 0===n&&(n=t.length);const o=new Array(t.length+1);o[0]={name:e+"Count",type:"USHORT",value:n};for(let n=0;n<t.length;n++)o[n+1]={name:e+n,type:"USHORT",value:t[n]};return o}function Q(e,t,n){const o=t.length,s=new Array(o+1);s[0]={name:e+"Count",type:"USHORT",value:o};for(let r=0;r<o;r++)s[r+1]={name:e+r,type:"TABLE",value:n(t[r],r)};return s}function $(e,t,n){const o=t.length;let s=[];s[0]={name:e+"Count",type:"USHORT",value:o};for(let e=0;e<o;e++)s=s.concat(n(t[e],e));return s}function K(e){1===e.format?Y.call(this,"coverageTable",[{name:"coverageFormat",type:"USHORT",value:1}].concat(Z("glyph",e.glyphs))):G.assert(!1,"Can't create coverage table format 2 yet.")}function J(e){Y.call(this,"scriptListTable",$("scriptRecord",e,(function(e,t){const n=e.script;let o=n.defaultLangSys;return G.assert(!!o,"Unable to write GSUB: script "+e.tag+" has no default language system."),[{name:"scriptTag"+t,type:"TAG",value:e.tag},{name:"script"+t,type:"TABLE",value:new Y("scriptTable",[{name:"defaultLangSys",type:"TABLE",value:new Y("defaultLangSys",[{name:"lookupOrder",type:"USHORT",value:0},{name:"reqFeatureIndex",type:"USHORT",value:o.reqFeatureIndex}].concat(Z("featureIndex",o.featureIndexes)))}].concat($("langSys",n.langSysRecords,(function(e,t){const n=e.langSys;return[{name:"langSysTag"+t,type:"TAG",value:e.tag},{name:"langSys"+t,type:"TABLE",value:new Y("langSys",[{name:"lookupOrder",type:"USHORT",value:0},{name:"reqFeatureIndex",type:"USHORT",value:n.reqFeatureIndex}].concat(Z("featureIndex",n.featureIndexes)))}]}))))}]})))}function ee(e){Y.call(this,"featureListTable",$("featureRecord",e,(function(e,t){const n=e.feature;return[{name:"featureTag"+t,type:"TAG",value:e.tag},{name:"feature"+t,type:"TABLE",value:new Y("featureTable",[{name:"featureParams",type:"USHORT",value:n.featureParams}].concat(Z("lookupListIndex",n.lookupListIndexes)))}]})))}function te(e,t){Y.call(this,"lookupListTable",Q("lookup",e,(function(e){let n=t[e.lookupType];return G.assert(!!n,"Unable to write GSUB lookup type "+e.lookupType+" tables."),new Y("lookupTable",[{name:"lookupType",type:"USHORT",value:e.lookupType},{name:"lookupFlag",type:"USHORT",value:e.lookupFlag}].concat(Q("subtable",e.subtables,n)))})))}P.CHARSTRING=function(e){if(j){const t=j.get(e);if(void 0!==t)return t}let t=[];const n=e.length;for(let o=0;o<n;o+=1){const n=e[o];t=t.concat(P[n.type](n.value))}return j&&j.set(e,t),t},A.CHARSTRING=function(e){return P.CHARSTRING(e).length},P.OBJECT=function(e){const t=P[e.type];return G.argument(void 0!==t,"No encoding function for type "+e.type),t(e.value)},A.OBJECT=function(e){const t=A[e.type];return G.argument(void 0!==t,"No sizeOf function for type "+e.type),t(e.value)},P.TABLE=function(e){let t=[];const n=e.fields.length,o=[],s=[];for(let r=0;r<n;r+=1){const n=e.fields[r],a=P[n.type];G.argument(void 0!==a,"No encoding function for field type "+n.type+" ("+n.name+")");let i=e[n.name];void 0===i&&(i=n.value);const l=a(i);"TABLE"===n.type?(s.push(t.length),t=t.concat([0,0]),o.push(l)):t=t.concat(l)}for(let n=0;n<o.length;n+=1){const r=s[n],a=t.length;G.argument(a<65536,"Table "+e.tableName+" too big."),t[r]=a>>8,t[r+1]=255&a,t=t.concat(o[n])}return t},A.TABLE=function(e){let t=0;const n=e.fields.length;for(let o=0;o<n;o+=1){const n=e.fields[o],s=A[n.type];G.argument(void 0!==s,"No sizeOf function for field type "+n.type+" ("+n.name+")");let r=e[n.name];void 0===r&&(r=n.value),t+=s(r),"TABLE"===n.type&&(t+=2)}return t},P.RECORD=P.TABLE,A.RECORD=A.TABLE,P.LITERAL=function(e){return e},A.LITERAL=function(e){return e.length},Y.prototype.encode=function(){return P.TABLE(this)},Y.prototype.sizeOf=function(){return A.TABLE(this)},K.prototype=Object.create(Y.prototype),K.prototype.constructor=K,J.prototype=Object.create(Y.prototype),J.prototype.constructor=J,ee.prototype=Object.create(Y.prototype),ee.prototype.constructor=ee,te.prototype=Object.create(Y.prototype),te.prototype.constructor=te;var ne={Table:Y,Record:Y,Coverage:K,ScriptList:J,FeatureList:ee,LookupList:te,ushortList:Z,tableList:Q,recordList:$};function oe(e,t){return e.getUint8(t)}function se(e,t){return e.getUint16(t,!1)}function re(e,t){return e.getUint32(t,!1)}function ae(e,t){return e.getInt16(t,!1)+e.getUint16(t+2,!1)/65535}const ie={byte:1,uShort:2,short:2,uLong:4,fixed:4,longDateTime:8,tag:4};function le(e,t){this.data=e,this.offset=t,this.relativeOffset=0}le.prototype.parseByte=function(){const e=this.data.getUint8(this.offset+this.relativeOffset);return this.relativeOffset+=1,e},le.prototype.parseChar=function(){const e=this.data.getInt8(this.offset+this.relativeOffset);return this.relativeOffset+=1,e},le.prototype.parseCard8=le.prototype.parseByte,le.prototype.parseUShort=function(){const e=this.data.getUint16(this.offset+this.relativeOffset);return this.relativeOffset+=2,e},le.prototype.parseCard16=le.prototype.parseUShort,le.prototype.parseSID=le.prototype.parseUShort,le.prototype.parseOffset16=le.prototype.parseUShort,le.prototype.parseShort=function(){const e=this.data.getInt16(this.offset+this.relativeOffset);return this.relativeOffset+=2,e},le.prototype.parseF2Dot14=function(){const e=this.data.getInt16(this.offset+this.relativeOffset)/16384;return this.relativeOffset+=2,e},le.prototype.parseULong=function(){const e=re(this.data,this.offset+this.relativeOffset);return this.relativeOffset+=4,e},le.prototype.parseFixed=function(){const e=ae(this.data,this.offset+this.relativeOffset);return this.relativeOffset+=4,e},le.prototype.parseString=function(e){const t=this.data,n=this.offset+this.relativeOffset;let o="";this.relativeOffset+=e;for(let s=0;s<e;s++)o+=String.fromCharCode(t.getUint8(n+s));return o},le.prototype.parseTag=function(){return this.parseString(4)},le.prototype.parseLongDateTime=function(){let e=re(this.data,this.offset+this.relativeOffset+4);return e-=2082844800,this.relativeOffset+=8,e},le.prototype.parseVersion=function(){const e=se(this.data,this.offset+this.relativeOffset),t=se(this.data,this.offset+this.relativeOffset+2);return this.relativeOffset+=4,e+t/4096/10},le.prototype.skip=function(e,t){void 0===t&&(t=1),this.relativeOffset+=ie[e]*t},le.prototype.parseOffset16List=le.prototype.parseUShortList=function(e){void 0===e&&(e=this.parseUShort());const t=new Array(e),n=this.data;let o=this.offset+this.relativeOffset;for(let s=0;s<e;s++)t[s]=n.getUint16(o),o+=2;return this.relativeOffset+=2*e,t},le.prototype.parseShortList=function(e){const t=new Array(e),n=this.data;let o=this.offset+this.relativeOffset;for(let s=0;s<e;s++)t[s]=n.getInt16(o),o+=2;return this.relativeOffset+=2*e,t},le.prototype.parseByteList=function(e){const t=new Array(e),n=this.data;let o=this.offset+this.relativeOffset;for(let s=0;s<e;s++)t[s]=n.getUint8(o++);return this.relativeOffset+=e,t},le.prototype.parseList=function(e,t){t||(t=e,e=this.parseUShort());const n=new Array(e);for(let o=0;o<e;o++)n[o]=t.call(this);return n},le.prototype.parseRecordList=function(e,t){t||(t=e,e=this.parseUShort());const n=new Array(e),o=Object.keys(t);for(let s=0;s<e;s++){const e={};for(let n=0;n<o.length;n++){const s=o[n],r=t[s];e[s]=r.call(this)}n[s]=e}return n},le.prototype.parseStruct=function(e){if("function"==typeof e)return e.call(this);{const t=Object.keys(e),n={};for(let o=0;o<t.length;o++){const s=t[o],r=e[s];n[s]=r.call(this)}return n}},le.prototype.parsePointer=function(e){const t=this.parseOffset16();if(t>0)return new le(this.data,this.offset+t).parseStruct(e)},le.prototype.parseListOfLists=function(e){const t=this.parseOffset16List(),n=t.length,o=this.relativeOffset,s=new Array(n);for(let o=0;o<n;o++){const n=t[o];if(0!==n)if(this.relativeOffset=n,e){const t=this.parseOffset16List(),r=new Array(t.length);for(let o=0;o<t.length;o++)this.relativeOffset=n+t[o],r[o]=e.call(this);s[o]=r}else s[o]=this.parseUShortList();else s[o]=void 0}return this.relativeOffset=o,s},le.prototype.parseCoverage=function(){const e=this.offset+this.relativeOffset,t=this.parseUShort(),n=this.parseUShort();if(1===t)return{format:1,glyphs:this.parseUShortList(n)};if(2===t){const e=new Array(n);for(let t=0;t<n;t++)e[t]={start:this.parseUShort(),end:this.parseUShort(),index:this.parseUShort()};return{format:2,ranges:e}}throw new Error("0x"+e.toString(16)+": Coverage format must be 1 or 2.")},le.prototype.parseClassDef=function(){const e=this.offset+this.relativeOffset,t=this.parseUShort();if(1===t)return{format:1,startGlyph:this.parseUShort(),classes:this.parseUShortList()};if(2===t)return{format:2,ranges:this.parseRecordList({start:le.uShort,end:le.uShort,classId:le.uShort})};throw new Error("0x"+e.toString(16)+": ClassDef format must be 1 or 2.")},le.list=function(e,t){return function(){return this.parseList(e,t)}},le.recordList=function(e,t){return function(){return this.parseRecordList(e,t)}},le.pointer=function(e){return function(){return this.parsePointer(e)}},le.tag=le.prototype.parseTag,le.byte=le.prototype.parseByte,le.uShort=le.offset16=le.prototype.parseUShort,le.uShortList=le.prototype.parseUShortList,le.struct=le.prototype.parseStruct,le.coverage=le.prototype.parseCoverage,le.classDef=le.prototype.parseClassDef;const ce={reserved:le.uShort,reqFeatureIndex:le.uShort,featureIndexes:le.uShortList};le.prototype.parseScriptList=function(){return this.parsePointer(le.recordList({tag:le.tag,script:le.pointer({defaultLangSys:le.pointer(ce),langSysRecords:le.recordList({tag:le.tag,langSys:le.pointer(ce)})})}))},le.prototype.parseFeatureList=function(){return this.parsePointer(le.recordList({tag:le.tag,feature:le.pointer({featureParams:le.offset16,lookupListIndexes:le.uShortList})}))},le.prototype.parseLookupList=function(e){return this.parsePointer(le.list(le.pointer((function(){const t=this.parseUShort();G.argument(1<=t&&t<=8,"GSUB lookup type "+t+" unknown.");const n=this.parseUShort(),o=16&n;return{lookupType:t,lookupFlag:n,subtables:this.parseList(le.pointer(e[t])),markFilteringSet:o?this.parseUShort():void 0}}))))};var ue={getByte:oe,getCard8:oe,getUShort:se,getCard16:se,getShort:function(e,t){return e.getInt16(t,!1)},getULong:re,getFixed:ae,getTag:function(e,t){let n="";for(let o=t;o<t+4;o+=1)n+=String.fromCharCode(e.getInt8(o));return n},getOffset:function(e,t,n){let o=0;for(let s=0;s<n;s+=1)o<<=8,o+=e.getUint8(t+s);return o},getBytes:function(e,t,n){const o=[];for(let s=t;s<n;s+=1)o.push(e.getUint8(s));return o},bytesToString:function(e){let t="";for(let n=0;n<e.length;n+=1)t+=String.fromCharCode(e[n]);return t},Parser:le};function pe(e,t,n){e.segments.push({end:t,start:t,delta:-(t-n),offset:0})}var he={parse:function(e,t){const n={};n.version=ue.getUShort(e,t),G.argument(0===n.version,"cmap table version should be 0."),n.numTables=ue.getUShort(e,t+2);let o=-1;for(let s=n.numTables-1;s>=0;s-=1){const n=ue.getUShort(e,t+4+8*s),r=ue.getUShort(e,t+4+8*s+2);if(3===n&&(0===r||1===r||10===r)){o=ue.getULong(e,t+4+8*s+4);break}}if(-1===o)throw new Error("No valid cmap sub-tables found.");const s=new ue.Parser(e,t+o);if(n.format=s.parseUShort(),12===n.format)!function(e,t){let n;t.parseUShort(),e.length=t.parseULong(),e.language=t.parseULong(),e.groupCount=n=t.parseULong(),e.glyphIndexMap={};for(let o=0;o<n;o+=1){const n=t.parseULong(),o=t.parseULong();let s=t.parseULong();for(let t=n;t<=o;t+=1)e.glyphIndexMap[t]=s,s++}}(n,s);else{if(4!==n.format)throw new Error("Only format 4 and 12 cmap tables are supported (found format "+n.format+").");!function(e,t,n,o,s){let r;e.length=t.parseUShort(),e.language=t.parseUShort(),e.segCount=r=t.parseUShort()>>1,t.skip("uShort",3),e.glyphIndexMap={};const a=new ue.Parser(n,o+s+14),i=new ue.Parser(n,o+s+16+2*r),l=new ue.Parser(n,o+s+16+4*r),c=new ue.Parser(n,o+s+16+6*r);let u=o+s+16+8*r;for(let t=0;t<r-1;t+=1){let t;const o=a.parseUShort(),s=i.parseUShort(),r=l.parseShort(),p=c.parseUShort();for(let a=s;a<=o;a+=1)0!==p?(u=c.offset+c.relativeOffset-2,u+=p,u+=2*(a-s),t=ue.getUShort(n,u),0!==t&&(t=t+r&65535)):t=a+r&65535,e.glyphIndexMap[a]=t}}(n,s,e,t,o)}return n},make:function(e){const t=new ne.Table("cmap",[{name:"version",type:"USHORT",value:0},{name:"numTables",type:"USHORT",value:1},{name:"platformID",type:"USHORT",value:3},{name:"encodingID",type:"USHORT",value:1},{name:"offset",type:"ULONG",value:12},{name:"format",type:"USHORT",value:4},{name:"length",type:"USHORT",value:0},{name:"language",type:"USHORT",value:0},{name:"segCountX2",type:"USHORT",value:0},{name:"searchRange",type:"USHORT",value:0},{name:"entrySelector",type:"USHORT",value:0},{name:"rangeShift",type:"USHORT",value:0}]);t.segments=[];for(let n=0;n<e.length;n+=1){const o=e.get(n);for(let e=0;e<o.unicodes.length;e+=1)pe(t,o.unicodes[e],n);t.segments=t.segments.sort((function(e,t){return e.start-t.start}))}let n;!function(e){e.segments.push({end:65535,start:65535,delta:1,offset:0})}(t),n=t.segments.length,t.segCountX2=2*n,t.searchRange=2*Math.pow(2,Math.floor(Math.log(n)/Math.log(2))),t.entrySelector=Math.log(t.searchRange/2)/Math.log(2),t.rangeShift=t.segCountX2-t.searchRange;let o=[],s=[],r=[],a=[],i=[];for(let e=0;e<n;e+=1){const n=t.segments[e];o=o.concat({name:"end_"+e,type:"USHORT",value:n.end}),s=s.concat({name:"start_"+e,type:"USHORT",value:n.start}),r=r.concat({name:"idDelta_"+e,type:"SHORT",value:n.delta}),a=a.concat({name:"idRangeOffset_"+e,type:"USHORT",value:n.offset}),void 0!==n.glyphId&&(i=i.concat({name:"glyph_"+e,type:"USHORT",value:n.glyphId}))}return t.fields=t.fields.concat(o),t.fields.push({name:"reservedPad",type:"USHORT",value:0}),t.fields=t.fields.concat(s),t.fields=t.fields.concat(r),t.fields=t.fields.concat(a),t.fields=t.fields.concat(i),t.length=14+2*o.length+2+2*s.length+2*r.length+2*a.length+2*i.length,t}};const fe=[".notdef","space","exclam","quotedbl","numbersign","dollar","percent","ampersand","quoteright","parenleft","parenright","asterisk","plus","comma","hyphen","period","slash","zero","one","two","three","four","five","six","seven","eight","nine","colon","semicolon","less","equal","greater","question","at","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","bracketleft","backslash","bracketright","asciicircum","underscore","quoteleft","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","braceleft","bar","braceright","asciitilde","exclamdown","cent","sterling","fraction","yen","florin","section","currency","quotesingle","quotedblleft","guillemotleft","guilsinglleft","guilsinglright","fi","fl","endash","dagger","daggerdbl","periodcentered","paragraph","bullet","quotesinglbase","quotedblbase","quotedblright","guillemotright","ellipsis","perthousand","questiondown","grave","acute","circumflex","tilde","macron","breve","dotaccent","dieresis","ring","cedilla","hungarumlaut","ogonek","caron","emdash","AE","ordfeminine","Lslash","Oslash","OE","ordmasculine","ae","dotlessi","lslash","oslash","oe","germandbls","onesuperior","logicalnot","mu","trademark","Eth","onehalf","plusminus","Thorn","onequarter","divide","brokenbar","degree","thorn","threequarters","twosuperior","registered","minus","eth","multiply","threesuperior","copyright","Aacute","Acircumflex","Adieresis","Agrave","Aring","Atilde","Ccedilla","Eacute","Ecircumflex","Edieresis","Egrave","Iacute","Icircumflex","Idieresis","Igrave","Ntilde","Oacute","Ocircumflex","Odieresis","Ograve","Otilde","Scaron","Uacute","Ucircumflex","Udieresis","Ugrave","Yacute","Ydieresis","Zcaron","aacute","acircumflex","adieresis","agrave","aring","atilde","ccedilla","eacute","ecircumflex","edieresis","egrave","iacute","icircumflex","idieresis","igrave","ntilde","oacute","ocircumflex","odieresis","ograve","otilde","scaron","uacute","ucircumflex","udieresis","ugrave","yacute","ydieresis","zcaron","exclamsmall","Hungarumlautsmall","dollaroldstyle","dollarsuperior","ampersandsmall","Acutesmall","parenleftsuperior","parenrightsuperior","266 ff","onedotenleader","zerooldstyle","oneoldstyle","twooldstyle","threeoldstyle","fouroldstyle","fiveoldstyle","sixoldstyle","sevenoldstyle","eightoldstyle","nineoldstyle","commasuperior","threequartersemdash","periodsuperior","questionsmall","asuperior","bsuperior","centsuperior","dsuperior","esuperior","isuperior","lsuperior","msuperior","nsuperior","osuperior","rsuperior","ssuperior","tsuperior","ff","ffi","ffl","parenleftinferior","parenrightinferior","Circumflexsmall","hyphensuperior","Gravesmall","Asmall","Bsmall","Csmall","Dsmall","Esmall","Fsmall","Gsmall","Hsmall","Ismall","Jsmall","Ksmall","Lsmall","Msmall","Nsmall","Osmall","Psmall","Qsmall","Rsmall","Ssmall","Tsmall","Usmall","Vsmall","Wsmall","Xsmall","Ysmall","Zsmall","colonmonetary","onefitted","rupiah","Tildesmall","exclamdownsmall","centoldstyle","Lslashsmall","Scaronsmall","Zcaronsmall","Dieresissmall","Brevesmall","Caronsmall","Dotaccentsmall","Macronsmall","figuredash","hypheninferior","Ogoneksmall","Ringsmall","Cedillasmall","questiondownsmall","oneeighth","threeeighths","fiveeighths","seveneighths","onethird","twothirds","zerosuperior","foursuperior","fivesuperior","sixsuperior","sevensuperior","eightsuperior","ninesuperior","zeroinferior","oneinferior","twoinferior","threeinferior","fourinferior","fiveinferior","sixinferior","seveninferior","eightinferior","nineinferior","centinferior","dollarinferior","periodinferior","commainferior","Agravesmall","Aacutesmall","Acircumflexsmall","Atildesmall","Adieresissmall","Aringsmall","AEsmall","Ccedillasmall","Egravesmall","Eacutesmall","Ecircumflexsmall","Edieresissmall","Igravesmall","Iacutesmall","Icircumflexsmall","Idieresissmall","Ethsmall","Ntildesmall","Ogravesmall","Oacutesmall","Ocircumflexsmall","Otildesmall","Odieresissmall","OEsmall","Oslashsmall","Ugravesmall","Uacutesmall","Ucircumflexsmall","Udieresissmall","Yacutesmall","Thornsmall","Ydieresissmall","001.000","001.001","001.002","001.003","Black","Bold","Book","Light","Medium","Regular","Roman","Semibold"],de=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","space","exclam","quotedbl","numbersign","dollar","percent","ampersand","quoteright","parenleft","parenright","asterisk","plus","comma","hyphen","period","slash","zero","one","two","three","four","five","six","seven","eight","nine","colon","semicolon","less","equal","greater","question","at","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","bracketleft","backslash","bracketright","asciicircum","underscore","quoteleft","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","braceleft","bar","braceright","asciitilde","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","exclamdown","cent","sterling","fraction","yen","florin","section","currency","quotesingle","quotedblleft","guillemotleft","guilsinglleft","guilsinglright","fi","fl","","endash","dagger","daggerdbl","periodcentered","","paragraph","bullet","quotesinglbase","quotedblbase","quotedblright","guillemotright","ellipsis","perthousand","","questiondown","","grave","acute","circumflex","tilde","macron","breve","dotaccent","dieresis","","ring","cedilla","","hungarumlaut","ogonek","caron","emdash","","","","","","","","","","","","","","","","","AE","","ordfeminine","","","","","Lslash","Oslash","OE","ordmasculine","","","","","","ae","","","","dotlessi","","","lslash","oslash","oe","germandbls"],ge=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","space","exclamsmall","Hungarumlautsmall","","dollaroldstyle","dollarsuperior","ampersandsmall","Acutesmall","parenleftsuperior","parenrightsuperior","twodotenleader","onedotenleader","comma","hyphen","period","fraction","zerooldstyle","oneoldstyle","twooldstyle","threeoldstyle","fouroldstyle","fiveoldstyle","sixoldstyle","sevenoldstyle","eightoldstyle","nineoldstyle","colon","semicolon","commasuperior","threequartersemdash","periodsuperior","questionsmall","","asuperior","bsuperior","centsuperior","dsuperior","esuperior","","","isuperior","","","lsuperior","msuperior","nsuperior","osuperior","","","rsuperior","ssuperior","tsuperior","","ff","fi","fl","ffi","ffl","parenleftinferior","","parenrightinferior","Circumflexsmall","hyphensuperior","Gravesmall","Asmall","Bsmall","Csmall","Dsmall","Esmall","Fsmall","Gsmall","Hsmall","Ismall","Jsmall","Ksmall","Lsmall","Msmall","Nsmall","Osmall","Psmall","Qsmall","Rsmall","Ssmall","Tsmall","Usmall","Vsmall","Wsmall","Xsmall","Ysmall","Zsmall","colonmonetary","onefitted","rupiah","Tildesmall","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","exclamdownsmall","centoldstyle","Lslashsmall","","","Scaronsmall","Zcaronsmall","Dieresissmall","Brevesmall","Caronsmall","","Dotaccentsmall","","","Macronsmall","","","figuredash","hypheninferior","","","Ogoneksmall","Ringsmall","Cedillasmall","","","","onequarter","onehalf","threequarters","questiondownsmall","oneeighth","threeeighths","fiveeighths","seveneighths","onethird","twothirds","","","zerosuperior","onesuperior","twosuperior","threesuperior","foursuperior","fivesuperior","sixsuperior","sevensuperior","eightsuperior","ninesuperior","zeroinferior","oneinferior","twoinferior","threeinferior","fourinferior","fiveinferior","sixinferior","seveninferior","eightinferior","nineinferior","centinferior","dollarinferior","periodinferior","commainferior","Agravesmall","Aacutesmall","Acircumflexsmall","Atildesmall","Adieresissmall","Aringsmall","AEsmall","Ccedillasmall","Egravesmall","Eacutesmall","Ecircumflexsmall","Edieresissmall","Igravesmall","Iacutesmall","Icircumflexsmall","Idieresissmall","Ethsmall","Ntildesmall","Ogravesmall","Oacutesmall","Ocircumflexsmall","Otildesmall","Odieresissmall","OEsmall","Oslashsmall","Ugravesmall","Uacutesmall","Ucircumflexsmall","Udieresissmall","Yacutesmall","Thornsmall","Ydieresissmall"],me=[".notdef",".null","nonmarkingreturn","space","exclam","quotedbl","numbersign","dollar","percent","ampersand","quotesingle","parenleft","parenright","asterisk","plus","comma","hyphen","period","slash","zero","one","two","three","four","five","six","seven","eight","nine","colon","semicolon","less","equal","greater","question","at","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","bracketleft","backslash","bracketright","asciicircum","underscore","grave","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","braceleft","bar","braceright","asciitilde","Adieresis","Aring","Ccedilla","Eacute","Ntilde","Odieresis","Udieresis","aacute","agrave","acircumflex","adieresis","atilde","aring","ccedilla","eacute","egrave","ecircumflex","edieresis","iacute","igrave","icircumflex","idieresis","ntilde","oacute","ograve","ocircumflex","odieresis","otilde","uacute","ugrave","ucircumflex","udieresis","dagger","degree","cent","sterling","section","bullet","paragraph","germandbls","registered","copyright","trademark","acute","dieresis","notequal","AE","Oslash","infinity","plusminus","lessequal","greaterequal","yen","mu","partialdiff","summation","product","pi","integral","ordfeminine","ordmasculine","Omega","ae","oslash","questiondown","exclamdown","logicalnot","radical","florin","approxequal","Delta","guillemotleft","guillemotright","ellipsis","nonbreakingspace","Agrave","Atilde","Otilde","OE","oe","endash","emdash","quotedblleft","quotedblright","quoteleft","quoteright","divide","lozenge","ydieresis","Ydieresis","fraction","currency","guilsinglleft","guilsinglright","fi","fl","daggerdbl","periodcentered","quotesinglbase","quotedblbase","perthousand","Acircumflex","Ecircumflex","Aacute","Edieresis","Egrave","Iacute","Icircumflex","Idieresis","Igrave","Oacute","Ocircumflex","apple","Ograve","Uacute","Ucircumflex","Ugrave","dotlessi","circumflex","tilde","macron","breve","dotaccent","ring","cedilla","hungarumlaut","ogonek","caron","Lslash","lslash","Scaron","scaron","Zcaron","zcaron","brokenbar","Eth","eth","Yacute","yacute","Thorn","thorn","minus","multiply","onesuperior","twosuperior","threesuperior","onehalf","onequarter","threequarters","franc","Gbreve","gbreve","Idotaccent","Scedilla","scedilla","Cacute","cacute","Ccaron","ccaron","dcroat"];function ye(e){this.font=e}function ve(e){this.cmap=e}function be(e,t){this.encoding=e,this.charset=t}function Se(e){switch(e.version){case 1:this.names=me.slice();break;case 2:this.names=new Array(e.numberOfGlyphs);for(let t=0;t<e.numberOfGlyphs;t++)e.glyphNameIndex[t]<me.length?this.names[t]=me[e.glyphNameIndex[t]]:this.names[t]=e.names[e.glyphNameIndex[t]-me.length];break;case 2.5:this.names=new Array(e.numberOfGlyphs);for(let t=0;t<e.numberOfGlyphs;t++)this.names[t]=me[t+e.glyphNameIndex[t]];break;case 3:default:this.names=[]}}ye.prototype.charToGlyphIndex=function(e){const t=e.charCodeAt(0),n=this.font.glyphs;if(n)for(let e=0;e<n.length;e+=1){const o=n.get(e);for(let n=0;n<o.unicodes.length;n+=1)if(o.unicodes[n]===t)return e}return null},ve.prototype.charToGlyphIndex=function(e){return this.cmap.glyphIndexMap[e.charCodeAt(0)]||0},be.prototype.charToGlyphIndex=function(e){const t=e.charCodeAt(0),n=this.encoding[t];return this.charset.indexOf(n)},Se.prototype.nameToGlyphIndex=function(e){return this.names.indexOf(e)},Se.prototype.glyphIndexToName=function(e){return this.names[e]};var xe={line:function(e,t,n,o,s){e.beginPath(),e.moveTo(t,n),e.lineTo(o,s),e.stroke()}};function Ue(e,t,n,o,s){let r;return(t&o)>0?(r=e.parseByte(),0==(t&s)&&(r=-r),r=n+r):r=(t&s)>0?n:n+e.parseShort(),r}function Te(e,t,n){const o=new ue.Parser(t,n);let s,r;if(e.numberOfContours=o.parseShort(),e._xMin=o.parseShort(),e._yMin=o.parseShort(),e._xMax=o.parseShort(),e._yMax=o.parseShort(),e.numberOfContours>0){const t=e.endPointIndices=[];for(let n=0;n<e.numberOfContours;n+=1)t.push(o.parseUShort());e.instructionLength=o.parseUShort(),e.instructions=[];for(let t=0;t<e.instructionLength;t+=1)e.instructions.push(o.parseByte());const n=t[t.length-1]+1;s=[];for(let e=0;e<n;e+=1)if(r=o.parseByte(),s.push(r),(8&r)>0){const t=o.parseByte();for(let n=0;n<t;n+=1)s.push(r),e+=1}if(G.argument(s.length===n,"Bad flags."),t.length>0){const a=[];let i;if(n>0){for(let e=0;e<n;e+=1)r=s[e],i={},i.onCurve=!!(1&r),i.lastPointOfContour=t.indexOf(e)>=0,a.push(i);let e=0;for(let t=0;t<n;t+=1)r=s[t],i=a[t],i.x=Ue(o,r,e,2,16),e=i.x;let l=0;for(let e=0;e<n;e+=1)r=s[e],i=a[e],i.y=Ue(o,r,l,4,32),l=i.y}e.points=a}else e.points=[]}else if(0===e.numberOfContours)e.points=[];else{e.isComposite=!0,e.points=[],e.components=[];let t=!0;for(;t;){s=o.parseUShort();const n={glyphIndex:o.parseUShort(),xScale:1,scale01:0,scale10:0,yScale:1,dx:0,dy:0};(1&s)>0?(2&s)>0?(n.dx=o.parseShort(),n.dy=o.parseShort()):n.matchedPoints=[o.parseUShort(),o.parseUShort()]:(2&s)>0?(n.dx=o.parseChar(),n.dy=o.parseChar()):n.matchedPoints=[o.parseByte(),o.parseByte()],(8&s)>0?n.xScale=n.yScale=o.parseF2Dot14():(64&s)>0?(n.xScale=o.parseF2Dot14(),n.yScale=o.parseF2Dot14()):(128&s)>0&&(n.xScale=o.parseF2Dot14(),n.scale01=o.parseF2Dot14(),n.scale10=o.parseF2Dot14(),n.yScale=o.parseF2Dot14()),e.components.push(n),t=!!(32&s)}if(256&s){e.instructionLength=o.parseUShort(),e.instructions=[];for(let t=0;t<e.instructionLength;t+=1)e.instructions.push(o.parseByte())}}}function Ee(e,t){const n=[];for(let o=0;o<e.length;o+=1){const s=e[o],r={x:t.xScale*s.x+t.scale01*s.y+t.dx,y:t.scale10*s.x+t.yScale*s.y+t.dy,onCurve:s.onCurve,lastPointOfContour:s.lastPointOfContour};n.push(r)}return n}function Oe(e){const t=new I;if(!e)return t;const n=function(e){const t=[];let n=[];for(let o=0;o<e.length;o+=1){const s=e[o];n.push(s),s.lastPointOfContour&&(t.push(n),n=[])}return G.argument(0===n.length,"There are still points left in the current contour."),t}(e);for(let e=0;e<n.length;++e){const o=n[e];let s=null,r=o[o.length-1],a=o[0];if(r.onCurve)t.moveTo(r.x,r.y);else if(a.onCurve)t.moveTo(a.x,a.y);else{const e={x:.5*(r.x+a.x),y:.5*(r.y+a.y)};t.moveTo(e.x,e.y)}for(let e=0;e<o.length;++e)if(s=r,r=a,a=o[(e+1)%o.length],r.onCurve)t.lineTo(r.x,r.y);else{let e=s,n=a;s.onCurve||(e={x:.5*(r.x+s.x),y:.5*(r.y+s.y)},t.lineTo(e.x,e.y)),a.onCurve||(n={x:.5*(r.x+a.x),y:.5*(r.y+a.y)}),t.lineTo(e.x,e.y),t.quadraticCurveTo(r.x,r.y,n.x,n.y)}t.closePath()}return t}function we(e,t){if(t.isComposite)for(let n=0;n<t.components.length;n+=1){const o=t.components[n],s=e.get(o.glyphIndex);if(s.getPath(),s.points){let e;if(void 0===o.matchedPoints)e=Ee(s.points,o);else{if(o.matchedPoints[0]>t.points.length-1||o.matchedPoints[1]>s.points.length-1)throw Error("Matched points out of range in "+t.name);const n=t.points[o.matchedPoints[0]];let r=s.points[o.matchedPoints[1]];const a={xScale:o.xScale,scale01:o.scale01,scale10:o.scale10,yScale:o.yScale,dx:0,dy:0};r=Ee([r],a)[0],a.dx=n.x-r.x,a.dy=n.y-r.y,e=Ee(s.points,a)}t.points=t.points.concat(e)}}return Oe(t.points)}var ke={getPath:Oe,parse:function(e,t,n,o){const s=new Le.GlyphSet(o);for(let r=0;r<n.length-1;r+=1){const a=n[r];a!==n[r+1]?s.push(r,Le.ttfGlyphLoader(o,r,Te,e,t+a,we)):s.push(r,Le.glyphLoader(o,r))}return s}};function Re(e){this.bindConstructorValues(e)}function De(e,t,n){Object.defineProperty(e,t,{get:function(){return e.path,e[n]},set:function(t){e[n]=t},enumerable:!0,configurable:!0})}function Ce(e,t){if(this.font=e,this.glyphs={},Array.isArray(t))for(let e=0;e<t.length;e++)this.glyphs[e]=t[e];this.length=t&&t.length||0}Re.prototype.bindConstructorValues=function(e){this.index=e.index||0,this.name=e.name||null,this.unicode=e.unicode||void 0,this.unicodes=e.unicodes||void 0!==e.unicode?[e.unicode]:[],e.xMin&&(this.xMin=e.xMin),e.yMin&&(this.yMin=e.yMin),e.xMax&&(this.xMax=e.xMax),e.yMax&&(this.yMax=e.yMax),e.advanceWidth&&(this.advanceWidth=e.advanceWidth),Object.defineProperty(this,"path",function(e,t){let n=t||{commands:[]};return{configurable:!0,get:function(){return"function"==typeof n&&(n=n()),n},set:function(e){n=e}}}(0,e.path))},Re.prototype.addUnicode=function(e){0===this.unicodes.length&&(this.unicode=e),this.unicodes.push(e)},Re.prototype.getBoundingBox=function(){return this.path.getBoundingBox()},Re.prototype.getPath=function(e,t,n,o,s){let r,a;e=void 0!==e?e:0,t=void 0!==t?t:0,n=void 0!==n?n:72,o||(o={});let i=o.xScale,l=o.yScale;if(o.hinting&&s&&s.hinting&&(a=this.path&&s.hinting.exec(this,n)),a)r=ke.getPath(a).commands,e=Math.round(e),t=Math.round(t),i=l=1;else{r=this.path.commands;const e=1/this.path.unitsPerEm*n;void 0===i&&(i=e),void 0===l&&(l=e)}const c=new I;for(let n=0;n<r.length;n+=1){const o=r[n];"M"===o.type?c.moveTo(e+o.x*i,t+-o.y*l):"L"===o.type?c.lineTo(e+o.x*i,t+-o.y*l):"Q"===o.type?c.quadraticCurveTo(e+o.x1*i,t+-o.y1*l,e+o.x*i,t+-o.y*l):"C"===o.type?c.curveTo(e+o.x1*i,t+-o.y1*l,e+o.x2*i,t+-o.y2*l,e+o.x*i,t+-o.y*l):"Z"===o.type&&c.closePath()}return c},Re.prototype.getContours=function(){if(void 0===this.points)return[];const e=[];let t=[];for(let n=0;n<this.points.length;n+=1){const o=this.points[n];t.push(o),o.lastPointOfContour&&(e.push(t),t=[])}return G.argument(0===t.length,"There are still points left in the current contour."),e},Re.prototype.getMetrics=function(){const e=this.path.commands,t=[],n=[];for(let o=0;o<e.length;o+=1){const s=e[o];"Z"!==s.type&&(t.push(s.x),n.push(s.y)),"Q"!==s.type&&"C"!==s.type||(t.push(s.x1),n.push(s.y1)),"C"===s.type&&(t.push(s.x2),n.push(s.y2))}const o={xMin:Math.min.apply(null,t),yMin:Math.min.apply(null,n),xMax:Math.max.apply(null,t),yMax:Math.max.apply(null,n),leftSideBearing:this.leftSideBearing};return isFinite(o.xMin)||(o.xMin=0),isFinite(o.xMax)||(o.xMax=this.advanceWidth),isFinite(o.yMin)||(o.yMin=0),isFinite(o.yMax)||(o.yMax=0),o.rightSideBearing=this.advanceWidth-o.leftSideBearing-(o.xMax-o.xMin),o},Re.prototype.draw=function(e,t,n,o,s){this.getPath(t,n,o,s).draw(e)},Re.prototype.drawPoints=function(e,t,n,o){function s(t,n,o,s){const r=2*Math.PI;e.beginPath();for(let a=0;a<t.length;a+=1)e.moveTo(n+t[a].x*s,o+t[a].y*s),e.arc(n+t[a].x*s,o+t[a].y*s,2,0,r,!1);e.closePath(),e.fill()}t=void 0!==t?t:0,n=void 0!==n?n:0,o=void 0!==o?o:24;const r=1/this.path.unitsPerEm*o,a=[],i=[],l=this.path;for(let e=0;e<l.commands.length;e+=1){const t=l.commands[e];void 0!==t.x&&a.push({x:t.x,y:-t.y}),void 0!==t.x1&&i.push({x:t.x1,y:-t.y1}),void 0!==t.x2&&i.push({x:t.x2,y:-t.y2})}e.fillStyle="blue",s(a,t,n,r),e.fillStyle="red",s(i,t,n,r)},Re.prototype.drawMetrics=function(e,t,n,o){let s;t=void 0!==t?t:0,n=void 0!==n?n:0,o=void 0!==o?o:24,s=1/this.path.unitsPerEm*o,e.lineWidth=1,e.strokeStyle="black",xe.line(e,t,-1e4,t,1e4),xe.line(e,-1e4,n,1e4,n);const r=this.xMin||0;let a=this.yMin||0;const i=this.xMax||0;let l=this.yMax||0;const c=this.advanceWidth||0;e.strokeStyle="blue",xe.line(e,t+r*s,-1e4,t+r*s,1e4),xe.line(e,t+i*s,-1e4,t+i*s,1e4),xe.line(e,-1e4,n+-a*s,1e4,n+-a*s),xe.line(e,-1e4,n+-l*s,1e4,n+-l*s),e.strokeStyle="green",xe.line(e,t+c*s,-1e4,t+c*s,1e4)},Ce.prototype.get=function(e){return"function"==typeof this.glyphs[e]&&(this.glyphs[e]=this.glyphs[e]()),this.glyphs[e]},Ce.prototype.push=function(e,t){this.glyphs[e]=t,this.length++};var Le={GlyphSet:Ce,glyphLoader:function(e,t){return new Re({index:t,font:e})},ttfGlyphLoader:function(e,t,n,o,s,r){return function(){const a=new Re({index:t,font:e});return a.path=function(){n(a,o,s);const t=r(e.glyphs,a);return t.unitsPerEm=e.unitsPerEm,t},De(a,"xMin","_xMin"),De(a,"xMax","_xMax"),De(a,"yMin","_yMin"),De(a,"yMax","_yMax"),a}},cffGlyphLoader:function(e,t,n,o){return function(){const s=new Re({index:t,font:e});return s.path=function(){const t=n(e,s,o);return t.unitsPerEm=e.unitsPerEm,t},s}}};function Ie(e,t){if(e===t)return!0;if(Array.isArray(e)&&Array.isArray(t)){if(e.length!==t.length)return!1;for(let n=0;n<e.length;n+=1)if(!Ie(e[n],t[n]))return!1;return!0}return!1}function Me(e){let t;return t=e.length<1240?107:e.length<33900?1131:32768,t}function Be(e,t,n){const o=[],s=[],r=ue.getCard16(e,t);let a,i;if(0!==r){const n=ue.getByte(e,t+2);a=t+(r+1)*n+2;let s=t+3;for(let t=0;t<r+1;t+=1)o.push(ue.getOffset(e,s,n)),s+=n;i=a+o[r]}else i=t+2;for(let t=0;t<o.length-1;t+=1){let r=ue.getBytes(e,a+o[t],a+o[t+1]);n&&(r=n(r)),s.push(r)}return{objects:s,startOffset:t,endOffset:i}}function Ge(e,t){let n,o,s,r;if(28===t)return n=e.parseByte(),o=e.parseByte(),n<<8|o;if(29===t)return n=e.parseByte(),o=e.parseByte(),s=e.parseByte(),r=e.parseByte(),n<<24|o<<16|s<<8|r;if(30===t)return function(e){let t="";const n=["0","1","2","3","4","5","6","7","8","9",".","E","E-",null,"-"];for(;;){const o=e.parseByte(),s=o>>4,r=15&o;if(15===s)break;if(t+=n[s],15===r)break;t+=n[r]}return parseFloat(t)}(e);if(t>=32&&t<=246)return t-139;if(t>=247&&t<=250)return n=e.parseByte(),256*(t-247)+n+108;if(t>=251&&t<=254)return n=e.parseByte(),256*-(t-251)-n-108;throw new Error("Invalid b0 "+t)}function Ne(e,t,n){t=void 0!==t?t:0;const o=new ue.Parser(e,t),s=[];let r=[];for(n=void 0!==n?n:e.length;o.relativeOffset<n;){let e=o.parseByte();e<=21?(12===e&&(e=1200+o.parseByte()),s.push([e,r]),r=[]):r.push(Ge(o,e))}return function(e){const t={};for(let n=0;n<e.length;n+=1){const o=e[n][0],s=e[n][1];let r;if(r=1===s.length?s[0]:s,t.hasOwnProperty(o)&&!isNaN(t[o]))throw new Error("Object "+t+" already has key "+o);t[o]=r}return t}(s)}function Pe(e,t){return t=t<=390?fe[t]:e[t-391]}function Ae(e,t,n){const o={};let s;for(let r=0;r<t.length;r+=1){const a=t[r];if(Array.isArray(a.type)){const t=[];t.length=a.type.length;for(let o=0;o<a.type.length;o++)s=void 0!==e[a.op]?e[a.op][o]:void 0,void 0===s&&(s=void 0!==a.value&&void 0!==a.value[o]?a.value[o]:null),"SID"===a.type[o]&&(s=Pe(n,s)),t[o]=s;o[a.name]=t}else s=e[a.op],void 0===s&&(s=void 0!==a.value?a.value:null),"SID"===a.type&&(s=Pe(n,s)),o[a.name]=s}return o}const Fe=[{name:"version",op:0,type:"SID"},{name:"notice",op:1,type:"SID"},{name:"copyright",op:1200,type:"SID"},{name:"fullName",op:2,type:"SID"},{name:"familyName",op:3,type:"SID"},{name:"weight",op:4,type:"SID"},{name:"isFixedPitch",op:1201,type:"number",value:0},{name:"italicAngle",op:1202,type:"number",value:0},{name:"underlinePosition",op:1203,type:"number",value:-100},{name:"underlineThickness",op:1204,type:"number",value:50},{name:"paintType",op:1205,type:"number",value:0},{name:"charstringType",op:1206,type:"number",value:2},{name:"fontMatrix",op:1207,type:["real","real","real","real","real","real"],value:[.001,0,0,.001,0,0]},{name:"uniqueId",op:13,type:"number"},{name:"fontBBox",op:5,type:["number","number","number","number"],value:[0,0,0,0]},{name:"strokeWidth",op:1208,type:"number",value:0},{name:"xuid",op:14,type:[],value:null},{name:"charset",op:15,type:"offset",value:0},{name:"encoding",op:16,type:"offset",value:0},{name:"charStrings",op:17,type:"offset",value:0},{name:"private",op:18,type:["number","offset"],value:[0,0]},{name:"ros",op:1230,type:["SID","SID","number"]},{name:"cidFontVersion",op:1231,type:"number",value:0},{name:"cidFontRevision",op:1232,type:"number",value:0},{name:"cidFontType",op:1233,type:"number",value:0},{name:"cidCount",op:1234,type:"number",value:8720},{name:"uidBase",op:1235,type:"number"},{name:"fdArray",op:1236,type:"offset"},{name:"fdSelect",op:1237,type:"offset"},{name:"fontName",op:1238,type:"SID"}],He=[{name:"subrs",op:19,type:"offset",value:0},{name:"defaultWidthX",op:20,type:"number",value:0},{name:"nominalWidthX",op:21,type:"number",value:0}];function ze(e,t){return Ae(Ne(e,0,e.byteLength),Fe,t)}function We(e,t,n,o){return Ae(Ne(e,t,n),He,o)}function _e(e,t,n,o){const s=[];for(let r=0;r<n.length;r+=1){const a=ze(new DataView(new Uint8Array(n[r]).buffer),o);a._subrs=[],a._subrsBias=0;const i=a.private[0],l=a.private[1];if(0!==i&&0!==l){const n=We(e,l+t,i,o);if(a._defaultWidthX=n.defaultWidthX,a._nominalWidthX=n.nominalWidthX,0!==n.subrs){const o=Be(e,l+n.subrs+t);a._subrs=o.objects,a._subrsBias=Me(a._subrs)}a._privateDict=n}s.push(a)}return s}function qe(e,t,n){let o,s,r,a;const i=new I,l=[];let c,u,p,h,f=0,d=!1,g=!1,m=0,y=0;if(e.isCIDFont){const n=e.tables.cff.topDict._fdSelect[t.index],o=e.tables.cff.topDict._fdArray[n];c=o._subrs,u=o._subrsBias,p=o._defaultWidthX,h=o._nominalWidthX}else c=e.tables.cff.topDict._subrs,u=e.tables.cff.topDict._subrsBias,p=e.tables.cff.topDict._defaultWidthX,h=e.tables.cff.topDict._nominalWidthX;let v=p;function b(e,t){g&&i.closePath(),i.moveTo(e,t),g=!0}function S(){let e;e=l.length%2!=0,e&&!d&&(v=l.shift()+h),f+=l.length>>1,l.length=0,d=!0}return function n(p){let x,U,T,E,O,w,k,R,D,C,L,I,M=0;for(;M<p.length;){let B=p[M];switch(M+=1,B){case 1:case 3:S();break;case 4:l.length>1&&!d&&(v=l.shift()+h,d=!0),y+=l.pop(),b(m,y);break;case 5:for(;l.length>0;)m+=l.shift(),y+=l.shift(),i.lineTo(m,y);break;case 6:for(;l.length>0&&(m+=l.shift(),i.lineTo(m,y),0!==l.length);)y+=l.shift(),i.lineTo(m,y);break;case 7:for(;l.length>0&&(y+=l.shift(),i.lineTo(m,y),0!==l.length);)m+=l.shift(),i.lineTo(m,y);break;case 8:for(;l.length>0;)o=m+l.shift(),s=y+l.shift(),r=o+l.shift(),a=s+l.shift(),m=r+l.shift(),y=a+l.shift(),i.curveTo(o,s,r,a,m,y);break;case 10:O=l.pop()+u,w=c[O],w&&n(w);break;case 11:return;case 12:switch(B=p[M],M+=1,B){case 35:o=m+l.shift(),s=y+l.shift(),r=o+l.shift(),a=s+l.shift(),k=r+l.shift(),R=a+l.shift(),D=k+l.shift(),C=R+l.shift(),L=D+l.shift(),I=C+l.shift(),m=L+l.shift(),y=I+l.shift(),l.shift(),i.curveTo(o,s,r,a,k,R),i.curveTo(D,C,L,I,m,y);break;case 34:o=m+l.shift(),s=y,r=o+l.shift(),a=s+l.shift(),k=r+l.shift(),R=a,D=k+l.shift(),C=a,L=D+l.shift(),I=y,m=L+l.shift(),i.curveTo(o,s,r,a,k,R),i.curveTo(D,C,L,I,m,y);break;case 36:o=m+l.shift(),s=y+l.shift(),r=o+l.shift(),a=s+l.shift(),k=r+l.shift(),R=a,D=k+l.shift(),C=a,L=D+l.shift(),I=C+l.shift(),m=L+l.shift(),i.curveTo(o,s,r,a,k,R),i.curveTo(D,C,L,I,m,y);break;case 37:o=m+l.shift(),s=y+l.shift(),r=o+l.shift(),a=s+l.shift(),k=r+l.shift(),R=a+l.shift(),D=k+l.shift(),C=R+l.shift(),L=D+l.shift(),I=C+l.shift(),Math.abs(L-m)>Math.abs(I-y)?m=L+l.shift():y=I+l.shift(),i.curveTo(o,s,r,a,k,R),i.curveTo(D,C,L,I,m,y);break;default:console.log("Glyph "+t.index+": unknown operator 1200"+B),l.length=0}break;case 14:l.length>0&&!d&&(v=l.shift()+h,d=!0),g&&(i.closePath(),g=!1);break;case 18:S();break;case 19:case 20:S(),M+=f+7>>3;break;case 21:l.length>2&&!d&&(v=l.shift()+h,d=!0),y+=l.pop(),m+=l.pop(),b(m,y);break;case 22:l.length>1&&!d&&(v=l.shift()+h,d=!0),m+=l.pop(),b(m,y);break;case 23:S();break;case 24:for(;l.length>2;)o=m+l.shift(),s=y+l.shift(),r=o+l.shift(),a=s+l.shift(),m=r+l.shift(),y=a+l.shift(),i.curveTo(o,s,r,a,m,y);m+=l.shift(),y+=l.shift(),i.lineTo(m,y);break;case 25:for(;l.length>6;)m+=l.shift(),y+=l.shift(),i.lineTo(m,y);o=m+l.shift(),s=y+l.shift(),r=o+l.shift(),a=s+l.shift(),m=r+l.shift(),y=a+l.shift(),i.curveTo(o,s,r,a,m,y);break;case 26:for(l.length%2&&(m+=l.shift());l.length>0;)o=m,s=y+l.shift(),r=o+l.shift(),a=s+l.shift(),m=r,y=a+l.shift(),i.curveTo(o,s,r,a,m,y);break;case 27:for(l.length%2&&(y+=l.shift());l.length>0;)o=m+l.shift(),s=y,r=o+l.shift(),a=s+l.shift(),m=r+l.shift(),y=a,i.curveTo(o,s,r,a,m,y);break;case 28:x=p[M],U=p[M+1],l.push((x<<24|U<<16)>>16),M+=2;break;case 29:O=l.pop()+e.gsubrsBias,w=e.gsubrs[O],w&&n(w);break;case 30:for(;l.length>0&&(o=m,s=y+l.shift(),r=o+l.shift(),a=s+l.shift(),m=r+l.shift(),y=a+(1===l.length?l.shift():0),i.curveTo(o,s,r,a,m,y),0!==l.length);)o=m+l.shift(),s=y,r=o+l.shift(),a=s+l.shift(),y=a+l.shift(),m=r+(1===l.length?l.shift():0),i.curveTo(o,s,r,a,m,y);break;case 31:for(;l.length>0&&(o=m+l.shift(),s=y,r=o+l.shift(),a=s+l.shift(),y=a+l.shift(),m=r+(1===l.length?l.shift():0),i.curveTo(o,s,r,a,m,y),0!==l.length);)o=m,s=y+l.shift(),r=o+l.shift(),a=s+l.shift(),m=r+l.shift(),y=a+(1===l.length?l.shift():0),i.curveTo(o,s,r,a,m,y);break;default:B<32?console.log("Glyph "+t.index+": unknown operator "+B):B<247?l.push(B-139):B<251?(x=p[M],M+=1,l.push(256*(B-247)+x+108)):B<255?(x=p[M],M+=1,l.push(256*-(B-251)-x-108)):(x=p[M],U=p[M+1],T=p[M+2],E=p[M+3],M+=4,l.push((x<<24|U<<16|T<<8|E)/65536))}}}(n),t.advanceWidth=v,i}function Xe(e,t){let n,o=fe.indexOf(e);return o>=0&&(n=o),o=t.indexOf(e),o>=0?n=o+fe.length:(n=fe.length+t.length,t.push(e)),n}function Ve(e,t,n){const o={};for(let s=0;s<e.length;s+=1){const r=e[s];let a=t[r.name];void 0===a||Ie(a,r.value)||("SID"===r.type&&(a=Xe(a,n)),o[r.op]={name:r.name,type:r.type,value:a})}return o}function je(e,t){const n=new ne.Record("Top DICT",[{name:"dict",type:"DICT",value:{}}]);return n.dict=Ve(Fe,e,t),n}function Ye(e){const t=new ne.Record("Top DICT INDEX",[{name:"topDicts",type:"INDEX",value:[]}]);return t.topDicts=[{name:"topDict_0",type:"TABLE",value:e}],t}function Ze(e){const t=[],n=e.path;t.push({name:"width",type:"NUMBER",value:e.advanceWidth});let o=0,s=0;for(let e=0;e<n.commands.length;e+=1){let r,a,i=n.commands[e];if("Q"===i.type){const e=1/3,t=2/3;i={type:"C",x:i.x,y:i.y,x1:e*o+t*i.x1,y1:e*s+t*i.y1,x2:e*i.x+t*i.x1,y2:e*i.y+t*i.y1}}if("M"===i.type)r=Math.round(i.x-o),a=Math.round(i.y-s),t.push({name:"dx",type:"NUMBER",value:r}),t.push({name:"dy",type:"NUMBER",value:a}),t.push({name:"rmoveto",type:"OP",value:21}),o=Math.round(i.x),s=Math.round(i.y);else if("L"===i.type)r=Math.round(i.x-o),a=Math.round(i.y-s),t.push({name:"dx",type:"NUMBER",value:r}),t.push({name:"dy",type:"NUMBER",value:a}),t.push({name:"rlineto",type:"OP",value:5}),o=Math.round(i.x),s=Math.round(i.y);else if("C"===i.type){const e=Math.round(i.x1-o),n=Math.round(i.y1-s),l=Math.round(i.x2-i.x1),c=Math.round(i.y2-i.y1);r=Math.round(i.x-i.x2),a=Math.round(i.y-i.y2),t.push({name:"dx1",type:"NUMBER",value:e}),t.push({name:"dy1",type:"NUMBER",value:n}),t.push({name:"dx2",type:"NUMBER",value:l}),t.push({name:"dy2",type:"NUMBER",value:c}),t.push({name:"dx",type:"NUMBER",value:r}),t.push({name:"dy",type:"NUMBER",value:a}),t.push({name:"rrcurveto",type:"OP",value:8}),o=Math.round(i.x),s=Math.round(i.y)}}return t.push({name:"endchar",type:"OP",value:14}),t}var Qe={parse:function(e,t,n){n.tables.cff={};const o=Be(e,function(e,t){const n={};return n.formatMajor=ue.getCard8(e,t),n.formatMinor=ue.getCard8(e,t+1),n.size=ue.getCard8(e,t+2),n.offsetSize=ue.getCard8(e,t+3),n.startOffset=t,n.endOffset=t+4,n}(e,t).endOffset,ue.bytesToString),s=Be(e,o.endOffset),r=Be(e,s.endOffset,ue.bytesToString),a=Be(e,r.endOffset);n.gsubrs=a.objects,n.gsubrsBias=Me(n.gsubrs);const i=_e(e,t,s.objects,r.objects);if(1!==i.length)throw new Error("CFF table has too many fonts in 'FontSet' - count of fonts NameIndex.length = "+i.length);const l=i[0];if(n.tables.cff.topDict=l,l._privateDict&&(n.defaultWidthX=l._privateDict.defaultWidthX,n.nominalWidthX=l._privateDict.nominalWidthX),void 0!==l.ros[0]&&void 0!==l.ros[1]&&(n.isCIDFont=!0),n.isCIDFont){let o=l.fdArray,s=l.fdSelect;if(0===o||0===s)throw new Error("Font is marked as a CID font, but FDArray and/or FDSelect information is missing");o+=t;const a=_e(e,t,Be(e,o).objects,r.objects);l._fdArray=a,s+=t,l._fdSelect=function(e,t,n,o){const s=[];let r;const a=new ue.Parser(e,t),i=a.parseCard8();if(0===i)for(let e=0;e<n;e++){if(r=a.parseCard8(),r>=o)throw new Error("CFF table CID Font FDSelect has bad FD index value "+r+" (FD count "+o+")");s.push(r)}else{if(3!==i)throw new Error("CFF Table CID Font FDSelect table has unsupported format "+i);{const e=a.parseCard16();let t,i=a.parseCard16();if(0!==i)throw new Error("CFF Table CID Font FDSelect format 3 range has bad initial GID "+i);for(let l=0;l<e;l++){if(r=a.parseCard8(),t=a.parseCard16(),r>=o)throw new Error("CFF table CID Font FDSelect has bad FD index value "+r+" (FD count "+o+")");if(t>n)throw new Error("CFF Table CID Font FDSelect format 3 range has bad GID "+t);for(;i<t;i++)s.push(r);i=t}if(t!==n)throw new Error("CFF Table CID Font FDSelect format 3 range has bad final GID "+t)}}return s}(e,s,n.numGlyphs,a.length)}const c=t+l.private[1],u=We(e,c,l.private[0],r.objects);if(n.defaultWidthX=u.defaultWidthX,n.nominalWidthX=u.nominalWidthX,0!==u.subrs){const t=Be(e,c+u.subrs);n.subrs=t.objects,n.subrsBias=Me(n.subrs)}else n.subrs=[],n.subrsBias=0;const p=Be(e,t+l.charStrings);n.nGlyphs=p.objects.length;const h=function(e,t,n,o){let s,r;const a=new ue.Parser(e,t);n-=1;const i=[".notdef"],l=a.parseCard8();if(0===l)for(let e=0;e<n;e+=1)s=a.parseSID(),i.push(Pe(o,s));else if(1===l)for(;i.length<=n;){s=a.parseSID(),r=a.parseCard8();for(let e=0;e<=r;e+=1)i.push(Pe(o,s)),s+=1}else{if(2!==l)throw new Error("Unknown charset format "+l);for(;i.length<=n;){s=a.parseSID(),r=a.parseCard16();for(let e=0;e<=r;e+=1)i.push(Pe(o,s)),s+=1}}return i}(e,t+l.charset,n.nGlyphs,r.objects);0===l.encoding?n.cffEncoding=new be(de,h):1===l.encoding?n.cffEncoding=new be(ge,h):n.cffEncoding=function(e,t,n){let o;const s={},r=new ue.Parser(e,t),a=r.parseCard8();if(0===a){const e=r.parseCard8();for(let t=0;t<e;t+=1)o=r.parseCard8(),s[o]=t}else{if(1!==a)throw new Error("Unknown encoding format "+a);{const e=r.parseCard8();o=1;for(let t=0;t<e;t+=1){const e=r.parseCard8(),t=r.parseCard8();for(let n=e;n<=e+t;n+=1)s[n]=o,o+=1}}}return new be(s,n)}(e,t+l.encoding,h),n.encoding=n.encoding||n.cffEncoding,n.glyphs=new Le.GlyphSet(n);for(let e=0;e<n.nGlyphs;e+=1){const t=p.objects[e];n.glyphs.push(e,Le.cffGlyphLoader(n,e,qe,t))}},make:function(e,t){const n=new ne.Table("CFF ",[{name:"header",type:"RECORD"},{name:"nameIndex",type:"RECORD"},{name:"topDictIndex",type:"RECORD"},{name:"stringIndex",type:"RECORD"},{name:"globalSubrIndex",type:"RECORD"},{name:"charsets",type:"RECORD"},{name:"charStringsIndex",type:"RECORD"},{name:"privateDict",type:"RECORD"}]),o=1/t.unitsPerEm,s={version:t.version,fullName:t.fullName,familyName:t.familyName,weight:t.weightName,fontBBox:t.fontBBox||[0,0,0,0],fontMatrix:[o,0,0,o,0,0],charset:999,encoding:0,charStrings:999,private:[0,999]},r=[];let a;for(let t=1;t<e.length;t+=1)a=e.get(t),r.push(a.name);const i=[];n.header=new ne.Record("Header",[{name:"major",type:"Card8",value:1},{name:"minor",type:"Card8",value:0},{name:"hdrSize",type:"Card8",value:4},{name:"major",type:"Card8",value:1}]),n.nameIndex=function(e){const t=new ne.Record("Name INDEX",[{name:"names",type:"INDEX",value:[]}]);t.names=[];for(let n=0;n<e.length;n+=1)t.names.push({name:"name_"+n,type:"NAME",value:e[n]});return t}([t.postScriptName]);let l=je(s,i);n.topDictIndex=Ye(l),n.globalSubrIndex=new ne.Record("Global Subr INDEX",[{name:"subrs",type:"INDEX",value:[]}]),n.charsets=function(e,t){const n=new ne.Record("Charsets",[{name:"format",type:"Card8",value:0}]);for(let o=0;o<e.length;o+=1){const s=Xe(e[o],t);n.fields.push({name:"glyph_"+o,type:"SID",value:s})}return n}(r,i),n.charStringsIndex=function(e){const t=new ne.Record("CharStrings INDEX",[{name:"charStrings",type:"INDEX",value:[]}]);for(let n=0;n<e.length;n+=1){const o=e.get(n),s=Ze(o);t.charStrings.push({name:o.name,type:"CHARSTRING",value:s})}return t}(e),n.privateDict=function(e,t){const n=new ne.Record("Private DICT",[{name:"dict",type:"DICT",value:{}}]);return n.dict=Ve(He,e,t),n}({},i),n.stringIndex=function(e){const t=new ne.Record("String INDEX",[{name:"strings",type:"INDEX",value:[]}]);t.strings=[];for(let n=0;n<e.length;n+=1)t.strings.push({name:"string_"+n,type:"STRING",value:e[n]});return t}(i);const c=n.header.sizeOf()+n.nameIndex.sizeOf()+n.topDictIndex.sizeOf()+n.stringIndex.sizeOf()+n.globalSubrIndex.sizeOf();return s.charset=c,s.encoding=0,s.charStrings=s.charset+n.charsets.sizeOf(),s.private[1]=s.charStrings+n.charStringsIndex.sizeOf(),l=je(s,i),n.topDictIndex=Ye(l),n}};var $e={parse:function(e,t){const n={},o=new ue.Parser(e,t);return n.version=o.parseVersion(),n.fontRevision=Math.round(1e3*o.parseFixed())/1e3,n.checkSumAdjustment=o.parseULong(),n.magicNumber=o.parseULong(),G.argument(1594834165===n.magicNumber,"Font header has wrong magic number."),n.flags=o.parseUShort(),n.unitsPerEm=o.parseUShort(),n.created=o.parseLongDateTime(),n.modified=o.parseLongDateTime(),n.xMin=o.parseShort(),n.yMin=o.parseShort(),n.xMax=o.parseShort(),n.yMax=o.parseShort(),n.macStyle=o.parseUShort(),n.lowestRecPPEM=o.parseUShort(),n.fontDirectionHint=o.parseShort(),n.indexToLocFormat=o.parseShort(),n.glyphDataFormat=o.parseShort(),n},make:function(e){const t=Math.round((new Date).getTime()/1e3)+2082844800;let n=t;return e.createdTimestamp&&(n=e.createdTimestamp+2082844800),new ne.Table("head",[{name:"version",type:"FIXED",value:65536},{name:"fontRevision",type:"FIXED",value:65536},{name:"checkSumAdjustment",type:"ULONG",value:0},{name:"magicNumber",type:"ULONG",value:1594834165},{name:"flags",type:"USHORT",value:0},{name:"unitsPerEm",type:"USHORT",value:1e3},{name:"created",type:"LONGDATETIME",value:n},{name:"modified",type:"LONGDATETIME",value:t},{name:"xMin",type:"SHORT",value:0},{name:"yMin",type:"SHORT",value:0},{name:"xMax",type:"SHORT",value:0},{name:"yMax",type:"SHORT",value:0},{name:"macStyle",type:"USHORT",value:0},{name:"lowestRecPPEM",type:"USHORT",value:0},{name:"fontDirectionHint",type:"SHORT",value:2},{name:"indexToLocFormat",type:"SHORT",value:0},{name:"glyphDataFormat",type:"SHORT",value:0}],e)}};var Ke={parse:function(e,t){const n={},o=new ue.Parser(e,t);return n.version=o.parseVersion(),n.ascender=o.parseShort(),n.descender=o.parseShort(),n.lineGap=o.parseShort(),n.advanceWidthMax=o.parseUShort(),n.minLeftSideBearing=o.parseShort(),n.minRightSideBearing=o.parseShort(),n.xMaxExtent=o.parseShort(),n.caretSlopeRise=o.parseShort(),n.caretSlopeRun=o.parseShort(),n.caretOffset=o.parseShort(),o.relativeOffset+=8,n.metricDataFormat=o.parseShort(),n.numberOfHMetrics=o.parseUShort(),n},make:function(e){return new ne.Table("hhea",[{name:"version",type:"FIXED",value:65536},{name:"ascender",type:"FWORD",value:0},{name:"descender",type:"FWORD",value:0},{name:"lineGap",type:"FWORD",value:0},{name:"advanceWidthMax",type:"UFWORD",value:0},{name:"minLeftSideBearing",type:"FWORD",value:0},{name:"minRightSideBearing",type:"FWORD",value:0},{name:"xMaxExtent",type:"FWORD",value:0},{name:"caretSlopeRise",type:"SHORT",value:1},{name:"caretSlopeRun",type:"SHORT",value:0},{name:"caretOffset",type:"SHORT",value:0},{name:"reserved1",type:"SHORT",value:0},{name:"reserved2",type:"SHORT",value:0},{name:"reserved3",type:"SHORT",value:0},{name:"reserved4",type:"SHORT",value:0},{name:"metricDataFormat",type:"SHORT",value:0},{name:"numberOfHMetrics",type:"USHORT",value:0}],e)}};var Je={parse:function(e,t,n,o,s){let r,a;const i=new ue.Parser(e,t);for(let e=0;e<o;e+=1){e<n&&(r=i.parseUShort(),a=i.parseShort());const t=s.get(e);t.advanceWidth=r,t.leftSideBearing=a}},make:function(e){const t=new ne.Table("hmtx",[]);for(let n=0;n<e.length;n+=1){const o=e.get(n),s=o.advanceWidth||0,r=o.leftSideBearing||0;t.fields.push({name:"advanceWidth_"+n,type:"USHORT",value:s}),t.fields.push({name:"leftSideBearing_"+n,type:"SHORT",value:r})}return t}};var et={make:function(e){const t=new ne.Table("ltag",[{name:"version",type:"ULONG",value:1},{name:"flags",type:"ULONG",value:0},{name:"numTags",type:"ULONG",value:e.length}]);let n="";const o=12+4*e.length;for(let s=0;s<e.length;++s){let r=n.indexOf(e[s]);r<0&&(r=n.length,n+=e[s]),t.fields.push({name:"offset "+s,type:"USHORT",value:o+r}),t.fields.push({name:"length "+s,type:"USHORT",value:e[s].length})}return t.fields.push({name:"stringPool",type:"CHARARRAY",value:n}),t},parse:function(e,t){const n=new ue.Parser(e,t),o=n.parseULong();G.argument(1===o,"Unsupported ltag table version."),n.skip("uLong",1);const s=n.parseULong(),r=[];for(let o=0;o<s;o++){let o="";const s=t+n.parseUShort(),a=n.parseUShort();for(let t=s;t<s+a;++t)o+=String.fromCharCode(e.getInt8(t));r.push(o)}return r}};var tt={parse:function(e,t){const n={},o=new ue.Parser(e,t);return n.version=o.parseVersion(),n.numGlyphs=o.parseUShort(),1===n.version&&(n.maxPoints=o.parseUShort(),n.maxContours=o.parseUShort(),n.maxCompositePoints=o.parseUShort(),n.maxCompositeContours=o.parseUShort(),n.maxZones=o.parseUShort(),n.maxTwilightPoints=o.parseUShort(),n.maxStorage=o.parseUShort(),n.maxFunctionDefs=o.parseUShort(),n.maxInstructionDefs=o.parseUShort(),n.maxStackElements=o.parseUShort(),n.maxSizeOfInstructions=o.parseUShort(),n.maxComponentElements=o.parseUShort(),n.maxComponentDepth=o.parseUShort()),n},make:function(e){return new ne.Table("maxp",[{name:"version",type:"FIXED",value:20480},{name:"numGlyphs",type:"USHORT",value:e}])}};const nt=["copyright","fontFamily","fontSubfamily","uniqueID","fullName","version","postScriptName","trademark","manufacturer","designer","description","manufacturerURL","designerURL","license","licenseURL","reserved","preferredFamily","preferredSubfamily","compatibleFullName","sampleText","postScriptFindFontName","wwsFamily","wwsSubfamily"],ot={0:"en",1:"fr",2:"de",3:"it",4:"nl",5:"sv",6:"es",7:"da",8:"pt",9:"no",10:"he",11:"ja",12:"ar",13:"fi",14:"el",15:"is",16:"mt",17:"tr",18:"hr",19:"zh-Hant",20:"ur",21:"hi",22:"th",23:"ko",24:"lt",25:"pl",26:"hu",27:"es",28:"lv",29:"se",30:"fo",31:"fa",32:"ru",33:"zh",34:"nl-BE",35:"ga",36:"sq",37:"ro",38:"cz",39:"sk",40:"si",41:"yi",42:"sr",43:"mk",44:"bg",45:"uk",46:"be",47:"uz",48:"kk",49:"az-Cyrl",50:"az-Arab",51:"hy",52:"ka",53:"mo",54:"ky",55:"tg",56:"tk",57:"mn-CN",58:"mn",59:"ps",60:"ks",61:"ku",62:"sd",63:"bo",64:"ne",65:"sa",66:"mr",67:"bn",68:"as",69:"gu",70:"pa",71:"or",72:"ml",73:"kn",74:"ta",75:"te",76:"si",77:"my",78:"km",79:"lo",80:"vi",81:"id",82:"tl",83:"ms",84:"ms-Arab",85:"am",86:"ti",87:"om",88:"so",89:"sw",90:"rw",91:"rn",92:"ny",93:"mg",94:"eo",128:"cy",129:"eu",130:"ca",131:"la",132:"qu",133:"gn",134:"ay",135:"tt",136:"ug",137:"dz",138:"jv",139:"su",140:"gl",141:"af",142:"br",143:"iu",144:"gd",145:"gv",146:"ga",147:"to",148:"el-polyton",149:"kl",150:"az",151:"nn"},st={0:0,1:0,2:0,3:0,4:0,5:0,6:0,7:0,8:0,9:0,10:5,11:1,12:4,13:0,14:6,15:0,16:0,17:0,18:0,19:2,20:4,21:9,22:21,23:3,24:29,25:29,26:29,27:29,28:29,29:0,30:0,31:4,32:7,33:25,34:0,35:0,36:0,37:0,38:29,39:29,40:0,41:5,42:7,43:7,44:7,45:7,46:7,47:7,48:7,49:7,50:4,51:24,52:23,53:7,54:7,55:7,56:7,57:27,58:7,59:4,60:4,61:4,62:4,63:26,64:9,65:9,66:9,67:13,68:13,69:11,70:10,71:12,72:17,73:16,74:14,75:15,76:18,77:19,78:20,79:22,80:30,81:0,82:0,83:0,84:4,85:28,86:28,87:28,88:0,89:0,90:0,91:0,92:0,93:0,94:0,128:0,129:0,130:0,131:0,132:0,133:0,134:0,135:7,136:4,137:26,138:0,139:0,140:0,141:0,142:0,143:28,144:0,145:0,146:0,147:0,148:6,149:0,150:0,151:0},rt={1078:"af",1052:"sq",1156:"gsw",1118:"am",5121:"ar-DZ",15361:"ar-BH",3073:"ar",2049:"ar-IQ",11265:"ar-JO",13313:"ar-KW",12289:"ar-LB",4097:"ar-LY",6145:"ary",8193:"ar-OM",16385:"ar-QA",1025:"ar-SA",10241:"ar-SY",7169:"aeb",14337:"ar-AE",9217:"ar-YE",1067:"hy",1101:"as",2092:"az-Cyrl",1068:"az",1133:"ba",1069:"eu",1059:"be",2117:"bn",1093:"bn-IN",8218:"bs-Cyrl",5146:"bs",1150:"br",1026:"bg",1027:"ca",3076:"zh-HK",5124:"zh-MO",2052:"zh",4100:"zh-SG",1028:"zh-TW",1155:"co",1050:"hr",4122:"hr-BA",1029:"cs",1030:"da",1164:"prs",1125:"dv",2067:"nl-BE",1043:"nl",3081:"en-AU",10249:"en-BZ",4105:"en-CA",9225:"en-029",16393:"en-IN",6153:"en-IE",8201:"en-JM",17417:"en-MY",5129:"en-NZ",13321:"en-PH",18441:"en-SG",7177:"en-ZA",11273:"en-TT",2057:"en-GB",1033:"en",12297:"en-ZW",1061:"et",1080:"fo",1124:"fil",1035:"fi",2060:"fr-BE",3084:"fr-CA",1036:"fr",5132:"fr-LU",6156:"fr-MC",4108:"fr-CH",1122:"fy",1110:"gl",1079:"ka",3079:"de-AT",1031:"de",5127:"de-LI",4103:"de-LU",2055:"de-CH",1032:"el",1135:"kl",1095:"gu",1128:"ha",1037:"he",1081:"hi",1038:"hu",1039:"is",1136:"ig",1057:"id",1117:"iu",2141:"iu-Latn",2108:"ga",1076:"xh",1077:"zu",1040:"it",2064:"it-CH",1041:"ja",1099:"kn",1087:"kk",1107:"km",1158:"quc",1159:"rw",1089:"sw",1111:"kok",1042:"ko",1088:"ky",1108:"lo",1062:"lv",1063:"lt",2094:"dsb",1134:"lb",1071:"mk",2110:"ms-BN",1086:"ms",1100:"ml",1082:"mt",1153:"mi",1146:"arn",1102:"mr",1148:"moh",1104:"mn",2128:"mn-CN",1121:"ne",1044:"nb",2068:"nn",1154:"oc",1096:"or",1123:"ps",1045:"pl",1046:"pt",2070:"pt-PT",1094:"pa",1131:"qu-BO",2155:"qu-EC",3179:"qu",1048:"ro",1047:"rm",1049:"ru",9275:"smn",4155:"smj-NO",5179:"smj",3131:"se-FI",1083:"se",2107:"se-SE",8251:"sms",6203:"sma-NO",7227:"sms",1103:"sa",7194:"sr-Cyrl-BA",3098:"sr",6170:"sr-Latn-BA",2074:"sr-Latn",1132:"nso",1074:"tn",1115:"si",1051:"sk",1060:"sl",11274:"es-AR",16394:"es-BO",13322:"es-CL",9226:"es-CO",5130:"es-CR",7178:"es-DO",12298:"es-EC",17418:"es-SV",4106:"es-GT",18442:"es-HN",2058:"es-MX",19466:"es-NI",6154:"es-PA",15370:"es-PY",10250:"es-PE",20490:"es-PR",3082:"es",1034:"es",21514:"es-US",14346:"es-UY",8202:"es-VE",2077:"sv-FI",1053:"sv",1114:"syr",1064:"tg",2143:"tzm",1097:"ta",1092:"tt",1098:"te",1054:"th",1105:"bo",1055:"tr",1090:"tk",1152:"ug",1058:"uk",1070:"hsb",1056:"ur",2115:"uz-Cyrl",1091:"uz",1066:"vi",1106:"cy",1160:"wo",1157:"sah",1144:"ii",1130:"yo"};function at(e,t,n){switch(e){case 0:if(65535===t)return"und";if(n)return n[t];break;case 1:return ot[t];case 3:return rt[t]}}const it={0:"macintosh",1:"x-mac-japanese",2:"x-mac-chinesetrad",3:"x-mac-korean",6:"x-mac-greek",7:"x-mac-cyrillic",9:"x-mac-devanagai",10:"x-mac-gurmukhi",11:"x-mac-gujarati",12:"x-mac-oriya",13:"x-mac-bengali",14:"x-mac-tamil",15:"x-mac-telugu",16:"x-mac-kannada",17:"x-mac-malayalam",18:"x-mac-sinhalese",19:"x-mac-burmese",20:"x-mac-khmer",21:"x-mac-thai",22:"x-mac-lao",23:"x-mac-georgian",24:"x-mac-armenian",25:"x-mac-chinesesimp",26:"x-mac-tibetan",27:"x-mac-mongolian",28:"x-mac-ethiopic",29:"x-mac-ce",30:"x-mac-vietnamese",31:"x-mac-extarabic"},lt={15:"x-mac-icelandic",17:"x-mac-turkish",18:"x-mac-croatian",24:"x-mac-ce",25:"x-mac-ce",26:"x-mac-ce",27:"x-mac-ce",28:"x-mac-ce",30:"x-mac-icelandic",37:"x-mac-romanian",38:"x-mac-ce",39:"x-mac-ce",40:"x-mac-ce",143:"x-mac-inuit",146:"x-mac-gaelic"};function ct(e,t,n){switch(e){case 0:return"utf-16";case 1:return lt[n]||it[t];case 3:if(1===t||10===t)return"utf-16"}}function ut(e){const t={};for(let n in e)t[e[n]]=parseInt(n);return t}function pt(e,t,n,o,s,r){return new ne.Record("NameRecord",[{name:"platformID",type:"USHORT",value:e},{name:"encodingID",type:"USHORT",value:t},{name:"languageID",type:"USHORT",value:n},{name:"nameID",type:"USHORT",value:o},{name:"length",type:"USHORT",value:s},{name:"offset",type:"USHORT",value:r}])}function ht(e,t){let n=function(e,t){const n=e.length,o=t.length-n+1;e:for(let s=0;s<o;s++)for(;s<o;s++){for(let o=0;o<n;o++)if(t[s+o]!==e[o])continue e;return s}return-1}(e,t);if(n<0){n=t.length;let o=0;const s=e.length;for(;o<s;++o)t.push(e[o])}return n}var ft={parse:function(e,t,n){const o={},s=new ue.Parser(e,t),r=s.parseUShort(),a=s.parseUShort(),i=s.offset+s.parseUShort();for(let t=0;t<a;t++){const t=s.parseUShort(),r=s.parseUShort(),a=s.parseUShort(),l=s.parseUShort(),c=nt[l]||l,u=s.parseUShort(),p=s.parseUShort(),h=at(t,a,n),f=ct(t,r,a);if(void 0!==f&&void 0!==h){let t;if(t="utf-16"===f?N.UTF16(e,i+p,u):N.MACSTRING(e,i+p,u,f),t){let e=o[c];void 0===e&&(e=o[c]={}),e[h]=t}}}return 1===r&&s.parseUShort(),o},make:function(e,t){let n;const o=[],s={},r=ut(nt);for(let t in e){let a=r[t];if(void 0===a&&(a=t),n=parseInt(a),isNaN(n))throw new Error('Name table entry "'+t+'" does not exist, see nameTableNames for complete list.');s[n]=e[t],o.push(n)}const a=ut(ot),i=ut(rt),l=[],c=[];for(let e=0;e<o.length;e++){n=o[e];const r=s[n];for(let e in r){const o=r[e];let s=1,u=a[e],p=st[u];const h=ct(s,p,u);let f=P.MACSTRING(o,h);void 0===f&&(s=0,u=t.indexOf(e),u<0&&(u=t.length,t.push(e)),p=4,f=P.UTF16(o));const d=ht(f,c);l.push(pt(s,p,u,n,f.length,d));const g=i[e];if(void 0!==g){const e=P.UTF16(o),t=ht(e,c);l.push(pt(3,1,g,n,e.length,t))}}}l.sort((function(e,t){return e.platformID-t.platformID||e.encodingID-t.encodingID||e.languageID-t.languageID||e.nameID-t.nameID}));const u=new ne.Table("name",[{name:"format",type:"USHORT",value:0},{name:"count",type:"USHORT",value:l.length},{name:"stringOffset",type:"USHORT",value:6+12*l.length}]);for(let e=0;e<l.length;e++)u.fields.push({name:"record_"+e,type:"RECORD",value:l[e]});return u.fields.push({name:"strings",type:"LITERAL",value:c}),u}};const dt=[{begin:0,end:127},{begin:128,end:255},{begin:256,end:383},{begin:384,end:591},{begin:592,end:687},{begin:688,end:767},{begin:768,end:879},{begin:880,end:1023},{begin:11392,end:11519},{begin:1024,end:1279},{begin:1328,end:1423},{begin:1424,end:1535},{begin:42240,end:42559},{begin:1536,end:1791},{begin:1984,end:2047},{begin:2304,end:2431},{begin:2432,end:2559},{begin:2560,end:2687},{begin:2688,end:2815},{begin:2816,end:2943},{begin:2944,end:3071},{begin:3072,end:3199},{begin:3200,end:3327},{begin:3328,end:3455},{begin:3584,end:3711},{begin:3712,end:3839},{begin:4256,end:4351},{begin:6912,end:7039},{begin:4352,end:4607},{begin:7680,end:7935},{begin:7936,end:8191},{begin:8192,end:8303},{begin:8304,end:8351},{begin:8352,end:8399},{begin:8400,end:8447},{begin:8448,end:8527},{begin:8528,end:8591},{begin:8592,end:8703},{begin:8704,end:8959},{begin:8960,end:9215},{begin:9216,end:9279},{begin:9280,end:9311},{begin:9312,end:9471},{begin:9472,end:9599},{begin:9600,end:9631},{begin:9632,end:9727},{begin:9728,end:9983},{begin:9984,end:10175},{begin:12288,end:12351},{begin:12352,end:12447},{begin:12448,end:12543},{begin:12544,end:12591},{begin:12592,end:12687},{begin:43072,end:43135},{begin:12800,end:13055},{begin:13056,end:13311},{begin:44032,end:55215},{begin:55296,end:57343},{begin:67840,end:67871},{begin:19968,end:40959},{begin:57344,end:63743},{begin:12736,end:12783},{begin:64256,end:64335},{begin:64336,end:65023},{begin:65056,end:65071},{begin:65040,end:65055},{begin:65104,end:65135},{begin:65136,end:65279},{begin:65280,end:65519},{begin:65520,end:65535},{begin:3840,end:4095},{begin:1792,end:1871},{begin:1920,end:1983},{begin:3456,end:3583},{begin:4096,end:4255},{begin:4608,end:4991},{begin:5024,end:5119},{begin:5120,end:5759},{begin:5760,end:5791},{begin:5792,end:5887},{begin:6016,end:6143},{begin:6144,end:6319},{begin:10240,end:10495},{begin:40960,end:42127},{begin:5888,end:5919},{begin:66304,end:66351},{begin:66352,end:66383},{begin:66560,end:66639},{begin:118784,end:119039},{begin:119808,end:120831},{begin:1044480,end:1048573},{begin:65024,end:65039},{begin:917504,end:917631},{begin:6400,end:6479},{begin:6480,end:6527},{begin:6528,end:6623},{begin:6656,end:6687},{begin:11264,end:11359},{begin:11568,end:11647},{begin:19904,end:19967},{begin:43008,end:43055},{begin:65536,end:65663},{begin:65856,end:65935},{begin:66432,end:66463},{begin:66464,end:66527},{begin:66640,end:66687},{begin:66688,end:66735},{begin:67584,end:67647},{begin:68096,end:68191},{begin:119552,end:119647},{begin:73728,end:74751},{begin:119648,end:119679},{begin:7040,end:7103},{begin:7168,end:7247},{begin:7248,end:7295},{begin:43136,end:43231},{begin:43264,end:43311},{begin:43312,end:43359},{begin:43520,end:43615},{begin:65936,end:65999},{begin:66e3,end:66047},{begin:66208,end:66271},{begin:127024,end:127135}];var gt={parse:function(e,t){const n={},o=new ue.Parser(e,t);n.version=o.parseUShort(),n.xAvgCharWidth=o.parseShort(),n.usWeightClass=o.parseUShort(),n.usWidthClass=o.parseUShort(),n.fsType=o.parseUShort(),n.ySubscriptXSize=o.parseShort(),n.ySubscriptYSize=o.parseShort(),n.ySubscriptXOffset=o.parseShort(),n.ySubscriptYOffset=o.parseShort(),n.ySuperscriptXSize=o.parseShort(),n.ySuperscriptYSize=o.parseShort(),n.ySuperscriptXOffset=o.parseShort(),n.ySuperscriptYOffset=o.parseShort(),n.yStrikeoutSize=o.parseShort(),n.yStrikeoutPosition=o.parseShort(),n.sFamilyClass=o.parseShort(),n.panose=[];for(let e=0;e<10;e++)n.panose[e]=o.parseByte();return n.ulUnicodeRange1=o.parseULong(),n.ulUnicodeRange2=o.parseULong(),n.ulUnicodeRange3=o.parseULong(),n.ulUnicodeRange4=o.parseULong(),n.achVendID=String.fromCharCode(o.parseByte(),o.parseByte(),o.parseByte(),o.parseByte()),n.fsSelection=o.parseUShort(),n.usFirstCharIndex=o.parseUShort(),n.usLastCharIndex=o.parseUShort(),n.sTypoAscender=o.parseShort(),n.sTypoDescender=o.parseShort(),n.sTypoLineGap=o.parseShort(),n.usWinAscent=o.parseUShort(),n.usWinDescent=o.parseUShort(),n.version>=1&&(n.ulCodePageRange1=o.parseULong(),n.ulCodePageRange2=o.parseULong()),n.version>=2&&(n.sxHeight=o.parseShort(),n.sCapHeight=o.parseShort(),n.usDefaultChar=o.parseUShort(),n.usBreakChar=o.parseUShort(),n.usMaxContent=o.parseUShort()),n},make:function(e){return new ne.Table("OS/2",[{name:"version",type:"USHORT",value:3},{name:"xAvgCharWidth",type:"SHORT",value:0},{name:"usWeightClass",type:"USHORT",value:0},{name:"usWidthClass",type:"USHORT",value:0},{name:"fsType",type:"USHORT",value:0},{name:"ySubscriptXSize",type:"SHORT",value:650},{name:"ySubscriptYSize",type:"SHORT",value:699},{name:"ySubscriptXOffset",type:"SHORT",value:0},{name:"ySubscriptYOffset",type:"SHORT",value:140},{name:"ySuperscriptXSize",type:"SHORT",value:650},{name:"ySuperscriptYSize",type:"SHORT",value:699},{name:"ySuperscriptXOffset",type:"SHORT",value:0},{name:"ySuperscriptYOffset",type:"SHORT",value:479},{name:"yStrikeoutSize",type:"SHORT",value:49},{name:"yStrikeoutPosition",type:"SHORT",value:258},{name:"sFamilyClass",type:"SHORT",value:0},{name:"bFamilyType",type:"BYTE",value:0},{name:"bSerifStyle",type:"BYTE",value:0},{name:"bWeight",type:"BYTE",value:0},{name:"bProportion",type:"BYTE",value:0},{name:"bContrast",type:"BYTE",value:0},{name:"bStrokeVariation",type:"BYTE",value:0},{name:"bArmStyle",type:"BYTE",value:0},{name:"bLetterform",type:"BYTE",value:0},{name:"bMidline",type:"BYTE",value:0},{name:"bXHeight",type:"BYTE",value:0},{name:"ulUnicodeRange1",type:"ULONG",value:0},{name:"ulUnicodeRange2",type:"ULONG",value:0},{name:"ulUnicodeRange3",type:"ULONG",value:0},{name:"ulUnicodeRange4",type:"ULONG",value:0},{name:"achVendID",type:"CHARARRAY",value:"XXXX"},{name:"fsSelection",type:"USHORT",value:0},{name:"usFirstCharIndex",type:"USHORT",value:0},{name:"usLastCharIndex",type:"USHORT",value:0},{name:"sTypoAscender",type:"SHORT",value:0},{name:"sTypoDescender",type:"SHORT",value:0},{name:"sTypoLineGap",type:"SHORT",value:0},{name:"usWinAscent",type:"USHORT",value:0},{name:"usWinDescent",type:"USHORT",value:0},{name:"ulCodePageRange1",type:"ULONG",value:0},{name:"ulCodePageRange2",type:"ULONG",value:0},{name:"sxHeight",type:"SHORT",value:0},{name:"sCapHeight",type:"SHORT",value:0},{name:"usDefaultChar",type:"USHORT",value:0},{name:"usBreakChar",type:"USHORT",value:0},{name:"usMaxContext",type:"USHORT",value:0}],e)},unicodeRanges:dt,getUnicodeRange:function(e){for(let t=0;t<dt.length;t+=1){const n=dt[t];if(e>=n.begin&&e<n.end)return t}return-1}};var mt={parse:function(e,t){const n={},o=new ue.Parser(e,t);switch(n.version=o.parseVersion(),n.italicAngle=o.parseFixed(),n.underlinePosition=o.parseShort(),n.underlineThickness=o.parseShort(),n.isFixedPitch=o.parseULong(),n.minMemType42=o.parseULong(),n.maxMemType42=o.parseULong(),n.minMemType1=o.parseULong(),n.maxMemType1=o.parseULong(),n.version){case 1:n.names=me.slice();break;case 2:n.numberOfGlyphs=o.parseUShort(),n.glyphNameIndex=new Array(n.numberOfGlyphs);for(let e=0;e<n.numberOfGlyphs;e++)n.glyphNameIndex[e]=o.parseUShort();n.names=[];for(let e=0;e<n.numberOfGlyphs;e++)if(n.glyphNameIndex[e]>=me.length){const e=o.parseChar();n.names.push(o.parseString(e))}break;case 2.5:n.numberOfGlyphs=o.parseUShort(),n.offset=new Array(n.numberOfGlyphs);for(let e=0;e<n.numberOfGlyphs;e++)n.offset[e]=o.parseChar()}return n},make:function(){return new ne.Table("post",[{name:"version",type:"FIXED",value:196608},{name:"italicAngle",type:"FIXED",value:0},{name:"underlinePosition",type:"FWORD",value:0},{name:"underlineThickness",type:"FWORD",value:0},{name:"isFixedPitch",type:"ULONG",value:0},{name:"minMemType42",type:"ULONG",value:0},{name:"maxMemType42",type:"ULONG",value:0},{name:"minMemType1",type:"ULONG",value:0},{name:"maxMemType1",type:"ULONG",value:0}])}};const yt=new Array(9);yt[1]=function(){const e=this.offset+this.relativeOffset,t=this.parseUShort();return 1===t?{substFormat:1,coverage:this.parsePointer(le.coverage),deltaGlyphId:this.parseUShort()}:2===t?{substFormat:2,coverage:this.parsePointer(le.coverage),substitute:this.parseOffset16List()}:void G.assert(!1,"0x"+e.toString(16)+": lookup type 1 format must be 1 or 2.")},yt[2]=function(){const e=this.parseUShort();return G.argument(1===e,"GSUB Multiple Substitution Subtable identifier-format must be 1"),{substFormat:e,coverage:this.parsePointer(le.coverage),sequences:this.parseListOfLists()}},yt[3]=function(){const e=this.parseUShort();return G.argument(1===e,"GSUB Alternate Substitution Subtable identifier-format must be 1"),{substFormat:e,coverage:this.parsePointer(le.coverage),alternateSets:this.parseListOfLists()}},yt[4]=function(){const e=this.parseUShort();return G.argument(1===e,"GSUB ligature table identifier-format must be 1"),{substFormat:e,coverage:this.parsePointer(le.coverage),ligatureSets:this.parseListOfLists((function(){return{ligGlyph:this.parseUShort(),components:this.parseUShortList(this.parseUShort()-1)}}))}};const vt={sequenceIndex:le.uShort,lookupListIndex:le.uShort};yt[5]=function(){const e=this.offset+this.relativeOffset,t=this.parseUShort();if(1===t)return{substFormat:t,coverage:this.parsePointer(le.coverage),ruleSets:this.parseListOfLists((function(){const e=this.parseUShort(),t=this.parseUShort();return{input:this.parseUShortList(e-1),lookupRecords:this.parseRecordList(t,vt)}}))};if(2===t)return{substFormat:t,coverage:this.parsePointer(le.coverage),classDef:this.parsePointer(le.classDef),classSets:this.parseListOfLists((function(){const e=this.parseUShort(),t=this.parseUShort();return{classes:this.parseUShortList(e-1),lookupRecords:this.parseRecordList(t,vt)}}))};if(3===t){const e=this.parseUShort(),n=this.parseUShort();return{substFormat:t,coverages:this.parseList(e,le.pointer(le.coverage)),lookupRecords:this.parseRecordList(n,vt)}}G.assert(!1,"0x"+e.toString(16)+": lookup type 5 format must be 1, 2 or 3.")},yt[6]=function(){const e=this.offset+this.relativeOffset,t=this.parseUShort();return 1===t?{substFormat:1,coverage:this.parsePointer(le.coverage),chainRuleSets:this.parseListOfLists((function(){return{backtrack:this.parseUShortList(),input:this.parseUShortList(this.parseShort()-1),lookahead:this.parseUShortList(),lookupRecords:this.parseRecordList(vt)}}))}:2===t?{substFormat:2,coverage:this.parsePointer(le.coverage),backtrackClassDef:this.parsePointer(le.classDef),inputClassDef:this.parsePointer(le.classDef),lookaheadClassDef:this.parsePointer(le.classDef),chainClassSet:this.parseListOfLists((function(){return{backtrack:this.parseUShortList(),input:this.parseUShortList(this.parseShort()-1),lookahead:this.parseUShortList(),lookupRecords:this.parseRecordList(vt)}}))}:3===t?{substFormat:3,backtrackCoverage:this.parseList(le.pointer(le.coverage)),inputCoverage:this.parseList(le.pointer(le.coverage)),lookaheadCoverage:this.parseList(le.pointer(le.coverage)),lookupRecords:this.parseRecordList(vt)}:void G.assert(!1,"0x"+e.toString(16)+": lookup type 6 format must be 1, 2 or 3.")},yt[7]=function(){const e=this.parseUShort();G.argument(1===e,"GSUB Extension Substitution subtable identifier-format must be 1");const t=this.parseUShort(),n=new le(this.data,this.offset+this.parseULong());return{substFormat:1,lookupType:t,extension:yt[t].call(n)}},yt[8]=function(){const e=this.parseUShort();return G.argument(1===e,"GSUB Reverse Chaining Contextual Single Substitution Subtable identifier-format must be 1"),{substFormat:e,coverage:this.parsePointer(le.coverage),backtrackCoverage:this.parseList(le.pointer(le.coverage)),lookaheadCoverage:this.parseList(le.pointer(le.coverage)),substitutes:this.parseUShortList()}};const bt=new Array(9);bt[1]=function(e){return 1===e.substFormat?new ne.Table("substitutionTable",[{name:"substFormat",type:"USHORT",value:1},{name:"coverage",type:"TABLE",value:new ne.Coverage(e.coverage)},{name:"deltaGlyphID",type:"USHORT",value:e.deltaGlyphId}]):new ne.Table("substitutionTable",[{name:"substFormat",type:"USHORT",value:2},{name:"coverage",type:"TABLE",value:new ne.Coverage(e.coverage)}].concat(ne.ushortList("substitute",e.substitute)))},bt[3]=function(e){return G.assert(1===e.substFormat,"Lookup type 3 substFormat must be 1."),new ne.Table("substitutionTable",[{name:"substFormat",type:"USHORT",value:1},{name:"coverage",type:"TABLE",value:new ne.Coverage(e.coverage)}].concat(ne.tableList("altSet",e.alternateSets,(function(e){return new ne.Table("alternateSetTable",ne.ushortList("alternate",e))}))))},bt[4]=function(e){return G.assert(1===e.substFormat,"Lookup type 4 substFormat must be 1."),new ne.Table("substitutionTable",[{name:"substFormat",type:"USHORT",value:1},{name:"coverage",type:"TABLE",value:new ne.Coverage(e.coverage)}].concat(ne.tableList("ligSet",e.ligatureSets,(function(e){return new ne.Table("ligatureSetTable",ne.tableList("ligature",e,(function(e){return new ne.Table("ligatureTable",[{name:"ligGlyph",type:"USHORT",value:e.ligGlyph}].concat(ne.ushortList("component",e.components,e.components.length+1)))})))}))))};var St={parse:function(e,t){const n=new le(e,t=t||0),o=n.parseVersion();return G.argument(1===o,"Unsupported GSUB table version."),{version:o,scripts:n.parseScriptList(),features:n.parseFeatureList(),lookups:n.parseLookupList(yt)}},make:function(e){return new ne.Table("GSUB",[{name:"version",type:"ULONG",value:65536},{name:"scripts",type:"TABLE",value:new ne.ScriptList(e.scripts)},{name:"features",type:"TABLE",value:new ne.FeatureList(e.features)},{name:"lookups",type:"TABLE",value:new ne.LookupList(e.lookups,bt)}])}};var xt={parse:function(e,t){const n=new ue.Parser(e,t),o=n.parseULong();G.argument(1===o,"Unsupported META table version."),n.parseULong(),n.parseULong();const s=n.parseULong(),r={};for(let o=0;o<s;o++){const o=n.parseTag(),s=n.parseULong(),a=n.parseULong(),i=N.UTF8(e,t+s,a);r[o]=i}return r},make:function(e){const t=Object.keys(e).length;let n="";const o=16+12*t,s=new ne.Table("meta",[{name:"version",type:"ULONG",value:1},{name:"flags",type:"ULONG",value:0},{name:"offset",type:"ULONG",value:o},{name:"numTags",type:"ULONG",value:t}]);for(let t in e){const r=n.length;n+=e[t],s.fields.push({name:"tag "+t,type:"TAG",value:t}),s.fields.push({name:"offset "+t,type:"ULONG",value:o+r}),s.fields.push({name:"length "+t,type:"ULONG",value:e[t].length})}return s.fields.push({name:"stringPool",type:"CHARARRAY",value:n}),s}};function Ut(e){return Math.log(e)/Math.log(2)|0}function Tt(e){for(;e.length%4!=0;)e.push(0);let t=0;for(let n=0;n<e.length;n+=4)t+=(e[n]<<24)+(e[n+1]<<16)+(e[n+2]<<8)+e[n+3];return t%=Math.pow(2,32),t}function Et(e,t,n,o){return new ne.Record("Table Record",[{name:"tag",type:"TAG",value:void 0!==e?e:""},{name:"checkSum",type:"ULONG",value:void 0!==t?t:0},{name:"offset",type:"ULONG",value:void 0!==n?n:0},{name:"length",type:"ULONG",value:void 0!==o?o:0}])}function Ot(e){const t=new ne.Table("sfnt",[{name:"version",type:"TAG",value:"OTTO"},{name:"numTables",type:"USHORT",value:0},{name:"searchRange",type:"USHORT",value:0},{name:"entrySelector",type:"USHORT",value:0},{name:"rangeShift",type:"USHORT",value:0}]);t.tables=e,t.numTables=e.length;const n=Math.pow(2,Ut(t.numTables));t.searchRange=16*n,t.entrySelector=Ut(n),t.rangeShift=16*t.numTables-t.searchRange;const o=[],s=[];let r=t.sizeOf()+Et().sizeOf()*t.numTables;for(;r%4!=0;)r+=1,s.push({name:"padding",type:"BYTE",value:0});for(let t=0;t<e.length;t+=1){const n=e[t];G.argument(4===n.tableName.length,"Table name"+n.tableName+" is invalid.");const a=n.sizeOf(),i=Et(n.tableName,Tt(n.encode()),r,a);for(o.push({name:i.tag+" Table Record",type:"RECORD",value:i}),s.push({name:n.tableName+" table",type:"RECORD",value:n}),r+=a,G.argument(!isNaN(r),"Something went wrong calculating the offset.");r%4!=0;)r+=1,s.push({name:"padding",type:"BYTE",value:0})}return o.sort((function(e,t){return e.value.tag>t.value.tag?1:-1})),t.fields=t.fields.concat(o),t.fields=t.fields.concat(s),t}function wt(e,t,n){for(let n=0;n<t.length;n+=1){const o=e.charToGlyphIndex(t[n]);if(o>0){return e.glyphs.get(o).getMetrics()}}return n}function kt(e){let t=0;for(let n=0;n<e.length;n+=1)t+=e[n];return t/e.length}var Rt={make:Ot,fontToTable:function(e){const t=[],n=[],o=[],s=[],r=[],a=[],i=[];let l,c=0,u=0,p=0,h=0,f=0;for(let d=0;d<e.glyphs.length;d+=1){const g=e.glyphs.get(d),m=0|g.unicode;if(isNaN(g.advanceWidth))throw new Error("Glyph "+g.name+" ("+d+"): advanceWidth is not a number.");(l>m||void 0===l)&&m>0&&(l=m),c<m&&(c=m);const y=gt.getUnicodeRange(m);if(y<32)u|=1<<y;else if(y<64)p|=1<<y-32;else if(y<96)h|=1<<y-64;else{if(!(y<123))throw new Error("Unicode ranges bits > 123 are reserved for internal usage");f|=1<<y-96}if(".notdef"===g.name)continue;const v=g.getMetrics();t.push(v.xMin),n.push(v.yMin),o.push(v.xMax),s.push(v.yMax),a.push(v.leftSideBearing),i.push(v.rightSideBearing),r.push(g.advanceWidth)}const d={xMin:Math.min.apply(null,t),yMin:Math.min.apply(null,n),xMax:Math.max.apply(null,o),yMax:Math.max.apply(null,s),advanceWidthMax:Math.max.apply(null,r),advanceWidthAvg:kt(r),minLeftSideBearing:Math.min.apply(null,a),maxLeftSideBearing:Math.max.apply(null,a),minRightSideBearing:Math.min.apply(null,i)};d.ascender=e.ascender,d.descender=e.descender;const g=$e.make({flags:3,unitsPerEm:e.unitsPerEm,xMin:d.xMin,yMin:d.yMin,xMax:d.xMax,yMax:d.yMax,lowestRecPPEM:3,createdTimestamp:e.createdTimestamp}),m=Ke.make({ascender:d.ascender,descender:d.descender,advanceWidthMax:d.advanceWidthMax,minLeftSideBearing:d.minLeftSideBearing,minRightSideBearing:d.minRightSideBearing,xMaxExtent:d.maxLeftSideBearing+(d.xMax-d.xMin),numberOfHMetrics:e.glyphs.length}),y=tt.make(e.glyphs.length),v=gt.make({xAvgCharWidth:Math.round(d.advanceWidthAvg),usWeightClass:e.tables.os2.usWeightClass,usWidthClass:e.tables.os2.usWidthClass,usFirstCharIndex:l,usLastCharIndex:c,ulUnicodeRange1:u,ulUnicodeRange2:p,ulUnicodeRange3:h,ulUnicodeRange4:f,fsSelection:e.tables.os2.fsSelection,sTypoAscender:d.ascender,sTypoDescender:d.descender,sTypoLineGap:0,usWinAscent:d.yMax,usWinDescent:Math.abs(d.yMin),ulCodePageRange1:1,sxHeight:wt(e,"xyvw",{yMax:Math.round(d.ascender/2)}).yMax,sCapHeight:wt(e,"HIKLEFJMNTZBDPRAGOQSUVWXY",d).yMax,usDefaultChar:e.hasChar(" ")?32:0,usBreakChar:e.hasChar(" ")?32:0}),b=Je.make(e.glyphs),S=he.make(e.glyphs),x=e.getEnglishName("fontFamily"),U=e.getEnglishName("fontSubfamily"),T=x+" "+U;let E=e.getEnglishName("postScriptName");E||(E=x.replace(/\s/g,"")+"-"+U);const O={};for(let t in e.names)O[t]=e.names[t];O.uniqueID||(O.uniqueID={en:e.getEnglishName("manufacturer")+":"+T}),O.postScriptName||(O.postScriptName={en:E}),O.preferredFamily||(O.preferredFamily=e.names.fontFamily),O.preferredSubfamily||(O.preferredSubfamily=e.names.fontSubfamily);const w=[],k=ft.make(O,w),R=w.length>0?et.make(w):void 0,D=mt.make(),C=Qe.make(e.glyphs,{version:e.getEnglishName("version"),fullName:T,familyName:x,weightName:U,postScriptName:E,unitsPerEm:e.unitsPerEm,fontBBox:[0,d.yMin,d.ascender,d.advanceWidthMax]}),L=e.metas&&Object.keys(e.metas).length>0?xt.make(e.metas):void 0,I=[g,m,y,v,k,S,D,C,b];R&&I.push(R),e.tables.gsub&&I.push(St.make(e.tables.gsub)),L&&I.push(L);const M=Ot(I),B=Tt(M.encode()),G=M.fields;let N=!1;for(let e=0;e<G.length;e+=1)if("head table"===G[e].name){G[e].value.checkSumAdjustment=2981146554-B,N=!0;break}if(!N)throw new Error("Could not find head table with checkSum to adjust.");return M},computeCheckSum:Tt};function Dt(e,t){let n=0,o=e.length-1;for(;n<=o;){const s=n+o>>>1,r=e[s].tag;if(r===t)return s;r<t?n=s+1:o=s-1}return-n-1}function Ct(e,t){this.font=e,this.tableName=t}function Lt(e){Ct.call(this,e,"gsub")}function It(e,t){const n=e.length;if(n!==t.length)return!1;for(let o=0;o<n;o++)if(e[o]!==t[o])return!1;return!0}function Mt(e,t,n){const o=e.subtables;for(let e=0;e<o.length;e++){const n=o[e];if(n.substFormat===t)return n}if(n)return o.push(n),n}function Bt(e){const t=new ArrayBuffer(e.length),n=new Uint8Array(t);for(let t=0;t<e.length;++t)n[t]=e[t];return t}function Gt(e,t){if(!e)throw t}let Nt,Pt,At,Ft;function Ht(e){this.font=e,this._fpgmState=this._prepState=void 0,this._errorState=0}function zt(e){return e}function Wt(e){return Math.sign(e)*Math.round(Math.abs(e))}function _t(e){return Math.sign(e)*Math.round(Math.abs(2*e))/2}function qt(e){return Math.sign(e)*(Math.round(Math.abs(e)+.5)-.5)}function Xt(e){return Math.sign(e)*Math.ceil(Math.abs(e))}function Vt(e){return Math.sign(e)*Math.floor(Math.abs(e))}Ct.prototype={searchTag:Dt,binSearch:function(e,t){let n=0,o=e.length-1;for(;n<=o;){const s=n+o>>>1,r=e[s];if(r===t)return s;r<t?n=s+1:o=s-1}return-n-1},getTable:function(e){let t=this.font.tables[this.tableName];return!t&&e&&(t=this.font.tables[this.tableName]=this.createDefaultTable()),t},getScriptNames:function(){let e=this.getTable();return e?e.scripts.map((function(e){return e.tag})):[]},getDefaultScriptName:function(){let e=this.getTable();if(!e)return;let t=!1;for(let n=0;n<e.scripts.length;n++){const o=e.scripts[n].tag;if("DFLT"===o)return o;"latn"===o&&(t=!0)}return t?"latn":void 0},getScriptTable:function(e,t){const n=this.getTable(t);if(n){e=e||"DFLT";const o=n.scripts,s=Dt(n.scripts,e);if(s>=0)return o[s].script;if(t){const t={tag:e,script:{defaultLangSys:{reserved:0,reqFeatureIndex:65535,featureIndexes:[]},langSysRecords:[]}};return o.splice(-1-s,0,t),t.script}}},getLangSysTable:function(e,t,n){const o=this.getScriptTable(e,n);if(o){if(!t||"dflt"===t||"DFLT"===t)return o.defaultLangSys;const e=Dt(o.langSysRecords,t);if(e>=0)return o.langSysRecords[e].langSys;if(n){const n={tag:t,langSys:{reserved:0,reqFeatureIndex:65535,featureIndexes:[]}};return o.langSysRecords.splice(-1-e,0,n),n.langSys}}},getFeatureTable:function(e,t,n,o){const s=this.getLangSysTable(e,t,o);if(s){let e;const t=s.featureIndexes,r=this.font.tables[this.tableName].features;for(let o=0;o<t.length;o++)if(e=r[t[o]],e.tag===n)return e.feature;if(o){const o=r.length;return G.assert(0===o||n>=r[o-1].tag,"Features must be added in alphabetical order."),e={tag:n,feature:{params:0,lookupListIndexes:[]}},r.push(e),t.push(o),e.feature}}},getLookupTables:function(e,t,n,o,s){const r=this.getFeatureTable(e,t,n,s),a=[];if(r){let e;const t=r.lookupListIndexes,n=this.font.tables[this.tableName].lookups;for(let s=0;s<t.length;s++)e=n[t[s]],e.lookupType===o&&a.push(e);if(0===a.length&&s){e={lookupType:o,lookupFlag:0,subtables:[],markFilteringSet:void 0};const s=n.length;return n.push(e),t.push(s),[e]}}return a},expandCoverage:function(e){if(1===e.format)return e.glyphs;{const t=[],n=e.ranges;for(let e=0;e<n.length;e++){const o=n[e],s=o.start,r=o.end;for(let e=s;e<=r;e++)t.push(e)}return t}}},Lt.prototype=Ct.prototype,Lt.prototype.createDefaultTable=function(){return{version:1,scripts:[{tag:"DFLT",script:{defaultLangSys:{reserved:0,reqFeatureIndex:65535,featureIndexes:[]},langSysRecords:[]}}],features:[],lookups:[]}},Lt.prototype.getSingle=function(e,t,n){const o=[],s=this.getLookupTables(t,n,e,1);for(let e=0;e<s.length;e++){const t=s[e].subtables;for(let e=0;e<t.length;e++){const n=t[e],s=this.expandCoverage(n.coverage);let r;if(1===n.substFormat){const e=n.deltaGlyphId;for(r=0;r<s.length;r++){const t=s[r];o.push({sub:t,by:t+e})}}else{const e=n.substitute;for(r=0;r<s.length;r++)o.push({sub:s[r],by:e[r]})}}}return o},Lt.prototype.getAlternates=function(e,t,n){const o=[],s=this.getLookupTables(t,n,e,3);for(let e=0;e<s.length;e++){const t=s[e].subtables;for(let e=0;e<t.length;e++){const n=t[e],s=this.expandCoverage(n.coverage),r=n.alternateSets;for(let e=0;e<s.length;e++)o.push({sub:s[e],by:r[e]})}}return o},Lt.prototype.getLigatures=function(e,t,n){const o=[],s=this.getLookupTables(t,n,e,4);for(let e=0;e<s.length;e++){const t=s[e].subtables;for(let e=0;e<t.length;e++){const n=t[e],s=this.expandCoverage(n.coverage),r=n.ligatureSets;for(let e=0;e<s.length;e++){const t=s[e],n=r[e];for(let e=0;e<n.length;e++){const s=n[e];o.push({sub:[t].concat(s.components),by:s.ligGlyph})}}}}return o},Lt.prototype.addSingle=function(e,t,n,o){const s=Mt(this.getLookupTables(n,o,e,1,!0)[0],2,{substFormat:2,coverage:{format:1,glyphs:[]},substitute:[]});G.assert(1===s.coverage.format,"Ligature: unable to modify coverage table format "+s.coverage.format);const r=t.sub;let a=this.binSearch(s.coverage.glyphs,r);a<0&&(a=-1-a,s.coverage.glyphs.splice(a,0,r),s.substitute.splice(a,0,0)),s.substitute[a]=t.by},Lt.prototype.addAlternate=function(e,t,n,o){const s=Mt(this.getLookupTables(n,o,e,3,!0)[0],1,{substFormat:1,coverage:{format:1,glyphs:[]},alternateSets:[]});G.assert(1===s.coverage.format,"Ligature: unable to modify coverage table format "+s.coverage.format);const r=t.sub;let a=this.binSearch(s.coverage.glyphs,r);a<0&&(a=-1-a,s.coverage.glyphs.splice(a,0,r),s.alternateSets.splice(a,0,0)),s.alternateSets[a]=t.by},Lt.prototype.addLigature=function(e,t,n,o){const s=this.getLookupTables(n,o,e,4,!0)[0];let r=s.subtables[0];r||(r={substFormat:1,coverage:{format:1,glyphs:[]},ligatureSets:[]},s.subtables[0]=r),G.assert(1===r.coverage.format,"Ligature: unable to modify coverage table format "+r.coverage.format);const a=t.sub[0],i=t.sub.slice(1),l={ligGlyph:t.by,components:i};let c=this.binSearch(r.coverage.glyphs,a);if(c>=0){const e=r.ligatureSets[c];for(let t=0;t<e.length;t++)if(It(e[t].components,i))return;e.push(l)}else c=-1-c,r.coverage.glyphs.splice(c,0,a),r.ligatureSets.splice(c,0,[l])},Lt.prototype.getFeature=function(e,t,n){if(/ss\d\d/.test(e))return this.getSingle(e,t,n);switch(e){case"aalt":case"salt":return this.getSingle(e,t,n).concat(this.getAlternates(e,t,n));case"dlig":case"liga":case"rlig":return this.getLigatures(e,t,n)}},Lt.prototype.add=function(e,t,n,o){if(/ss\d\d/.test(e))return this.addSingle(e,t,n,o);switch(e){case"aalt":case"salt":return"number"==typeof t.by?this.addSingle(e,t,n,o):this.addAlternate(e,t,n,o);case"dlig":case"liga":case"rlig":return this.addLigature(e,t,n,o)}};const jt=function(e){const t=this.srPeriod;let n=this.srPhase;let o=1;return e<0&&(e=-e,o=-1),e+=this.srThreshold-n,e=Math.trunc(e/t)*t,e+=n,o>0&&e<0?n:o<0&&e>0?-n:e*o},Yt={x:1,y:0,axis:"x",distance:function(e,t,n,o){return(n?e.xo:e.x)-(o?t.xo:t.x)},interpolate:function(e,t,n,o){let s,r,a,i,l,c,u;if(!o||o===this)return s=e.xo-t.xo,r=e.xo-n.xo,l=t.x-t.xo,c=n.x-n.xo,a=Math.abs(s),i=Math.abs(r),u=a+i,0===u?void(e.x=e.xo+(l+c)/2):void(e.x=e.xo+(l*i+c*a)/u);s=o.distance(e,t,!0,!0),r=o.distance(e,n,!0,!0),l=o.distance(t,t,!1,!0),c=o.distance(n,n,!1,!0),a=Math.abs(s),i=Math.abs(r),u=a+i,0!==u?Yt.setRelative(e,e,(l*i+c*a)/u,o,!0):Yt.setRelative(e,e,(l+c)/2,o,!0)},normalSlope:Number.NEGATIVE_INFINITY,setRelative:function(e,t,n,o,s){if(!o||o===this)return void(e.x=(s?t.xo:t.x)+n);const r=s?t.xo:t.x,a=s?t.yo:t.y,i=r+n*o.x,l=a+n*o.y;e.x=i+(e.y-l)/o.normalSlope},slope:0,touch:function(e){e.xTouched=!0},touched:function(e){return e.xTouched},untouch:function(e){e.xTouched=!1}},Zt={x:0,y:1,axis:"y",distance:function(e,t,n,o){return(n?e.yo:e.y)-(o?t.yo:t.y)},interpolate:function(e,t,n,o){let s,r,a,i,l,c,u;if(!o||o===this)return s=e.yo-t.yo,r=e.yo-n.yo,l=t.y-t.yo,c=n.y-n.yo,a=Math.abs(s),i=Math.abs(r),u=a+i,0===u?void(e.y=e.yo+(l+c)/2):void(e.y=e.yo+(l*i+c*a)/u);s=o.distance(e,t,!0,!0),r=o.distance(e,n,!0,!0),l=o.distance(t,t,!1,!0),c=o.distance(n,n,!1,!0),a=Math.abs(s),i=Math.abs(r),u=a+i,0!==u?Zt.setRelative(e,e,(l*i+c*a)/u,o,!0):Zt.setRelative(e,e,(l+c)/2,o,!0)},normalSlope:0,setRelative:function(e,t,n,o,s){if(!o||o===this)return void(e.y=(s?t.yo:t.y)+n);const r=s?t.xo:t.x,a=s?t.yo:t.y,i=r+n*o.x,l=a+n*o.y;e.y=l+o.normalSlope*(e.x-i)},slope:Number.POSITIVE_INFINITY,touch:function(e){e.yTouched=!0},touched:function(e){return e.yTouched},untouch:function(e){e.yTouched=!1}};function Qt(e,t){this.x=e,this.y=t,this.axis=void 0,this.slope=t/e,this.normalSlope=-e/t,Object.freeze(this)}function $t(e,t){const n=Math.sqrt(e*e+t*t);return t/=n,1===(e/=n)&&0===t?Yt:0===e&&1===t?Zt:new Qt(e,t)}function Kt(e,t,n,o){this.x=this.xo=Math.round(64*e)/64,this.y=this.yo=Math.round(64*t)/64,this.lastPointOfContour=n,this.onCurve=o,this.prevPointOnContour=void 0,this.nextPointOnContour=void 0,this.xTouched=!1,this.yTouched=!1,Object.preventExtensions(this)}Object.freeze(Yt),Object.freeze(Zt),Qt.prototype.distance=function(e,t,n,o){return this.x*Yt.distance(e,t,n,o)+this.y*Zt.distance(e,t,n,o)},Qt.prototype.interpolate=function(e,t,n,o){let s,r,a,i,l,c,u;a=o.distance(e,t,!0,!0),i=o.distance(e,n,!0,!0),s=o.distance(t,t,!1,!0),r=o.distance(n,n,!1,!0),l=Math.abs(a),c=Math.abs(i),u=l+c,0!==u?this.setRelative(e,e,(s*c+r*l)/u,o,!0):this.setRelative(e,e,(s+r)/2,o,!0)},Qt.prototype.setRelative=function(e,t,n,o,s){o=o||this;const r=s?t.xo:t.x,a=s?t.yo:t.y,i=r+n*o.x,l=a+n*o.y,c=o.normalSlope,u=this.slope,p=e.x,h=e.y;e.x=(u*p-c*i+l-h)/(u-c),e.y=u*(e.x-p)+h},Qt.prototype.touch=function(e){e.xTouched=!0,e.yTouched=!0},Kt.prototype.nextTouched=function(e){let t=this.nextPointOnContour;for(;!e.touched(t)&&t!==this;)t=t.nextPointOnContour;return t},Kt.prototype.prevTouched=function(e){let t=this.prevPointOnContour;for(;!e.touched(t)&&t!==this;)t=t.prevPointOnContour;return t};const Jt=Object.freeze(new Kt(0,0)),en={cvCutIn:17/16,deltaBase:9,deltaShift:.125,loop:1,minDis:1,autoFlip:!0};function tn(e,t){switch(this.env=e,this.stack=[],this.prog=t,e){case"glyf":this.zp0=this.zp1=this.zp2=1,this.rp0=this.rp1=this.rp2=0;case"prep":this.fv=this.pv=this.dpv=Yt,this.round=Wt}}function nn(e){const t=e.tZone=new Array(e.gZone.length);for(let e=0;e<t.length;e++)t[e]=new Kt(0,0)}function on(e,t){const n=e.prog;let o,s=e.ip,r=1;do{if(o=n[++s],88===o)r++;else if(89===o)r--;else if(64===o)s+=n[s+1]+1;else if(65===o)s+=2*n[s+1]+1;else if(o>=176&&o<=183)s+=o-176+1;else if(o>=184&&o<=191)s+=2*(o-184+1);else if(t&&1===r&&27===o)break}while(r>0);e.ip=s}function sn(e,t){exports.DEBUG&&console.log(t.step,"SVTCA["+e.axis+"]"),t.fv=t.pv=t.dpv=e}function rn(e,t){exports.DEBUG&&console.log(t.step,"SPVTCA["+e.axis+"]"),t.pv=t.dpv=e}function an(e,t){exports.DEBUG&&console.log(t.step,"SFVTCA["+e.axis+"]"),t.fv=e}function ln(e,t){const n=t.stack,o=n.pop(),s=n.pop(),r=t.z2[o],a=t.z1[s];let i,l;exports.DEBUG&&console.log("SPVTL["+e+"]",o,s),e?(i=r.y-a.y,l=a.x-r.x):(i=a.x-r.x,l=a.y-r.y),t.pv=t.dpv=$t(i,l)}function cn(e,t){const n=t.stack,o=n.pop(),s=n.pop(),r=t.z2[o],a=t.z1[s];let i,l;exports.DEBUG&&console.log("SFVTL["+e+"]",o,s),e?(i=r.y-a.y,l=a.x-r.x):(i=a.x-r.x,l=a.y-r.y),t.fv=$t(i,l)}function un(e){exports.DEBUG&&console.log(e.step,"POP[]"),e.stack.pop()}function pn(e,t){const n=t.stack.pop(),o=t.z0[n],s=t.fv,r=t.pv;exports.DEBUG&&console.log(t.step,"MDAP["+e+"]",n);let a=r.distance(o,Jt);e&&(a=t.round(a)),s.setRelative(o,Jt,a,r),s.touch(o),t.rp0=t.rp1=n}function hn(e,t){const n=t.z2,o=n.length-2;let s,r,a;exports.DEBUG&&console.log(t.step,"IUP["+e.axis+"]");for(let t=0;t<o;t++)s=n[t],e.touched(s)||(r=s.prevTouched(e),r!==s&&(a=s.nextTouched(e),r===a&&e.setRelative(s,s,e.distance(r,r,!1,!0),e,!0),e.interpolate(s,r,a,e)))}function fn(e,t){const n=t.stack,o=e?t.rp1:t.rp2,s=(e?t.z0:t.z1)[o],r=t.fv,a=t.pv;let i=t.loop;const l=t.z2;for(;i--;){const o=n.pop(),c=l[o],u=a.distance(s,s,!1,!0);r.setRelative(c,c,u,a),r.touch(c),exports.DEBUG&&console.log(t.step,(t.loop>1?"loop "+(t.loop-i)+": ":"")+"SHP["+(e?"rp1":"rp2")+"]",o)}t.loop=1}function dn(e,t){const n=t.stack,o=e?t.rp1:t.rp2,s=(e?t.z0:t.z1)[o],r=t.fv,a=t.pv,i=n.pop(),l=t.z2[t.contours[i]];let c=l;exports.DEBUG&&console.log(t.step,"SHC["+e+"]",i);const u=a.distance(s,s,!1,!0);do{c!==s&&r.setRelative(c,c,u,a),c=c.nextPointOnContour}while(c!==l)}function gn(e,t){const n=t.stack,o=e?t.rp1:t.rp2,s=(e?t.z0:t.z1)[o],r=t.fv,a=t.pv,i=n.pop();let l,c;switch(exports.DEBUG&&console.log(t.step,"SHZ["+e+"]",i),i){case 0:l=t.tZone;break;case 1:l=t.gZone;break;default:throw new Error("Invalid zone")}const u=a.distance(s,s,!1,!0),p=l.length-2;for(let e=0;e<p;e++)c=l[e],c!==s&&r.setRelative(c,c,u,a)}function mn(e,t){const n=t.stack,o=n.pop()/64,s=n.pop(),r=t.z1[s],a=t.z0[t.rp0],i=t.fv,l=t.pv;i.setRelative(r,a,o,l),i.touch(r),exports.DEBUG&&console.log(t.step,"MSIRP["+e+"]",o,s),t.rp1=t.rp0,t.rp2=s,e&&(t.rp0=s)}function yn(e,t){const n=t.stack,o=n.pop(),s=n.pop(),r=t.z0[s],a=t.fv,i=t.pv;let l=t.cvt[o];e&&(l=t.round(l)),exports.DEBUG&&console.log(t.step,"MIAP["+e+"]",o,"(",l,")",s),a.setRelative(r,Jt,l,i),0===t.zp0&&(r.xo=r.x,r.yo=r.y),a.touch(r),t.rp0=t.rp1=s}function vn(e,t){const n=t.stack,o=n.pop(),s=t.z2[o];exports.DEBUG&&console.log(t.step,"GC["+e+"]",o),n.push(64*t.dpv.distance(s,Jt,e,!1))}function bn(e,t){const n=t.stack,o=n.pop(),s=n.pop(),r=t.z1[o],a=t.z0[s],i=t.dpv.distance(a,r,e,e);exports.DEBUG&&console.log(t.step,"MD["+e+"]",o,s,"->",i),t.stack.push(Math.round(64*i))}function Sn(e,t){const n=t.stack,o=n.pop(),s=t.fv,r=t.pv,a=t.ppem,i=t.deltaBase+16*(e-1),l=t.deltaShift,c=t.z0;exports.DEBUG&&console.log(t.step,"DELTAP["+e+"]",o,n);for(let e=0;e<o;e++){const e=n.pop(),o=n.pop();if(i+((240&o)>>4)!==a)continue;let u=(15&o)-8;u>=0&&u++,exports.DEBUG&&console.log(t.step,"DELTAPFIX",e,"by",u*l);const p=c[e];s.setRelative(p,p,u*l,r)}}function xn(e,t){const n=t.stack,o=n.pop();exports.DEBUG&&console.log(t.step,"ROUND[]"),n.push(64*t.round(o/64))}function Un(e,t){const n=t.stack,o=n.pop(),s=t.ppem,r=t.deltaBase+16*(e-1),a=t.deltaShift;exports.DEBUG&&console.log(t.step,"DELTAC["+e+"]",o,n);for(let e=0;e<o;e++){const e=n.pop(),o=n.pop();if(r+((240&o)>>4)!==s)continue;let i=(15&o)-8;i>=0&&i++;const l=i*a;exports.DEBUG&&console.log(t.step,"DELTACFIX",e,"by",l),t.cvt[e]+=l}}function Tn(e,t){const n=t.stack,o=n.pop(),s=n.pop(),r=t.z2[o],a=t.z1[s];let i,l;exports.DEBUG&&console.log("SDPVTL["+e+"]",o,s),e?(i=r.y-a.y,l=a.x-r.x):(i=a.x-r.x,l=a.y-r.y),t.dpv=$t(i,l)}function En(e,t){const n=t.stack,o=t.prog;let s=t.ip;exports.DEBUG&&console.log(t.step,"PUSHB["+e+"]");for(let t=0;t<e;t++)n.push(o[++s]);t.ip=s}function On(e,t){let n=t.ip;const o=t.prog,s=t.stack;exports.DEBUG&&console.log(t.ip,"PUSHW["+e+"]");for(let t=0;t<e;t++){let e=o[++n]<<8|o[++n];32768&e&&(e=-(1+(65535^e))),s.push(e)}t.ip=n}function wn(e,t,n,o,s,r){const a=r.stack,i=e&&a.pop(),l=a.pop(),c=r.rp0,u=r.z0[c],p=r.z1[l],h=r.minDis,f=r.fv,d=r.dpv;let g,m,y,v;m=g=d.distance(p,u,!0,!0),y=m>=0?1:-1,m=Math.abs(m),e&&(v=r.cvt[i],o&&Math.abs(m-v)<r.cvCutIn&&(m=v)),n&&m<h&&(m=h),o&&(m=r.round(m)),f.setRelative(p,u,y*m,d),f.touch(p),exports.DEBUG&&console.log(r.step,(e?"MIRP[":"MDRP[")+(t?"M":"m")+(n?">":"_")+(o?"R":"_")+(0===s?"Gr":1===s?"Bl":2===s?"Wh":"")+"]",e?i+"("+r.cvt[i]+","+v+")":"",l,"(d =",g,"->",y*m,")"),r.rp1=r.rp0,r.rp2=l,t&&(r.rp0=l)}function kn(e){(e=e||{}).empty||(Gt(e.familyName,"When creating a new Font object, familyName is required."),Gt(e.styleName,"When creating a new Font object, styleName is required."),Gt(e.unitsPerEm,"When creating a new Font object, unitsPerEm is required."),Gt(e.ascender,"When creating a new Font object, ascender is required."),Gt(e.descender,"When creating a new Font object, descender is required."),Gt(e.descender<0,"Descender should be negative (e.g. -512)."),this.names={fontFamily:{en:e.familyName||" "},fontSubfamily:{en:e.styleName||" "},fullName:{en:e.fullName||e.familyName+" "+e.styleName},postScriptName:{en:e.postScriptName||e.familyName+e.styleName},designer:{en:e.designer||" "},designerURL:{en:e.designerURL||" "},manufacturer:{en:e.manufacturer||" "},manufacturerURL:{en:e.manufacturerURL||" "},license:{en:e.license||" "},licenseURL:{en:e.licenseURL||" "},version:{en:e.version||"Version 0.1"},description:{en:e.description||" "},copyright:{en:e.copyright||" "},trademark:{en:e.trademark||" "}},this.unitsPerEm=e.unitsPerEm||1e3,this.ascender=e.ascender,this.descender=e.descender,this.createdTimestamp=e.createdTimestamp,this.tables={os2:{usWeightClass:e.weightClass||this.usWeightClasses.MEDIUM,usWidthClass:e.widthClass||this.usWidthClasses.MEDIUM,fsSelection:e.fsSelection||this.fsSelectionValues.REGULAR}}),this.supported=!0,this.glyphs=new Le.GlyphSet(this,e.glyphs||[]),this.encoding=new ye(this),this.substitution=new Lt(this),this.tables=this.tables||{},Object.defineProperty(this,"hinting",{get:function(){return this._hinting?this._hinting:"truetype"===this.outlinesFormat?this._hinting=new Ht(this):void 0}})}function Rn(e,t){const n=JSON.stringify(e);let o=256;for(let e in t){let s=parseInt(e);if(s&&!(s<256)){if(JSON.stringify(t[e])===n)return s;o<=s&&(o=s+1)}}return t[o]=e,o}function Dn(e,t,n){const o=Rn(t.name,n);return[{name:"tag_"+e,type:"TAG",value:t.tag},{name:"minValue_"+e,type:"FIXED",value:t.minValue<<16},{name:"defaultValue_"+e,type:"FIXED",value:t.defaultValue<<16},{name:"maxValue_"+e,type:"FIXED",value:t.maxValue<<16},{name:"flags_"+e,type:"USHORT",value:0},{name:"nameID_"+e,type:"USHORT",value:o}]}function Cn(e,t,n){const o={},s=new ue.Parser(e,t);return o.tag=s.parseTag(),o.minValue=s.parseFixed(),o.defaultValue=s.parseFixed(),o.maxValue=s.parseFixed(),s.skip("uShort",1),o.name=n[s.parseUShort()]||{},o}function Ln(e,t,n,o){const s=[{name:"nameID_"+e,type:"USHORT",value:Rn(t.name,o)},{name:"flags_"+e,type:"USHORT",value:0}];for(let o=0;o<n.length;++o){const r=n[o].tag;s.push({name:"axis_"+e+" "+r,type:"FIXED",value:t.coordinates[r]<<16})}return s}function In(e,t,n,o){const s={},r=new ue.Parser(e,t);s.name=o[r.parseUShort()]||{},r.skip("uShort",1),s.coordinates={};for(let e=0;e<n.length;++e)s.coordinates[n[e].tag]=r.parseFixed();return s}Ht.prototype.exec=function(e,t){if("number"!=typeof t)throw new Error("Point size is not a number!");if(this._errorState>2)return;const n=this.font;let o=this._prepState;if(!o||o.ppem!==t){let e=this._fpgmState;if(!e){tn.prototype=en,e=this._fpgmState=new tn("fpgm",n.tables.fpgm),e.funcs=[],e.font=n,exports.DEBUG&&(console.log("---EXEC FPGM---"),e.step=-1);try{Pt(e)}catch(e){return console.log("Hinting error in FPGM:"+e),void(this._errorState=3)}}tn.prototype=e,o=this._prepState=new tn("prep",n.tables.prep),o.ppem=t;const s=n.tables.cvt;if(s){const e=o.cvt=new Array(s.length),r=t/n.unitsPerEm;for(let t=0;t<s.length;t++)e[t]=s[t]*r}else o.cvt=[];exports.DEBUG&&(console.log("---EXEC PREP---"),o.step=-1);try{Pt(o)}catch(e){this._errorState<2&&console.log("Hinting error in PREP:"+e),this._errorState=2}}if(!(this._errorState>1))try{return At(e,o)}catch(e){return this._errorState<1&&(console.log("Hinting error:"+e),console.log("Note: further hinting errors are silenced")),void(this._errorState=1)}},At=function(e,t){const n=t.ppem/t.font.unitsPerEm,o=n;let s,r,a,i=e.components;if(tn.prototype=t,i){const l=t.font;r=[],s=[];for(let e=0;e<i.length;e++){const t=i[e],c=l.glyphs.get(t.glyphIndex);a=new tn("glyf",c.instructions),exports.DEBUG&&(console.log("---EXEC COMP "+e+"---"),a.step=-1),Ft(c,a,n,o);const u=Math.round(t.dx*n),p=Math.round(t.dy*o),h=a.gZone,f=a.contours;for(let e=0;e<h.length;e++){const t=h[e];t.xTouched=t.yTouched=!1,t.xo=t.x=t.x+u,t.yo=t.y=t.y+p}const d=r.length;r.push.apply(r,h);for(let e=0;e<f.length;e++)s.push(f[e]+d)}e.instructions&&!a.inhibitGridFit&&(a=new tn("glyf",e.instructions),a.gZone=a.z0=a.z1=a.z2=r,a.contours=s,r.push(new Kt(0,0),new Kt(Math.round(e.advanceWidth*n),0)),exports.DEBUG&&(console.log("---EXEC COMPOSITE---"),a.step=-1),Pt(a),r.length-=2)}else a=new tn("glyf",e.instructions),exports.DEBUG&&(console.log("---EXEC GLYPH---"),a.step=-1),Ft(e,a,n,o),r=a.gZone;return r},Ft=function(e,t,n,o){const s=e.points||[],r=s.length,a=t.gZone=t.z0=t.z1=t.z2=[],i=t.contours=[];let l,c,u;for(let e=0;e<r;e++)l=s[e],a[e]=new Kt(l.x*n,l.y*o,l.lastPointOfContour,l.onCurve);for(let e=0;e<r;e++)l=a[e],c||(c=l,i.push(e)),l.lastPointOfContour?(l.nextPointOnContour=c,c.prevPointOnContour=l,c=void 0):(u=a[e+1],l.nextPointOnContour=u,u.prevPointOnContour=l);if(!t.inhibitGridFit&&(a.push(new Kt(0,0),new Kt(Math.round(e.advanceWidth*n),0)),Pt(t),a.length-=2,exports.DEBUG)){console.log("FINISHED GLYPH",t.stack);for(let e=0;e<r;e++)console.log(e,a[e].x,a[e].y)}},Pt=function(e){let t=e.prog;if(!t)return;const n=t.length;let o;for(e.ip=0;e.ip<n;e.ip++){if(exports.DEBUG&&e.step++,o=Nt[t[e.ip]],!o)throw new Error("unknown instruction: 0x"+Number(t[e.ip]).toString(16));o(e)}},Nt=[sn.bind(void 0,Zt),sn.bind(void 0,Yt),rn.bind(void 0,Zt),rn.bind(void 0,Yt),an.bind(void 0,Zt),an.bind(void 0,Yt),ln.bind(void 0,0),ln.bind(void 0,1),cn.bind(void 0,0),cn.bind(void 0,1),function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"SPVFS[]",n,o),e.pv=e.dpv=$t(o,n)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"SPVFS[]",n,o),e.fv=$t(o,n)},function(e){const t=e.stack,n=e.pv;exports.DEBUG&&console.log(e.step,"GPV[]"),t.push(16384*n.x),t.push(16384*n.y)},function(e){const t=e.stack,n=e.fv;exports.DEBUG&&console.log(e.step,"GFV[]"),t.push(16384*n.x),t.push(16384*n.y)},function(e){e.fv=e.pv,exports.DEBUG&&console.log(e.step,"SFVTPV[]")},function(e){const t=e.stack,n=t.pop(),o=t.pop(),s=t.pop(),r=t.pop(),a=t.pop(),i=e.z0,l=e.z1,c=i[n],u=i[o],p=l[s],h=l[r],f=e.z2[a];exports.DEBUG&&console.log("ISECT[], ",n,o,s,r,a);const d=c.x,g=c.y,m=u.x,y=u.y,v=p.x,b=p.y,S=h.x,x=h.y,U=(d-m)*(b-x)-(g-y)*(v-S),T=d*y-g*m,E=v*x-b*S;f.x=(T*(v-S)-E*(d-m))/U,f.y=(T*(b-x)-E*(g-y))/U},function(e){e.rp0=e.stack.pop(),exports.DEBUG&&console.log(e.step,"SRP0[]",e.rp0)},function(e){e.rp1=e.stack.pop(),exports.DEBUG&&console.log(e.step,"SRP1[]",e.rp1)},function(e){e.rp2=e.stack.pop(),exports.DEBUG&&console.log(e.step,"SRP2[]",e.rp2)},function(e){const t=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"SZP0[]",t),e.zp0=t,t){case 0:e.tZone||nn(e),e.z0=e.tZone;break;case 1:e.z0=e.gZone;break;default:throw new Error("Invalid zone pointer")}},function(e){const t=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"SZP1[]",t),e.zp1=t,t){case 0:e.tZone||nn(e),e.z1=e.tZone;break;case 1:e.z1=e.gZone;break;default:throw new Error("Invalid zone pointer")}},function(e){const t=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"SZP2[]",t),e.zp2=t,t){case 0:e.tZone||nn(e),e.z2=e.tZone;break;case 1:e.z2=e.gZone;break;default:throw new Error("Invalid zone pointer")}},function(e){const t=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"SZPS[]",t),e.zp0=e.zp1=e.zp2=t,t){case 0:e.tZone||nn(e),e.z0=e.z1=e.z2=e.tZone;break;case 1:e.z0=e.z1=e.z2=e.gZone;break;default:throw new Error("Invalid zone pointer")}},function(e){e.loop=e.stack.pop(),exports.DEBUG&&console.log(e.step,"SLOOP[]",e.loop)},function(e){exports.DEBUG&&console.log(e.step,"RTG[]"),e.round=Wt},function(e){exports.DEBUG&&console.log(e.step,"RTHG[]"),e.round=qt},function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"SMD[]",t),e.minDis=t/64},function(e){exports.DEBUG&&console.log(e.step,"ELSE[]"),on(e,!1)},function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"JMPR[]",t),e.ip+=t-1},function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"SCVTCI[]",t),e.cvCutIn=t/64},void 0,void 0,function(e){const t=e.stack;exports.DEBUG&&console.log(e.step,"DUP[]"),t.push(t[t.length-1])},un,function(e){exports.DEBUG&&console.log(e.step,"CLEAR[]"),e.stack.length=0},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"SWAP[]"),t.push(n),t.push(o)},function(e){const t=e.stack;exports.DEBUG&&console.log(e.step,"DEPTH[]"),t.push(t.length)},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"CINDEX[]",n),t.push(t[t.length-n])},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"MINDEX[]",n),t.push(t.splice(t.length-n,1)[0])},void 0,void 0,void 0,function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"LOOPCALL[]",n,o);const s=e.ip,r=e.prog;e.prog=e.funcs[n];for(let t=0;t<o;t++)Pt(e),exports.DEBUG&&console.log(++e.step,t+1<o?"next loopcall":"done loopcall",t);e.ip=s,e.prog=r},function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"CALL[]",t);const n=e.ip,o=e.prog;e.prog=e.funcs[t],Pt(e),e.ip=n,e.prog=o,exports.DEBUG&&console.log(++e.step,"returning from",t)},function(e){if("fpgm"!==e.env)throw new Error("FDEF not allowed here");const t=e.stack,n=e.prog;let o=e.ip;const s=t.pop(),r=o;for(exports.DEBUG&&console.log(e.step,"FDEF[]",s);45!==n[++o];);e.ip=o,e.funcs[s]=n.slice(r+1,o)},void 0,pn.bind(void 0,0),pn.bind(void 0,1),hn.bind(void 0,Zt),hn.bind(void 0,Yt),fn.bind(void 0,0),fn.bind(void 0,1),dn.bind(void 0,0),dn.bind(void 0,1),gn.bind(void 0,0),gn.bind(void 0,1),function(e){const t=e.stack;let n=e.loop;const o=e.fv,s=t.pop()/64,r=e.z2;for(;n--;){const a=t.pop(),i=r[a];exports.DEBUG&&console.log(e.step,(e.loop>1?"loop "+(e.loop-n)+": ":"")+"SHPIX[]",a,s),o.setRelative(i,i,s),o.touch(i)}e.loop=1},function(e){const t=e.stack,n=e.rp1,o=e.rp2;let s=e.loop;const r=e.z0[n],a=e.z1[o],i=e.fv,l=e.dpv,c=e.z2;for(;s--;){const u=t.pop(),p=c[u];exports.DEBUG&&console.log(e.step,(e.loop>1?"loop "+(e.loop-s)+": ":"")+"IP[]",u,n,"<->",o),i.interpolate(p,r,a,l),i.touch(p)}e.loop=1},mn.bind(void 0,0),mn.bind(void 0,1),function(e){const t=e.stack,n=e.rp0,o=e.z0[n];let s=e.loop;const r=e.fv,a=e.pv,i=e.z1;for(;s--;){const n=t.pop(),l=i[n];exports.DEBUG&&console.log(e.step,(e.loop>1?"loop "+(e.loop-s)+": ":"")+"ALIGNRP[]",n),r.setRelative(l,o,0,a),r.touch(l)}e.loop=1},function(e){exports.DEBUG&&console.log(e.step,"RTDG[]"),e.round=_t},yn.bind(void 0,0),yn.bind(void 0,1),function(e){const t=e.prog;let n=e.ip;const o=e.stack,s=t[++n];exports.DEBUG&&console.log(e.step,"NPUSHB[]",s);for(let e=0;e<s;e++)o.push(t[++n]);e.ip=n},function(e){let t=e.ip;const n=e.prog,o=e.stack,s=n[++t];exports.DEBUG&&console.log(e.step,"NPUSHW[]",s);for(let e=0;e<s;e++){let e=n[++t]<<8|n[++t];32768&e&&(e=-(1+(65535^e))),o.push(e)}e.ip=t},function(e){const t=e.stack;let n=e.store;n||(n=e.store=[]);const o=t.pop(),s=t.pop();exports.DEBUG&&console.log(e.step,"WS",o,s),n[s]=o},function(e){const t=e.stack,n=e.store,o=t.pop();exports.DEBUG&&console.log(e.step,"RS",o);const s=n&&n[o]||0;t.push(s)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"WCVTP",n,o),e.cvt[o]=n/64},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"RCVT",n),t.push(64*e.cvt[n])},vn.bind(void 0,0),vn.bind(void 0,1),void 0,bn.bind(void 0,0),bn.bind(void 0,1),function(e){exports.DEBUG&&console.log(e.step,"MPPEM[]"),e.stack.push(e.ppem)},void 0,function(e){exports.DEBUG&&console.log(e.step,"FLIPON[]"),e.autoFlip=!0},void 0,void 0,function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"LT[]",n,o),t.push(o<n?1:0)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"LTEQ[]",n,o),t.push(o<=n?1:0)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"GT[]",n,o),t.push(o>n?1:0)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"GTEQ[]",n,o),t.push(o>=n?1:0)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"EQ[]",n,o),t.push(n===o?1:0)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"NEQ[]",n,o),t.push(n!==o?1:0)},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"ODD[]",n),t.push(Math.trunc(n)%2?1:0)},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"EVEN[]",n),t.push(Math.trunc(n)%2?0:1)},function(e){let t=e.stack.pop();exports.DEBUG&&console.log(e.step,"IF[]",t),t||(on(e,!0),exports.DEBUG&&console.log(e.step,"EIF[]"))},function(e){exports.DEBUG&&console.log(e.step,"EIF[]")},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"AND[]",n,o),t.push(n&&o?1:0)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"OR[]",n,o),t.push(n||o?1:0)},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"NOT[]",n),t.push(n?0:1)},Sn.bind(void 0,1),function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"SDB[]",t),e.deltaBase=t},function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"SDS[]",t),e.deltaShift=Math.pow(.5,t)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"ADD[]",n,o),t.push(o+n)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"SUB[]",n,o),t.push(o-n)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"DIV[]",n,o),t.push(64*o/n)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"MUL[]",n,o),t.push(o*n/64)},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"ABS[]",n),t.push(Math.abs(n))},function(e){const t=e.stack;let n=t.pop();exports.DEBUG&&console.log(e.step,"NEG[]",n),t.push(-n)},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"FLOOR[]",n),t.push(64*Math.floor(n/64))},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"CEILING[]",n),t.push(64*Math.ceil(n/64))},xn.bind(void 0,0),xn.bind(void 0,1),xn.bind(void 0,2),xn.bind(void 0,3),void 0,void 0,void 0,void 0,function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"WCVTF[]",n,o),e.cvt[o]=n*e.ppem/e.font.unitsPerEm},Sn.bind(void 0,2),Sn.bind(void 0,3),Un.bind(void 0,1),Un.bind(void 0,2),Un.bind(void 0,3),function(e){let t,n=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"SROUND[]",n),e.round=jt,192&n){case 0:t=.5;break;case 64:t=1;break;case 128:t=2;break;default:throw new Error("invalid SROUND value")}switch(e.srPeriod=t,48&n){case 0:e.srPhase=0;break;case 16:e.srPhase=.25*t;break;case 32:e.srPhase=.5*t;break;case 48:e.srPhase=.75*t;break;default:throw new Error("invalid SROUND value")}n&=15,e.srThreshold=0===n?0:(n/8-.5)*t},function(e){let t,n=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"S45ROUND[]",n),e.round=jt,192&n){case 0:t=Math.sqrt(2)/2;break;case 64:t=Math.sqrt(2);break;case 128:t=2*Math.sqrt(2);break;default:throw new Error("invalid S45ROUND value")}switch(e.srPeriod=t,48&n){case 0:e.srPhase=0;break;case 16:e.srPhase=.25*t;break;case 32:e.srPhase=.5*t;break;case 48:e.srPhase=.75*t;break;default:throw new Error("invalid S45ROUND value")}n&=15,e.srThreshold=0===n?0:(n/8-.5)*t},void 0,void 0,function(e){exports.DEBUG&&console.log(e.step,"ROFF[]"),e.round=zt},void 0,function(e){exports.DEBUG&&console.log(e.step,"RUTG[]"),e.round=Xt},function(e){exports.DEBUG&&console.log(e.step,"RDTG[]"),e.round=Vt},un,un,void 0,void 0,void 0,void 0,void 0,function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"SCANCTRL[]",t)},Tn.bind(void 0,0),Tn.bind(void 0,1),function(e){const t=e.stack,n=t.pop();let o=0;exports.DEBUG&&console.log(e.step,"GETINFO[]",n),1&n&&(o=35),32&n&&(o|=4096),t.push(o)},void 0,function(e){const t=e.stack,n=t.pop(),o=t.pop(),s=t.pop();exports.DEBUG&&console.log(e.step,"ROLL[]"),t.push(o),t.push(n),t.push(s)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"MAX[]",n,o),t.push(Math.max(o,n))},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"MIN[]",n,o),t.push(Math.min(o,n))},function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"SCANTYPE[]",t)},function(e){const t=e.stack.pop();let n=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"INSTCTRL[]",t,n),t){case 1:return void(e.inhibitGridFit=!!n);case 2:return void(e.ignoreCvt=!!n);default:throw new Error("invalid INSTCTRL[] selector")}},void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,En.bind(void 0,1),En.bind(void 0,2),En.bind(void 0,3),En.bind(void 0,4),En.bind(void 0,5),En.bind(void 0,6),En.bind(void 0,7),En.bind(void 0,8),On.bind(void 0,1),On.bind(void 0,2),On.bind(void 0,3),On.bind(void 0,4),On.bind(void 0,5),On.bind(void 0,6),On.bind(void 0,7),On.bind(void 0,8),wn.bind(void 0,0,0,0,0,0),wn.bind(void 0,0,0,0,0,1),wn.bind(void 0,0,0,0,0,2),wn.bind(void 0,0,0,0,0,3),wn.bind(void 0,0,0,0,1,0),wn.bind(void 0,0,0,0,1,1),wn.bind(void 0,0,0,0,1,2),wn.bind(void 0,0,0,0,1,3),wn.bind(void 0,0,0,1,0,0),wn.bind(void 0,0,0,1,0,1),wn.bind(void 0,0,0,1,0,2),wn.bind(void 0,0,0,1,0,3),wn.bind(void 0,0,0,1,1,0),wn.bind(void 0,0,0,1,1,1),wn.bind(void 0,0,0,1,1,2),wn.bind(void 0,0,0,1,1,3),wn.bind(void 0,0,1,0,0,0),wn.bind(void 0,0,1,0,0,1),wn.bind(void 0,0,1,0,0,2),wn.bind(void 0,0,1,0,0,3),wn.bind(void 0,0,1,0,1,0),wn.bind(void 0,0,1,0,1,1),wn.bind(void 0,0,1,0,1,2),wn.bind(void 0,0,1,0,1,3),wn.bind(void 0,0,1,1,0,0),wn.bind(void 0,0,1,1,0,1),wn.bind(void 0,0,1,1,0,2),wn.bind(void 0,0,1,1,0,3),wn.bind(void 0,0,1,1,1,0),wn.bind(void 0,0,1,1,1,1),wn.bind(void 0,0,1,1,1,2),wn.bind(void 0,0,1,1,1,3),wn.bind(void 0,1,0,0,0,0),wn.bind(void 0,1,0,0,0,1),wn.bind(void 0,1,0,0,0,2),wn.bind(void 0,1,0,0,0,3),wn.bind(void 0,1,0,0,1,0),wn.bind(void 0,1,0,0,1,1),wn.bind(void 0,1,0,0,1,2),wn.bind(void 0,1,0,0,1,3),wn.bind(void 0,1,0,1,0,0),wn.bind(void 0,1,0,1,0,1),wn.bind(void 0,1,0,1,0,2),wn.bind(void 0,1,0,1,0,3),wn.bind(void 0,1,0,1,1,0),wn.bind(void 0,1,0,1,1,1),wn.bind(void 0,1,0,1,1,2),wn.bind(void 0,1,0,1,1,3),wn.bind(void 0,1,1,0,0,0),wn.bind(void 0,1,1,0,0,1),wn.bind(void 0,1,1,0,0,2),wn.bind(void 0,1,1,0,0,3),wn.bind(void 0,1,1,0,1,0),wn.bind(void 0,1,1,0,1,1),wn.bind(void 0,1,1,0,1,2),wn.bind(void 0,1,1,0,1,3),wn.bind(void 0,1,1,1,0,0),wn.bind(void 0,1,1,1,0,1),wn.bind(void 0,1,1,1,0,2),wn.bind(void 0,1,1,1,0,3),wn.bind(void 0,1,1,1,1,0),wn.bind(void 0,1,1,1,1,1),wn.bind(void 0,1,1,1,1,2),wn.bind(void 0,1,1,1,1,3)],kn.prototype.hasChar=function(e){return null!==this.encoding.charToGlyphIndex(e)},kn.prototype.charToGlyphIndex=function(e){return this.encoding.charToGlyphIndex(e)},kn.prototype.charToGlyph=function(e){const t=this.charToGlyphIndex(e);let n=this.glyphs.get(t);return n||(n=this.glyphs.get(0)),n},kn.prototype.stringToGlyphs=function(e,t){t=t||this.defaultRenderOptions;const n=[];for(let t=0;t<e.length;t+=1){const o=e[t];n.push(this.charToGlyphIndex(o))}let o=n.length;if(t.features){const e=t.script||this.substitution.getDefaultScriptName();let s=[];t.features.liga&&(s=s.concat(this.substitution.getFeature("liga",e,t.language))),t.features.rlig&&(s=s.concat(this.substitution.getFeature("rlig",e,t.language)));for(let e=0;e<o;e+=1)for(let t=0;t<s.length;t++){const r=s[t],a=r.sub,i=a.length;let l=0;for(;l<i&&a[l]===n[e+l];)l++;l===i&&(n.splice(e,i,r.by),o=o-i+1)}}const s=new Array(o),r=this.glyphs.get(0);for(let e=0;e<o;e+=1)s[e]=this.glyphs.get(n[e])||r;return s},kn.prototype.nameToGlyphIndex=function(e){return this.glyphNames.nameToGlyphIndex(e)},kn.prototype.nameToGlyph=function(e){const t=this.nameToGlyphIndex(e);let n=this.glyphs.get(t);return n||(n=this.glyphs.get(0)),n},kn.prototype.glyphIndexToName=function(e){return this.glyphNames.glyphIndexToName?this.glyphNames.glyphIndexToName(e):""},kn.prototype.getKerningValue=function(e,t){e=e.index||e,t=t.index||t;const n=this.getGposKerningValue;return n?n(e,t):this.kerningPairs[e+","+t]||0},kn.prototype.defaultRenderOptions={kerning:!0,features:{liga:!0,rlig:!0}},kn.prototype.forEachGlyph=function(e,t,n,o,s,r){t=void 0!==t?t:0,n=void 0!==n?n:0,o=void 0!==o?o:72,s=s||this.defaultRenderOptions;const a=1/this.unitsPerEm*o,i=this.stringToGlyphs(e,s);for(let e=0;e<i.length;e+=1){const l=i[e];if(r.call(this,l,t,n,o,s),l.advanceWidth&&(t+=l.advanceWidth*a),s.kerning&&e<i.length-1){t+=this.getKerningValue(l,i[e+1])*a}s.letterSpacing?t+=s.letterSpacing*o:s.tracking&&(t+=s.tracking/1e3*o)}return t},kn.prototype.getPath=function(e,t,n,o,s){const r=new I;return this.forEachGlyph(e,t,n,o,s,(function(e,t,n,o){const a=e.getPath(t,n,o,s,this);r.extend(a)})),r},kn.prototype.getPaths=function(e,t,n,o,s){const r=[];return this.forEachGlyph(e,t,n,o,s,(function(e,t,n,o){const a=e.getPath(t,n,o,s,this);r.push(a)})),r},kn.prototype.getAdvanceWidth=function(e,t,n){return this.forEachGlyph(e,0,0,t,n,(function(){}))},kn.prototype.draw=function(e,t,n,o,s,r){this.getPath(t,n,o,s,r).draw(e)},kn.prototype.drawPoints=function(e,t,n,o,s,r){this.forEachGlyph(t,n,o,s,r,(function(t,n,o,s){t.drawPoints(e,n,o,s)}))},kn.prototype.drawMetrics=function(e,t,n,o,s,r){this.forEachGlyph(t,n,o,s,r,(function(t,n,o,s){t.drawMetrics(e,n,o,s)}))},kn.prototype.getEnglishName=function(e){const t=this.names[e];if(t)return t.en},kn.prototype.validate=function(){const e=this;function t(t){const n=e.getEnglishName(t);n&&n.trim().length}t("fontFamily"),t("weightName"),t("manufacturer"),t("copyright"),t("version"),this.unitsPerEm},kn.prototype.toTables=function(){return Rt.fontToTable(this)},kn.prototype.toBuffer=function(){return console.warn("Font.toBuffer is deprecated. Use Font.toArrayBuffer instead."),this.toArrayBuffer()},kn.prototype.toArrayBuffer=function(){const e=this.toTables().encode(),t=new ArrayBuffer(e.length),n=new Uint8Array(t);for(let t=0;t<e.length;t++)n[t]=e[t];return t},kn.prototype.download=function(e){const t=this.getEnglishName("fontFamily"),n=this.getEnglishName("fontSubfamily");e=e||t.replace(/\s/g,"")+"-"+n+".otf";const o=this.toArrayBuffer();if("undefined"!=typeof window)window.requestFileSystem=window.requestFileSystem||window.webkitRequestFileSystem,window.requestFileSystem(window.TEMPORARY,o.byteLength,(function(t){t.root.getFile(e,{create:!0},(function(e){e.createWriter((function(t){const n=new DataView(o),s=new Blob([n],{type:"font/opentype"});t.write(s),t.addEventListener("writeend",(function(){location.href=e.toURL()}),!1)}))}))}),(function(e){throw new Error(e.name+": "+e.message)}));else{const t=require("fs"),n=function(e){const t=new Buffer(e.byteLength),n=new Uint8Array(e);for(let e=0;e<t.length;++e)t[e]=n[e];return t}(o);t.writeFileSync(e,n)}},kn.prototype.fsSelectionValues={ITALIC:1,UNDERSCORE:2,NEGATIVE:4,OUTLINED:8,STRIKEOUT:16,BOLD:32,REGULAR:64,USER_TYPO_METRICS:128,WWS:256,OBLIQUE:512},kn.prototype.usWidthClasses={ULTRA_CONDENSED:1,EXTRA_CONDENSED:2,CONDENSED:3,SEMI_CONDENSED:4,MEDIUM:5,SEMI_EXPANDED:6,EXPANDED:7,EXTRA_EXPANDED:8,ULTRA_EXPANDED:9},kn.prototype.usWeightClasses={THIN:100,EXTRA_LIGHT:200,LIGHT:300,NORMAL:400,MEDIUM:500,SEMI_BOLD:600,BOLD:700,EXTRA_BOLD:800,BLACK:900};var Mn={make:function(e,t){const n=new ne.Table("fvar",[{name:"version",type:"ULONG",value:65536},{name:"offsetToData",type:"USHORT",value:0},{name:"countSizePairs",type:"USHORT",value:2},{name:"axisCount",type:"USHORT",value:e.axes.length},{name:"axisSize",type:"USHORT",value:20},{name:"instanceCount",type:"USHORT",value:e.instances.length},{name:"instanceSize",type:"USHORT",value:4+4*e.axes.length}]);n.offsetToData=n.sizeOf();for(let o=0;o<e.axes.length;o++)n.fields=n.fields.concat(Dn(o,e.axes[o],t));for(let o=0;o<e.instances.length;o++)n.fields=n.fields.concat(Ln(o,e.instances[o],e.axes,t));return n},parse:function(e,t,n){const o=new ue.Parser(e,t),s=o.parseULong();G.argument(65536===s,"Unsupported fvar table version.");const r=o.parseOffset16();o.skip("uShort",1);const a=o.parseUShort(),i=o.parseUShort(),l=o.parseUShort(),c=o.parseUShort(),u=[];for(let o=0;o<a;o++)u.push(Cn(e,t+r+o*i,n));const p=[],h=t+r+a*i;for(let t=0;t<l;t++)p.push(In(e,h+t*c,u,n));return{axes:u,instances:p}}};function Bn(e,t){const n=new ue.Parser(e,t),o=n.parseUShort(),s=[];for(let e=0;e<o;e++)s[n.parseTag()]={offset:n.parseUShort()};return s}function Gn(e,t){const n=new ue.Parser(e,t),o=n.parseUShort();if(1===o){const e=n.parseUShort(),t=n.parseUShort(),o=n.parseUShortList(t);return function(t){return o[t-e]||0}}if(2===o){const e=n.parseUShort(),t=[],o=[],s=[];for(let r=0;r<e;r++)t[r]=n.parseUShort(),o[r]=n.parseUShort(),s[r]=n.parseUShort();return function(e){let n=0,r=t.length-1;for(;n<r;){const o=n+r+1>>1;e<t[o]?r=o-1:n=o}return t[n]<=e&&e<=o[n]&&s[n]||0}}}function Nn(e,t){const n=new ue.Parser(e,t),o=n.parseUShort(),s=function(e,t){const n=new ue.Parser(e,t),o=n.parseUShort();let s=n.parseUShort();if(1===o)return n.parseUShortList(s);if(2===o){const e=[];for(;s--;){const t=n.parseUShort(),o=n.parseUShort();let s=n.parseUShort();for(let n=t;n<=o;n++)e[s++]=n}return e}}(e,t+n.parseUShort()),r=n.parseUShort(),a=n.parseUShort();let i;if(4!==r||0!==a)return;const l={};if(1===o){const e=n.parseUShort(),t=[],o=n.parseOffset16List(e);for(let c=0;c<e;c++){const e=o[c];let u=l[e];if(!u){u={},n.relativeOffset=e;let t=n.parseUShort();for(;t--;){const e=n.parseUShort();r&&(i=n.parseShort()),a&&n.parseShort(),u[e]=i}}t[s[c]]=u}return function(e,n){const o=t[e];if(o)return o[n]}}if(2===o){const o=n.parseUShort(),l=n.parseUShort(),c=n.parseUShort(),u=n.parseUShort(),p=Gn(e,t+o),h=Gn(e,t+l),f=[];for(let e=0;e<c;e++){const t=f[e]=[];for(let e=0;e<u;e++)r&&(i=n.parseShort()),a&&n.parseShort(),t[e]=i}const d={};for(let e=0;e<s.length;e++)d[s[e]]=1;return function(e,t){if(!d[e])return;const n=p(e),o=h(t),s=f[n];return s?s[o]:void 0}}}function Pn(e,t){const n=new ue.Parser(e,t),o=n.parseUShort(),s=n.parseUShort(),r=16&s,a=n.parseUShort(),i=n.parseOffset16List(a),l={lookupType:o,lookupFlag:s,markFilteringSet:r?n.parseUShort():-1};if(2===o){const n=[];for(let o=0;o<a;o++){const s=Nn(e,t+i[o]);s&&n.push(s)}l.getKerningValue=function(e,t){for(let o=n.length;o--;){const s=n[o](e,t);if(void 0!==s)return s}return 0}}return l}var An={parse:function(e,t,n){const o=new ue.Parser(e,t),s=o.parseFixed();G.argument(1===s,"Unsupported GPOS table version."),Bn(e,t+o.parseUShort()),Bn(e,t+o.parseUShort());const r=o.parseUShort();o.relativeOffset=r;const a=o.parseUShort(),i=o.parseOffset16List(a),l=t+r;for(let t=0;t<a;t++){const o=Pn(e,l+i[t]);2!==o.lookupType||n.getGposKerningValue||(n.getGposKerningValue=o.getKerningValue)}}};var Fn={parse:function(e,t){const n=new ue.Parser(e,t),o=n.parseUShort();if(0===o)return function(e){const t={};e.skip("uShort");const n=e.parseUShort();G.argument(0===n,"Unsupported kern sub-table version."),e.skip("uShort",2);const o=e.parseUShort();e.skip("uShort",3);for(let n=0;n<o;n+=1){const n=e.parseUShort(),o=e.parseUShort(),s=e.parseShort();t[n+","+o]=s}return t}(n);if(1===o)return function(e){const t={};e.skip("uShort"),e.parseULong()>1&&console.warn("Only the first kern subtable is supported."),e.skip("uLong");const n=255&e.parseUShort();if(e.skip("uShort"),0===n){const n=e.parseUShort();e.skip("uShort",3);for(let o=0;o<n;o+=1){const n=e.parseUShort(),o=e.parseUShort(),s=e.parseShort();t[n+","+o]=s}}return t}(n);throw new Error("Unsupported kern table version ("+o+").")}};var Hn={parse:function(e,t,n,o){const s=new ue.Parser(e,t),r=o?s.parseUShort:s.parseULong,a=[];for(let e=0;e<n+1;e+=1){let e=r.call(s);o&&(e*=2),a.push(e)}return a}};function zn(e,t){require("fs").readFile(e,(function(e,n){if(e)return t(e.message);t(null,Bt(n))}))}function Wn(e,t){const n=new XMLHttpRequest;n.open("get",e,!0),n.responseType="arraybuffer",n.onload=function(){return 200!==n.status?t("Font could not be loaded: "+n.statusText):t(null,n.response)},n.onerror=function(){t("Font could not be loaded")},n.send()}function _n(e,t){const n=[];let o=12;for(let s=0;s<t;s+=1){const t=ue.getTag(e,o),s=ue.getULong(e,o+4),r=ue.getULong(e,o+8),a=ue.getULong(e,o+12);n.push({tag:t,checksum:s,offset:r,length:a,compression:!1}),o+=16}return n}function qn(e,t){if("WOFF"===t.compression){const n=new Uint8Array(e.buffer,t.offset+2,t.compressedLength-2),o=new Uint8Array(t.length);if(D(n,o),o.byteLength!==t.length)throw new Error("Decompression error: "+t.tag+" decompressed length doesn't match recorded length");return{data:new DataView(o.buffer,0),offset:0}}return{data:e,offset:t.offset}}function Xn(e){let t,n;const o=new kn({empty:!0}),s=new DataView(e,0);let r,a=[];const i=ue.getTag(s,0);if(i===String.fromCharCode(0,1,0,0)||"true"===i||"typ1"===i)o.outlinesFormat="truetype",r=ue.getUShort(s,4),a=_n(s,r);else if("OTTO"===i)o.outlinesFormat="cff",r=ue.getUShort(s,4),a=_n(s,r);else{if("wOFF"!==i)throw new Error("Unsupported OpenType signature "+i);{const e=ue.getTag(s,4);if(e===String.fromCharCode(0,1,0,0))o.outlinesFormat="truetype";else{if("OTTO"!==e)throw new Error("Unsupported OpenType flavor "+i);o.outlinesFormat="cff"}r=ue.getUShort(s,12),a=function(e,t){const n=[];let o=44;for(let s=0;s<t;s+=1){const t=ue.getTag(e,o),s=ue.getULong(e,o+4),r=ue.getULong(e,o+8),a=ue.getULong(e,o+12);let i;i=r<a&&"WOFF",n.push({tag:t,offset:s,compression:i,compressedLength:r,length:a}),o+=20}return n}(s,r)}}let l,c,u,p,h,f,d,g,m,y,v;for(let e=0;e<r;e+=1){const r=a[e];let i;switch(r.tag){case"cmap":i=qn(s,r),o.tables.cmap=he.parse(i.data,i.offset),o.encoding=new ve(o.tables.cmap);break;case"cvt ":i=qn(s,r),v=new ue.Parser(i.data,i.offset),o.tables.cvt=v.parseShortList(r.length/2);break;case"fvar":c=r;break;case"fpgm":i=qn(s,r),v=new ue.Parser(i.data,i.offset),o.tables.fpgm=v.parseByteList(r.length);break;case"head":i=qn(s,r),o.tables.head=$e.parse(i.data,i.offset),o.unitsPerEm=o.tables.head.unitsPerEm,t=o.tables.head.indexToLocFormat;break;case"hhea":i=qn(s,r),o.tables.hhea=Ke.parse(i.data,i.offset),o.ascender=o.tables.hhea.ascender,o.descender=o.tables.hhea.descender,o.numberOfHMetrics=o.tables.hhea.numberOfHMetrics;break;case"hmtx":f=r;break;case"ltag":i=qn(s,r),n=et.parse(i.data,i.offset);break;case"maxp":i=qn(s,r),o.tables.maxp=tt.parse(i.data,i.offset),o.numGlyphs=o.tables.maxp.numGlyphs;break;case"name":m=r;break;case"OS/2":i=qn(s,r),o.tables.os2=gt.parse(i.data,i.offset);break;case"post":i=qn(s,r),o.tables.post=mt.parse(i.data,i.offset),o.glyphNames=new Se(o.tables.post);break;case"prep":i=qn(s,r),v=new ue.Parser(i.data,i.offset),o.tables.prep=v.parseByteList(r.length);break;case"glyf":u=r;break;case"loca":g=r;break;case"CFF ":l=r;break;case"kern":d=r;break;case"GPOS":p=r;break;case"GSUB":h=r;break;case"meta":y=r}}const b=qn(s,m);if(o.tables.name=ft.parse(b.data,b.offset,n),o.names=o.tables.name,u&&g){const e=0===t,n=qn(s,g),r=Hn.parse(n.data,n.offset,o.numGlyphs,e),a=qn(s,u);o.glyphs=ke.parse(a.data,a.offset,r,o)}else{if(!l)throw new Error("Font doesn't contain TrueType or CFF outlines.");{const e=qn(s,l);Qe.parse(e.data,e.offset,o)}}const S=qn(s,f);if(Je.parse(S.data,S.offset,o.numberOfHMetrics,o.numGlyphs,o.glyphs),function(e){let t;const n=e.tables.cmap.glyphIndexMap,o=Object.keys(n);for(let s=0;s<o.length;s+=1){const r=o[s],a=n[r];t=e.glyphs.get(a),t.addUnicode(parseInt(r))}for(let n=0;n<e.glyphs.length;n+=1)t=e.glyphs.get(n),e.cffEncoding?e.isCIDFont?t.name="gid"+n:t.name=e.cffEncoding.charset[n]:e.glyphNames.names&&(t.name=e.glyphNames.glyphIndexToName(n))}(o),d){const e=qn(s,d);o.kerningPairs=Fn.parse(e.data,e.offset)}else o.kerningPairs={};if(p){const e=qn(s,p);An.parse(e.data,e.offset,o)}if(h){const e=qn(s,h);o.tables.gsub=St.parse(e.data,e.offset)}if(c){const e=qn(s,c);o.tables.fvar=Mn.parse(e.data,e.offset,o.names)}if(y){const e=qn(s,y);o.tables.meta=xt.parse(e.data,e.offset),o.metas=o.tables.meta}return o}var Vn=Object.freeze({__proto__:null,Font:kn,Glyph:Re,Path:I,BoundingBox:L,_parse:ue,parse:Xn,load:function(e,t){("undefined"==typeof window?zn:Wn)(e,(function(e,n){if(e)return t(e);let o;try{o=Xn(n)}catch(e){return t(e,null)}return t(null,o)}))},loadSync:function(e){return Xn(Bt(require("fs").readFileSync(e)))}});const jn=s.default.join(__dirname,"./fonts/font.ttf"),Yn=Vn.loadSync(jn),Zn={width:150,height:50,noise:4,color:!1,background:"#FFFAE8",size:4,ignoreChars:"",fontSize:40,charPreset:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",font:Yn,ascender:Yn.ascender,descender:Yn.descender,truncateLineProbability:.5,truncateCurveProbability:.5,truncateCurvePositionMin:.4,truncateCurvePositionMax:.6};var Qn={options:Zn,loadFont:e=>{const t=Vn.loadSync(e);Zn.font=t,Zn.ascender=t.ascender,Zn.descender=t.descender}};const $n=Qn.options,Kn=function(e,t){return Math.round(e+Math.random()*(t-e))};const Jn=function(e,t){return{text:(e+t).toString(),equation:e+"+"+t}},eo=function(e,t){return{text:(e-t).toString(),equation:e+"-"+t}};function to(e,t,n){return 6*(n=(n+1)%1)<1?e+(t-e)*n*6:2*n<1?t:3*n<2?e+(t-e)*(2/3-n)*6:e}var no={int:Kn,greyColor:function(e,t){const n=Kn(e=e||1,t=t||9).toString(16);return`#${n}${n}${n}`},captchaText:function(e){"number"==typeof e&&(e={size:e});const t=(e=e||{}).size||4,n=e.ignoreChars||"";let o=-1,s="",r=e.charPreset||$n.charPreset;n&&(r=function(e,t){return e.split("").filter(e=>-1===t.indexOf(e))}(r,n));const a=r.length-1;for(;++o<t;)s+=r[Kn(0,a)];return s},mathExpr:function(e,t,n){const o=Kn(e=e||1,t=t||9),s=Kn(e,t);switch(n){case"+":return Jn(o,s);case"-":return eo(o,s);default:return Kn(1,2)%2?Jn(o,s):eo(o,s)}},color:function(e){const t=Kn(0,24)/24,n=Kn(60,80)/100,o=e?function(e){if("#"!==e[0])return 1;3===(e=e.slice(1)).length&&(e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]);const t=parseInt(e,16),n=t>>16,o=t>>8&255,s=255&t,r=Math.max(n,o,s),a=Math.min(n,o,s);return(r+a)/510}(e):1;let s,r;o>=.5?(s=Math.round(100*o)-45,r=Math.round(100*o)-25):(s=Math.round(100*o)+25,r=Math.round(100*o)+45);const a=Kn(s,r)/100,i=a<.5?a*(a+n):a+n-a*n,l=2*a-i,c=Math.floor(255*to(l,i,t+1/3)),u=Math.floor(255*to(l,i,t));return"#"+(Math.floor(255*to(l,i,t-1/3))|u<<8|c<<16|1<<24).toString(16).slice(1)}};const oo=Qn.options,so=function(e,t){e=e||no.captchaText();const n=(t=Object.assign({},oo,t)).width,o=t.height,s=t.background||t.backgroundColor;s&&(t.color=!0);const r=s?`<rect width="100%" height="100%" fill="${s}"/>`:"",a=[].concat(function(e,t,n){const o=n.color,s=[],r=n.inverse?7:1,a=n.inverse?15:9;let i=-1;for(;++i<n.noise;){const n=`${no.int(1,21)} ${no.int(1,t-1)}`,i=`${no.int(e-21,e-1)} ${no.int(1,t-1)}`,l=`${no.int(e/2-21,e/2+21)} ${no.int(1,t-1)}`,c=`${no.int(e/2-21,e/2+21)} ${no.int(1,t-1)}`,u=o?no.color():no.greyColor(r,a);s.push(`<path d="M${n} C${l},${c},${i}" stroke="${u}" fill="none"/>`)}return s}(n,o,t)).concat(function(e,t,n,o,s){const r=e.length,a=(t-2)/(r+1),i=o.inverse?10:0,c=o.inverse?14:4;let u=-1;const p=[],h=s||o.color?no.color(o.background):no.greyColor(i,c);for(;++u<r;){const t=a*(u+1),s=n/2,r=l(e[u],Object.assign({x:t,y:s},o));p.push(`<path fill="${h}" d="${r}"/>`)}return p}(e,n,o,t)).sort(()=>Math.random()-.5).join("");return`${`<svg xmlns="http://www.w3.org/2000/svg" width="${n}" height="${o}" viewBox="0,0,${n},${o}">`}${r}${a}</svg>`};var ro=so,ao=no.captchaText,io=function(e){const t=e.text||no.captchaText(e);return{text:t,data:so(t,e)}},lo=function(e){const t=no.mathExpr(e.mathMin,e.mathMax,e.mathOperator);return{text:t.text,data:so(t.equation,e)}},co=oo,uo=Qn.loadFont;ro.randomText=ao,ro.create=io,ro.createMathExpr=lo,ro.options=co,ro.loadFont=uo;var po=ro;const ho=Object.prototype.toString;function fo(e){return"[object Object]"===ho.call(e)}function go(){"development"===process.env.NODE_ENV&&console.log(...arguments)}const mo=async function(){};function yo(e){return mo.constructor===e.constructor?async function(){const t=await e.apply(this,arguments);return fo(t)&&(t.msg&&(t.message=t.msg,t.errMsg=t.msg),t.errCode=t.code),t}:function(){const t=e.apply(this,arguments);return fo(t)&&(t.msg&&(t.message=t.msg,t.errMsg=t.msg),t.errCode=t.code),t}}const vo=uniCloud.database().collection("opendb-verify-codes");class bo{async setVerifyCode({deviceId:e,code:t,expiresDate:n,scene:o}){if(!e)return{code:10101,msg:"deviceId不可为空"};if(!t)return{code:10102,msg:"验证码不可为空"};n||(n=180);const s=Date.now(),r={deviceId:e,scene:o,code:t.toLocaleLowerCase(),state:0,ip:__ctx__.CLIENTIP,created_date:s,expired_date:s+1e3*n};return go("addRes",await vo.add(r)),{code:0,deviceId:e}}async verifyCode({deviceId:e,code:t,scene:n}){if(!e)return{code:10101,msg:"deviceId不可为空"};if(!t)return{code:10102,msg:"验证码不可为空"};const o=Date.now(),s={deviceId:e,scene:n,code:t.toLocaleLowerCase(),state:0},r=await vo.where(s).orderBy("created_date","desc").limit(1).get();if(go("verifyRecord:",r),r&&r.data&&r.data.length>0){const e=r.data[0];if(e.expired_date<o)return{code:10103,msg:"验证码已失效"};return go("upRes",await vo.doc(e._id).update({state:1})),{code:0,msg:"验证通过"}}return{code:10104,msg:"验证码错误"}}}let So;try{So=require("uni-config-center")}catch(e){throw new Error("Plugin[uni-config-center] was not found")}class xo extends class{constructor(){this.pluginConfig={},this._initConfig(),this._initScene()}_initConfig(){const e=So({pluginId:"uni-captcha"});if(e&&e.hasFile("config.json"))try{const t=e.config();fo(t)&&(this.pluginConfig=t)}catch(e){throw new Error(this.t("config-file-invalid")+"\n"+e.messages)}}_initScene(){if(fo(this.pluginConfig.scene)){const{scene:e,...t}=this.pluginConfig;Object.keys(e).forEach(n=>{e.scene&&delete e.scene,this.pluginConfig.scene[n]=Object.assign({},t,e[n])})}}}{constructor(){super(),this.DEVICEID2opts={}}mergeConfig(e){const t=fo(this.pluginConfig.scene)?this.pluginConfig.scene[e.scene]:e.scene;return Object.assign({},fo(t)?t:this.pluginConfig,e)}async create(e={}){if(!e.scene)throw new Error("scene验证码场景不可为空");e=this.mergeConfig(e);let{scene:t,expiresDate:n,deviceId:o,...s}=e;if(o=o||__ctx__.DEVICEID,!o)throw new Error("deviceId不可为空");const r=new bo;try{const{text:a,base64:i}=function(e={}){const{uniPlatform:t=""}=e;let n;n=e.mathExpr?po.createMathExpr(e):po.create(e);let o="data:image/svg+xml;utf8,"+n.data.replace(/#/g,"%23");return(!t||"string"==typeof t&&-1===t.indexOf("mp-"))&&(o=o.replace(/"/g,"'").replace(/</g,"%3C").replace(/>/g,"%3E")),{text:n.text,base64:o}}(s),l=await r.setVerifyCode({deviceId:o,code:a,expiresDate:n,scene:t});return l.code>0?{...l,code:10001}:(this.DEVICEID2opts[o]=e,{code:0,msg:"验证码获取成功",captchaBase64:i})}catch(e){return{code:10001,msg:"验证码生成失败："+e.message}}}async verify({deviceId:e,captcha:t,scene:n}){if(!(e=e||__ctx__.DEVICEID))throw new Error("deviceId不可为空");if(!n)throw new Error("scene验证码场景不可为空");const o=new bo;try{const s=await o.verifyCode({deviceId:e,code:t,scene:n});return s.code>0?s:{code:0,msg:"验证码通过"}}catch(e){return{code:10002,msg:"验证码校验失败："+e.message}}}async refresh(e={}){let{scene:t,expiresDate:n,deviceId:o,...s}=e;if(o=o||__ctx__.DEVICEID,!o)throw new Error("deviceId不可为空");if(!t)throw new Error("scene验证码场景不可为空");const r=await vo.where({deviceId:o,scene:t}).orderBy("created_date","desc").limit(1).get();if(r&&r.data&&r.data.length>0){const e=r.data[0];await vo.doc(e._id).update({state:2}),Object.keys(s).length>0&&(this.DEVICEID2opts[o]=Object.assign({},this.DEVICEID2opts[o],s));let a={};try{a=await this.create(Object.assign({},this.DEVICEID2opts[o],{deviceId:o,scene:t,expiresDate:n}))}catch(e){return{code:50403,msg:e.message}}return a.code>0?{...a,code:10003}:{code:0,msg:"验证码刷新成功",captchaBase64:a.captchaBase64}}return{code:10003,msg:`验证码刷新失败：无此设备在 ${t} 场景信息，请重新获取`}}}const Uo=new bo;Object.keys(Uo).forEach(e=>{xo.prototype[e]=yo(Uo[e])});const To=new xo,Eo=new Proxy(To,{get(e,t){if(t in e)return"function"==typeof e[t]?yo(e[t]).bind(Eo):e[t]}});module.exports=Eo;
+"use strict";var e=require("assert"),t=require("path");function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var o=n(e),r=n(t);const s={10001:"uni-captcha-create-fail",10002:"uni-captcha-verify-fail",10003:"uni-captcha-refresh-fail",10101:"uni-captcha-deviceId-empty",10102:"uni-captcha-text-required",10103:"uni-captcha-verify-overdue",10104:"uni-captcha-verify-fail",50403:"uni-captcha-interior-fail"};function a(e){const t=.2*Math.random()-.1;switch(e.type){case"M":case"L":e.x+=t,e.y+=t;break;case"Q":case"C":e.x+=t,e.y+=t,e.x1+=t,e.y1+=t}return e}function i(e,t,n,o,r,s,a){let i,l,c,u,p,h;if(e<=0||e>=1)throw RangeError("spliteCurveAt requires position > 0 && position < 1");return u=[],p=0,i={},l={},c={},i.x=t,i.y=n,l.x=o,l.y=r,c.x=s,c.y=a,h=e,u[p++]=i.x,u[p++]=i.y,u[p++]=i.x+=(l.x-i.x)*h,u[p++]=i.y+=(l.y-i.y)*h,l.x+=(c.x-l.x)*h,l.y+=(c.y-l.y)*h,u[p++]=i.x+(l.x-i.x)*h,u[p++]=i.y+(l.y-i.y)*h,u[p++]=l.x,u[p++]=l.y,u[p++]=c.x,u[p++]=c.y,u}function l(e,t){return Math.random()*(t-e)+e}var c=function(e,t){const n=e[0];o.default(n,"expect a string");const r=t.fontSize,s=r/t.font.unitsPerEm,c=t.font.charToGlyph(n),u=c.advanceWidth?c.advanceWidth*s:0,p=t.x-u/2,h=(t.ascender+t.descender)*s,f=t.y+h/2,d=c.getPath(p,f,r);d.commands.forEach(a),d.commands=function(e,t){const n=[];for(let o=0;o<e.length-1;o++){const r=e[o];if("L"===r.type){const s=e[o+1];if("L"===s.type&&Math.random()>t.truncateLineProbability){const e=l(-.1,.1);n.push(r),n.push({type:"L",x:(r.x+s.x)/2+e,y:(r.y+s.y)/2+e})}else n.push(r)}else if("Q"===r.type&&o>=1){const s=e[o-1];if(("L"===s.type||"M"===s.type)&&Math.random()>t.truncateCurveProbability){const e=s.x,o=s.y,a=l(-.1,.1),c=r.x1+a,u=r.y1+a,p=r.x+a,h=r.y+a,f=i(l(t.truncateCurvePositionMin,t.truncateCurvePositionMax),e,o,c,u,p,h),d={type:"Q",x1:f[2],y1:f[3],x:f[4],y:f[5]},g={type:"L",x:f[4],y:f[5]},m={type:"Q",x1:f[6],y1:f[7],x:f[8],y:f[9]},y={type:"L",x:f[8],y:f[9]};n.push(d),n.push(g),n.push(m),n.push(y)}}else n.push(r)}return n}(d.commands,t);return d.toPathData()};function u(){this.table=new Uint16Array(16),this.trans=new Uint16Array(288)}function p(e,t){this.source=e,this.sourceIndex=0,this.tag=0,this.bitcount=0,this.dest=t,this.destLen=0,this.ltree=new u,this.dtree=new u}var h=new u,f=new u,d=new Uint8Array(30),g=new Uint16Array(30),m=new Uint8Array(30),y=new Uint16Array(30),v=new Uint8Array([16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15]),b=new u,S=new Uint8Array(320);function x(e,t,n,o){var r,s;for(r=0;r<n;++r)e[r]=0;for(r=0;r<30-n;++r)e[r+n]=r/n|0;for(s=o,r=0;r<30;++r)t[r]=s,s+=1<<e[r]}var U=new Uint16Array(16);function T(e,t,n,o){var r,s;for(r=0;r<16;++r)e.table[r]=0;for(r=0;r<o;++r)e.table[t[n+r]]++;for(e.table[0]=0,s=0,r=0;r<16;++r)U[r]=s,s+=e.table[r];for(r=0;r<o;++r)t[n+r]&&(e.trans[U[t[n+r]]++]=r)}function E(e){e.bitcount--||(e.tag=e.source[e.sourceIndex++],e.bitcount=7);var t=1&e.tag;return e.tag>>>=1,t}function O(e,t,n){if(!t)return n;for(;e.bitcount<24;)e.tag|=e.source[e.sourceIndex++]<<e.bitcount,e.bitcount+=8;var o=e.tag&65535>>>16-t;return e.tag>>>=t,e.bitcount-=t,o+n}function w(e,t){for(;e.bitcount<24;)e.tag|=e.source[e.sourceIndex++]<<e.bitcount,e.bitcount+=8;var n=0,o=0,r=0,s=e.tag;do{o=2*o+(1&s),s>>>=1,++r,n+=t.table[r],o-=t.table[r]}while(o>=0);return e.tag=s,e.bitcount-=r,t.trans[n+o]}function k(e,t,n){var o,r,s,a,i,l;for(o=O(e,5,257),r=O(e,5,1),s=O(e,4,4),a=0;a<19;++a)S[a]=0;for(a=0;a<s;++a){var c=O(e,3,0);S[v[a]]=c}for(T(b,S,0,19),i=0;i<o+r;){var u=w(e,b);switch(u){case 16:var p=S[i-1];for(l=O(e,2,3);l;--l)S[i++]=p;break;case 17:for(l=O(e,3,3);l;--l)S[i++]=0;break;case 18:for(l=O(e,7,11);l;--l)S[i++]=0;break;default:S[i++]=u}}T(t,S,0,o),T(n,S,o,r)}function R(e,t,n){for(;;){var o,r,s,a,i=w(e,t);if(256===i)return 0;if(i<256)e.dest[e.destLen++]=i;else for(o=O(e,d[i-=257],g[i]),r=w(e,n),a=s=e.destLen-O(e,m[r],y[r]);a<s+o;++a)e.dest[e.destLen++]=e.dest[a]}}function D(e){for(var t,n;e.bitcount>8;)e.sourceIndex--,e.bitcount-=8;if((t=256*(t=e.source[e.sourceIndex+1])+e.source[e.sourceIndex])!==(65535&~(256*e.source[e.sourceIndex+3]+e.source[e.sourceIndex+2])))return-3;for(e.sourceIndex+=4,n=t;n;--n)e.dest[e.destLen++]=e.source[e.sourceIndex++];return e.bitcount=0,0}!function(e,t){var n;for(n=0;n<7;++n)e.table[n]=0;for(e.table[7]=24,e.table[8]=152,e.table[9]=112,n=0;n<24;++n)e.trans[n]=256+n;for(n=0;n<144;++n)e.trans[24+n]=n;for(n=0;n<8;++n)e.trans[168+n]=280+n;for(n=0;n<112;++n)e.trans[176+n]=144+n;for(n=0;n<5;++n)t.table[n]=0;for(t.table[5]=32,n=0;n<32;++n)t.trans[n]=n}(h,f),x(d,g,4,3),x(m,y,2,1),d[28]=0,g[28]=258;var C=function(e,t){var n,o,r=new p(e,t);do{switch(n=E(r),O(r,2,0)){case 0:o=D(r);break;case 1:o=R(r,h,f);break;case 2:k(r,r.ltree,r.dtree),o=R(r,r.ltree,r.dtree);break;default:o=-3}if(0!==o)throw new Error("Data error")}while(!n);return r.destLen<r.dest.length?"function"==typeof r.dest.slice?r.dest.slice(0,r.destLen):r.dest.subarray(0,r.destLen):r.dest};function L(e,t,n,o,r){return Math.pow(1-r,3)*e+3*Math.pow(1-r,2)*r*t+3*(1-r)*Math.pow(r,2)*n+Math.pow(r,3)*o}function I(){this.x1=Number.NaN,this.y1=Number.NaN,this.x2=Number.NaN,this.y2=Number.NaN}function M(){this.commands=[],this.fill="black",this.stroke=null,this.strokeWidth=1}function B(e){throw new Error(e)}function G(e,t){e||B(t)}I.prototype.isEmpty=function(){return isNaN(this.x1)||isNaN(this.y1)||isNaN(this.x2)||isNaN(this.y2)},I.prototype.addPoint=function(e,t){"number"==typeof e&&((isNaN(this.x1)||isNaN(this.x2))&&(this.x1=e,this.x2=e),e<this.x1&&(this.x1=e),e>this.x2&&(this.x2=e)),"number"==typeof t&&((isNaN(this.y1)||isNaN(this.y2))&&(this.y1=t,this.y2=t),t<this.y1&&(this.y1=t),t>this.y2&&(this.y2=t))},I.prototype.addX=function(e){this.addPoint(e,null)},I.prototype.addY=function(e){this.addPoint(null,e)},I.prototype.addBezier=function(e,t,n,o,r,s,a,i){const l=[e,t],c=[n,o],u=[r,s],p=[a,i];this.addPoint(e,t),this.addPoint(a,i);for(let e=0;e<=1;e++){const t=6*l[e]-12*c[e]+6*u[e],n=-3*l[e]+9*c[e]-9*u[e]+3*p[e],o=3*c[e]-3*l[e];if(0===n){if(0===t)continue;const n=-o/t;0<n&&n<1&&(0===e&&this.addX(L(l[e],c[e],u[e],p[e],n)),1===e&&this.addY(L(l[e],c[e],u[e],p[e],n)));continue}const r=Math.pow(t,2)-4*o*n;if(r<0)continue;const s=(-t+Math.sqrt(r))/(2*n);0<s&&s<1&&(0===e&&this.addX(L(l[e],c[e],u[e],p[e],s)),1===e&&this.addY(L(l[e],c[e],u[e],p[e],s)));const a=(-t-Math.sqrt(r))/(2*n);0<a&&a<1&&(0===e&&this.addX(L(l[e],c[e],u[e],p[e],a)),1===e&&this.addY(L(l[e],c[e],u[e],p[e],a)))}},I.prototype.addQuad=function(e,t,n,o,r,s){const a=e+2/3*(n-e),i=t+2/3*(o-t),l=a+1/3*(r-e),c=i+1/3*(s-t);this.addBezier(e,t,a,i,l,c,r,s)},M.prototype.moveTo=function(e,t){this.commands.push({type:"M",x:e,y:t})},M.prototype.lineTo=function(e,t){this.commands.push({type:"L",x:e,y:t})},M.prototype.curveTo=M.prototype.bezierCurveTo=function(e,t,n,o,r,s){this.commands.push({type:"C",x1:e,y1:t,x2:n,y2:o,x:r,y:s})},M.prototype.quadTo=M.prototype.quadraticCurveTo=function(e,t,n,o){this.commands.push({type:"Q",x1:e,y1:t,x:n,y:o})},M.prototype.close=M.prototype.closePath=function(){this.commands.push({type:"Z"})},M.prototype.extend=function(e){if(e.commands)e=e.commands;else if(e instanceof I){const t=e;return this.moveTo(t.x1,t.y1),this.lineTo(t.x2,t.y1),this.lineTo(t.x2,t.y2),this.lineTo(t.x1,t.y2),void this.close()}Array.prototype.push.apply(this.commands,e)},M.prototype.getBoundingBox=function(){const e=new I;let t=0,n=0,o=0,r=0;for(let s=0;s<this.commands.length;s++){const a=this.commands[s];switch(a.type){case"M":e.addPoint(a.x,a.y),t=o=a.x,n=r=a.y;break;case"L":e.addPoint(a.x,a.y),o=a.x,r=a.y;break;case"Q":e.addQuad(o,r,a.x1,a.y1,a.x,a.y),o=a.x,r=a.y;break;case"C":e.addBezier(o,r,a.x1,a.y1,a.x2,a.y2,a.x,a.y),o=a.x,r=a.y;break;case"Z":o=t,r=n;break;default:throw new Error("Unexpected path command "+a.type)}}return e.isEmpty()&&e.addPoint(0,0),e},M.prototype.draw=function(e){e.beginPath();for(let t=0;t<this.commands.length;t+=1){const n=this.commands[t];"M"===n.type?e.moveTo(n.x,n.y):"L"===n.type?e.lineTo(n.x,n.y):"C"===n.type?e.bezierCurveTo(n.x1,n.y1,n.x2,n.y2,n.x,n.y):"Q"===n.type?e.quadraticCurveTo(n.x1,n.y1,n.x,n.y):"Z"===n.type&&e.closePath()}this.fill&&(e.fillStyle=this.fill,e.fill()),this.stroke&&(e.strokeStyle=this.stroke,e.lineWidth=this.strokeWidth,e.stroke())},M.prototype.toPathData=function(e){function t(t){return Math.round(t)===t?""+Math.round(t):t.toFixed(e)}function n(){let e="";for(let n=0;n<arguments.length;n+=1){const o=arguments[n];o>=0&&n>0&&(e+=" "),e+=t(o)}return e}e=void 0!==e?e:2;let o="";for(let e=0;e<this.commands.length;e+=1){const t=this.commands[e];"M"===t.type?o+="M"+n(t.x,t.y):"L"===t.type?o+="L"+n(t.x,t.y):"C"===t.type?o+="C"+n(t.x1,t.y1,t.x2,t.y2,t.x,t.y):"Q"===t.type?o+="Q"+n(t.x1,t.y1,t.x,t.y):"Z"===t.type&&(o+="Z")}return o},M.prototype.toSVG=function(e){let t='<path d="';return t+=this.toPathData(e),t+='"',this.fill&&"black"!==this.fill&&(null===this.fill?t+=' fill="none"':t+=' fill="'+this.fill+'"'),this.stroke&&(t+=' stroke="'+this.stroke+'" stroke-width="'+this.strokeWidth+'"'),t+="/>",t},M.prototype.toDOMElement=function(e){const t=this.toPathData(e),n=document.createElementNS("http://www.w3.org/2000/svg","path");return n.setAttribute("d",t),n};var N={fail:B,argument:G,assert:G};const P={},A={},F={};function H(e){return function(){return e}}A.BYTE=function(e){return N.argument(e>=0&&e<=255,"Byte value should be between 0 and 255."),[e]},F.BYTE=H(1),A.CHAR=function(e){return[e.charCodeAt(0)]},F.CHAR=H(1),A.CHARARRAY=function(e){const t=[];for(let n=0;n<e.length;n+=1)t[n]=e.charCodeAt(n);return t},F.CHARARRAY=function(e){return e.length},A.USHORT=function(e){return[e>>8&255,255&e]},F.USHORT=H(2),A.SHORT=function(e){return e>=32768&&(e=-(65536-e)),[e>>8&255,255&e]},F.SHORT=H(2),A.UINT24=function(e){return[e>>16&255,e>>8&255,255&e]},F.UINT24=H(3),A.ULONG=function(e){return[e>>24&255,e>>16&255,e>>8&255,255&e]},F.ULONG=H(4),A.LONG=function(e){return e>=2147483648&&(e=-(4294967296-e)),[e>>24&255,e>>16&255,e>>8&255,255&e]},F.LONG=H(4),A.FIXED=A.ULONG,F.FIXED=F.ULONG,A.FWORD=A.SHORT,F.FWORD=F.SHORT,A.UFWORD=A.USHORT,F.UFWORD=F.USHORT,A.LONGDATETIME=function(e){return[0,0,0,0,e>>24&255,e>>16&255,e>>8&255,255&e]},F.LONGDATETIME=H(8),A.TAG=function(e){return N.argument(4===e.length,"Tag should be exactly 4 ASCII characters."),[e.charCodeAt(0),e.charCodeAt(1),e.charCodeAt(2),e.charCodeAt(3)]},F.TAG=H(4),A.Card8=A.BYTE,F.Card8=F.BYTE,A.Card16=A.USHORT,F.Card16=F.USHORT,A.OffSize=A.BYTE,F.OffSize=F.BYTE,A.SID=A.USHORT,F.SID=F.USHORT,A.NUMBER=function(e){return e>=-107&&e<=107?[e+139]:e>=108&&e<=1131?[247+((e-=108)>>8),255&e]:e>=-1131&&e<=-108?[251+((e=-e-108)>>8),255&e]:e>=-32768&&e<=32767?A.NUMBER16(e):A.NUMBER32(e)},F.NUMBER=function(e){return A.NUMBER(e).length},A.NUMBER16=function(e){return[28,e>>8&255,255&e]},F.NUMBER16=H(3),A.NUMBER32=function(e){return[29,e>>24&255,e>>16&255,e>>8&255,255&e]},F.NUMBER32=H(5),A.REAL=function(e){let t=e.toString();const n=/\.(\d*?)(?:9{5,20}|0{5,20})\d{0,2}(?:e(.+)|$)/.exec(t);if(n){const o=parseFloat("1e"+((n[2]?+n[2]:0)+n[1].length));t=(Math.round(e*o)/o).toString()}let o="";for(let e=0,n=t.length;e<n;e+=1){const n=t[e];o+="e"===n?"-"===t[++e]?"c":"b":"."===n?"a":"-"===n?"e":n}o+=1&o.length?"f":"ff";const r=[30];for(let e=0,t=o.length;e<t;e+=2)r.push(parseInt(o.substr(e,2),16));return r},F.REAL=function(e){return A.REAL(e).length},A.NAME=A.CHARARRAY,F.NAME=F.CHARARRAY,A.STRING=A.CHARARRAY,F.STRING=F.CHARARRAY,P.UTF8=function(e,t,n){const o=[],r=n;for(let n=0;n<r;n++,t+=1)o[n]=e.getUint8(t);return String.fromCharCode.apply(null,o)},P.UTF16=function(e,t,n){const o=[],r=n/2;for(let n=0;n<r;n++,t+=2)o[n]=e.getUint16(t);return String.fromCharCode.apply(null,o)},A.UTF16=function(e){const t=[];for(let n=0;n<e.length;n+=1){const o=e.charCodeAt(n);t[t.length]=o>>8&255,t[t.length]=255&o}return t},F.UTF16=function(e){return 2*e.length};const z={"x-mac-croatian":"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®Š™´¨≠ŽØ∞±≤≥∆µ∂∑∏š∫ªºΩžø¿¡¬√ƒ≈Ć«Č… ÀÃÕŒœĐ—“”‘’÷◊©⁄€‹›Æ»–·‚„‰ÂćÁčÈÍÎÏÌÓÔđÒÚÛÙıˆ˜¯πË˚¸Êæˇ","x-mac-cyrillic":"АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ†°Ґ£§•¶І®©™Ђђ≠Ѓѓ∞±≤≥іµґЈЄєЇїЉљЊњјЅ¬√ƒ≈∆«»… ЋћЌќѕ–—“”‘’÷„ЎўЏџ№Ёёяабвгдежзийклмнопрстуфхцчшщъыьэю","x-mac-gaelic":"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØḂ±≤≥ḃĊċḊḋḞḟĠġṀæøṁṖṗɼƒſṠ«»… ÀÃÕŒœ–—“”‘’ṡẛÿŸṪ€‹›Ŷŷṫ·Ỳỳ⁊ÂÊÁËÈÍÎÏÌÓÔ♣ÒÚÛÙıÝýŴŵẄẅẀẁẂẃ","x-mac-greek":"Ĺ²É³ÖÜ΅àâä΄¨çéèê룙î‰ôö¦€ùûü†ΓΔΘΛΞΠß®©ΣΪ§≠°·Α±≤≥¥ΒΕΖΗΙΚΜΦΫΨΩάΝ¬ΟΡ≈Τ«»… ΥΧΆΈœ–―“”‘’÷ΉΊΌΎέήίόΏύαβψδεφγηιξκλμνοπώρστθωςχυζϊϋΐΰ­","x-mac-icelandic":"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûüÝ°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄€ÐðÞþý·‚„‰ÂÊÁËÈÍÎÏÌÓÔÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ","x-mac-inuit":"ᐃᐄᐅᐆᐊᐋᐱᐲᐳᐴᐸᐹᑉᑎᑏᑐᑑᑕᑖᑦᑭᑮᑯᑰᑲᑳᒃᒋᒌᒍᒎᒐᒑ°ᒡᒥᒦ•¶ᒧ®©™ᒨᒪᒫᒻᓂᓃᓄᓅᓇᓈᓐᓯᓰᓱᓲᓴᓵᔅᓕᓖᓗᓘᓚᓛᓪᔨᔩᔪᔫᔭ… ᔮᔾᕕᕖᕗ–—“”‘’ᕘᕙᕚᕝᕆᕇᕈᕉᕋᕌᕐᕿᖀᖁᖂᖃᖄᖅᖏᖐᖑᖒᖓᖔᖕᙱᙲᙳᙴᙵᙶᖖᖠᖡᖢᖣᖤᖥᖦᕼŁł","x-mac-ce":"ÄĀāÉĄÖÜáąČäčĆć鏟ĎíďĒēĖóėôöõúĚěü†°Ę£§•¶ß®©™ę¨≠ģĮįĪ≤≥īĶ∂∑łĻļĽľĹĺŅņѬ√ńŇ∆«»… ňŐÕőŌ–—“”‘’÷◊ōŔŕŘ‹›řŖŗŠ‚„šŚśÁŤťÍŽžŪÓÔūŮÚůŰűŲųÝýķŻŁżĢˇ",macintosh:"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄€‹›fifl‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ","x-mac-romanian":"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ĂȘ∞±≤≥¥µ∂∑∏π∫ªºΩăș¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄€‹›Țț‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ","x-mac-turkish":"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸĞğİıŞş‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔÒÚÛÙˆ˜¯˘˙˚¸˝˛ˇ"};P.MACSTRING=function(e,t,n,o){const r=z[o];if(void 0===r)return;let s="";for(let o=0;o<n;o++){const n=e.getUint8(t+o);s+=n<=127?String.fromCharCode(n):r[127&n]}return s};const W="function"==typeof WeakMap&&new WeakMap;let _;function q(e){return e>=-128&&e<=127}function X(e,t,n){let o=0;const r=e.length;for(;t<r&&o<64&&0===e[t];)++t,++o;return n.push(128|o-1),t}function V(e,t,n){let o=0;const r=e.length;let s=t;for(;s<r&&o<64;){const t=e[s];if(!q(t))break;if(0===t&&s+1<r&&0===e[s+1])break;++s,++o}n.push(o-1);for(let o=t;o<s;++o)n.push(e[o]+256&255);return s}function j(e,t,n){let o=0;const r=e.length;let s=t;for(;s<r&&o<64;){const t=e[s];if(0===t)break;if(q(t)&&s+1<r&&q(e[s+1]))break;++s,++o}n.push(64|o-1);for(let o=t;o<s;++o){const t=e[o];n.push(t+65536>>8&255,t+256&255)}return s}A.MACSTRING=function(e,t){const n=function(e){if(!_){_={};for(let e in z)_[e]=new String(e)}const t=_[e];if(void 0===t)return;if(W){const e=W.get(t);if(void 0!==e)return e}const n=z[e];if(void 0===n)return;const o={};for(let e=0;e<n.length;e++)o[n.charCodeAt(e)]=e+128;return W&&W.set(t,o),o}(t);if(void 0===n)return;const o=[];for(let t=0;t<e.length;t++){let r=e.charCodeAt(t);if(r>=128&&(r=n[r],void 0===r))return;o[t]=r}return o},F.MACSTRING=function(e,t){const n=A.MACSTRING(e,t);return void 0!==n?n.length:0},A.VARDELTAS=function(e){let t=0;const n=[];for(;t<e.length;){const o=e[t];t=0===o?X(e,t,n):o>=-128&&o<=127?V(e,t,n):j(e,t,n)}return n},A.INDEX=function(e){let t=1;const n=[t],o=[];for(let r=0;r<e.length;r+=1){const s=A.OBJECT(e[r]);Array.prototype.push.apply(o,s),t+=s.length,n.push(t)}if(0===o.length)return[0,0];const r=[],s=1+Math.floor(Math.log(t)/Math.log(2))/8|0,a=[void 0,A.BYTE,A.USHORT,A.UINT24,A.ULONG][s];for(let e=0;e<n.length;e+=1){const t=a(n[e]);Array.prototype.push.apply(r,t)}return Array.prototype.concat(A.Card16(e.length),A.OffSize(s),r,o)},F.INDEX=function(e){return A.INDEX(e).length},A.DICT=function(e){let t=[];const n=Object.keys(e),o=n.length;for(let r=0;r<o;r+=1){const o=parseInt(n[r],0),s=e[o];t=t.concat(A.OPERAND(s.value,s.type)),t=t.concat(A.OPERATOR(o))}return t},F.DICT=function(e){return A.DICT(e).length},A.OPERATOR=function(e){return e<1200?[e]:[12,e-1200]},A.OPERAND=function(e,t){let n=[];if(Array.isArray(t))for(let o=0;o<t.length;o+=1)N.argument(e.length===t.length,"Not enough arguments given for type"+t),n=n.concat(A.OPERAND(e[o],t[o]));else if("SID"===t)n=n.concat(A.NUMBER(e));else if("offset"===t)n=n.concat(A.NUMBER32(e));else if("number"===t)n=n.concat(A.NUMBER(e));else{if("real"!==t)throw new Error("Unknown operand type "+t);n=n.concat(A.REAL(e))}return n},A.OP=A.BYTE,F.OP=F.BYTE;const Y="function"==typeof WeakMap&&new WeakMap;function Z(e,t,n){for(let e=0;e<t.length;e+=1){const n=t[e];this[n.name]=n.value}if(this.tableName=e,this.fields=t,n){const e=Object.keys(n);for(let t=0;t<e.length;t+=1){const o=e[t],r=n[o];void 0!==this[o]&&(this[o]=r)}}}function Q(e,t,n){void 0===n&&(n=t.length);const o=new Array(t.length+1);o[0]={name:e+"Count",type:"USHORT",value:n};for(let n=0;n<t.length;n++)o[n+1]={name:e+n,type:"USHORT",value:t[n]};return o}function $(e,t,n){const o=t.length,r=new Array(o+1);r[0]={name:e+"Count",type:"USHORT",value:o};for(let s=0;s<o;s++)r[s+1]={name:e+s,type:"TABLE",value:n(t[s],s)};return r}function K(e,t,n){const o=t.length;let r=[];r[0]={name:e+"Count",type:"USHORT",value:o};for(let e=0;e<o;e++)r=r.concat(n(t[e],e));return r}function J(e){1===e.format?Z.call(this,"coverageTable",[{name:"coverageFormat",type:"USHORT",value:1}].concat(Q("glyph",e.glyphs))):N.assert(!1,"Can't create coverage table format 2 yet.")}function ee(e){Z.call(this,"scriptListTable",K("scriptRecord",e,(function(e,t){const n=e.script;let o=n.defaultLangSys;return N.assert(!!o,"Unable to write GSUB: script "+e.tag+" has no default language system."),[{name:"scriptTag"+t,type:"TAG",value:e.tag},{name:"script"+t,type:"TABLE",value:new Z("scriptTable",[{name:"defaultLangSys",type:"TABLE",value:new Z("defaultLangSys",[{name:"lookupOrder",type:"USHORT",value:0},{name:"reqFeatureIndex",type:"USHORT",value:o.reqFeatureIndex}].concat(Q("featureIndex",o.featureIndexes)))}].concat(K("langSys",n.langSysRecords,(function(e,t){const n=e.langSys;return[{name:"langSysTag"+t,type:"TAG",value:e.tag},{name:"langSys"+t,type:"TABLE",value:new Z("langSys",[{name:"lookupOrder",type:"USHORT",value:0},{name:"reqFeatureIndex",type:"USHORT",value:n.reqFeatureIndex}].concat(Q("featureIndex",n.featureIndexes)))}]}))))}]})))}function te(e){Z.call(this,"featureListTable",K("featureRecord",e,(function(e,t){const n=e.feature;return[{name:"featureTag"+t,type:"TAG",value:e.tag},{name:"feature"+t,type:"TABLE",value:new Z("featureTable",[{name:"featureParams",type:"USHORT",value:n.featureParams}].concat(Q("lookupListIndex",n.lookupListIndexes)))}]})))}function ne(e,t){Z.call(this,"lookupListTable",$("lookup",e,(function(e){let n=t[e.lookupType];return N.assert(!!n,"Unable to write GSUB lookup type "+e.lookupType+" tables."),new Z("lookupTable",[{name:"lookupType",type:"USHORT",value:e.lookupType},{name:"lookupFlag",type:"USHORT",value:e.lookupFlag}].concat($("subtable",e.subtables,n)))})))}A.CHARSTRING=function(e){if(Y){const t=Y.get(e);if(void 0!==t)return t}let t=[];const n=e.length;for(let o=0;o<n;o+=1){const n=e[o];t=t.concat(A[n.type](n.value))}return Y&&Y.set(e,t),t},F.CHARSTRING=function(e){return A.CHARSTRING(e).length},A.OBJECT=function(e){const t=A[e.type];return N.argument(void 0!==t,"No encoding function for type "+e.type),t(e.value)},F.OBJECT=function(e){const t=F[e.type];return N.argument(void 0!==t,"No sizeOf function for type "+e.type),t(e.value)},A.TABLE=function(e){let t=[];const n=e.fields.length,o=[],r=[];for(let s=0;s<n;s+=1){const n=e.fields[s],a=A[n.type];N.argument(void 0!==a,"No encoding function for field type "+n.type+" ("+n.name+")");let i=e[n.name];void 0===i&&(i=n.value);const l=a(i);"TABLE"===n.type?(r.push(t.length),t=t.concat([0,0]),o.push(l)):t=t.concat(l)}for(let n=0;n<o.length;n+=1){const s=r[n],a=t.length;N.argument(a<65536,"Table "+e.tableName+" too big."),t[s]=a>>8,t[s+1]=255&a,t=t.concat(o[n])}return t},F.TABLE=function(e){let t=0;const n=e.fields.length;for(let o=0;o<n;o+=1){const n=e.fields[o],r=F[n.type];N.argument(void 0!==r,"No sizeOf function for field type "+n.type+" ("+n.name+")");let s=e[n.name];void 0===s&&(s=n.value),t+=r(s),"TABLE"===n.type&&(t+=2)}return t},A.RECORD=A.TABLE,F.RECORD=F.TABLE,A.LITERAL=function(e){return e},F.LITERAL=function(e){return e.length},Z.prototype.encode=function(){return A.TABLE(this)},Z.prototype.sizeOf=function(){return F.TABLE(this)},J.prototype=Object.create(Z.prototype),J.prototype.constructor=J,ee.prototype=Object.create(Z.prototype),ee.prototype.constructor=ee,te.prototype=Object.create(Z.prototype),te.prototype.constructor=te,ne.prototype=Object.create(Z.prototype),ne.prototype.constructor=ne;var oe={Table:Z,Record:Z,Coverage:J,ScriptList:ee,FeatureList:te,LookupList:ne,ushortList:Q,tableList:$,recordList:K};function re(e,t){return e.getUint8(t)}function se(e,t){return e.getUint16(t,!1)}function ae(e,t){return e.getUint32(t,!1)}function ie(e,t){return e.getInt16(t,!1)+e.getUint16(t+2,!1)/65535}const le={byte:1,uShort:2,short:2,uLong:4,fixed:4,longDateTime:8,tag:4};function ce(e,t){this.data=e,this.offset=t,this.relativeOffset=0}ce.prototype.parseByte=function(){const e=this.data.getUint8(this.offset+this.relativeOffset);return this.relativeOffset+=1,e},ce.prototype.parseChar=function(){const e=this.data.getInt8(this.offset+this.relativeOffset);return this.relativeOffset+=1,e},ce.prototype.parseCard8=ce.prototype.parseByte,ce.prototype.parseUShort=function(){const e=this.data.getUint16(this.offset+this.relativeOffset);return this.relativeOffset+=2,e},ce.prototype.parseCard16=ce.prototype.parseUShort,ce.prototype.parseSID=ce.prototype.parseUShort,ce.prototype.parseOffset16=ce.prototype.parseUShort,ce.prototype.parseShort=function(){const e=this.data.getInt16(this.offset+this.relativeOffset);return this.relativeOffset+=2,e},ce.prototype.parseF2Dot14=function(){const e=this.data.getInt16(this.offset+this.relativeOffset)/16384;return this.relativeOffset+=2,e},ce.prototype.parseULong=function(){const e=ae(this.data,this.offset+this.relativeOffset);return this.relativeOffset+=4,e},ce.prototype.parseFixed=function(){const e=ie(this.data,this.offset+this.relativeOffset);return this.relativeOffset+=4,e},ce.prototype.parseString=function(e){const t=this.data,n=this.offset+this.relativeOffset;let o="";this.relativeOffset+=e;for(let r=0;r<e;r++)o+=String.fromCharCode(t.getUint8(n+r));return o},ce.prototype.parseTag=function(){return this.parseString(4)},ce.prototype.parseLongDateTime=function(){let e=ae(this.data,this.offset+this.relativeOffset+4);return e-=2082844800,this.relativeOffset+=8,e},ce.prototype.parseVersion=function(){const e=se(this.data,this.offset+this.relativeOffset),t=se(this.data,this.offset+this.relativeOffset+2);return this.relativeOffset+=4,e+t/4096/10},ce.prototype.skip=function(e,t){void 0===t&&(t=1),this.relativeOffset+=le[e]*t},ce.prototype.parseOffset16List=ce.prototype.parseUShortList=function(e){void 0===e&&(e=this.parseUShort());const t=new Array(e),n=this.data;let o=this.offset+this.relativeOffset;for(let r=0;r<e;r++)t[r]=n.getUint16(o),o+=2;return this.relativeOffset+=2*e,t},ce.prototype.parseShortList=function(e){const t=new Array(e),n=this.data;let o=this.offset+this.relativeOffset;for(let r=0;r<e;r++)t[r]=n.getInt16(o),o+=2;return this.relativeOffset+=2*e,t},ce.prototype.parseByteList=function(e){const t=new Array(e),n=this.data;let o=this.offset+this.relativeOffset;for(let r=0;r<e;r++)t[r]=n.getUint8(o++);return this.relativeOffset+=e,t},ce.prototype.parseList=function(e,t){t||(t=e,e=this.parseUShort());const n=new Array(e);for(let o=0;o<e;o++)n[o]=t.call(this);return n},ce.prototype.parseRecordList=function(e,t){t||(t=e,e=this.parseUShort());const n=new Array(e),o=Object.keys(t);for(let r=0;r<e;r++){const e={};for(let n=0;n<o.length;n++){const r=o[n],s=t[r];e[r]=s.call(this)}n[r]=e}return n},ce.prototype.parseStruct=function(e){if("function"==typeof e)return e.call(this);{const t=Object.keys(e),n={};for(let o=0;o<t.length;o++){const r=t[o],s=e[r];n[r]=s.call(this)}return n}},ce.prototype.parsePointer=function(e){const t=this.parseOffset16();if(t>0)return new ce(this.data,this.offset+t).parseStruct(e)},ce.prototype.parseListOfLists=function(e){const t=this.parseOffset16List(),n=t.length,o=this.relativeOffset,r=new Array(n);for(let o=0;o<n;o++){const n=t[o];if(0!==n)if(this.relativeOffset=n,e){const t=this.parseOffset16List(),s=new Array(t.length);for(let o=0;o<t.length;o++)this.relativeOffset=n+t[o],s[o]=e.call(this);r[o]=s}else r[o]=this.parseUShortList();else r[o]=void 0}return this.relativeOffset=o,r},ce.prototype.parseCoverage=function(){const e=this.offset+this.relativeOffset,t=this.parseUShort(),n=this.parseUShort();if(1===t)return{format:1,glyphs:this.parseUShortList(n)};if(2===t){const e=new Array(n);for(let t=0;t<n;t++)e[t]={start:this.parseUShort(),end:this.parseUShort(),index:this.parseUShort()};return{format:2,ranges:e}}throw new Error("0x"+e.toString(16)+": Coverage format must be 1 or 2.")},ce.prototype.parseClassDef=function(){const e=this.offset+this.relativeOffset,t=this.parseUShort();if(1===t)return{format:1,startGlyph:this.parseUShort(),classes:this.parseUShortList()};if(2===t)return{format:2,ranges:this.parseRecordList({start:ce.uShort,end:ce.uShort,classId:ce.uShort})};throw new Error("0x"+e.toString(16)+": ClassDef format must be 1 or 2.")},ce.list=function(e,t){return function(){return this.parseList(e,t)}},ce.recordList=function(e,t){return function(){return this.parseRecordList(e,t)}},ce.pointer=function(e){return function(){return this.parsePointer(e)}},ce.tag=ce.prototype.parseTag,ce.byte=ce.prototype.parseByte,ce.uShort=ce.offset16=ce.prototype.parseUShort,ce.uShortList=ce.prototype.parseUShortList,ce.struct=ce.prototype.parseStruct,ce.coverage=ce.prototype.parseCoverage,ce.classDef=ce.prototype.parseClassDef;const ue={reserved:ce.uShort,reqFeatureIndex:ce.uShort,featureIndexes:ce.uShortList};ce.prototype.parseScriptList=function(){return this.parsePointer(ce.recordList({tag:ce.tag,script:ce.pointer({defaultLangSys:ce.pointer(ue),langSysRecords:ce.recordList({tag:ce.tag,langSys:ce.pointer(ue)})})}))},ce.prototype.parseFeatureList=function(){return this.parsePointer(ce.recordList({tag:ce.tag,feature:ce.pointer({featureParams:ce.offset16,lookupListIndexes:ce.uShortList})}))},ce.prototype.parseLookupList=function(e){return this.parsePointer(ce.list(ce.pointer((function(){const t=this.parseUShort();N.argument(1<=t&&t<=8,"GSUB lookup type "+t+" unknown.");const n=this.parseUShort(),o=16&n;return{lookupType:t,lookupFlag:n,subtables:this.parseList(ce.pointer(e[t])),markFilteringSet:o?this.parseUShort():void 0}}))))};var pe={getByte:re,getCard8:re,getUShort:se,getCard16:se,getShort:function(e,t){return e.getInt16(t,!1)},getULong:ae,getFixed:ie,getTag:function(e,t){let n="";for(let o=t;o<t+4;o+=1)n+=String.fromCharCode(e.getInt8(o));return n},getOffset:function(e,t,n){let o=0;for(let r=0;r<n;r+=1)o<<=8,o+=e.getUint8(t+r);return o},getBytes:function(e,t,n){const o=[];for(let r=t;r<n;r+=1)o.push(e.getUint8(r));return o},bytesToString:function(e){let t="";for(let n=0;n<e.length;n+=1)t+=String.fromCharCode(e[n]);return t},Parser:ce};function he(e,t,n){e.segments.push({end:t,start:t,delta:-(t-n),offset:0})}var fe={parse:function(e,t){const n={};n.version=pe.getUShort(e,t),N.argument(0===n.version,"cmap table version should be 0."),n.numTables=pe.getUShort(e,t+2);let o=-1;for(let r=n.numTables-1;r>=0;r-=1){const n=pe.getUShort(e,t+4+8*r),s=pe.getUShort(e,t+4+8*r+2);if(3===n&&(0===s||1===s||10===s)){o=pe.getULong(e,t+4+8*r+4);break}}if(-1===o)throw new Error("No valid cmap sub-tables found.");const r=new pe.Parser(e,t+o);if(n.format=r.parseUShort(),12===n.format)!function(e,t){let n;t.parseUShort(),e.length=t.parseULong(),e.language=t.parseULong(),e.groupCount=n=t.parseULong(),e.glyphIndexMap={};for(let o=0;o<n;o+=1){const n=t.parseULong(),o=t.parseULong();let r=t.parseULong();for(let t=n;t<=o;t+=1)e.glyphIndexMap[t]=r,r++}}(n,r);else{if(4!==n.format)throw new Error("Only format 4 and 12 cmap tables are supported (found format "+n.format+").");!function(e,t,n,o,r){let s;e.length=t.parseUShort(),e.language=t.parseUShort(),e.segCount=s=t.parseUShort()>>1,t.skip("uShort",3),e.glyphIndexMap={};const a=new pe.Parser(n,o+r+14),i=new pe.Parser(n,o+r+16+2*s),l=new pe.Parser(n,o+r+16+4*s),c=new pe.Parser(n,o+r+16+6*s);let u=o+r+16+8*s;for(let t=0;t<s-1;t+=1){let t;const o=a.parseUShort(),r=i.parseUShort(),s=l.parseShort(),p=c.parseUShort();for(let a=r;a<=o;a+=1)0!==p?(u=c.offset+c.relativeOffset-2,u+=p,u+=2*(a-r),t=pe.getUShort(n,u),0!==t&&(t=t+s&65535)):t=a+s&65535,e.glyphIndexMap[a]=t}}(n,r,e,t,o)}return n},make:function(e){const t=new oe.Table("cmap",[{name:"version",type:"USHORT",value:0},{name:"numTables",type:"USHORT",value:1},{name:"platformID",type:"USHORT",value:3},{name:"encodingID",type:"USHORT",value:1},{name:"offset",type:"ULONG",value:12},{name:"format",type:"USHORT",value:4},{name:"length",type:"USHORT",value:0},{name:"language",type:"USHORT",value:0},{name:"segCountX2",type:"USHORT",value:0},{name:"searchRange",type:"USHORT",value:0},{name:"entrySelector",type:"USHORT",value:0},{name:"rangeShift",type:"USHORT",value:0}]);t.segments=[];for(let n=0;n<e.length;n+=1){const o=e.get(n);for(let e=0;e<o.unicodes.length;e+=1)he(t,o.unicodes[e],n);t.segments=t.segments.sort((function(e,t){return e.start-t.start}))}let n;!function(e){e.segments.push({end:65535,start:65535,delta:1,offset:0})}(t),n=t.segments.length,t.segCountX2=2*n,t.searchRange=2*Math.pow(2,Math.floor(Math.log(n)/Math.log(2))),t.entrySelector=Math.log(t.searchRange/2)/Math.log(2),t.rangeShift=t.segCountX2-t.searchRange;let o=[],r=[],s=[],a=[],i=[];for(let e=0;e<n;e+=1){const n=t.segments[e];o=o.concat({name:"end_"+e,type:"USHORT",value:n.end}),r=r.concat({name:"start_"+e,type:"USHORT",value:n.start}),s=s.concat({name:"idDelta_"+e,type:"SHORT",value:n.delta}),a=a.concat({name:"idRangeOffset_"+e,type:"USHORT",value:n.offset}),void 0!==n.glyphId&&(i=i.concat({name:"glyph_"+e,type:"USHORT",value:n.glyphId}))}return t.fields=t.fields.concat(o),t.fields.push({name:"reservedPad",type:"USHORT",value:0}),t.fields=t.fields.concat(r),t.fields=t.fields.concat(s),t.fields=t.fields.concat(a),t.fields=t.fields.concat(i),t.length=14+2*o.length+2+2*r.length+2*s.length+2*a.length+2*i.length,t}};const de=[".notdef","space","exclam","quotedbl","numbersign","dollar","percent","ampersand","quoteright","parenleft","parenright","asterisk","plus","comma","hyphen","period","slash","zero","one","two","three","four","five","six","seven","eight","nine","colon","semicolon","less","equal","greater","question","at","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","bracketleft","backslash","bracketright","asciicircum","underscore","quoteleft","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","braceleft","bar","braceright","asciitilde","exclamdown","cent","sterling","fraction","yen","florin","section","currency","quotesingle","quotedblleft","guillemotleft","guilsinglleft","guilsinglright","fi","fl","endash","dagger","daggerdbl","periodcentered","paragraph","bullet","quotesinglbase","quotedblbase","quotedblright","guillemotright","ellipsis","perthousand","questiondown","grave","acute","circumflex","tilde","macron","breve","dotaccent","dieresis","ring","cedilla","hungarumlaut","ogonek","caron","emdash","AE","ordfeminine","Lslash","Oslash","OE","ordmasculine","ae","dotlessi","lslash","oslash","oe","germandbls","onesuperior","logicalnot","mu","trademark","Eth","onehalf","plusminus","Thorn","onequarter","divide","brokenbar","degree","thorn","threequarters","twosuperior","registered","minus","eth","multiply","threesuperior","copyright","Aacute","Acircumflex","Adieresis","Agrave","Aring","Atilde","Ccedilla","Eacute","Ecircumflex","Edieresis","Egrave","Iacute","Icircumflex","Idieresis","Igrave","Ntilde","Oacute","Ocircumflex","Odieresis","Ograve","Otilde","Scaron","Uacute","Ucircumflex","Udieresis","Ugrave","Yacute","Ydieresis","Zcaron","aacute","acircumflex","adieresis","agrave","aring","atilde","ccedilla","eacute","ecircumflex","edieresis","egrave","iacute","icircumflex","idieresis","igrave","ntilde","oacute","ocircumflex","odieresis","ograve","otilde","scaron","uacute","ucircumflex","udieresis","ugrave","yacute","ydieresis","zcaron","exclamsmall","Hungarumlautsmall","dollaroldstyle","dollarsuperior","ampersandsmall","Acutesmall","parenleftsuperior","parenrightsuperior","266 ff","onedotenleader","zerooldstyle","oneoldstyle","twooldstyle","threeoldstyle","fouroldstyle","fiveoldstyle","sixoldstyle","sevenoldstyle","eightoldstyle","nineoldstyle","commasuperior","threequartersemdash","periodsuperior","questionsmall","asuperior","bsuperior","centsuperior","dsuperior","esuperior","isuperior","lsuperior","msuperior","nsuperior","osuperior","rsuperior","ssuperior","tsuperior","ff","ffi","ffl","parenleftinferior","parenrightinferior","Circumflexsmall","hyphensuperior","Gravesmall","Asmall","Bsmall","Csmall","Dsmall","Esmall","Fsmall","Gsmall","Hsmall","Ismall","Jsmall","Ksmall","Lsmall","Msmall","Nsmall","Osmall","Psmall","Qsmall","Rsmall","Ssmall","Tsmall","Usmall","Vsmall","Wsmall","Xsmall","Ysmall","Zsmall","colonmonetary","onefitted","rupiah","Tildesmall","exclamdownsmall","centoldstyle","Lslashsmall","Scaronsmall","Zcaronsmall","Dieresissmall","Brevesmall","Caronsmall","Dotaccentsmall","Macronsmall","figuredash","hypheninferior","Ogoneksmall","Ringsmall","Cedillasmall","questiondownsmall","oneeighth","threeeighths","fiveeighths","seveneighths","onethird","twothirds","zerosuperior","foursuperior","fivesuperior","sixsuperior","sevensuperior","eightsuperior","ninesuperior","zeroinferior","oneinferior","twoinferior","threeinferior","fourinferior","fiveinferior","sixinferior","seveninferior","eightinferior","nineinferior","centinferior","dollarinferior","periodinferior","commainferior","Agravesmall","Aacutesmall","Acircumflexsmall","Atildesmall","Adieresissmall","Aringsmall","AEsmall","Ccedillasmall","Egravesmall","Eacutesmall","Ecircumflexsmall","Edieresissmall","Igravesmall","Iacutesmall","Icircumflexsmall","Idieresissmall","Ethsmall","Ntildesmall","Ogravesmall","Oacutesmall","Ocircumflexsmall","Otildesmall","Odieresissmall","OEsmall","Oslashsmall","Ugravesmall","Uacutesmall","Ucircumflexsmall","Udieresissmall","Yacutesmall","Thornsmall","Ydieresissmall","001.000","001.001","001.002","001.003","Black","Bold","Book","Light","Medium","Regular","Roman","Semibold"],ge=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","space","exclam","quotedbl","numbersign","dollar","percent","ampersand","quoteright","parenleft","parenright","asterisk","plus","comma","hyphen","period","slash","zero","one","two","three","four","five","six","seven","eight","nine","colon","semicolon","less","equal","greater","question","at","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","bracketleft","backslash","bracketright","asciicircum","underscore","quoteleft","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","braceleft","bar","braceright","asciitilde","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","exclamdown","cent","sterling","fraction","yen","florin","section","currency","quotesingle","quotedblleft","guillemotleft","guilsinglleft","guilsinglright","fi","fl","","endash","dagger","daggerdbl","periodcentered","","paragraph","bullet","quotesinglbase","quotedblbase","quotedblright","guillemotright","ellipsis","perthousand","","questiondown","","grave","acute","circumflex","tilde","macron","breve","dotaccent","dieresis","","ring","cedilla","","hungarumlaut","ogonek","caron","emdash","","","","","","","","","","","","","","","","","AE","","ordfeminine","","","","","Lslash","Oslash","OE","ordmasculine","","","","","","ae","","","","dotlessi","","","lslash","oslash","oe","germandbls"],me=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","space","exclamsmall","Hungarumlautsmall","","dollaroldstyle","dollarsuperior","ampersandsmall","Acutesmall","parenleftsuperior","parenrightsuperior","twodotenleader","onedotenleader","comma","hyphen","period","fraction","zerooldstyle","oneoldstyle","twooldstyle","threeoldstyle","fouroldstyle","fiveoldstyle","sixoldstyle","sevenoldstyle","eightoldstyle","nineoldstyle","colon","semicolon","commasuperior","threequartersemdash","periodsuperior","questionsmall","","asuperior","bsuperior","centsuperior","dsuperior","esuperior","","","isuperior","","","lsuperior","msuperior","nsuperior","osuperior","","","rsuperior","ssuperior","tsuperior","","ff","fi","fl","ffi","ffl","parenleftinferior","","parenrightinferior","Circumflexsmall","hyphensuperior","Gravesmall","Asmall","Bsmall","Csmall","Dsmall","Esmall","Fsmall","Gsmall","Hsmall","Ismall","Jsmall","Ksmall","Lsmall","Msmall","Nsmall","Osmall","Psmall","Qsmall","Rsmall","Ssmall","Tsmall","Usmall","Vsmall","Wsmall","Xsmall","Ysmall","Zsmall","colonmonetary","onefitted","rupiah","Tildesmall","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","exclamdownsmall","centoldstyle","Lslashsmall","","","Scaronsmall","Zcaronsmall","Dieresissmall","Brevesmall","Caronsmall","","Dotaccentsmall","","","Macronsmall","","","figuredash","hypheninferior","","","Ogoneksmall","Ringsmall","Cedillasmall","","","","onequarter","onehalf","threequarters","questiondownsmall","oneeighth","threeeighths","fiveeighths","seveneighths","onethird","twothirds","","","zerosuperior","onesuperior","twosuperior","threesuperior","foursuperior","fivesuperior","sixsuperior","sevensuperior","eightsuperior","ninesuperior","zeroinferior","oneinferior","twoinferior","threeinferior","fourinferior","fiveinferior","sixinferior","seveninferior","eightinferior","nineinferior","centinferior","dollarinferior","periodinferior","commainferior","Agravesmall","Aacutesmall","Acircumflexsmall","Atildesmall","Adieresissmall","Aringsmall","AEsmall","Ccedillasmall","Egravesmall","Eacutesmall","Ecircumflexsmall","Edieresissmall","Igravesmall","Iacutesmall","Icircumflexsmall","Idieresissmall","Ethsmall","Ntildesmall","Ogravesmall","Oacutesmall","Ocircumflexsmall","Otildesmall","Odieresissmall","OEsmall","Oslashsmall","Ugravesmall","Uacutesmall","Ucircumflexsmall","Udieresissmall","Yacutesmall","Thornsmall","Ydieresissmall"],ye=[".notdef",".null","nonmarkingreturn","space","exclam","quotedbl","numbersign","dollar","percent","ampersand","quotesingle","parenleft","parenright","asterisk","plus","comma","hyphen","period","slash","zero","one","two","three","four","five","six","seven","eight","nine","colon","semicolon","less","equal","greater","question","at","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","bracketleft","backslash","bracketright","asciicircum","underscore","grave","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","braceleft","bar","braceright","asciitilde","Adieresis","Aring","Ccedilla","Eacute","Ntilde","Odieresis","Udieresis","aacute","agrave","acircumflex","adieresis","atilde","aring","ccedilla","eacute","egrave","ecircumflex","edieresis","iacute","igrave","icircumflex","idieresis","ntilde","oacute","ograve","ocircumflex","odieresis","otilde","uacute","ugrave","ucircumflex","udieresis","dagger","degree","cent","sterling","section","bullet","paragraph","germandbls","registered","copyright","trademark","acute","dieresis","notequal","AE","Oslash","infinity","plusminus","lessequal","greaterequal","yen","mu","partialdiff","summation","product","pi","integral","ordfeminine","ordmasculine","Omega","ae","oslash","questiondown","exclamdown","logicalnot","radical","florin","approxequal","Delta","guillemotleft","guillemotright","ellipsis","nonbreakingspace","Agrave","Atilde","Otilde","OE","oe","endash","emdash","quotedblleft","quotedblright","quoteleft","quoteright","divide","lozenge","ydieresis","Ydieresis","fraction","currency","guilsinglleft","guilsinglright","fi","fl","daggerdbl","periodcentered","quotesinglbase","quotedblbase","perthousand","Acircumflex","Ecircumflex","Aacute","Edieresis","Egrave","Iacute","Icircumflex","Idieresis","Igrave","Oacute","Ocircumflex","apple","Ograve","Uacute","Ucircumflex","Ugrave","dotlessi","circumflex","tilde","macron","breve","dotaccent","ring","cedilla","hungarumlaut","ogonek","caron","Lslash","lslash","Scaron","scaron","Zcaron","zcaron","brokenbar","Eth","eth","Yacute","yacute","Thorn","thorn","minus","multiply","onesuperior","twosuperior","threesuperior","onehalf","onequarter","threequarters","franc","Gbreve","gbreve","Idotaccent","Scedilla","scedilla","Cacute","cacute","Ccaron","ccaron","dcroat"];function ve(e){this.font=e}function be(e){this.cmap=e}function Se(e,t){this.encoding=e,this.charset=t}function xe(e){switch(e.version){case 1:this.names=ye.slice();break;case 2:this.names=new Array(e.numberOfGlyphs);for(let t=0;t<e.numberOfGlyphs;t++)e.glyphNameIndex[t]<ye.length?this.names[t]=ye[e.glyphNameIndex[t]]:this.names[t]=e.names[e.glyphNameIndex[t]-ye.length];break;case 2.5:this.names=new Array(e.numberOfGlyphs);for(let t=0;t<e.numberOfGlyphs;t++)this.names[t]=ye[t+e.glyphNameIndex[t]];break;case 3:default:this.names=[]}}ve.prototype.charToGlyphIndex=function(e){const t=e.charCodeAt(0),n=this.font.glyphs;if(n)for(let e=0;e<n.length;e+=1){const o=n.get(e);for(let n=0;n<o.unicodes.length;n+=1)if(o.unicodes[n]===t)return e}return null},be.prototype.charToGlyphIndex=function(e){return this.cmap.glyphIndexMap[e.charCodeAt(0)]||0},Se.prototype.charToGlyphIndex=function(e){const t=e.charCodeAt(0),n=this.encoding[t];return this.charset.indexOf(n)},xe.prototype.nameToGlyphIndex=function(e){return this.names.indexOf(e)},xe.prototype.glyphIndexToName=function(e){return this.names[e]};var Ue={line:function(e,t,n,o,r){e.beginPath(),e.moveTo(t,n),e.lineTo(o,r),e.stroke()}};function Te(e,t,n,o,r){let s;return(t&o)>0?(s=e.parseByte(),0==(t&r)&&(s=-s),s=n+s):s=(t&r)>0?n:n+e.parseShort(),s}function Ee(e,t,n){const o=new pe.Parser(t,n);let r,s;if(e.numberOfContours=o.parseShort(),e._xMin=o.parseShort(),e._yMin=o.parseShort(),e._xMax=o.parseShort(),e._yMax=o.parseShort(),e.numberOfContours>0){const t=e.endPointIndices=[];for(let n=0;n<e.numberOfContours;n+=1)t.push(o.parseUShort());e.instructionLength=o.parseUShort(),e.instructions=[];for(let t=0;t<e.instructionLength;t+=1)e.instructions.push(o.parseByte());const n=t[t.length-1]+1;r=[];for(let e=0;e<n;e+=1)if(s=o.parseByte(),r.push(s),(8&s)>0){const t=o.parseByte();for(let n=0;n<t;n+=1)r.push(s),e+=1}if(N.argument(r.length===n,"Bad flags."),t.length>0){const a=[];let i;if(n>0){for(let e=0;e<n;e+=1)s=r[e],i={},i.onCurve=!!(1&s),i.lastPointOfContour=t.indexOf(e)>=0,a.push(i);let e=0;for(let t=0;t<n;t+=1)s=r[t],i=a[t],i.x=Te(o,s,e,2,16),e=i.x;let l=0;for(let e=0;e<n;e+=1)s=r[e],i=a[e],i.y=Te(o,s,l,4,32),l=i.y}e.points=a}else e.points=[]}else if(0===e.numberOfContours)e.points=[];else{e.isComposite=!0,e.points=[],e.components=[];let t=!0;for(;t;){r=o.parseUShort();const n={glyphIndex:o.parseUShort(),xScale:1,scale01:0,scale10:0,yScale:1,dx:0,dy:0};(1&r)>0?(2&r)>0?(n.dx=o.parseShort(),n.dy=o.parseShort()):n.matchedPoints=[o.parseUShort(),o.parseUShort()]:(2&r)>0?(n.dx=o.parseChar(),n.dy=o.parseChar()):n.matchedPoints=[o.parseByte(),o.parseByte()],(8&r)>0?n.xScale=n.yScale=o.parseF2Dot14():(64&r)>0?(n.xScale=o.parseF2Dot14(),n.yScale=o.parseF2Dot14()):(128&r)>0&&(n.xScale=o.parseF2Dot14(),n.scale01=o.parseF2Dot14(),n.scale10=o.parseF2Dot14(),n.yScale=o.parseF2Dot14()),e.components.push(n),t=!!(32&r)}if(256&r){e.instructionLength=o.parseUShort(),e.instructions=[];for(let t=0;t<e.instructionLength;t+=1)e.instructions.push(o.parseByte())}}}function Oe(e,t){const n=[];for(let o=0;o<e.length;o+=1){const r=e[o],s={x:t.xScale*r.x+t.scale01*r.y+t.dx,y:t.scale10*r.x+t.yScale*r.y+t.dy,onCurve:r.onCurve,lastPointOfContour:r.lastPointOfContour};n.push(s)}return n}function we(e){const t=new M;if(!e)return t;const n=function(e){const t=[];let n=[];for(let o=0;o<e.length;o+=1){const r=e[o];n.push(r),r.lastPointOfContour&&(t.push(n),n=[])}return N.argument(0===n.length,"There are still points left in the current contour."),t}(e);for(let e=0;e<n.length;++e){const o=n[e];let r=null,s=o[o.length-1],a=o[0];if(s.onCurve)t.moveTo(s.x,s.y);else if(a.onCurve)t.moveTo(a.x,a.y);else{const e={x:.5*(s.x+a.x),y:.5*(s.y+a.y)};t.moveTo(e.x,e.y)}for(let e=0;e<o.length;++e)if(r=s,s=a,a=o[(e+1)%o.length],s.onCurve)t.lineTo(s.x,s.y);else{let e=r,n=a;r.onCurve||(e={x:.5*(s.x+r.x),y:.5*(s.y+r.y)},t.lineTo(e.x,e.y)),a.onCurve||(n={x:.5*(s.x+a.x),y:.5*(s.y+a.y)}),t.lineTo(e.x,e.y),t.quadraticCurveTo(s.x,s.y,n.x,n.y)}t.closePath()}return t}function ke(e,t){if(t.isComposite)for(let n=0;n<t.components.length;n+=1){const o=t.components[n],r=e.get(o.glyphIndex);if(r.getPath(),r.points){let e;if(void 0===o.matchedPoints)e=Oe(r.points,o);else{if(o.matchedPoints[0]>t.points.length-1||o.matchedPoints[1]>r.points.length-1)throw Error("Matched points out of range in "+t.name);const n=t.points[o.matchedPoints[0]];let s=r.points[o.matchedPoints[1]];const a={xScale:o.xScale,scale01:o.scale01,scale10:o.scale10,yScale:o.yScale,dx:0,dy:0};s=Oe([s],a)[0],a.dx=n.x-s.x,a.dy=n.y-s.y,e=Oe(r.points,a)}t.points=t.points.concat(e)}}return we(t.points)}var Re={getPath:we,parse:function(e,t,n,o){const r=new Ie.GlyphSet(o);for(let s=0;s<n.length-1;s+=1){const a=n[s];a!==n[s+1]?r.push(s,Ie.ttfGlyphLoader(o,s,Ee,e,t+a,ke)):r.push(s,Ie.glyphLoader(o,s))}return r}};function De(e){this.bindConstructorValues(e)}function Ce(e,t,n){Object.defineProperty(e,t,{get:function(){return e.path,e[n]},set:function(t){e[n]=t},enumerable:!0,configurable:!0})}function Le(e,t){if(this.font=e,this.glyphs={},Array.isArray(t))for(let e=0;e<t.length;e++)this.glyphs[e]=t[e];this.length=t&&t.length||0}De.prototype.bindConstructorValues=function(e){this.index=e.index||0,this.name=e.name||null,this.unicode=e.unicode||void 0,this.unicodes=e.unicodes||void 0!==e.unicode?[e.unicode]:[],e.xMin&&(this.xMin=e.xMin),e.yMin&&(this.yMin=e.yMin),e.xMax&&(this.xMax=e.xMax),e.yMax&&(this.yMax=e.yMax),e.advanceWidth&&(this.advanceWidth=e.advanceWidth),Object.defineProperty(this,"path",function(e,t){let n=t||{commands:[]};return{configurable:!0,get:function(){return"function"==typeof n&&(n=n()),n},set:function(e){n=e}}}(0,e.path))},De.prototype.addUnicode=function(e){0===this.unicodes.length&&(this.unicode=e),this.unicodes.push(e)},De.prototype.getBoundingBox=function(){return this.path.getBoundingBox()},De.prototype.getPath=function(e,t,n,o,r){let s,a;e=void 0!==e?e:0,t=void 0!==t?t:0,n=void 0!==n?n:72,o||(o={});let i=o.xScale,l=o.yScale;if(o.hinting&&r&&r.hinting&&(a=this.path&&r.hinting.exec(this,n)),a)s=Re.getPath(a).commands,e=Math.round(e),t=Math.round(t),i=l=1;else{s=this.path.commands;const e=1/this.path.unitsPerEm*n;void 0===i&&(i=e),void 0===l&&(l=e)}const c=new M;for(let n=0;n<s.length;n+=1){const o=s[n];"M"===o.type?c.moveTo(e+o.x*i,t+-o.y*l):"L"===o.type?c.lineTo(e+o.x*i,t+-o.y*l):"Q"===o.type?c.quadraticCurveTo(e+o.x1*i,t+-o.y1*l,e+o.x*i,t+-o.y*l):"C"===o.type?c.curveTo(e+o.x1*i,t+-o.y1*l,e+o.x2*i,t+-o.y2*l,e+o.x*i,t+-o.y*l):"Z"===o.type&&c.closePath()}return c},De.prototype.getContours=function(){if(void 0===this.points)return[];const e=[];let t=[];for(let n=0;n<this.points.length;n+=1){const o=this.points[n];t.push(o),o.lastPointOfContour&&(e.push(t),t=[])}return N.argument(0===t.length,"There are still points left in the current contour."),e},De.prototype.getMetrics=function(){const e=this.path.commands,t=[],n=[];for(let o=0;o<e.length;o+=1){const r=e[o];"Z"!==r.type&&(t.push(r.x),n.push(r.y)),"Q"!==r.type&&"C"!==r.type||(t.push(r.x1),n.push(r.y1)),"C"===r.type&&(t.push(r.x2),n.push(r.y2))}const o={xMin:Math.min.apply(null,t),yMin:Math.min.apply(null,n),xMax:Math.max.apply(null,t),yMax:Math.max.apply(null,n),leftSideBearing:this.leftSideBearing};return isFinite(o.xMin)||(o.xMin=0),isFinite(o.xMax)||(o.xMax=this.advanceWidth),isFinite(o.yMin)||(o.yMin=0),isFinite(o.yMax)||(o.yMax=0),o.rightSideBearing=this.advanceWidth-o.leftSideBearing-(o.xMax-o.xMin),o},De.prototype.draw=function(e,t,n,o,r){this.getPath(t,n,o,r).draw(e)},De.prototype.drawPoints=function(e,t,n,o){function r(t,n,o,r){const s=2*Math.PI;e.beginPath();for(let a=0;a<t.length;a+=1)e.moveTo(n+t[a].x*r,o+t[a].y*r),e.arc(n+t[a].x*r,o+t[a].y*r,2,0,s,!1);e.closePath(),e.fill()}t=void 0!==t?t:0,n=void 0!==n?n:0,o=void 0!==o?o:24;const s=1/this.path.unitsPerEm*o,a=[],i=[],l=this.path;for(let e=0;e<l.commands.length;e+=1){const t=l.commands[e];void 0!==t.x&&a.push({x:t.x,y:-t.y}),void 0!==t.x1&&i.push({x:t.x1,y:-t.y1}),void 0!==t.x2&&i.push({x:t.x2,y:-t.y2})}e.fillStyle="blue",r(a,t,n,s),e.fillStyle="red",r(i,t,n,s)},De.prototype.drawMetrics=function(e,t,n,o){let r;t=void 0!==t?t:0,n=void 0!==n?n:0,o=void 0!==o?o:24,r=1/this.path.unitsPerEm*o,e.lineWidth=1,e.strokeStyle="black",Ue.line(e,t,-1e4,t,1e4),Ue.line(e,-1e4,n,1e4,n);const s=this.xMin||0;let a=this.yMin||0;const i=this.xMax||0;let l=this.yMax||0;const c=this.advanceWidth||0;e.strokeStyle="blue",Ue.line(e,t+s*r,-1e4,t+s*r,1e4),Ue.line(e,t+i*r,-1e4,t+i*r,1e4),Ue.line(e,-1e4,n+-a*r,1e4,n+-a*r),Ue.line(e,-1e4,n+-l*r,1e4,n+-l*r),e.strokeStyle="green",Ue.line(e,t+c*r,-1e4,t+c*r,1e4)},Le.prototype.get=function(e){return"function"==typeof this.glyphs[e]&&(this.glyphs[e]=this.glyphs[e]()),this.glyphs[e]},Le.prototype.push=function(e,t){this.glyphs[e]=t,this.length++};var Ie={GlyphSet:Le,glyphLoader:function(e,t){return new De({index:t,font:e})},ttfGlyphLoader:function(e,t,n,o,r,s){return function(){const a=new De({index:t,font:e});return a.path=function(){n(a,o,r);const t=s(e.glyphs,a);return t.unitsPerEm=e.unitsPerEm,t},Ce(a,"xMin","_xMin"),Ce(a,"xMax","_xMax"),Ce(a,"yMin","_yMin"),Ce(a,"yMax","_yMax"),a}},cffGlyphLoader:function(e,t,n,o){return function(){const r=new De({index:t,font:e});return r.path=function(){const t=n(e,r,o);return t.unitsPerEm=e.unitsPerEm,t},r}}};function Me(e,t){if(e===t)return!0;if(Array.isArray(e)&&Array.isArray(t)){if(e.length!==t.length)return!1;for(let n=0;n<e.length;n+=1)if(!Me(e[n],t[n]))return!1;return!0}return!1}function Be(e){let t;return t=e.length<1240?107:e.length<33900?1131:32768,t}function Ge(e,t,n){const o=[],r=[],s=pe.getCard16(e,t);let a,i;if(0!==s){const n=pe.getByte(e,t+2);a=t+(s+1)*n+2;let r=t+3;for(let t=0;t<s+1;t+=1)o.push(pe.getOffset(e,r,n)),r+=n;i=a+o[s]}else i=t+2;for(let t=0;t<o.length-1;t+=1){let s=pe.getBytes(e,a+o[t],a+o[t+1]);n&&(s=n(s)),r.push(s)}return{objects:r,startOffset:t,endOffset:i}}function Ne(e,t){let n,o,r,s;if(28===t)return n=e.parseByte(),o=e.parseByte(),n<<8|o;if(29===t)return n=e.parseByte(),o=e.parseByte(),r=e.parseByte(),s=e.parseByte(),n<<24|o<<16|r<<8|s;if(30===t)return function(e){let t="";const n=["0","1","2","3","4","5","6","7","8","9",".","E","E-",null,"-"];for(;;){const o=e.parseByte(),r=o>>4,s=15&o;if(15===r)break;if(t+=n[r],15===s)break;t+=n[s]}return parseFloat(t)}(e);if(t>=32&&t<=246)return t-139;if(t>=247&&t<=250)return n=e.parseByte(),256*(t-247)+n+108;if(t>=251&&t<=254)return n=e.parseByte(),256*-(t-251)-n-108;throw new Error("Invalid b0 "+t)}function Pe(e,t,n){t=void 0!==t?t:0;const o=new pe.Parser(e,t),r=[];let s=[];for(n=void 0!==n?n:e.length;o.relativeOffset<n;){let e=o.parseByte();e<=21?(12===e&&(e=1200+o.parseByte()),r.push([e,s]),s=[]):s.push(Ne(o,e))}return function(e){const t={};for(let n=0;n<e.length;n+=1){const o=e[n][0],r=e[n][1];let s;if(s=1===r.length?r[0]:r,t.hasOwnProperty(o)&&!isNaN(t[o]))throw new Error("Object "+t+" already has key "+o);t[o]=s}return t}(r)}function Ae(e,t){return t=t<=390?de[t]:e[t-391]}function Fe(e,t,n){const o={};let r;for(let s=0;s<t.length;s+=1){const a=t[s];if(Array.isArray(a.type)){const t=[];t.length=a.type.length;for(let o=0;o<a.type.length;o++)r=void 0!==e[a.op]?e[a.op][o]:void 0,void 0===r&&(r=void 0!==a.value&&void 0!==a.value[o]?a.value[o]:null),"SID"===a.type[o]&&(r=Ae(n,r)),t[o]=r;o[a.name]=t}else r=e[a.op],void 0===r&&(r=void 0!==a.value?a.value:null),"SID"===a.type&&(r=Ae(n,r)),o[a.name]=r}return o}const He=[{name:"version",op:0,type:"SID"},{name:"notice",op:1,type:"SID"},{name:"copyright",op:1200,type:"SID"},{name:"fullName",op:2,type:"SID"},{name:"familyName",op:3,type:"SID"},{name:"weight",op:4,type:"SID"},{name:"isFixedPitch",op:1201,type:"number",value:0},{name:"italicAngle",op:1202,type:"number",value:0},{name:"underlinePosition",op:1203,type:"number",value:-100},{name:"underlineThickness",op:1204,type:"number",value:50},{name:"paintType",op:1205,type:"number",value:0},{name:"charstringType",op:1206,type:"number",value:2},{name:"fontMatrix",op:1207,type:["real","real","real","real","real","real"],value:[.001,0,0,.001,0,0]},{name:"uniqueId",op:13,type:"number"},{name:"fontBBox",op:5,type:["number","number","number","number"],value:[0,0,0,0]},{name:"strokeWidth",op:1208,type:"number",value:0},{name:"xuid",op:14,type:[],value:null},{name:"charset",op:15,type:"offset",value:0},{name:"encoding",op:16,type:"offset",value:0},{name:"charStrings",op:17,type:"offset",value:0},{name:"private",op:18,type:["number","offset"],value:[0,0]},{name:"ros",op:1230,type:["SID","SID","number"]},{name:"cidFontVersion",op:1231,type:"number",value:0},{name:"cidFontRevision",op:1232,type:"number",value:0},{name:"cidFontType",op:1233,type:"number",value:0},{name:"cidCount",op:1234,type:"number",value:8720},{name:"uidBase",op:1235,type:"number"},{name:"fdArray",op:1236,type:"offset"},{name:"fdSelect",op:1237,type:"offset"},{name:"fontName",op:1238,type:"SID"}],ze=[{name:"subrs",op:19,type:"offset",value:0},{name:"defaultWidthX",op:20,type:"number",value:0},{name:"nominalWidthX",op:21,type:"number",value:0}];function We(e,t){return Fe(Pe(e,0,e.byteLength),He,t)}function _e(e,t,n,o){return Fe(Pe(e,t,n),ze,o)}function qe(e,t,n,o){const r=[];for(let s=0;s<n.length;s+=1){const a=We(new DataView(new Uint8Array(n[s]).buffer),o);a._subrs=[],a._subrsBias=0;const i=a.private[0],l=a.private[1];if(0!==i&&0!==l){const n=_e(e,l+t,i,o);if(a._defaultWidthX=n.defaultWidthX,a._nominalWidthX=n.nominalWidthX,0!==n.subrs){const o=Ge(e,l+n.subrs+t);a._subrs=o.objects,a._subrsBias=Be(a._subrs)}a._privateDict=n}r.push(a)}return r}function Xe(e,t,n){let o,r,s,a;const i=new M,l=[];let c,u,p,h,f=0,d=!1,g=!1,m=0,y=0;if(e.isCIDFont){const n=e.tables.cff.topDict._fdSelect[t.index],o=e.tables.cff.topDict._fdArray[n];c=o._subrs,u=o._subrsBias,p=o._defaultWidthX,h=o._nominalWidthX}else c=e.tables.cff.topDict._subrs,u=e.tables.cff.topDict._subrsBias,p=e.tables.cff.topDict._defaultWidthX,h=e.tables.cff.topDict._nominalWidthX;let v=p;function b(e,t){g&&i.closePath(),i.moveTo(e,t),g=!0}function S(){let e;e=l.length%2!=0,e&&!d&&(v=l.shift()+h),f+=l.length>>1,l.length=0,d=!0}return function n(p){let x,U,T,E,O,w,k,R,D,C,L,I,M=0;for(;M<p.length;){let B=p[M];switch(M+=1,B){case 1:case 3:S();break;case 4:l.length>1&&!d&&(v=l.shift()+h,d=!0),y+=l.pop(),b(m,y);break;case 5:for(;l.length>0;)m+=l.shift(),y+=l.shift(),i.lineTo(m,y);break;case 6:for(;l.length>0&&(m+=l.shift(),i.lineTo(m,y),0!==l.length);)y+=l.shift(),i.lineTo(m,y);break;case 7:for(;l.length>0&&(y+=l.shift(),i.lineTo(m,y),0!==l.length);)m+=l.shift(),i.lineTo(m,y);break;case 8:for(;l.length>0;)o=m+l.shift(),r=y+l.shift(),s=o+l.shift(),a=r+l.shift(),m=s+l.shift(),y=a+l.shift(),i.curveTo(o,r,s,a,m,y);break;case 10:O=l.pop()+u,w=c[O],w&&n(w);break;case 11:return;case 12:switch(B=p[M],M+=1,B){case 35:o=m+l.shift(),r=y+l.shift(),s=o+l.shift(),a=r+l.shift(),k=s+l.shift(),R=a+l.shift(),D=k+l.shift(),C=R+l.shift(),L=D+l.shift(),I=C+l.shift(),m=L+l.shift(),y=I+l.shift(),l.shift(),i.curveTo(o,r,s,a,k,R),i.curveTo(D,C,L,I,m,y);break;case 34:o=m+l.shift(),r=y,s=o+l.shift(),a=r+l.shift(),k=s+l.shift(),R=a,D=k+l.shift(),C=a,L=D+l.shift(),I=y,m=L+l.shift(),i.curveTo(o,r,s,a,k,R),i.curveTo(D,C,L,I,m,y);break;case 36:o=m+l.shift(),r=y+l.shift(),s=o+l.shift(),a=r+l.shift(),k=s+l.shift(),R=a,D=k+l.shift(),C=a,L=D+l.shift(),I=C+l.shift(),m=L+l.shift(),i.curveTo(o,r,s,a,k,R),i.curveTo(D,C,L,I,m,y);break;case 37:o=m+l.shift(),r=y+l.shift(),s=o+l.shift(),a=r+l.shift(),k=s+l.shift(),R=a+l.shift(),D=k+l.shift(),C=R+l.shift(),L=D+l.shift(),I=C+l.shift(),Math.abs(L-m)>Math.abs(I-y)?m=L+l.shift():y=I+l.shift(),i.curveTo(o,r,s,a,k,R),i.curveTo(D,C,L,I,m,y);break;default:console.log("Glyph "+t.index+": unknown operator 1200"+B),l.length=0}break;case 14:l.length>0&&!d&&(v=l.shift()+h,d=!0),g&&(i.closePath(),g=!1);break;case 18:S();break;case 19:case 20:S(),M+=f+7>>3;break;case 21:l.length>2&&!d&&(v=l.shift()+h,d=!0),y+=l.pop(),m+=l.pop(),b(m,y);break;case 22:l.length>1&&!d&&(v=l.shift()+h,d=!0),m+=l.pop(),b(m,y);break;case 23:S();break;case 24:for(;l.length>2;)o=m+l.shift(),r=y+l.shift(),s=o+l.shift(),a=r+l.shift(),m=s+l.shift(),y=a+l.shift(),i.curveTo(o,r,s,a,m,y);m+=l.shift(),y+=l.shift(),i.lineTo(m,y);break;case 25:for(;l.length>6;)m+=l.shift(),y+=l.shift(),i.lineTo(m,y);o=m+l.shift(),r=y+l.shift(),s=o+l.shift(),a=r+l.shift(),m=s+l.shift(),y=a+l.shift(),i.curveTo(o,r,s,a,m,y);break;case 26:for(l.length%2&&(m+=l.shift());l.length>0;)o=m,r=y+l.shift(),s=o+l.shift(),a=r+l.shift(),m=s,y=a+l.shift(),i.curveTo(o,r,s,a,m,y);break;case 27:for(l.length%2&&(y+=l.shift());l.length>0;)o=m+l.shift(),r=y,s=o+l.shift(),a=r+l.shift(),m=s+l.shift(),y=a,i.curveTo(o,r,s,a,m,y);break;case 28:x=p[M],U=p[M+1],l.push((x<<24|U<<16)>>16),M+=2;break;case 29:O=l.pop()+e.gsubrsBias,w=e.gsubrs[O],w&&n(w);break;case 30:for(;l.length>0&&(o=m,r=y+l.shift(),s=o+l.shift(),a=r+l.shift(),m=s+l.shift(),y=a+(1===l.length?l.shift():0),i.curveTo(o,r,s,a,m,y),0!==l.length);)o=m+l.shift(),r=y,s=o+l.shift(),a=r+l.shift(),y=a+l.shift(),m=s+(1===l.length?l.shift():0),i.curveTo(o,r,s,a,m,y);break;case 31:for(;l.length>0&&(o=m+l.shift(),r=y,s=o+l.shift(),a=r+l.shift(),y=a+l.shift(),m=s+(1===l.length?l.shift():0),i.curveTo(o,r,s,a,m,y),0!==l.length);)o=m,r=y+l.shift(),s=o+l.shift(),a=r+l.shift(),m=s+l.shift(),y=a+(1===l.length?l.shift():0),i.curveTo(o,r,s,a,m,y);break;default:B<32?console.log("Glyph "+t.index+": unknown operator "+B):B<247?l.push(B-139):B<251?(x=p[M],M+=1,l.push(256*(B-247)+x+108)):B<255?(x=p[M],M+=1,l.push(256*-(B-251)-x-108)):(x=p[M],U=p[M+1],T=p[M+2],E=p[M+3],M+=4,l.push((x<<24|U<<16|T<<8|E)/65536))}}}(n),t.advanceWidth=v,i}function Ve(e,t){let n,o=de.indexOf(e);return o>=0&&(n=o),o=t.indexOf(e),o>=0?n=o+de.length:(n=de.length+t.length,t.push(e)),n}function je(e,t,n){const o={};for(let r=0;r<e.length;r+=1){const s=e[r];let a=t[s.name];void 0===a||Me(a,s.value)||("SID"===s.type&&(a=Ve(a,n)),o[s.op]={name:s.name,type:s.type,value:a})}return o}function Ye(e,t){const n=new oe.Record("Top DICT",[{name:"dict",type:"DICT",value:{}}]);return n.dict=je(He,e,t),n}function Ze(e){const t=new oe.Record("Top DICT INDEX",[{name:"topDicts",type:"INDEX",value:[]}]);return t.topDicts=[{name:"topDict_0",type:"TABLE",value:e}],t}function Qe(e){const t=[],n=e.path;t.push({name:"width",type:"NUMBER",value:e.advanceWidth});let o=0,r=0;for(let e=0;e<n.commands.length;e+=1){let s,a,i=n.commands[e];if("Q"===i.type){const e=1/3,t=2/3;i={type:"C",x:i.x,y:i.y,x1:e*o+t*i.x1,y1:e*r+t*i.y1,x2:e*i.x+t*i.x1,y2:e*i.y+t*i.y1}}if("M"===i.type)s=Math.round(i.x-o),a=Math.round(i.y-r),t.push({name:"dx",type:"NUMBER",value:s}),t.push({name:"dy",type:"NUMBER",value:a}),t.push({name:"rmoveto",type:"OP",value:21}),o=Math.round(i.x),r=Math.round(i.y);else if("L"===i.type)s=Math.round(i.x-o),a=Math.round(i.y-r),t.push({name:"dx",type:"NUMBER",value:s}),t.push({name:"dy",type:"NUMBER",value:a}),t.push({name:"rlineto",type:"OP",value:5}),o=Math.round(i.x),r=Math.round(i.y);else if("C"===i.type){const e=Math.round(i.x1-o),n=Math.round(i.y1-r),l=Math.round(i.x2-i.x1),c=Math.round(i.y2-i.y1);s=Math.round(i.x-i.x2),a=Math.round(i.y-i.y2),t.push({name:"dx1",type:"NUMBER",value:e}),t.push({name:"dy1",type:"NUMBER",value:n}),t.push({name:"dx2",type:"NUMBER",value:l}),t.push({name:"dy2",type:"NUMBER",value:c}),t.push({name:"dx",type:"NUMBER",value:s}),t.push({name:"dy",type:"NUMBER",value:a}),t.push({name:"rrcurveto",type:"OP",value:8}),o=Math.round(i.x),r=Math.round(i.y)}}return t.push({name:"endchar",type:"OP",value:14}),t}var $e={parse:function(e,t,n){n.tables.cff={};const o=Ge(e,function(e,t){const n={};return n.formatMajor=pe.getCard8(e,t),n.formatMinor=pe.getCard8(e,t+1),n.size=pe.getCard8(e,t+2),n.offsetSize=pe.getCard8(e,t+3),n.startOffset=t,n.endOffset=t+4,n}(e,t).endOffset,pe.bytesToString),r=Ge(e,o.endOffset),s=Ge(e,r.endOffset,pe.bytesToString),a=Ge(e,s.endOffset);n.gsubrs=a.objects,n.gsubrsBias=Be(n.gsubrs);const i=qe(e,t,r.objects,s.objects);if(1!==i.length)throw new Error("CFF table has too many fonts in 'FontSet' - count of fonts NameIndex.length = "+i.length);const l=i[0];if(n.tables.cff.topDict=l,l._privateDict&&(n.defaultWidthX=l._privateDict.defaultWidthX,n.nominalWidthX=l._privateDict.nominalWidthX),void 0!==l.ros[0]&&void 0!==l.ros[1]&&(n.isCIDFont=!0),n.isCIDFont){let o=l.fdArray,r=l.fdSelect;if(0===o||0===r)throw new Error("Font is marked as a CID font, but FDArray and/or FDSelect information is missing");o+=t;const a=qe(e,t,Ge(e,o).objects,s.objects);l._fdArray=a,r+=t,l._fdSelect=function(e,t,n,o){const r=[];let s;const a=new pe.Parser(e,t),i=a.parseCard8();if(0===i)for(let e=0;e<n;e++){if(s=a.parseCard8(),s>=o)throw new Error("CFF table CID Font FDSelect has bad FD index value "+s+" (FD count "+o+")");r.push(s)}else{if(3!==i)throw new Error("CFF Table CID Font FDSelect table has unsupported format "+i);{const e=a.parseCard16();let t,i=a.parseCard16();if(0!==i)throw new Error("CFF Table CID Font FDSelect format 3 range has bad initial GID "+i);for(let l=0;l<e;l++){if(s=a.parseCard8(),t=a.parseCard16(),s>=o)throw new Error("CFF table CID Font FDSelect has bad FD index value "+s+" (FD count "+o+")");if(t>n)throw new Error("CFF Table CID Font FDSelect format 3 range has bad GID "+t);for(;i<t;i++)r.push(s);i=t}if(t!==n)throw new Error("CFF Table CID Font FDSelect format 3 range has bad final GID "+t)}}return r}(e,r,n.numGlyphs,a.length)}const c=t+l.private[1],u=_e(e,c,l.private[0],s.objects);if(n.defaultWidthX=u.defaultWidthX,n.nominalWidthX=u.nominalWidthX,0!==u.subrs){const t=Ge(e,c+u.subrs);n.subrs=t.objects,n.subrsBias=Be(n.subrs)}else n.subrs=[],n.subrsBias=0;const p=Ge(e,t+l.charStrings);n.nGlyphs=p.objects.length;const h=function(e,t,n,o){let r,s;const a=new pe.Parser(e,t);n-=1;const i=[".notdef"],l=a.parseCard8();if(0===l)for(let e=0;e<n;e+=1)r=a.parseSID(),i.push(Ae(o,r));else if(1===l)for(;i.length<=n;){r=a.parseSID(),s=a.parseCard8();for(let e=0;e<=s;e+=1)i.push(Ae(o,r)),r+=1}else{if(2!==l)throw new Error("Unknown charset format "+l);for(;i.length<=n;){r=a.parseSID(),s=a.parseCard16();for(let e=0;e<=s;e+=1)i.push(Ae(o,r)),r+=1}}return i}(e,t+l.charset,n.nGlyphs,s.objects);0===l.encoding?n.cffEncoding=new Se(ge,h):1===l.encoding?n.cffEncoding=new Se(me,h):n.cffEncoding=function(e,t,n){let o;const r={},s=new pe.Parser(e,t),a=s.parseCard8();if(0===a){const e=s.parseCard8();for(let t=0;t<e;t+=1)o=s.parseCard8(),r[o]=t}else{if(1!==a)throw new Error("Unknown encoding format "+a);{const e=s.parseCard8();o=1;for(let t=0;t<e;t+=1){const e=s.parseCard8(),t=s.parseCard8();for(let n=e;n<=e+t;n+=1)r[n]=o,o+=1}}}return new Se(r,n)}(e,t+l.encoding,h),n.encoding=n.encoding||n.cffEncoding,n.glyphs=new Ie.GlyphSet(n);for(let e=0;e<n.nGlyphs;e+=1){const t=p.objects[e];n.glyphs.push(e,Ie.cffGlyphLoader(n,e,Xe,t))}},make:function(e,t){const n=new oe.Table("CFF ",[{name:"header",type:"RECORD"},{name:"nameIndex",type:"RECORD"},{name:"topDictIndex",type:"RECORD"},{name:"stringIndex",type:"RECORD"},{name:"globalSubrIndex",type:"RECORD"},{name:"charsets",type:"RECORD"},{name:"charStringsIndex",type:"RECORD"},{name:"privateDict",type:"RECORD"}]),o=1/t.unitsPerEm,r={version:t.version,fullName:t.fullName,familyName:t.familyName,weight:t.weightName,fontBBox:t.fontBBox||[0,0,0,0],fontMatrix:[o,0,0,o,0,0],charset:999,encoding:0,charStrings:999,private:[0,999]},s=[];let a;for(let t=1;t<e.length;t+=1)a=e.get(t),s.push(a.name);const i=[];n.header=new oe.Record("Header",[{name:"major",type:"Card8",value:1},{name:"minor",type:"Card8",value:0},{name:"hdrSize",type:"Card8",value:4},{name:"major",type:"Card8",value:1}]),n.nameIndex=function(e){const t=new oe.Record("Name INDEX",[{name:"names",type:"INDEX",value:[]}]);t.names=[];for(let n=0;n<e.length;n+=1)t.names.push({name:"name_"+n,type:"NAME",value:e[n]});return t}([t.postScriptName]);let l=Ye(r,i);n.topDictIndex=Ze(l),n.globalSubrIndex=new oe.Record("Global Subr INDEX",[{name:"subrs",type:"INDEX",value:[]}]),n.charsets=function(e,t){const n=new oe.Record("Charsets",[{name:"format",type:"Card8",value:0}]);for(let o=0;o<e.length;o+=1){const r=Ve(e[o],t);n.fields.push({name:"glyph_"+o,type:"SID",value:r})}return n}(s,i),n.charStringsIndex=function(e){const t=new oe.Record("CharStrings INDEX",[{name:"charStrings",type:"INDEX",value:[]}]);for(let n=0;n<e.length;n+=1){const o=e.get(n),r=Qe(o);t.charStrings.push({name:o.name,type:"CHARSTRING",value:r})}return t}(e),n.privateDict=function(e,t){const n=new oe.Record("Private DICT",[{name:"dict",type:"DICT",value:{}}]);return n.dict=je(ze,e,t),n}({},i),n.stringIndex=function(e){const t=new oe.Record("String INDEX",[{name:"strings",type:"INDEX",value:[]}]);t.strings=[];for(let n=0;n<e.length;n+=1)t.strings.push({name:"string_"+n,type:"STRING",value:e[n]});return t}(i);const c=n.header.sizeOf()+n.nameIndex.sizeOf()+n.topDictIndex.sizeOf()+n.stringIndex.sizeOf()+n.globalSubrIndex.sizeOf();return r.charset=c,r.encoding=0,r.charStrings=r.charset+n.charsets.sizeOf(),r.private[1]=r.charStrings+n.charStringsIndex.sizeOf(),l=Ye(r,i),n.topDictIndex=Ze(l),n}};var Ke={parse:function(e,t){const n={},o=new pe.Parser(e,t);return n.version=o.parseVersion(),n.fontRevision=Math.round(1e3*o.parseFixed())/1e3,n.checkSumAdjustment=o.parseULong(),n.magicNumber=o.parseULong(),N.argument(1594834165===n.magicNumber,"Font header has wrong magic number."),n.flags=o.parseUShort(),n.unitsPerEm=o.parseUShort(),n.created=o.parseLongDateTime(),n.modified=o.parseLongDateTime(),n.xMin=o.parseShort(),n.yMin=o.parseShort(),n.xMax=o.parseShort(),n.yMax=o.parseShort(),n.macStyle=o.parseUShort(),n.lowestRecPPEM=o.parseUShort(),n.fontDirectionHint=o.parseShort(),n.indexToLocFormat=o.parseShort(),n.glyphDataFormat=o.parseShort(),n},make:function(e){const t=Math.round((new Date).getTime()/1e3)+2082844800;let n=t;return e.createdTimestamp&&(n=e.createdTimestamp+2082844800),new oe.Table("head",[{name:"version",type:"FIXED",value:65536},{name:"fontRevision",type:"FIXED",value:65536},{name:"checkSumAdjustment",type:"ULONG",value:0},{name:"magicNumber",type:"ULONG",value:1594834165},{name:"flags",type:"USHORT",value:0},{name:"unitsPerEm",type:"USHORT",value:1e3},{name:"created",type:"LONGDATETIME",value:n},{name:"modified",type:"LONGDATETIME",value:t},{name:"xMin",type:"SHORT",value:0},{name:"yMin",type:"SHORT",value:0},{name:"xMax",type:"SHORT",value:0},{name:"yMax",type:"SHORT",value:0},{name:"macStyle",type:"USHORT",value:0},{name:"lowestRecPPEM",type:"USHORT",value:0},{name:"fontDirectionHint",type:"SHORT",value:2},{name:"indexToLocFormat",type:"SHORT",value:0},{name:"glyphDataFormat",type:"SHORT",value:0}],e)}};var Je={parse:function(e,t){const n={},o=new pe.Parser(e,t);return n.version=o.parseVersion(),n.ascender=o.parseShort(),n.descender=o.parseShort(),n.lineGap=o.parseShort(),n.advanceWidthMax=o.parseUShort(),n.minLeftSideBearing=o.parseShort(),n.minRightSideBearing=o.parseShort(),n.xMaxExtent=o.parseShort(),n.caretSlopeRise=o.parseShort(),n.caretSlopeRun=o.parseShort(),n.caretOffset=o.parseShort(),o.relativeOffset+=8,n.metricDataFormat=o.parseShort(),n.numberOfHMetrics=o.parseUShort(),n},make:function(e){return new oe.Table("hhea",[{name:"version",type:"FIXED",value:65536},{name:"ascender",type:"FWORD",value:0},{name:"descender",type:"FWORD",value:0},{name:"lineGap",type:"FWORD",value:0},{name:"advanceWidthMax",type:"UFWORD",value:0},{name:"minLeftSideBearing",type:"FWORD",value:0},{name:"minRightSideBearing",type:"FWORD",value:0},{name:"xMaxExtent",type:"FWORD",value:0},{name:"caretSlopeRise",type:"SHORT",value:1},{name:"caretSlopeRun",type:"SHORT",value:0},{name:"caretOffset",type:"SHORT",value:0},{name:"reserved1",type:"SHORT",value:0},{name:"reserved2",type:"SHORT",value:0},{name:"reserved3",type:"SHORT",value:0},{name:"reserved4",type:"SHORT",value:0},{name:"metricDataFormat",type:"SHORT",value:0},{name:"numberOfHMetrics",type:"USHORT",value:0}],e)}};var et={parse:function(e,t,n,o,r){let s,a;const i=new pe.Parser(e,t);for(let e=0;e<o;e+=1){e<n&&(s=i.parseUShort(),a=i.parseShort());const t=r.get(e);t.advanceWidth=s,t.leftSideBearing=a}},make:function(e){const t=new oe.Table("hmtx",[]);for(let n=0;n<e.length;n+=1){const o=e.get(n),r=o.advanceWidth||0,s=o.leftSideBearing||0;t.fields.push({name:"advanceWidth_"+n,type:"USHORT",value:r}),t.fields.push({name:"leftSideBearing_"+n,type:"SHORT",value:s})}return t}};var tt={make:function(e){const t=new oe.Table("ltag",[{name:"version",type:"ULONG",value:1},{name:"flags",type:"ULONG",value:0},{name:"numTags",type:"ULONG",value:e.length}]);let n="";const o=12+4*e.length;for(let r=0;r<e.length;++r){let s=n.indexOf(e[r]);s<0&&(s=n.length,n+=e[r]),t.fields.push({name:"offset "+r,type:"USHORT",value:o+s}),t.fields.push({name:"length "+r,type:"USHORT",value:e[r].length})}return t.fields.push({name:"stringPool",type:"CHARARRAY",value:n}),t},parse:function(e,t){const n=new pe.Parser(e,t),o=n.parseULong();N.argument(1===o,"Unsupported ltag table version."),n.skip("uLong",1);const r=n.parseULong(),s=[];for(let o=0;o<r;o++){let o="";const r=t+n.parseUShort(),a=n.parseUShort();for(let t=r;t<r+a;++t)o+=String.fromCharCode(e.getInt8(t));s.push(o)}return s}};var nt={parse:function(e,t){const n={},o=new pe.Parser(e,t);return n.version=o.parseVersion(),n.numGlyphs=o.parseUShort(),1===n.version&&(n.maxPoints=o.parseUShort(),n.maxContours=o.parseUShort(),n.maxCompositePoints=o.parseUShort(),n.maxCompositeContours=o.parseUShort(),n.maxZones=o.parseUShort(),n.maxTwilightPoints=o.parseUShort(),n.maxStorage=o.parseUShort(),n.maxFunctionDefs=o.parseUShort(),n.maxInstructionDefs=o.parseUShort(),n.maxStackElements=o.parseUShort(),n.maxSizeOfInstructions=o.parseUShort(),n.maxComponentElements=o.parseUShort(),n.maxComponentDepth=o.parseUShort()),n},make:function(e){return new oe.Table("maxp",[{name:"version",type:"FIXED",value:20480},{name:"numGlyphs",type:"USHORT",value:e}])}};const ot=["copyright","fontFamily","fontSubfamily","uniqueID","fullName","version","postScriptName","trademark","manufacturer","designer","description","manufacturerURL","designerURL","license","licenseURL","reserved","preferredFamily","preferredSubfamily","compatibleFullName","sampleText","postScriptFindFontName","wwsFamily","wwsSubfamily"],rt={0:"en",1:"fr",2:"de",3:"it",4:"nl",5:"sv",6:"es",7:"da",8:"pt",9:"no",10:"he",11:"ja",12:"ar",13:"fi",14:"el",15:"is",16:"mt",17:"tr",18:"hr",19:"zh-Hant",20:"ur",21:"hi",22:"th",23:"ko",24:"lt",25:"pl",26:"hu",27:"es",28:"lv",29:"se",30:"fo",31:"fa",32:"ru",33:"zh",34:"nl-BE",35:"ga",36:"sq",37:"ro",38:"cz",39:"sk",40:"si",41:"yi",42:"sr",43:"mk",44:"bg",45:"uk",46:"be",47:"uz",48:"kk",49:"az-Cyrl",50:"az-Arab",51:"hy",52:"ka",53:"mo",54:"ky",55:"tg",56:"tk",57:"mn-CN",58:"mn",59:"ps",60:"ks",61:"ku",62:"sd",63:"bo",64:"ne",65:"sa",66:"mr",67:"bn",68:"as",69:"gu",70:"pa",71:"or",72:"ml",73:"kn",74:"ta",75:"te",76:"si",77:"my",78:"km",79:"lo",80:"vi",81:"id",82:"tl",83:"ms",84:"ms-Arab",85:"am",86:"ti",87:"om",88:"so",89:"sw",90:"rw",91:"rn",92:"ny",93:"mg",94:"eo",128:"cy",129:"eu",130:"ca",131:"la",132:"qu",133:"gn",134:"ay",135:"tt",136:"ug",137:"dz",138:"jv",139:"su",140:"gl",141:"af",142:"br",143:"iu",144:"gd",145:"gv",146:"ga",147:"to",148:"el-polyton",149:"kl",150:"az",151:"nn"},st={0:0,1:0,2:0,3:0,4:0,5:0,6:0,7:0,8:0,9:0,10:5,11:1,12:4,13:0,14:6,15:0,16:0,17:0,18:0,19:2,20:4,21:9,22:21,23:3,24:29,25:29,26:29,27:29,28:29,29:0,30:0,31:4,32:7,33:25,34:0,35:0,36:0,37:0,38:29,39:29,40:0,41:5,42:7,43:7,44:7,45:7,46:7,47:7,48:7,49:7,50:4,51:24,52:23,53:7,54:7,55:7,56:7,57:27,58:7,59:4,60:4,61:4,62:4,63:26,64:9,65:9,66:9,67:13,68:13,69:11,70:10,71:12,72:17,73:16,74:14,75:15,76:18,77:19,78:20,79:22,80:30,81:0,82:0,83:0,84:4,85:28,86:28,87:28,88:0,89:0,90:0,91:0,92:0,93:0,94:0,128:0,129:0,130:0,131:0,132:0,133:0,134:0,135:7,136:4,137:26,138:0,139:0,140:0,141:0,142:0,143:28,144:0,145:0,146:0,147:0,148:6,149:0,150:0,151:0},at={1078:"af",1052:"sq",1156:"gsw",1118:"am",5121:"ar-DZ",15361:"ar-BH",3073:"ar",2049:"ar-IQ",11265:"ar-JO",13313:"ar-KW",12289:"ar-LB",4097:"ar-LY",6145:"ary",8193:"ar-OM",16385:"ar-QA",1025:"ar-SA",10241:"ar-SY",7169:"aeb",14337:"ar-AE",9217:"ar-YE",1067:"hy",1101:"as",2092:"az-Cyrl",1068:"az",1133:"ba",1069:"eu",1059:"be",2117:"bn",1093:"bn-IN",8218:"bs-Cyrl",5146:"bs",1150:"br",1026:"bg",1027:"ca",3076:"zh-HK",5124:"zh-MO",2052:"zh",4100:"zh-SG",1028:"zh-TW",1155:"co",1050:"hr",4122:"hr-BA",1029:"cs",1030:"da",1164:"prs",1125:"dv",2067:"nl-BE",1043:"nl",3081:"en-AU",10249:"en-BZ",4105:"en-CA",9225:"en-029",16393:"en-IN",6153:"en-IE",8201:"en-JM",17417:"en-MY",5129:"en-NZ",13321:"en-PH",18441:"en-SG",7177:"en-ZA",11273:"en-TT",2057:"en-GB",1033:"en",12297:"en-ZW",1061:"et",1080:"fo",1124:"fil",1035:"fi",2060:"fr-BE",3084:"fr-CA",1036:"fr",5132:"fr-LU",6156:"fr-MC",4108:"fr-CH",1122:"fy",1110:"gl",1079:"ka",3079:"de-AT",1031:"de",5127:"de-LI",4103:"de-LU",2055:"de-CH",1032:"el",1135:"kl",1095:"gu",1128:"ha",1037:"he",1081:"hi",1038:"hu",1039:"is",1136:"ig",1057:"id",1117:"iu",2141:"iu-Latn",2108:"ga",1076:"xh",1077:"zu",1040:"it",2064:"it-CH",1041:"ja",1099:"kn",1087:"kk",1107:"km",1158:"quc",1159:"rw",1089:"sw",1111:"kok",1042:"ko",1088:"ky",1108:"lo",1062:"lv",1063:"lt",2094:"dsb",1134:"lb",1071:"mk",2110:"ms-BN",1086:"ms",1100:"ml",1082:"mt",1153:"mi",1146:"arn",1102:"mr",1148:"moh",1104:"mn",2128:"mn-CN",1121:"ne",1044:"nb",2068:"nn",1154:"oc",1096:"or",1123:"ps",1045:"pl",1046:"pt",2070:"pt-PT",1094:"pa",1131:"qu-BO",2155:"qu-EC",3179:"qu",1048:"ro",1047:"rm",1049:"ru",9275:"smn",4155:"smj-NO",5179:"smj",3131:"se-FI",1083:"se",2107:"se-SE",8251:"sms",6203:"sma-NO",7227:"sms",1103:"sa",7194:"sr-Cyrl-BA",3098:"sr",6170:"sr-Latn-BA",2074:"sr-Latn",1132:"nso",1074:"tn",1115:"si",1051:"sk",1060:"sl",11274:"es-AR",16394:"es-BO",13322:"es-CL",9226:"es-CO",5130:"es-CR",7178:"es-DO",12298:"es-EC",17418:"es-SV",4106:"es-GT",18442:"es-HN",2058:"es-MX",19466:"es-NI",6154:"es-PA",15370:"es-PY",10250:"es-PE",20490:"es-PR",3082:"es",1034:"es",21514:"es-US",14346:"es-UY",8202:"es-VE",2077:"sv-FI",1053:"sv",1114:"syr",1064:"tg",2143:"tzm",1097:"ta",1092:"tt",1098:"te",1054:"th",1105:"bo",1055:"tr",1090:"tk",1152:"ug",1058:"uk",1070:"hsb",1056:"ur",2115:"uz-Cyrl",1091:"uz",1066:"vi",1106:"cy",1160:"wo",1157:"sah",1144:"ii",1130:"yo"};function it(e,t,n){switch(e){case 0:if(65535===t)return"und";if(n)return n[t];break;case 1:return rt[t];case 3:return at[t]}}const lt={0:"macintosh",1:"x-mac-japanese",2:"x-mac-chinesetrad",3:"x-mac-korean",6:"x-mac-greek",7:"x-mac-cyrillic",9:"x-mac-devanagai",10:"x-mac-gurmukhi",11:"x-mac-gujarati",12:"x-mac-oriya",13:"x-mac-bengali",14:"x-mac-tamil",15:"x-mac-telugu",16:"x-mac-kannada",17:"x-mac-malayalam",18:"x-mac-sinhalese",19:"x-mac-burmese",20:"x-mac-khmer",21:"x-mac-thai",22:"x-mac-lao",23:"x-mac-georgian",24:"x-mac-armenian",25:"x-mac-chinesesimp",26:"x-mac-tibetan",27:"x-mac-mongolian",28:"x-mac-ethiopic",29:"x-mac-ce",30:"x-mac-vietnamese",31:"x-mac-extarabic"},ct={15:"x-mac-icelandic",17:"x-mac-turkish",18:"x-mac-croatian",24:"x-mac-ce",25:"x-mac-ce",26:"x-mac-ce",27:"x-mac-ce",28:"x-mac-ce",30:"x-mac-icelandic",37:"x-mac-romanian",38:"x-mac-ce",39:"x-mac-ce",40:"x-mac-ce",143:"x-mac-inuit",146:"x-mac-gaelic"};function ut(e,t,n){switch(e){case 0:return"utf-16";case 1:return ct[n]||lt[t];case 3:if(1===t||10===t)return"utf-16"}}function pt(e){const t={};for(let n in e)t[e[n]]=parseInt(n);return t}function ht(e,t,n,o,r,s){return new oe.Record("NameRecord",[{name:"platformID",type:"USHORT",value:e},{name:"encodingID",type:"USHORT",value:t},{name:"languageID",type:"USHORT",value:n},{name:"nameID",type:"USHORT",value:o},{name:"length",type:"USHORT",value:r},{name:"offset",type:"USHORT",value:s}])}function ft(e,t){let n=function(e,t){const n=e.length,o=t.length-n+1;e:for(let r=0;r<o;r++)for(;r<o;r++){for(let o=0;o<n;o++)if(t[r+o]!==e[o])continue e;return r}return-1}(e,t);if(n<0){n=t.length;let o=0;const r=e.length;for(;o<r;++o)t.push(e[o])}return n}var dt={parse:function(e,t,n){const o={},r=new pe.Parser(e,t),s=r.parseUShort(),a=r.parseUShort(),i=r.offset+r.parseUShort();for(let t=0;t<a;t++){const t=r.parseUShort(),s=r.parseUShort(),a=r.parseUShort(),l=r.parseUShort(),c=ot[l]||l,u=r.parseUShort(),p=r.parseUShort(),h=it(t,a,n),f=ut(t,s,a);if(void 0!==f&&void 0!==h){let t;if(t="utf-16"===f?P.UTF16(e,i+p,u):P.MACSTRING(e,i+p,u,f),t){let e=o[c];void 0===e&&(e=o[c]={}),e[h]=t}}}return 1===s&&r.parseUShort(),o},make:function(e,t){let n;const o=[],r={},s=pt(ot);for(let t in e){let a=s[t];if(void 0===a&&(a=t),n=parseInt(a),isNaN(n))throw new Error('Name table entry "'+t+'" does not exist, see nameTableNames for complete list.');r[n]=e[t],o.push(n)}const a=pt(rt),i=pt(at),l=[],c=[];for(let e=0;e<o.length;e++){n=o[e];const s=r[n];for(let e in s){const o=s[e];let r=1,u=a[e],p=st[u];const h=ut(r,p,u);let f=A.MACSTRING(o,h);void 0===f&&(r=0,u=t.indexOf(e),u<0&&(u=t.length,t.push(e)),p=4,f=A.UTF16(o));const d=ft(f,c);l.push(ht(r,p,u,n,f.length,d));const g=i[e];if(void 0!==g){const e=A.UTF16(o),t=ft(e,c);l.push(ht(3,1,g,n,e.length,t))}}}l.sort((function(e,t){return e.platformID-t.platformID||e.encodingID-t.encodingID||e.languageID-t.languageID||e.nameID-t.nameID}));const u=new oe.Table("name",[{name:"format",type:"USHORT",value:0},{name:"count",type:"USHORT",value:l.length},{name:"stringOffset",type:"USHORT",value:6+12*l.length}]);for(let e=0;e<l.length;e++)u.fields.push({name:"record_"+e,type:"RECORD",value:l[e]});return u.fields.push({name:"strings",type:"LITERAL",value:c}),u}};const gt=[{begin:0,end:127},{begin:128,end:255},{begin:256,end:383},{begin:384,end:591},{begin:592,end:687},{begin:688,end:767},{begin:768,end:879},{begin:880,end:1023},{begin:11392,end:11519},{begin:1024,end:1279},{begin:1328,end:1423},{begin:1424,end:1535},{begin:42240,end:42559},{begin:1536,end:1791},{begin:1984,end:2047},{begin:2304,end:2431},{begin:2432,end:2559},{begin:2560,end:2687},{begin:2688,end:2815},{begin:2816,end:2943},{begin:2944,end:3071},{begin:3072,end:3199},{begin:3200,end:3327},{begin:3328,end:3455},{begin:3584,end:3711},{begin:3712,end:3839},{begin:4256,end:4351},{begin:6912,end:7039},{begin:4352,end:4607},{begin:7680,end:7935},{begin:7936,end:8191},{begin:8192,end:8303},{begin:8304,end:8351},{begin:8352,end:8399},{begin:8400,end:8447},{begin:8448,end:8527},{begin:8528,end:8591},{begin:8592,end:8703},{begin:8704,end:8959},{begin:8960,end:9215},{begin:9216,end:9279},{begin:9280,end:9311},{begin:9312,end:9471},{begin:9472,end:9599},{begin:9600,end:9631},{begin:9632,end:9727},{begin:9728,end:9983},{begin:9984,end:10175},{begin:12288,end:12351},{begin:12352,end:12447},{begin:12448,end:12543},{begin:12544,end:12591},{begin:12592,end:12687},{begin:43072,end:43135},{begin:12800,end:13055},{begin:13056,end:13311},{begin:44032,end:55215},{begin:55296,end:57343},{begin:67840,end:67871},{begin:19968,end:40959},{begin:57344,end:63743},{begin:12736,end:12783},{begin:64256,end:64335},{begin:64336,end:65023},{begin:65056,end:65071},{begin:65040,end:65055},{begin:65104,end:65135},{begin:65136,end:65279},{begin:65280,end:65519},{begin:65520,end:65535},{begin:3840,end:4095},{begin:1792,end:1871},{begin:1920,end:1983},{begin:3456,end:3583},{begin:4096,end:4255},{begin:4608,end:4991},{begin:5024,end:5119},{begin:5120,end:5759},{begin:5760,end:5791},{begin:5792,end:5887},{begin:6016,end:6143},{begin:6144,end:6319},{begin:10240,end:10495},{begin:40960,end:42127},{begin:5888,end:5919},{begin:66304,end:66351},{begin:66352,end:66383},{begin:66560,end:66639},{begin:118784,end:119039},{begin:119808,end:120831},{begin:1044480,end:1048573},{begin:65024,end:65039},{begin:917504,end:917631},{begin:6400,end:6479},{begin:6480,end:6527},{begin:6528,end:6623},{begin:6656,end:6687},{begin:11264,end:11359},{begin:11568,end:11647},{begin:19904,end:19967},{begin:43008,end:43055},{begin:65536,end:65663},{begin:65856,end:65935},{begin:66432,end:66463},{begin:66464,end:66527},{begin:66640,end:66687},{begin:66688,end:66735},{begin:67584,end:67647},{begin:68096,end:68191},{begin:119552,end:119647},{begin:73728,end:74751},{begin:119648,end:119679},{begin:7040,end:7103},{begin:7168,end:7247},{begin:7248,end:7295},{begin:43136,end:43231},{begin:43264,end:43311},{begin:43312,end:43359},{begin:43520,end:43615},{begin:65936,end:65999},{begin:66e3,end:66047},{begin:66208,end:66271},{begin:127024,end:127135}];var mt={parse:function(e,t){const n={},o=new pe.Parser(e,t);n.version=o.parseUShort(),n.xAvgCharWidth=o.parseShort(),n.usWeightClass=o.parseUShort(),n.usWidthClass=o.parseUShort(),n.fsType=o.parseUShort(),n.ySubscriptXSize=o.parseShort(),n.ySubscriptYSize=o.parseShort(),n.ySubscriptXOffset=o.parseShort(),n.ySubscriptYOffset=o.parseShort(),n.ySuperscriptXSize=o.parseShort(),n.ySuperscriptYSize=o.parseShort(),n.ySuperscriptXOffset=o.parseShort(),n.ySuperscriptYOffset=o.parseShort(),n.yStrikeoutSize=o.parseShort(),n.yStrikeoutPosition=o.parseShort(),n.sFamilyClass=o.parseShort(),n.panose=[];for(let e=0;e<10;e++)n.panose[e]=o.parseByte();return n.ulUnicodeRange1=o.parseULong(),n.ulUnicodeRange2=o.parseULong(),n.ulUnicodeRange3=o.parseULong(),n.ulUnicodeRange4=o.parseULong(),n.achVendID=String.fromCharCode(o.parseByte(),o.parseByte(),o.parseByte(),o.parseByte()),n.fsSelection=o.parseUShort(),n.usFirstCharIndex=o.parseUShort(),n.usLastCharIndex=o.parseUShort(),n.sTypoAscender=o.parseShort(),n.sTypoDescender=o.parseShort(),n.sTypoLineGap=o.parseShort(),n.usWinAscent=o.parseUShort(),n.usWinDescent=o.parseUShort(),n.version>=1&&(n.ulCodePageRange1=o.parseULong(),n.ulCodePageRange2=o.parseULong()),n.version>=2&&(n.sxHeight=o.parseShort(),n.sCapHeight=o.parseShort(),n.usDefaultChar=o.parseUShort(),n.usBreakChar=o.parseUShort(),n.usMaxContent=o.parseUShort()),n},make:function(e){return new oe.Table("OS/2",[{name:"version",type:"USHORT",value:3},{name:"xAvgCharWidth",type:"SHORT",value:0},{name:"usWeightClass",type:"USHORT",value:0},{name:"usWidthClass",type:"USHORT",value:0},{name:"fsType",type:"USHORT",value:0},{name:"ySubscriptXSize",type:"SHORT",value:650},{name:"ySubscriptYSize",type:"SHORT",value:699},{name:"ySubscriptXOffset",type:"SHORT",value:0},{name:"ySubscriptYOffset",type:"SHORT",value:140},{name:"ySuperscriptXSize",type:"SHORT",value:650},{name:"ySuperscriptYSize",type:"SHORT",value:699},{name:"ySuperscriptXOffset",type:"SHORT",value:0},{name:"ySuperscriptYOffset",type:"SHORT",value:479},{name:"yStrikeoutSize",type:"SHORT",value:49},{name:"yStrikeoutPosition",type:"SHORT",value:258},{name:"sFamilyClass",type:"SHORT",value:0},{name:"bFamilyType",type:"BYTE",value:0},{name:"bSerifStyle",type:"BYTE",value:0},{name:"bWeight",type:"BYTE",value:0},{name:"bProportion",type:"BYTE",value:0},{name:"bContrast",type:"BYTE",value:0},{name:"bStrokeVariation",type:"BYTE",value:0},{name:"bArmStyle",type:"BYTE",value:0},{name:"bLetterform",type:"BYTE",value:0},{name:"bMidline",type:"BYTE",value:0},{name:"bXHeight",type:"BYTE",value:0},{name:"ulUnicodeRange1",type:"ULONG",value:0},{name:"ulUnicodeRange2",type:"ULONG",value:0},{name:"ulUnicodeRange3",type:"ULONG",value:0},{name:"ulUnicodeRange4",type:"ULONG",value:0},{name:"achVendID",type:"CHARARRAY",value:"XXXX"},{name:"fsSelection",type:"USHORT",value:0},{name:"usFirstCharIndex",type:"USHORT",value:0},{name:"usLastCharIndex",type:"USHORT",value:0},{name:"sTypoAscender",type:"SHORT",value:0},{name:"sTypoDescender",type:"SHORT",value:0},{name:"sTypoLineGap",type:"SHORT",value:0},{name:"usWinAscent",type:"USHORT",value:0},{name:"usWinDescent",type:"USHORT",value:0},{name:"ulCodePageRange1",type:"ULONG",value:0},{name:"ulCodePageRange2",type:"ULONG",value:0},{name:"sxHeight",type:"SHORT",value:0},{name:"sCapHeight",type:"SHORT",value:0},{name:"usDefaultChar",type:"USHORT",value:0},{name:"usBreakChar",type:"USHORT",value:0},{name:"usMaxContext",type:"USHORT",value:0}],e)},unicodeRanges:gt,getUnicodeRange:function(e){for(let t=0;t<gt.length;t+=1){const n=gt[t];if(e>=n.begin&&e<n.end)return t}return-1}};var yt={parse:function(e,t){const n={},o=new pe.Parser(e,t);switch(n.version=o.parseVersion(),n.italicAngle=o.parseFixed(),n.underlinePosition=o.parseShort(),n.underlineThickness=o.parseShort(),n.isFixedPitch=o.parseULong(),n.minMemType42=o.parseULong(),n.maxMemType42=o.parseULong(),n.minMemType1=o.parseULong(),n.maxMemType1=o.parseULong(),n.version){case 1:n.names=ye.slice();break;case 2:n.numberOfGlyphs=o.parseUShort(),n.glyphNameIndex=new Array(n.numberOfGlyphs);for(let e=0;e<n.numberOfGlyphs;e++)n.glyphNameIndex[e]=o.parseUShort();n.names=[];for(let e=0;e<n.numberOfGlyphs;e++)if(n.glyphNameIndex[e]>=ye.length){const e=o.parseChar();n.names.push(o.parseString(e))}break;case 2.5:n.numberOfGlyphs=o.parseUShort(),n.offset=new Array(n.numberOfGlyphs);for(let e=0;e<n.numberOfGlyphs;e++)n.offset[e]=o.parseChar()}return n},make:function(){return new oe.Table("post",[{name:"version",type:"FIXED",value:196608},{name:"italicAngle",type:"FIXED",value:0},{name:"underlinePosition",type:"FWORD",value:0},{name:"underlineThickness",type:"FWORD",value:0},{name:"isFixedPitch",type:"ULONG",value:0},{name:"minMemType42",type:"ULONG",value:0},{name:"maxMemType42",type:"ULONG",value:0},{name:"minMemType1",type:"ULONG",value:0},{name:"maxMemType1",type:"ULONG",value:0}])}};const vt=new Array(9);vt[1]=function(){const e=this.offset+this.relativeOffset,t=this.parseUShort();return 1===t?{substFormat:1,coverage:this.parsePointer(ce.coverage),deltaGlyphId:this.parseUShort()}:2===t?{substFormat:2,coverage:this.parsePointer(ce.coverage),substitute:this.parseOffset16List()}:void N.assert(!1,"0x"+e.toString(16)+": lookup type 1 format must be 1 or 2.")},vt[2]=function(){const e=this.parseUShort();return N.argument(1===e,"GSUB Multiple Substitution Subtable identifier-format must be 1"),{substFormat:e,coverage:this.parsePointer(ce.coverage),sequences:this.parseListOfLists()}},vt[3]=function(){const e=this.parseUShort();return N.argument(1===e,"GSUB Alternate Substitution Subtable identifier-format must be 1"),{substFormat:e,coverage:this.parsePointer(ce.coverage),alternateSets:this.parseListOfLists()}},vt[4]=function(){const e=this.parseUShort();return N.argument(1===e,"GSUB ligature table identifier-format must be 1"),{substFormat:e,coverage:this.parsePointer(ce.coverage),ligatureSets:this.parseListOfLists((function(){return{ligGlyph:this.parseUShort(),components:this.parseUShortList(this.parseUShort()-1)}}))}};const bt={sequenceIndex:ce.uShort,lookupListIndex:ce.uShort};vt[5]=function(){const e=this.offset+this.relativeOffset,t=this.parseUShort();if(1===t)return{substFormat:t,coverage:this.parsePointer(ce.coverage),ruleSets:this.parseListOfLists((function(){const e=this.parseUShort(),t=this.parseUShort();return{input:this.parseUShortList(e-1),lookupRecords:this.parseRecordList(t,bt)}}))};if(2===t)return{substFormat:t,coverage:this.parsePointer(ce.coverage),classDef:this.parsePointer(ce.classDef),classSets:this.parseListOfLists((function(){const e=this.parseUShort(),t=this.parseUShort();return{classes:this.parseUShortList(e-1),lookupRecords:this.parseRecordList(t,bt)}}))};if(3===t){const e=this.parseUShort(),n=this.parseUShort();return{substFormat:t,coverages:this.parseList(e,ce.pointer(ce.coverage)),lookupRecords:this.parseRecordList(n,bt)}}N.assert(!1,"0x"+e.toString(16)+": lookup type 5 format must be 1, 2 or 3.")},vt[6]=function(){const e=this.offset+this.relativeOffset,t=this.parseUShort();return 1===t?{substFormat:1,coverage:this.parsePointer(ce.coverage),chainRuleSets:this.parseListOfLists((function(){return{backtrack:this.parseUShortList(),input:this.parseUShortList(this.parseShort()-1),lookahead:this.parseUShortList(),lookupRecords:this.parseRecordList(bt)}}))}:2===t?{substFormat:2,coverage:this.parsePointer(ce.coverage),backtrackClassDef:this.parsePointer(ce.classDef),inputClassDef:this.parsePointer(ce.classDef),lookaheadClassDef:this.parsePointer(ce.classDef),chainClassSet:this.parseListOfLists((function(){return{backtrack:this.parseUShortList(),input:this.parseUShortList(this.parseShort()-1),lookahead:this.parseUShortList(),lookupRecords:this.parseRecordList(bt)}}))}:3===t?{substFormat:3,backtrackCoverage:this.parseList(ce.pointer(ce.coverage)),inputCoverage:this.parseList(ce.pointer(ce.coverage)),lookaheadCoverage:this.parseList(ce.pointer(ce.coverage)),lookupRecords:this.parseRecordList(bt)}:void N.assert(!1,"0x"+e.toString(16)+": lookup type 6 format must be 1, 2 or 3.")},vt[7]=function(){const e=this.parseUShort();N.argument(1===e,"GSUB Extension Substitution subtable identifier-format must be 1");const t=this.parseUShort(),n=new ce(this.data,this.offset+this.parseULong());return{substFormat:1,lookupType:t,extension:vt[t].call(n)}},vt[8]=function(){const e=this.parseUShort();return N.argument(1===e,"GSUB Reverse Chaining Contextual Single Substitution Subtable identifier-format must be 1"),{substFormat:e,coverage:this.parsePointer(ce.coverage),backtrackCoverage:this.parseList(ce.pointer(ce.coverage)),lookaheadCoverage:this.parseList(ce.pointer(ce.coverage)),substitutes:this.parseUShortList()}};const St=new Array(9);St[1]=function(e){return 1===e.substFormat?new oe.Table("substitutionTable",[{name:"substFormat",type:"USHORT",value:1},{name:"coverage",type:"TABLE",value:new oe.Coverage(e.coverage)},{name:"deltaGlyphID",type:"USHORT",value:e.deltaGlyphId}]):new oe.Table("substitutionTable",[{name:"substFormat",type:"USHORT",value:2},{name:"coverage",type:"TABLE",value:new oe.Coverage(e.coverage)}].concat(oe.ushortList("substitute",e.substitute)))},St[3]=function(e){return N.assert(1===e.substFormat,"Lookup type 3 substFormat must be 1."),new oe.Table("substitutionTable",[{name:"substFormat",type:"USHORT",value:1},{name:"coverage",type:"TABLE",value:new oe.Coverage(e.coverage)}].concat(oe.tableList("altSet",e.alternateSets,(function(e){return new oe.Table("alternateSetTable",oe.ushortList("alternate",e))}))))},St[4]=function(e){return N.assert(1===e.substFormat,"Lookup type 4 substFormat must be 1."),new oe.Table("substitutionTable",[{name:"substFormat",type:"USHORT",value:1},{name:"coverage",type:"TABLE",value:new oe.Coverage(e.coverage)}].concat(oe.tableList("ligSet",e.ligatureSets,(function(e){return new oe.Table("ligatureSetTable",oe.tableList("ligature",e,(function(e){return new oe.Table("ligatureTable",[{name:"ligGlyph",type:"USHORT",value:e.ligGlyph}].concat(oe.ushortList("component",e.components,e.components.length+1)))})))}))))};var xt={parse:function(e,t){const n=new ce(e,t=t||0),o=n.parseVersion();return N.argument(1===o,"Unsupported GSUB table version."),{version:o,scripts:n.parseScriptList(),features:n.parseFeatureList(),lookups:n.parseLookupList(vt)}},make:function(e){return new oe.Table("GSUB",[{name:"version",type:"ULONG",value:65536},{name:"scripts",type:"TABLE",value:new oe.ScriptList(e.scripts)},{name:"features",type:"TABLE",value:new oe.FeatureList(e.features)},{name:"lookups",type:"TABLE",value:new oe.LookupList(e.lookups,St)}])}};var Ut={parse:function(e,t){const n=new pe.Parser(e,t),o=n.parseULong();N.argument(1===o,"Unsupported META table version."),n.parseULong(),n.parseULong();const r=n.parseULong(),s={};for(let o=0;o<r;o++){const o=n.parseTag(),r=n.parseULong(),a=n.parseULong(),i=P.UTF8(e,t+r,a);s[o]=i}return s},make:function(e){const t=Object.keys(e).length;let n="";const o=16+12*t,r=new oe.Table("meta",[{name:"version",type:"ULONG",value:1},{name:"flags",type:"ULONG",value:0},{name:"offset",type:"ULONG",value:o},{name:"numTags",type:"ULONG",value:t}]);for(let t in e){const s=n.length;n+=e[t],r.fields.push({name:"tag "+t,type:"TAG",value:t}),r.fields.push({name:"offset "+t,type:"ULONG",value:o+s}),r.fields.push({name:"length "+t,type:"ULONG",value:e[t].length})}return r.fields.push({name:"stringPool",type:"CHARARRAY",value:n}),r}};function Tt(e){return Math.log(e)/Math.log(2)|0}function Et(e){for(;e.length%4!=0;)e.push(0);let t=0;for(let n=0;n<e.length;n+=4)t+=(e[n]<<24)+(e[n+1]<<16)+(e[n+2]<<8)+e[n+3];return t%=Math.pow(2,32),t}function Ot(e,t,n,o){return new oe.Record("Table Record",[{name:"tag",type:"TAG",value:void 0!==e?e:""},{name:"checkSum",type:"ULONG",value:void 0!==t?t:0},{name:"offset",type:"ULONG",value:void 0!==n?n:0},{name:"length",type:"ULONG",value:void 0!==o?o:0}])}function wt(e){const t=new oe.Table("sfnt",[{name:"version",type:"TAG",value:"OTTO"},{name:"numTables",type:"USHORT",value:0},{name:"searchRange",type:"USHORT",value:0},{name:"entrySelector",type:"USHORT",value:0},{name:"rangeShift",type:"USHORT",value:0}]);t.tables=e,t.numTables=e.length;const n=Math.pow(2,Tt(t.numTables));t.searchRange=16*n,t.entrySelector=Tt(n),t.rangeShift=16*t.numTables-t.searchRange;const o=[],r=[];let s=t.sizeOf()+Ot().sizeOf()*t.numTables;for(;s%4!=0;)s+=1,r.push({name:"padding",type:"BYTE",value:0});for(let t=0;t<e.length;t+=1){const n=e[t];N.argument(4===n.tableName.length,"Table name"+n.tableName+" is invalid.");const a=n.sizeOf(),i=Ot(n.tableName,Et(n.encode()),s,a);for(o.push({name:i.tag+" Table Record",type:"RECORD",value:i}),r.push({name:n.tableName+" table",type:"RECORD",value:n}),s+=a,N.argument(!isNaN(s),"Something went wrong calculating the offset.");s%4!=0;)s+=1,r.push({name:"padding",type:"BYTE",value:0})}return o.sort((function(e,t){return e.value.tag>t.value.tag?1:-1})),t.fields=t.fields.concat(o),t.fields=t.fields.concat(r),t}function kt(e,t,n){for(let n=0;n<t.length;n+=1){const o=e.charToGlyphIndex(t[n]);if(o>0){return e.glyphs.get(o).getMetrics()}}return n}function Rt(e){let t=0;for(let n=0;n<e.length;n+=1)t+=e[n];return t/e.length}var Dt={make:wt,fontToTable:function(e){const t=[],n=[],o=[],r=[],s=[],a=[],i=[];let l,c=0,u=0,p=0,h=0,f=0;for(let d=0;d<e.glyphs.length;d+=1){const g=e.glyphs.get(d),m=0|g.unicode;if(isNaN(g.advanceWidth))throw new Error("Glyph "+g.name+" ("+d+"): advanceWidth is not a number.");(l>m||void 0===l)&&m>0&&(l=m),c<m&&(c=m);const y=mt.getUnicodeRange(m);if(y<32)u|=1<<y;else if(y<64)p|=1<<y-32;else if(y<96)h|=1<<y-64;else{if(!(y<123))throw new Error("Unicode ranges bits > 123 are reserved for internal usage");f|=1<<y-96}if(".notdef"===g.name)continue;const v=g.getMetrics();t.push(v.xMin),n.push(v.yMin),o.push(v.xMax),r.push(v.yMax),a.push(v.leftSideBearing),i.push(v.rightSideBearing),s.push(g.advanceWidth)}const d={xMin:Math.min.apply(null,t),yMin:Math.min.apply(null,n),xMax:Math.max.apply(null,o),yMax:Math.max.apply(null,r),advanceWidthMax:Math.max.apply(null,s),advanceWidthAvg:Rt(s),minLeftSideBearing:Math.min.apply(null,a),maxLeftSideBearing:Math.max.apply(null,a),minRightSideBearing:Math.min.apply(null,i)};d.ascender=e.ascender,d.descender=e.descender;const g=Ke.make({flags:3,unitsPerEm:e.unitsPerEm,xMin:d.xMin,yMin:d.yMin,xMax:d.xMax,yMax:d.yMax,lowestRecPPEM:3,createdTimestamp:e.createdTimestamp}),m=Je.make({ascender:d.ascender,descender:d.descender,advanceWidthMax:d.advanceWidthMax,minLeftSideBearing:d.minLeftSideBearing,minRightSideBearing:d.minRightSideBearing,xMaxExtent:d.maxLeftSideBearing+(d.xMax-d.xMin),numberOfHMetrics:e.glyphs.length}),y=nt.make(e.glyphs.length),v=mt.make({xAvgCharWidth:Math.round(d.advanceWidthAvg),usWeightClass:e.tables.os2.usWeightClass,usWidthClass:e.tables.os2.usWidthClass,usFirstCharIndex:l,usLastCharIndex:c,ulUnicodeRange1:u,ulUnicodeRange2:p,ulUnicodeRange3:h,ulUnicodeRange4:f,fsSelection:e.tables.os2.fsSelection,sTypoAscender:d.ascender,sTypoDescender:d.descender,sTypoLineGap:0,usWinAscent:d.yMax,usWinDescent:Math.abs(d.yMin),ulCodePageRange1:1,sxHeight:kt(e,"xyvw",{yMax:Math.round(d.ascender/2)}).yMax,sCapHeight:kt(e,"HIKLEFJMNTZBDPRAGOQSUVWXY",d).yMax,usDefaultChar:e.hasChar(" ")?32:0,usBreakChar:e.hasChar(" ")?32:0}),b=et.make(e.glyphs),S=fe.make(e.glyphs),x=e.getEnglishName("fontFamily"),U=e.getEnglishName("fontSubfamily"),T=x+" "+U;let E=e.getEnglishName("postScriptName");E||(E=x.replace(/\s/g,"")+"-"+U);const O={};for(let t in e.names)O[t]=e.names[t];O.uniqueID||(O.uniqueID={en:e.getEnglishName("manufacturer")+":"+T}),O.postScriptName||(O.postScriptName={en:E}),O.preferredFamily||(O.preferredFamily=e.names.fontFamily),O.preferredSubfamily||(O.preferredSubfamily=e.names.fontSubfamily);const w=[],k=dt.make(O,w),R=w.length>0?tt.make(w):void 0,D=yt.make(),C=$e.make(e.glyphs,{version:e.getEnglishName("version"),fullName:T,familyName:x,weightName:U,postScriptName:E,unitsPerEm:e.unitsPerEm,fontBBox:[0,d.yMin,d.ascender,d.advanceWidthMax]}),L=e.metas&&Object.keys(e.metas).length>0?Ut.make(e.metas):void 0,I=[g,m,y,v,k,S,D,C,b];R&&I.push(R),e.tables.gsub&&I.push(xt.make(e.tables.gsub)),L&&I.push(L);const M=wt(I),B=Et(M.encode()),G=M.fields;let N=!1;for(let e=0;e<G.length;e+=1)if("head table"===G[e].name){G[e].value.checkSumAdjustment=2981146554-B,N=!0;break}if(!N)throw new Error("Could not find head table with checkSum to adjust.");return M},computeCheckSum:Et};function Ct(e,t){let n=0,o=e.length-1;for(;n<=o;){const r=n+o>>>1,s=e[r].tag;if(s===t)return r;s<t?n=r+1:o=r-1}return-n-1}function Lt(e,t){this.font=e,this.tableName=t}function It(e){Lt.call(this,e,"gsub")}function Mt(e,t){const n=e.length;if(n!==t.length)return!1;for(let o=0;o<n;o++)if(e[o]!==t[o])return!1;return!0}function Bt(e,t,n){const o=e.subtables;for(let e=0;e<o.length;e++){const n=o[e];if(n.substFormat===t)return n}if(n)return o.push(n),n}function Gt(e){const t=new ArrayBuffer(e.length),n=new Uint8Array(t);for(let t=0;t<e.length;++t)n[t]=e[t];return t}function Nt(e,t){if(!e)throw t}let Pt,At,Ft,Ht;function zt(e){this.font=e,this._fpgmState=this._prepState=void 0,this._errorState=0}function Wt(e){return e}function _t(e){return Math.sign(e)*Math.round(Math.abs(e))}function qt(e){return Math.sign(e)*Math.round(Math.abs(2*e))/2}function Xt(e){return Math.sign(e)*(Math.round(Math.abs(e)+.5)-.5)}function Vt(e){return Math.sign(e)*Math.ceil(Math.abs(e))}function jt(e){return Math.sign(e)*Math.floor(Math.abs(e))}Lt.prototype={searchTag:Ct,binSearch:function(e,t){let n=0,o=e.length-1;for(;n<=o;){const r=n+o>>>1,s=e[r];if(s===t)return r;s<t?n=r+1:o=r-1}return-n-1},getTable:function(e){let t=this.font.tables[this.tableName];return!t&&e&&(t=this.font.tables[this.tableName]=this.createDefaultTable()),t},getScriptNames:function(){let e=this.getTable();return e?e.scripts.map((function(e){return e.tag})):[]},getDefaultScriptName:function(){let e=this.getTable();if(!e)return;let t=!1;for(let n=0;n<e.scripts.length;n++){const o=e.scripts[n].tag;if("DFLT"===o)return o;"latn"===o&&(t=!0)}return t?"latn":void 0},getScriptTable:function(e,t){const n=this.getTable(t);if(n){e=e||"DFLT";const o=n.scripts,r=Ct(n.scripts,e);if(r>=0)return o[r].script;if(t){const t={tag:e,script:{defaultLangSys:{reserved:0,reqFeatureIndex:65535,featureIndexes:[]},langSysRecords:[]}};return o.splice(-1-r,0,t),t.script}}},getLangSysTable:function(e,t,n){const o=this.getScriptTable(e,n);if(o){if(!t||"dflt"===t||"DFLT"===t)return o.defaultLangSys;const e=Ct(o.langSysRecords,t);if(e>=0)return o.langSysRecords[e].langSys;if(n){const n={tag:t,langSys:{reserved:0,reqFeatureIndex:65535,featureIndexes:[]}};return o.langSysRecords.splice(-1-e,0,n),n.langSys}}},getFeatureTable:function(e,t,n,o){const r=this.getLangSysTable(e,t,o);if(r){let e;const t=r.featureIndexes,s=this.font.tables[this.tableName].features;for(let o=0;o<t.length;o++)if(e=s[t[o]],e.tag===n)return e.feature;if(o){const o=s.length;return N.assert(0===o||n>=s[o-1].tag,"Features must be added in alphabetical order."),e={tag:n,feature:{params:0,lookupListIndexes:[]}},s.push(e),t.push(o),e.feature}}},getLookupTables:function(e,t,n,o,r){const s=this.getFeatureTable(e,t,n,r),a=[];if(s){let e;const t=s.lookupListIndexes,n=this.font.tables[this.tableName].lookups;for(let r=0;r<t.length;r++)e=n[t[r]],e.lookupType===o&&a.push(e);if(0===a.length&&r){e={lookupType:o,lookupFlag:0,subtables:[],markFilteringSet:void 0};const r=n.length;return n.push(e),t.push(r),[e]}}return a},expandCoverage:function(e){if(1===e.format)return e.glyphs;{const t=[],n=e.ranges;for(let e=0;e<n.length;e++){const o=n[e],r=o.start,s=o.end;for(let e=r;e<=s;e++)t.push(e)}return t}}},It.prototype=Lt.prototype,It.prototype.createDefaultTable=function(){return{version:1,scripts:[{tag:"DFLT",script:{defaultLangSys:{reserved:0,reqFeatureIndex:65535,featureIndexes:[]},langSysRecords:[]}}],features:[],lookups:[]}},It.prototype.getSingle=function(e,t,n){const o=[],r=this.getLookupTables(t,n,e,1);for(let e=0;e<r.length;e++){const t=r[e].subtables;for(let e=0;e<t.length;e++){const n=t[e],r=this.expandCoverage(n.coverage);let s;if(1===n.substFormat){const e=n.deltaGlyphId;for(s=0;s<r.length;s++){const t=r[s];o.push({sub:t,by:t+e})}}else{const e=n.substitute;for(s=0;s<r.length;s++)o.push({sub:r[s],by:e[s]})}}}return o},It.prototype.getAlternates=function(e,t,n){const o=[],r=this.getLookupTables(t,n,e,3);for(let e=0;e<r.length;e++){const t=r[e].subtables;for(let e=0;e<t.length;e++){const n=t[e],r=this.expandCoverage(n.coverage),s=n.alternateSets;for(let e=0;e<r.length;e++)o.push({sub:r[e],by:s[e]})}}return o},It.prototype.getLigatures=function(e,t,n){const o=[],r=this.getLookupTables(t,n,e,4);for(let e=0;e<r.length;e++){const t=r[e].subtables;for(let e=0;e<t.length;e++){const n=t[e],r=this.expandCoverage(n.coverage),s=n.ligatureSets;for(let e=0;e<r.length;e++){const t=r[e],n=s[e];for(let e=0;e<n.length;e++){const r=n[e];o.push({sub:[t].concat(r.components),by:r.ligGlyph})}}}}return o},It.prototype.addSingle=function(e,t,n,o){const r=Bt(this.getLookupTables(n,o,e,1,!0)[0],2,{substFormat:2,coverage:{format:1,glyphs:[]},substitute:[]});N.assert(1===r.coverage.format,"Ligature: unable to modify coverage table format "+r.coverage.format);const s=t.sub;let a=this.binSearch(r.coverage.glyphs,s);a<0&&(a=-1-a,r.coverage.glyphs.splice(a,0,s),r.substitute.splice(a,0,0)),r.substitute[a]=t.by},It.prototype.addAlternate=function(e,t,n,o){const r=Bt(this.getLookupTables(n,o,e,3,!0)[0],1,{substFormat:1,coverage:{format:1,glyphs:[]},alternateSets:[]});N.assert(1===r.coverage.format,"Ligature: unable to modify coverage table format "+r.coverage.format);const s=t.sub;let a=this.binSearch(r.coverage.glyphs,s);a<0&&(a=-1-a,r.coverage.glyphs.splice(a,0,s),r.alternateSets.splice(a,0,0)),r.alternateSets[a]=t.by},It.prototype.addLigature=function(e,t,n,o){const r=this.getLookupTables(n,o,e,4,!0)[0];let s=r.subtables[0];s||(s={substFormat:1,coverage:{format:1,glyphs:[]},ligatureSets:[]},r.subtables[0]=s),N.assert(1===s.coverage.format,"Ligature: unable to modify coverage table format "+s.coverage.format);const a=t.sub[0],i=t.sub.slice(1),l={ligGlyph:t.by,components:i};let c=this.binSearch(s.coverage.glyphs,a);if(c>=0){const e=s.ligatureSets[c];for(let t=0;t<e.length;t++)if(Mt(e[t].components,i))return;e.push(l)}else c=-1-c,s.coverage.glyphs.splice(c,0,a),s.ligatureSets.splice(c,0,[l])},It.prototype.getFeature=function(e,t,n){if(/ss\d\d/.test(e))return this.getSingle(e,t,n);switch(e){case"aalt":case"salt":return this.getSingle(e,t,n).concat(this.getAlternates(e,t,n));case"dlig":case"liga":case"rlig":return this.getLigatures(e,t,n)}},It.prototype.add=function(e,t,n,o){if(/ss\d\d/.test(e))return this.addSingle(e,t,n,o);switch(e){case"aalt":case"salt":return"number"==typeof t.by?this.addSingle(e,t,n,o):this.addAlternate(e,t,n,o);case"dlig":case"liga":case"rlig":return this.addLigature(e,t,n,o)}};const Yt=function(e){const t=this.srPeriod;let n=this.srPhase;let o=1;return e<0&&(e=-e,o=-1),e+=this.srThreshold-n,e=Math.trunc(e/t)*t,e+=n,o>0&&e<0?n:o<0&&e>0?-n:e*o},Zt={x:1,y:0,axis:"x",distance:function(e,t,n,o){return(n?e.xo:e.x)-(o?t.xo:t.x)},interpolate:function(e,t,n,o){let r,s,a,i,l,c,u;if(!o||o===this)return r=e.xo-t.xo,s=e.xo-n.xo,l=t.x-t.xo,c=n.x-n.xo,a=Math.abs(r),i=Math.abs(s),u=a+i,0===u?void(e.x=e.xo+(l+c)/2):void(e.x=e.xo+(l*i+c*a)/u);r=o.distance(e,t,!0,!0),s=o.distance(e,n,!0,!0),l=o.distance(t,t,!1,!0),c=o.distance(n,n,!1,!0),a=Math.abs(r),i=Math.abs(s),u=a+i,0!==u?Zt.setRelative(e,e,(l*i+c*a)/u,o,!0):Zt.setRelative(e,e,(l+c)/2,o,!0)},normalSlope:Number.NEGATIVE_INFINITY,setRelative:function(e,t,n,o,r){if(!o||o===this)return void(e.x=(r?t.xo:t.x)+n);const s=r?t.xo:t.x,a=r?t.yo:t.y,i=s+n*o.x,l=a+n*o.y;e.x=i+(e.y-l)/o.normalSlope},slope:0,touch:function(e){e.xTouched=!0},touched:function(e){return e.xTouched},untouch:function(e){e.xTouched=!1}},Qt={x:0,y:1,axis:"y",distance:function(e,t,n,o){return(n?e.yo:e.y)-(o?t.yo:t.y)},interpolate:function(e,t,n,o){let r,s,a,i,l,c,u;if(!o||o===this)return r=e.yo-t.yo,s=e.yo-n.yo,l=t.y-t.yo,c=n.y-n.yo,a=Math.abs(r),i=Math.abs(s),u=a+i,0===u?void(e.y=e.yo+(l+c)/2):void(e.y=e.yo+(l*i+c*a)/u);r=o.distance(e,t,!0,!0),s=o.distance(e,n,!0,!0),l=o.distance(t,t,!1,!0),c=o.distance(n,n,!1,!0),a=Math.abs(r),i=Math.abs(s),u=a+i,0!==u?Qt.setRelative(e,e,(l*i+c*a)/u,o,!0):Qt.setRelative(e,e,(l+c)/2,o,!0)},normalSlope:0,setRelative:function(e,t,n,o,r){if(!o||o===this)return void(e.y=(r?t.yo:t.y)+n);const s=r?t.xo:t.x,a=r?t.yo:t.y,i=s+n*o.x,l=a+n*o.y;e.y=l+o.normalSlope*(e.x-i)},slope:Number.POSITIVE_INFINITY,touch:function(e){e.yTouched=!0},touched:function(e){return e.yTouched},untouch:function(e){e.yTouched=!1}};function $t(e,t){this.x=e,this.y=t,this.axis=void 0,this.slope=t/e,this.normalSlope=-e/t,Object.freeze(this)}function Kt(e,t){const n=Math.sqrt(e*e+t*t);return t/=n,1===(e/=n)&&0===t?Zt:0===e&&1===t?Qt:new $t(e,t)}function Jt(e,t,n,o){this.x=this.xo=Math.round(64*e)/64,this.y=this.yo=Math.round(64*t)/64,this.lastPointOfContour=n,this.onCurve=o,this.prevPointOnContour=void 0,this.nextPointOnContour=void 0,this.xTouched=!1,this.yTouched=!1,Object.preventExtensions(this)}Object.freeze(Zt),Object.freeze(Qt),$t.prototype.distance=function(e,t,n,o){return this.x*Zt.distance(e,t,n,o)+this.y*Qt.distance(e,t,n,o)},$t.prototype.interpolate=function(e,t,n,o){let r,s,a,i,l,c,u;a=o.distance(e,t,!0,!0),i=o.distance(e,n,!0,!0),r=o.distance(t,t,!1,!0),s=o.distance(n,n,!1,!0),l=Math.abs(a),c=Math.abs(i),u=l+c,0!==u?this.setRelative(e,e,(r*c+s*l)/u,o,!0):this.setRelative(e,e,(r+s)/2,o,!0)},$t.prototype.setRelative=function(e,t,n,o,r){o=o||this;const s=r?t.xo:t.x,a=r?t.yo:t.y,i=s+n*o.x,l=a+n*o.y,c=o.normalSlope,u=this.slope,p=e.x,h=e.y;e.x=(u*p-c*i+l-h)/(u-c),e.y=u*(e.x-p)+h},$t.prototype.touch=function(e){e.xTouched=!0,e.yTouched=!0},Jt.prototype.nextTouched=function(e){let t=this.nextPointOnContour;for(;!e.touched(t)&&t!==this;)t=t.nextPointOnContour;return t},Jt.prototype.prevTouched=function(e){let t=this.prevPointOnContour;for(;!e.touched(t)&&t!==this;)t=t.prevPointOnContour;return t};const en=Object.freeze(new Jt(0,0)),tn={cvCutIn:17/16,deltaBase:9,deltaShift:.125,loop:1,minDis:1,autoFlip:!0};function nn(e,t){switch(this.env=e,this.stack=[],this.prog=t,e){case"glyf":this.zp0=this.zp1=this.zp2=1,this.rp0=this.rp1=this.rp2=0;case"prep":this.fv=this.pv=this.dpv=Zt,this.round=_t}}function on(e){const t=e.tZone=new Array(e.gZone.length);for(let e=0;e<t.length;e++)t[e]=new Jt(0,0)}function rn(e,t){const n=e.prog;let o,r=e.ip,s=1;do{if(o=n[++r],88===o)s++;else if(89===o)s--;else if(64===o)r+=n[r+1]+1;else if(65===o)r+=2*n[r+1]+1;else if(o>=176&&o<=183)r+=o-176+1;else if(o>=184&&o<=191)r+=2*(o-184+1);else if(t&&1===s&&27===o)break}while(s>0);e.ip=r}function sn(e,t){exports.DEBUG&&console.log(t.step,"SVTCA["+e.axis+"]"),t.fv=t.pv=t.dpv=e}function an(e,t){exports.DEBUG&&console.log(t.step,"SPVTCA["+e.axis+"]"),t.pv=t.dpv=e}function ln(e,t){exports.DEBUG&&console.log(t.step,"SFVTCA["+e.axis+"]"),t.fv=e}function cn(e,t){const n=t.stack,o=n.pop(),r=n.pop(),s=t.z2[o],a=t.z1[r];let i,l;exports.DEBUG&&console.log("SPVTL["+e+"]",o,r),e?(i=s.y-a.y,l=a.x-s.x):(i=a.x-s.x,l=a.y-s.y),t.pv=t.dpv=Kt(i,l)}function un(e,t){const n=t.stack,o=n.pop(),r=n.pop(),s=t.z2[o],a=t.z1[r];let i,l;exports.DEBUG&&console.log("SFVTL["+e+"]",o,r),e?(i=s.y-a.y,l=a.x-s.x):(i=a.x-s.x,l=a.y-s.y),t.fv=Kt(i,l)}function pn(e){exports.DEBUG&&console.log(e.step,"POP[]"),e.stack.pop()}function hn(e,t){const n=t.stack.pop(),o=t.z0[n],r=t.fv,s=t.pv;exports.DEBUG&&console.log(t.step,"MDAP["+e+"]",n);let a=s.distance(o,en);e&&(a=t.round(a)),r.setRelative(o,en,a,s),r.touch(o),t.rp0=t.rp1=n}function fn(e,t){const n=t.z2,o=n.length-2;let r,s,a;exports.DEBUG&&console.log(t.step,"IUP["+e.axis+"]");for(let t=0;t<o;t++)r=n[t],e.touched(r)||(s=r.prevTouched(e),s!==r&&(a=r.nextTouched(e),s===a&&e.setRelative(r,r,e.distance(s,s,!1,!0),e,!0),e.interpolate(r,s,a,e)))}function dn(e,t){const n=t.stack,o=e?t.rp1:t.rp2,r=(e?t.z0:t.z1)[o],s=t.fv,a=t.pv;let i=t.loop;const l=t.z2;for(;i--;){const o=n.pop(),c=l[o],u=a.distance(r,r,!1,!0);s.setRelative(c,c,u,a),s.touch(c),exports.DEBUG&&console.log(t.step,(t.loop>1?"loop "+(t.loop-i)+": ":"")+"SHP["+(e?"rp1":"rp2")+"]",o)}t.loop=1}function gn(e,t){const n=t.stack,o=e?t.rp1:t.rp2,r=(e?t.z0:t.z1)[o],s=t.fv,a=t.pv,i=n.pop(),l=t.z2[t.contours[i]];let c=l;exports.DEBUG&&console.log(t.step,"SHC["+e+"]",i);const u=a.distance(r,r,!1,!0);do{c!==r&&s.setRelative(c,c,u,a),c=c.nextPointOnContour}while(c!==l)}function mn(e,t){const n=t.stack,o=e?t.rp1:t.rp2,r=(e?t.z0:t.z1)[o],s=t.fv,a=t.pv,i=n.pop();let l,c;switch(exports.DEBUG&&console.log(t.step,"SHZ["+e+"]",i),i){case 0:l=t.tZone;break;case 1:l=t.gZone;break;default:throw new Error("Invalid zone")}const u=a.distance(r,r,!1,!0),p=l.length-2;for(let e=0;e<p;e++)c=l[e],c!==r&&s.setRelative(c,c,u,a)}function yn(e,t){const n=t.stack,o=n.pop()/64,r=n.pop(),s=t.z1[r],a=t.z0[t.rp0],i=t.fv,l=t.pv;i.setRelative(s,a,o,l),i.touch(s),exports.DEBUG&&console.log(t.step,"MSIRP["+e+"]",o,r),t.rp1=t.rp0,t.rp2=r,e&&(t.rp0=r)}function vn(e,t){const n=t.stack,o=n.pop(),r=n.pop(),s=t.z0[r],a=t.fv,i=t.pv;let l=t.cvt[o];e&&(l=t.round(l)),exports.DEBUG&&console.log(t.step,"MIAP["+e+"]",o,"(",l,")",r),a.setRelative(s,en,l,i),0===t.zp0&&(s.xo=s.x,s.yo=s.y),a.touch(s),t.rp0=t.rp1=r}function bn(e,t){const n=t.stack,o=n.pop(),r=t.z2[o];exports.DEBUG&&console.log(t.step,"GC["+e+"]",o),n.push(64*t.dpv.distance(r,en,e,!1))}function Sn(e,t){const n=t.stack,o=n.pop(),r=n.pop(),s=t.z1[o],a=t.z0[r],i=t.dpv.distance(a,s,e,e);exports.DEBUG&&console.log(t.step,"MD["+e+"]",o,r,"->",i),t.stack.push(Math.round(64*i))}function xn(e,t){const n=t.stack,o=n.pop(),r=t.fv,s=t.pv,a=t.ppem,i=t.deltaBase+16*(e-1),l=t.deltaShift,c=t.z0;exports.DEBUG&&console.log(t.step,"DELTAP["+e+"]",o,n);for(let e=0;e<o;e++){const e=n.pop(),o=n.pop();if(i+((240&o)>>4)!==a)continue;let u=(15&o)-8;u>=0&&u++,exports.DEBUG&&console.log(t.step,"DELTAPFIX",e,"by",u*l);const p=c[e];r.setRelative(p,p,u*l,s)}}function Un(e,t){const n=t.stack,o=n.pop();exports.DEBUG&&console.log(t.step,"ROUND[]"),n.push(64*t.round(o/64))}function Tn(e,t){const n=t.stack,o=n.pop(),r=t.ppem,s=t.deltaBase+16*(e-1),a=t.deltaShift;exports.DEBUG&&console.log(t.step,"DELTAC["+e+"]",o,n);for(let e=0;e<o;e++){const e=n.pop(),o=n.pop();if(s+((240&o)>>4)!==r)continue;let i=(15&o)-8;i>=0&&i++;const l=i*a;exports.DEBUG&&console.log(t.step,"DELTACFIX",e,"by",l),t.cvt[e]+=l}}function En(e,t){const n=t.stack,o=n.pop(),r=n.pop(),s=t.z2[o],a=t.z1[r];let i,l;exports.DEBUG&&console.log("SDPVTL["+e+"]",o,r),e?(i=s.y-a.y,l=a.x-s.x):(i=a.x-s.x,l=a.y-s.y),t.dpv=Kt(i,l)}function On(e,t){const n=t.stack,o=t.prog;let r=t.ip;exports.DEBUG&&console.log(t.step,"PUSHB["+e+"]");for(let t=0;t<e;t++)n.push(o[++r]);t.ip=r}function wn(e,t){let n=t.ip;const o=t.prog,r=t.stack;exports.DEBUG&&console.log(t.ip,"PUSHW["+e+"]");for(let t=0;t<e;t++){let e=o[++n]<<8|o[++n];32768&e&&(e=-(1+(65535^e))),r.push(e)}t.ip=n}function kn(e,t,n,o,r,s){const a=s.stack,i=e&&a.pop(),l=a.pop(),c=s.rp0,u=s.z0[c],p=s.z1[l],h=s.minDis,f=s.fv,d=s.dpv;let g,m,y,v;m=g=d.distance(p,u,!0,!0),y=m>=0?1:-1,m=Math.abs(m),e&&(v=s.cvt[i],o&&Math.abs(m-v)<s.cvCutIn&&(m=v)),n&&m<h&&(m=h),o&&(m=s.round(m)),f.setRelative(p,u,y*m,d),f.touch(p),exports.DEBUG&&console.log(s.step,(e?"MIRP[":"MDRP[")+(t?"M":"m")+(n?">":"_")+(o?"R":"_")+(0===r?"Gr":1===r?"Bl":2===r?"Wh":"")+"]",e?i+"("+s.cvt[i]+","+v+")":"",l,"(d =",g,"->",y*m,")"),s.rp1=s.rp0,s.rp2=l,t&&(s.rp0=l)}function Rn(e){(e=e||{}).empty||(Nt(e.familyName,"When creating a new Font object, familyName is required."),Nt(e.styleName,"When creating a new Font object, styleName is required."),Nt(e.unitsPerEm,"When creating a new Font object, unitsPerEm is required."),Nt(e.ascender,"When creating a new Font object, ascender is required."),Nt(e.descender,"When creating a new Font object, descender is required."),Nt(e.descender<0,"Descender should be negative (e.g. -512)."),this.names={fontFamily:{en:e.familyName||" "},fontSubfamily:{en:e.styleName||" "},fullName:{en:e.fullName||e.familyName+" "+e.styleName},postScriptName:{en:e.postScriptName||e.familyName+e.styleName},designer:{en:e.designer||" "},designerURL:{en:e.designerURL||" "},manufacturer:{en:e.manufacturer||" "},manufacturerURL:{en:e.manufacturerURL||" "},license:{en:e.license||" "},licenseURL:{en:e.licenseURL||" "},version:{en:e.version||"Version 0.1"},description:{en:e.description||" "},copyright:{en:e.copyright||" "},trademark:{en:e.trademark||" "}},this.unitsPerEm=e.unitsPerEm||1e3,this.ascender=e.ascender,this.descender=e.descender,this.createdTimestamp=e.createdTimestamp,this.tables={os2:{usWeightClass:e.weightClass||this.usWeightClasses.MEDIUM,usWidthClass:e.widthClass||this.usWidthClasses.MEDIUM,fsSelection:e.fsSelection||this.fsSelectionValues.REGULAR}}),this.supported=!0,this.glyphs=new Ie.GlyphSet(this,e.glyphs||[]),this.encoding=new ve(this),this.substitution=new It(this),this.tables=this.tables||{},Object.defineProperty(this,"hinting",{get:function(){return this._hinting?this._hinting:"truetype"===this.outlinesFormat?this._hinting=new zt(this):void 0}})}function Dn(e,t){const n=JSON.stringify(e);let o=256;for(let e in t){let r=parseInt(e);if(r&&!(r<256)){if(JSON.stringify(t[e])===n)return r;o<=r&&(o=r+1)}}return t[o]=e,o}function Cn(e,t,n){const o=Dn(t.name,n);return[{name:"tag_"+e,type:"TAG",value:t.tag},{name:"minValue_"+e,type:"FIXED",value:t.minValue<<16},{name:"defaultValue_"+e,type:"FIXED",value:t.defaultValue<<16},{name:"maxValue_"+e,type:"FIXED",value:t.maxValue<<16},{name:"flags_"+e,type:"USHORT",value:0},{name:"nameID_"+e,type:"USHORT",value:o}]}function Ln(e,t,n){const o={},r=new pe.Parser(e,t);return o.tag=r.parseTag(),o.minValue=r.parseFixed(),o.defaultValue=r.parseFixed(),o.maxValue=r.parseFixed(),r.skip("uShort",1),o.name=n[r.parseUShort()]||{},o}function In(e,t,n,o){const r=[{name:"nameID_"+e,type:"USHORT",value:Dn(t.name,o)},{name:"flags_"+e,type:"USHORT",value:0}];for(let o=0;o<n.length;++o){const s=n[o].tag;r.push({name:"axis_"+e+" "+s,type:"FIXED",value:t.coordinates[s]<<16})}return r}function Mn(e,t,n,o){const r={},s=new pe.Parser(e,t);r.name=o[s.parseUShort()]||{},s.skip("uShort",1),r.coordinates={};for(let e=0;e<n.length;++e)r.coordinates[n[e].tag]=s.parseFixed();return r}zt.prototype.exec=function(e,t){if("number"!=typeof t)throw new Error("Point size is not a number!");if(this._errorState>2)return;const n=this.font;let o=this._prepState;if(!o||o.ppem!==t){let e=this._fpgmState;if(!e){nn.prototype=tn,e=this._fpgmState=new nn("fpgm",n.tables.fpgm),e.funcs=[],e.font=n,exports.DEBUG&&(console.log("---EXEC FPGM---"),e.step=-1);try{At(e)}catch(e){return console.log("Hinting error in FPGM:"+e),void(this._errorState=3)}}nn.prototype=e,o=this._prepState=new nn("prep",n.tables.prep),o.ppem=t;const r=n.tables.cvt;if(r){const e=o.cvt=new Array(r.length),s=t/n.unitsPerEm;for(let t=0;t<r.length;t++)e[t]=r[t]*s}else o.cvt=[];exports.DEBUG&&(console.log("---EXEC PREP---"),o.step=-1);try{At(o)}catch(e){this._errorState<2&&console.log("Hinting error in PREP:"+e),this._errorState=2}}if(!(this._errorState>1))try{return Ft(e,o)}catch(e){return this._errorState<1&&(console.log("Hinting error:"+e),console.log("Note: further hinting errors are silenced")),void(this._errorState=1)}},Ft=function(e,t){const n=t.ppem/t.font.unitsPerEm,o=n;let r,s,a,i=e.components;if(nn.prototype=t,i){const l=t.font;s=[],r=[];for(let e=0;e<i.length;e++){const t=i[e],c=l.glyphs.get(t.glyphIndex);a=new nn("glyf",c.instructions),exports.DEBUG&&(console.log("---EXEC COMP "+e+"---"),a.step=-1),Ht(c,a,n,o);const u=Math.round(t.dx*n),p=Math.round(t.dy*o),h=a.gZone,f=a.contours;for(let e=0;e<h.length;e++){const t=h[e];t.xTouched=t.yTouched=!1,t.xo=t.x=t.x+u,t.yo=t.y=t.y+p}const d=s.length;s.push.apply(s,h);for(let e=0;e<f.length;e++)r.push(f[e]+d)}e.instructions&&!a.inhibitGridFit&&(a=new nn("glyf",e.instructions),a.gZone=a.z0=a.z1=a.z2=s,a.contours=r,s.push(new Jt(0,0),new Jt(Math.round(e.advanceWidth*n),0)),exports.DEBUG&&(console.log("---EXEC COMPOSITE---"),a.step=-1),At(a),s.length-=2)}else a=new nn("glyf",e.instructions),exports.DEBUG&&(console.log("---EXEC GLYPH---"),a.step=-1),Ht(e,a,n,o),s=a.gZone;return s},Ht=function(e,t,n,o){const r=e.points||[],s=r.length,a=t.gZone=t.z0=t.z1=t.z2=[],i=t.contours=[];let l,c,u;for(let e=0;e<s;e++)l=r[e],a[e]=new Jt(l.x*n,l.y*o,l.lastPointOfContour,l.onCurve);for(let e=0;e<s;e++)l=a[e],c||(c=l,i.push(e)),l.lastPointOfContour?(l.nextPointOnContour=c,c.prevPointOnContour=l,c=void 0):(u=a[e+1],l.nextPointOnContour=u,u.prevPointOnContour=l);if(!t.inhibitGridFit&&(a.push(new Jt(0,0),new Jt(Math.round(e.advanceWidth*n),0)),At(t),a.length-=2,exports.DEBUG)){console.log("FINISHED GLYPH",t.stack);for(let e=0;e<s;e++)console.log(e,a[e].x,a[e].y)}},At=function(e){let t=e.prog;if(!t)return;const n=t.length;let o;for(e.ip=0;e.ip<n;e.ip++){if(exports.DEBUG&&e.step++,o=Pt[t[e.ip]],!o)throw new Error("unknown instruction: 0x"+Number(t[e.ip]).toString(16));o(e)}},Pt=[sn.bind(void 0,Qt),sn.bind(void 0,Zt),an.bind(void 0,Qt),an.bind(void 0,Zt),ln.bind(void 0,Qt),ln.bind(void 0,Zt),cn.bind(void 0,0),cn.bind(void 0,1),un.bind(void 0,0),un.bind(void 0,1),function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"SPVFS[]",n,o),e.pv=e.dpv=Kt(o,n)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"SPVFS[]",n,o),e.fv=Kt(o,n)},function(e){const t=e.stack,n=e.pv;exports.DEBUG&&console.log(e.step,"GPV[]"),t.push(16384*n.x),t.push(16384*n.y)},function(e){const t=e.stack,n=e.fv;exports.DEBUG&&console.log(e.step,"GFV[]"),t.push(16384*n.x),t.push(16384*n.y)},function(e){e.fv=e.pv,exports.DEBUG&&console.log(e.step,"SFVTPV[]")},function(e){const t=e.stack,n=t.pop(),o=t.pop(),r=t.pop(),s=t.pop(),a=t.pop(),i=e.z0,l=e.z1,c=i[n],u=i[o],p=l[r],h=l[s],f=e.z2[a];exports.DEBUG&&console.log("ISECT[], ",n,o,r,s,a);const d=c.x,g=c.y,m=u.x,y=u.y,v=p.x,b=p.y,S=h.x,x=h.y,U=(d-m)*(b-x)-(g-y)*(v-S),T=d*y-g*m,E=v*x-b*S;f.x=(T*(v-S)-E*(d-m))/U,f.y=(T*(b-x)-E*(g-y))/U},function(e){e.rp0=e.stack.pop(),exports.DEBUG&&console.log(e.step,"SRP0[]",e.rp0)},function(e){e.rp1=e.stack.pop(),exports.DEBUG&&console.log(e.step,"SRP1[]",e.rp1)},function(e){e.rp2=e.stack.pop(),exports.DEBUG&&console.log(e.step,"SRP2[]",e.rp2)},function(e){const t=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"SZP0[]",t),e.zp0=t,t){case 0:e.tZone||on(e),e.z0=e.tZone;break;case 1:e.z0=e.gZone;break;default:throw new Error("Invalid zone pointer")}},function(e){const t=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"SZP1[]",t),e.zp1=t,t){case 0:e.tZone||on(e),e.z1=e.tZone;break;case 1:e.z1=e.gZone;break;default:throw new Error("Invalid zone pointer")}},function(e){const t=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"SZP2[]",t),e.zp2=t,t){case 0:e.tZone||on(e),e.z2=e.tZone;break;case 1:e.z2=e.gZone;break;default:throw new Error("Invalid zone pointer")}},function(e){const t=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"SZPS[]",t),e.zp0=e.zp1=e.zp2=t,t){case 0:e.tZone||on(e),e.z0=e.z1=e.z2=e.tZone;break;case 1:e.z0=e.z1=e.z2=e.gZone;break;default:throw new Error("Invalid zone pointer")}},function(e){e.loop=e.stack.pop(),exports.DEBUG&&console.log(e.step,"SLOOP[]",e.loop)},function(e){exports.DEBUG&&console.log(e.step,"RTG[]"),e.round=_t},function(e){exports.DEBUG&&console.log(e.step,"RTHG[]"),e.round=Xt},function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"SMD[]",t),e.minDis=t/64},function(e){exports.DEBUG&&console.log(e.step,"ELSE[]"),rn(e,!1)},function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"JMPR[]",t),e.ip+=t-1},function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"SCVTCI[]",t),e.cvCutIn=t/64},void 0,void 0,function(e){const t=e.stack;exports.DEBUG&&console.log(e.step,"DUP[]"),t.push(t[t.length-1])},pn,function(e){exports.DEBUG&&console.log(e.step,"CLEAR[]"),e.stack.length=0},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"SWAP[]"),t.push(n),t.push(o)},function(e){const t=e.stack;exports.DEBUG&&console.log(e.step,"DEPTH[]"),t.push(t.length)},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"CINDEX[]",n),t.push(t[t.length-n])},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"MINDEX[]",n),t.push(t.splice(t.length-n,1)[0])},void 0,void 0,void 0,function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"LOOPCALL[]",n,o);const r=e.ip,s=e.prog;e.prog=e.funcs[n];for(let t=0;t<o;t++)At(e),exports.DEBUG&&console.log(++e.step,t+1<o?"next loopcall":"done loopcall",t);e.ip=r,e.prog=s},function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"CALL[]",t);const n=e.ip,o=e.prog;e.prog=e.funcs[t],At(e),e.ip=n,e.prog=o,exports.DEBUG&&console.log(++e.step,"returning from",t)},function(e){if("fpgm"!==e.env)throw new Error("FDEF not allowed here");const t=e.stack,n=e.prog;let o=e.ip;const r=t.pop(),s=o;for(exports.DEBUG&&console.log(e.step,"FDEF[]",r);45!==n[++o];);e.ip=o,e.funcs[r]=n.slice(s+1,o)},void 0,hn.bind(void 0,0),hn.bind(void 0,1),fn.bind(void 0,Qt),fn.bind(void 0,Zt),dn.bind(void 0,0),dn.bind(void 0,1),gn.bind(void 0,0),gn.bind(void 0,1),mn.bind(void 0,0),mn.bind(void 0,1),function(e){const t=e.stack;let n=e.loop;const o=e.fv,r=t.pop()/64,s=e.z2;for(;n--;){const a=t.pop(),i=s[a];exports.DEBUG&&console.log(e.step,(e.loop>1?"loop "+(e.loop-n)+": ":"")+"SHPIX[]",a,r),o.setRelative(i,i,r),o.touch(i)}e.loop=1},function(e){const t=e.stack,n=e.rp1,o=e.rp2;let r=e.loop;const s=e.z0[n],a=e.z1[o],i=e.fv,l=e.dpv,c=e.z2;for(;r--;){const u=t.pop(),p=c[u];exports.DEBUG&&console.log(e.step,(e.loop>1?"loop "+(e.loop-r)+": ":"")+"IP[]",u,n,"<->",o),i.interpolate(p,s,a,l),i.touch(p)}e.loop=1},yn.bind(void 0,0),yn.bind(void 0,1),function(e){const t=e.stack,n=e.rp0,o=e.z0[n];let r=e.loop;const s=e.fv,a=e.pv,i=e.z1;for(;r--;){const n=t.pop(),l=i[n];exports.DEBUG&&console.log(e.step,(e.loop>1?"loop "+(e.loop-r)+": ":"")+"ALIGNRP[]",n),s.setRelative(l,o,0,a),s.touch(l)}e.loop=1},function(e){exports.DEBUG&&console.log(e.step,"RTDG[]"),e.round=qt},vn.bind(void 0,0),vn.bind(void 0,1),function(e){const t=e.prog;let n=e.ip;const o=e.stack,r=t[++n];exports.DEBUG&&console.log(e.step,"NPUSHB[]",r);for(let e=0;e<r;e++)o.push(t[++n]);e.ip=n},function(e){let t=e.ip;const n=e.prog,o=e.stack,r=n[++t];exports.DEBUG&&console.log(e.step,"NPUSHW[]",r);for(let e=0;e<r;e++){let e=n[++t]<<8|n[++t];32768&e&&(e=-(1+(65535^e))),o.push(e)}e.ip=t},function(e){const t=e.stack;let n=e.store;n||(n=e.store=[]);const o=t.pop(),r=t.pop();exports.DEBUG&&console.log(e.step,"WS",o,r),n[r]=o},function(e){const t=e.stack,n=e.store,o=t.pop();exports.DEBUG&&console.log(e.step,"RS",o);const r=n&&n[o]||0;t.push(r)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"WCVTP",n,o),e.cvt[o]=n/64},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"RCVT",n),t.push(64*e.cvt[n])},bn.bind(void 0,0),bn.bind(void 0,1),void 0,Sn.bind(void 0,0),Sn.bind(void 0,1),function(e){exports.DEBUG&&console.log(e.step,"MPPEM[]"),e.stack.push(e.ppem)},void 0,function(e){exports.DEBUG&&console.log(e.step,"FLIPON[]"),e.autoFlip=!0},void 0,void 0,function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"LT[]",n,o),t.push(o<n?1:0)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"LTEQ[]",n,o),t.push(o<=n?1:0)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"GT[]",n,o),t.push(o>n?1:0)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"GTEQ[]",n,o),t.push(o>=n?1:0)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"EQ[]",n,o),t.push(n===o?1:0)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"NEQ[]",n,o),t.push(n!==o?1:0)},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"ODD[]",n),t.push(Math.trunc(n)%2?1:0)},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"EVEN[]",n),t.push(Math.trunc(n)%2?0:1)},function(e){let t=e.stack.pop();exports.DEBUG&&console.log(e.step,"IF[]",t),t||(rn(e,!0),exports.DEBUG&&console.log(e.step,"EIF[]"))},function(e){exports.DEBUG&&console.log(e.step,"EIF[]")},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"AND[]",n,o),t.push(n&&o?1:0)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"OR[]",n,o),t.push(n||o?1:0)},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"NOT[]",n),t.push(n?0:1)},xn.bind(void 0,1),function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"SDB[]",t),e.deltaBase=t},function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"SDS[]",t),e.deltaShift=Math.pow(.5,t)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"ADD[]",n,o),t.push(o+n)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"SUB[]",n,o),t.push(o-n)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"DIV[]",n,o),t.push(64*o/n)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"MUL[]",n,o),t.push(o*n/64)},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"ABS[]",n),t.push(Math.abs(n))},function(e){const t=e.stack;let n=t.pop();exports.DEBUG&&console.log(e.step,"NEG[]",n),t.push(-n)},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"FLOOR[]",n),t.push(64*Math.floor(n/64))},function(e){const t=e.stack,n=t.pop();exports.DEBUG&&console.log(e.step,"CEILING[]",n),t.push(64*Math.ceil(n/64))},Un.bind(void 0,0),Un.bind(void 0,1),Un.bind(void 0,2),Un.bind(void 0,3),void 0,void 0,void 0,void 0,function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"WCVTF[]",n,o),e.cvt[o]=n*e.ppem/e.font.unitsPerEm},xn.bind(void 0,2),xn.bind(void 0,3),Tn.bind(void 0,1),Tn.bind(void 0,2),Tn.bind(void 0,3),function(e){let t,n=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"SROUND[]",n),e.round=Yt,192&n){case 0:t=.5;break;case 64:t=1;break;case 128:t=2;break;default:throw new Error("invalid SROUND value")}switch(e.srPeriod=t,48&n){case 0:e.srPhase=0;break;case 16:e.srPhase=.25*t;break;case 32:e.srPhase=.5*t;break;case 48:e.srPhase=.75*t;break;default:throw new Error("invalid SROUND value")}n&=15,e.srThreshold=0===n?0:(n/8-.5)*t},function(e){let t,n=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"S45ROUND[]",n),e.round=Yt,192&n){case 0:t=Math.sqrt(2)/2;break;case 64:t=Math.sqrt(2);break;case 128:t=2*Math.sqrt(2);break;default:throw new Error("invalid S45ROUND value")}switch(e.srPeriod=t,48&n){case 0:e.srPhase=0;break;case 16:e.srPhase=.25*t;break;case 32:e.srPhase=.5*t;break;case 48:e.srPhase=.75*t;break;default:throw new Error("invalid S45ROUND value")}n&=15,e.srThreshold=0===n?0:(n/8-.5)*t},void 0,void 0,function(e){exports.DEBUG&&console.log(e.step,"ROFF[]"),e.round=Wt},void 0,function(e){exports.DEBUG&&console.log(e.step,"RUTG[]"),e.round=Vt},function(e){exports.DEBUG&&console.log(e.step,"RDTG[]"),e.round=jt},pn,pn,void 0,void 0,void 0,void 0,void 0,function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"SCANCTRL[]",t)},En.bind(void 0,0),En.bind(void 0,1),function(e){const t=e.stack,n=t.pop();let o=0;exports.DEBUG&&console.log(e.step,"GETINFO[]",n),1&n&&(o=35),32&n&&(o|=4096),t.push(o)},void 0,function(e){const t=e.stack,n=t.pop(),o=t.pop(),r=t.pop();exports.DEBUG&&console.log(e.step,"ROLL[]"),t.push(o),t.push(n),t.push(r)},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"MAX[]",n,o),t.push(Math.max(o,n))},function(e){const t=e.stack,n=t.pop(),o=t.pop();exports.DEBUG&&console.log(e.step,"MIN[]",n,o),t.push(Math.min(o,n))},function(e){const t=e.stack.pop();exports.DEBUG&&console.log(e.step,"SCANTYPE[]",t)},function(e){const t=e.stack.pop();let n=e.stack.pop();switch(exports.DEBUG&&console.log(e.step,"INSTCTRL[]",t,n),t){case 1:return void(e.inhibitGridFit=!!n);case 2:return void(e.ignoreCvt=!!n);default:throw new Error("invalid INSTCTRL[] selector")}},void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,void 0,On.bind(void 0,1),On.bind(void 0,2),On.bind(void 0,3),On.bind(void 0,4),On.bind(void 0,5),On.bind(void 0,6),On.bind(void 0,7),On.bind(void 0,8),wn.bind(void 0,1),wn.bind(void 0,2),wn.bind(void 0,3),wn.bind(void 0,4),wn.bind(void 0,5),wn.bind(void 0,6),wn.bind(void 0,7),wn.bind(void 0,8),kn.bind(void 0,0,0,0,0,0),kn.bind(void 0,0,0,0,0,1),kn.bind(void 0,0,0,0,0,2),kn.bind(void 0,0,0,0,0,3),kn.bind(void 0,0,0,0,1,0),kn.bind(void 0,0,0,0,1,1),kn.bind(void 0,0,0,0,1,2),kn.bind(void 0,0,0,0,1,3),kn.bind(void 0,0,0,1,0,0),kn.bind(void 0,0,0,1,0,1),kn.bind(void 0,0,0,1,0,2),kn.bind(void 0,0,0,1,0,3),kn.bind(void 0,0,0,1,1,0),kn.bind(void 0,0,0,1,1,1),kn.bind(void 0,0,0,1,1,2),kn.bind(void 0,0,0,1,1,3),kn.bind(void 0,0,1,0,0,0),kn.bind(void 0,0,1,0,0,1),kn.bind(void 0,0,1,0,0,2),kn.bind(void 0,0,1,0,0,3),kn.bind(void 0,0,1,0,1,0),kn.bind(void 0,0,1,0,1,1),kn.bind(void 0,0,1,0,1,2),kn.bind(void 0,0,1,0,1,3),kn.bind(void 0,0,1,1,0,0),kn.bind(void 0,0,1,1,0,1),kn.bind(void 0,0,1,1,0,2),kn.bind(void 0,0,1,1,0,3),kn.bind(void 0,0,1,1,1,0),kn.bind(void 0,0,1,1,1,1),kn.bind(void 0,0,1,1,1,2),kn.bind(void 0,0,1,1,1,3),kn.bind(void 0,1,0,0,0,0),kn.bind(void 0,1,0,0,0,1),kn.bind(void 0,1,0,0,0,2),kn.bind(void 0,1,0,0,0,3),kn.bind(void 0,1,0,0,1,0),kn.bind(void 0,1,0,0,1,1),kn.bind(void 0,1,0,0,1,2),kn.bind(void 0,1,0,0,1,3),kn.bind(void 0,1,0,1,0,0),kn.bind(void 0,1,0,1,0,1),kn.bind(void 0,1,0,1,0,2),kn.bind(void 0,1,0,1,0,3),kn.bind(void 0,1,0,1,1,0),kn.bind(void 0,1,0,1,1,1),kn.bind(void 0,1,0,1,1,2),kn.bind(void 0,1,0,1,1,3),kn.bind(void 0,1,1,0,0,0),kn.bind(void 0,1,1,0,0,1),kn.bind(void 0,1,1,0,0,2),kn.bind(void 0,1,1,0,0,3),kn.bind(void 0,1,1,0,1,0),kn.bind(void 0,1,1,0,1,1),kn.bind(void 0,1,1,0,1,2),kn.bind(void 0,1,1,0,1,3),kn.bind(void 0,1,1,1,0,0),kn.bind(void 0,1,1,1,0,1),kn.bind(void 0,1,1,1,0,2),kn.bind(void 0,1,1,1,0,3),kn.bind(void 0,1,1,1,1,0),kn.bind(void 0,1,1,1,1,1),kn.bind(void 0,1,1,1,1,2),kn.bind(void 0,1,1,1,1,3)],Rn.prototype.hasChar=function(e){return null!==this.encoding.charToGlyphIndex(e)},Rn.prototype.charToGlyphIndex=function(e){return this.encoding.charToGlyphIndex(e)},Rn.prototype.charToGlyph=function(e){const t=this.charToGlyphIndex(e);let n=this.glyphs.get(t);return n||(n=this.glyphs.get(0)),n},Rn.prototype.stringToGlyphs=function(e,t){t=t||this.defaultRenderOptions;const n=[];for(let t=0;t<e.length;t+=1){const o=e[t];n.push(this.charToGlyphIndex(o))}let o=n.length;if(t.features){const e=t.script||this.substitution.getDefaultScriptName();let r=[];t.features.liga&&(r=r.concat(this.substitution.getFeature("liga",e,t.language))),t.features.rlig&&(r=r.concat(this.substitution.getFeature("rlig",e,t.language)));for(let e=0;e<o;e+=1)for(let t=0;t<r.length;t++){const s=r[t],a=s.sub,i=a.length;let l=0;for(;l<i&&a[l]===n[e+l];)l++;l===i&&(n.splice(e,i,s.by),o=o-i+1)}}const r=new Array(o),s=this.glyphs.get(0);for(let e=0;e<o;e+=1)r[e]=this.glyphs.get(n[e])||s;return r},Rn.prototype.nameToGlyphIndex=function(e){return this.glyphNames.nameToGlyphIndex(e)},Rn.prototype.nameToGlyph=function(e){const t=this.nameToGlyphIndex(e);let n=this.glyphs.get(t);return n||(n=this.glyphs.get(0)),n},Rn.prototype.glyphIndexToName=function(e){return this.glyphNames.glyphIndexToName?this.glyphNames.glyphIndexToName(e):""},Rn.prototype.getKerningValue=function(e,t){e=e.index||e,t=t.index||t;const n=this.getGposKerningValue;return n?n(e,t):this.kerningPairs[e+","+t]||0},Rn.prototype.defaultRenderOptions={kerning:!0,features:{liga:!0,rlig:!0}},Rn.prototype.forEachGlyph=function(e,t,n,o,r,s){t=void 0!==t?t:0,n=void 0!==n?n:0,o=void 0!==o?o:72,r=r||this.defaultRenderOptions;const a=1/this.unitsPerEm*o,i=this.stringToGlyphs(e,r);for(let e=0;e<i.length;e+=1){const l=i[e];if(s.call(this,l,t,n,o,r),l.advanceWidth&&(t+=l.advanceWidth*a),r.kerning&&e<i.length-1){t+=this.getKerningValue(l,i[e+1])*a}r.letterSpacing?t+=r.letterSpacing*o:r.tracking&&(t+=r.tracking/1e3*o)}return t},Rn.prototype.getPath=function(e,t,n,o,r){const s=new M;return this.forEachGlyph(e,t,n,o,r,(function(e,t,n,o){const a=e.getPath(t,n,o,r,this);s.extend(a)})),s},Rn.prototype.getPaths=function(e,t,n,o,r){const s=[];return this.forEachGlyph(e,t,n,o,r,(function(e,t,n,o){const a=e.getPath(t,n,o,r,this);s.push(a)})),s},Rn.prototype.getAdvanceWidth=function(e,t,n){return this.forEachGlyph(e,0,0,t,n,(function(){}))},Rn.prototype.draw=function(e,t,n,o,r,s){this.getPath(t,n,o,r,s).draw(e)},Rn.prototype.drawPoints=function(e,t,n,o,r,s){this.forEachGlyph(t,n,o,r,s,(function(t,n,o,r){t.drawPoints(e,n,o,r)}))},Rn.prototype.drawMetrics=function(e,t,n,o,r,s){this.forEachGlyph(t,n,o,r,s,(function(t,n,o,r){t.drawMetrics(e,n,o,r)}))},Rn.prototype.getEnglishName=function(e){const t=this.names[e];if(t)return t.en},Rn.prototype.validate=function(){const e=this;function t(t){const n=e.getEnglishName(t);n&&n.trim().length}t("fontFamily"),t("weightName"),t("manufacturer"),t("copyright"),t("version"),this.unitsPerEm},Rn.prototype.toTables=function(){return Dt.fontToTable(this)},Rn.prototype.toBuffer=function(){return console.warn("Font.toBuffer is deprecated. Use Font.toArrayBuffer instead."),this.toArrayBuffer()},Rn.prototype.toArrayBuffer=function(){const e=this.toTables().encode(),t=new ArrayBuffer(e.length),n=new Uint8Array(t);for(let t=0;t<e.length;t++)n[t]=e[t];return t},Rn.prototype.download=function(e){const t=this.getEnglishName("fontFamily"),n=this.getEnglishName("fontSubfamily");e=e||t.replace(/\s/g,"")+"-"+n+".otf";const o=this.toArrayBuffer();if("undefined"!=typeof window)window.requestFileSystem=window.requestFileSystem||window.webkitRequestFileSystem,window.requestFileSystem(window.TEMPORARY,o.byteLength,(function(t){t.root.getFile(e,{create:!0},(function(e){e.createWriter((function(t){const n=new DataView(o),r=new Blob([n],{type:"font/opentype"});t.write(r),t.addEventListener("writeend",(function(){location.href=e.toURL()}),!1)}))}))}),(function(e){throw new Error(e.name+": "+e.message)}));else{const t=require("fs"),n=function(e){const t=new Buffer(e.byteLength),n=new Uint8Array(e);for(let e=0;e<t.length;++e)t[e]=n[e];return t}(o);t.writeFileSync(e,n)}},Rn.prototype.fsSelectionValues={ITALIC:1,UNDERSCORE:2,NEGATIVE:4,OUTLINED:8,STRIKEOUT:16,BOLD:32,REGULAR:64,USER_TYPO_METRICS:128,WWS:256,OBLIQUE:512},Rn.prototype.usWidthClasses={ULTRA_CONDENSED:1,EXTRA_CONDENSED:2,CONDENSED:3,SEMI_CONDENSED:4,MEDIUM:5,SEMI_EXPANDED:6,EXPANDED:7,EXTRA_EXPANDED:8,ULTRA_EXPANDED:9},Rn.prototype.usWeightClasses={THIN:100,EXTRA_LIGHT:200,LIGHT:300,NORMAL:400,MEDIUM:500,SEMI_BOLD:600,BOLD:700,EXTRA_BOLD:800,BLACK:900};var Bn={make:function(e,t){const n=new oe.Table("fvar",[{name:"version",type:"ULONG",value:65536},{name:"offsetToData",type:"USHORT",value:0},{name:"countSizePairs",type:"USHORT",value:2},{name:"axisCount",type:"USHORT",value:e.axes.length},{name:"axisSize",type:"USHORT",value:20},{name:"instanceCount",type:"USHORT",value:e.instances.length},{name:"instanceSize",type:"USHORT",value:4+4*e.axes.length}]);n.offsetToData=n.sizeOf();for(let o=0;o<e.axes.length;o++)n.fields=n.fields.concat(Cn(o,e.axes[o],t));for(let o=0;o<e.instances.length;o++)n.fields=n.fields.concat(In(o,e.instances[o],e.axes,t));return n},parse:function(e,t,n){const o=new pe.Parser(e,t),r=o.parseULong();N.argument(65536===r,"Unsupported fvar table version.");const s=o.parseOffset16();o.skip("uShort",1);const a=o.parseUShort(),i=o.parseUShort(),l=o.parseUShort(),c=o.parseUShort(),u=[];for(let o=0;o<a;o++)u.push(Ln(e,t+s+o*i,n));const p=[],h=t+s+a*i;for(let t=0;t<l;t++)p.push(Mn(e,h+t*c,u,n));return{axes:u,instances:p}}};function Gn(e,t){const n=new pe.Parser(e,t),o=n.parseUShort(),r=[];for(let e=0;e<o;e++)r[n.parseTag()]={offset:n.parseUShort()};return r}function Nn(e,t){const n=new pe.Parser(e,t),o=n.parseUShort();if(1===o){const e=n.parseUShort(),t=n.parseUShort(),o=n.parseUShortList(t);return function(t){return o[t-e]||0}}if(2===o){const e=n.parseUShort(),t=[],o=[],r=[];for(let s=0;s<e;s++)t[s]=n.parseUShort(),o[s]=n.parseUShort(),r[s]=n.parseUShort();return function(e){let n=0,s=t.length-1;for(;n<s;){const o=n+s+1>>1;e<t[o]?s=o-1:n=o}return t[n]<=e&&e<=o[n]&&r[n]||0}}}function Pn(e,t){const n=new pe.Parser(e,t),o=n.parseUShort(),r=function(e,t){const n=new pe.Parser(e,t),o=n.parseUShort();let r=n.parseUShort();if(1===o)return n.parseUShortList(r);if(2===o){const e=[];for(;r--;){const t=n.parseUShort(),o=n.parseUShort();let r=n.parseUShort();for(let n=t;n<=o;n++)e[r++]=n}return e}}(e,t+n.parseUShort()),s=n.parseUShort(),a=n.parseUShort();let i;if(4!==s||0!==a)return;const l={};if(1===o){const e=n.parseUShort(),t=[],o=n.parseOffset16List(e);for(let c=0;c<e;c++){const e=o[c];let u=l[e];if(!u){u={},n.relativeOffset=e;let t=n.parseUShort();for(;t--;){const e=n.parseUShort();s&&(i=n.parseShort()),a&&n.parseShort(),u[e]=i}}t[r[c]]=u}return function(e,n){const o=t[e];if(o)return o[n]}}if(2===o){const o=n.parseUShort(),l=n.parseUShort(),c=n.parseUShort(),u=n.parseUShort(),p=Nn(e,t+o),h=Nn(e,t+l),f=[];for(let e=0;e<c;e++){const t=f[e]=[];for(let e=0;e<u;e++)s&&(i=n.parseShort()),a&&n.parseShort(),t[e]=i}const d={};for(let e=0;e<r.length;e++)d[r[e]]=1;return function(e,t){if(!d[e])return;const n=p(e),o=h(t),r=f[n];return r?r[o]:void 0}}}function An(e,t){const n=new pe.Parser(e,t),o=n.parseUShort(),r=n.parseUShort(),s=16&r,a=n.parseUShort(),i=n.parseOffset16List(a),l={lookupType:o,lookupFlag:r,markFilteringSet:s?n.parseUShort():-1};if(2===o){const n=[];for(let o=0;o<a;o++){const r=Pn(e,t+i[o]);r&&n.push(r)}l.getKerningValue=function(e,t){for(let o=n.length;o--;){const r=n[o](e,t);if(void 0!==r)return r}return 0}}return l}var Fn={parse:function(e,t,n){const o=new pe.Parser(e,t),r=o.parseFixed();N.argument(1===r,"Unsupported GPOS table version."),Gn(e,t+o.parseUShort()),Gn(e,t+o.parseUShort());const s=o.parseUShort();o.relativeOffset=s;const a=o.parseUShort(),i=o.parseOffset16List(a),l=t+s;for(let t=0;t<a;t++){const o=An(e,l+i[t]);2!==o.lookupType||n.getGposKerningValue||(n.getGposKerningValue=o.getKerningValue)}}};var Hn={parse:function(e,t){const n=new pe.Parser(e,t),o=n.parseUShort();if(0===o)return function(e){const t={};e.skip("uShort");const n=e.parseUShort();N.argument(0===n,"Unsupported kern sub-table version."),e.skip("uShort",2);const o=e.parseUShort();e.skip("uShort",3);for(let n=0;n<o;n+=1){const n=e.parseUShort(),o=e.parseUShort(),r=e.parseShort();t[n+","+o]=r}return t}(n);if(1===o)return function(e){const t={};e.skip("uShort"),e.parseULong()>1&&console.warn("Only the first kern subtable is supported."),e.skip("uLong");const n=255&e.parseUShort();if(e.skip("uShort"),0===n){const n=e.parseUShort();e.skip("uShort",3);for(let o=0;o<n;o+=1){const n=e.parseUShort(),o=e.parseUShort(),r=e.parseShort();t[n+","+o]=r}}return t}(n);throw new Error("Unsupported kern table version ("+o+").")}};var zn={parse:function(e,t,n,o){const r=new pe.Parser(e,t),s=o?r.parseUShort:r.parseULong,a=[];for(let e=0;e<n+1;e+=1){let e=s.call(r);o&&(e*=2),a.push(e)}return a}};function Wn(e,t){require("fs").readFile(e,(function(e,n){if(e)return t(e.message);t(null,Gt(n))}))}function _n(e,t){const n=new XMLHttpRequest;n.open("get",e,!0),n.responseType="arraybuffer",n.onload=function(){return 200!==n.status?t("Font could not be loaded: "+n.statusText):t(null,n.response)},n.onerror=function(){t("Font could not be loaded")},n.send()}function qn(e,t){const n=[];let o=12;for(let r=0;r<t;r+=1){const t=pe.getTag(e,o),r=pe.getULong(e,o+4),s=pe.getULong(e,o+8),a=pe.getULong(e,o+12);n.push({tag:t,checksum:r,offset:s,length:a,compression:!1}),o+=16}return n}function Xn(e,t){if("WOFF"===t.compression){const n=new Uint8Array(e.buffer,t.offset+2,t.compressedLength-2),o=new Uint8Array(t.length);if(C(n,o),o.byteLength!==t.length)throw new Error("Decompression error: "+t.tag+" decompressed length doesn't match recorded length");return{data:new DataView(o.buffer,0),offset:0}}return{data:e,offset:t.offset}}function Vn(e){let t,n;const o=new Rn({empty:!0}),r=new DataView(e,0);let s,a=[];const i=pe.getTag(r,0);if(i===String.fromCharCode(0,1,0,0)||"true"===i||"typ1"===i)o.outlinesFormat="truetype",s=pe.getUShort(r,4),a=qn(r,s);else if("OTTO"===i)o.outlinesFormat="cff",s=pe.getUShort(r,4),a=qn(r,s);else{if("wOFF"!==i)throw new Error("Unsupported OpenType signature "+i);{const e=pe.getTag(r,4);if(e===String.fromCharCode(0,1,0,0))o.outlinesFormat="truetype";else{if("OTTO"!==e)throw new Error("Unsupported OpenType flavor "+i);o.outlinesFormat="cff"}s=pe.getUShort(r,12),a=function(e,t){const n=[];let o=44;for(let r=0;r<t;r+=1){const t=pe.getTag(e,o),r=pe.getULong(e,o+4),s=pe.getULong(e,o+8),a=pe.getULong(e,o+12);let i;i=s<a&&"WOFF",n.push({tag:t,offset:r,compression:i,compressedLength:s,length:a}),o+=20}return n}(r,s)}}let l,c,u,p,h,f,d,g,m,y,v;for(let e=0;e<s;e+=1){const s=a[e];let i;switch(s.tag){case"cmap":i=Xn(r,s),o.tables.cmap=fe.parse(i.data,i.offset),o.encoding=new be(o.tables.cmap);break;case"cvt ":i=Xn(r,s),v=new pe.Parser(i.data,i.offset),o.tables.cvt=v.parseShortList(s.length/2);break;case"fvar":c=s;break;case"fpgm":i=Xn(r,s),v=new pe.Parser(i.data,i.offset),o.tables.fpgm=v.parseByteList(s.length);break;case"head":i=Xn(r,s),o.tables.head=Ke.parse(i.data,i.offset),o.unitsPerEm=o.tables.head.unitsPerEm,t=o.tables.head.indexToLocFormat;break;case"hhea":i=Xn(r,s),o.tables.hhea=Je.parse(i.data,i.offset),o.ascender=o.tables.hhea.ascender,o.descender=o.tables.hhea.descender,o.numberOfHMetrics=o.tables.hhea.numberOfHMetrics;break;case"hmtx":f=s;break;case"ltag":i=Xn(r,s),n=tt.parse(i.data,i.offset);break;case"maxp":i=Xn(r,s),o.tables.maxp=nt.parse(i.data,i.offset),o.numGlyphs=o.tables.maxp.numGlyphs;break;case"name":m=s;break;case"OS/2":i=Xn(r,s),o.tables.os2=mt.parse(i.data,i.offset);break;case"post":i=Xn(r,s),o.tables.post=yt.parse(i.data,i.offset),o.glyphNames=new xe(o.tables.post);break;case"prep":i=Xn(r,s),v=new pe.Parser(i.data,i.offset),o.tables.prep=v.parseByteList(s.length);break;case"glyf":u=s;break;case"loca":g=s;break;case"CFF ":l=s;break;case"kern":d=s;break;case"GPOS":p=s;break;case"GSUB":h=s;break;case"meta":y=s}}const b=Xn(r,m);if(o.tables.name=dt.parse(b.data,b.offset,n),o.names=o.tables.name,u&&g){const e=0===t,n=Xn(r,g),s=zn.parse(n.data,n.offset,o.numGlyphs,e),a=Xn(r,u);o.glyphs=Re.parse(a.data,a.offset,s,o)}else{if(!l)throw new Error("Font doesn't contain TrueType or CFF outlines.");{const e=Xn(r,l);$e.parse(e.data,e.offset,o)}}const S=Xn(r,f);if(et.parse(S.data,S.offset,o.numberOfHMetrics,o.numGlyphs,o.glyphs),function(e){let t;const n=e.tables.cmap.glyphIndexMap,o=Object.keys(n);for(let r=0;r<o.length;r+=1){const s=o[r],a=n[s];t=e.glyphs.get(a),t.addUnicode(parseInt(s))}for(let n=0;n<e.glyphs.length;n+=1)t=e.glyphs.get(n),e.cffEncoding?e.isCIDFont?t.name="gid"+n:t.name=e.cffEncoding.charset[n]:e.glyphNames.names&&(t.name=e.glyphNames.glyphIndexToName(n))}(o),d){const e=Xn(r,d);o.kerningPairs=Hn.parse(e.data,e.offset)}else o.kerningPairs={};if(p){const e=Xn(r,p);Fn.parse(e.data,e.offset,o)}if(h){const e=Xn(r,h);o.tables.gsub=xt.parse(e.data,e.offset)}if(c){const e=Xn(r,c);o.tables.fvar=Bn.parse(e.data,e.offset,o.names)}if(y){const e=Xn(r,y);o.tables.meta=Ut.parse(e.data,e.offset),o.metas=o.tables.meta}return o}var jn=Object.freeze({__proto__:null,Font:Rn,Glyph:De,Path:M,BoundingBox:I,_parse:pe,parse:Vn,load:function(e,t){("undefined"==typeof window?Wn:_n)(e,(function(e,n){if(e)return t(e);let o;try{o=Vn(n)}catch(e){return t(e,null)}return t(null,o)}))},loadSync:function(e){return Vn(Gt(require("fs").readFileSync(e)))}});const Yn=r.default.join(__dirname,"./fonts/font.ttf"),Zn=jn.loadSync(Yn),Qn={width:150,height:50,noise:4,color:!1,background:"#FFFAE8",size:4,ignoreChars:"",fontSize:40,charPreset:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",font:Zn,ascender:Zn.ascender,descender:Zn.descender,truncateLineProbability:.5,truncateCurveProbability:.5,truncateCurvePositionMin:.4,truncateCurvePositionMax:.6};var $n={options:Qn,loadFont:e=>{const t=jn.loadSync(e);Qn.font=t,Qn.ascender=t.ascender,Qn.descender=t.descender}};const Kn=$n.options,Jn=function(e,t){return Math.round(e+Math.random()*(t-e))};const eo=function(e,t){return{text:(e+t).toString(),equation:e+"+"+t}},to=function(e,t){return{text:(e-t).toString(),equation:e+"-"+t}};function no(e,t,n){return 6*(n=(n+1)%1)<1?e+(t-e)*n*6:2*n<1?t:3*n<2?e+(t-e)*(2/3-n)*6:e}var oo={int:Jn,greyColor:function(e,t){const n=Jn(e=e||1,t=t||9).toString(16);return`#${n}${n}${n}`},captchaText:function(e){"number"==typeof e&&(e={size:e});const t=(e=e||{}).size||4,n=e.ignoreChars||"";let o=-1,r="",s=e.charPreset||Kn.charPreset;n&&(s=function(e,t){return e.split("").filter(e=>-1===t.indexOf(e))}(s,n));const a=s.length-1;for(;++o<t;)r+=s[Jn(0,a)];return r},mathExpr:function(e,t,n){const o=Jn(e=e||1,t=t||9),r=Jn(e,t);switch(n){case"+":return eo(o,r);case"-":return to(o,r);default:return Jn(1,2)%2?eo(o,r):to(o,r)}},color:function(e){const t=Jn(0,24)/24,n=Jn(60,80)/100,o=e?function(e){if("#"!==e[0])return 1;3===(e=e.slice(1)).length&&(e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]);const t=parseInt(e,16),n=t>>16,o=t>>8&255,r=255&t,s=Math.max(n,o,r),a=Math.min(n,o,r);return(s+a)/510}(e):1;let r,s;o>=.5?(r=Math.round(100*o)-45,s=Math.round(100*o)-25):(r=Math.round(100*o)+25,s=Math.round(100*o)+45);const a=Jn(r,s)/100,i=a<.5?a*(a+n):a+n-a*n,l=2*a-i,c=Math.floor(255*no(l,i,t+1/3)),u=Math.floor(255*no(l,i,t));return"#"+(Math.floor(255*no(l,i,t-1/3))|u<<8|c<<16|1<<24).toString(16).slice(1)}};const ro=$n.options,so=function(e,t){e=e||oo.captchaText();const n=(t=Object.assign({},ro,t)).width,o=t.height,r=t.background||t.backgroundColor;r&&(t.color=!0);const s=r?`<rect width="100%" height="100%" fill="${r}"/>`:"",a=[].concat(function(e,t,n){const o=n.color,r=[],s=n.inverse?7:1,a=n.inverse?15:9;let i=-1;for(;++i<n.noise;){const n=`${oo.int(1,21)} ${oo.int(1,t-1)}`,i=`${oo.int(e-21,e-1)} ${oo.int(1,t-1)}`,l=`${oo.int(e/2-21,e/2+21)} ${oo.int(1,t-1)}`,c=`${oo.int(e/2-21,e/2+21)} ${oo.int(1,t-1)}`,u=o?oo.color():oo.greyColor(s,a);r.push(`<path d="M${n} C${l},${c},${i}" stroke="${u}" fill="none"/>`)}return r}(n,o,t)).concat(function(e,t,n,o,r){const s=e.length,a=(t-2)/(s+1),i=o.inverse?10:0,l=o.inverse?14:4;let u=-1;const p=[],h=r||o.color?oo.color(o.background):oo.greyColor(i,l);for(;++u<s;){const t=a*(u+1),r=n/2,s=c(e[u],Object.assign({x:t,y:r},o));p.push(`<path fill="${h}" d="${s}"/>`)}return p}(e,n,o,t)).sort(()=>Math.random()-.5).join("");return`${`<svg xmlns="http://www.w3.org/2000/svg" width="${n}" height="${o}" viewBox="0,0,${n},${o}">`}${s}${a}</svg>`};var ao=so,io=oo.captchaText,lo=function(e){const t=e.text||oo.captchaText(e);return{text:t,data:so(t,e)}},co=function(e){const t=oo.mathExpr(e.mathMin,e.mathMax,e.mathOperator);return{text:t.text,data:so(t.equation,e)}},uo=ro,po=$n.loadFont;ao.randomText=io,ao.create=lo,ao.createMathExpr=co,ao.options=uo,ao.loadFont=po;var ho=ao;const fo=Object.prototype.toString;function go(e){return"[object Object]"===fo.call(e)}function mo(){"development"===process.env.NODE_ENV&&console.log(...arguments)}const yo=async function(){};function vo(e){return yo.constructor===e.constructor?async function(){const t=await e.apply(this,arguments);return go(t)&&(t.msg&&(t.message=t.msg,t.errMsg=t.msg),0===t.code?t.errCode=t.code:t.errCode=s[t.code]||t.code),t}:function(){const t=e.apply(this,arguments);return go(t)&&(t.msg&&(t.message=t.msg,t.errMsg=t.msg),0===t.code?t.errCode=t.code:t.errCode=s[t.code]||t.code),t}}const bo=uniCloud.database().collection("opendb-verify-codes");class So{async setVerifyCode({deviceId:e,code:t,expiresDate:n,scene:o}){if(!e)return{code:10101,msg:"deviceId不可为空"};if(!t)return{code:10102,msg:"验证码不可为空"};n||(n=180);const r=Date.now(),s={deviceId:e,scene:o,code:t.toLocaleLowerCase(),state:0,ip:__ctx__.CLIENTIP,created_date:r,expired_date:r+1e3*n};return mo("addRes",await bo.add(s)),{code:0,deviceId:e}}async verifyCode({deviceId:e,code:t,scene:n}){if(!e)return{code:10101,msg:"deviceId不可为空"};if(!t)return{code:10102,msg:"验证码不可为空"};const o=Date.now(),r={deviceId:e,scene:n,code:t.toLocaleLowerCase(),state:0},s=await bo.where(r).orderBy("created_date","desc").limit(1).get();if(mo("verifyRecord:",s),s&&s.data&&s.data.length>0){const e=s.data[0];if(e.expired_date<o)return{code:10103,msg:"验证码已失效"};return mo("upRes",await bo.doc(e._id).update({state:1})),{code:0,msg:"验证通过"}}return{code:10104,msg:"验证码错误"}}}let xo;try{xo=require("uni-config-center")}catch(e){throw new Error("Plugin[uni-config-center] was not found")}class Uo extends class{constructor(){this.pluginConfig={},this._initConfig(),this._initScene()}_initConfig(){const e=xo({pluginId:"uni-captcha"});if(e&&e.hasFile("config.json"))try{const t=e.config();go(t)&&(this.pluginConfig=t)}catch(e){throw new Error(this.t("config-file-invalid")+"\n"+e.messages)}}_initScene(){if(go(this.pluginConfig.scene)){const{scene:e,...t}=this.pluginConfig;Object.keys(e).forEach(n=>{e.scene&&delete e.scene,this.pluginConfig.scene[n]=Object.assign({},t,e[n])})}}}{constructor(){super(),this.DEVICEID2opts={}}mergeConfig(e){const t=go(this.pluginConfig.scene)?this.pluginConfig.scene[e.scene]:e.scene;return Object.assign({},go(t)?t:this.pluginConfig,e)}async create(e={}){if(!e.scene)throw new Error("scene验证码场景不可为空");e=this.mergeConfig(e);let{scene:t,expiresDate:n,deviceId:o,...r}=e;if(o=o||__ctx__.DEVICEID,!o)throw new Error("deviceId不可为空");const s=new So;try{const{text:a,base64:i}=function(e={}){const{uniPlatform:t=""}=e;let n;n=e.mathExpr?ho.createMathExpr(e):ho.create(e);let o="data:image/svg+xml;utf8,"+n.data.replace(/#/g,"%23");return(!t||"string"==typeof t&&-1===t.indexOf("mp-"))&&(o=o.replace(/"/g,"'").replace(/</g,"%3C").replace(/>/g,"%3E")),{text:n.text,base64:o}}(r),l=await s.setVerifyCode({deviceId:o,code:a,expiresDate:n,scene:t});return l.code>0?{...l,code:10001}:(this.DEVICEID2opts[o]=e,{code:0,msg:"验证码获取成功",captchaBase64:i})}catch(e){return{code:10001,msg:"验证码生成失败："+e.message}}}async verify({deviceId:e,captcha:t,scene:n}){if(!(e=e||__ctx__.DEVICEID))throw new Error("deviceId不可为空");if(!n)throw new Error("scene验证码场景不可为空");const o=new So;try{const r=await o.verifyCode({deviceId:e,code:t,scene:n});return r.code>0?r:{code:0,msg:"验证码通过"}}catch(e){return{code:10002,msg:"验证码校验失败："+e.message}}}async refresh(e={}){let{scene:t,expiresDate:n,deviceId:o,...r}=e;if(o=o||__ctx__.DEVICEID,!o)throw new Error("deviceId不可为空");if(!t)throw new Error("scene验证码场景不可为空");const s=await bo.where({deviceId:o,scene:t}).orderBy("created_date","desc").limit(1).get();if(s&&s.data&&s.data.length>0){const e=s.data[0];await bo.doc(e._id).update({state:2}),Object.keys(r).length>0&&(this.DEVICEID2opts[o]=Object.assign({},this.DEVICEID2opts[o],r));let a={};try{a=await this.create(Object.assign({},this.DEVICEID2opts[o],{deviceId:o,scene:t,expiresDate:n}))}catch(e){return{code:50403,msg:e.message}}return a.code>0?{...a,code:50403}:{code:0,msg:"验证码刷新成功",captchaBase64:a.captchaBase64}}return{code:10003,msg:`验证码刷新失败：无此设备在 ${t} 场景信息，请重新获取`}}}const To=new So;Object.keys(To).forEach(e=>{Uo.prototype[e]=vo(To[e])});const Eo=new Uo,Oo=new Proxy(Eo,{get(e,t){if(t in e)return"function"==typeof e[t]?vo(e[t]).bind(Oo):e[t]}});module.exports=Oo;
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
index 0ca24756223dd772d40482b3359b64242551fa64..c845533061f84d8eeaea9753aeee3dbf61f65f7f 100644
--- a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
@@ -1,53 +1,53 @@
-{
-  "passwordSecret": "passwordSecret-demo",
-  "tokenSecret": "tokenSecret-demo",
-  "tokenExpiresIn": 7200,
-  "tokenExpiresThreshold": 600,
-  "passwordErrorLimit": 6,
-  "bindTokenToDevice": false,
-  "passwordErrorRetryTime": 3600,
-  "autoSetInviteCode": false,
-  "forceInviteCode": false,
-  "preferedAppPlatform": "app",
-  "app": {
-    "tokenExpiresIn": 2592000,
-    "oauth": {
-      "weixin": {
-        "appid": "填写来源微信开放平台https://open.weixin.qq.com/创建的应用的appid",
-        "appsecret": "填写来源微信开放平台https://open.weixin.qq.com/创建的应用的appsecret"
-      },
-      "apple": {
-        "bundleId": "苹果开发者后台获取的bundleId"
-      }
-    }
-  },
-  "mp-weixin": {
-    "oauth": {
-      "weixin": {
-        "appid": "微信小程序登录所用的appid、appsecret需要在对应的小程序管理控制台获取",
-        "appsecret": "微信小程序后台获取的appsecret"
-      }
-    }
-  },
-  "mp-alipay": {
-    "oauth": {
-      "alipay": {
-        "appid": "支付宝小程序登录用到的appid、privateKey请参考支付宝小程序的文档进行设置或者获取，https://opendocs.alipay.com/open/291/105971#LDsXr",
-        "privateKey": "支付宝小程序登录用到的appid、privateKey请参考支付宝小程序的文档进行设置或者获取，https://opendocs.alipay.com/open/291/105971#LDsXr"
-      }
-    }
-  },
-  "service": {
-    "sms": {
-      "name": "应用名称，对应短信模版的name",
-      "codeExpiresIn": 300,
-      "smsKey": "短信密钥key，开通短信服务处可以看到",
-      "smsSecret": "短信密钥secret，开通短信服务处可以看到"
-    },
-    "univerify": {
-      "appid": "当前应用的appid，使用云函数URL化，此项必须配置",
-      "apiKey": "apiKey 和 apiSecret 在开发者中心获取，开发者中心：https://dev.dcloud.net.cn/uniLogin/index?type=0，文档：https://ask.dcloud.net.cn/article/37965",
-      "apiSecret": ""
-    }
-  }
+{
+  "passwordSecret": "passwordSecret-demo",
+  "tokenSecret": "tokenSecret-demo",
+  "tokenExpiresIn": 7200,
+  "tokenExpiresThreshold": 600,
+  "passwordErrorLimit": 6,
+  "bindTokenToDevice": false,
+  "passwordErrorRetryTime": 3600,
+  "autoSetInviteCode": true,
+  "forceInviteCode": false,
+  "preferedAppPlatform": "app",
+  "app": {
+    "tokenExpiresIn": 2592000,
+    "oauth": {
+      "weixin": {
+        "appid": "填写来源微信开放平台https://open.weixin.qq.com/创建的应用的appid",
+        "appsecret": "填写来源微信开放平台https://open.weixin.qq.com/创建的应用的appsecret"
+      },
+      "apple": {
+        "bundleId": "苹果开发者后台获取的bundleId"
+      }
+    }
+  },
+  "mp-weixin": {
+    "oauth": {
+      "weixin": {
+        "appid": "微信小程序登录所用的appid、appsecret需要在对应的小程序管理控制台获取",
+        "appsecret": "微信小程序后台获取的appsecret"
+      }
+    }
+  },
+  "mp-alipay": {
+    "oauth": {
+      "alipay": {
+        "appid": "支付宝小程序登录用到的appid、privateKey请参考支付宝小程序的文档进行设置或者获取，https://opendocs.alipay.com/open/291/105971#LDsXr",
+        "privateKey": "支付宝小程序登录用到的appid、privateKey请参考支付宝小程序的文档进行设置或者获取，https://opendocs.alipay.com/open/291/105971#LDsXr"
+      }
+    }
+  },
+  "service": {
+    "sms": {
+      "name": "应用名称，对应短信模版的name",
+      "codeExpiresIn": 300,
+      "smsKey": "短信密钥key，开通短信服务处可以看到",
+      "smsSecret": "短信密钥secret，开通短信服务处可以看到"
+    },
+    "univerify": {
+      "appid": "当前应用的appid，使用云函数URL化，此项必须配置",
+      "apiKey": "apiKey 和 apiSecret 在开发者中心获取，开发者中心：https://dev.dcloud.net.cn/uniLogin/index?type=0，文档：https://ask.dcloud.net.cn/article/37965",
+      "apiSecret": ""
+    }
+  }
 }
\ No newline at end of file
diff --git a/uni_modules/uni-data-checkbox/changelog.md b/uni_modules/uni-data-checkbox/changelog.md
index d8f420b9a6cfec68b7fd755ab516f26f8f2dfd39..dbc517a30f8049120442d0c9e1eb0034b04fa940 100644
--- a/uni_modules/uni-data-checkbox/changelog.md
+++ b/uni_modules/uni-data-checkbox/changelog.md
@@ -1,3 +1,5 @@
+## 1.0.2（2022-06-30）
+- 优化 在 uni-forms 中的依赖注入方式
 ## 1.0.1（2022-02-07）
 - 修复 multiple 为 true 时，v-model 的值为 null 报错的 bug
 ## 1.0.0（2021-11-19）
diff --git a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
index 300cb5fe6e7e31a60b2bc2c9a15b48dc15ac4315..eb3ae3f8d5962cbe8e28cff0afc75e167fc46680 100644
--- a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
+++ b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
@@ -155,17 +155,17 @@
 			value(newVal) {
 				this.dataList = this.getDataList(newVal)
 				// fix by mehaotian is_reset 在 uni-forms 中定义
-				if(!this.is_reset){
-					this.is_reset = false
-					this.formItem && this.formItem.setValue(newVal)
-				}
+				// if(!this.is_reset){
+				// 	this.is_reset = false
+				// 	this.formItem && this.formItem.setValue(newVal)
+				// }
 			},
 			modelValue(newVal) {
 				this.dataList = this.getDataList(newVal);
-				if(!this.is_reset){
-					this.is_reset = false
-					this.formItem && this.formItem.setValue(newVal)
-				}
+				// if(!this.is_reset){
+				// 	this.is_reset = false
+				// 	this.formItem && this.formItem.setValue(newVal)
+				// }
 			}
 		},
 		data() {
@@ -193,22 +193,22 @@
 			}
 		},
 		created() {
-			this.form = this.getForm('uniForms')
-			this.formItem = this.getForm('uniFormsItem')
+			// this.form = this.getForm('uniForms')
+			// this.formItem = this.getForm('uniFormsItem')
 			// this.formItem && this.formItem.setValue(this.value)
 
-			if (this.formItem) {
-				this.isTop = 6
-				if (this.formItem.name) {
-					// 如果存在name添加默认值,否则formData 中不存在这个字段不校验
-					if(!this.is_reset){
-						this.is_reset = false
-						this.formItem.setValue(this.dataValue)
-					}
-					this.rename = this.formItem.name
-					this.form.inputChildrens.push(this)
-				}
-			}
+			// if (this.formItem) {
+			// 	this.isTop = 6
+			// 	if (this.formItem.name) {
+			// 		// 如果存在name添加默认值,否则formData 中不存在这个字段不校验
+			// 		if(!this.is_reset){
+			// 			this.is_reset = false
+			// 			this.formItem.setValue(this.dataValue)
+			// 		}
+			// 		this.rename = this.formItem.name
+			// 		this.form.inputChildrens.push(this)
+			// 	}
+			// }
 
 			if (this.localdata && this.localdata.length !== 0) {
 				this.isLocal = true
@@ -273,7 +273,7 @@
 						}
 					}
 				}
-				this.formItem && this.formItem.setValue(detail.value)
+				// this.formItem && this.formItem.setValue(detail.value)
 				// TODO 兼容 vue2
 				this.$emit('input', detail.value);
 				// // TOTO 兼容 vue3
@@ -375,7 +375,7 @@
 						selectedArr.push(item[this.map.value])
 					}
 				})
-				return this.dataValue && this.dataValue.length > 0 ? this.dataValue : selectedArr
+				return this.dataValue.length > 0 ? this.dataValue : selectedArr
 			},
 
 			/**
diff --git a/uni_modules/uni-data-checkbox/package.json b/uni_modules/uni-data-checkbox/package.json
index 64131e75f154b001c2135463a93f064a194c564a..51470a956872d2e6bd39c02d79f11d51f8f577ae 100644
--- a/uni_modules/uni-data-checkbox/package.json
+++ b/uni_modules/uni-data-checkbox/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-data-checkbox",
   "displayName": "uni-data-checkbox 数据选择器",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "通过数据驱动的单选框和复选框",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-easyinput/changelog.md b/uni_modules/uni-easyinput/changelog.md
index 030162eefb426a38de2ecc78ef3988b78f0c522c..1e8c6f91be4e19a739cd4935c8615387bd746db6 100644
--- a/uni_modules/uni-easyinput/changelog.md
+++ b/uni_modules/uni-easyinput/changelog.md
@@ -1,31 +1,47 @@
+## 1.1.0（2022-06-30）
+- 新增 在 uni-forms 1.4.0 中使用可以在 blur 时校验内容
+- 新增 clear 事件，点击右侧叉号图标触发
+- 新增 change 事件 ，仅在输入框失去焦点或用户按下回车时触发
+- 优化 组件样式，组件获取焦点时高亮显示，图标颜色调整等
+-
+## 1.0.5（2022-06-07）
+- 优化 clearable 显示策略
+## 1.0.4（2022-06-07）
+- 优化 clearable 显示策略
+## 1.0.3（2022-05-20）
+- 修复 关闭图标某些情况下无法取消的bug
+## 1.0.2（2022-04-12）
+- 修复 默认值不生效的bug
+## 1.0.1（2022-04-02）
+- 修复 value不能为0的bug
 ## 1.0.0（2021-11-19）
 - 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
 - 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-easyinput](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
-## 0.1.4（2021-08-20）
-- 修复 在 uni-forms 的动态表单中默认值校验不通过的 bug
-## 0.1.3（2021-08-11）
-- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
-## 0.1.2（2021-07-30）
-- 优化 vue3下事件警告的问题
-## 0.1.1
-- 优化 errorMessage 属性支持 Boolean 类型
-## 0.1.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 0.0.16（2021-06-29）
-- 修复 confirmType 属性（仅 type="text" 生效）导致多行文本框无法换行的 bug
-## 0.0.15（2021-06-21）
-- 修复 passwordIcon 属性拼写错误的 bug
-## 0.0.14（2021-06-18）
-- 新增 passwordIcon 属性，当type=password时是否显示小眼睛图标
-- 修复 confirmType 属性不生效的问题
-## 0.0.13（2021-06-04）
-- 修复 disabled 状态可清出内容的 bug
-## 0.0.12（2021-05-12）
-- 新增 组件示例地址
-## 0.0.11（2021-05-07）
-- 修复 input-border 属性不生效的问题
-## 0.0.10（2021-04-30）
-- 修复 ios 遮挡文字、显示一半的问题
-## 0.0.9（2021-02-05）
-- 调整为uni_modules目录规范
-- 优化 兼容 nvue 页面
+## 0.1.4（2021-08-20）
+- 修复 在 uni-forms 的动态表单中默认值校验不通过的 bug
+## 0.1.3（2021-08-11）
+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+## 0.1.2（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 0.1.1
+- 优化 errorMessage 属性支持 Boolean 类型
+## 0.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.0.16（2021-06-29）
+- 修复 confirmType 属性（仅 type="text" 生效）导致多行文本框无法换行的 bug
+## 0.0.15（2021-06-21）
+- 修复 passwordIcon 属性拼写错误的 bug
+## 0.0.14（2021-06-18）
+- 新增 passwordIcon 属性，当type=password时是否显示小眼睛图标
+- 修复 confirmType 属性不生效的问题
+## 0.0.13（2021-06-04）
+- 修复 disabled 状态可清出内容的 bug
+## 0.0.12（2021-05-12）
+- 新增 组件示例地址
+## 0.0.11（2021-05-07）
+- 修复 input-border 属性不生效的问题
+## 0.0.10（2021-04-30）
+- 修复 ios 遮挡文字、显示一半的问题
+## 0.0.9（2021-02-05）
+- 调整为uni_modules目录规范
+- 优化 兼容 nvue 页面
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
index bf25b7bb4fd46ecf3ce8255aa37233ebfbdffef2..d129ce15b9d366ee17004cbab51964cb5437c752 100644
--- a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -1,40 +1,41 @@
 <template>
-	<view class="uni-easyinput" :class="{'uni-easyinput-error':msg}" :style="{color:inputBorder && msg?'#e43d33':styles.color}">
-		<view class="uni-easyinput__content" :class="{'is-input-border':inputBorder ,'is-input-error-border':inputBorder && msg,'is-textarea':type==='textarea','is-disabled':disabled}"
-		 :style="{'border-color':inputBorder && msg?'#dd524d':styles.borderColor,'background-color':disabled?styles.disableColor:''}">
-			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc" @click="onClickIcon('prefix')"></uni-icons>
-			<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea" :class="{'input-padding':inputBorder}"
-			 :name="name" :value="val" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" placeholder-class="uni-easyinput__placeholder-class"
-			 :maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" @input="onInput" @blur="onBlur"  @focus="onFocus"
-			 @confirm="onConfirm"></textarea>
-			<input v-else :type="type === 'password'?'text':type" class="uni-easyinput__content-input" :style="{
-				 'padding-right':type === 'password' ||clearable || prefixIcon?'':'10px',
-				 'padding-left':prefixIcon?'':'10px'
-			 }"
-			 :name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder"
-			 :placeholderStyle="placeholderStyle" placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType" @focus="onFocus"
-			 @blur="onBlur" @input="onInput" @confirm="onConfirm" />
-			<template v-if="type === 'password' && passwordIcon" >
-				<uni-icons v-if="val != '' " class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}" :type="showPassword?'eye-slash-filled':'eye-filled'"
-				 :size="18" color="#c0c4cc" @click="onEyes"></uni-icons>
+	<view class="uni-easyinput" :class="{'uni-easyinput-error':msg}" :style="boxStyle">
+		<view class="uni-easyinput__content" :class="inputContentClass" :style="inputContentStyle">
+			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc"
+				@click="onClickIcon('prefix')" size="22"></uni-icons>
+			<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea"
+				:class="{'input-padding':inputBorder}" :name="name" :value="val" :placeholder="placeholder"
+				:placeholderStyle="placeholderStyle" :disabled="disabled"
+				placeholder-class="uni-easyinput__placeholder-class" :maxlength="inputMaxlength" :focus="focused"
+				:autoHeight="autoHeight" @input="onInput" @blur="_Blur" @focus="_Focus" @confirm="onConfirm"></textarea>
+			<input v-else :type="type === 'password'?'text':type" class="uni-easyinput__content-input"
+				:style="inputStyle" :name="name" :value="val" :password="!showPassword && type === 'password'"
+				:placeholder="placeholder" :placeholderStyle="placeholderStyle"
+				placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :maxlength="inputMaxlength"
+				:focus="focused" :confirmType="confirmType" @focus="_Focus" @blur="_Blur" @input="onInput"
+				@confirm="onConfirm" />
+			<template v-if="type === 'password' && passwordIcon">
+				<!-- 开启密码时显示小眼睛 -->
+				<uni-icons v-if="isVal" class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}"
+					:type="showPassword?'eye-slash-filled':'eye-filled'" :size="22"
+					:color="focusShow?'#2979ff':'#c0c4cc'" @click="onEyes">
+				</uni-icons>
 			</template>
 			<template v-else-if="suffixIcon">
-				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc" @click="onClickIcon('suffix')"></uni-icons>
+				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc"
+					@click="onClickIcon('suffix')" size="22"></uni-icons>
 			</template>
 			<template v-else>
-				<uni-icons class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}" type="clear" :size="clearSize"
-				 v-if="clearable && val && !disabled" color="#c0c4cc" @click="onClear"></uni-icons>
-			</template>
+				<uni-icons v-if="clearable && isVal && !disabled  && type !== 'textarea'" class="content-clear-icon"
+					:class="{'is-textarea-icon':type==='textarea'}" type="clear" :size="clearSize"
+					:color="msg?'#dd524d':(focusShow?'#2979ff':'#c0c4cc')" @click="onClear"></uni-icons>
+			</template>
 			<slot name="right"></slot>
 		</view>
 	</view>
 </template>
 
-<script>
-	// import {
-	// 	debounce,
-	// 	throttle
-	// } from './common.js'
+<script>
 	/**
 	 * Easyinput 输入框
 	 * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
@@ -76,13 +77,44 @@
 	 * @event {Function}	iconClick	点击图标时触发
 	 * @example <uni-easyinput v-model="mobile"></uni-easyinput>
 	 */
+	function obj2strClass(obj) {
+		let classess = ''
+		for (let key in obj) {
+			const val = obj[key]
+			if (val) {
+				classess += `${key} `
+			}
+		}
+		return classess
+	}
 
-	 export default {
+	function obj2strStyle(obj) {
+		let style = ''
+		for (let key in obj) {
+			const val = obj[key]
+			style += `${key}:${val};`
+		}
+		return style
+	}
+	export default {
 		name: 'uni-easyinput',
-		emits:['click','iconClick','update:modelValue','input','focus','blur','confirm'],
-		model:{
-			prop:'modelValue',
-			event:'update:modelValue'
+		emits: ['click', 'iconClick', 'update:modelValue', 'input', 'focus', 'blur', 'confirm', 'clear', 'eyes', 'change'],
+		model: {
+			prop: 'modelValue',
+			event: 'update:modelValue'
+		},
+		options: {
+			virtualHost: true
+		},
+		inject: {
+			form: {
+				from: 'uniForm',
+				default: null
+			},
+			formItem: {
+				from: 'uniFormItem',
+				default: null
+			},
 		},
 		props: {
 			name: String,
@@ -100,7 +132,10 @@
 				type: Boolean,
 				default: false
 			},
-			placeholder: String,
+			placeholder: {
+				type: String,
+				default: ' '
+			},
 			placeholderStyle: String,
 			focus: {
 				type: Boolean,
@@ -120,7 +155,7 @@
 			},
 			clearSize: {
 				type: [Number, String],
-				default: 15
+				default: 24
 			},
 			inputBorder: {
 				type: Boolean,
@@ -138,7 +173,7 @@
 				type: [Boolean, String],
 				default: true
 			},
-			passwordIcon:{
+			passwordIcon: {
 				type: Boolean,
 				default: true
 			},
@@ -152,79 +187,105 @@
 					}
 				}
 			},
-			errorMessage:{
-				type:[String,Boolean],
-				default:''
+			errorMessage: {
+				type: [String, Boolean],
+				default: ''
 			}
 		},
 		data() {
 			return {
 				focused: false,
-				errMsg: '',
 				val: '',
 				showMsg: '',
 				border: false,
 				isFirstBorder: false,
 				showClearIcon: false,
-				showPassword: false
+				showPassword: false,
+				focusShow: false,
+				localMsg: ''
 			};
 		},
 		computed: {
+			// 输入框内是否有值
+			isVal() {
+				const val = this.val
+				// fixed by mehaotian 处理值为0的情况，字符串0不在处理范围
+				if (val || val === 0) {
+					return true
+				}
+				return false
+			},
+
 			msg() {
-				return this.errorMessage || this.errMsg;
+				// console.log('computed', this.form, this.formItem);
+				// if (this.form) {
+				// 	return this.errorMessage || this.formItem.errMsg;
+				// }
+				// TODO 处理头条 formItem 中 errMsg 不更新的问题
+				return this.localMsg || this.errorMessage
 			},
 			// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，用户可以传入字符串数值
 			inputMaxlength() {
 				return Number(this.maxlength);
 			},
+
+			// 处理外层样式的style
+			boxStyle() {
+				return `color:${this.inputBorder && this.msg?'#e43d33':this.styles.color};`
+			},
+			// input 内容的类和样式处理
+			inputContentClass() {
+				return obj2strClass({
+					'is-input-border': this.inputBorder,
+					'is-input-error-border': this.inputBorder && this.msg,
+					'is-textarea': this.type === 'textarea',
+					'is-disabled': this.disabled
+				})
+			},
+			inputContentStyle() {
+				const focusColor = this.focusShow ? '#2979ff' : this.styles.borderColor
+				const borderColor = this.inputBorder && this.msg ? '#dd524d' : focusColor
+				return obj2strStyle({
+					'border-color': borderColor || '#e5e5e5',
+					'background-color': this.disabled ? this.styles.disableColor : '#fff'
+				})
+			},
+			// input右侧样式
+			inputStyle() {
+				const paddingRight = this.type === 'password' || this.clearable || this.prefixIcon ? '' : '10px'
+				return obj2strStyle({
+					'padding-right': paddingRight,
+					'padding-left': this.prefixIcon ? '' : '10px'
+				})
+			}
 		},
 		watch: {
 			value(newVal) {
-				if (this.errMsg) this.errMsg = ''
-				this.val = newVal
-				// fix by mehaotian is_reset 在 uni-forms 中定义
-				if (this.form && this.formItem &&!this.is_reset) {
-					this.is_reset = false
-					this.formItem.setValue(newVal)
-				}
+				this.val = newVal
 			},
 			modelValue(newVal) {
-				if (this.errMsg) this.errMsg = ''
 				this.val = newVal
-				if (this.form && this.formItem &&!this.is_reset) {
-					this.is_reset = false
-					this.formItem.setValue(newVal)
-				}
 			},
 			focus(newVal) {
 				this.$nextTick(() => {
 					this.focused = this.focus
+					this.focusShow = this.focus
 				})
 			}
 		},
 		created() {
-			if(!this.value){
-				this.val = this.modelValue
-			}
-			if(!this.modelValue){
-				this.val = this.value
-			}
-			this.form = this.getForm('uniForms')
-			this.formItem = this.getForm('uniFormsItem')
+			this.init()
+			// TODO 处理头条vue3 computed 不监听 inject 更改的问题（formItem.errMsg）
 			if (this.form && this.formItem) {
-				if (this.formItem.name) {
-					if(!this.is_reset){
-						this.is_reset = false
-						this.formItem.setValue(this.val)
-					}
-					this.rename = this.formItem.name
-					this.form.inputChildrens.push(this)
-				}
+				this.$watch('formItem.errMsg', (newVal) => {
+					this.localMsg = newVal
+				})
 			}
 		},
 		mounted() {
 			this.$nextTick(() => {
 				this.focused = this.focus
+				this.focusShow = this.focus
 			})
 		},
 		methods: {
@@ -232,28 +293,35 @@
 			 * 初始化变量值
 			 */
 			init() {
-
+				if (this.value || this.value === 0) {
+					this.val = this.value
+				} else if (this.modelValue || this.modelValue === 0) {
+					this.val = this.modelValue
+				} else {
+					this.val = null
+				}
 			},
+
+			/**
+			 * 点击图标时触发
+			 * @param {Object} type
+			 */
 			onClickIcon(type) {
 				this.$emit('iconClick', type)
 			},
+
 			/**
-			 * 获取父元素实例
+			 * 显示隐藏内容，密码框时生效
 			 */
-			getForm(name = 'uniForms') {
-				let parent = this.$parent;
-				let parentName = parent.$options.name;
-				while (parentName !== name) {
-					parent = parent.$parent;
-					if (!parent) return false;
-					parentName = parent.$options.name;
-				}
-				return parent;
-			},
-
 			onEyes() {
 				this.showPassword = !this.showPassword
+				this.$emit('eyes', this.showPassword)
 			},
+
+			/**
+			 * 输入时触发
+			 * @param {Object} event
+			 */
 			onInput(event) {
 				let value = event.detail.value;
 				// 判断是否去除空格
@@ -270,30 +338,79 @@
 				// TODO 兼容 vue2
 				this.$emit('input', value);
 				// TODO　兼容　vue3
-				this.$emit('update:modelValue',value)
+				this.$emit('update:modelValue', value)
 			},
 
-			onFocus(event) {
+			/**
+			 * 外部调用方法
+			 * 获取焦点时触发
+			 * @param {Object} event
+			 */
+			onFocus() {
+				this.$nextTick(() => {
+					this.focused = true
+				})
+				this.$emit('focus', null);
+			},
+
+			_Focus(event) {
+				this.focusShow = true
 				this.$emit('focus', event);
 			},
-			onBlur(event) {
+
+			/**
+			 * 外部调用方法
+			 * 失去焦点时触发
+			 * @param {Object} event
+			 */
+			onBlur() {
+				this.focused = false
+				this.$emit('focus', null);
+			},
+			_Blur(event) {
 				let value = event.detail.value;
+				this.focusShow = false
 				this.$emit('blur', event);
+				// 根据类型返回值，在event中获取的值理论上讲都是string
+				this.$emit('change', this.val)
+				// 失去焦点时参与表单校验
+				if (this.form && this.formItem) {
+					const {
+						validateTrigger
+					} = this.form
+					if (validateTrigger === 'blur') {
+						this.formItem.onFieldChange()
+					}
+				}
 			},
+
+			/**
+			 * 按下键盘的发送键
+			 * @param {Object} e
+			 */
 			onConfirm(e) {
-				this.$emit('confirm', e.detail.value);
+				this.$emit('confirm', this.val);
+				this.$emit('change', this.val)
 			},
+
+			/**
+			 * 清理内容
+			 * @param {Object} event
+			 */
 			onClear(event) {
 				this.val = '';
 				// TODO 兼容 vue2
 				this.$emit('input', '');
 				// TODO 兼容 vue2
 				// TODO　兼容　vue3
-				this.$emit('update:modelValue','')
-			},
-			fieldClick() {
-				this.$emit('click');
+				this.$emit('update:modelValue', '')
+				// 点击叉号触发
+				this.$emit('clear')
 			},
+
+			/**
+			 * 去除空格
+			 */
 			trimStr(str, pos = 'both') {
 				if (pos === 'both') {
 					return str.trim();
@@ -316,9 +433,10 @@
 	};
 </script>
 
-<style lang="scss" scoped>
-	$uni-error: #e43d33;
+<style lang="scss">
+	$uni-error: #e43d33;
 	$uni-border-1: #DCDFE6 !default;
+
 	.uni-easyinput {
 		/* #ifndef APP-NVUE */
 		width: 100%;
@@ -327,7 +445,7 @@
 		position: relative;
 		text-align: left;
 		color: #333;
-		font-size: 14px;
+		font-size: 14px;
 	}
 
 	.uni-easyinput__content {
@@ -335,11 +453,15 @@
 		/* #ifndef APP-NVUE */
 		width: 100%;
 		display: flex;
-		box-sizing: border-box;
-		min-height: 36px;
-		/* #endif */
+		box-sizing: border-box;
+		// min-height: 36px;
+		/* #endif */
 		flex-direction: row;
-		align-items: center;
+		align-items: center;
+		// 处理border动画刚开始显示黑色的问题
+		border-color: #fff;
+		transition-property: border-color;
+		transition-duration: 0.3s;
 	}
 
 	.uni-easyinput__content-input {
@@ -350,13 +472,17 @@
 		overflow: hidden;
 		flex: 1;
 		line-height: 1;
-		font-size: 14px;
+		font-size: 14px;
+		height: 35px;
+		// min-height: 36px;
 	}
-	.uni-easyinput__placeholder-class {
-		color: #999;
-		font-size: 12px;
-		font-weight: 200;
+
+	.uni-easyinput__placeholder-class {
+		color: #999;
+		font-size: 12px;
+		// font-weight: 200;
 	}
+
 	.is-textarea {
 		align-items: flex-start;
 	}
@@ -371,9 +497,10 @@
 		flex: 1;
 		line-height: 1.5;
 		font-size: 14px;
-		padding-top: 6px;
-		padding-bottom: 10px;
+		margin: 6px;
+		margin-left: 0;
 		height: 80px;
+		min-height: 80px;
 		/* #ifndef APP-NVUE */
 		min-height: 80px;
 		width: auto;
@@ -403,6 +530,9 @@
 		align-items: center;
 		border: 1px solid $uni-border-1;
 		border-radius: 4px;
+		/* #ifdef MP-ALIPAY */
+		overflow: hidden;
+		/* #endif */
 	}
 
 	.uni-error-message {
@@ -422,11 +552,13 @@
 	}
 
 	.is-input-error-border {
-		border-color: $uni-error;
-		.uni-easyinput__placeholder-class {
-			color: mix(#fff, $uni-error, 50%);;
+		border-color: $uni-error;
+
+		.uni-easyinput__placeholder-class {
+			color: mix(#fff, $uni-error, 50%);
+			;
 		}
-	}
+	}
 
 
 	.uni-easyinput--border {
@@ -449,13 +581,13 @@
 		/* #endif */
 	}
 
-	.is-disabled {
-		border-color: red;
-		background-color: #F7F6F6;
-		color: #D5D5D5;
-		.uni-easyinput__placeholder-class {
-			color: #D5D5D5;
-			font-size: 12px;
+	.is-disabled {
+		background-color: #F7F6F6;
+		color: #D5D5D5;
+
+		.uni-easyinput__placeholder-class {
+			color: #D5D5D5;
+			font-size: 12px;
 		}
 	}
 </style>
diff --git a/uni_modules/uni-easyinput/package.json b/uni_modules/uni-easyinput/package.json
index 912b837571bfbb2c09c1e064b74b8165e9793ca4..3cc793e6132002e2fd4aceb5567e2ca34d54c58d 100644
--- a/uni_modules/uni-easyinput/package.json
+++ b/uni_modules/uni-easyinput/package.json
@@ -1,90 +1,90 @@
-{
-  "id": "uni-easyinput",
-  "displayName": "uni-easyinput 增强输入框",
-  "version": "1.0.0",
-  "description": "Easyinput 组件是对原生input组件的增强",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "input",
-    "uni-easyinput",
-    "输入框"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
+{
+  "id": "uni-easyinput",
+  "displayName": "uni-easyinput 增强输入框",
+  "version": "1.1.0",
+  "description": "Easyinput 组件是对原生input组件的增强",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "input",
+    "uni-easyinput",
+    "输入框"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
     "dependencies": [
-			"uni-scss",
-      "uni-icons"
-    ],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "y"
-        }
-      }
-    }
-  }
+			"uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/uni_modules/uni-forms/changelog.md b/uni_modules/uni-forms/changelog.md
index 26e120b5c0878e5d3bc2916063da30603f3c87a7..c358a21abbe9d9c871febe80fb8b141f23561e1d 100644
--- a/uni_modules/uni-forms/changelog.md
+++ b/uni_modules/uni-forms/changelog.md
@@ -1,3 +1,33 @@
+## 1.4.8（2022-08-23）
+- 优化 根据 rules 自动添加 required 的问题
+## 1.4.7（2022-08-22）
+- 修复 item 未设置 require 属性，rules 设置 require 后，星号也显示的 bug，详见：[https://ask.dcloud.net.cn/question/151540](https://ask.dcloud.net.cn/question/151540)
+## 1.4.6（2022-07-13）
+- 修复 model 需要校验的值没有声明对应字段时，导致第一次不触发校验的bug
+## 1.4.5（2022-07-05）
+- 新增 更多表单示例
+- 优化 子表单组件过期提示的问题
+- 优化 子表单组件uni-datetime-picker、uni-data-select、uni-data-picker的显示样式
+## 1.4.4（2022-07-04）
+- 更新 删除组件日志
+## 1.4.3（2022-07-04）
+- 修复 由 1.4.0 引发的 label 插槽不生效的bug
+## 1.4.2（2022-07-04）
+- 修复 子组件找不到 setValue 报错的bug
+## 1.4.1（2022-07-04）
+- 修复 uni-data-picker 在 uni-forms-item 中报错的bug
+- 修复 uni-data-picker 在 uni-forms-item 中宽度不正确的bug
+## 1.4.0（2022-06-30）
+- 【重要】组件逻辑重构，部分用法用旧版本不兼容，请注意兼容问题
+- 【重要】组件使用 Provide/Inject 方式注入依赖，提供了自定义表单组件调用 uni-forms 校验表单的能力
+- 新增 model 属性，等同于原 value/modelValue 属性，旧属性即将废弃
+- 新增 validateTrigger 属性的 blur 值，仅 uni-easyinput 生效
+- 新增 onFieldChange 方法，可以对子表单进行校验，可替代binddata方法
+- 新增 子表单的 setRules 方法，配合自定义校验函数使用
+- 新增 uni-forms-item 的 setRules 方法，配置动态表单使用可动态更新校验规则
+- 优化 动态表单校验方式，废弃拼接name的方式
+## 1.3.3（2022-06-22）
+- 修复 表单校验顺序无序问题
 ## 1.3.2（2021-12-09）
 -
 ## 1.3.1（2021-11-19）
diff --git a/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue b/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
index 679b12f9349692459f9fcce0932668a43a5dfa90..349ee7012350798a177b7ec94a5b9be3bfd4ef42 100644
--- a/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
+++ b/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
@@ -1,213 +1,325 @@
 <template>
-	<view class="uni-forms-item" :class="{ 'uni-forms-item--border': border, 'is-first-border': border && isFirstBorder, 'uni-forms-item-error': msg }">
-		<view class="uni-forms-item__box">
-			<view class="uni-forms-item__inner" :class="['is-direction-' + labelPos]">
-				<view class="uni-forms-item__label" :style="{ width: labelWid , justifyContent: justifyContent }">
-					<slot name="label">
-						<text v-if="required" class="is-required">*</text>
-						<uni-icons v-if="leftIcon" class="label-icon" size="16" :type="leftIcon" :color="iconColor" />
-						<text class="label-text">{{ label }}</text>
-
-						<view v-if="label" class="label-seat"></view>
-					</slot>
-				</view>
-				<view class="uni-forms-item__content" :class="{ 'is-input-error-border': msg }"><slot></slot></view>
+	<view class="uni-forms-item"
+		:class="['is-direction-' + localLabelPos ,border?'uni-forms-item--border':'' ,border && isFirstBorder?'is-first-border':'']">
+		<slot name="label">
+			<view class="uni-forms-item__label" :class="{'no-label':!label && !isRequired}"
+				:style="{width:localLabelWidth,justifyContent: localLabelAlign}">
+				<text v-if="isRequired" class="is-required">*</text>
+				<text>{{label}}</text>
 			</view>
-			<view
-				v-if="msg"
-				class="uni-error-message"
-				:class="{ 'uni-error-msg--boeder': border }"
-				:style="{
-					paddingLeft: labelLeft
-				}"
-			>
-				<text class="uni-error-message-text">{{ showMsg === 'undertext' ? msg : '' }}</text>
+		</slot>
+		<!-- #ifndef APP-NVUE -->
+		<view class="uni-forms-item__content">
+			<slot></slot>
+			<view class="uni-forms-item__error" :class="{'msg--active':msg}">
+				<text>{{msg}}</text>
 			</view>
 		</view>
+		<!-- #endif -->
+		<!-- #ifdef APP-NVUE -->
+		<view class="uni-forms-item__nuve-content">
+			<view class="uni-forms-item__content">
+				<slot></slot>
+			</view>
+			<view class="uni-forms-item__error" :class="{'msg--active':msg}">
+				<text class="error-text">{{msg}}</text>
+			</view>
+		</view>
+		<!-- #endif -->
 	</view>
 </template>
 
 <script>
-/**
- * Field 输入框
- * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
- * @tutorial https://ext.dcloud.net.cn/plugin?id=21001
- * @property {Boolean} 	required 			是否必填，左边显示红色"*"号（默认false）
- * @property {String} validateTrigger = [bind|submit]	校验触发器方式 默认 submit 可选
- * 	@value bind 	发生变化时触发
- * 	@value submit 	提交时触发
- * @property {String } 	leftIcon 			label左边的图标，限 uni-ui 的图标名称
- * @property {String } 	iconColor 			左边通过icon配置的图标的颜色（默认#606266）
- * @property {String } 	label 				输入框左边的文字提示
- * @property {Number } 	labelWidth 			label的宽度，单位px（默认65）
- * @property {String } 	labelAlign = [left|center|right] label的文字对齐方式（默认left）
- * 	@value left		label 左侧显示
- * 	@value center	label 居中
- * 	@value right	label 右侧对齐
- * @property {String } 	labelPosition = [top|left] label的文字的位置（默认left）
- * 	@value top	顶部显示 label
- * 	@value left	左侧显示 label
- * @property {String } 	errorMessage 		显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
- * @property {String } 	name 				表单域的属性名，在使用校验规则时必填
- */
-
-export default {
-	name: 'uniFormsItem',
-	props: {
-		// 自定义内容
-		custom: {
-			type: Boolean,
-			default: false
-		},
-		// 是否显示报错信息
-		showMessage: {
-			type: Boolean,
-			default: true
-		},
-		name: String,
-		required: Boolean,
-		validateTrigger: {
-			type: String,
-			default: ''
-		},
-		leftIcon: String,
-		iconColor: {
-			type: String,
-			default: '#606266'
+	/**
+	 * uni-fomrs-item 表单子组件
+	 * @description uni-fomrs-item 表单子组件，提供了基础布局已经校验能力
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=2773
+	 * @property {Boolean} required 是否必填，左边显示红色"*"号
+	 * @property {String } 	label 				输入框左边的文字提示
+	 * @property {Number } 	labelWidth 			label的宽度，单位px（默认65）
+	 * @property {String } 	labelAlign = [left|center|right] label的文字对齐方式（默认left）
+	 * 	@value left		label 左侧显示
+	 * 	@value center	label 居中
+	 * 	@value right	label 右侧对齐
+	 * @property {String } 	errorMessage 		显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
+	 * @property {String } 	name 				表单域的属性名，在使用校验规则时必填
+	 * @property {String } 	leftIcon 			【1.4.0废弃】label左边的图标，限 uni-ui 的图标名称
+	 * @property {String } 	iconColor 		【1.4.0废弃】左边通过icon配置的图标的颜色（默认#606266）
+	 * @property {String} validateTrigger = [bind|submit|blur]	【1.4.0废弃】校验触发器方式 默认 submit
+	 * 	@value bind 	发生变化时触发
+	 * 	@value submit 提交时触发
+	 * 	@value blur 	失去焦点触发
+	 * @property {String } 	labelPosition = [top|left] 【1.4.0废弃】label的文字的位置（默认left）
+	 * 	@value top	顶部显示 label
+	 * 	@value left	左侧显示 label
+	 */
+
+	export default {
+		name: 'uniFormsItem',
+		options: {
+			virtualHost: true
 		},
-		label: String,
-		// 左边标题的宽度单位px
-		labelWidth: {
-			type: [Number, String],
-			default: ''
+		provide() {
+			return {
+				uniFormItem: this
+			}
 		},
-		// 对齐方式，left|center|right
-		labelAlign: {
-			type: String,
-			default: ''
+		inject: {
+			form: {
+				from: 'uniForm',
+				default: null
+			},
 		},
-		// lable的位置，可选为 left-左边，top-上边
-		labelPosition: {
-			type: String,
-			default: ''
+		props: {
+			// 表单校验规则
+			rules: {
+				type: Array,
+				default () {
+					return null;
+				}
+			},
+			// 表单域的属性名，在使用校验规则时必填
+			name: {
+				type: [String, Array],
+				default: ''
+			},
+			required: {
+				type: Boolean,
+				default: false
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			// label的宽度 ，默认 80
+			labelWidth: {
+				type: [String, Number],
+				default: ''
+			},
+			// label 居中方式，默认 left 取值 left/center/right
+			labelAlign: {
+				type: String,
+				default: ''
+			},
+			// 强制显示错误信息
+			errorMessage: {
+				type: [String, Boolean],
+				default: ''
+			},
+			// 1.4.0 弃用，统一使用 form 的校验时机
+			// validateTrigger: {
+			// 	type: String,
+			// 	default: ''
+			// },
+			// 1.4.0 弃用，统一使用 form 的label 位置
+			// labelPosition: {
+			// 	type: String,
+			// 	default: ''
+			// },
+			// 1.4.0 以下属性已经废弃，请使用  #label 插槽代替
+			leftIcon: String,
+			iconColor: {
+				type: String,
+				default: '#606266'
+			},
 		},
-		errorMessage: {
-			type: [String, Boolean],
-			default: ''
+		data() {
+			return {
+				errMsg: '',
+				isRequired: false,
+				userRules: null,
+				localLabelAlign: 'left',
+				localLabelWidth: '65px',
+				localLabelPos: 'left',
+				border: false,
+				isFirstBorder: false,
+			};
 		},
-		// 表单校验规则
-		rules: {
-			type: Array,
-			default() {
-				return [];
+		computed: {
+			// 处理错误信息
+			msg() {
+				return this.errorMessage || this.errMsg;
 			}
-		}
-	},
-	data() {
-		return {
-			errorTop: false,
-			errorBottom: false,
-			labelMarginBottom: '',
-			errorWidth: '',
-			errMsg: '',
-			val: '',
-			labelPos: '',
-			labelWid: '',
-			labelAli: '',
-			showMsg: 'undertext',
-			border: false,
-			isFirstBorder: false,
-			isArray: false,
-			arrayField: ''
-		};
-	},
-	computed: {
-		msg() {
-			return this.errorMessage || this.errMsg;
 		},
-		fieldStyle() {
-			let style = {};
-			if (this.labelPos == 'top') {
-				style.padding = '0 0';
-				this.labelMarginBottom = '6px';
-			}
-			if (this.labelPos == 'left' && this.msg !== false && this.msg != '') {
-				style.paddingBottom = '0px';
-				this.errorBottom = true;
-				this.errorTop = false;
-			} else if (this.labelPos == 'top' && this.msg !== false && this.msg != '') {
-				this.errorBottom = false;
-				this.errorTop = true;
-			} else {
-				// style.paddingBottom = ''
-				this.errorTop = false;
-				this.errorBottom = false;
+		watch: {
+			// 规则发生变化通知子组件更新
+			'form.formRules'(val) {
+				// TODO 处理头条vue3 watch不生效的问题
+				// #ifndef MP-TOUTIAO
+				this.init()
+				// #endif
+			},
+			'form.labelWidth'(val) {
+				// 宽度
+				this.localLabelWidth = this._labelWidthUnit(val)
+
+			},
+			'form.labelPosition'(val) {
+				// 标签位置
+				this.localLabelPos = this._labelPosition()
+			},
+			'form.labelAlign'(val) {
+
 			}
-			return style;
 		},
+		created() {
+			this.init(true)
+			if (this.name && this.form) {
+				// TODO 处理头条vue3 watch不生效的问题
+				// #ifdef MP-TOUTIAO
+				this.$watch('form.formRules', () => {
+					this.init()
+				})
+				// #endif
+
+				// 监听变化
+				this.$watch(
+					() => {
+						const val = this.form._getDataValue(this.name, this.form.localData)
+						return val
+					},
+					(value, oldVal) => {
+						const isEqual = this.form._isEqual(value, oldVal)
+						// 简单判断前后值的变化，只有发生变化才会发生校验
+						// TODO  如果 oldVal = undefined ，那么大概率是源数据里没有值导致 ，这个情况不哦校验 ,可能不严谨 ，需要在做观察
+						// fix by mehaotian 暂时取消 && oldVal !== undefined ，如果formData 中不存在，可能会不校验
+						if (!isEqual) {
+							const val = this.itemSetValue(value)
+							this.onFieldChange(val, false)
+						}
+					}, {
+						immediate: false
+					}
+				);
+			}
 
-		// uni不支持在computed中写style.justifyContent = 'center'的形式，故用此方法
-		justifyContent() {
-			if (this.labelAli === 'left') return 'flex-start';
-			if (this.labelAli === 'center') return 'center';
-			if (this.labelAli === 'right') return 'flex-end';
 		},
-		labelLeft(){
-			return (this.labelPos === 'left' ? parseInt(this.labelWid) : 0) + 'px'
-		}
-	},
-	watch: {
-		validateTrigger(trigger) {
-			this.formTrigger = trigger;
-		}
-	},
-	created() {
-		this.form = this.getForm();
-		this.group = this.getForm('uniGroup');
-		this.formRules = [];
-		this.formTrigger = this.validateTrigger;
-		// 处理 name，是否数组
-		if (this.name && this.name.indexOf('[') !== -1 && this.name.indexOf(']') !== -1) {
-			this.isArray = true;
-			this.arrayField = this.name
-			// fix by mehaotian 修改不修改的情况，动态值不检验的问题
-			this.form.formData[this.name] = this.form._getValue(this.name, '')
-		}
-	},
-	mounted() {
-		if (this.form) {
-			this.form.childrens.push(this);
-		}
-		this.init();
-	},
-	// #ifndef VUE3
-	destroyed() {
-		if(this.__isUnmounted) return
-		this.unInit()
-	},
-	// #endif
-	// #ifdef VUE3
-	unmounted(){
-		this.__isUnmounted = true
-		this.unInit()
-	},
-	// #endif
-	methods: {
-		init() {
-			if (this.form) {
-				let { formRules, validator, formData, value, labelPosition, labelWidth, labelAlign, errShowType } = this.form;
-				this.labelPos = this.labelPosition ? this.labelPosition : labelPosition;
-
-				if(this.label){
-					this.labelWid = (this.labelWidth ? this.labelWidth : (labelWidth||70))
-				}else{
-					this.labelWid =( this.labelWidth ? this.labelWidth : (labelWidth||'auto'))
+		// #ifndef VUE3
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.unInit()
+		},
+		// #endif
+		// #ifdef VUE3
+		unmounted() {
+			this.__isUnmounted = true
+			this.unInit()
+		},
+		// #endif
+		methods: {
+			/**
+			 * 外部调用方法
+			 * 设置规则 ，主要用于小程序自定义检验规则
+			 * @param {Array} rules 规则源数据
+			 */
+			setRules(rules = null) {
+				this.userRules = rules
+				this.init(false)
+			},
+			// 兼容老版本表单组件
+			setValue() {
+				// console.log('setValue 方法已经弃用，请使用最新版本的 uni-forms 表单组件以及其他关联组件。');
+			},
+			/**
+			 * 外部调用方法
+			 * 校验数据
+			 * @param {any} value 需要校验的数据
+			 * @param {boolean} 是否立即校验
+			 * @return {Array|null} 校验内容
+			 */
+			async onFieldChange(value, formtrigger = true) {
+				const {
+					formData,
+					localData,
+					errShowType,
+					validateCheck,
+					validateTrigger,
+					_isRequiredField,
+					_realName
+				} = this.form
+				const name = _realName(this.name)
+				if (!value) {
+					value = this.form.formData[name]
 				}
-				if(this.labelWid && this.labelWid !=='auto') {
-					this.labelWid +='px'
+				// fixd by mehaotian 不在校验前清空信息，解决闪屏的问题
+				// this.errMsg = '';
+
+				// fix by mehaotian 解决没有检验规则的情况下，抛出错误的问题
+				const ruleLen = this.itemRules.rules && this.itemRules.rules.length
+				if (!this.validator || !ruleLen || ruleLen === 0) return;
+
+				// 检验时机
+				// let trigger = this.isTrigger(this.itemRules.validateTrigger, this.validateTrigger, validateTrigger);
+				const isRequiredField = _isRequiredField(this.itemRules.rules || []);
+				let result = null;
+				// 只有等于 bind 时 ，才能开启时实校验
+				if (validateTrigger === 'bind' || formtrigger) {
+					// 校验当前表单项
+					result = await this.validator.validateUpdate({
+							[name]: value
+						},
+						formData
+					);
+
+					// 判断是否必填,非必填，不填不校验，填写才校验 ,暂时只处理 undefined  和空的情况
+					if (!isRequiredField && (value === undefined || value === '')) {
+						result = null;
+					}
+
+					// 判断错误信息显示类型
+					if (result && result.errorMessage) {
+						if (errShowType === 'undertext') {
+							// 获取错误信息
+							this.errMsg = !result ? '' : result.errorMessage;
+						}
+						if (errShowType === 'toast') {
+							uni.showToast({
+								title: result.errorMessage || '校验错误',
+								icon: 'none'
+							});
+						}
+						if (errShowType === 'modal') {
+							uni.showModal({
+								title: '提示',
+								content: result.errorMessage || '校验错误'
+							});
+						}
+					} else {
+						this.errMsg = ''
+					}
+					// 通知 form 组件更新事件
+					validateCheck(result ? result : null)
+				} else {
+					this.errMsg = ''
 				}
-				this.labelAli = this.labelAlign ? this.labelAlign : labelAlign;
+				return result ? result : null;
+			},
+			/**
+			 * 初始组件数据
+			 */
+			init(type = false) {
+				const {
+					validator,
+					formRules,
+					childrens,
+					formData,
+					localData,
+					_realName,
+					labelWidth,
+					_getDataValue,
+					_setDataValue
+				} = this.form || {}
+				// 对齐方式
+				this.localLabelAlign = this._justifyContent()
+				// 宽度
+				this.localLabelWidth = this._labelWidthUnit(labelWidth)
+				// 标签位置
+				this.localLabelPos = this._labelPosition()
+				this.isRequired = this.required
+				// 将需要校验的子组件加入form 队列
+				this.form && type && childrens.push(this)
 
+				if (!validator || !formRules) return
 				// 判断第一个 item
 				if (!this.form.isFirstBorder) {
 					this.form.isFirstBorder = true;
@@ -221,289 +333,299 @@ export default {
 						this.isFirstBorder = true;
 					}
 				}
-
 				this.border = this.form.border;
-				this.showMsg = errShowType;
-				let name = this.isArray ? this.arrayField : this.name;
-				if(!name) return
-				if (formRules && this.rules.length > 0) {
-					if (!formRules[name]) {
-						formRules[name] = {
-							rules: this.rules
-						}
+				// 获取子域的真实名称
+				const name = _realName(this.name)
+				const itemRule = this.userRules || this.rules
+				if (typeof formRules === 'object' && itemRule) {
+					// 子规则替换父规则
+					formRules[name] = {
+						rules: itemRule
 					}
 					validator.updateSchema(formRules);
 				}
-				this.formRules = formRules[name] || {};
-				this.validator = validator;
-			} else {
-				this.labelPos = this.labelPosition || 'left';
-				this.labelWid = this.labelWidth || 65;
-				this.labelAli = this.labelAlign || 'left';
-			}
-		},
-		unInit(){
-			if (this.form) {
-				this.form.childrens.forEach((item, index) => {
-					if (item === this) {
-						this.form.childrens.splice(index, 1)
-						delete this.form.formData[item.name]
-					}
-				})
-			}
-		},
-		/**
-		 * 获取父元素实例
-		 */
-		getForm(name = 'uniForms') {
-			let parent = this.$parent;
-			let parentName = parent.$options.name;
-			while (parentName !== name) {
-				parent = parent.$parent;
-				if (!parent) return false;
-				parentName = parent.$options.name;
-			}
-			return parent;
-		},
+				// 注册校验规则
+				const itemRules = formRules[name] || {}
+				this.itemRules = itemRules
+				// 注册校验函数
+				this.validator = validator
+				// 默认值赋予
+				this.itemSetValue(_getDataValue(this.name, localData))
+				this.isRequired = this._isRequired()
 
-		/**
-		 * 移除该表单项的校验结果
-		 */
-		clearValidate() {
-			this.errMsg = '';
-		},
-		/**
-		 * 子组件调用，如 easyinput
-		 * @param {Object} value
-		 */
-		setValue(value) {
-			let name = this.isArray ? this.arrayField : this.name;
-			if (name) {
-				if (this.errMsg) this.errMsg = '';
-				// 给组件赋值
-				this.form.formData[name] = this.form._getValue(name, value);
-				if (!this.formRules || (typeof this.formRules && JSON.stringify(this.formRules) === '{}')) return;
-				this.triggerCheck(this.form._getValue(this.name, value));
-			}
-		},
-
-		/**
-		 * 校验规则
-		 * @param {Object} value
-		 */
-		async triggerCheck(value,formTrigger) {
-			let promise = null;
-			this.errMsg = '';
-			// fix by mehaotian 解决没有检验规则的情况下，抛出错误的问题
-			if (!this.validator || Object.keys(this.formRules).length === 0) return;
-			const isNoField = this.isRequired(this.formRules.rules || []);
-			let isTrigger = this.isTrigger(this.formRules.validateTrigger, this.validateTrigger, this.form.validateTrigger);
-			let result = null;
-			if (!!isTrigger || formTrigger) {
-				let name = this.isArray ? this.arrayField : this.name;
-				result = await this.validator.validateUpdate(
-					{
-						[name]: value
-					},
-					this.form.formData
-				);
-			}
-			// 判断是否必填,非必填，不填不校验，填写才校验
-			if (!isNoField && (value === undefined || value === '')) {
-				result = null;
-			}
-			const inputComp = this.form.inputChildrens.find(child => child.rename === this.name);
-			if ((isTrigger ||　formTrigger) && result && result.errorMessage) {
-				if (inputComp) {
-					inputComp.errMsg = result.errorMessage;
-				}
-				if (this.form.errShowType === 'toast') {
-					uni.showToast({
-						title: result.errorMessage || '校验错误',
-						icon: 'none'
-					});
-				}
-				if (this.form.errShowType === 'modal') {
-					uni.showModal({
-						title: '提示',
-						content: result.errorMessage || '校验错误'
-					});
+			},
+			unInit() {
+				if (this.form) {
+					const {
+						childrens,
+						formData,
+						_realName
+					} = this.form
+					childrens.forEach((item, index) => {
+						if (item === this) {
+							this.form.childrens.splice(index, 1)
+							delete formData[_realName(item.name)]
+						}
+					})
 				}
-			} else {
-				if (inputComp) {
-					inputComp.errMsg = '';
+			},
+			// 设置item 的值
+			itemSetValue(value) {
+				const name = this.form._realName(this.name)
+				const rules = this.itemRules.rules || []
+				const val = this.form._getValue(name, value, rules)
+				this.form._setDataValue(name, this.form.formData, val)
+				return val
+			},
+
+			/**
+			 * 移除该表单项的校验结果
+			 */
+			clearValidate() {
+				this.errMsg = '';
+			},
+
+			// 是否显示星号
+			_isRequired() {
+				// TODO 不根据规则显示 星号，考虑后续兼容
+				// if (this.form) {
+				// 	if (this.form._isRequiredField(this.itemRules.rules || []) && this.required) {
+				// 		return true
+				// 	}
+				// 	return false
+				// }
+				return this.required
+			},
+
+			// 处理对齐方式
+			_justifyContent() {
+				if (this.form) {
+					const {
+						labelAlign
+					} = this.form
+					let labelAli = this.labelAlign ? this.labelAlign : labelAlign;
+					if (labelAli === 'left') return 'flex-start';
+					if (labelAli === 'center') return 'center';
+					if (labelAli === 'right') return 'flex-end';
 				}
-			}
+				return 'flex-start';
+			},
+			// 处理 label宽度单位 ,继承父元素的值
+			_labelWidthUnit(labelWidth) {
 
-			this.errMsg = !result ? '' : result.errorMessage;
-			// 触发validate事件
-			this.form.validateCheck(result ? result : null);
-			// typeof callback === 'function' && callback(result ? result : null);
-			// if (promise) return promise
-			return result ? result : null;
-		},
-		/**
-		 * 触发时机
-		 * @param {Object} event
-		 */
-		isTrigger(rule, itemRlue, parentRule) {
-			let rl = true;
-			//  bind  submit
-			if (rule === 'submit' || !rule) {
-				if (rule === undefined) {
-					if (itemRlue !== 'bind') {
-						if (!itemRlue) {
-							return parentRule === 'bind' ? true : false;
+				// if (this.form) {
+				// 	const {
+				// 		labelWidth
+				// 	} = this.form
+				return this.num2px(this.labelWidth ? this.labelWidth : (labelWidth || (this.label ? 65 : 'auto')))
+				// }
+				// return '65px'
+			},
+			// 处理 label 位置
+			_labelPosition() {
+				if (this.form) return this.form.labelPosition || 'left'
+				return 'left'
+
+			},
+
+			/**
+			 * 触发时机
+			 * @param {Object} rule 当前规则内时机
+			 * @param {Object} itemRlue 当前组件时机
+			 * @param {Object} parentRule 父组件时机
+			 */
+			isTrigger(rule, itemRlue, parentRule) {
+				//  bind  submit
+				if (rule === 'submit' || !rule) {
+					if (rule === undefined) {
+						if (itemRlue !== 'bind') {
+							if (!itemRlue) {
+								return parentRule === '' ? 'bind' : 'submit';
+							}
+							return 'submit';
 						}
-						return false;
+						return 'bind';
 					}
-					return true;
+					return 'submit';
 				}
-				return false;
-			}
-			return true;
-		},
-		// 是否有必填字段
-		isRequired(rules) {
-			let isNoField = false;
-			for (let i = 0; i < rules.length; i++) {
-				const ruleData = rules[i];
-				if (ruleData.required) {
-					isNoField = true;
-					break;
+				return 'bind';
+			},
+			num2px(num) {
+				if (typeof num === 'number') {
+					return `${num}px`
 				}
+				return num
 			}
-			return isNoField;
 		}
-	}
-};
+	};
 </script>
 
-<style lang="scss" >
-.uni-forms-item {
-	position: relative;
-	padding: 0px;
-	text-align: left;
-	color: #333;
-	font-size: 14px;
-	// margin-bottom: 22px;
-}
-
-.uni-forms-item__box {
-	position: relative;
-}
-
-.uni-forms-item__inner {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	// flex-direction: row;
-	// align-items: center;
-	padding-bottom: 22px;
-	// margin-bottom: 22px;
-}
-
-.is-direction-left {
-	flex-direction: row;
-}
-
-.is-direction-top {
-	flex-direction: column;
-}
-
-.uni-forms-item__label {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	flex-shrink: 0;
-	box-sizing: border-box;
-	/* #endif */
-	flex-direction: row;
-	align-items: center;
-	width: 65px;
-	// line-height: 2;
-	// margin-top: 3px;
-	padding: 5px 0;
-	height: 36px;
-	// margin-right: 5px;
-
-	.label-text {
-		font-size: 13px;
-		color: #666666;
+<style lang="scss">
+	.uni-forms-item {
+		position: relative;
+		display: flex;
+		/* #ifdef APP-NVUE */
+		// 在 nvue 中，使用 margin-bottom error 信息会被隐藏
+		padding-bottom: 22px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		margin-bottom: 22px;
+		/* #endif */
+		flex-direction: row;
+
+		&__label {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			text-align: left;
+			font-size: 14px;
+			color: #606266;
+			height: 36px;
+			padding: 0 12px 0 0;
+			/* #ifndef APP-NVUE */
+			vertical-align: middle;
+			flex-shrink: 0;
+			/* #endif */
+
+			/* #ifndef APP-NVUE */
+			box-sizing: border-box;
+
+			/* #endif */
+			&.no-label {
+				padding: 0;
+			}
+		}
+
+		&__content {
+			/* #ifndef MP-TOUTIAO */
+			// display: flex;
+			// align-items: center;
+			/* #endif */
+			position: relative;
+			font-size: 14px;
+			flex: 1;
+			/* #ifndef APP-NVUE */
+			box-sizing: border-box;
+			/* #endif */
+			flex-direction: row;
+
+			/* #ifndef APP || H5 || MP-WEIXIN || APP-NVUE */
+			// TODO 因为小程序平台会多一层标签节点 ，所以需要在多余节点继承当前样式
+			&>uni-easyinput,
+			&>uni-data-picker {
+				width: 100%;
+			}
+
+			/* #endif */
+
+		}
+
+		& .uni-forms-item__nuve-content {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+		}
+
+		&__error {
+			color: #f56c6c;
+			font-size: 12px;
+			line-height: 1;
+			padding-top: 4px;
+			position: absolute;
+			/* #ifndef APP-NVUE */
+			top: 100%;
+			left: 0;
+			transition: transform 0.3s;
+			transform: translateY(-100%);
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			bottom: 5px;
+			/* #endif */
+
+			opacity: 0;
+
+			.error-text {
+				// 只有 nvue 下这个样式才生效
+				color: #f56c6c;
+				font-size: 12px;
+			}
+
+			&.msg--active {
+				opacity: 1;
+				transform: translateY(0%);
+			}
+		}
+
+		// 位置修饰样式
+		&.is-direction-left {
+			flex-direction: row;
+		}
+
+		&.is-direction-top {
+			flex-direction: column;
+
+			.uni-forms-item__label {
+				padding: 0 0 8px;
+				line-height: 1.5715;
+				text-align: left;
+				/* #ifndef APP-NVUE */
+				white-space: initial;
+				/* #endif */
+			}
+		}
+
+		.is-required {
+			// color: $uni-color-error;
+			color: #dd524d;
+			font-weight: bold;
+		}
 	}
-	.label-seat {
-		margin-right: 5px;
+
+
+	.uni-forms-item--border {
+		margin-bottom: 0;
+		padding: 10px 0;
+		// padding-bottom: 0;
+		border-top: 1px #eee solid;
+
+		/* #ifndef APP-NVUE */
+		.uni-forms-item__content {
+			flex-direction: column;
+			justify-content: flex-start;
+			align-items: flex-start;
+
+			.uni-forms-item__error {
+				position: relative;
+				top: 5px;
+				left: 0;
+				padding-top: 0;
+			}
+		}
+
+		/* #endif */
+
+		/* #ifdef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+
+		.uni-forms-item__error {
+			position: relative;
+			top: 0px;
+			left: 0;
+			padding-top: 0;
+			margin-top: 5px;
+		}
+
+		/* #endif */
+
 	}
-}
-
-.uni-forms-item__content {
-	/* #ifndef APP-NVUE */
-	width: 100%;
-	box-sizing: border-box;
-	min-height: 36px;
-	/* #endif */
-	flex: 1;
-}
-
-.label-icon {
-	margin-right: 5px;
-	margin-top: -1px;
-}
-
-// 必填
-.is-required {
-	// color: $uni-color-error;
-	color: #dd524d;
-	font-weight: bold;
-}
-
-.uni-error-message {
-	position: absolute;
-	bottom: 0px;
-	left: 0;
-	text-align: left;
-}
-
-.uni-error-message-text {
-	line-height: 22px;
-	color: #dd524d;
-	font-size: 12px;
-}
-
-.uni-error-msg--boeder {
-	position: relative;
-	bottom: 0;
-	line-height: 22px;
-}
-
-.is-input-error-border {
-	border-color: #dd524d;
-}
-
-.uni-forms-item--border {
-	margin-bottom: 0;
-	padding: 10px 0;
-	// padding-bottom: 0;
-	border-top: 1px #eee solid;
-
-	.uni-forms-item__inner {
-		padding: 0;
+
+	.is-first-border {
+		/* #ifndef APP-NVUE */
+		border: none;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		border-width: 0;
+		/* #endif */
 	}
-}
-
-.uni-forms-item-error {
-	// padding-bottom: 0;
-}
-
-.is-first-border {
-	/* #ifndef APP-NVUE */
-	border: none;
-	/* #endif */
-	/* #ifdef APP-NVUE */
-	border-width: 0;
-	/* #endif */
-}
-
-.uni-forms--no-padding {
-	padding: 0;
-}
 </style>
diff --git a/uni_modules/uni-forms/components/uni-forms/uni-forms.vue b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
index dff823bb09d7681708bfe3f1be932dcdfb09efe0..21aee1a4605ef58b757af2c66645ae16164b098f 100644
--- a/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
+++ b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
@@ -1,13 +1,27 @@
 <template>
-	<view class="uni-forms" :class="{ 'uni-forms--top': !border }">
-		<form @submit.stop="submitForm" @reset="resetForm">
+	<view class="uni-forms">
+		<form>
 			<slot></slot>
 		</form>
 	</view>
 </template>
 
 <script>
+	import Validator from './validate.js';
+	import {
+		deepCopy,
+		getValue,
+		isRequiredField,
+		setDataValue,
+		getDataValue,
+		realName,
+		isRealName,
+		rawData,
+		isEqual
+	} from './utils.js'
+
 	// #ifndef VUE3
+	// 后续会慢慢废弃这个方法
 	import Vue from 'vue';
 	Vue.prototype.binddata = function(name, value, formName) {
 		if (formName) {
@@ -26,18 +40,15 @@
 		}
 	};
 	// #endif
-
-
-
-	import Validator from './validate.js';
 	/**
 	 * Forms 表单
 	 * @description 由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=2773
 	 * @property {Object} rules	表单校验规则
-	 * @property {String} validateTrigger = [bind|submit]	校验触发器方式 默认 submit
+	 * @property {String} validateTrigger = [bind|submit|blur]	校验触发器方式 默认 submit
 	 * @value bind		发生变化时触发
 	 * @value submit	提交时触发
+	 * @value blur	  失去焦点时触发
 	 * @property {String} labelPosition = [top|left]	label 位置 默认 left
 	 * @value top		顶部显示 label
 	 * @value left	左侧显示 label
@@ -51,25 +62,34 @@
 	 * @value toast			错误信息toast显示
 	 * @value modal			错误信息modal显示
 	 * @event {Function} submit	提交时触发
+	 * @event {Function} validate	校验结果发生变化触发
 	 */
-
 	export default {
 		name: 'uniForms',
-		components: {},
-		emits:['input','reset','validate','submit'],
+		emits: ['validate', 'submit'],
+		options: {
+			virtualHost: true
+		},
 		props: {
 			// 即将弃用
 			value: {
 				type: Object,
 				default () {
-					return {};
+					return null;
 				}
 			},
-			// 替换 value 属性
+			// vue3 替换 value 属性
 			modelValue: {
 				type: Object,
 				default () {
-					return {};
+					return null;
+				}
+			},
+			// 1.4.0 开始将不支持 v-model ，且废弃 value 和 modelValue
+			model: {
+				type: Object,
+				default () {
+					return null;
 				}
 			},
 			// 表单校验规则
@@ -79,58 +99,68 @@
 					return {};
 				}
 			},
-			// 校验触发器方式，默认 关闭
+			//校验错误信息提示方式 默认 undertext 取值 [undertext|toast|modal]
+			errShowType: {
+				type: String,
+				default: 'undertext'
+			},
+			// 校验触发器方式 默认 bind 取值 [bind|submit]
 			validateTrigger: {
 				type: String,
-				default: ''
+				default: 'submit'
 			},
-			// label 位置，可选值 top/left
+			// label 位置，默认 left 取值  top/left
 			labelPosition: {
 				type: String,
 				default: 'left'
 			},
-			// label 宽度，单位 px
+			// label 宽度
 			labelWidth: {
 				type: [String, Number],
 				default: ''
 			},
-			// label 居中方式，可选值 left/center/right
+			// label 居中方式，默认 left 取值 left/center/right
 			labelAlign: {
 				type: String,
 				default: 'left'
 			},
-			errShowType: {
-				type: String,
-				default: 'undertext'
-			},
 			border: {
 				type: Boolean,
 				default: false
 			}
 		},
+		provide() {
+			return {
+				uniForm: this
+			}
+		},
 		data() {
 			return {
-				formData: {}
+				// 表单本地值的记录，不应该与传如的值进行关联
+				formData: {},
+				formRules: {}
 			};
 		},
 		computed: {
-			dataValue() {
-				if (JSON.stringify(this.modelValue) === '{}') {
-					return this.value
-				} else {
-					return this.modelValue
+			// 计算数据源变化的
+			localData() {
+				const localVal = this.model || this.modelValue || this.value
+				if (localVal) {
+					return deepCopy(localVal)
 				}
+				return {}
 			}
 		},
 		watch: {
-			rules(newVal) {
-				// 如果规则发生变化，要初始化组件
-				this.init(newVal);
-			},
-			labelPosition() {
-				this.childrens.forEach(vm => {
-					vm.init()
-				})
+			// 监听数据变化 ,暂时不使用，需要单独赋值
+			// localData: {},
+			// 监听规则变化
+			rules: {
+				handler: function(val, oldVal) {
+					this.setRules(val)
+				},
+				deep: true,
+				immediate: true
 			}
 		},
 		created() {
@@ -156,137 +186,132 @@
 			}
 			// #endif
 
-			// 存放watch 监听数组
-			this.unwatchs = [];
-			// 存放子组件数组
-			this.childrens = [];
-			// 存放 easyInput 组件
-			this.inputChildrens = [];
-			// 存放 dataCheckbox 组件
-			this.checkboxChildrens = [];
-			// 存放规则
-			this.formRules = [];
-			this.init(this.rules);
+			// 子组件实例数组
+			this.childrens = []
+			// TODO 兼容旧版 uni-data-picker ,新版本中无效，只是避免报错
+			this.inputChildrens = []
+			this.setRules(this.rules)
 		},
-		// mounted() {
-		// 	this.init(this.rules)
-		// },
 		methods: {
-			init(formRules) {
-				// 判断是否有规则
-				if (Object.keys(formRules).length === 0) {
-					this.formData = this.dataValue
-					return
-				};
-				this.formRules = formRules;
-				this.validator = new Validator(formRules);
-				this.registerWatch();
-			},
-			// 监听 watch
-			registerWatch() {
-				// 取消监听,避免多次调用 init 重复执行 $watch
-				this.unwatchs.forEach(v => v());
-				this.childrens.forEach((v) => {
-					v.init()
-				})
-				// watch 每个属性 ，需要知道具体那个属性发变化
-				Object.keys(this.dataValue).forEach(key => {
-					let watch = this.$watch(
-						'dataValue.' + key,
-						value => {
-							if (!value) return
-							// 如果是对象 ，则平铺内容
-							if (value.toString() === '[object Object]') {
-								for (let i in value) {
-									let name = `${key}[${i}]`;
-									this.formData[name] = this._getValue(name, value[i]);
-								}
-							} else {
-								this.formData[key] = this._getValue(key, value);
-							}
-						},
-						{
-							deep: true,
-							immediate: true
-						}
-					);
-					this.unwatchs.push(watch);
-				});
-			},
 			/**
-			 * 公开给用户使用
-			 * 设置校验规则
-			 * @param {Object} formRules
+			 * 外部调用方法
+			 * 设置规则 ，主要用于小程序自定义检验规则
+			 * @param {Array} rules 规则源数据
 			 */
-			setRules(formRules) {
-				this.init(formRules);
+			setRules(rules) {
+				// TODO 有可能子组件合并规则的时机比这个要早，所以需要合并对象 ，而不是直接赋值，可能会被覆盖
+				this.formRules = Object.assign({}, this.formRules, rules)
+				// 初始化校验函数
+				this.validator = new Validator(rules);
 			},
+
 			/**
-			 * 公开给用户使用
-			 * 设置自定义表单组件 value 值
-			 *  @param {String} name 字段名称
-			 *  @param {String} value 字段值
+			 * 外部调用方法
+			 * 设置数据，用于设置表单数据，公开给用户使用 ， 不支持在动态表单中使用
+			 * @param {Object} key
+			 * @param {Object} value
 			 */
-			setValue(name, value, callback) {
-				let example = this.childrens.find(child => child.name === name);
+			setValue(key, value) {
+				let example = this.childrens.find(child => child.name === key);
 				if (!example) return null;
-				value = this._getValue(example.name, value);
-				this.formData[name] = value;
-				example.val = value;
-				return example.triggerCheck(value, callback);
+				this.formData[key] = getValue(key, value, (this.formRules[key] && this.formRules[key].rules) || [])
+				return example.onFieldChange(this.formData[key]);
+			},
+
+			/**
+			 * 外部调用方法
+			 * 手动提交校验表单
+			 * 对整个表单进行校验的方法，参数为一个回调函数。
+			 * @param {Array} keepitem 保留不参与校验的字段
+			 * @param {type} callback 方法回调
+			 */
+			validate(keepitem, callback) {
+				return this.checkAll(this.formData, keepitem, callback);
 			},
 
 			/**
-			 * 表单重置
-			 * @param {Object} event
+			 * 外部调用方法
+			 * 部分表单校验
+			 * @param {Array|String} props 需要校验的字段
+			 * @param {Function} 回调函数
 			 */
-			resetForm(event) {
+			validateField(props = [], callback) {
+				props = [].concat(props);
+				let invalidFields = {};
 				this.childrens.forEach(item => {
-					item.errMsg = '';
-					const inputComp = this.inputChildrens.find(child => child.rename === item.name);
-					if (inputComp) {
-						inputComp.errMsg = '';
-						// fix by mehaotian 不触发其他组件的 setValue
-						inputComp.is_reset = true
-						inputComp.$emit('input', inputComp.multiple ? [] : '');
-						inputComp.$emit('update:modelValue', inputComp.multiple ? [] : '');
+					const name = realName(item.name)
+					if (props.indexOf(name) !== -1) {
+						invalidFields = Object.assign({}, invalidFields, {
+							[name]: this.formData[name]
+						});
 					}
 				});
+				return this.checkAll(invalidFields, [], callback);
+			},
 
+			/**
+			 * 外部调用方法
+			 * 移除表单项的校验结果。传入待移除的表单项的 prop 属性或者 prop 组成的数组，如不传则移除整个表单的校验结果
+			 * @param {Array|String} props 需要移除校验的字段 ，不填为所有
+			 */
+			clearValidate(props = []) {
+				props = [].concat(props);
 				this.childrens.forEach(item => {
-					if (item.name) {
-						this.formData[item.name] = this._getValue(item.name, '');
+					if (props.length === 0) {
+						item.errMsg = '';
+					} else {
+						const name = realName(item.name)
+						if (props.indexOf(name) !== -1) {
+							item.errMsg = '';
+						}
 					}
 				});
-
-				this.$emit('reset', event);
 			},
 
 			/**
-			 * 触发表单校验，通过 @validate 获取
-			 * @param {Object} validate
+			 * 外部调用方法 ，即将废弃
+			 * 手动提交校验表单
+			 * 对整个表单进行校验的方法，参数为一个回调函数。
+			 * @param {Array} keepitem 保留不参与校验的字段
+			 * @param {type} callback 方法回调
 			 */
-			validateCheck(validate) {
-				if (validate === null) validate = null;
-				this.$emit('validate', validate);
+			submit(keepitem, callback, type) {
+				for (let i in this.dataValue) {
+					const itemData = this.childrens.find(v => v.name === i);
+					if (itemData) {
+						if (this.formData[i] === undefined) {
+							this.formData[i] = this._getValue(i, this.dataValue[i]);
+						}
+					}
+				}
+
+				if (!type) {
+					console.warn('submit 方法即将废弃，请使用validate方法代替！');
+				}
+
+				return this.checkAll(this.formData, keepitem, callback, 'submit');
 			},
-			/**
-			 * 校验所有或者部分表单
-			 */
-			async validateAll(invalidFields, type, keepitem, callback) {
+
+			// 校验所有
+			async checkAll(invalidFields, keepitem, callback, type) {
+				// 不存在校验规则 ，则停止校验流程
+				if (!this.validator) return
 				let childrens = []
+				// 处理参与校验的item实例
 				for (let i in invalidFields) {
-					const item = this.childrens.find(v => v.name === i)
+					const item = this.childrens.find(v => realName(v.name) === i)
 					if (item) {
 						childrens.push(item)
 					}
 				}
 
+				// 如果validate第一个参数是funciont ,那就走回调
 				if (!callback && typeof keepitem === 'function') {
 					callback = keepitem;
 				}
 
 				let promise;
+				// 如果不存在回调，那么使用 Promise 方式返回
 				if (!callback && typeof callback !== 'function' && Promise) {
 					promise = new Promise((resolve, reject) => {
 						callback = function(valid, invalidFields) {
@@ -296,47 +321,39 @@
 				}
 
 				let results = [];
-				let newFormData = {};
-				if (this.validator) {
-					for (let key in childrens) {
-						const child = childrens[key];
-						let name = child.isArray ? child.arrayField : child.name;
-						if (child.isArray) {
-							if (child.name.indexOf('[') !== -1 && child.name.indexOf(']') !== -1) {
-								const fieldData = child.name.split('[');
-								const fieldName = fieldData[0];
-								const fieldValue = fieldData[1].replace(']', '');
-								if (!newFormData[fieldName]) {
-									newFormData[fieldName] = {};
-								}
-								newFormData[fieldName][fieldValue] = this._getValue(name, invalidFields[name]);
-							}
-						} else {
-							newFormData[name] = this._getValue(name, invalidFields[name]);
-						}
-						const result = await child.triggerCheck(invalidFields[name], true);
-						if (result) {
-							results.push(result);
-							if (this.errShowType === 'toast' || this.errShowType === 'modal') break;
-						}
+				// 避免引用错乱 ，建议拷贝对象处理
+				let tempFormData = JSON.parse(JSON.stringify(invalidFields))
+				// 所有子组件参与校验,使用 for 可以使用  awiat
+				for (let i in childrens) {
+					const child = childrens[i]
+					let name = realName(child.name);
+					const result = await child.onFieldChange(tempFormData[name]);
+					if (result) {
+						results.push(result);
+						// toast ,modal 只需要执行第一次就可以
+						if (this.errShowType === 'toast' || this.errShowType === 'modal') break;
 					}
-				} else {
-					newFormData = invalidFields
 				}
+
+
 				if (Array.isArray(results)) {
 					if (results.length === 0) results = null;
 				}
-
 				if (Array.isArray(keepitem)) {
 					keepitem.forEach(v => {
-						newFormData[v] = this.dataValue[v];
+						let vName = realName(v);
+						let value = getDataValue(v, this.localData)
+						if (value !== undefined) {
+							tempFormData[vName] = value
+						}
 					});
 				}
 
+				// TODO submit 即将废弃
 				if (type === 'submit') {
 					this.$emit('submit', {
 						detail: {
-							value: newFormData,
+							value: tempFormData,
 							errors: results
 						}
 					});
@@ -344,129 +361,37 @@
 					this.$emit('validate', results);
 				}
 
-				callback && typeof callback === 'function' && callback(results, newFormData);
+				// const resetFormData = rawData(tempFormData, this.localData, this.name)
+				let resetFormData = {}
+				resetFormData = rawData(tempFormData, this.name)
+				callback && typeof callback === 'function' && callback(results, resetFormData);
 
 				if (promise && callback) {
 					return promise;
 				} else {
 					return null;
 				}
-			},
-			submitForm() {},
-			/**
-			 * 外部调用方法
-			 * 手动提交校验表单
-			 * 对整个表单进行校验的方法，参数为一个回调函数。
-			 */
-			submit(keepitem, callback, type) {
-				for (let i in this.dataValue) {
-					const itemData = this.childrens.find(v => v.name === i);
-					if (itemData) {
-						if (this.formData[i] === undefined) {
-							this.formData[i] = this._getValue(i, this.dataValue[i]);
-						}
-					}
-				}
-				if (!type) {
-					console.warn('submit 方法即将废弃，请使用validate方法代替！');
-				}
-				return this.validateAll(this.formData, 'submit', keepitem, callback);
-			},
 
-			/**
-			 * 外部调用方法
-			 * 校验表单
-			 * 对整个表单进行校验的方法，参数为一个回调函数。
-			 */
-			validate(keepitem, callback) {
-				return this.submit(keepitem, callback, true);
 			},
 
 			/**
-			 * 部分表单校验
-			 * @param {Object} props
-			 * @param {Object} cb
-			 */
-			validateField(props, callback) {
-				props = [].concat(props);
-				let invalidFields = {};
-				this.childrens.forEach(item => {
-					if (props.indexOf(item.name) !== -1) {
-						invalidFields = Object.assign({}, invalidFields, {
-							[item.name]: this.formData[item.name]
-						});
-					}
-				});
-				return this.validateAll(invalidFields, 'submit', [], callback);
-			},
-
-			/**
-			 * 对整个表单进行重置，将所有字段值重置为初始值并移除校验结果
+			 * 返回validate事件
+			 * @param {Object} result
 			 */
-			resetFields() {
-				this.resetForm();
+			validateCheck(result) {
+				this.$emit('validate', result);
 			},
-
-			/**
-			 * 移除表单项的校验结果。传入待移除的表单项的 prop 属性或者 prop 组成的数组，如不传则移除整个表单的校验结果
-			 */
-			clearValidate(props) {
-				props = [].concat(props);
-				this.childrens.forEach(item => {
-					const inputComp = this.inputChildrens.find(child => child.rename === item.name);
-					if (props.length === 0) {
-						item.errMsg = '';
-						if (inputComp) {
-							inputComp.errMsg = '';
-						}
-					} else {
-						if (props.indexOf(item.name) !== -1) {
-							item.errMsg = '';
-							if (inputComp) {
-								inputComp.errMsg = '';
-							}
-						}
-					}
-				});
-			},
-			/**
-			 * 把 value 转换成指定的类型
-			 * @param {Object} key
-			 * @param {Object} value
-			 */
-			_getValue(key, value) {
-				const rules = (this.formRules[key] && this.formRules[key].rules) || [];
-				const isRuleNum = rules.find(val => val.format && this.type_filter(val.format));
-				const isRuleBool = rules.find(val => (val.format && val.format === 'boolean') || val.format === 'bool');
-				// 输入值为 number
-				if (isRuleNum) {
-					value = isNaN(value) ? value : value === '' || value === null ? null : Number(value);
-				}
-				// 简单判断真假值
-				if (isRuleBool) {
-					value = !value ? false : true;
-				}
-				return value;
-			},
-			/**
-			 * 过滤数字类型
-			 * @param {Object} format
-			 */
-			type_filter(format) {
-				return format === 'int' || format === 'double' || format === 'number' || format === 'timestamp';
-			}
+			_getValue: getValue,
+			_isRequiredField: isRequiredField,
+			_setDataValue: setDataValue,
+			_getDataValue: getDataValue,
+			_realName: realName,
+			_isRealName: isRealName,
+			_isEqual: isEqual
 		}
 	};
 </script>
 
-<style lang="scss" >
-	.uni-forms {
-		// overflow: hidden;
-		// padding: 10px 15px;
-	}
-
-	.uni-forms--top {
-		// padding: 10px 15px;
-		// padding-top: 22px;
-	}
-</style>
+<style lang="scss">
+	.uni-forms {}
+</style>
diff --git a/uni_modules/uni-forms/components/uni-forms/utils.js b/uni_modules/uni-forms/components/uni-forms/utils.js
new file mode 100644
index 0000000000000000000000000000000000000000..31d57f41031ee6b5ebd01d0a091a17611ae270c3
--- /dev/null
+++ b/uni_modules/uni-forms/components/uni-forms/utils.js
@@ -0,0 +1,293 @@
+/**
+ * 简单处理对象拷贝
+ * @param {Obejct} 被拷贝对象
+ * @@return {Object} 拷贝对象
+ */
+export const deepCopy = (val) => {
+	return JSON.parse(JSON.stringify(val))
+}
+/**
+ * 过滤数字类型
+ * @param {String} format 数字类型
+ * @@return {Boolean} 返回是否为数字类型
+ */
+export const typeFilter = (format) => {
+	return format === 'int' || format === 'double' || format === 'number' || format === 'timestamp';
+}
+
+/**
+ * 把 value 转换成指定的类型，用于处理初始值，原因是初始值需要入库不能为 undefined
+ * @param {String} key 字段名
+ * @param {any} value 字段值
+ * @param {Object} rules 表单校验规则
+ */
+export const getValue = (key, value, rules) => {
+	const isRuleNumType = rules.find(val => val.format && typeFilter(val.format));
+	const isRuleBoolType = rules.find(val => (val.format && val.format === 'boolean') || val.format === 'bool');
+	// 输入类型为 number
+	if (!!isRuleNumType) {
+		if (!value && value !== 0) {
+			value = null
+		} else {
+			value = isNumber(Number(value)) ? Number(value) : value
+		}
+	}
+
+	// 输入类型为 boolean
+	if (!!isRuleBoolType) {
+		value = isBoolean(value) ? value : false
+	}
+
+	return value;
+}
+
+/**
+ * 获取表单数据
+ * @param {String|Array} name 真实名称，需要使用 realName 获取
+ * @param {Object} data 原始数据
+ * @param {any} value  需要设置的值
+ */
+export const setDataValue = (field, formdata, value) => {
+	formdata[field] = value
+	return value || ''
+}
+
+/**
+ * 获取表单数据
+ * @param {String|Array} field 真实名称，需要使用 realName 获取
+ * @param {Object} data 原始数据
+ */
+export const getDataValue = (field, data) => {
+	return objGet(data, field)
+}
+
+/**
+ * 获取表单类型
+ * @param {String|Array} field 真实名称，需要使用 realName 获取
+ */
+export const getDataValueType = (field, data) => {
+	const value = getDataValue(field, data)
+	return {
+		type: type(value),
+		value
+	}
+}
+
+/**
+ * 获取表单可用的真实name
+ * @param {String|Array} name 表单name
+ * @@return {String} 表单可用的真实name
+ */
+export const realName = (name, data = {}) => {
+	const base_name = _basePath(name)
+	if (typeof base_name === 'object' && Array.isArray(base_name) && base_name.length > 1) {
+		const realname = base_name.reduce((a, b) => a += `#${b}`, '_formdata_')
+		return realname
+	}
+	return base_name[0] || name
+}
+
+/**
+ * 判断是否表单可用的真实name
+ * @param {String|Array} name 表单name
+ * @@return {String} 表单可用的真实name
+ */
+export const isRealName = (name) => {
+	const reg = /^_formdata_#*/
+	return reg.test(name)
+}
+
+/**
+ * 获取表单数据的原始格式
+ * @@return {Object|Array} object 需要解析的数据
+ */
+export const rawData = (object = {}, name) => {
+	let newData = JSON.parse(JSON.stringify(object))
+	let formData = {}
+	for(let i in newData){
+		let path = name2arr(i)
+		objSet(formData,path,newData[i])
+	}
+	return formData
+}
+
+/**
+ * 真实name还原为 array
+ * @param {*} name 
+ */
+export const name2arr = (name) => {
+	let field = name.replace('_formdata_#', '')
+	field = field.split('#').map(v => (isNumber(v) ? Number(v) : v))
+	return field
+}
+
+/**
+ * 对象中设置值
+ * @param {Object|Array} object 源数据
+ * @param {String| Array} path 'a.b.c' 或 ['a',0,'b','c']
+ * @param {String} value 需要设置的值
+ */
+export const objSet = (object, path, value) => {
+	if (typeof object !== 'object') return object;
+	_basePath(path).reduce((o, k, i, _) => {
+		if (i === _.length - 1) { 
+			// 若遍历结束直接赋值
+			o[k] = value
+			return null
+		} else if (k in o) { 
+			// 若存在对应路径，则返回找到的对象，进行下一次遍历
+			return o[k]
+		} else { 
+			// 若不存在对应路径，则创建对应对象，若下一路径是数字，新对象赋值为空数组，否则赋值为空对象
+			o[k] = /^[0-9]{1,}$/.test(_[i + 1]) ? [] : {}
+			return o[k]
+		}
+	}, object)
+	// 返回object
+	return object;
+}
+
+// 处理 path， path有三种形式：'a[0].b.c'、'a.0.b.c' 和 ['a','0','b','c']，需要统一处理成数组，便于后续使用
+function _basePath(path) {
+	// 若是数组，则直接返回
+	if (Array.isArray(path)) return path
+	// 若有 '[',']'，则替换成将 '[' 替换成 '.',去掉 ']'
+	return path.replace(/\[/g, '.').replace(/\]/g, '').split('.')
+}
+
+/**
+ * 从对象中获取值
+ * @param {Object|Array} object 源数据
+ * @param {String| Array} path 'a.b.c' 或 ['a',0,'b','c']
+ * @param {String} defaultVal 如果无法从调用链中获取值的默认值
+ */
+export const objGet = (object, path, defaultVal = 'undefined') => {
+	// 先将path处理成统一格式
+	let newPath = _basePath(path)
+	// 递归处理，返回最后结果
+	let val = newPath.reduce((o, k) => {
+		return (o || {})[k]
+	}, object);
+	return !val || val !== undefined ? val : defaultVal
+}
+
+
+/**
+ * 是否为 number 类型 
+ * @param {any} num 需要判断的值
+ * @return {Boolean} 是否为 number
+ */
+export const isNumber = (num) => {
+	return !isNaN(Number(num))
+}
+
+/**
+ * 是否为 boolean 类型 
+ * @param {any} bool 需要判断的值
+ * @return {Boolean} 是否为 boolean
+ */
+export const isBoolean = (bool) => {
+	return (typeof bool === 'boolean')
+}
+/**
+ * 是否有必填字段
+ * @param {Object} rules 规则
+ * @return {Boolean} 是否有必填字段
+ */
+export const isRequiredField = (rules) => {
+	let isNoField = false;
+	for (let i = 0; i < rules.length; i++) {
+		const ruleData = rules[i];
+		if (ruleData.required) {
+			isNoField = true;
+			break;
+		}
+	}
+	return isNoField;
+}
+
+
+/**
+ * 获取数据类型
+ * @param {Any} obj 需要获取数据类型的值
+ */
+export const type = (obj) => {
+	var class2type = {};
+
+	// 生成class2type映射
+	"Boolean Number String Function Array Date RegExp Object Error".split(" ").map(function(item, index) {
+		class2type["[object " + item + "]"] = item.toLowerCase();
+	})
+	if (obj == null) {
+		return obj + "";
+	}
+	return typeof obj === "object" || typeof obj === "function" ?
+		class2type[Object.prototype.toString.call(obj)] || "object" :
+		typeof obj;
+}
+
+/**
+ * 判断两个值是否相等
+ * @param {any} a 值  
+ * @param {any} b 值  
+ * @return {Boolean} 是否相等
+ */
+export const isEqual = (a, b) => {
+	//如果a和b本来就全等
+	if (a === b) {
+		//判断是否为0和-0
+		return a !== 0 || 1 / a === 1 / b;
+	}
+	//判断是否为null和undefined
+	if (a == null || b == null) {
+		return a === b;
+	}
+	//接下来判断a和b的数据类型
+	var classNameA = toString.call(a),
+		classNameB = toString.call(b);
+	//如果数据类型不相等，则返回false
+	if (classNameA !== classNameB) {
+		return false;
+	}
+	//如果数据类型相等，再根据不同数据类型分别判断
+	switch (classNameA) {
+		case '[object RegExp]':
+		case '[object String]':
+			//进行字符串转换比较
+			return '' + a === '' + b;
+		case '[object Number]':
+			//进行数字转换比较,判断是否为NaN
+			if (+a !== +a) {
+				return +b !== +b;
+			}
+			//判断是否为0或-0
+			return +a === 0 ? 1 / +a === 1 / b : +a === +b;
+		case '[object Date]':
+		case '[object Boolean]':
+			return +a === +b;
+	}
+	//如果是对象类型
+	if (classNameA == '[object Object]') {
+		//获取a和b的属性长度
+		var propsA = Object.getOwnPropertyNames(a),
+			propsB = Object.getOwnPropertyNames(b);
+		if (propsA.length != propsB.length) {
+			return false;
+		}
+		for (var i = 0; i < propsA.length; i++) {
+			var propName = propsA[i];
+			//如果对应属性对应值不相等，则返回false
+			if (a[propName] !== b[propName]) {
+				return false;
+			}
+		}
+		return true;
+	}
+	//如果是数组类型
+	if (classNameA == '[object Array]') {
+		if (a.toString() == b.toString()) {
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/uni_modules/uni-forms/package.json b/uni_modules/uni-forms/package.json
index dfa7af4c459063564c2ad3942a96a79503e6a905..e3736c45357f4a5f8061a1d0aeea79e89c7f6a1e 100644
--- a/uni_modules/uni-forms/package.json
+++ b/uni_modules/uni-forms/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-forms",
   "displayName": "uni-forms 表单",
-  "version": "1.3.2",
+  "version": "1.4.8",
   "description": "由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据",
   "keywords": [
     "uni-ui",
@@ -17,11 +17,7 @@
   "directories": {
     "example": "../../temps/example_temps"
   },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
+"dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -38,7 +34,8 @@
       "data": "无",
       "permissions": "无"
     },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
   },
   "uni_modules": {
     "dependencies": [
@@ -74,7 +71,8 @@
           "阿里": "y",
           "百度": "y",
           "字节跳动": "y",
-          "QQ": "y"
+        "QQ": "y",
+        "京东": "u"
         },
         "快应用": {
           "华为": "u",
diff --git a/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js b/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js
deleted file mode 100644
index 393afb2bc0c6beca1c4dba1767416173d7a05115..0000000000000000000000000000000000000000
--- a/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js
+++ /dev/null
@@ -1,766 +0,0 @@
-'use strict';
-let uniID = require('uni-id')
-const uniCaptcha = require('uni-captcha')
-const createConfig = require('uni-config-center')
-const uniIdConfig = createConfig({
-	pluginId: 'uni-id'
-}).config()
-const db = uniCloud.database()
-const dbCmd = db.command
-const usersDB = db.collection('uni-id-users')
-const deviceDB = db.collection('uni-id-device')
-exports.main = async (event, context) => {
-	console.log({
-		context
-	});
-	//UNI_WYQ:这里的uniID换成新的，保证多人访问不会冲突
-	uniID = uniID.createInstance({
-		context
-	})
-	console.log('event : ' + JSON.stringify(event))
-	/*
-	1.event为客户端 uniCloud.callFunction填写的data的值，这里介绍一下其中的属性
-		action：表示要执行的任务名称、比如：登录login、退出登录 logout等
-		params：业务数据内容
-		uniIdToken：系统自动传递的token，数据来源客户端的 uni.getStorageSync('uni_id_token')
-	*/
-	const {
-		action,
-		uniIdToken,
-		inviteCode
-	} = event;
-	const deviceInfo = event.deviceInfo || {};
-	let params = event.params || {},
-		tokenExpired,needCaptcha;
-	/*
-	2.在某些操作之前我们要对用户对身份进行校验（也就是要检查用户的token）再将得到的uid写入params.uid
-		校验用到的方法是uniID.checkToken 详情：https://uniapp.dcloud.io/uniCloud/uni-id?id=checktoken
-		讨论，我们假设一个这样的场景，代码如下。
-		如：
-		uniCloud.callFunction({
-			name:"xxx",
-			data:{
-				"params":{
-					uid:"通过某种方式获取来的别人的uid"
-				}
-			}
-		})
-		用户就这样轻易地伪造了他人的uid传递给服务端，有一句话叫：前端传来的数据都是不可信任的
-		所以这里我们需要将uniID.checkToken返回的uid写入到params.uid
-	*/
-	let noCheckAction = ['register', 'checkToken', 'login', 'logout', 'sendSmsCode', 'getNeedCaptcha',
-		'createCaptcha', 'verifyCaptcha', 'refreshCaptcha', 'inviteLogin', 'loginByWeixin',
-		'loginByUniverify', 'loginByApple', 'loginBySms', 'resetPwdBySmsCode', 'registerAdmin'
-	]
-	if (!noCheckAction.includes(action)) {
-		if (!uniIdToken) {
-			return {
-				code: 403,
-				msg: '缺少token'
-			}
-		}
-		let payload = await uniID.checkToken(uniIdToken)
-		if (payload.code && payload.code > 0) {
-			return payload
-		}
-		params.uid = payload.uid
-		tokenExpired = payload.tokenExpired
-	}
-
-	//禁止前台用户传递角色
-	if (action.slice(0, 7) == "loginBy") {
-		if (params.role) {
-			return {
-				code: 403,
-				msg: '禁止前台用户传递角色'
-			}
-		}
-	}
-
-	// 3.注册成功后触发。
-	async function registerSuccess(res) {
-		//用户接受邀请
-		if (inviteCode) {
-			await uniID.acceptInvite({
-				inviteCode,
-				uid
-			});
-		}
-		//添加当前用户设备信息
-		await addDeviceInfo(res)
-	}
-	//4.记录成功登录的日志方法
-	const uniIdLog = async (res = {}) => {
-		const now = Date.now()
-		const uniIdLogCollection = db.collection('uni-id-log')
-		let logData = {
-			deviceId: context.DEVICEID,
-			ip: context.CLIENTIP,
-			type: res.type,
-			ua: context.CLIENTUA,
-			create_date: now,
-			action
-		};
-
-		if (res.code === 0) {
-			logData.user_id = res.uid
-			logData.state = 1
-			if (res.userInfo && res.userInfo.password) {
-				delete res.userInfo.password
-			}
-			if (res.type == 'register') {
-				await registerSuccess(res)
-			}
-			if (res.type == 'login') {
-				if (Object.keys(deviceInfo).length) {
-					console.log(context.DEVICEID);
-					//避免重复新增设备信息，先判断是否已存在
-					let getDeviceRes = await deviceDB.where({
-						"device_id": context.DEVICEID
-					}).get()
-					if (getDeviceRes.data.length == 0) {
-						await addDeviceInfo(res)
-					} else {
-						await deviceDB.where({
-							"device_id": context.DEVICEID,
-						}).update({
-							...deviceInfo,
-							"tokenExpired": res.tokenExpired,
-							"user_id": res.uid,
-							"device_id": context.DEVICEID,
-							"ua": context.CLIENTUA,
-							"platform": context.PLATFORM,
-							"create_date": Date.now(),
-							"last_active_date": Date.now(),
-							"last_active_ip": context.CLIENTIP
-						})
-					}
-				}
-			}
-		} else {
-			logData.state = 0
-		}
-		return await uniIdLogCollection.add(logData)
-	}
-
-	async function addDeviceInfo({
-		uid,
-		tokenExpired
-	}) {
-		return await deviceDB.add({
-			...deviceInfo,
-			tokenExpired,
-			"user_id": uid,
-			"device_id": context.DEVICEID,
-			"ua": context.CLIENTUA,
-			"platform": context.PLATFORM,
-			"create_date": Date.now(),
-			"last_active_date": Date.now(),
-			"last_active_ip": context.CLIENTIP
-		})
-	}
-
-	//5.防止恶意破解操作，连续操作失败一定次数后，需要用户提供验证码
-	const isNeedCaptcha = async () => {
-		//当用户最近“2小时内(recordDate)”操作失败达到2次(recordSize)时。要求用户提交验证码
-		const now = Date.now(),
-			recordDate = 120 * 60 * 1000,
-			recordSize = 2;
-		const uniIdLogCollection = db.collection('uni-id-log')
-		let recentRecord = await uniIdLogCollection.where({
-				ip: context.CLIENTIP,
-				create_date: dbCmd.gt(now - recordDate),
-				action
-			})
-			.orderBy('create_date', 'desc')
-			.limit(recordSize)
-			.get();
-		return recentRecord.data.filter(item => item.state === 0).length === recordSize;
-	}
-
-	let res = {}
-	switch (action) { //根据action的值执行对应的操作
-		case 'renewDeviceTokenExpired':
-			return await deviceDB.where({
-				"user_id": params.uid,
-				"device_id": context.DEVICEID
-			}).update({
-				"user_id": params.uid,
-				"push_clientid": params.push_clientid,
-				tokenExpired
-			})
-			break;
-		case 'refreshSessionKey':
-			let getSessionKey = await uniID.code2SessionWeixin({
-				code: params.code
-			});
-			if (getSessionKey.code) {
-				return getSessionKey
-			}
-			res = await uniID.updateUser({
-				uid: params.uid,
-				sessionKey: getSessionKey.sessionKey
-			})
-			console.log(res);
-			break;
-		case 'bindMobileByMpWeixin':
-			console.log(params);
-			let getSessionKeyRes = await uniID.getUserInfo({
-				uid: params.uid,
-				field: ['sessionKey']
-			})
-			if (getSessionKeyRes.code) {
-				return getSessionKeyRes
-			}
-			let sessionKey = getSessionKeyRes.userInfo.sessionKey
-			console.log(getSessionKeyRes);
-			res = await uniID.wxBizDataCrypt({
-				...params,
-				sessionKey
-			})
-			console.log(res);
-			if (res.code) {
-				return res
-			}
-			res = await uniID.bindMobile({
-				uid: params.uid,
-				mobile: res.purePhoneNumber
-			})
-			console.log(res);
-			break;
-		case 'bindMobileByUniverify':
-			let {
-				appid, apiKey, apiSecret
-			} = uniIdConfig.service.univerify
-			let univerifyRes = await uniCloud.getPhoneNumber({
-				provider: 'univerify',
-				appid,
-				apiKey,
-				apiSecret,
-				access_token: params.access_token,
-				openid: params.openid
-			})
-			if (univerifyRes.code === 0) {
-				res = await uniID.bindMobile({
-					uid: params.uid,
-					mobile: univerifyRes.phoneNumber
-				})
-				res.mobile = univerifyRes.phoneNumber
-			}
-			break;
-		case 'bindMobileBySms':
-			if(!(/^1\d{10}$/.test(params.mobile))){
-				return {
-					code: 401,
-					msg: '手机号格式错误'
-				}
-			}
-			if(!params.code){
-				return {
-					code: 401,
-					msg: '短信验证码不能为空'
-				}
-			}
-			needCaptcha = await isNeedCaptcha()
-			console.log(needCaptcha)
-			if(needCaptcha){
-				let {captcha} = params
-				if(!captcha){
-					return {
-						errCode: 'CAPTCHA_REQUIRED',
-						errMsg: '操作失败达到2次，请提交验证码'
-					}
-				}
-				res = await uniCaptcha.verify({
-					captcha,
-					scene: action
-				})
-				console.log(8956,res);
-				if(res.code != 0){
-					console.log(res,action);
-					return res
-				}
-			}
-			
-			res = await uniID.bindMobile({
-				uid: params.uid,
-				mobile: params.mobile,
-				code: params.code
-			})
-			uniIdLog(res)
-			console.log(res);
-			break;
-		case 'register':
-			var {
-				username, password, nickname,captcha
-			} = params
-			if (/^1\d{10}$/.test(username)) {
-				return {
-					code: 401,
-					msg: '用户名不能是手机号'
-				}
-			};
-			if (/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/.test(username)) {
-				return {
-					code: 401,
-					msg: '用户名不能是邮箱'
-				}
-			}
-			if(!captcha){
-				return {
-					code: 401,
-					msg: '图形验证码不能为空'
-				}
-			}
-			res = await uniCaptcha.verify({
-				captcha,
-				scene: action
-			})
-			if(res.code != 0){
-				return res
-			}
-			res = await uniID.register({
-				username,
-				password,
-				nickname,
-				inviteCode
-			});
-			if (res.code === 0) {
-				await registerSuccess(res)
-			}
-			break;
-		case 'getNeedCaptcha': {
-			const needCaptcha = await isNeedCaptcha()
-			res.needCaptcha = needCaptcha
-			break;
-		}
-		case 'login':
-			let passed = false;
-			needCaptcha = await isNeedCaptcha();
-			console.log('needCaptcha', needCaptcha);
-			if (needCaptcha) {
-				res = await uniCaptcha.verify({
-					...params,
-					scene: 'login'
-				})
-				if (res.code === 0) passed = true;
-			}
-
-			if (!needCaptcha || passed) {
-				res = await uniID.login({
-					...params,
-					queryField: ['username', 'email', 'mobile']
-				});
-				res.type = 'login'
-				await uniIdLog(res);
-				needCaptcha = await isNeedCaptcha();
-			}
-
-			res.needCaptcha = needCaptcha;
-			break;
-		case 'loginByWeixin':
-			let loginRes = await uniID.loginByWeixin(params);
-			if (loginRes.code === 0) {
-				//用户完善资料（昵称、头像）
-				if (context.PLATFORM == "app-plus" && !loginRes.userInfo.nickname) {
-					let {
-						accessToken: access_token,
-						openid
-					} = loginRes, {
-						appid,
-						appsecret: secret
-					} = uniIdConfig['app-plus'].oauth.weixin;
-					let wxRes = await uniCloud.httpclient.request(
-						`https://api.weixin.qq.com/sns/userinfo?access_token=${access_token}&openid=${openid}&scope=snsapi_userinfo&appid=${appid}&secret=${secret}`, {
-							method: 'POST',
-							contentType: 'json', // 指定以application/json发送data内的数据
-							dataType: 'json' // 指定返回值为json格式，自动进行parse
-						})
-					if (wxRes.status == 200) {
-						let {
-							nickname,
-							headimgurl
-						} = wxRes.data;
-						let headimgurlFile = {},
-							cloudPath = loginRes.uid + '/' + Date.now() + "headimgurl.jpg";
-						let getImgBuffer = await uniCloud.httpclient.request(headimgurl)
-						if (getImgBuffer.status == 200) {
-							let {
-								fileID
-							} = await uniCloud.uploadFile({
-								cloudPath,
-								fileContent: getImgBuffer.data
-							});
-							headimgurlFile = {
-								name: cloudPath,
-								extname: "jpg",
-								url: fileID
-							}
-						} else {
-							return getImgBuffer
-						}
-						await uniID.updateUser({
-							uid: loginRes.uid,
-							nickname,
-							avatar_file: headimgurlFile
-						})
-						loginRes.userInfo.nickname = nickname;
-						loginRes.userInfo.avatar_file = headimgurlFile;
-					} else {
-						return wxRes
-					}
-				}
-				if (context.PLATFORM == "mp-weixin") {
-					let resUpdateUser = await uniID.updateUser({
-						uid: loginRes.uid,
-						sessionKey: loginRes.sessionKey
-					})
-					console.log(resUpdateUser);
-				}
-				delete loginRes.openid
-				delete loginRes.sessionKey
-				delete loginRes.accessToken
-				delete loginRes.refreshToken
-			}
-			await uniIdLog(loginRes)
-			return loginRes
-			break;
-		case 'loginByUniverify':
-			console.error(params)
-			res = await uniID.loginByUniverify(params)
-			console.log(999999999,res)
-			await uniIdLog(res)
-			break;
-		case 'loginByApple':
-			res = await uniID.loginByApple(params)
-			await uniIdLog(res)
-			break;
-		case 'checkToken':
-			res = await uniID.checkToken(uniIdToken);
-			break;
-		case 'logout':
-			res = await uniID.logout(uniIdToken)
-			await deviceDB.where({
-				"device_id": context.DEVICEID,
-			}).update({
-				"tokenExpired": Date.now()
-			})
-			break;
-		case 'sendSmsCode':
-			/* -开始- 测试期间，为节约资源。统一虚拟短信验证码为： 123456；开启以下代码块即可  */
-			res = uniID.setVerifyCode({
-				mobile: params.mobile,
-				code: '123456',
-				type: params.type
-			})
-			return {
-				...res,
-				code: 40000,
-					msg:
-					"已启动测试模式，直接使用：123456作为短信验证码即可。正式项目，请配置/common/uni-config-center/uni-id/config.json（service->sm中的密钥信息）并在uni-id-cf完成配置 "
-			}
-			/* -结束- */
-
-			// 简单限制一下客户端调用频率
-			const ipLimit = await db.collection('opendb-verify-codes').where({
-				ip: context.CLIENTIP,
-				created_at: dbCmd.gt(Date.now() - 60000)
-			}).get()
-			if (ipLimit.data.length > 0) {
-				return {
-					code: 429,
-					msg: '请求过于频繁'
-				}
-			}
-			const templateId = '11753' // 替换为自己申请的模板id
-			if (!templateId) {
-				return {
-					code: 500,
-					msg: 'sendSmsCode需要传入自己的templateId，参考https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=sendsmscode'
-				}
-			}
-			const randomStr = '00000' + Math.floor(Math.random() * 1000000)
-			const code = randomStr.substring(randomStr.length - 6)
-			res = await uniID.sendSmsCode({
-				mobile: params.mobile,
-				code,
-				type: params.type,
-				templateId
-			})
-			break;
-		case 'loginBySms':
-			needCaptcha = await  isNeedCaptcha()
-			if(needCaptcha){
-				let {captcha} = params
-				if(!captcha){
-					return {
-						errCode: 'CAPTCHA_REQUIRED',
-						errMsg: '操作失败达到2次，请提交验证码'
-					}
-				}
-				res = await uniCaptcha.verify({
-					captcha,
-					scene: action
-				})
-				if(res.code != 0){
-					console.log(res,action);
-					return res
-				}
-			}
-			if (!params.code) {
-				return {
-					code: 500,
-					msg: '请填写验证码'
-				}
-			}
-			if (!/^1\d{10}$/.test(params.mobile)) {
-				return {
-					code: 500,
-					msg: '手机号码填写错误'
-				}
-			}
-			res = await uniID.loginBySms(params)
-			await uniIdLog(res)
-			break;
-		case 'resetPwdBySmsCode':
-			if (!params.code) {
-				return {
-					code: 500,
-					msg: '请填写验证码'
-				}
-			}
-			if (!/^1\d{10}$/.test(params.mobile)) {
-				return {
-					code: 500,
-					msg: '手机号码填写错误'
-				}
-			}
-			params.type = 'login'
-			let loginBySmsRes = await uniID.loginBySms(params)
-			// console.log(loginBySmsRes);
-			if (loginBySmsRes.code === 0) {
-				res = await uniID.resetPwd({
-					password: params.password,
-					"uid": loginBySmsRes.uid
-				})
-			} else {
-				return loginBySmsRes
-			}
-			break;
-		case 'getInviteCode':
-			res = await uniID.getUserInfo({
-				uid: params.uid,
-				field: ['my_invite_code']
-			})
-			if (res.code === 0) {
-				res.myInviteCode = res.userInfo.my_invite_code
-				delete res.userInfo
-			}
-			break;
-		case 'getInvitedUser':
-			res = await uniID.getInvitedUser(params)
-			break;
-		case 'updatePwd':
-			res = await uniID.updatePwd(params)
-			break;
-		case 'createCaptcha':
-			res = await uniCaptcha.create(params)
-			break;
-		case 'refreshCaptcha':
-			res = await uniCaptcha.refresh(params)
-			break;
-		case 'getUserInviteCode':
-			res = await uniID.getUserInfo({
-				uid: params.uid,
-				field: ['my_invite_code']
-			})
-			if (!res.userInfo.my_invite_code) {
-				res = await uniID.setUserInviteCode({
-					uid: params.uid
-				})
-			}
-			break;
-		case 'closeAccount':
-			console.log(params.uid, '-----------------------');
-			res = await uniID.closeAccount({
-				uid: params.uid
-			});
-			break;
-
-			// =========================== admin api start =========================
-		case 'registerAdmin': {
-			var {
-				username,
-				password
-			} = params
-			let {
-				total
-			} = await db.collection('uni-id-users').where({
-				role: 'admin'
-			}).count()
-			if (total) {
-				return {
-					code: 10001,
-					message: '超级管理员已存在，请登录...'
-				}
-			}
-			const appid = params.appid
-			const appName = params.appName
-			delete params.appid
-			delete params.appName
-			res = await uniID.register({
-				username,
-				password,
-				role: ["admin"]
-			})
-			if (res.code === 0) {
-				const app = await db.collection('opendb-app-list').where({
-					appid
-				}).count()
-				if (!app.total) {
-					await db.collection('opendb-app-list').add({
-						appid,
-						name: appName,
-						description: "admin 管理后台",
-						create_date: Date.now()
-					})
-				}
-
-			}
-			break;
-		}
-		case 'registerUser': {
-			const {
-				userInfo
-			} = await uniID.getUserInfo({
-				uid: params.uid
-			})
-			if (userInfo.role.indexOf('admin') === -1) {
-				res = {
-					code: 403,
-					message: '非法访问, 无权限注册超级管理员',
-				}
-			} else {
-				// 过滤 dcloud_appid，注册用户成功后再提交
-				const dcloudAppidList = params.dcloud_appid
-				delete params.dcloud_appid
-				delete params.uid
-				res = await uniID.register({
-					autoSetDcloudAppid: false,
-					...params
-				})
-				if (res.code === 0) {
-					delete res.token
-					delete res.tokenExpired
-					await uniID.setAuthorizedAppLogin({
-						uid: res.uid,
-						dcloudAppidList
-					})
-				}
-			}
-			break;
-		}
-		case 'updateUser': {
-			const {
-				userInfo
-			} = await uniID.getUserInfo({
-				uid: params.uid
-			})
-			if (userInfo.role.indexOf('admin') === -1) {
-				res = {
-					code: 403,
-					message: '非法访问, 无权限注册超级管理员',
-				}
-			} else {
-				// 过滤 dcloud_appid，注册用户成功后再提交
-				const dcloudAppidList = params.dcloud_appid
-				delete params.dcloud_appid
-
-				// 过滤 password，注册用户成功后再提交
-				const password = params.password
-				delete params.password
-
-				// 过滤 uid、id
-				const id = params.id
-				delete params.id
-				delete params.uid
-
-
-				res = await uniID.updateUser({
-					uid: id,
-					...params
-				})
-				if (res.code === 0) {
-					if (password) {
-						await uniID.resetPwd({
-							uid: id,
-							password
-						})
-					}
-					await uniID.setAuthorizedAppLogin({
-						uid: id,
-						dcloudAppidList
-					})
-				}
-			}
-			break;
-		}
-		case 'getCurrentUserInfo':
-			res = await uniID.getUserInfo({
-				uid: params.uid,
-				...params
-			})
-			break;
-		case 'managerMultiTag': {
-			const {
-				userInfo
-			} = await uniID.getUserInfo({
-				uid: params.uid
-			})
-			// 限制只有 admin 角色的用户可管理标签，如需非 admin 角色需自行实现
-			if (userInfo.role.indexOf('admin') === -1) {
-				res = {
-					code: 403,
-					message: '非法访问, 无权限修改用户标签',
-				}
-				return
-			}
-			let {
-				ids,
-				type,
-				value
-			} = params
-			if (type === 'add') {
-				res = await db.collection('uni-id-users').where({
-					_id: dbCmd.in(ids)
-				}).update({
-					tags: dbCmd.addToSet({
-						$each: value
-					})
-				})
-			} else if (type === 'del') {
-				res = await db.collection('uni-id-users').where({
-					_id: dbCmd.in(ids)
-				}).update({
-					tags: dbCmd.pull(dbCmd.in(value))
-				})
-			} else {
-				res = {
-					code: 403,
-					msg: '无效操作'
-				}
-				return
-			}
-			break;
-		}
-		// =========================== admin api end =========================
-		default:
-			res = {
-				code: 403,
-				msg: '非法访问'
-			}
-			break;
-	}
-	//返回数据给客户端
-	return res
-}
diff --git a/uni_modules/uni-id-common/changelog.md b/uni_modules/uni-id-common/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..6a3d19b9b76f4eae843d9c269477548b9616ee4e
--- /dev/null
+++ b/uni_modules/uni-id-common/changelog.md
@@ -0,0 +1,26 @@
+## 1.0.13（2022-07-21）
+- 修复 创建token时未传角色权限信息生成的token不正确的bug
+## 1.0.12（2022-07-15）
+- 提升与旧版本uni-id的兼容性（补充读取配置文件时回退平台app-plus、h5），但是仍推荐使用新平台名进行配置（app、web）
+## 1.0.11（2022-07-14）
+- 修复 部分情况下报`read property 'reduce' of undefined`的错误
+## 1.0.10（2022-07-11）
+- 将token存储在用户表的token字段内，与旧版本uni-id保持一致
+## 1.0.9（2022-07-01）
+- checkToken兼容token内未缓存角色权限的情况，此时将查库获取角色权限
+## 1.0.8（2022-07-01）
+- 修复clientDB默认依赖时部分情况下获取不到uni-id配置的Bug
+## 1.0.7（2022-06-30）
+- 修复config文件不合法时未抛出具体错误的Bug
+## 1.0.6（2022-06-28）
+- 移除插件内的数据表schema
+## 1.0.5（2022-06-27）
+- 修复使用多应用配置时报`Cannot read property 'appId' of undefined`的Bug
+## 1.0.4（2022-06-27）
+- 修复使用自定义token内容功能报错的Bug [详情](https://ask.dcloud.net.cn/question/147945)
+## 1.0.2（2022-06-23）
+- 对齐旧版本uni-id默认配置
+## 1.0.1（2022-06-22）
+- 补充对uni-config-center的依赖
+## 1.0.0（2022-06-21）
+- 提供uni-id token创建、校验、刷新接口，简化旧版uni-id公共模块
diff --git a/uni_modules/uni-id-common/package.json b/uni_modules/uni-id-common/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..0aed93272e5aca43c34b284807fcae231c9b5dd8
--- /dev/null
+++ b/uni_modules/uni-id-common/package.json
@@ -0,0 +1,87 @@
+{
+	"id": "uni-id-common",
+	"displayName": "uni-id-common",
+	"version": "1.0.13",
+	"description": "包含uni-id token生成、校验、刷新功能的云函数公共模块",
+	"keywords": [
+        "uni-id-common",
+        "uniCloud",
+        "token",
+        "权限"
+    ],
+	"repository": "https://gitcode.net/dcloud/uni-id-common",
+	"engines": {
+		"HBuilderX": "^3.1.0"
+	},
+	"dcloudext": {
+		"category": [
+			"uniCloud",
+			"云函数模板"
+		],
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+		"npmurl": ""
+	},
+	"uni_modules": {
+		"dependencies": ["uni-config-center"],
+		"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"
+				}
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-id-common/readme.md b/uni_modules/uni-id-common/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..91b3aaa811950cb82e592587f13993b517d52b9e
--- /dev/null
+++ b/uni_modules/uni-id-common/readme.md
@@ -0,0 +1,3 @@
+# uni-id-common
+
+文档请参考：[uni-id-common](https://uniapp.dcloud.net.cn/uniCloud/uni-id-common.html)
\ No newline at end of file
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..c51a148471f8346cf389c70e479b119026fc4fee
--- /dev/null
+++ b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
@@ -0,0 +1 @@
+"use strict";var e,t=(e=require("crypto"))&&"object"==typeof e&&"default"in e?e.default:e;const n={TOKEN_EXPIRED:"uni-id-token-expired",CHECK_TOKEN_FAILED:"uni-id-check-token-failed",PARAM_REQUIRED:"uni-id-param-required",ACCOUNT_EXISTS:"uni-id-account-exists",ACCOUNT_NOT_EXISTS:"uni-id-account-not-exists",ACCOUNT_CONFLICT:"uni-id-account-conflict",ACCOUNT_BANNED:"uni-id-account-banned",ACCOUNT_AUDITING:"uni-id-account-auditing",ACCOUNT_AUDIT_FAILED:"uni-id-account-audit-failed",ACCOUNT_CLOSED:"uni-id-account-closed"};function i(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof e.then}function r(e){if(!e)return;const t=e.match(/^(\d+).(\d+).(\d+)/);return t?t.slice(1,4).map(e=>parseInt(e)):void 0}function o(e,t){const n=r(e),i=r(t);return n?i?function(e,t){const n=Math.max(e.length,t.length);for(let i=0;i<n;i++){const n=e[i],r=t[i];if(n>r)return 1;if(n<r)return-1}return 0}(n,i):1:i?-1:0}const s={"uni-id-token-expired":30203,"uni-id-check-token-failed":30202};function c(e){const{errCode:t,errMsgValue:n}=e;e.errMsg=this._t(t,n),t in s&&(e.code=s[t]),delete e.errMsgValue}function a(e){return"object"===(i=e,Object.prototype.toString.call(i).slice(8,-1).toLowerCase())&&e.errCode&&(t=e.errCode,Object.values(n).includes(t))&&!!e.errCode;var t,i}let u={"zh-Hans":{"uni-id-token-expired":"登陆状态失效，token已过期","uni-id-check-token-failed":"token校验未通过","uni-id-param-required":"缺少参数: {param}","uni-id-account-exists":"此账号已注册","uni-id-account-not-exists":"此账号未注册","uni-id-account-conflict":"用户账号冲突","uni-id-account-banned":"从账号已封禁","uni-id-account-auditing":"此账号正在审核中","uni-id-account-audit-failed":"此账号审核失败","uni-id-account-closed":"此账号已注销"},en:{"uni-id-token-expired":"The login status is invalid, token has expired","uni-id-check-token-failed":"Check token failed","uni-id-param-required":"Parameter required: {param}","uni-id-account-exists":"Account exists","uni-id-account-not-exists":"Account does not exists","uni-id-account-conflict":"User account conflict","uni-id-account-banned":"Account has been banned","uni-id-account-auditing":"Account audit in progress","uni-id-account-audit-failed":"Account audit failed","uni-id-account-closed":"Account has been closed"}};try{const e=require.resolve("uni-config-center/uni-id/lang/index.js");u=function(e,t){const n=Object.keys(e);n.push(...Object.keys(t));const i={};for(let r=0;r<n.length;r++){const o=n[r];i[o]=Object.assign({},e[o],t[o])}return i}(u,require(e))}catch(e){}var d=u;function l(e){return e.replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")}function h(e){return JSON.parse((t=function(e){var t=4-(e=e.toString()).length%4;if(4!==t)for(var n=0;n<t;++n)e+="=";return e.replace(/-/g,"+").replace(/_/g,"/")}(e),Buffer.from(t,"base64").toString("utf-8")));var t}function f(e){return l((t=JSON.stringify(e),Buffer.from(t,"utf-8").toString("base64")));var t}function p(e,n){return l(t.createHmac("sha256",n).update(e).digest("base64"))}const k=function(e,t){if("string"!=typeof e)throw new Error("Invalid token");const n=e.split(".");if(3!==n.length)throw new Error("Invalid token");const[i,r,o]=n;if(p(i+"."+r,t)!==o)throw new Error("Invalid token");const s=h(i);if("HS256"!==s.alg||"JWT"!==s.typ)throw new Error("Invalid token");const c=h(r);if(1e3*c.exp<Date.now()){const e=new Error("Token expired");throw e.name="TokenExpiredError",e}return c},g=function(e,t,n={}){const{expiresIn:i}=n;if(!i)throw new Error("expiresIn is required");const r=parseInt(Date.now()/1e3),o={...e,iat:r,exp:r+n.expiresIn},s=f({alg:"HS256",typ:"JWT"})+"."+f(o);return s+"."+p(s,t)},I=uniCloud.database(),_=I.command,C=I.collection("uni-id-users"),m=I.collection("uni-id-roles");class T{constructor({uniId:e}={}){this.uid=null,this.userRecord=null,this.userPermission=null,this.oldToken=null,this.oldTokenPayload=null,this.uniId=e,this.config=this.uniId._getConfig(),this.clientInfo=this.uniId._clientInfo,this.checkConfig()}checkConfig(){const{tokenExpiresIn:e,tokenExpiresThreshold:t}=this.config;if(t>e)throw new Error("Config error, tokenExpiresThreshold should be less than tokenExpiresIn")}get customToken(){return this.uniId.interceptorMap.get("customToken")}isTokenInDb(e){return o(e,"1.0.10")>=0}async getUserRecord(){if(this.userRecord)return this.userRecord;const e=await C.doc(this.uid).get();if(this.userRecord=e.data[0],!this.userRecord)throw{errCode:n.ACCOUNT_NOT_EXISTS};switch(this.userRecord.status){case void 0:case 0:break;case 1:throw{errCode:n.ACCOUNT_BANNED};case 2:throw{errCode:n.ACCOUNT_AUDITING};case 3:throw{errCode:n.ACCOUNT_AUDIT_FAILED};case 4:throw{errCode:n.ACCOUNT_CLOSED}}if(this.oldTokenPayload){if(this.isTokenInDb(this.oldTokenPayload.uniIdVersion)){if(-1===(this.userRecord.token||[]).indexOf(this.oldToken))throw{errCode:n.CHECK_TOKEN_FAILED}}if(this.userRecord.valid_token_date&&this.userRecord.valid_token_date>1e3*this.oldTokenPayload.iat)throw{errCode:n.TOKEN_EXPIRED}}return this.userRecord}async updateUserRecord(e){await C.doc(this.uid).update(e)}async getUserPermission(){if(this.userPermission)return this.userPermission;const e=(await this.getUserRecord()).role||[];if(0===e.length)return this.userPermission={role:[],permission:[]},this.userPermission;if(e.includes("admin"))return this.userPermission={role:["admin"],permission:[]},this.userPermission;const t=await m.where({role_id:_.in(e)}).get(),n=(i=t.data.reduce((e,t)=>(t.permission&&e.push(...t.permission),e),[]),Array.from(new Set(i)));var i;return this.userPermission={role:e,permission:n},this.userPermission}async _createToken({uid:e,role:t,permission:i}={}){if(!t||!i){const e=await this.getUserPermission();t=e.role,i=e.permission}let r={uid:e,role:t,permission:i};if(this.uniId.interceptorMap.has("customToken")){const n=this.uniId.interceptorMap.get("customToken");if("function"!=typeof n)throw new Error("Invalid custom token file");r=await n({uid:e,role:t,permission:i})}const o=Date.now(),{tokenSecret:s,tokenExpiresIn:c}=this.config,a=g({...r,uniIdVersion:"1.0.13"},s,{expiresIn:c}),u=await this.getUserRecord(),d=(u.token||[]).filter(e=>{try{const t=this._checkToken(e);if(u.valid_token_date&&u.valid_token_date>1e3*t.iat)return!1}catch(e){if(e.errCode===n.TOKEN_EXPIRED)return!1}return!0});return d.push(a),await this.updateUserRecord({last_login_ip:this.clientInfo.clientIP,last_login_date:o,token:d}),{token:a,tokenExpired:o+1e3*c}}async createToken({uid:e,role:t,permission:i}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"uid"}};this.uid=e;const{token:r,tokenExpired:o}=await this._createToken({uid:e,role:t,permission:i});return{errCode:0,token:r,tokenExpired:o}}async refreshToken({token:e}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"token"}};this.oldToken=e;const t=this._checkToken(e);this.uid=t.uid,this.oldTokenPayload=t;const{uid:i}=t,{role:r,permission:o}=await this.getUserPermission(),{token:s,tokenExpired:c}=await this._createToken({uid:i,role:r,permission:o});return{errCode:0,token:s,tokenExpired:c}}_checkToken(e){const{tokenSecret:t}=this.config;let i;try{i=k(e,t)}catch(e){if("TokenExpiredError"===e.name)throw{errCode:n.TOKEN_EXPIRED};throw{errCode:n.CHECK_TOKEN_FAILED}}return i}async checkToken(e,{autoRefresh:t=!0}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"token"}};this.oldToken=e;const i=this._checkToken(e);this.uid=i.uid,this.oldTokenPayload=i;const{tokenExpiresThreshold:r}=this.config,{uid:o,role:s,permission:c}=i,a={role:s,permission:c};if(!s&&!c){const{role:e,permission:t}=await this.getUserPermission();a.role=e,a.permission=t}if(!r||!t){const e={code:0,errCode:0,...i,...a};return delete e.uniIdVersion,e}const u=Date.now();let d={};1e3*i.exp-u<1e3*r&&(d=await this._createToken({uid:o}));const l={code:0,errCode:0,...i,...a,...d};return delete l.uniIdVersion,l}}var E=Object.freeze({__proto__:null,checkToken:async function(e,{autoRefresh:t=!0}={}){return new T({uniId:this}).checkToken(e,{autoRefresh:t})},createToken:async function({uid:e,role:t,permission:n}={}){return new T({uniId:this}).createToken({uid:e,role:t,permission:n})},refreshToken:async function({token:e}={}){return new T({uniId:this}).refreshToken({token:e})}});const w=require("uni-config-center")({pluginId:"uni-id"});class A{constructor({context:e,clientInfo:t,config:n}={}){this._clientInfo=e?function(e){return{appId:e.APPID,platform:e.PLATFORM,locale:e.LOCALE,clientIP:e.CLIENTIP,deviceId:e.DEVICEID}}(e):t,this.config=n||this._getOriginConfig(),this.interceptorMap=new Map,w.hasFile("custom-token.js")&&this.setInterceptor("customToken",require(w.resolve("custom-token.js"))),this._i18n=uniCloud.initI18n({locale:this._clientInfo.locale,fallbackLocale:"zh-Hans",messages:d})}setInterceptor(e,t){this.interceptorMap.set(e,t)}_t(...e){return this._i18n.t(...e)}_parseOriginConfig(e){return Array.isArray(e)?e:e[0]?Object.values(e):e}_getOriginConfig(){if(w.hasFile("config.json")){let e;try{e=w.config()}catch(e){throw new Error("Invalid uni-id config file\n"+e.message)}return this._parseOriginConfig(e)}try{return this._parseOriginConfig(require("uni-id/config.json"))}catch(e){throw new Error("Invalid uni-id config file")}}_getAppConfig(){const e=this._getOriginConfig();return Array.isArray(e)?e.find(e=>e.dcloudAppid===this._clientInfo.appId)||e.find(e=>e.isDefaultConfig):e}_getPlatformConfig(){const e=this._getAppConfig();if(!e)throw new Error(`Config for current app (${this._clientInfo.appId}) was not found, please check your config file or client appId`);let t;switch("app-plus"===this._clientInfo.platform&&(this._clientInfo.platform="app"),"h5"===this._clientInfo.platform&&(this._clientInfo.platform="web"),this._clientInfo.platform){case"web":t="h5";break;case"app":t="app-plus"}const n=[{tokenExpiresIn:7200,tokenExpiresThreshold:1200,passwordErrorLimit:6,passwordErrorRetryTime:3600},e];t&&e[t]&&n.push(e[t]),n.push(e[this._clientInfo.platform]);const i=Object.assign(...n);return["tokenSecret","tokenExpiresIn"].forEach(e=>{if(!i||!i[e])throw new Error(`Config parameter missing, ${e} is required`)}),i}_getConfig(){return this._getPlatformConfig()}}for(const e in E)A.prototype[e]=E[e];function y(e){const t=new A(e);return new Proxy(t,{get(e,t){if(t in e&&0!==t.indexOf("_")){if("function"==typeof e[t])return(n=e[t],function(){let e;try{e=n.apply(this,arguments)}catch(e){if(a(e))return c.call(this,e),e;throw e}return i(e)?e.then(e=>(a(e)&&c.call(this,e),e),e=>{if(a(e))return c.call(this,e),e;throw e}):(a(e)&&c.call(this,e),e)}).bind(e);if("context"!==t&&"config"!==t)return e[t]}var n}})}A.prototype.createInstance=y;const x={createInstance:y};module.exports=x;
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..f330c28eb94422990eb791aa045df0adf0056c1a
--- /dev/null
+++ b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "uni-id-common",
+  "version": "1.0.13",
+  "description": "uni-id token生成、校验、刷新",
+  "main": "index.js",
+  "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id-common.html",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitee.com/dcloud/uni-id-common.git"
+  },
+  "author": "DCloud",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/changelog.md b/uni_modules/uni-id-pages/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..9d10c85bd89fa777f09f042e8991eb902b60f05d
--- /dev/null
+++ b/uni_modules/uni-id-pages/changelog.md
@@ -0,0 +1,30 @@
+## 1.0.10（2022-08-25）
+- 修复 导入uni-id-pages插件时未自动导入uni-open-bridge-common的Bug
+## 1.0.9（2022-08-23）
+- 修复 uni-id-co 缺失uni-open-bridge-common依赖的Bug
+## 1.0.8（2022-08-23）
+- 新增 H5端支持微信登录（含微信公众号内的网页授权登录 和 普通浏览器内网页生成二维码，实现手机微信扫码登录）[详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#weixinlogin)
+- 新增 登录成功(全局)回调事件：`uni-id-pages-login-success`，支持通过[uni.$on](https://uniapp.dcloud.net.cn/api/window/communication.html#on)监听;
+- 新增 密码强度（是否必须包含大小写字母、数字和特殊符号以及长度）配置 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#config)
+- 调整 uni-id-co 密码规则调整，废除之前的简单校验，允许配置密码强度 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#password-strength)
+- 调整 uni-id-co 存储用户 openid 时同时以客户端 AppId 为 Key 的副本，参考：[微信登录](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin)、[QQ登录](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-qq)
+- 调整 uni-id-co 依赖 uni-open-bridge-common 存储用户 session_key、access_token 等信息 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#save-user-token)
+- 新增 uni-id-co 增加 beforeRegister 钩子用户在注册前向用户记录内添加一些数据 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#before-register)
+## 1.0.7（2022-07-19）
+- 修复 uni-id-co接口 logout时没有删除token的Bug
+## 1.0.6（2022-07-13）
+- 新增 允许覆盖内置校验规则 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#custom-validator)
+- 修复 app端clientInfo.appVersionCode为数字导致校验无法通过的Bug
+## 1.0.5（2022-07-11）
+修复 微信小程序调用uni-id-co接口报错的Bug [详情](https://ask.dcloud.net.cn/question/148877)
+## 1.0.4（2022-07-06）
+- uni-id-co增加clientInfo字段类型校验
+- 监听token更新时机，同步客户端push_clientid至uni-id-device表，改为：同步客户端push_clientid至uni-id-device表和opendb-device表
+## 1.0.3（2022-07-05）
+新增监听token更新时机，同步客户端push_clientid至uni-id-device表
+## 1.0.2（2022-07-04）
+修复微信小程序登录时无unionid报错的Bug [详情](https://ask.dcloud.net.cn/question/148016)
+## 1.0.1（2022-06-28）
+添加相关uni-id表
+## 1.0.0（2022-06-23）
+正式版
diff --git a/uni_modules/uni-id-pages/common/login-page.mixin.js b/uni_modules/uni-id-pages/common/login-page.mixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a3cab9c8d8bde41975b520079ba2ed7364c834c
--- /dev/null
+++ b/uni_modules/uni-id-pages/common/login-page.mixin.js
@@ -0,0 +1,77 @@
+import loginSuccess from './loginSuccess.js';
+import config from '@/uni_modules/uni-id-pages/config.js'
+let mixin = {
+	data() {
+		return {
+			config,
+			isMounted: false
+		}
+	},
+	onUnload() {
+		// #ifdef H5
+		document.onkeydown = false
+		// #endif
+	},
+	mounted() {
+		this.isMounted = true;
+	},
+	onLoad(e) {
+		if (e.is_weixin_redirect) {
+			uni.showLoading({
+				mask: true
+			})
+			
+			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'){
+						 e.code = arr[1]
+					}
+				})
+			}
+			this.$nextTick(n => {
+				console.log(this.$refs.uniFabLogin);
+				this.$refs.uniFabLogin.login({
+					code:e.code
+				}, 'weixin')
+			})
+		}
+	},
+	computed: {
+		needAgreements() {
+			if (this.isMounted) {
+				if (this.$refs.agreements) {
+					return this.$refs.agreements.needAgreements
+				} else {
+					return false
+				}
+			}
+		},
+		agree: {
+			get() {
+				if (this.isMounted) {
+					if (this.$refs.agreements) {
+						return this.$refs.agreements.isAgree
+					} else {
+						return true
+					}
+				}
+			},
+			set(agree) {
+				if (this.$refs.agreements) {
+					this.$refs.agreements.isAgree = agree
+				} else {
+					console.log('不存在 隐私政策协议组件');
+				}
+			}
+		}
+	},
+	methods: {
+		loginSuccess(e) {
+			loginSuccess(e)
+		}
+	}
+}
+export default mixin
diff --git a/uni_modules/uni-id-pages/common/login-page.scss b/uni_modules/uni-id-pages/common/login-page.scss
new file mode 100644
index 0000000000000000000000000000000000000000..257f67bc87e557fc46dcc83497fda8bfa4b3ab87
--- /dev/null
+++ b/uni_modules/uni-id-pages/common/login-page.scss
@@ -0,0 +1,72 @@
+.uni-content {
+  padding: 0 60rpx;
+}
+
+/* #ifndef APP-NVUE */
+@media screen and (min-width: 690px) {
+  .uni-content {
+    padding: 0;
+    max-width: 400px;
+    margin-left: calc(50% - 200px);
+  }
+}
+
+.uni-content view {
+  box-sizing: border-box;
+}
+
+/* #endif */
+.title {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  padding: 18px 0;
+  font-weight: 800;
+  flex-direction: column;
+}
+
+.tip {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  color: #BDBDC0;
+  font-size: 11px;
+  margin: 6px 0;
+}
+
+.input-box {
+  padding: 4px;
+  background-color: #F8F8F8;
+  border-radius: 0;
+  font-size: 14px;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex: 1;
+}
+
+.link {
+  color: #04498c;
+  cursor: pointer;
+}
+
+.uni-content ::v-deep .uni-forms-item__inner {
+  padding-bottom: 8px;
+}
+
+.uni-btn {
+	text-align: center;
+	height: 40px;
+	line-height: 40px;
+	margin: 15px 0 0 0;
+	color: #FFF !important;
+	border-radius: 5px;
+}
+/*
+.uni-btn::after{
+  display: none;
+}
+.uni-btn[disabled]{
+	background-color: $uni-color-primary !important;
+	opacity: 0.3;
+}*/
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/common/loginSuccess.js b/uni_modules/uni-id-pages/common/loginSuccess.js
new file mode 100644
index 0000000000000000000000000000000000000000..17df975216c645d49054b94b08894d79e41c9820
--- /dev/null
+++ b/uni_modules/uni-id-pages/common/loginSuccess.js
@@ -0,0 +1,37 @@
+export default function(e = {}) {
+	const {
+		showToast = true, toastText = '登录成功', autoBack = true
+	} = e
+	console.log({
+		toastText,
+		autoBack
+	});
+	if (showToast) {
+		uni.showToast({
+			title: toastText,
+			icon: 'none'
+		});
+	}
+	if (autoBack) {
+		let delta = 0; //判断需要返回几层
+		let pages = getCurrentPages();
+		uni.$emit('uni-id-pages-login-success',pages)
+		console.log(pages);
+		pages.forEach((page, index) => {
+			if (pages[pages.length - index - 1].route.split('/')[3] == 'login') {
+				delta++
+			}
+		})
+		console.log('判断需要返回几层:',pages, delta);
+		// #ifdef H5
+		if(e.loginType == 'weixin'){
+			console.log('window.history',window.history);
+			return window.history.go(-3)
+		}
+		// #endif
+		
+		uni.navigateBack({
+			delta
+		})
+	}
+}
diff --git a/uni_modules/uni-id-pages/common/password.js b/uni_modules/uni-id-pages/common/password.js
new file mode 100644
index 0000000000000000000000000000000000000000..e3f57b3b15ade519a5954c955812335e597d61e0
--- /dev/null
+++ b/uni_modules/uni-id-pages/common/password.js
@@ -0,0 +1,113 @@
+// 导入配置
+import config from '@/uni_modules/uni-id-pages/config.js'
+
+const passwordLength = config.password.length
+const passwordStrength = config.password.strength
+
+let minPasswordLength = 6
+let maxPasswordLength = 20
+if (passwordLength) {
+	if (passwordLength[0]) {
+		minPasswordLength = passwordLength[0]
+	}
+	if (passwordLength[1]) {
+		maxPasswordLength = passwordLength[1]
+	}
+}
+// 密码强度表达式
+const passwordRules = {
+	// 密码必须包含大小写字母、数字和特殊符号
+	super: /^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/])[0-9a-zA-Z~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/]{8,16}$/,
+	// 密码必须包含字母、数字和特殊符号
+	strong: /^(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/])[0-9a-zA-Z~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/]{8,16}$/,
+	// 密码必须为字母、数字和特殊符号任意两种的组合
+	medium: /^(?![0-9]+$)(?![a-zA-Z]+$)(?![~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/]+$)[0-9a-zA-Z~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/]{8,16}$/,
+	// 密码必须包含字母和数字
+	weak: /^(?=.*[0-9])(?=.*[a-zA-Z])[0-9a-zA-Z~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/]{6,16}$/
+}
+
+const ERROR = {
+	normal: {
+		noPwd: '请输入密码',
+		noRePwd: '再次输入密码',
+		rePwdErr: '两次输入密码不一致'
+	},
+	passwordStrengthError: {
+		superstrong: '密码必须包含大小写字母、数字和特殊符号',
+		strong: '密码必须包含字母、数字和特殊符号',
+		medium: '密码必须为字母、数字和特殊符号任意两种的组合',
+		weak: '密码必须包含字母'
+	},
+	passwordLengthError: {
+		normal: '密码长度必须在' + minPasswordLength + '-' + maxPasswordLength + '位之间',
+		minLimit: '密码长度不得少于' + minPasswordLength + '位',
+		maxLimit: '密码长度不得超过' + maxPasswordLength + '位'
+	}
+}
+
+function validPwd(password) {
+	//强度校验
+	if (passwordStrength && passwordRules[passwordStrength]) {
+		if (!new RegExp(passwordRules[passwordStrength]).test(password)) {
+			return ERROR.passwordStrengthError[passwordStrength]
+		}
+	}
+	//长度校验
+	if (passwordLength) {
+		if (passwordLength[0] && password.length < passwordLength[0]) {
+			return ERROR.passwordLengthError.minLimit
+		}
+		if (passwordLength[1] && password.length > passwordLength[1]) {
+			return ERROR.passwordLengthError.maxLimit
+		}
+	}
+
+	return true
+}
+
+function getPwdRules(pwdName = 'password', rePwdName = 'password2') {
+	const rules = {}
+	rules[pwdName] = {
+		rules: [{
+				required: true,
+				errorMessage: ERROR.normal.noPwd,
+			},
+			{
+				validateFunction: function(rule, value, data, callback) {
+					const checkRes = validPwd(value)
+					if (checkRes !== true) {
+						callback(checkRes)
+					}
+					return true
+				}
+			}
+		]
+	}
+
+	if (rePwdName) {
+		rules[rePwdName] = {
+			rules: [{
+					required: true,
+					errorMessage: ERROR.normal.noRePwd,
+				},
+				{
+					validateFunction: function(rule, value, data, callback) {
+						if (value != data.password) {
+							callback(ERROR.normal.rePwdErr)
+						}
+						return true
+					}
+				}
+			]
+		}
+	}
+	return rules
+}
+
+export default {
+	ERROR,
+	minPasswordLength,
+	maxPasswordLength,
+	validPwd,
+	getPwdRules
+}
diff --git a/components/cloud-image/cloud-image.vue b/uni_modules/uni-id-pages/components/cloud-image/cloud-image.vue
similarity index 67%
rename from components/cloud-image/cloud-image.vue
rename to uni_modules/uni-id-pages/components/cloud-image/cloud-image.vue
index 2279eb81f6d3880be8c68e5942e1750d9b6ed312..f36bb91a7097a973d5c7d7597ecb0828c0ff08df 100644
--- a/components/cloud-image/cloud-image.vue
+++ b/uni_modules/uni-id-pages/components/cloud-image/cloud-image.vue
@@ -4,10 +4,19 @@
 	</view>
 </template>
 
-<script>
+<script>
+	/**
+	* cloud-image 
+	* @description 兼容普通资源和unicloud图片资源渲染的组件
+	* @property {String} mode	图片裁剪、缩放的模式。默认为widthFix，支持所有image组件的mode值
+	* @property {String} src	资源完了链接或uniCloud云存储资源的fileid
+	* @property {String} width	图片的宽，默认为：100rpx
+	* @property {String} height	图片的高，默认为：100rpx
+	* @event {Function} click 点击 cloud-image 触发事件
+	*/
 	export default {
 		name: "cloud-image",
-		emits:['click','switchChange'],
+		emits:['click'],
 		props: {
 			mode: {
 				type:String,
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-agreements/uni-id-pages-agreements.vue b/uni_modules/uni-id-pages/components/uni-id-pages-agreements/uni-id-pages-agreements.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2e1e0d360b83e5e8ac010369fd846ea5d474c682
--- /dev/null
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-agreements/uni-id-pages-agreements.vue
@@ -0,0 +1,168 @@
+<template>
+	<view class="root" v-if="agreements.length">
+		<template v-if="needAgreements">
+			<checkbox-group @change="setAgree">
+				<label class="checkbox-box">
+					<checkbox :checked="isAgree" style="transform: scale(0.5);margin-right: -6px;" />
+					<text class="text">同意</text>
+				</label>
+			</checkbox-group>
+			<view class="content">
+				<view class="item" v-for="(agreement,index) in agreements" :key="index">
+					<text class="agreement text" @click="navigateTo(agreement)">{{agreement.title}}</text>
+					<text class="text and" v-if="hasAnd(agreements,index)" space="nbsp"> 和 </text>
+				</view>
+			</view>
+		</template>
+		<!-- 弹出式 -->
+		<uni-popup v-if="needAgreements||needPopupAgreements" ref="popupAgreement" type="center">
+			<uni-popup-dialog confirmText="同意" @confirm="popupConfirm">
+				<view class="content">
+					<text class="text">请先阅读并同意</text>
+					<view class="item" v-for="(agreement,index) in agreements" :key="index">
+						<text class="agreement text" @click="navigateTo(agreement)">{{agreement.title}}</text>
+						<text class="text and" v-if="hasAnd(agreements,index)" space="nbsp"> 和 </text>
+					</view>
+				</view>
+			</uni-popup-dialog>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import config from '@/uni_modules/uni-id-pages/config.js'
+	let retryFun = ()=>console.log('为定义')
+	/**
+		* uni-id-pages-agreements 
+		* @description 用户服务协议和隐私政策条款组件
+		* @property {String,Boolean} scope = [register|login]	作用于哪种场景如：register 注册（包括登录并注册，如：微信登录、苹果登录、短信验证码登录）、login 登录。默认值为：register
+	*/
+	export default {
+		name: "uni-agreements",
+		computed: {
+			agreements() {
+				if(!config.agreements){
+					return []
+				}
+				let {serviceUrl,privacyUrl} = config.agreements
+				return [
+					{
+						url:serviceUrl,
+						title:"用户服务协议"
+					},
+					{
+						url:privacyUrl,
+						title:"隐私政策条款"
+					}
+				]
+			}
+		},
+		props: {
+			scope: {
+				type: String,
+				default(){
+					return 'register'
+				}
+			},
+		},
+		methods: {
+			popupConfirm(){
+				console.log("popupConfirm");
+				this.isAgree = true
+				retryFun()
+				// this.$emit('popupConfirm')
+			},
+			popup(Fun){
+				this.needPopupAgreements = true
+				// this.needAgreements = true
+				this.$nextTick(()=>{
+					if(Fun){
+						retryFun = Fun
+					}
+					this.$refs.popupAgreement.open()
+				})
+			},
+			navigateTo({
+				url,
+				title
+			}) {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/common/webview/webview?url=' + url + '&title=' + title,
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			hasAnd(agreements, index) {
+				return agreements.length - 1 > index
+			},
+			setAgree(e) {
+				this.isAgree = !this.isAgree
+				this.$emit('setAgree', this.isAgree)
+			}
+		},
+		created() {
+			this.needAgreements = (config?.agreements?.scope || []).includes(this.scope)
+		},
+		data() {
+			return {
+				isAgree: false,
+				needAgreements:true,
+				needPopupAgreements:false
+			};
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/* #ifndef APP-NVUE */
+	view {
+		display: flex;
+		box-sizing: border-box;
+		flex-direction: column;
+	}
+
+	/* #endif */
+	.root {
+		flex-direction: row;
+		align-items: center;
+		font-size: 12px;
+		color: #8a8f8b;
+	}
+
+	.checkbox-box ,.uni-label-pointer{
+		align-items: center;
+		display: flex;
+		flex-direction: row;
+	}
+
+	.item {
+		flex-direction: row;
+	}
+	.text{
+		line-height: 26px;
+	}
+	.agreement {
+		color: #04498c;
+		cursor: pointer;
+	}
+	
+	.checkbox-box ::v-deep .uni-checkbox-input{
+		border-radius: 100%;
+	}
+
+	.checkbox-box ::v-deep .uni-checkbox-input.uni-checkbox-input-checked{
+		border-color: $uni-color-primary;
+		color: #FFFFFF !important;
+		background-color: $uni-color-primary;
+	}
+	
+	.content{
+		flex-wrap: wrap;
+		flex-direction: row;
+	}
+	
+	.root ::v-deep .uni-popup__error{
+		color: #333333;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue b/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
new file mode 100644
index 0000000000000000000000000000000000000000..898bbaaa84f5246de6bb263c54a0f3675a7fc9f1
--- /dev/null
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
@@ -0,0 +1,188 @@
+<template>
+	<view @click="uploadAvatarImg">
+		<cloud-image v-if="avatar_file" :src="avatar_file.url" :width="width" :height="height"></cloud-image>
+		<uni-icons v-else :style="{width,height,lineHeight:height}" class="chooseAvatar" type="plusempty" size="30"
+			color="#dddddd"></uni-icons>
+	</view>
+</template>
+
+<script>
+	const db = uniCloud.database();
+	const usersTable = db.collection('uni-id-users')
+	/**
+	* uni-id-pages-avatar 
+	* @description 用户头像组件
+	* @property {String} width	图片的宽，默认为：50px
+	* @property {String} height	图片的高，默认为：50px
+	*/
+	export default {
+		data() {
+			return {
+				userInfo: {},
+				isPC: false,
+				hasLogin:false
+			}
+		},
+		props: {
+			//头像图片宽
+			width: {
+				type: String,
+				default () {
+					return "50px"
+				}
+			},
+			//头像图片高
+			height: {
+				type: String,
+				default () {
+					return "50px"
+				}
+			}
+		},
+		async mounted() {
+			usersTable.where("'_id' == $cloudEnv_uid").field('avatar_file,mobile,nickname').get().then(res=>{
+				this.userInfo = res.result.data[0]||{}
+				console.log('this.userInfo', this.userInfo);
+				this.hasLogin = true
+			}).catch (e=>{
+				this.userInfo = {}
+				this.hasLogin = false
+				console.log(e.message, e.errCode);
+			})
+			
+			// try {
+			// 	let res = await usersTable.where("'_id' == $cloudEnv_uid").field('avatar_file').get()
+			// 	this.userInfo = res.result.data[0]
+			// 	console.log('this.userInfo', this.userInfo);
+			// } catch (e) {
+			// 	console.log(e.message);
+			// }
+			// #ifdef H5
+			this.isPC = !['ios', 'android'].includes(uni.getSystemInfoSync().platform);
+			console.log(' this.isPC', this.isPC, uni.getSystemInfoSync().platform);
+			// #endif
+		},
+		computed: {
+			avatar_file() {
+				if (this.userInfo.avatar_file && this.userInfo.avatar_file.url) {
+					return this.userInfo.avatar_file
+				}
+			}
+		},
+		methods: {
+			setAvatarFile(avatar_file) {
+				uni.showLoading({
+					title: "设置中",
+					mask: true
+				});
+				// 使用 clientDB 提交数据
+				usersTable.where('_id==$env.uid').update({
+					avatar_file
+				}).then((res) => {
+					console.log(res);
+					if (avatar_file) {
+						uni.showToast({
+							icon: 'none',
+							title: "更新成功"
+						})
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: "删除成功"
+						})
+					}
+					this.$set(this.userInfo, 'avatar_file', avatar_file)
+				}).catch((err) => {
+					uni.showModal({
+						content: err.message || "请求失败",
+						showCancel: false
+					})
+				}).finally(() => {
+					uni.hideLoading()
+				})
+			},
+			uploadAvatarImg(res) {
+				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) => {
+						console.log(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]
+						// #ifndef APP-PLUS
+						//非app端用前端组件剪裁头像，app端用内置的原生裁剪
+						if (!this.isPC) {
+							filePath = await new Promise((callback) => {
+								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
+						console.log(this.userInfo);
+						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"
+						});
+						// console.log(result)
+						avatar_file.url = fileID
+						console.log({
+							avatar_file
+						});
+						uni.hideLoading()
+						this.setAvatarFile(avatar_file)
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.chooseAvatar {
+		/* #ifndef APP-NVUE */
+		display: inline-block;
+		/* #endif */
+		border: dotted 1px #ddd;
+		border-radius: 10px;
+		text-align: center;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-bind-mobile/uni-id-pages-bind-mobile.vue b/uni_modules/uni-id-pages/components/uni-id-pages-bind-mobile/uni-id-pages-bind-mobile.vue
new file mode 100644
index 0000000000000000000000000000000000000000..770cb74a33958b70686fe2a399de7765c6af1e47
--- /dev/null
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-bind-mobile/uni-id-pages-bind-mobile.vue
@@ -0,0 +1,165 @@
+<template>
+	<uni-popup ref="popup" type="bottom">
+		<view class="box">
+			<text class="headBox">绑定资料</text>
+			<text class="tip">将一键获取你的手机号码绑定你的个人资料</text>
+			<view class="btnBox">
+				<text @click="closeMe" class="close">关闭</text>
+				<button class="agree uni-btn" type="primary" open-type="getPhoneNumber"
+					@getphonenumber="bindMobileByMpWeixin">获取</button>
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	const db = uniCloud.database();
+	const usersTable = db.collection('uni-id-users')
+	const uniIdCo = uniCloud.importObject("uni-id-co")
+	export default {
+		emits: ['success'],
+		computed: {},
+		data() {
+			return {}
+		},
+		methods: {
+			async beforeGetphonenumber() {
+				return await new Promise((resolve,reject)=>{
+					uni.showLoading({ mask: true })
+					wx.checkSession({
+						success() {
+							console.log('session_key 未过期');
+							resolve()
+							uni.hideLoading()
+						},
+						fail() {
+							console.log('session_key 已经失效，正在执行更新');
+							wx.login({
+								success({
+									code
+								}) {
+									uniCloud.importObject("uni-id-co",{
+										customUI:true
+									}).loginByWeixin({code}).then(e=>{
+										console.log(e);
+										resolve()
+									}).catch(e=>{
+										console.log(e);
+										reject()
+									}).finally(e=>{
+										console.log(e);
+										uni.hideLoading()
+									})
+								},
+								fail: (err) => {
+									console.error(err);
+									reject()
+								}
+							})
+						}
+					})
+				})
+			},
+			async bindMobileByMpWeixin(e) {
+				console.log(e);
+				if (e.detail.errMsg == "getPhoneNumber:ok") {
+					console.log(e.detail);
+					//检查登录信息是否过期，否则通过重新登录刷新session_key
+					await this.beforeGetphonenumber()
+					uniIdCo.bindMobileByMpWeixin(e.detail).then(e => {
+						console.log(e);
+						this.$emit('success')
+					}).finally(e => {
+						this.closeMe()
+					})
+				} else {
+					this.closeMe()
+				}
+			},
+			async open() {
+				this.$refs.popup.open()
+			},
+			closeMe(e) {
+				this.$refs.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+	view {
+		display: flex;
+	}
+
+	.box {
+		background-color: #FFFFFF;
+		height: 200px;
+		width: 750rpx;
+		flex-direction: column;
+		border-top-left-radius: 15px;
+		border-top-right-radius: 15px;
+	}
+
+	.headBox {
+		padding: 20rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: left;
+		font-size: 16px;
+		color: #333333;
+		margin-left: 15rpx;
+	}
+
+	.tip {
+		color: #666666;
+		text-align: left;
+		justify-content: center;
+		margin: 10rpx 30rpx;
+		font-size: 18px;
+	}
+
+	.btnBox {
+		margin-top: 45rpx;
+		justify-content: center;
+		flex-direction: row;
+	}
+
+	.close,
+	.agree {
+		text-align: center;
+		width: 200rpx;
+		height: 80upx;
+		line-height: 80upx;
+		border-radius: 5px;
+		margin: 0 20rpx;
+		font-size: 14px;
+	}
+
+	.close {
+		color: #999999;
+		border-color: #EEEEEE;
+		border-style: solid;
+		border-width: 1px;
+		background-color: #FFFFFF;
+	}
+
+	.close:active {
+		color: #989898;
+		background-color: #E2E2E2;
+	}
+
+	.agree {
+		color: #FFFFFF;
+	}
+
+	/* #ifdef MP */
+	.agree::after {
+		border: none;
+	}
+
+	/* #endif */
+	.agree:active {
+		background-color: #F5F5F6;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue b/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
new file mode 100644
index 0000000000000000000000000000000000000000..daddb7fc67fde53c09b77d71d55993dbab338144
--- /dev/null
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
@@ -0,0 +1,554 @@
+<template>
+	<view>
+		<view class="fab-login-box">
+			<view class="item" v-for="(item,index) in servicesList" :key="index"
+				@click="item.path?navigateTo(item.path):login_before(item.id,false)">
+				<image class="logo" :src="item.logo" mode="scaleToFill"></image>
+				<text class="login-title">{{item.text}}</text>
+			</view>
+		</view>
+		<!-- #ifdef MP-WEIXIN -->
+		<uni-id-pages-user-profile @next="doUserProfileNext" ref="userProfile"></uni-id-pages-user-profile>
+		<!-- #endif -->
+	</view>
+</template>
+<script>
+	import config from '@/uni_modules/uni-id-pages/config.js'
+	//前一个窗口的页面地址。控制点击切换快捷登录方式是创建还是返回
+	import loginSuccess from '../../common/loginSuccess.js';
+	
+	const db = uniCloud.database();
+	const usersTable = db.collection('uni-id-users')
+	let allServicesList = []
+	
+	export default {
+		computed: {
+			agreements() {
+				if (!config.agreements) {
+					return []
+				}
+				let {
+					serviceUrl,
+					privacyUrl
+				} = config.agreements
+				return [{
+						url: serviceUrl,
+						title: "用户服务协议"
+					},
+					{
+						url: privacyUrl,
+						title: "隐私政策条款"
+					}
+				]
+			},
+			agree: {
+				get() {
+					return this.getParentComponent().agree
+				},
+				set(agree) {
+					console.log('setAgree', agree);
+					return this.getParentComponent().agree = agree
+				}
+			}
+		},
+		data() {
+			return {
+				servicesList: [{
+						"id": "username",
+						"text": "账号登录",
+						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/user.png",
+						"path": "/uni_modules/uni-id-pages/pages/login/login-withpwd"
+					},
+					{
+						"id": "smsCode",
+						"text": "短信验证码",
+						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/sms.png",
+						"path": "/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=smsCode"
+					},
+					{
+						"id": "weixin",
+						"text": "微信登录",
+						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/weixin.png",
+					},
+					{
+						"id": "apple",
+						"text": "苹果登录",
+						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/apple.png",
+					},
+					{
+						"id": "univerify",
+						"text": "一键登录",
+						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/univerify.png",
+					},
+					{
+						"id": "taobao",
+						"text": "淘宝登录", //暂未提供该登录方式的接口示例
+						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/taobao.png",
+					},
+					{
+						"id": "facebook",
+						"text": "脸书登录", //暂未提供该登录方式的接口示例
+						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/facebook.png",
+					},
+					{
+						"id": "alipay",
+						"text": "支付宝登录", //暂未提供该登录方式的接口示例
+						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/alipay.png",
+					},
+					{
+						"id": "qq",
+						"text": "QQ登录", //暂未提供该登录方式的接口示例
+						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/qq.png",
+					},
+					{
+						"id": "google",
+						"text": "谷歌登录", //暂未提供该登录方式的接口示例
+						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/google.png",
+					},
+					{
+						"id": "douyin",
+						"text": "抖音登录", //暂未提供该登录方式的接口示例
+						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/douyin.png",
+					},
+					{
+						"id": "sinaweibo",
+						"text": "新浪微博", //暂未提供该登录方式的接口示例
+						"logo": "/uni_modules/uni-id-pages/static/uni-fab-login/sinaweibo.png",
+					}
+				],
+				univerifyStyle: { //一键登录弹出窗的样式配置参数
+					"fullScreen": true, // 是否全屏显示，true表示全屏模式，false表示非全屏模式，默认值为false。
+					"backgroundColor": "#ffffff", // 授权页面背景颜色，默认值：#ffffff
+					"buttons": { // 自定义登录按钮
+						"iconWidth": "45px", // 图标宽度（高度等比例缩放） 默认值：45px
+						"list": []
+					},
+					"privacyTerms": {
+						"defaultCheckBoxState": false, // 条款勾选框初始状态 默认值： true   
+						"textColor": "#BBBBBB", // 文字颜色 默认值：#BBBBBB  
+						"termsColor": "#5496E3", //  协议文字颜色 默认值： #5496E3  
+						"prefix": "我已阅读并同意", // 条款前的文案 默认值：“我已阅读并同意”  
+						"suffix": "并使用本机号码登录", // 条款后的文案 默认值：“并使用本机号码登录”  
+						"privacyItems": []
+					}
+				}
+			}
+		},
+		watch: {
+			agree(agree) {
+				this.univerifyStyle.privacyTerms.defaultCheckBoxState = agree
+			}
+		},
+		async created() {
+			let servicesList = this.servicesList
+			let loginTypes = config.loginTypes
+
+			servicesList = servicesList.filter(item => {
+				
+				// #ifndef APP
+				//非app端去掉apple登录
+				if (item.id == 'apple') {
+					return false
+				}
+				// #endif
+				
+				// #ifdef APP
+				//去掉非ios系统上的apple登录
+				if (item.id == 'apple' && uni.getSystemInfoSync().osName != 'ios') {
+					return false
+				}
+				// #endif
+
+				return loginTypes.includes(item.id)
+			})
+			//处理一键登录
+			if (loginTypes.includes('univerify')) {
+				this.univerifyStyle.privacyTerms.privacyItems = this.agreements
+				//设置一键登录功能底下的快捷登录按钮
+				servicesList.forEach(({
+					id,
+					logo,
+					path
+				}) => {
+					if (id != 'univerify') {
+						this.univerifyStyle.buttons.list.push({
+							"iconPath": logo,
+							"provider": id,
+							path //路径用于点击快捷按钮时判断是跳转页面
+						})
+					}
+				})
+			}
+			//	console.log(servicesList);
+
+			//去掉当前页面对应的登录选项
+			this.servicesList = servicesList.filter(item => {
+				let path = item.path ? item.path.split('?')[0] : '';
+				return path != this.getRoute(1)
+			})
+			//console.log('servicesList', servicesList, this.servicesList);
+		},
+		methods: {
+			getParentComponent(){
+				// #ifndef H5
+				return this.$parent;
+				// #endif
+				
+				// #ifdef H5
+				return this.$parent.$parent;
+				// #endif
+			},
+			setUserInfo(e) {
+				console.log('setUserInfo', e);
+			},
+			getRoute(n = 0) {
+				let pages = getCurrentPages();
+				// console.log('route-pages-length', pages.length);
+				if (n > pages.length) {
+					return ''
+				}
+				return '/' + pages[pages.length - n].route
+			},
+			navigateTo(path) {
+				//console.log('比较', this.getRoute(1),this.getRoute(2), path)
+				if (this.getRoute(1) == path.split('?')[0] && this.getRoute(1) ==
+					'/uni_modules/uni-id-pages/pages/login/login-withoutpwd') {
+					//如果要被打开的页面已经打开，且这个页面是 /uni_modules/uni-id-pages/pages/index/index 则把类型参数传给他
+					let type = path.split('?')[1].split('=')[1]
+					uni.$emit('uni-id-pages-set-login-type', type)
+				} else if (this.getRoute(2) == path) { // 如果上一个页面就是，马上要打开的页面，直接返回。防止重复开启
+					uni.navigateBack();
+				} else if (this.getRoute(1) != path) {
+					//console.log(3);
+					uni.navigateTo({
+						url: path,
+						animationType: 'slide-in-left',
+						complete(e) {
+							// console.log(e);
+						}
+					})
+				} else {
+					console.log('出乎意料的情况,path：' + path);
+				}
+			},
+			async login_before(type, navigateBack = true) {
+				console.log(type);
+				//提示空实现
+				if (["qq",
+						"xiaomi",
+						"sinaweibo",
+						"taobao",
+						"facebook",
+						"google",
+						"alipay",
+						"douyin",
+					].includes(type)) {
+					return uni.showToast({
+						title: '该登录方式暂未实现，欢迎提交pr',
+						icon: 'none'
+					});
+				}
+				
+				//检查当前环境是否支持这种登录方式
+				// #ifdef APP
+				let isAppExist = true
+				await new Promise((callback) => {
+					plus.oauth.getServices(oauthServices => {
+						let index = oauthServices.findIndex(e => e.id == type)
+						if(index != -1){
+							isAppExist = oauthServices[index].nativeClient
+							callback()
+						}else{
+							return uni.showToast({
+								title: '当前设备不支持此登录，请选择其他登录方式',
+								icon: 'none'
+							});
+						}
+					}, err => {
+						throw new Error('获取服务供应商失败：' + JSON.stringify(err))
+					})
+				})
+				// #endif
+				
+				if (
+					// #ifdef APP
+					!isAppExist
+					// #endif
+					
+					//非app端使用了，app特有登录方式
+					// #ifndef APP
+					["univerify","apple"].includes(type)
+					// #endif
+					
+				) {
+					return uni.showToast({
+						title: '当前设备不支持此登录，请选择其他登录方式',
+						icon: 'none'
+					});
+				}
+				
+				//判断是否需要弹出隐私协议授权框
+				console.log(type, this.agree);
+				let needAgreements = (config?.agreements?.scope || []).includes('register')
+				console.log({
+					needAgreements
+				});
+				if (type != 'univerify' && needAgreements && !this.agree) {
+					let agreementsRef = this.getParentComponent().$refs.agreements
+					return agreementsRef.popup(() => {
+						console.log(type, navigateBack);
+						this.login_before(type, navigateBack)
+					})
+				}
+				
+				// #ifdef H5
+					if(type == 'weixin'){
+						// console.log('开始微信网页登录');
+						let redirectUrl = location.protocol +'//'+ 
+										document.domain + 
+										(window.location.href.includes('#')?'/#':'') +
+										'/uni_modules/uni-id-pages/pages/login/login-withoutpwd?is_weixin_redirect=true&type=weixin'
+						console.log('redirectUrl----',redirectUrl);
+						let ua = window.navigator.userAgent.toLowerCase();
+						if (ua.match(/MicroMessenger/i) == 'micromessenger'){
+							// console.log('在微信公众号内');
+							return window.open(`https://open.weixin.qq.com/connect/oauth2/authorize?
+										appid=${config.appid.weixin.h5}
+										&redirect_uri=${encodeURIComponent(redirectUrl)}
+										&response_type=code
+										&scope=snsapi_userinfo
+										&state=STATE&connect_redirect=1#wechat_redirect`);
+							
+						}else{
+							// console.log('非微信公众号内');
+							return location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=${config.appid.weixin.web}
+											&redirect_uri=${encodeURIComponent(redirectUrl)}
+											&response_type=code&scope=snsapi_login&state=STATE#wechat_redirect`
+						}
+					}
+				// #endif
+				
+				
+				uni.showLoading({
+					mask: true
+				})
+				if (type == 'univerify') {
+					let univerifyManager = uni.getUniverifyManager()
+					let onButtonsClickFn = async res => {
+						console.log('点击了第三方登录，provider：', res, res.provider, this.univerifyStyle.buttons.list);
+						//同步一键登录弹出层隐私协议框是否打勾
+						let agree = (await uni.getCheckBoxState())[1].state
+						//console.log('agree',agree);
+						this.agree = agree
+						let {
+							path
+						} = this.univerifyStyle.buttons.list[res.index]
+						if (path) {
+							this.navigateTo(path)
+							closeUniverify()
+						} else {
+							if (agree) {
+								closeUniverify()
+								setTimeout(() => {
+									//console.log('login_before');
+									this.login_before(res.provider)
+								}, 500)
+							} else {
+								//console.log("你未同意隐私政策协议");
+								uni.showToast({
+									title: "你未同意隐私政策协议",
+									icon: 'none'
+								});
+							}
+						}
+					}
+
+					function closeUniverify() {
+						uni.hideLoading()
+						univerifyManager.close()
+						// 取消订阅自定义按钮点击事件
+						univerifyManager.offButtonsClick(onButtonsClickFn)
+					}
+					// 订阅自定义按钮点击事件
+					univerifyManager.onButtonsClick(onButtonsClickFn)
+					// 调用一键登录弹框
+					return univerifyManager.login({
+						"univerifyStyle": this.univerifyStyle,
+						success: res => {
+							console.log('login success', res)
+							this.login(res.authResult, 'univerify')
+						},
+						fail(err) {
+							uni.showToast({
+								title: JSON.stringify(err),
+								icon: 'none'
+							});
+						},
+						complete: async e => {
+							console.log(e);
+							uni.hideLoading()
+							//同步一键登录弹出层隐私协议框是否打勾
+							this.agree = (await uni.getCheckBoxState())[1].state
+							// 取消订阅自定义按钮点击事件
+							univerifyManager.offButtonsClick(onButtonsClickFn)
+						}
+					})
+				}
+				uni.login({
+					"provider": type,
+					"onlyAuthorize": true,
+					// #ifdef APP
+					"univerifyStyle": this.univerifyStyle,
+					// #endif
+					success: async e => {
+						console.log(e);
+						if (type == 'apple') {
+							let res = await this.getUserInfo({
+								provider: "apple"
+							})
+							Object.assign(e.authResult, res.userInfo)
+							uni.hideLoading()
+						}
+						this.login(type == 'weixin' ? {
+							code: e.code
+						} : e.authResult, type)
+					},
+					fail: async (err) => {
+						console.log(err);
+						uni.hideLoading()
+					}
+				})
+			},
+			login(params, type) { //联网验证登录
+				console.log('执行登录开始----');
+				console.log({
+					params,
+					type
+				});
+				//toLowerCase
+				let action = 'loginBy' + type.trim().toLowerCase().replace(type[0], type[0].toUpperCase())
+				const uniIdCo = uniCloud.importObject("uni-id-co",{
+					customUI:true
+				})
+				uniIdCo[action](params).then(result => {
+					console.log("login-result", result);
+					uni.showToast({
+						title: '登录成功',
+						icon: 'none'
+					});
+					// #ifdef MP-WEIXIN
+					//如果是微信小程序端的微信登录，且为首次登录，就弹出获取微信昵称+头像用于绑定资料
+					if (type == 'weixin' && result.type == "register") {
+						loginSuccess({
+							...result,
+							showToast: false,
+							autoBack: false
+						})
+						return this.$refs.userProfile.open(result.uid)
+					}
+					// #endif
+					// #ifdef H5
+					result.loginType = type
+					// #endif
+					loginSuccess(result)
+				})
+				.catch(e=>{
+					console.log(e);
+					uni.showModal({
+						content: e.message,
+						confirmText:"知道了",
+						showCancel: false
+					});
+				})
+				.finally(e => {
+					if (type == 'univerify') {
+						uni.closeAuthView()
+					}
+					uni.hideLoading()
+				})
+			},
+			doUserProfileNext() {
+				try {
+					loginSuccess()
+				} catch (e) {
+					console.log(e);
+				}
+			},
+			async getUserInfo(e) {
+				return new Promise((resolve, reject) => {
+					uni.getUserInfo({
+						...e,
+						success: (res) => {
+							resolve(res);
+						},
+						fail: (err) => {
+							uni.showModal({
+								content: JSON.stringify(err),
+								showCancel: false
+							});
+							reject(err);
+						}
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	.fab-login-box,
+	.item {
+		display: flex;
+		box-sizing: border-box;
+		flex-direction: column;
+	}
+
+	/* #endif */
+
+	.fab-login-box {
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 750rpx;
+		justify-content: space-around;
+		position: fixed;
+		bottom: 10rpx;
+		left: 0;
+	}
+
+	/* #ifndef APP-NVUE */
+	@media screen and (min-width: 690px) {
+		.fab-login-box {
+			max-width: 500px;
+			margin-left: calc(50% - 250px);
+		}
+	}
+
+	/* #endif */
+
+	.item {
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 200rpx;
+		cursor: pointer;
+	}
+
+	.logo {
+		width: 60rpx;
+		height: 60rpx;
+		max-width: 40px;
+		max-height: 40px;
+		border-radius: 100%;
+		border: solid 1px #F6F6F6;
+	}
+
+
+	.login-title {
+		text-align: center;
+		margin-top: 6px;
+		color: #999;
+		font-size: 10px;
+		width: 70px;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-sms-form/uni-id-pages-sms-form.vue b/uni_modules/uni-id-pages/components/uni-id-pages-sms-form/uni-id-pages-sms-form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..81b2292cc9dbef5324274cf7634cee75a85f1709
--- /dev/null
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-sms-form/uni-id-pages-sms-form.vue
@@ -0,0 +1,241 @@
+<template>
+	<view>
+		<uni-captcha :focus="focusCaptchaInput" ref="captcha" scene="send-sms-code" v-model="captcha" />
+		<view class="box">
+			<uni-easyinput :focus="focusSmsCodeInput" @blur="focusSmsCodeInput = 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);
+		}
+	}
+	/**
+	 * sms-form 
+	 * @description 获取短信验证码组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=
+	 * @property {Number} count 倒计时时长 s
+	 * @property {String} phone 手机号码
+	 * @property {String} type = [login-by-sms|reset-pwd-by-sms|bind-mobile] 	验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定手机、unbind解绑手机
+	 * @property {false} focusCaptchaInput = [true|false] 验证码输入框是否默认获取焦点
+	 */
+	export default {
+		name: "uni-sms-form",
+		model: {
+			prop: 'modelValue',
+			event: 'update:modelValue'
+		},
+		props: {
+			event: ['update:modelValue'],
+			/**
+			 * 倒计时时长 s
+			 */
+			count: {
+				type: [String, Number],
+				default: 60
+			},
+			/**
+			 * 手机号码
+			 */
+			phone: {
+				type: [String, Number],
+				default: ''
+			},
+			/*
+				验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定手机、unbind解绑手机
+			*/
+			type: {
+				type: String,
+				default () {
+					return 'login'
+				}
+			},
+			/*
+				验证码输入框是否默认获取焦点
+			*/
+			focusCaptchaInput: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+		},
+		data() {
+			return {
+				captcha: "",
+				reverseNumber: 0,
+				reverseTimer: null,
+				modelValue: "",
+				focusSmsCodeInput: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'
+					});
+				}
+				let reg_phone = /^1\d{10}$/;
+				if (!reg_phone.test(this.phone)) return uni.showToast({
+					title: "手机号格式错误",
+					icon: 'none'
+				});
+				const uniIdCo = uniCloud.importObject("uni-id-co", {
+					customUI: true
+				})
+				console.log('sendSmsCode',{
+					"mobile": this.phone,
+					"scene": this.type,
+					"captcha": this.captcha
+				});
+				uniIdCo.sendSmsCode({
+					"mobile": this.phone,
+					"scene": this.type,
+					"captcha": this.captcha
+				}).then(result => {
+					console.log(result.code);
+					uni.showToast({
+						title: "短信验证码发送成功",
+						icon: 'none'
+					});
+					this.reverseNumber = Number(this.count);
+					this.getCode();
+				}).catch(e => {
+					console.log(JSON.stringify(e));
+					if (e.code == "uni-id-invalid-sms-template-id") {
+						this.modelValue = "123456"
+						uni.showToast({
+							title: '已启动测试模式,详情【控制台信息】',
+							icon: 'none',
+							duration: 3000
+						});
+						console.warn(e.message);
+					} else {
+						this.getImageCaptcha()
+						this.captcha = ""
+						uni.showToast({
+							title: e.message,
+							icon: 'none'
+						});
+					}
+				})
+			},
+			getCode() {
+				if (this.reverseNumber == 0) {
+					clearTimeout(this.reverseTimer);
+					this.reverseTimer = null;
+					return;
+				}
+				this.reverseNumber--;
+				this.reverseTimer = setTimeout(() => {
+					this.getCode();
+				}, 1000)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.box {
+		position: relative;
+		margin-top: 10px;
+	}
+
+	.short-code-btn {
+		padding: 0;
+		position: absolute;
+		top: 0;
+		right: 8px;
+		width: 260rpx;
+		max-width: 100px;
+		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: 110px;
+	}
+
+	.box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+</style>
diff --git a/components/uni-user-profile/uni-user-profile.vue b/uni_modules/uni-id-pages/components/uni-id-pages-user-profile/uni-id-pages-user-profile.vue
similarity index 81%
rename from components/uni-user-profile/uni-user-profile.vue
rename to uni_modules/uni-id-pages/components/uni-id-pages-user-profile/uni-id-pages-user-profile.vue
index 62beb86485fa39557e91887f8408d0d1cd5b3d2f..703f4845d1dde3f6c809583f6add63c233840d51 100644
--- a/components/uni-user-profile/uni-user-profile.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-user-profile/uni-id-pages-user-profile.vue
@@ -5,35 +5,22 @@
 			<text class="tip">获取你的微信头像和昵称，完善你的个人资料</text>
 			<view class="btnBox">
 				<text @click="closeMe" class="close">关闭</text>
-				<button class="agree" type="warn" @click="getUserProfile">确定</button>
+				<button class="agree uni-btn" type="primary" @click="getUserProfile">确定</button>
 			</view>
 		</view>
 	</uni-popup>
 </template>
 
 <script>
-	import {
-		mapMutations,
-		mapGetters
-	} from 'vuex';
 	const db = uniCloud.database();
 	const usersTable = db.collection('uni-id-users')
 	let userId = ''
 	export default {
 		emits:['next'],
-		computed: {
-			...mapGetters({
-				userInfo: 'user/info',
-				login: 'user/hasLogin'
-			})
-		},
 		data() {
 			return {}
 		},
 		methods: {
-			...mapMutations({
-				setUserInfo: 'user/login'
-			}),
 			async open(uid){
 				userId = uid
 				this.$refs.popup.open()
@@ -44,7 +31,7 @@
 					uni.getUserProfile({
 						desc: "用于设置账户昵称和头像",
 						complete: (e) => {
-							// console.log("getUserProfile:", e);
+							console.log("getUserProfile:", e);
 							callBack(e)
 						}
 					})
@@ -53,8 +40,7 @@
 				if(res.errMsg != "getUserProfile:ok"){
 					return this.closeMe()
 				}
-				let {avatarUrl,nickName} = res.userInfo,				
-					cloudPath = userId+'/'+Date.now()+'avatarUrl.jpg';
+				let {avatarUrl,nickName} = res.userInfo;
 				
 				let tempFilePath = await new Promise((callBack)=>{
 					uni.downloadFile({
@@ -74,6 +60,8 @@
 						}
 					});
 				})
+				const extName = tempFilePath.split('.').pop() || 'jpg'
+				const cloudPath = 'user/avatar/'+ userId+'/'+Date.now()+'-avatar.'+extName;
 				// console.log(tempFilePath);
 				const result = await uniCloud.uploadFile({
 					filePath: tempFilePath,
@@ -95,7 +83,7 @@
 			},
 			closeMe(e){
 				uni.showLoading();
-				this.doUpdate({nickname:"微信匿名用户"},()=>{
+				this.doUpdate({nickname:"匿名微信用户"},()=>{
 					uni.hideLoading()
 					this.$refs.popup.close()
 				})
@@ -104,13 +92,10 @@
 				// console.log('dododo',data);
 				// 使用 clientDB 提交数据
 				usersTable.where('_id==$env.uid').update(data).then((res) => {
-					// console.log(res);
-					this.setUserInfo(data);
 					callback(res)
 				}).catch((err) => {
 					uni.showModal({
-						content: err.message ||
-							'请求服务失败',
+						content: err.message || '请求服务失败',
 						showCancel: false
 					})
 					callback(err)
@@ -124,6 +109,7 @@
 </script>
 
 <style lang="scss" scoped>
+@import "@/uni_modules/uni-id-pages/common/login-page.scss";
 view{
 	display: flex;
 }
@@ -140,7 +126,7 @@ view{
 	height:80rpx;
 	line-height:80rpx;
 	text-align: left;
-	font-size:32upx;
+	font-size:16px;
 	color:#333333;
 	margin-left: 15rpx;
 }
@@ -149,7 +135,7 @@ view{
 	text-align: left;
 	justify-content: center;
 	margin:10rpx 30rpx;
-	font-size:36rpx;
+	font-size:18px;
 }
 .btnBox{
 	margin-top:45rpx;
@@ -161,9 +147,9 @@ view{
 	width:200rpx;
 	height:80upx;
 	line-height:80upx;
-	border-radius:50px;
+	border-radius:5px;
 	margin:0 20rpx;
-	font-size:36rpx;
+	font-size:14px;
 }
 .close{
 	color:#999999;
@@ -177,16 +163,12 @@ view{
 	background-color:#E2E2E2;
 }
 .agree{
-	background-color:#DD524D;
 	color:#FFFFFF;
 }
 /* #ifdef MP */
 .agree::after {
    border: none;
 }
-.agree{
-	background-color:#DD524D;
-}
 /* #endif */
 .agree:active{
 	background-color:#F5F5F6;
diff --git a/uni_modules/uni-id-pages/config.js b/uni_modules/uni-id-pages/config.js
new file mode 100644
index 0000000000000000000000000000000000000000..af5872d64141b0e26afb67a141c1f7ad6837081f
--- /dev/null
+++ b/uni_modules/uni-id-pages/config.js
@@ -0,0 +1,58 @@
+export default {
+	//调试模式
+	"debug": true,
+	/*
+		登录类型 未列举到的或运行环境不支持的，将被自动隐藏。
+		如果需要在不同平台有不同的配置，直接用条件编译即可
+	*/
+	"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"
+		}
+	},
+	/**
+	 * 密码强度 
+	 * superstrong（超强：密码必须包含大小写字母、数字和特殊符号） 
+	 * strong（强: 密码必须包含字母、数字和特殊符号） 
+	 * medium (中：密码必须为字母、数字和特殊符号任意两种的组合) 
+	 * weak（弱：密码必须包含字母）
+	 * 为空或false则不验证密码强度
+	 */
+	"password": {
+		// "strength": "strong",
+		"length": [6, 20] //密码长度，默认在6-20位之间
+	}
+}
diff --git a/uni_modules/uni-id-pages/init.js b/uni_modules/uni-id-pages/init.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1b3d1f03c9155697d0fe4f7d7336373658d525b
--- /dev/null
+++ b/uni_modules/uni-id-pages/init.js
@@ -0,0 +1,99 @@
+// 导入配置
+import config from '@/uni_modules/uni-id-pages/config.js';
+// uni-id的云对象
+const uniIdCo = uniCloud.importObject("uni-id-co", {
+	customUI: true
+})
+// 用户配置的登录方式、是否打开调试模式
+const {
+	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(
+				`错误：前端启用的登录方式:${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)
+
+
+	//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)
+					}
+				})
+			}
+		})
+	}
+}
diff --git a/uni_modules/uni-id-pages/package.json b/uni_modules/uni-id-pages/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..154021b675a2f8e42e4bbe81ec2f7ec244223911
--- /dev/null
+++ b/uni_modules/uni-id-pages/package.json
@@ -0,0 +1,101 @@
+{
+	"id": "uni-id-pages",
+	"displayName": "uni-id-pages",
+	"version": "1.0.10",
+	"description": "云端一体简单、统一、可扩展的用户中心页面模版",
+	"keywords": [
+        "用户管理",
+        "用户中心",
+        "短信验证码",
+        "login",
+        "登录"
+    ],
+	"repository": "https://gitcode.net/dcloud/hello_uni-id-pages",
+	"engines": {
+		"HBuilderX": "^3.4.17"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "",
+        "type": "unicloud-template-page"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-captcha",
+			"uni-config-center",
+			"uni-data-checkbox",
+			"uni-easyinput",
+			"uni-forms",
+			"uni-icons",
+			"uni-id-common",
+			"uni-list",
+			"uni-load-more",
+			"uni-popup",
+			"uni-scss",
+			"uni-transition",
+			"uni-open-bridge-common"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "u"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "u",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "u",
+					"百度": "u",
+					"字节跳动": "u",
+					"QQ": "u",
+					"钉钉": "u",
+					"快手": "u",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	},
+	"dependencies": {
+	}
+}
diff --git a/uni_modules/uni-id-pages/pages/common/webview/webview.vue b/uni_modules/uni-id-pages/pages/common/webview/webview.vue
new file mode 100644
index 0000000000000000000000000000000000000000..83d07ec7c66b41c98b924e1fe54d036f89333a76
--- /dev/null
+++ b/uni_modules/uni-id-pages/pages/common/webview/webview.vue
@@ -0,0 +1,40 @@
+<!-- 网络链接内容展示页（uni-id-pages中用于展示隐私政策协议内容） -->
+<template>
+	<view>
+		<web-view v-if="url" :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad({url,title}) {
+			if(url.substring(0, 4) != 'http'){
+				uni.showModal({
+					title:"错误",
+					content: '不是一个有效的网站链接,'+'"'+url+'"',
+					showCancel: false,
+					confirmText:"知道了",
+					complete: () => {
+						uni.navigateBack()
+					}
+				});
+				title = "页面路径错误"
+			}else{
+				console.log(url,title);
+				this.url = url;
+			}
+			if(title){
+				uni.setNavigationBarTitle({title});
+			}
+		},
+		data() {
+			return {
+				url:null
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/uni_modules/uni-id-pages/pages/login/login-smscode.vue b/uni_modules/uni-id-pages/pages/login/login-smscode.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b0ca3d0f0f47167dfa65cf52d0279583e08be449
--- /dev/null
+++ b/uni_modules/uni-id-pages/pages/login/login-smscode.vue
@@ -0,0 +1,118 @@
+<!-- 短信验证码登录页 -->
+<template>
+	<view class="uni-content">
+		<!-- 顶部文字 -->
+		<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": "",
+			}
+		},
+		computed: {
+			tipText() {
+				return '验证码已通过短信发送至' + this.phone;
+			},
+		},
+		onLoad({
+			phoneNumber
+		}) {
+			this.phone = phoneNumber;
+		},
+		onShow() {
+			console.log('onShow');
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			submit() { //完成并提交
+				const uniIdCo = uniCloud.importObject("uni-id-co", {
+					errorOptions: {
+						type: 'toast'
+					}
+				})
+				if (this.code.length != 6) {
+					this.$refs.smsCode.focusSmsCodeInput = true
+					return uni.showToast({
+						title: '验证码不能为空',
+						icon: 'none'
+					});
+				}
+				uniIdCo.loginBySms({
+					"mobile": this.phone,
+					"code": this.code,
+					"captcha": this.captcha
+				}).then(e => {
+					console.log(e);
+					this.loginSuccess(e)
+				}).catch(e => {
+					if (e.errCode == 'uni-id-captcha-required') {
+						this.$refs.popup.open()
+					} else {
+						console.log(e.errMsg);
+						console.log(e.errCode);
+					}
+				}).finally(e => {
+					this.captcha = ''
+				})
+			}
+		}
+	}
+</script>
+<style scoped lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	.tip {
+		margin-top: -15px;
+		margin-bottom: 15px;
+	}
+
+	.popup-captcha {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		padding: 20rpx;
+		background-color: #FFF;
+		border-radius: 2px;
+		flex-direction: column;
+		position: relative;
+	}
+
+	.popup-captcha .title {
+		font-weight: normal;
+		padding: 0;
+		padding-bottom: 15px;
+		color: #666;
+	}
+
+	.popup-captcha .close {
+		position: absolute;
+		bottom: -40px;
+		margin-left: -13px;
+		left: 50%;
+	}
+
+	.popup-captcha .uni-btn {
+		margin: 0;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue b/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
new file mode 100644
index 0000000000000000000000000000000000000000..256a99e7548b6d2cba7c7047f8eb14b5e466949f
--- /dev/null
+++ b/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
@@ -0,0 +1,196 @@
+<!-- 免密登录页 -->
+<template>
+	<view class="uni-content">
+		<!-- 顶部文字 -->
+		<text class="title">请选择登录方式</text>
+		<!-- 快捷登录框 当url带参数时有效 -->
+		<template v-if="['apple','weixin'].includes(type)">
+			<text class="tip">将根据第三方账号服务平台的授权范围获取你的信息</text>
+			<view class="quickLogin">
+				<image @click="quickLogin" :src="imgSrc" mode="widthFix" class="quickLoginBtn"></image>
+				<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
+			</view>
+		</template>
+		<template v-else>
+			<text class="tip">未注册的账号验证通过后将自动注册</text>
+			<view class="phone-box">
+				<view @click="chooseArea" class="area">+86</view>
+				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" type="number" :inputBorder="false"
+					v-model="phone" maxlength="11" placeholder="请输入手机号" />
+			</view>
+			<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
+			<button class="uni-btn" type="primary" @click="toSmsPage">获取验证码</button>
+		</template>
+		<!-- 固定定位的快捷登录按钮 -->
+		<uni-id-pages-fab-login ref="uniFabLogin"></uni-id-pages-fab-login>
+	</view>
+</template>
+
+<script>
+	let currentWebview; //当前窗口对象
+	import config from '@/uni_modules/uni-id-pages/config.js'
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				type: "", //快捷登录方式
+				phone: "", //手机号码
+				focusPhone:false
+			}
+		},
+		computed: {
+			async loginTypes() { //读取配置的登录优先级
+				return config.loginTypes
+			},
+			isPhone() { //手机号码校验正则
+				return /^1\d{10}$/.test(this.phone);
+			},
+			imgSrc() { //大快捷登录按钮图
+				return '/uni_modules/uni-id-pages/static/login/' + this.type + '.png'
+			}
+		},
+		async onLoad(e) {
+			console.log(e);
+			let type = e.type
+			// console.log({type});
+			this.type = type
+			if(type != 'univerify'){
+				this.focusPhone = true
+			}
+			this.$nextTick(() => {
+				//关闭重复显示的登录快捷方式
+				if (['weixin', 'apple'].includes(type)) {
+					this.$refs.uniFabLogin.servicesList = this.$refs.uniFabLogin.servicesList.filter(item =>
+						item.id != type)
+				}
+			})
+			uni.$on('uni-id-pages-set-login-type', type => {
+				this.type = type
+			})
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.toSmsPage()
+				}
+			};
+			// #endif
+		},
+		onUnload() {
+			uni.$off('uni-id-pages-set-login-type')
+		},
+		onReady() {
+			//是否优先启动一键登录。即：页面一加载就启动一键登录
+			//#ifdef APP-PLUS
+			if (this.type == "univerify") {
+				this.type == this.loginTypes[1]
+				// console.log('开始一键登录');
+				setTimeout(() => {
+					this.$refs.uniFabLogin.login_before('univerify')
+				}, 100)
+			}
+			//#endif
+		},
+		methods: {
+			quickLogin() {
+				this.$refs.uniFabLogin.login_before(this.type)
+			},
+			toSmsPage() {
+				console.log('toSmsPage',this.agree);
+				if (!this.isPhone) {
+					this.focusPhone = true
+					return uni.showToast({
+						title: "手机号码格式不正确",
+						icon: 'none'
+					});
+				}
+				if (this.needAgreements && !this.agree) {
+					return this.$refs.agreements.popup(this.toSmsPage)
+				}
+				// 发送验证吗
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-smscode?phoneNumber=' + this.phone
+				});
+			},
+			//去密码登录页
+			toPwdLogin() {
+				uni.navigateTo({
+					url: '../login/password'
+				})
+			},
+			chooseArea() {
+				uni.showToast({
+					title: '暂不支持其他国家',
+					icon: 'none'
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	.uni-content,
+	.quickLogin {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+	}
+
+	.phone-box {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+	}
+
+	.area {
+		position: absolute;
+		left: 10px;
+		z-index: 9;
+		top: 12px;
+		font-size: 14px;
+	}
+
+	.area::after {
+		content: "";
+		border: 3px solid transparent;
+		border-top-color: #000;
+		top: 12px;
+		left: 3px;
+		position: relative;
+	}
+
+	.input-box {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		flex: 1;
+		padding-left: 45px;
+		margin-bottom: 10px;
+		border-radius: 0;
+	}
+
+	.quickLogin {
+		width: 650rpx;
+		height: 350px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.quickLoginBtn {
+		margin: 20px 0;
+		width: 450rpx;
+		height: 82rpx;
+	}
+
+	.tip {
+		margin-top: -15px;
+		margin-bottom: 20px;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/pages/login/login-withpwd.vue b/uni_modules/uni-id-pages/pages/login/login-withpwd.vue
new file mode 100644
index 0000000000000000000000000000000000000000..049ebac71c6e95e6457d17194c293962d98ca332
--- /dev/null
+++ b/uni_modules/uni-id-pages/pages/login/login-withpwd.vue
@@ -0,0 +1,156 @@
+<!-- 账号密码登录页 -->
+<template>
+	<view class="uni-content">
+		<!-- 顶部文字 -->
+		<text class="title title-box">账号密码登录</text>
+		<uni-forms>
+			<uni-forms-item name="username">
+				<uni-easyinput :focus="focusUsername" @blur="focusUsername = false" class="input-box" :inputBorder="false" v-model="username" placeholder="请输入手机号/用户名" />
+			</uni-forms-item>
+			<uni-forms-item name="password">
+				<uni-easyinput :focus="focusPassword" @blur="focusPassword = false" class="input-box" clearable type="password" :inputBorder="false" v-model="password"
+					placeholder="请输入密码" />
+			</uni-forms-item>
+		</uni-forms>
+		<uni-captcha v-if="needCaptcha" focus ref="captcha" scene="login-by-pwd" v-model="captcha" />
+		<!-- 带选择框的隐私政策协议组件 -->
+		<uni-id-pages-agreements scope="login" ref="agreements" ></uni-id-pages-agreements>
+		<button class="uni-btn" type="primary" @click="pwdLogin">登录</button>
+		<!-- 忘记密码 -->
+		<view class="link-box">
+			<view>
+				<text class="forget">忘记了？</text>
+				<text class="link" @click="toRetrievePwd">找回密码</text>
+			</view>
+			<text class="link" @click="toRegister">注册账号</text>
+		</view>
+		<!-- 悬浮登录方式组件 -->
+		<uni-id-pages-fab-login ref="uniFabLogin"></uni-id-pages-fab-login>
+	</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 {
+				"password": "",
+				"username": "",
+				"captcha": "",
+				"needCaptcha": false,
+				"focusUsername":false,
+				"focusPassword":false
+			}
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.pwdLogin()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			// 页面跳转，找回密码
+			toRetrievePwd() {
+				let url = '/uni_modules/uni-id-pages/pages/retrieve/retrieve'
+				//如果刚好用户名输入框的值为手机号码，就把它传到retrieve页面，根据该手机号找回密码
+				if (/^1\d{10}$/.test(this.username)) {
+					url += `?phoneNumber=${this.username}`
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			/**
+			 * 密码登录
+			 */
+			pwdLogin() {
+				if(!this.password.length){
+					this.focusPassword = true
+					return uni.showToast({
+						title: '请输入密码',
+						icon: 'none'
+					});
+				}
+				if(!this.username.length){
+					this.focusUsername = true
+					return uni.showToast({
+						title: '请输入手机号/用户名',
+						icon: 'none'
+					});
+				}
+				if(this.needCaptcha && this.captcha.length!=4){
+					this.$refs.captcha.getImageCaptcha()
+					return uni.showToast({
+						title: '请输入验证码',
+						icon: 'none'
+					});
+				}
+				
+				if (this.needAgreements && !this.agree) {
+					return this.$refs.agreements.popup(this.pwdLogin)
+				}
+				
+				let data = {
+					"password": this.password,
+					"captcha": this.captcha
+				}
+				
+				if (/^1\d{10}$/.test(this.username)) {
+					data.mobile = this.username
+				}else{
+					data.username = this.username
+				}
+				
+				uniIdCo.login(data).then(e => {
+					this.loginSuccess(e)
+				}).catch(e => {
+					if(e.errCode == 'uni-id-captcha-required'){
+						this.needCaptcha = true
+					}else if(this.needCaptcha){
+						//登录失败，自动重新获取验证码
+						this.$refs.captcha.getImageCaptcha()
+					}
+				})
+			},
+			/* 前往注册 */
+			toRegister(e) {
+				console.log(e);
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/register/register'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	.forget{
+		font-size: 12px;
+		color: #8a8f8b;
+	}
+
+	.link-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		margin-top: 20px;
+	}
+
+	.link {
+		font-size: 12px;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/pages/register/register.vue b/uni_modules/uni-id-pages/pages/register/register.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5ceaa25fda084bb1a9a0f781b4fe71526cdc1088
--- /dev/null
+++ b/uni_modules/uni-id-pages/pages/register/register.vue
@@ -0,0 +1,132 @@
+<!-- 账号注册页 -->
+<template>
+	<view class="uni-content">
+		<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="'请输入' + passwordLength[0] + '-' + passwordLength[1] + '位密码'" 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">返回</button>
+		</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")
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				formData: {
+					username: "",
+					nickname: "",
+					password: "",
+					password2: "",
+					captcha: ""
+				},
+				rules,
+				focusUsername:false,
+				focusNickname:false,
+				focusPassword:false,
+				focusPassword2:false
+			}
+		},
+		computed:{
+			passwordLength(){
+				return config.password.length
+			}
+		},
+		onReady() {
+			this.$refs.form.setRules(this.rules)
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			/**
+			 * 触发表单提交
+			 */
+			submit() {
+				this.$refs.form.validate().then((res) => {
+					if(this.formData.captcha.length != 4){
+						this.$refs.captcha.focusCaptchaInput = true
+						return uni.showToast({
+							title: '请输入验证码',
+							icon: 'none'
+						});
+					}
+					if (this.needAgreements && !this.agree) {
+						return this.$refs.agreements.popup(()=>{
+							this.submitForm(res)
+						})
+					}
+					this.submitForm(res)
+				}).catch((errors) => {
+					let key = errors[0].key
+					key = key.replace(key[0], key[0].toUpperCase())
+					console.log(key);
+					this['focus'+key] = true
+				})
+			},
+			submitForm(params) {
+				uniIdCo.registerUser(this.formData).then(e => {
+					console.log(e);
+					uni.navigateBack()
+				})
+				.catch(e => {
+					console.log(e);
+					console.log(e.message);
+					//更好的体验：登录错误，直接刷新验证码
+					this.$refs.captcha.getImageCaptcha()
+				})
+			},
+			navigateBack() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+	.uni-content{
+		margin-top: 15px;
+	}
+	.uni-content ::v-deep .uni-forms-item__label {
+		position: absolute;
+		left: -15px;
+	}
+
+	button {
+		margin-top: 15px;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/pages/register/validator.js b/uni_modules/uni-id-pages/pages/register/validator.js
new file mode 100644
index 0000000000000000000000000000000000000000..907f901070ff7838b1907572d9a1381b387a850f
--- /dev/null
+++ b/uni_modules/uni-id-pages/pages/register/validator.js
@@ -0,0 +1,56 @@
+import passwordMod from '@/uni_modules/uni-id-pages/common/password.js'
+export default {
+	"username": {
+		"rules": [{
+				required: true,
+				errorMessage: '请输入用户名',
+			},
+			{
+				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": "用户名"
+	},
+	"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()
+}
diff --git a/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue b/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
new file mode 100644
index 0000000000000000000000000000000000000000..0b7a14bef43f2cdcbf841a9ffb63370bdbf8ec18
--- /dev/null
+++ b/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
@@ -0,0 +1,201 @@
+<!-- 找回密码页 -->
+<template>
+	<view class="uni-content">
+		<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>
+		</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
+								}
+							}
+						]
+					}
+				}
+			}
+		},
+		computed: {
+			isPhone() {
+				let reg_phone = /^1\d{10}$/;
+				let isPhone = reg_phone.test(this.formData.phone);
+				return isPhone;
+			},
+			isPwd() {
+				let reg_pwd = /^.{6,20}$/;
+				let isPwd = reg_pwd.test(this.formData.password);
+				return isPwd;
+			},
+			isCode() {
+				let reg_code = /^\d{6}$/;
+				let isCode = reg_code.test(this.formData.code);
+				return isCode;
+			}
+		},
+		onLoad(event) {
+			if (event && event.phoneNumber) {
+				this.formData.phone = event.phoneNumber;
+				if(event.lock){
+					this.lock = event.lock //如果是已经登录的账号，点击找回密码就锁定指定的账号绑定的手机号码
+					this.focusPhone = true
+				}
+			}
+		},
+		onReady() {
+			if (this.formData.phone) {
+				this.$refs.shortCode.start();
+			}
+			this.$refs.form.setRules(this.rules)
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			/**
+			 * 完成并提交
+			 */
+			submit() {
+				console.log("formData", this.formData);
+				console.log('rules', this.rules);
+				this.$refs.form.validate()
+					.then(res => {
+						let {
+							"phone": mobile,
+							"password": password,
+							captcha,
+							code
+						} = this.formData
+						uniIdCo.resetPwdBySms({
+								mobile,
+								code,
+								password,
+								captcha
+							}).then(e => {
+								console.log(e);
+								uni.navigateBack()
+							})
+							.catch(e => {
+								if (e.errCode == 'uni-id-captcha-required') {
+									this.$refs.popup.open()
+								}
+							}).finally(e => {
+								this.formData.captcha = ""
+							})
+					}).catch(errors=>{
+						let key = errors[0].key
+						if(key == 'code'){
+							console.log(this.$refs.shortCode);
+							return this.$refs.shortCode.focusSmsCodeInput = true
+						}
+						key = key.replace(key[0], key[0].toUpperCase())
+						console.log(key,'focus'+key);
+						this['focus'+key] = true
+					})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	.uni-content {
+		margin-top: 15px;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue b/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue
new file mode 100644
index 0000000000000000000000000000000000000000..351c32b3b7fcba2c5d834fe8223973036275411d
--- /dev/null
+++ b/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue
@@ -0,0 +1,111 @@
+<!-- 绑定手机号码页 -->
+<template>
+	<view class="uni-content">
+		<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
+		<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>
+	export default {
+		data() {
+			return {
+				formData: {
+					mobile: "",
+					code: "",
+					captcha: ""
+				},
+				focusMobile:true
+			}
+		},
+		computed: {
+			tipText() {
+				return `验证码已通过短信发送至 ${this.formData.mobile}。密码为6 - 20位`
+			}
+		},
+		onLoad(event) {},
+		onReady() {},
+
+		methods: {
+			/**
+			 * 完成并提交
+			 */
+			submit() {
+				if(! /^1\d{10}$/.test(this.formData.mobile)){
+					this.focusMobile = true 
+					return uni.showToast({
+						title: '手机号码格式不正确',
+						icon: 'none'
+					});
+				}
+				if(! /^\d{6}$/.test(this.formData.code)){
+					this.$refs.smsForm.focusSmsCodeInput = true 
+					return uni.showToast({
+						title: '验证码格式不正确',
+						icon: 'none'
+					});
+				}
+				
+				console.log(this.formData);
+				const uniIdCo = uniCloud.importObject("uni-id-co")
+				uniIdCo.bindMobileBySms(this.formData).then(e => {
+					console.log(e);
+					uni.showToast({
+						title: e.errMsg,
+						icon: 'none'
+					});
+					// #ifdef APP-NVUE
+					const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
+					// #endif
+					// #ifndef APP-NVUE
+					const eventChannel = this.getOpenerEventChannel();
+					// #endif
+					eventChannel.emit('getUserInfo')
+					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;
+	}
+
+	/* #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>
diff --git a/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue b/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue
new file mode 100644
index 0000000000000000000000000000000000000000..724e47bbe2e063436f7c3cb6bfc383cfe9993eda
--- /dev/null
+++ b/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue
@@ -0,0 +1,146 @@
+<!-- 修改密码 -->
+<template>
+	<view class="uni-content">
+		<uni-forms ref="form" :value="formData" err-show-type="toast">
+			<uni-forms-item name="oldPassword">
+				<uni-easyinput :focus="focusOldPassword" @blur="focusOldPassword = false" class="input-box"
+					type="password" :inputBorder="false" v-model="formData.oldPassword" placeholder="请输入旧密码">
+				</uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="newPassword">
+				<uni-easyinput :focus="focusNewPassword" @blur="focusNewPassword = false" class="input-box"
+					type="password" :inputBorder="false" v-model="formData.newPassword" placeholder="请输入新密码">
+				</uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="newPassword2">
+				<uni-easyinput :focus="focusNewPassword2" @blur="focusNewPassword2 = false" class="input-box"
+					type="password" :inputBorder="false" v-model="formData.newPassword2" placeholder="请再次输入新密码">
+				</uni-easyinput>
+			</uni-forms-item>
+			<button class="uni-btn send-btn-box" type="primary" @click="submit">提交</button>
+		</uni-forms>
+	</view>
+</template>
+
+<script>
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	const uniIdCo = uniCloud.importObject("uni-id-co", {
+		customUI:true
+	})
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				focusOldPassword: false,
+				focusNewPassword: false,
+				focusNewPassword2: false,
+				formData: {
+					'oldPassword': '',
+					'newPassword': '',
+					'newPassword2': '',
+				},
+				rules: {
+					oldPassword: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入新密码',
+							},
+							{
+								pattern: /^.{6,20}$/,
+								errorMessage: '密码为6 - 20位',
+							}
+						]
+					},
+					newPassword: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入新密码',
+							},
+							{
+								pattern: /^.{6,20}$/,
+								errorMessage: '密码为6 - 20位',
+							}
+						]
+					},
+					newPassword2: {
+						rules: [{
+								required: true,
+								errorMessage: '请确认密码',
+							},
+							{
+								pattern: /^.{6,20}$/,
+								errorMessage: '密码为6 - 20位',
+							},
+							{
+								validateFunction: function(rule, value, data, callback) {
+									if (value != data.newPassword) {
+										callback('两次输入密码不一致')
+									};
+									return true
+								}
+							}
+						]
+					}
+				}
+			}
+		},
+		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() {
+				console.log("formData", this.formData);
+				console.log('rules', this.rules);
+				this.$refs.form.validate()
+					.then(res => {
+						let {
+							oldPassword,
+							newPassword
+						} = this.formData
+						uniIdCo.updatePwd({
+								oldPassword,
+								newPassword
+							}).then(e => {
+								console.log(e);
+								uni.removeStorageSync('uni_id_token');
+								uni.setStorageSync('uni_id_token_expired', 0)
+								uni.redirectTo({
+									url:'/uni_modules/uni-id-pages/pages/login/login-withpwd'
+								})
+							}).catch(e => {
+								uni.showModal({
+									content: e.message,
+									showCancel: false
+								});
+							})
+					}).catch(errors => {
+						let key = errors[0].key
+						key = key.replace(key[0], key[0].toUpperCase())
+						console.log(key, 'focus' + key);
+						this['focus' + key] = true
+					})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	.uni-content {
+		margin-top: 15px;
+	}
+</style>
diff --git a/pages/ucenter/userinfo/cropImage.vue b/uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage.vue
similarity index 96%
rename from pages/ucenter/userinfo/cropImage.vue
rename to uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage.vue
index dbec54d65615aba78c4eb62417606835da945ea6..0a9e701768d2739362c88b7364b3a74f3b5c872d 100644
--- a/pages/ucenter/userinfo/cropImage.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage.vue
@@ -1,3 +1,4 @@
+<!-- 图片裁剪页 -->
 <template>
 	<view class="content" >
 		<limeClipper :width="options.width" :scale-ratio="2" :is-lock-width="false" :is-lock-height="false" :height="options.height" :image-url="path"  
diff --git a/pages/ucenter/userinfo/limeClipper/README.md b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/README.md
similarity index 100%
rename from pages/ucenter/userinfo/limeClipper/README.md
rename to uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/README.md
diff --git a/pages/ucenter/userinfo/limeClipper/images/photo.svg b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/photo.svg
similarity index 100%
rename from pages/ucenter/userinfo/limeClipper/images/photo.svg
rename to uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/photo.svg
diff --git a/pages/ucenter/userinfo/limeClipper/images/rotate.svg b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/rotate.svg
similarity index 100%
rename from pages/ucenter/userinfo/limeClipper/images/rotate.svg
rename to uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/images/rotate.svg
diff --git a/pages/ucenter/userinfo/limeClipper/index.css b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/index.css
similarity index 100%
rename from pages/ucenter/userinfo/limeClipper/index.css
rename to uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/index.css
diff --git a/pages/ucenter/userinfo/limeClipper/limeClipper.vue b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/limeClipper.vue
similarity index 99%
rename from pages/ucenter/userinfo/limeClipper/limeClipper.vue
rename to uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/limeClipper.vue
index 076354b4dc86a069113b23e87f3eb8bd1c947aa8..9caae2dc1e620e89cfde323a349e753393da824c 100644
--- a/pages/ucenter/userinfo/limeClipper/limeClipper.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/limeClipper.vue
@@ -30,11 +30,11 @@
 				</view>
 				<view v-if="isShowPhotoBtn" @tap="uploadImage">
 					<slot name="photo" v-if="$slots.photo" />
-					<image v-else src="@/static/limeClipper/photo.svg" />
+					<image v-else src="uni_modules/uni-id-pages/static/limeClipper/photo.svg" />
 				</view>
 				<view v-if="isShowRotateBtn" @tap="rotate">
 					<slot name="rotate" v-if="$slots.rotate" />
-					<image v-else src="@/static/limeClipper/rotate.svg" data-type="inverse" />
+					<image v-else src="uni_modules/uni-id-pages/static/limeClipper/rotate.svg" data-type="inverse" />
 				</view>
 				<view v-if="isShowConfirmBtn" @tap="confirm">
 					<slot name="confirm" v-if="$slots.confirm" />
diff --git a/pages/ucenter/userinfo/limeClipper/utils.js b/uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/utils.js
similarity index 100%
rename from pages/ucenter/userinfo/limeClipper/utils.js
rename to uni_modules/uni-id-pages/pages/userinfo/cropImage/limeClipper/utils.js
diff --git a/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate.vue b/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate.vue
new file mode 100644
index 0000000000000000000000000000000000000000..817fbd3da808857afad3f1c657dde115d63638ec
--- /dev/null
+++ b/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate.vue
@@ -0,0 +1,111 @@
+<!-- 注销（销毁）账号 -->
+<template>
+	<view class="content">
+		<text class="words" space="emsp">
+			一、注销是不可逆操作，注销后:\n
+			1.帐号将无法登录、无法找回。\n
+			2.帐号所有信息都会清除(个人身份信息、粉丝数等;发布的作品、评论、点赞等;交易信息等)，你
+			的朋友将无法通过本应用帐号联系你，请自行备份相关
+			信息和数据。\n
+
+			二、重要提示\n
+			1.封禁帐号(永久封禁、社交封禁、直播权限封禁)不能申请注销。\n
+			2.注销后，你的身份证、三方帐号(微信、QQ、微博、支付宝)、手机号等绑定关系将解除，解除后可以绑定到其他帐号。\n
+			3.注销后，手机号可以注册新的帐号，新帐号不会存在之前帐号的任何信息(作品、粉丝、评论、个人信息等)。\n
+			4.注销本应用帐号前，需尽快处理帐号下的资金问题。\n
+			5.视具体帐号情况而定，注销最多需要7天。\n
+		</text>
+		<view class="button-group">
+			<button @click="nextStep" class="next" type="default">下一步</button>
+			<button @click="cancel" type="warn">取消</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		onLoad() {},
+		methods: {
+			cancel() {
+				uni.navigateBack()
+			},
+			nextStep() {
+				uni.showModal({
+					content: '已经仔细阅读注销提示，知晓可能带来的后果，并确认要注销',
+					complete: (e) => {
+						if (e.confirm) {
+							const db = uniCloud.database();
+							
+							const uniIdco = uniCloud.importObject("uni-id-co");
+							uniIdco.closeAccount().then((e) => {
+								console.log(e);
+								uni.showToast({
+									title: '注销成功'
+								});
+								uni.removeStorageSync('uni_id_token');
+								uni.setStorageSync('uni_id_token_expired', 0)
+								uni.navigateTo({
+									url:"/uni_modules/uni-id-pages/pages/login/login-withoutpwd"
+								})
+							})
+						} else {
+							uni.navigateBack()
+						}
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	.content {
+		display: flex;
+		flex-direction: column;
+		font-size: 28rpx;
+	}
+
+	.words {
+		padding: 0 26rpx;
+		line-height: 46rpx;
+		margin-top: 20rpx;
+		margin-bottom: 80px;
+	}
+
+	.button-group {
+		display: flex;
+		flex-direction: row;
+		position: fixed;
+		height: 50px;
+		bottom: 10px;
+		width: 750rpx;
+		justify-content: center;
+		align-items: center;
+		border-top: solid 1px #e4e6ec;
+		padding-top: 10px;
+		background-color: #FFFFFF;
+	}
+
+	.button-group button {
+		border-radius: 100px;
+		border: none;
+		width: 300rpx;
+		height: 42px;
+		line-height: 42px;
+		font-size: 32rpx;
+	}
+
+	.button-group button:after {
+		border: none;
+	}
+
+	.button-group button.next {
+		color: #e64340;
+		border: solid 1px #e64340;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue b/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2566cdcb5d98b4c8d98092dca0620101e82dedd0
--- /dev/null
+++ b/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
@@ -0,0 +1,236 @@
+<!-- 用户资料页 -->
+<template>
+	<view class="uni-content">
+		<view class="avatar">
+			<uni-id-pages-avatar width="260rpx" height="260rpx"></uni-id-pages-avatar>
+		</view>
+		<uni-list>
+			<uni-list-item class="item" @click="setNickname('')" title="昵称" :rightText="userInfo.nickname||'未设置'" link>
+			</uni-list-item>
+			<uni-list-item class="item" @click="bindMobile" title="手机号" :rightText="userInfo.mobile||'未绑定'" link>
+			</uni-list-item>
+			<uni-list-item v-if="hasPwd" class="item" @click="changePassword" title="修改密码" link>
+			</uni-list-item>
+		</uni-list>
+		<uni-list class="mt10">
+			<uni-list-item @click="deactivate" title="注销账号" link="navigateTo"></uni-list-item>
+		</uni-list>
+		<uni-popup ref="dialog" type="dialog">
+			<uni-popup-dialog mode="input" :value="userInfo.nickname" @confirm="setNickname" title="设置昵称"
+				placeholder="请输入要设置的昵称">
+			</uni-popup-dialog>
+		</uni-popup>
+		<uni-id-pages-bind-mobile ref="bind-mobile-by-sms" @success="getUserInfo"></uni-id-pages-bind-mobile>
+		<button v-if="hasLogin" @click="logout">退出登录</button>
+		<button v-else @click="login">去登录</button>
+	</view>
+</template>
+<script>
+	const db = uniCloud.database();
+	const usersTable = db.collection('uni-id-users')
+	const uniIdCo = uniCloud.importObject("uni-id-co")
+	export default {
+		data() {
+			return {
+				univerifyStyle: {
+					authButton: {
+						"title": "本机号码一键绑定", // 授权按钮文案
+					},
+					otherLoginButton: {
+						"title": "其他号码绑定",
+					}
+				},
+				userInfo: {
+					mobile:'',
+					nickname:''
+				},
+				hasLogin: false,
+				hasPwd:false
+			}
+		},
+		async onShow() {
+			this.univerifyStyle.authButton.title = "本机号码一键绑定"
+			this.univerifyStyle.otherLoginButton.title = "其他号码绑定"
+		},
+		async onLoad() {
+			this.getUserInfo()
+			//判断当前用户是否有密码，否则就不显示密码修改功能
+			let res = await uniIdCo.getAccountInfo()
+			this.hasPwd = res.isPasswordSet
+		},
+		methods: {
+			login() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-withoutpwd',
+					complete: (e) => {
+						console.log(e);
+					}
+				})
+			},
+			async logout() {
+				await uniIdCo.logout()
+				uni.removeStorageSync('uni_id_token');
+				uni.setStorageSync('uni_id_token_expired', 0)
+				uni.redirectTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-withoutpwd',
+				});
+			},
+			changePassword(){
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd',
+					complete: (e) => {
+						console.log(e);
+					}
+				})
+			},
+			getUserInfo(e) {
+				uni.showLoading({
+					mask: true
+				});
+				usersTable.where("'_id' == $cloudEnv_uid").field('mobile,nickname').get().then(res => {
+					console.log({res});
+					this.userInfo = res.result.data[0]
+					console.log('this.userInfo', this.userInfo);
+					this.hasLogin = true
+				}).catch(e => {
+					this.userInfo = {}
+					this.hasLogin = false
+					console.log(e.message, e.errCode);
+				}).finally(e => {
+					// console.log(e);
+					uni.hideLoading()
+				})
+			},
+			bindMobile() {
+				// #ifdef APP-PLUS
+				uni.preLogin({
+					provider: 'univerify',
+					success: this.univerify(), //预登录成功
+					fail: (res) => { // 预登录失败
+						// 不显示一键登录选项（或置灰）
+						console.log(res)
+						this.bindMobileBySmsCode()
+					}
+				})
+				// #endif
+
+				// #ifdef MP-WEIXIN
+				this.$refs['bind-mobile'].open()
+				// #endif
+
+				// #ifdef H5
+				//...去用验证码绑定
+				this.bindMobileBySmsCode()
+				// #endif
+			},
+			univerify() {
+				uni.login({
+					"provider": 'univerify',
+					"univerifyStyle": this.univerifyStyle,
+					success: async e => {
+						console.log(e.authResult);
+						uniIdCo.bindMobileByUniverify(e.authResult).then(res => {
+							console.log(res);
+							this.getUserInfo()
+						}).catch(e => {
+							console.log(e);
+						}).finally(e=>{
+							console.log(e);
+							uni.closeAuthView()
+						})
+					},
+					fail: (err) => {
+						console.log(err);
+						if (err.code == '30002' || err.code == '30001') {
+							this.bindMobileBySmsCode()
+						}
+					}
+				})
+			},
+			bindMobileBySmsCode() {
+				uni.navigateTo({
+					url: './bind-mobile/bind-mobile',
+					events: {
+						getUserInfo: () => {
+							this.getUserInfo()
+						}
+					},
+					complete(e) {
+						console.log(e);
+					}
+				})
+			},
+			setNickname(nickname) {
+				console.log(nickname);
+				if (nickname) {
+					usersTable.where('_id==$env.uid').update({
+						nickname
+					}).then(e => {
+						console.log(e);
+						if (e.result.updated) {
+							uni.showToast({
+								title: "更新成功",
+								icon: 'none'
+							});
+							this.userInfo.nickname = nickname
+						} else {
+							uni.showToast({
+								title: "没有改变",
+								icon: 'none'
+							});
+						}
+					})
+					this.$refs.dialog.close()
+				} else {
+					this.$refs.dialog.open()
+				}
+			},
+			deactivate(){
+				uni.navigateTo({
+					url:"/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate"
+				})
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	@import url("/uni_modules/uni-id-pages/common/login-page.scss");
+
+	.uni-content {
+		padding: 0;
+	}
+
+	/* #ifndef APP-NVUE */
+	view {
+		display: flex;
+		box-sizing: border-box;
+		flex-direction: column;
+	}
+
+	/* #endif */
+	.avatar {
+		align-items: center;
+		justify-content: center;
+		margin: 22px 0;
+		width: 100%;
+	}
+
+	.item {
+		flex: 1;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	button {
+		margin: 10%;
+		margin-top: 40px;
+		border-radius: 0;
+		background-color: #FFFFFF;
+		width: 80%;
+	}
+	
+	.mt10{
+		margin-top: 10px;
+	}
+</style>
diff --git a/uni_modules/uni-id-pages/readme.md b/uni_modules/uni-id-pages/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..1650e459c71e4bb0bf70d721f9b5c4f1e969c71f
--- /dev/null
+++ b/uni_modules/uni-id-pages/readme.md
@@ -0,0 +1,15 @@
+# 文档已移至uni-id-pages文档[https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html](https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html)
+
+
+
+关于插件更新的说明：
+
+所有uni_modules，在HBuilderX里点右键都可以直接升级。或者在插件市场导入覆盖。
+
+覆盖时HBuilderX会弹出代码差异比对，可以决定接受哪些更改、拒绝哪些更改。
+
+当拒绝局部修改时，注意可能产生兼容性问题。
+
+你需要二次开发uni-id-pages的前端页面，
+- 如果改动不大，那么每次更新uni-id-pages时，在HBuilderX的对比界面对比一下就好
+- 如果改动较大，建议复制一套前端页面到自己工程的pages目录下，pages.json里只引用根目录pages下的页面，不引用uni_modules下的页面。然后每次uni-id-pages更新，你对比下比上一版uni-id-pages改了什么，看你是否需要再合并到你自己的pages里。pages.json里不引用uni_modules里的页面的话，打包时不会把这些页面打包进去，不影响发行后的包体积
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/static/limeClipper/photo.svg b/uni_modules/uni-id-pages/static/limeClipper/photo.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7b4b59058376794d6e6a78035f627678102f96ad
--- /dev/null
+++ b/uni_modules/uni-id-pages/static/limeClipper/photo.svg
@@ -0,0 +1,19 @@
+<?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>
diff --git a/uni_modules/uni-id-pages/static/limeClipper/rotate.svg b/uni_modules/uni-id-pages/static/limeClipper/rotate.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0143706ca7adea484ed38339980c2cc23559595e
--- /dev/null
+++ b/uni_modules/uni-id-pages/static/limeClipper/rotate.svg
@@ -0,0 +1,15 @@
+<?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"
+	 width="30px" height="30px" viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#FFFFFF;stroke-width:2.4306;stroke-miterlimit:10;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M17.1,24.2h-12c-0.2,0-0.3-0.2-0.3-0.3v-9.3c0-0.2,0.2-0.3,0.3-0.3h12c0.2,0,0.3,0.2,0.3,0.3v9.3
+		C17.5,24.1,17.3,24.2,17.1,24.2z"/>
+	<path class="st0" d="M16.6,5.4c4.8,0,8.7,3.9,8.7,8.7"/>
+	<polyline class="st0" points="19.3,10.1 14.9,5.6 19.3,1.2 	"/>
+</g>
+</svg>
diff --git a/uni_modules/uni-id-pages/static/login/apple.png b/uni_modules/uni-id-pages/static/login/apple.png
new file mode 100644
index 0000000000000000000000000000000000000000..04a3579cbd143037161da2779fb695f731818d81
Binary files /dev/null and b/uni_modules/uni-id-pages/static/login/apple.png differ
diff --git a/uni_modules/uni-id-pages/static/login/weixin.png b/uni_modules/uni-id-pages/static/login/weixin.png
new file mode 100644
index 0000000000000000000000000000000000000000..913a9d1d6959aef1b0efef8171f74f6878adfd37
Binary files /dev/null and b/uni_modules/uni-id-pages/static/login/weixin.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-center/defaultAvatarUrl.png b/uni_modules/uni-id-pages/static/uni-center/defaultAvatarUrl.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3d33188b94e4843e0311836ffb0fd843195ae4e
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-center/defaultAvatarUrl.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-center/grey.png b/uni_modules/uni-id-pages/static/uni-center/grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..2aae15a5d0b9eea8451df6395d53775bcc676f78
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-center/grey.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-center/headers.png b/uni_modules/uni-id-pages/static/uni-center/headers.png
new file mode 100644
index 0000000000000000000000000000000000000000..4233e82cf1ef1d850dc9c3772ecde21836f78bfc
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-center/headers.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/alipay.png b/uni_modules/uni-id-pages/static/uni-fab-login/alipay.png
new file mode 100644
index 0000000000000000000000000000000000000000..adc0417f86720d9a0702186412ec1a735865ac86
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-fab-login/alipay.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/apple.png b/uni_modules/uni-id-pages/static/uni-fab-login/apple.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f0840fe2ccb9873bd986dc046813ae7d50cb22d
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-fab-login/apple.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/douyin.png b/uni_modules/uni-id-pages/static/uni-fab-login/douyin.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc9f299aa5490d42ca36278b42db6364202b75ce
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-fab-login/douyin.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/facebook.png b/uni_modules/uni-id-pages/static/uni-fab-login/facebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec418a52d0afe44f547a1c173e9e7a5932e13f3e
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-fab-login/facebook.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/google.png b/uni_modules/uni-id-pages/static/uni-fab-login/google.png
new file mode 100644
index 0000000000000000000000000000000000000000..2262f87d7e5421c92115b8a42b6e73f61aa5182b
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-fab-login/google.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/qq.png b/uni_modules/uni-id-pages/static/uni-fab-login/qq.png
new file mode 100644
index 0000000000000000000000000000000000000000..33c8505db6102e3f269a2bfc187ff2c41a0f912c
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-fab-login/qq.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/sinaweibo.png b/uni_modules/uni-id-pages/static/uni-fab-login/sinaweibo.png
new file mode 100644
index 0000000000000000000000000000000000000000..4424c7e124f8c901888540ff56e01fcbd858ee51
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-fab-login/sinaweibo.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/sms.png b/uni_modules/uni-id-pages/static/uni-fab-login/sms.png
new file mode 100644
index 0000000000000000000000000000000000000000..4488c564b2d5a0107e6874c1136a3c30322d5b4e
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-fab-login/sms.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/taobao.png b/uni_modules/uni-id-pages/static/uni-fab-login/taobao.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f0944092327135b88686f39f6b247814e9a825a
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-fab-login/taobao.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/univerify.png b/uni_modules/uni-id-pages/static/uni-fab-login/univerify.png
new file mode 100644
index 0000000000000000000000000000000000000000..75778d36dd63ed6038e8d1afec1e572485dd0f19
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-fab-login/univerify.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/user.png b/uni_modules/uni-id-pages/static/uni-fab-login/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f330e7b72484c8e00e24c0f890e849717d73aa1
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-fab-login/user.png differ
diff --git a/uni_modules/uni-id-pages/static/uni-fab-login/weixin.png b/uni_modules/uni-id-pages/static/uni-fab-login/weixin.png
new file mode 100644
index 0000000000000000000000000000000000000000..26e85c16080a366931bd1fa2e3316266be09265f
Binary files /dev/null and b/uni_modules/uni-id-pages/static/uni-fab-login/weixin.png differ
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..519eff90d4fc406f29d56275e0925fd2d5d0ddda
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/constants.js
@@ -0,0 +1,72 @@
+const db = uniCloud.database()
+const dbCmd = db.command
+const userCollectionName = 'uni-id-users'
+const userCollection = db.collection(userCollectionName)
+const verifyCollectionName = 'opendb-verify-codes'
+const verifyCollection = db.collection(verifyCollectionName)
+const deviceCollectionName = 'uni-id-device'
+const deviceCollection = db.collection(deviceCollectionName)
+
+const USER_IDENTIFIER = {
+  username: 'username',
+  mobile: 'mobile',
+  email: 'email',
+  wx_unionid: 'wechat-account',
+  'wx_openid.app': 'wechat-account',
+  'wx_openid.mp': 'wechat-account',
+  'wx_openid.h5': 'wechat-account',
+  'wx_openid.web': 'wechat-account',
+  qq_unionid: 'qq-account',
+  'qq_openid.app': 'qq-account',
+  'qq_openid.mp': 'qq-account',
+  ali_openid: 'alipay-account',
+  apple_openid: 'alipay-account'
+}
+
+const USER_STATUS = {
+  NORMAL: 0,
+  BANNED: 1,
+  AUDITING: 2,
+  AUDIT_FAILED: 3,
+  CLOSED: 4
+}
+
+const CAPTCHA_SCENE = {
+  REGISTER: 'register',
+  LOGIN_BY_PWD: 'login-by-pwd',
+  LOGIN_BY_SMS: 'login-by-sms',
+  RESET_PWD_BY_SMS: 'reset-pwd-by-sms',
+  SEND_SMS_CODE: 'send-sms-code',
+  BIND_MOBILE_BY_SMS: 'bind-mobile-by-sms'
+}
+
+const LOG_TYPE = {
+  LOGOUT: 'logout',
+  LOGIN: 'login',
+  REGISTER: 'register',
+  RESET_PWD_BY_SMS: 'reset-pwd',
+  BIND_MOBILE: 'bind-mobile',
+  BIND_WEIXIN: 'bind-weixin',
+  BIND_QQ: 'bind-qq',
+  BIND_APPLE: 'bind-apple',
+  BIND_ALIPAY: 'bind-alipay'
+}
+
+const SMS_SCENE = {
+  LOGIN_BY_SMS: 'login-by-sms',
+  RESET_PWD_BY_SMS: 'reset-pwd-by-sms',
+  BIND_MOBILE_BY_SMS: 'bind-mobile-by-sms'
+}
+
+module.exports = {
+  db,
+  dbCmd,
+  userCollection,
+  verifyCollection,
+  deviceCollection,
+  USER_IDENTIFIER,
+  USER_STATUS,
+  CAPTCHA_SCENE,
+  LOG_TYPE,
+  SMS_SCENE
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..3095e5f72573bddb56a33f3a6c0897c07061f201
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/error.js
@@ -0,0 +1,52 @@
+const ERROR = {
+  ACCOUNT_EXISTS: 'uni-id-account-exists',
+  ACCOUNT_NOT_EXISTS: 'uni-id-account-not-exists',
+  ACCOUNT_CONFLICT: 'uni-id-account-conflict',
+  ACCOUNT_BANNED: 'uni-id-account-banned',
+  ACCOUNT_AUDITING: 'uni-id-account-auditing',
+  ACCOUNT_AUDIT_FAILED: 'uni-id-account-audit-failed',
+  ACCOUNT_CLOSED: 'uni-id-account-closed',
+  CAPTCHA_REQUIRED: 'uni-id-captcha-required',
+  PASSWORD_ERROR: 'uni-id-password-error',
+  PASSWORD_ERROR_EXCEED_LIMIT: 'uni-id-password-error-exceed-limit',
+  INVALID_USERNAME: 'uni-id-invalid-username',
+  INVALID_PASSWORD: 'uni-id-invalid-password',
+  INVALID_PASSWORD_SUPER: 'uni-id-invalid-password-super',
+  INVALID_PASSWORD_STRONG: 'uni-id-invalid-password-strong',
+  INVALID_PASSWORD_MEDIUM: 'uni-id-invalid-password-medium',
+  INVALID_PASSWORD_WEAK: 'uni-id-invalid-password-weak',
+  INVALID_MOBILE: 'uni-id-invalid-mobile',
+  INVALID_EMAIL: 'uni-id-invalid-email',
+  INVALID_NICKNAME: 'uni-id-invalid-nickname',
+  INVALID_PARAM: 'uni-id-invalid-param',
+  PARAM_REQUIRED: 'uni-id-param-required',
+  GET_THIRD_PARTY_ACCOUNT_FAILED: 'uni-id-get-third-party-account-failed',
+  GET_THIRD_PARTY_USER_INFO_FAILED: 'uni-id-get-third-party-user-info-failed',
+  MOBILE_VERIFY_CODE_ERROR: 'uni-id-mobile-verify-code-error',
+  EMAIL_VERIFY_CODE_ERROR: 'uni-id-email-verify-code-error',
+  ADMIN_EXISTS: 'uni-id-admin-exists',
+  PERMISSION_ERROR: 'uni-id-permission-error',
+  SYSTEM_ERROR: 'uni-id-system-error',
+  SET_INVITE_CODE_FAILED: 'uni-id-set-invite-code-failed',
+  INVALID_INVITE_CODE: 'uni-id-invalid-invite-code',
+  CHANGE_INVITER_FORBIDDEN: 'uni-id-change-inviter-forbidden',
+  BIND_CONFLICT: 'uni-id-bind-conflict'
+}
+
+function isUniIdError (errCode) {
+  return Object.values(ERROR).includes(errCode)
+}
+
+class UniCloudError extends Error {
+  constructor (options) {
+    super(options.message)
+    this.errMsg = options.message || ''
+    this.errCode = options.code
+  }
+}
+
+module.exports = {
+  ERROR,
+  isUniIdError,
+  UniCloudError
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..432404b933c7d23dc15fbc1947eb04310c6f0a6f
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/utils.js
@@ -0,0 +1,190 @@
+function batchFindObjctValue (obj = {}, keys = []) {
+  const values = {}
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i]
+    const keyPath = key.split('.')
+    let currentKey = keyPath.shift()
+    let result = obj
+    while (currentKey) {
+      if (!result) {
+        break
+      }
+      result = result[currentKey]
+      currentKey = keyPath.shift()
+    }
+    values[key] = result
+  }
+  return values
+}
+
+function getType (val) {
+  return Object.prototype.toString.call(val).slice(8, -1).toLowerCase()
+}
+
+function hasOwn (obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key)
+}
+
+function isValidString (val) {
+  return val && getType(val) === 'string'
+}
+
+function isPlainObject (obj) {
+  return getType(obj) === 'object'
+}
+
+function isFn (fn) {
+  // 务必注意AsyncFunction
+  return typeof fn === 'function'
+}
+
+// 获取文件后缀，只添加几种图片类型供客服消息接口使用
+const mime2ext = {
+  'image/png': 'png',
+  'image/jpeg': 'jpg',
+  'image/gif': 'gif',
+  'image/svg+xml': 'svg',
+  'image/bmp': 'bmp',
+  'image/webp': 'webp'
+}
+
+function getExtension (contentType) {
+  return mime2ext[contentType]
+}
+
+const isSnakeCase = /_(\w)/g
+const isCamelCase = /[A-Z]/g
+
+function snake2camel (value) {
+  return value.replace(isSnakeCase, (_, c) => (c ? c.toUpperCase() : ''))
+}
+
+function camel2snake (value) {
+  return value.replace(isCamelCase, str => '_' + str.toLowerCase())
+}
+
+function parseObjectKeys (obj, type) {
+  let parserReg, parser
+  switch (type) {
+    case 'snake2camel':
+      parser = snake2camel
+      parserReg = isSnakeCase
+      break
+    case 'camel2snake':
+      parser = camel2snake
+      parserReg = isCamelCase
+      break
+  }
+  for (const key in obj) {
+    if (hasOwn(obj, key)) {
+      if (parserReg.test(key)) {
+        const keyCopy = parser(key)
+        obj[keyCopy] = obj[key]
+        delete obj[key]
+        if (isPlainObject(obj[keyCopy])) {
+          obj[keyCopy] = parseObjectKeys(obj[keyCopy], type)
+        } else if (Array.isArray(obj[keyCopy])) {
+          obj[keyCopy] = obj[keyCopy].map((item) => {
+            return parseObjectKeys(item, type)
+          })
+        }
+      }
+    }
+  }
+  return obj
+}
+
+function snake2camelJson (obj) {
+  return parseObjectKeys(obj, 'snake2camel')
+}
+
+function camel2snakeJson (obj) {
+  return parseObjectKeys(obj, 'camel2snake')
+}
+
+function getOffsetDate (offset) {
+  return new Date(
+    Date.now() + (new Date().getTimezoneOffset() + (offset || 0) * 60) * 60000
+  )
+}
+
+function getDateStr (date, separator = '-') {
+  date = date || new Date()
+  const dateArr = []
+  dateArr.push(date.getFullYear())
+  dateArr.push(('00' + (date.getMonth() + 1)).substr(-2))
+  dateArr.push(('00' + date.getDate()).substr(-2))
+  return dateArr.join(separator)
+}
+
+function getTimeStr (date, separator = ':') {
+  date = date || new Date()
+  const timeArr = []
+  timeArr.push(('00' + date.getHours()).substr(-2))
+  timeArr.push(('00' + date.getMinutes()).substr(-2))
+  timeArr.push(('00' + date.getSeconds()).substr(-2))
+  return timeArr.join(separator)
+}
+
+function getFullTimeStr (date) {
+  date = date || new Date()
+  return getDateStr(date) + ' ' + getTimeStr(date)
+}
+
+function getDistinctArray (arr) {
+  return Array.from(new Set(arr))
+}
+
+/**
+ * 拼接url
+ * @param {string} base 基础路径
+ * @param {string} path 在基础路径上拼接的路径
+ * @returns
+ */
+function resolveUrl (base, path) {
+  if (/^https?:/.test(path)) {
+    return path
+  }
+  return base + path
+}
+
+function getVerifyCode (len = 6) {
+  let code = ''
+  for (let i = 0; i < len; i++) {
+    code += Math.floor(Math.random() * 10)
+  }
+  return code
+}
+
+function coverMobile (mobile) {
+  if (typeof mobile !== 'string') {
+    return mobile
+  }
+  return mobile.slice(0, 3) + '****' + mobile.slice(7)
+}
+
+function getNonceStr (length = 16) {
+  let str = ''
+  while (str.length < length) {
+    str += Math.random().toString(32).substring(2)
+  }
+  return str.substring(0, length)
+}
+
+module.exports = {
+  getType,
+  isValidString,
+  batchFindObjctValue,
+  isPlainObject,
+  isFn,
+  getDistinctArray,
+  getFullTimeStr,
+  resolveUrl,
+  getOffsetDate,
+  camel2snakeJson,
+  snake2camelJson,
+  getExtension,
+  getVerifyCode,
+  coverMobile,
+  getNonceStr
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..7e0e33a304fa56c18923a365f26a6a305bc1b790
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/validator.js
@@ -0,0 +1,414 @@
+const {
+  isValidString,
+  getType
+} = require('./utils.js')
+const {
+  ERROR
+} = require('./error')
+
+const baseValidator = Object.create(null)
+
+baseValidator.username = function (username) {
+  const errCode = ERROR.INVALID_USERNAME
+  if (!isValidString(username)) {
+    return {
+      errCode
+    }
+  }
+  if (/^\d+$/.test(username)) {
+    // 用户名不能为纯数字
+    return {
+      errCode
+    }
+  };
+  if (!/^[a-zA-Z0-9_-]+$/.test(username)) {
+    // 用户名仅能使用数字、字母、“_”及“-”
+    return {
+      errCode
+    }
+  }
+}
+
+baseValidator.mobile = function (mobile) {
+  const errCode = ERROR.INVALID_MOBILE
+  if (!isValidString(mobile)) {
+    return {
+      errCode
+    }
+  }
+  if (!/^1\d{10}$/.test(mobile)) {
+    return {
+      errCode
+    }
+  }
+}
+
+baseValidator.email = function (email) {
+  const errCode = ERROR.INVALID_EMAIL
+  if (!isValidString(email)) {
+    return {
+      errCode
+    }
+  }
+  if (!/@/.test(email)) {
+    return {
+      errCode
+    }
+  }
+}
+
+baseValidator.nickname = function (nickname) {
+  const errCode = ERROR.INVALID_NICKNAME
+  if (nickname.indexOf('@') !== -1) {
+    // 昵称不允许含@
+    return {
+      errCode
+    }
+  };
+  if (/^\d+$/.test(nickname)) {
+    // 昵称不能为纯数字
+    return {
+      errCode
+    }
+  };
+  if (nickname.length > 100) {
+    // 昵称不可超过100字符
+    return {
+      errCode
+    }
+  }
+}
+
+const baseType = ['string', 'boolean', 'number', 'null'] // undefined不会由客户端提交上来
+
+baseType.forEach((type) => {
+  baseValidator[type] = function (val) {
+    if (getType(val) === type) {
+      return
+    }
+    return {
+      errCode: ERROR.INVALID_PARAM
+    }
+  }
+})
+
+function tokenize (name) {
+  let i = 0
+  const result = []
+  let token = ''
+  while (i < name.length) {
+    const char = name[i]
+    switch (char) {
+      case '|':
+      case '<':
+      case '>':
+        token && result.push(token)
+        result.push(char)
+        token = ''
+        break
+      default:
+        token += char
+        break
+    }
+    i++
+    if (i === name.length && token) {
+      result.push(token)
+    }
+  }
+  return result
+}
+
+/**
+ * 处理validator名
+ * @param {string} name
+ */
+function parseValidatorName (name) {
+  const tokenList = tokenize(name)
+  let i = 0
+  let currentToken = tokenList[i]
+  const result = {
+    type: 'root',
+    children: [],
+    parent: null
+  }
+  let lastRealm = result
+  while (currentToken) {
+    switch (currentToken) {
+      case 'array': {
+        const currentRealm = {
+          type: 'array',
+          children: [],
+          parent: lastRealm
+        }
+        lastRealm.children.push(currentRealm)
+        lastRealm = currentRealm
+        break
+      }
+      case '<':
+        if (lastRealm.type !== 'array') {
+          throw new Error('Invalid validator token "<"')
+        }
+        break
+      case '>':
+        if (lastRealm.type !== 'array') {
+          throw new Error('Invalid validator token ">"')
+        }
+        lastRealm = lastRealm.parent
+        break
+      case '|':
+        if (lastRealm.type !== 'array' && lastRealm.type !== 'root') {
+          throw new Error('Invalid validator token "|"')
+        }
+        break
+      default:
+        lastRealm.children.push({
+          type: currentToken
+        })
+        break
+    }
+    i++
+    currentToken = tokenList[i]
+  }
+  return result
+}
+
+function getRuleCategory (rule) {
+  switch (rule.type) {
+    case 'array':
+      return 'array'
+    case 'root':
+      return 'root'
+    default:
+      return 'base'
+  }
+}
+
+function isMatchUnionType (val, rule) {
+  if (!rule.children || rule.children.length === 0) {
+    return true
+  }
+  const children = rule.children
+  for (let i = 0; i < children.length; i++) {
+    const child = children[i]
+    const category = getRuleCategory(child)
+    let pass = false
+    switch (category) {
+      case 'base':
+        pass = isMatchBaseType(val, child)
+        break
+      case 'array':
+        pass = isMatchArrayType(val, child)
+        break
+      default:
+        break
+    }
+    if (pass) {
+      return true
+    }
+  }
+  return false
+}
+
+function isMatchBaseType (val, rule) {
+  if (typeof baseValidator[rule.type] !== 'function') {
+    throw new Error(`invalid schema type: ${rule.type}`)
+  }
+  const validateRes = baseValidator[rule.type](val)
+  if (validateRes && validateRes.errCode) {
+    return false
+  }
+  return true
+}
+
+function isMatchArrayType (arr, rule) {
+  if (getType(arr) !== 'array') {
+    return false
+  }
+  if (rule.children && rule.children.length && arr.some(item => !isMatchUnionType(item, rule))) {
+    return false
+  }
+  return true
+}
+
+// 特殊符号 https://www.ibm.com/support/pages/password-strength-rules  ~!@#$%^&*_-+=`|\(){}[]:;"'<>,.?/
+// const specialChar = '~!@#$%^&*_-+=`|\(){}[]:;"\'<>,.?/'
+// const specialCharRegExp = /^[~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/]$/
+// for (let i = 0, arr = specialChar.split(''); i < arr.length; i++) {
+//   const char = arr[i]
+//   if (!specialCharRegExp.test(char)) {
+//     throw new Error('check special character error: ' + char)
+//   }
+// }
+
+// 密码强度表达式
+const passwordRules = {
+  // 密码必须包含大小写字母、数字和特殊符号
+  super: /^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/])[0-9a-zA-Z~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/]{8,16}$/,
+  // 密码必须包含字母、数字和特殊符号
+  strong: /^(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/])[0-9a-zA-Z~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/]{8,16}$/,
+  // 密码必须为字母、数字和特殊符号任意两种的组合
+  medium: /^(?![0-9]+$)(?![a-zA-Z]+$)(?![~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/]+$)[0-9a-zA-Z~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/]{8,16}$/,
+  // 密码必须包含字母和数字
+  weak: /^(?=.*[0-9])(?=.*[a-zA-Z])[0-9a-zA-Z~!@#$%^&*_\-+=`|\\(){}[\]:;"'<>,.?/]{6,16}$/
+}
+
+function createPasswordVerifier ({
+  passwordStrength = 'medium'
+} = {}) {
+  return function (password) {
+    const passwordRegExp = passwordRules[passwordStrength]
+    if (!passwordRegExp) {
+      throw new Error('Invalid password strength config: ' + passwordStrength)
+    }
+    const errCode = ERROR.INVALID_PASSWORD
+    if (!isValidString(password)) {
+      return {
+        errCode
+      }
+    }
+    if (!passwordRegExp.test(password)) {
+      return {
+        errCode: errCode + '-' + passwordStrength
+      }
+    }
+  }
+}
+
+class Validator {
+  constructor ({
+    passwordStrength = 'medium'
+  } = {}) {
+    this.baseValidator = baseValidator
+    this.customValidator = Object.create(null)
+    this.mixin(
+      'password',
+      createPasswordVerifier({
+        passwordStrength
+      })
+    )
+  }
+
+  mixin (type, handler) {
+    this.customValidator[type] = handler
+  }
+
+  getRealBaseValidator (type) {
+    return this.customValidator[type] || this.baseValidator[type]
+  }
+
+  get validator () {
+    return new Proxy({}, {
+      get: (_, prop) => {
+        if (typeof prop !== 'string') {
+          return
+        }
+        const realBaseValidator = this.getRealBaseValidator(prop)
+        if (realBaseValidator) {
+          return realBaseValidator
+        }
+        const rule = parseValidatorName(prop)
+        return function (val) {
+          if (!isMatchUnionType(val, rule)) {
+            return {
+              errCode: ERROR.INVALID_PARAM
+            }
+          }
+        }
+      }
+    })
+  }
+
+  validate (value = {}, schema = {}) {
+    for (const schemaKey in schema) {
+      let schemaValue = schema[schemaKey]
+      if (getType(schemaValue) === 'string') {
+        schemaValue = {
+          required: true,
+          type: schemaValue
+        }
+      }
+      const {
+        required,
+        type
+      } = schemaValue
+      // value内未传入了schemaKey或对应值为undefined
+      if (value[schemaKey] === undefined) {
+        if (required) {
+          return {
+            errCode: ERROR.PARAM_REQUIRED,
+            errMsgValue: {
+              param: schemaKey
+            },
+            schemaKey
+          }
+        } else {
+          continue
+        }
+      }
+      const validateMethod = this.validator[type]
+      if (!validateMethod) {
+        throw new Error(`invalid schema type: ${type}`)
+      }
+      const validateRes = validateMethod(value[schemaKey])
+      if (validateRes) {
+        validateRes.schemaKey = schemaKey
+        return validateRes
+      }
+    }
+  }
+}
+
+function checkClientInfo (clientInfo) {
+  const stringNotRequired = {
+    required: false,
+    type: 'string'
+  }
+  const numberNotRequired = {
+    required: false,
+    type: 'number'
+  }
+  const numberOrStringNotRequired = {
+    required: false,
+    type: 'number|string'
+  }
+  const schema = {
+    uniPlatform: 'string',
+    appId: 'string',
+    deviceId: stringNotRequired,
+    osName: stringNotRequired,
+    locale: stringNotRequired,
+    clientIP: stringNotRequired,
+    appName: stringNotRequired,
+    appVersion: stringNotRequired,
+    appVersionCode: numberOrStringNotRequired,
+    channel: numberOrStringNotRequired,
+    userAgent: stringNotRequired,
+    uniIdToken: stringNotRequired,
+    deviceBrand: stringNotRequired,
+    deviceModel: stringNotRequired,
+    osVersion: stringNotRequired,
+    osLanguage: stringNotRequired,
+    osTheme: stringNotRequired,
+    romName: stringNotRequired,
+    romVersion: stringNotRequired,
+    devicePixelRatio: numberNotRequired,
+    windowWidth: numberNotRequired,
+    windowHeight: numberNotRequired,
+    screenWidth: numberNotRequired,
+    screenHeight: numberNotRequired
+  }
+  const validateRes = new Validator().validate(clientInfo, schema)
+  if (validateRes) {
+    if (validateRes.errCode === ERROR.PARAM_REQUIRED) {
+      console.warn('- 如果使用HBuilderX运行本地云函数/云对象功能时出现此提示，请改为使用客户端调用本地云函数方式调试，或更新HBuilderX到3.4.12及以上版本。\n- 如果是缺少clientInfo.appId，请检查项目manifest.json内是否配置了DCloud AppId')
+      throw new Error(`"clientInfo.${validateRes.schemaKey}" is required.`)
+    } else {
+      throw new Error(`Invalid client info: clienInfo.${validateRes.schemaKey}`)
+    }
+  }
+}
+
+module.exports = {
+  Validator,
+  checkClientInfo
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..ce5b02df071216ab42fc79cec697dee2d5a2d050
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/config/permission.js
@@ -0,0 +1,63 @@
+// 各接口权限配置，未配置接口表示允许任何用户访问（包括未登录用户）
+module.exports = {
+  // 管理接口
+  addUser: {
+    // auth: true // 已登录用户方可操作，配置角色或权限时此项可不写
+    role: ['admin'] // 允许进行此操作的角色，包含任一角色均可操作。
+    // permission: [] // 允许进行此操作的权限，包含任一权限均可操作。
+    // 权限角色均配置时，用户拥有任一权限或任一角色均可操作
+  },
+  authorizeAppLogin: {
+    role: ['admin']
+  },
+  removeAuthorizedApp: {
+    role: ['admin']
+  },
+  setAuthorizedApp: {
+    role: ['admin']
+  },
+
+  // 用户接口
+  closeAccount: {
+    auth: true
+  },
+  updatePwd: {
+    auth: true
+  },
+  logout: {
+    auth: true
+  },
+  bindMobileBySms: {
+    auth: true
+  },
+  bindMobileByUniverify: {
+    auth: true
+  },
+  bindMobileByMpWeixin: {
+    auth: true
+  },
+  bindAlipay: {
+    auth: true
+  },
+  bindApple: {
+    auth: true
+  },
+  bindQQ: {
+    auth: true
+  },
+  bindWeixin: {
+    auth: true
+  },
+  acceptInvite: {
+    auth: true
+  },
+  getInvitedUser: {
+    auth: true
+  },
+  setPushCid: {
+    auth: true
+  },
+  getAccountInfo: {
+    auth: true
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..2ee707321e28f66e204b8c44f8c32e4347a56959
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js
@@ -0,0 +1,493 @@
+const uniIdCommon = require('uni-id-common')
+const uniCaptcha = require('uni-captcha')
+const {
+  getType
+} = require('./common/utils')
+const {
+  checkClientInfo,
+  Validator
+} = require('./common/validator')
+const ConfigUtils = require('./lib/utils/config')
+const {
+  isUniIdError
+} = require('./common/error')
+const middleware = require('./middleware/index')
+
+const {
+  registerAdmin,
+  registerUser
+} = require('./module/register/index')
+const {
+  addUser
+} = require('./module/admin/index')
+const {
+  login,
+  loginBySms,
+  loginByUniverify,
+  loginByWeixin,
+  loginByAlipay,
+  loginByQQ,
+  loginByApple
+} = require('./module/login/index')
+const {
+  logout
+} = require('./module/logout/index')
+const {
+  bindMobileBySms,
+  bindMobileByUniverify,
+  bindMobileByMpWeixin,
+  bindAlipay,
+  bindApple,
+  bindQQ,
+  bindWeixin
+} = require('./module/relate/index')
+const {
+  updatePwd,
+  resetPwdBySms,
+  closeAccount,
+  getAccountInfo
+} = require('./module/account/index')
+const {
+  createCaptcha,
+  refreshCaptcha,
+  sendSmsCode
+} = require('./module/verify/index')
+const {
+  refreshToken,
+  setPushCid
+} = require('./module/utils/index')
+const {
+  getInvitedUser,
+  acceptInvite
+} = require('./module/fission')
+const {
+  authorizeAppLogin,
+  removeAuthorizedApp,
+  setAuthorizedApp
+} = require('./module/multi-end')
+const {
+  getSupportedLoginType
+} = require('./module/dev/index')
+
+module.exports = {
+  async _before() {
+    const clientInfo = this.getClientInfo()
+    /**
+     * 检查clientInfo，无appId和uniPlatform时本云对象无法正常运行
+     * 此外需要保证用到的clientInfo字段均经过类型检查
+     * clientInfo由客户端上传并非完全可信，clientInfo内除clientIP、userAgent、source外均为客户端上传参数
+     * 否则可能会出现一些意料外的情况
+     */
+    checkClientInfo(clientInfo)
+    let clientPlatform = clientInfo.uniPlatform
+    // 统一platform名称
+    switch (clientPlatform) {
+      case 'app':
+      case 'app-plus':
+        clientPlatform = 'app'
+        break
+      case 'web':
+      case 'h5':
+        clientPlatform = 'web'
+        break
+      default:
+        break
+    }
+
+    this.clientPlatform = clientPlatform
+
+    // 挂载uni-id实例到this上，方便后续调用
+    this.uniIdCommon = uniIdCommon.createInstance({
+      clientInfo
+    })
+
+    // 包含uni-id配置合并等功能的工具集
+    this.configUtils = new ConfigUtils({
+      context: this
+    })
+    this.config = this.configUtils.getPlatformConfig()
+    this.hooks = this.configUtils.getHooks()
+
+    this.validator = new Validator({
+      passwordStrength: this.config.passwordStrength || 'medium'
+    })
+    /**
+     * 示例：覆盖密码验证规则
+     */
+    // this.validator.mixin('password', function (password) {
+    //   if (typeof password !== 'string' || password.length < 10) {
+    //     // 调整为密码长度不能小于10
+    //     return {
+    //       errCode: ERROR.INVALID_PASSWORD
+    //     }
+    //   }
+    // })
+    /**
+     * 示例：新增验证规则
+     */
+    // this.validator.mixin('timestamp', function (timestamp) {
+    //   if (typeof timestamp !== 'number' || timestamp > Date.now()) {
+    //     return {
+    //       errCode: ERROR.INVALID_PARAM
+    //     }
+    //   }
+    // })
+    // // 新增规则同样可以在数组验证规则中使用
+    // this.validator.valdate({
+    //   timestamp: 123456789
+    // }, {
+    //   timestamp: 'timestamp'
+    // })
+    // this.validator.valdate({
+    //   timestampList: [123456789, 123123123123]
+    // }, {
+    //   timestampList: 'array<timestamp>'
+    // })
+    // // 甚至更复杂的写法
+    // this.validator.valdate({
+    //   timestamp: [123456789, 123123123123]
+    // }, {
+    //   timestamp: 'timestamp|array<timestamp>'
+    // })
+
+    // 挂载uni-captcha到this上，方便后续调用
+    this.uniCaptcha = uniCaptcha
+    Object.defineProperty(this, 'uniOpenBridge', {
+      get() {
+        return require('uni-open-bridge-common')
+      }
+    })
+
+    // 挂载中间件
+    this.middleware = {}
+    for (const mwName in middleware) {
+      this.middleware[mwName] = middleware[mwName].bind(this)
+    }
+
+    // 国际化
+    const i18n = uniCloud.initI18n({
+      locale: clientInfo.locale,
+      fallbackLocale: 'zh-Hans',
+      messages: require('./lang/index')
+    })
+    this.t = i18n.t.bind(i18n)
+
+    this.response = {}
+
+    // 通用权限校验模块
+    await this.middleware.accessControl()
+  },
+  _after(error, result) {
+    if (error) {
+      // 处理中间件内抛出的标准响应对象
+      if (error.errCode && getType(error) === 'object') {
+        const errCode = error.errCode
+        if (!isUniIdError(errCode)) {
+          return error
+        }
+        return {
+          errCode,
+          errMsg: error.errMsg || this.t(errCode, error.errMsgValue)
+        }
+      }
+      throw error
+    }
+    return Object.assign(this.response, result)
+  },
+  /**
+   * 注册管理员
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#register-admin
+   * @param {Object} params
+   * @param {String} params.username   用户名
+   * @param {String} params.password   密码
+   * @param {String} params.nickname   昵称
+   * @returns
+   */
+  registerAdmin,
+  /**
+   * 新增用户
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#add-user
+   * @param {Object}  params
+   * @param {String}  params.username       用户名
+   * @param {String}  params.password       密码
+   * @param {String}  params.nickname       昵称
+   * @param {Array}   params.authorizedApp  允许登录的AppID列表
+   * @param {Array}   params.role           用户角色列表
+   * @returns
+   */
+  addUser,
+  /**
+   * 授权用户登录应用
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#authorize-app-login
+   * @param {Object} params
+   * @param {String} params.uid   用户id
+   * @param {String} params.appId 授权的应用的AppId
+   * @returns
+   */
+  authorizeAppLogin,
+  /**
+   * 移除用户登录授权
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#remove-authorized-app
+   * @param {Object} params
+   * @param {String} params.uid   用户id
+   * @param {String} params.appId 取消授权的应用的AppId
+   * @returns
+   */
+  removeAuthorizedApp,
+  /**
+   * 设置用户允许登录的应用列表
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#set-authorized-app
+   * @param {Object} params
+   * @param {String} params.uid       用户id
+   * @param {Array} params.appIdList 允许登录的应用AppId列表
+   * @returns
+   */
+  setAuthorizedApp,
+  /**
+   * 注册普通用户
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#register-user
+   * @param {Object} params
+   * @param {String} params.username    用户名
+   * @param {String} params.password    密码
+   * @param {String} params.captcha     图形验证码
+   * @param {String} params.nickname    昵称
+   * @param {String} params.inviteCode  邀请码
+   * @returns
+   */
+  registerUser,
+  /**
+   * 用户名密码登录
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login
+   * @param {Object} params
+   * @param {String} params.username  用户名
+   * @param {String} params.mobile    手机号
+   * @param {String} params.email     邮箱
+   * @param {String} params.password  密码
+   * @param {String} params.captcha   图形验证码
+   * @returns
+   */
+  login,
+  /**
+   * 短信验证码登录
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-sms
+   * @param {Object} params
+   * @param {String} params.mobile      手机号
+   * @param {String} params.code        短信验证码
+   * @param {String} params.captcha     图形验证码
+   * @param {String} params.inviteCode  邀请码
+   * @returns
+   */
+  loginBySms,
+  /**
+   * App端一键登录
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-univerify
+   * @param {Object} params
+   * @param {String} params.access_token  APP端一键登录返回的access_token
+   * @param {String} params.openid        APP端一键登录返回的openid
+   * @param {String} params.inviteCode    邀请码
+   * @returns
+   */
+  loginByUniverify,
+  /**
+   * 微信登录
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin
+   * @param {Object} params
+   * @param {String} params.code          微信登录返回的code
+   * @param {String} params.inviteCode    邀请码
+   * @returns
+   */
+  loginByWeixin,
+  /**
+   * 支付宝登录
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-alipay
+   * @param {Object} params
+   * @param {String} params.code        支付宝小程序客户端登录返回的code
+   * @param {String} params.inviteCode  邀请码
+   * @returns
+   */
+  loginByAlipay,
+  /**
+   * QQ登录
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-qq
+   * @param {Object} params
+   * @param {String} params.code                  QQ小程序登录返回的code参数
+   * @param {String} params.accessToken           App端QQ登录返回的accessToken参数
+   * @param {String} params.accessTokenExpired    accessToken过期时间，由App端QQ登录返回的expires_in参数计算而来，单位：毫秒
+   * @param {String} params.inviteCode            邀请码
+   * @returns
+   */
+  loginByQQ,
+  /**
+   * 苹果登录
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-apple
+   * @param {Object} params
+   * @param {String} params.identityToken 苹果登录返回的identityToken
+   * @param {String} params.nickname      用户昵称
+   * @param {String} params.inviteCode    邀请码
+   * @returns
+   */
+  loginByApple,
+  /**
+   * 用户退出登录
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#logout
+   * @returns
+   */
+  logout,
+  /**
+   * 通过短信验证码绑定手机号
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-sms
+   * @param {Object} params
+   * @param {String} params.mobile    手机号
+   * @param {String} params.code      短信验证码
+   * @param {String} params.captcha   图形验证码
+   * @returns
+   */
+  bindMobileBySms,
+  /**
+   * 通过一键登录绑定手机号
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-univerify
+   * @param {Object} params
+   * @param {String} params.openid        APP端一键登录返回的openid
+   * @param {String} params.access_token  APP端一键登录返回的access_token
+   * @returns
+   */
+  bindMobileByUniverify,
+  /**
+   * 通过微信绑定手机号
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-mp-weixin
+   * @param {Object} params
+   * @param {String} params.encryptedData   微信获取手机号返回的加密信息
+   * @param {String} params.iv              微信获取手机号返回的初始向量
+   * @returns
+   */
+  bindMobileByMpWeixin,
+  /**
+   * 绑定微信
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-weixin
+   * @param {Object} params
+   * @param {String} params.code  微信登录返回的code
+   * @returns
+   */
+  bindWeixin,
+  /**
+   * 绑定QQ
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-qq
+   * @param {Object} params
+   * @param {String} params.code          小程序端QQ登录返回的code
+   * @param {String} params.accessToken   APP端QQ登录返回的accessToken
+   * @param {String} params.accessTokenExpired    accessToken过期时间，由App端QQ登录返回的expires_in参数计算而来，单位：毫秒
+   * @returns
+   */
+  bindQQ,
+  /**
+   * 绑定支付宝账号
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-alipay
+   * @param {Object} params
+   * @param {String} params.code  支付宝小程序登录返回的code参数
+   * @returns
+   */
+  bindAlipay,
+  /**
+   * 绑定苹果账号
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-apple
+   * @param {Object} params
+   * @param {String} params.identityToken 苹果登录返回identityToken
+   * @returns
+   */
+  bindApple,
+  /**
+   * 更新密码
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#update-pwd
+   * @param {object} params
+   * @param {string} params.oldPassword 旧密码
+   * @param {string} params.newPassword 新密码
+   * @returns {object}
+   */
+  updatePwd,
+  /**
+   * 通过短信验证码重置密码
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#reset-pwd-by-sms
+   * @param {object} params
+   * @param {string} params.mobile   手机号
+   * @param {string} params.mobile   短信验证码
+   * @param {string} params.password 密码
+   * @param {string} params.captcha  图形验证码
+   * @returns {object}
+   */
+  resetPwdBySms,
+  /**
+   * 注销账户
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#close-account
+   * @returns
+   */
+  closeAccount,
+  /**
+   * 获取账户账户简略信息
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-account-info
+   */
+  getAccountInfo,
+  /**
+   * 创建图形验证码
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#create-captcha
+   * @param {Object} params
+   * @param {String} params.scene   图形验证码使用场景
+   * @returns
+   */
+  createCaptcha,
+  /**
+   * 刷新图形验证码
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#refresh-captcha
+   * @param {Object} params
+   * @param {String} params.scene   图形验证码使用场景
+   * @returns
+   */
+  refreshCaptcha,
+  /**
+   * 发送短信验证码
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#send-sms-code
+   * @param {Object} params
+   * @param {String} params.mobile    手机号
+   * @param {String} params.captcha   图形验证码
+   * @param {String} params.scene     短信验证码使用场景
+   * @returns
+   */
+  sendSmsCode,
+  /**
+   * 刷新token
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#refresh-token
+   */
+  refreshToken,
+  /**
+   * 接受邀请
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#accept-invite
+   * @param {Object} params
+   * @param {String} params.inviteCode  邀请码
+   * @returns
+   */
+  acceptInvite,
+  /**
+   * 获取受邀用户
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-invited-user
+   * @param {Object} params
+   * @param {Number} params.level       获取受邀用户的级数，1表示直接邀请的用户
+   * @param {Number} params.limit       返回数据大小
+   * @param {Number} params.offset      返回数据偏移
+   * @param {Boolean} params.needTotal  是否需要返回总数
+   * @returns
+   */
+  getInvitedUser,
+  /**
+   * 更新device表的push_clien_id
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#set-push-cid
+   * @param {object} params
+   * @param {string} params.pushClientId  客户端pushClientId
+   * @returns
+   */
+  setPushCid,
+  /**
+   * 获取支持的登录方式
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-supported-login-type
+   * @returns
+   */
+  getSupportedLoginType
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..1ef455ab1e419227ffbdfd1bdf52512659be57f4
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/en.js
@@ -0,0 +1,44 @@
+const word = {
+  login: 'login',
+  'verify-mobile': 'verify phone number'
+}
+
+const sentence = {
+  'uni-id-account-exists': 'Account exists',
+  'uni-id-account-not-exists': 'Account does not exists',
+  'uni-id-account-conflict': 'User account conflict',
+  'uni-id-account-banned': 'Account has been banned',
+  'uni-id-account-auditing': 'Account audit in progress',
+  'uni-id-account-audit-failed': 'Account audit failed',
+  'uni-id-account-closed': 'Account has been closed',
+  'uni-id-captcha-required': 'Captcha required',
+  'uni-id-password-error': 'Username or password error',
+  'uni-id-password-error-exceed-limit': 'The number of password errors is excessive',
+  'uni-id-invalid-username': 'Invalid username',
+  'uni-id-invalid-password': 'invalid password',
+  'uni-id-invalid-password-super': 'Passwords must have 8-16 characters and contain uppercase letters, lowercase letters, numbers, and symbols.',
+  'uni-id-invalid-password-strong': 'Passwords must have 8-16 characters and contain letters, numbers and symbols.',
+  'uni-id-invalid-password-medium': 'Passwords must have 8-16 characters and contain at least two of the following: letters, numbers, and symbols.',
+  'uni-id-invalid-password-weak': 'Passwords must have 6-16 characters and contain letters and numbers.',
+  'uni-id-invalid-mobile': 'Invalid mobile phone number',
+  'uni-id-invalid-email': 'Invalid email address',
+  'uni-id-invalid-nickname': 'Invalid nickname',
+  'uni-id-invalid-param': 'Invalid parameter',
+  'uni-id-param-required': 'Parameter required: {param}',
+  'uni-id-get-third-party-account-failed': 'Get third party account failed',
+  'uni-id-get-third-party-user-info-failed': 'Get third party user info failed',
+  'uni-id-mobile-verify-code-error': 'Verify code error or expired',
+  'uni-id-email-verify-code-error': 'Verify code error or expired',
+  'uni-id-admin-exists': 'Administrator exists',
+  'uni-id-permission-error': 'Permission denied',
+  'uni-id-system-error': 'System error',
+  'uni-id-set-invite-code-failed': 'Set invite code failed',
+  'uni-id-invalid-invite-code': 'Invalid invite code',
+  'uni-id-change-inviter-forbidden': 'Change inviter is not allowed',
+  'uni-id-bind-conflict': 'This account has been bound'
+}
+
+module.exports = {
+  ...word,
+  ...sentence
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..1f22998929e37bcd713a0d0b0ef31060bc1576b8
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/index.js
@@ -0,0 +1,22 @@
+let lang = {
+  'zh-Hans': require('./zh-hans'),
+  en: require('./en')
+}
+
+function mergeLanguage (lang1, lang2) {
+  const localeList = Object.keys(lang1)
+  localeList.push(...Object.keys(lang2))
+  const result = {}
+  for (let i = 0; i < localeList.length; i++) {
+    const locale = localeList[i]
+    result[locale] = Object.assign({}, lang1[locale], lang2[locale])
+  }
+  return result
+}
+
+try {
+  const langPath = require.resolve('uni-config-center/uni-id/lang/index.js')
+  lang = mergeLanguage(lang, require(langPath))
+} catch (error) { }
+
+module.exports = lang
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..5bd2443f045ab895c4a33d98ab4f22e6c697c8b4
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/zh-hans.js
@@ -0,0 +1,44 @@
+const word = {
+  login: '登录',
+  'verify-mobile': '验证手机号'
+}
+
+const sentence = {
+  'uni-id-account-exists': '此账号已注册',
+  'uni-id-account-not-exists': '此账号未注册',
+  'uni-id-account-conflict': '用户账号冲突',
+  'uni-id-account-banned': '此账号已封禁',
+  'uni-id-account-auditing': '此账号正在审核中',
+  'uni-id-account-audit-failed': '此账号审核失败',
+  'uni-id-account-closed': '此账号已注销',
+  'uni-id-captcha-required': '请输入图形验证码',
+  'uni-id-password-error': '用户名或密码错误',
+  'uni-id-password-error-exceed-limit': '密码错误次数过多，请稍后再试',
+  'uni-id-invalid-username': '用户名不合法',
+  'uni-id-invalid-password': '密码不合法',
+  'uni-id-invalid-password-super': '密码必须包含大小写字母、数字和特殊符号，长度8-16位',
+  'uni-id-invalid-password-strong': '密码必须包含字母、数字和特殊符号，长度8-16位不合法',
+  'uni-id-invalid-password-medium': '密码必须为字母、数字和特殊符号任意两种的组合，长度8-16位',
+  'uni-id-invalid-password-weak': '密码必须包含字母和数字，长度6-16位',
+  'uni-id-invalid-mobile': '手机号码不合法',
+  'uni-id-invalid-email': '邮箱不合法',
+  'uni-id-invalid-nickname': '昵称不合法',
+  'uni-id-invalid-param': '参数错误',
+  'uni-id-param-required': '缺少参数: {param}',
+  'uni-id-get-third-party-account-failed': '获取第三方账号失败',
+  'uni-id-get-third-party-user-info-failed': '获取用户信息失败',
+  'uni-id-mobile-verify-code-error': '手机验证码错误或已过期',
+  'uni-id-email-verify-code-error': '邮箱验证码错误或已过期',
+  'uni-id-admin-exists': '超级管理员已存在',
+  'uni-id-permission-error': '权限错误',
+  'uni-id-system-error': '系统错误',
+  'uni-id-set-invite-code-failed': '设置邀请码失败',
+  'uni-id-invalid-invite-code': '邀请码不可用',
+  'uni-id-change-inviter-forbidden': '禁止修改邀请人',
+  'uni-id-bind-conflict': '此账号已被绑定'
+}
+
+module.exports = {
+  ...word,
+  ...sentence
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..47d8c4c87b02177f27b712d2f1bedde53fcbc7e8
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/README.md
@@ -0,0 +1,3 @@
+# 说明
+
+此目录内为uni-id-co基础能力，不建议直接修改。如果你发现有些逻辑加入会更好，或者此部分代码有Bug可以向我们提交PR，仓库地址：[]()。如果有特殊的需求也可以在[论坛](https://ask.dcloud.net.cn/)提出，我们可以讨论下如何实现。
\ No newline at end of file
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..dbec0817811ad8e36f4745f842a30712ea672525
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/index.js
@@ -0,0 +1,16 @@
+const AlipayBase = require('../alipayBase')
+const protocols = require('./protocols')
+module.exports = class Auth extends AlipayBase {
+  constructor (options) {
+    super(options)
+    this._protocols = protocols
+  }
+
+  async code2Session (code) {
+    const result = await this._exec('alipay.system.oauth.token', {
+      grantType: 'authorization_code',
+      code
+    })
+    return result
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..cff351d830562ba14ce52482daa54f82d490b714
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/account/protocols.js
@@ -0,0 +1,10 @@
+module.exports = {
+  code2Session: {
+    // args (fromArgs) {
+    //   return fromArgs
+    // },
+    returnValue: {
+      openid: 'userId'
+    }
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..1462b046d1aae1f355a54f26c3e1739360fb2f76
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/alipay/alipayBase.js
@@ -0,0 +1,231 @@
+const {
+  camel2snakeJson,
+  snake2camelJson,
+  getOffsetDate,
+  getFullTimeStr
+} = require('../../../common/utils')
+const crypto = require('crypto')
+
+const ALIPAY_ALGORITHM_MAPPING = {
+  RSA: 'RSA-SHA1',
+  RSA2: 'RSA-SHA256'
+}
+
+module.exports = class AlipayBase {
+  constructor (options = {}) {
+    if (!options.appId) throw new Error('appId required')
+    if (!options.privateKey) throw new Error('privateKey required')
+    const defaultOptions = {
+      gateway: 'https://openapi.alipay.com/gateway.do',
+      timeout: 5000,
+      charset: 'utf-8',
+      version: '1.0',
+      signType: 'RSA2',
+      timeOffset: -new Date().getTimezoneOffset() / 60,
+      keyType: 'PKCS8'
+    }
+
+    if (options.sandbox) {
+      options.gateway = 'https://openapi.alipaydev.com/gateway.do'
+    }
+
+    this.options = Object.assign({}, defaultOptions, options)
+
+    const privateKeyType =
+      this.options.keyType === 'PKCS8' ? 'PRIVATE KEY' : 'RSA PRIVATE KEY'
+
+    this.options.privateKey = this._formatKey(
+      this.options.privateKey,
+      privateKeyType
+    )
+    if (this.options.alipayPublicKey) {
+      this.options.alipayPublicKey = this._formatKey(
+        this.options.alipayPublicKey,
+        'PUBLIC KEY'
+      )
+    }
+  }
+
+  _formatKey (key, type) {
+    return `-----BEGIN ${type}-----\n${key}\n-----END ${type}-----`
+  }
+
+  _formatUrl (url, params) {
+    let requestUrl = url
+    // 需要放在 url 中的参数列表
+    const urlArgs = [
+      'app_id',
+      'method',
+      'format',
+      'charset',
+      'sign_type',
+      'sign',
+      'timestamp',
+      'version',
+      'notify_url',
+      'return_url',
+      'auth_token',
+      'app_auth_token'
+    ]
+
+    for (const key in params) {
+      if (urlArgs.indexOf(key) > -1) {
+        const val = encodeURIComponent(params[key])
+        requestUrl = `${requestUrl}${requestUrl.includes('?') ? '&' : '?'
+          }${key}=${val}`
+        // 删除 postData 中对应的数据
+        delete params[key]
+      }
+    }
+
+    return { execParams: params, url: requestUrl }
+  }
+
+  _getSign (method, params) {
+    const bizContent = params.bizContent || null
+    delete params.bizContent
+
+    const signParams = Object.assign({
+      method,
+      appId: this.options.appId,
+      charset: this.options.charset,
+      version: this.options.version,
+      signType: this.options.signType,
+      timestamp: getFullTimeStr(getOffsetDate(this.options.timeOffset))
+    }, params)
+
+    if (bizContent) {
+      signParams.bizContent = JSON.stringify(camel2snakeJson(bizContent))
+    }
+
+    // params key 驼峰转下划线
+    const decamelizeParams = camel2snakeJson(signParams)
+
+    // 排序
+    const signStr = Object.keys(decamelizeParams)
+      .sort()
+      .map((key) => {
+        let data = decamelizeParams[key]
+        if (Array.prototype.toString.call(data) !== '[object String]') {
+          data = JSON.stringify(data)
+        }
+        return `${key}=${data}`
+      })
+      .join('&')
+
+    // 计算签名
+    const sign = crypto
+      .createSign(ALIPAY_ALGORITHM_MAPPING[this.options.signType])
+      .update(signStr, 'utf8')
+      .sign(this.options.privateKey, 'base64')
+
+    return Object.assign(decamelizeParams, { sign })
+  }
+
+  async _exec (method, params = {}, option = {}) {
+    // 计算签名
+    const signData = this._getSign(method, params)
+    const { url, execParams } = this._formatUrl(this.options.gateway, signData)
+    const { status, data } = await uniCloud.httpclient.request(url, {
+      method: 'POST',
+      data: execParams,
+      // 按 text 返回（为了验签）
+      dataType: 'text',
+      timeout: this.options.timeout
+    })
+    if (status !== 200) throw new Error('request fail')
+    /**
+     * 示例响应格式
+     * {"alipay_trade_precreate_response":
+     *  {"code": "10000","msg": "Success","out_trade_no": "111111","qr_code": "https:\/\/"},
+     *  "sign": "abcde="
+     * }
+     * 或者
+     * {"error_response":
+     *  {"code":"40002","msg":"Invalid Arguments","sub_code":"isv.code-invalid","sub_msg":"授权码code无效"},
+     * }
+     */
+    const result = JSON.parse(data)
+    const responseKey = `${method.replace(/\./g, '_')}_response`
+    const response = result[responseKey]
+    const errorResponse = result.error_response
+    if (response) {
+      // 按字符串验签
+      const validateSuccess = option.validateSign ? this._checkResponseSign(data, responseKey) : true
+      if (validateSuccess) {
+        if (!response.code || response.code === '10000') {
+          const errCode = 0
+          const errMsg = response.msg || ''
+          return {
+            errCode,
+            errMsg,
+            ...snake2camelJson(response)
+          }
+        }
+        const msg = response.sub_code ? `${response.sub_code} ${response.sub_msg}` : `${response.msg || 'unkonwn error'}`
+        throw new Error(msg)
+      } else {
+        throw new Error('check sign error')
+      }
+    } else if (errorResponse) {
+      throw new Error(errorResponse.sub_msg || errorResponse.msg || 'request fail')
+    }
+
+    throw new Error('request fail')
+  }
+
+  _checkResponseSign (signStr, responseKey) {
+    if (!this.options.alipayPublicKey || this.options.alipayPublicKey === '') {
+      console.warn('options.alipayPublicKey is empty')
+      // 支付宝公钥不存在时不做验签
+      return true
+    }
+
+    // 带验签的参数不存在时返回失败
+    if (!signStr) { return false }
+
+    // 根据服务端返回的结果截取需要验签的目标字符串
+    const validateStr = this._getSignStr(signStr, responseKey)
+    // 服务端返回的签名
+    const serverSign = JSON.parse(signStr).sign
+
+    // 参数存在，并且是正常的结果（不包含 sub_code）时才验签
+    const verifier = crypto.createVerify(ALIPAY_ALGORITHM_MAPPING[this.options.signType])
+    verifier.update(validateStr, 'utf8')
+    return verifier.verify(this.options.alipayPublicKey, serverSign, 'base64')
+  }
+
+  _getSignStr (originStr, responseKey) {
+    // 待签名的字符串
+    let validateStr = originStr.trim()
+    // 找到 xxx_response 开始的位置
+    const startIndex = originStr.indexOf(`${responseKey}"`)
+    // 找到最后一个 “"sign"” 字符串的位置（避免）
+    const lastIndex = originStr.lastIndexOf('"sign"')
+
+    /**
+     * 删除 xxx_response 及之前的字符串
+     * 假设原始字符串为
+     *  {"xxx_response":{"code":"10000"},"sign":"jumSvxTKwn24G5sAIN"}
+     * 删除后变为
+     *  :{"code":"10000"},"sign":"jumSvxTKwn24G5sAIN"}
+     */
+    validateStr = validateStr.substr(startIndex + responseKey.length + 1)
+
+    /**
+     * 删除最后一个 "sign" 及之后的字符串
+     * 删除后变为
+     *  :{"code":"10000"},
+     * {} 之间就是待验签的字符串
+     */
+    validateStr = validateStr.substr(0, lastIndex)
+
+    // 删除第一个 { 之前的任何字符
+    validateStr = validateStr.replace(/^[^{]*{/g, '{')
+
+    // 删除最后一个 } 之后的任何字符
+    validateStr = validateStr.replace(/\}([^}]*)$/g, '}')
+
+    return validateStr
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..0e51b4dab2e2653d95d043f6cfa29717e7c24dcb
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/account/index.js
@@ -0,0 +1,76 @@
+const rsaPublicKeyPem = require('../rsa-public-key-pem')
+let authKeysCache = null
+
+module.exports = class Auth {
+  constructor (options) {
+    this.options = Object.assign({
+      baseUrl: 'https://appleid.apple.com',
+      timeout: 10000
+    }, options)
+  }
+
+  async _fetch (url, options) {
+    const { baseUrl } = this.options
+    return uniCloud.httpclient.request(baseUrl + url, options)
+  }
+
+  async verifyIdentityToken (identityToken) {
+    // 解密出kid，拿取key
+    const jwtHeader = identityToken.split('.')[0]
+    const { kid } = JSON.parse(Buffer.from(jwtHeader, 'base64').toString())
+    let authKeys
+    if (authKeysCache) {
+      authKeys = authKeysCache
+    } else {
+      authKeys = await this.getAuthKeys()
+      authKeysCache = authKeys
+    }
+    const usedKey = authKeys.find(item => item.kid === kid)
+
+    /**
+     * identityToken 格式
+     *
+     * {
+     *   iss: 'https://appleid.apple.com',
+     *   aud: 'io.dcloud.hellouniapp',
+     *   exp: 1610626724,
+     *   iat: 1610540324,
+     *   sub: '000628.30119d332d9b45a3be4a297f9391fd5c.0403',
+     *   c_hash: 'oFfgewoG36cJX00KUbj45A',
+     *   email: 'x2awmap99s@privaterelay.appleid.com',
+     *   email_verified: 'true',
+     *   is_private_email: 'true',
+     *   auth_time: 1610540324,
+     *   nonce_supported: true
+     * }
+     */
+    const payload = require('jsonwebtoken').verify(
+      identityToken,
+      rsaPublicKeyPem(usedKey.n, usedKey.e),
+      {
+        algorithms: usedKey.alg
+      }
+    )
+
+    if (payload.iss !== 'https://appleid.apple.com' || payload.aud !== this.options.bundleId) {
+      throw new Error('Invalid identity token')
+    }
+
+    return {
+      openid: payload.sub,
+      email: payload.email,
+      emailVerified: payload.email_verified === 'true',
+      isPrivateEmail: payload.is_private_email === 'true'
+    }
+  }
+
+  async getAuthKeys () {
+    const { status, data } = await this._fetch('/auth/keys', {
+      method: 'GET',
+      dataType: 'json',
+      timeout: this.options.timeout
+    })
+    if (status !== 200) throw new Error('request https://appleid.apple.com/auth/keys fail')
+    return data.keys
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..e1dbb31db3894f81838a843ec667cda09ec9f23b
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/rsa-public-key-pem.js
@@ -0,0 +1,64 @@
+// http://stackoverflow.com/questions/18835132/xml-to-pem-in-node-js
+/* eslint-disable camelcase */
+function rsaPublicKeyPem (modulus_b64, exponent_b64) {
+  const modulus = Buffer.from(modulus_b64, 'base64')
+  const exponent = Buffer.from(exponent_b64, 'base64')
+
+  let modulus_hex = modulus.toString('hex')
+  let exponent_hex = exponent.toString('hex')
+
+  modulus_hex = prepadSigned(modulus_hex)
+  exponent_hex = prepadSigned(exponent_hex)
+
+  const modlen = modulus_hex.length / 2
+  const explen = exponent_hex.length / 2
+
+  const encoded_modlen = encodeLengthHex(modlen)
+  const encoded_explen = encodeLengthHex(explen)
+  const encoded_pubkey = '30' +
+    encodeLengthHex(
+      modlen +
+      explen +
+      encoded_modlen.length / 2 +
+      encoded_explen.length / 2 + 2
+    ) +
+    '02' + encoded_modlen + modulus_hex +
+    '02' + encoded_explen + exponent_hex
+
+  const der_b64 = Buffer.from(encoded_pubkey, 'hex').toString('base64')
+
+  const pem = '-----BEGIN RSA PUBLIC KEY-----\n' +
+    der_b64.match(/.{1,64}/g).join('\n') +
+    '\n-----END RSA PUBLIC KEY-----\n'
+
+  return pem
+}
+
+function prepadSigned (hexStr) {
+  const msb = hexStr[0]
+  if (msb < '0' || msb > '7') {
+    return '00' + hexStr
+  } else {
+    return hexStr
+  }
+}
+
+function toHex (number) {
+  const nstr = number.toString(16)
+  if (nstr.length % 2) return '0' + nstr
+  return nstr
+}
+
+// encode ASN.1 DER length field
+// if <=127, short form
+// if >=128, long form
+function encodeLengthHex (n) {
+  if (n <= 127) return toHex(n)
+  else {
+    const n_hex = toHex(n)
+    const length_of_length_byte = 128 + n_hex.length / 2 // 0x80+numbytes
+    return toHex(length_of_length_byte) + n_hex
+  }
+}
+
+module.exports = rsaPublicKeyPem
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..149c7de99cc214c10976e9728efd3b2f7f8a73f5
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/index.js
@@ -0,0 +1,36 @@
+const WxAccount = require('./weixin/account/index')
+const QQAccount = require('./qq/account/index')
+const AliAccount = require('./alipay/account/index')
+const AppleAccount = require('./apple/account/index')
+
+const createApi = require('./share/create-api')
+
+module.exports = {
+  initWeixin: function () {
+    const oauthConfig = this.configUtils.getOauthConfig({ provider: 'weixin' })
+    return createApi(WxAccount, {
+      appId: oauthConfig.appid,
+      secret: oauthConfig.appsecret
+    })
+  },
+  initQQ: function () {
+    const oauthConfig = this.configUtils.getOauthConfig({ provider: 'qq' })
+    return createApi(QQAccount, {
+      appId: oauthConfig.appid,
+      secret: oauthConfig.appsecret
+    })
+  },
+  initAlipay: function () {
+    const oauthConfig = this.configUtils.getOauthConfig({ provider: 'alipay' })
+    return createApi(AliAccount, {
+      appId: oauthConfig.appid,
+      privateKey: oauthConfig.privateKey
+    })
+  },
+  initApple: function () {
+    const oauthConfig = this.configUtils.getOauthConfig({ provider: 'apple' })
+    return createApi(AppleAccount, {
+      bundleId: oauthConfig.bundleId
+    })
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..9b4879a0e1481e296f56425900278cf607bb59a0
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/account/index.js
@@ -0,0 +1,97 @@
+const {
+  UniCloudError
+} = require('../../../../common/error')
+const {
+  resolveUrl
+} = require('../../../../common/utils')
+const {
+  callQQOpenApi
+} = require('../normalize')
+
+module.exports = class Auth {
+  constructor (options) {
+    this.options = Object.assign({
+      baseUrl: 'https://graph.qq.com',
+      timeout: 5000
+    }, options)
+  }
+
+  async _requestQQOpenapi ({ name, url, data, options }) {
+    const defaultOptions = {
+      method: 'GET',
+      dataType: 'json',
+      dataAsQueryString: true,
+      timeout: this.options.timeout
+    }
+    const result = await callQQOpenApi({
+      name: `auth.${name}`,
+      url: resolveUrl(this.options.baseUrl, url),
+      data,
+      options,
+      defaultOptions
+    })
+    return result
+  }
+
+  async getUserInfo ({
+    accessToken,
+    openid
+  } = {}) {
+    const url = '/user/get_user_info'
+    const result = await this._requestQQOpenapi({
+      name: 'getUserInfo',
+      url,
+      data: {
+        oauthConsumerKey: this.options.appId,
+        accessToken,
+        openid
+      }
+    })
+    return {
+      nickname: result.nickname,
+      avatar: result.figureurl_qq_1
+    }
+  }
+
+  async getOpenidByToken ({
+    accessToken
+  } = {}) {
+    const url = '/oauth2.0/me'
+    const result = await this._requestQQOpenapi({
+      name: 'getOpenidByToken',
+      url,
+      data: {
+        accessToken,
+        unionid: 1,
+        fmt: 'json'
+      }
+    })
+    if (result.clientId !== this.options.appId) {
+      throw new UniCloudError({
+        code: 'APPID_NOT_MATCH',
+        message: 'appid not match'
+      })
+    }
+    return {
+      openid: result.openid,
+      unionid: result.unionid
+    }
+  }
+
+  async code2Session ({
+    code
+  } = {}) {
+    const url = 'https://api.q.qq.com/sns/jscode2session'
+    const result = await this._requestQQOpenapi({
+      name: 'getOpenidByToken',
+      url,
+      data: {
+        grant_type: 'authorization_code',
+        appid: this.options.appId,
+        secret: this.options.secret,
+        js_code: code
+      }
+    })
+    return result
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/account/protocol.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/account/protocol.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..fcfdc1ef87ae27e8c3308fcf82d5cdb1404df89c
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/qq/normalize.js
@@ -0,0 +1,85 @@
+const {
+  UniCloudError
+} = require('../../../common/error')
+const {
+  camel2snakeJson,
+  snake2camelJson
+} = require('../../../common/utils')
+
+function generateApiResult (apiName, data) {
+  if (data.ret || data.error) {
+    // 这三种都是qq的错误码规范
+    const code = data.ret || data.error || data.errcode || -2
+    const message = data.msg || data.error_description || data.errmsg || `${apiName} fail`
+    throw new UniCloudError({
+      code,
+      message
+    })
+  } else {
+    delete data.ret
+    delete data.msg
+    delete data.error
+    delete data.error_description
+    delete data.errcode
+    delete data.errmsg
+    return {
+      ...data,
+      errMsg: `${apiName} ok`,
+      errCode: 0
+    }
+  }
+}
+
+function nomalizeError (apiName, error) {
+  throw new UniCloudError({
+    code: error.code || -2,
+    message: error.message || `${apiName} fail`
+  })
+}
+
+async function callQQOpenApi ({
+  name,
+  url,
+  data,
+  options,
+  defaultOptions
+}) {
+  options = Object.assign({}, defaultOptions, options, { data: camel2snakeJson(Object.assign({}, data)) })
+  let result
+  try {
+    result = await uniCloud.httpclient.request(url, options)
+  } catch (e) {
+    return nomalizeError(name, e)
+  }
+  let resData = result.data
+  const contentType = result.headers['content-type']
+  if (
+    Buffer.isBuffer(resData) &&
+    (contentType.indexOf('text/plain') === 0 ||
+      contentType.indexOf('application/json') === 0)
+  ) {
+    try {
+      resData = JSON.parse(resData.toString())
+    } catch (e) {
+      resData = resData.toString()
+    }
+  } else if (Buffer.isBuffer(resData)) {
+    resData = {
+      buffer: resData,
+      contentType
+    }
+  }
+  return snake2camelJson(
+    generateApiResult(
+      name,
+      resData || {
+        errCode: -2,
+        errMsg: 'Request failed'
+      }
+    )
+  )
+}
+
+module.exports = {
+  callQQOpenApi
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..c58f1e8dbe1581767d15ffc6f141f5c8c63d4c8c
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/share/create-api.js
@@ -0,0 +1,73 @@
+const {
+  isFn,
+  isPlainObject
+} = require('../../../common/utils')
+
+// 注意：不进行递归处理
+function parseParams (params = {}, rule) {
+  if (!rule || !params) {
+    return params
+  }
+  const internalKeys = ['_pre', '_purify', '_post']
+  // 转换之前的处理
+  if (rule._pre) {
+    params = rule._pre(params)
+  }
+  // 净化参数
+  let purify = { shouldDelete: new Set([]) }
+  if (rule._purify) {
+    const _purify = rule._purify
+    for (const purifyKey in _purify) {
+      _purify[purifyKey] = new Set(_purify[purifyKey])
+    }
+    purify = Object.assign(purify, _purify)
+  }
+  if (isPlainObject(rule)) {
+    for (const key in rule) {
+      const parser = rule[key]
+      if (isFn(parser) && internalKeys.indexOf(key) === -1) {
+        params[key] = parser(params)
+      } else if (typeof parser === 'string' && internalKeys.indexOf(key) === -1) {
+        // 直接转换属性名称的删除旧属性名
+        params[key] = params[parser]
+        purify.shouldDelete.add(parser)
+      }
+    }
+  } else if (isFn(rule)) {
+    params = rule(params)
+  }
+
+  if (purify.shouldDelete) {
+    for (const item of purify.shouldDelete) {
+      delete params[item]
+    }
+  }
+
+  // 转换之后的处理
+  if (rule._post) {
+    params = rule._post(params)
+  }
+
+  return params
+}
+
+function createApi (ApiClass, options) {
+  const apiInstance = new ApiClass(options)
+  return new Proxy(apiInstance, {
+    get: function (obj, prop) {
+      if (typeof obj[prop] === 'function' && prop.indexOf('_') !== 0 && obj._protocols && obj._protocols[prop]) {
+        const protocol = obj._protocols[prop]
+        return async function (params) {
+          params = parseParams(params, protocol.args)
+          let result = await obj[prop](params)
+          result = parseParams(result, protocol.returnValue)
+          return result
+        }
+      } else {
+        return obj[prop]
+      }
+    }
+  })
+}
+
+module.exports = createApi
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..5fafc78e2869937b7ea83579f7eff2cd21b55b82
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/account/index.js
@@ -0,0 +1,89 @@
+const {
+  callWxOpenApi,
+  buildUrl
+} = require('../normalize')
+
+module.exports = class Auth {
+  constructor (options) {
+    this.options = Object.assign({
+      baseUrl: 'https://api.weixin.qq.com',
+      timeout: 5000
+    }, options)
+  }
+
+  async _requestWxOpenapi ({ name, url, data, options }) {
+    const defaultOptions = {
+      method: 'GET',
+      dataType: 'json',
+      dataAsQueryString: true,
+      timeout: this.options.timeout
+    }
+    const result = await callWxOpenApi({
+      name: `auth.${name}`,
+      url: `${this.options.baseUrl}${buildUrl(url, data)}`,
+      data,
+      options,
+      defaultOptions
+    })
+    return result
+  }
+
+  async code2Session (code) {
+    const url = '/sns/jscode2session'
+    const result = await this._requestWxOpenapi({
+      name: 'code2Session',
+      url,
+      data: {
+        grant_type: 'authorization_code',
+        appid: this.options.appId,
+        secret: this.options.secret,
+        js_code: code
+      }
+    })
+    return result
+  }
+
+  async getOauthAccessToken (code) {
+    const url = '/sns/oauth2/access_token'
+    const result = await this._requestWxOpenapi({
+      name: 'getOauthAccessToken',
+      url,
+      data: {
+        grant_type: 'authorization_code',
+        appid: this.options.appId,
+        secret: this.options.secret,
+        code
+      }
+    })
+    if (result.expiresIn) {
+      result.expired = Date.now() + result.expiresIn * 1000
+      // delete result.expiresIn
+    }
+    return result
+  }
+
+  async getUserInfo ({
+    accessToken,
+    openid
+  } = {}) {
+    const url = '/sns/userinfo'
+    const {
+      nickname,
+      headimgurl: avatar
+    } = await this._requestWxOpenapi({
+      name: 'getUserInfo',
+      url,
+      data: {
+        accessToken,
+        openid,
+        appid: this.options.appId,
+        secret: this.options.secret,
+        scope: 'snsapi_userinfo'
+      }
+    })
+    return {
+      nickname,
+      avatar
+    }
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..908d916dc6349e5cb326d4f1b8927f24faed9b3c
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/normalize.js
@@ -0,0 +1,95 @@
+const {
+  UniCloudError
+} = require('../../../common/error')
+const {
+  camel2snakeJson, snake2camelJson
+} = require('../../../common/utils')
+
+function generateApiResult (apiName, data) {
+  if (data.errcode) {
+    throw new UniCloudError({
+      code: data.errcode || -2,
+      message: data.errmsg || `${apiName} fail`
+    })
+  } else {
+    delete data.errcode
+    delete data.errmsg
+    return {
+      ...data,
+      errMsg: `${apiName} ok`,
+      errCode: 0
+    }
+  }
+}
+
+function nomalizeError (apiName, error) {
+  throw new UniCloudError({
+    code: error.code || -2,
+    message: error.message || `${apiName} fail`
+  })
+}
+
+// 微信openapi接口接收蛇形（snake case）参数返回蛇形参数，这里进行转化，如果是formdata里面的参数需要在对应api实现时就转为蛇形
+async function callWxOpenApi ({
+  name,
+  url,
+  data,
+  options,
+  defaultOptions
+}) {
+  let result = {}
+  // 获取二维码的接口wxacode.get和wxacode.getUnlimited不可以传入access_token（可能有其他接口也不可以），否则会返回data format error
+  const dataCopy = camel2snakeJson(Object.assign({}, data))
+  if (dataCopy && dataCopy.access_token) {
+    delete dataCopy.access_token
+  }
+  try {
+    options = Object.assign({}, defaultOptions, options, { data: dataCopy })
+    result = await uniCloud.httpclient.request(url, options)
+  } catch (e) {
+    return nomalizeError(name, e)
+  }
+
+  // 有几个接口成功返回buffer失败返回json，对这些接口统一成返回buffer，然后分别解析
+  let resData = result.data
+  const contentType = result.headers['content-type']
+  if (
+    Buffer.isBuffer(resData) &&
+    (contentType.indexOf('text/plain') === 0 ||
+      contentType.indexOf('application/json') === 0)
+  ) {
+    try {
+      resData = JSON.parse(resData.toString())
+    } catch (e) {
+      resData = resData.toString()
+    }
+  } else if (Buffer.isBuffer(resData)) {
+    resData = {
+      buffer: resData,
+      contentType
+    }
+  }
+  return snake2camelJson(
+    generateApiResult(
+      name,
+      resData || {
+        errCode: -2,
+        errMsg: 'Request failed'
+      }
+    )
+  )
+}
+
+function buildUrl (url, data) {
+  let query = ''
+  if (data && data.accessToken) {
+    const divider = url.indexOf('?') > -1 ? '&' : '?'
+    query = `${divider}access_token=${data.accessToken}`
+  }
+  return `${url}${query}`
+}
+
+module.exports = {
+  callWxOpenApi,
+  buildUrl
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..c1410169a68fe4ffca80d7949d3e54dcd0479b2b
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/weixin/utils.js
@@ -0,0 +1,87 @@
+const crypto = require('crypto')
+const {
+  isPlainObject
+} = require('../../../common/utils')
+
+// 退款通知解密key=md5(key)
+function decryptData (encryptedData, key, iv = '') {
+  // 解密
+  const decipher = crypto.createDecipheriv('aes-128-cbc', key, iv)
+  // 设置自动 padding 为 true，删除填充补位
+  decipher.setAutoPadding(true)
+  let decoded = decipher.update(encryptedData, 'base64', 'utf8')
+  decoded += decipher.final('utf8')
+  return decoded
+}
+
+function md5 (str, encoding = 'utf8') {
+  return crypto
+    .createHash('md5')
+    .update(str, encoding)
+    .digest('hex')
+}
+
+function sha256 (str, key, encoding = 'utf8') {
+  return crypto
+    .createHmac('sha256', key)
+    .update(str, encoding)
+    .digest('hex')
+}
+
+function getSignStr (obj) {
+  return Object.keys(obj)
+    .filter(key => key !== 'sign' && obj[key] !== undefined && obj[key] !== '')
+    .sort()
+    .map(key => key + '=' + obj[key])
+    .join('&')
+}
+
+function getNonceStr (length = 16) {
+  let str = ''
+  while (str.length < length) {
+    str += Math.random().toString(32).substring(2)
+  }
+  return str.substring(0, length)
+}
+
+// 简易版Object转XML，只可在微信支付时使用，不支持嵌套
+function buildXML (obj, rootName = 'xml') {
+  const content = Object.keys(obj).map(item => {
+    if (isPlainObject(obj[item])) {
+      return `<${item}><![CDATA[${JSON.stringify(obj[item])}]]></${item}>`
+    } else {
+      return `<${item}><![CDATA[${obj[item]}]]></${item}>`
+    }
+  })
+  return `<${rootName}>${content.join('')}</${rootName}>`
+}
+
+function isXML (str) {
+  const reg = /^(<\?xml.*\?>)?(\r?\n)*<xml>(.|\r?\n)*<\/xml>$/i
+  return reg.test(str.trim())
+};
+
+// 简易版XML转Object，只可在微信支付时使用，不支持嵌套
+function parseXML (xml) {
+  const xmlReg = /<(?:xml|root).*?>([\s|\S]*)<\/(?:xml|root)>/
+  const str = xmlReg.exec(xml)[1]
+  const obj = {}
+  const nodeReg = /<(.*?)>(?:<!\[CDATA\[){0,1}(.*?)(?:\]\]>){0,1}<\/.*?>/g
+  let matches = null
+  // eslint-disable-next-line no-cond-assign
+  while ((matches = nodeReg.exec(str))) {
+    obj[matches[1]] = matches[2]
+  }
+  return obj
+}
+
+module.exports = {
+  decryptData,
+  md5,
+  sha256,
+  getSignStr,
+  getNonceStr,
+  buildXML,
+  parseXML,
+  isXML
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..c62e3ebff4ea6dc8673aaff6d46c529231b5ecbe
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/account.js
@@ -0,0 +1,130 @@
+const {
+  db,
+  dbCmd,
+  userCollection
+} = require('../../common/constants')
+const {
+  USER_IDENTIFIER
+} = require('../../common/constants')
+const {
+  batchFindObjctValue,
+  getType
+} = require('../../common/utils')
+
+/**
+ * 查询满足条件的用户
+ * @param {Object} params
+ * @param {Object} params.userQuery 用户唯一标识组成的查询条件
+ * @param {Object} params.authorizedApp 用户允许登录的应用
+ * @returns userMatched 满足条件的用户列表
+ */
+async function findUser (params = {}) {
+  const {
+    userQuery,
+    authorizedApp = []
+  } = params
+  const condition = getUserQueryCondition(userQuery)
+  if (condition.length === 0) {
+    throw new Error('Invalid user query')
+  }
+  const authorizedAppType = getType(authorizedApp)
+  let appQuery = null
+  if (authorizedAppType === 'string') {
+    // 传入authorizedApp为单个appId时
+    appQuery = dbCmd.or(
+      {
+        dcloud_appid: authorizedApp
+      },
+      {
+        dcloud_appid: dbCmd.exists(false)
+      }
+    )
+  } else if (authorizedAppType === 'array') {
+    if (authorizedApp.length === 0) {
+      // 传入空数组表示希望获取不能登录任一客户端的用户
+      appQuery = {
+        dcloud_appid: []
+      }
+    } else if (authorizedApp.length === 1) {
+      appQuery = dbCmd.or(
+        {
+          dcloud_appid: authorizedApp[0]
+        },
+        {
+          dcloud_appid: dbCmd.exists(false)
+        }
+      )
+    } else {
+      appQuery = dbCmd.or(
+        {
+          dcloud_appid: db.command.in(authorizedApp)
+        },
+        {
+          dcloud_appid: dbCmd.exists(false)
+        }
+      )
+    }
+  } else {
+    throw new Error('Invalid authorized app')
+  }
+
+  let finalQuery
+
+  if (condition.length === 1) {
+    finalQuery = dbCmd.and(condition[0], appQuery)
+  } else {
+    finalQuery = dbCmd.and(
+      dbCmd.or(condition),
+      appQuery
+    )
+  }
+  const userQueryRes = await userCollection.where(finalQuery).get()
+  return userQueryRes.data
+}
+
+function getUserIdentifier (userRecord = {}) {
+  const keys = Object.keys(USER_IDENTIFIER)
+  return batchFindObjctValue(userRecord, keys)
+}
+
+function getUserQueryCondition (userRecord = {}) {
+  const userIdentifier = getUserIdentifier(userRecord)
+  const condition = []
+  for (const key in userIdentifier) {
+    const value = userIdentifier[key]
+    if (!value) {
+      // 过滤所有value为假值的条件，在查询用户时没有意义
+      continue
+    }
+    const queryItem = {
+      [key]: value
+    }
+    // 为兼容用户老数据用户名及邮箱需要同时查小写及原始大小写数据
+    if (key === 'mobile') {
+      queryItem.mobile_confirmed = 1
+    } else if (key === 'email') {
+      queryItem.email_confirmed = 1
+      const email = userIdentifier.email
+      if (email.toLowerCase() !== email) {
+        condition.push({
+          email: email.toLowerCase(),
+          email_confirmed: 1
+        })
+      }
+    } else if (key === 'username') {
+      const username = userIdentifier.username
+      if (username.toLowerCase() !== username) {
+        condition.push({
+          username: username.toLowerCase()
+        })
+      }
+    }
+    condition.push(queryItem)
+  }
+  return condition
+}
+
+module.exports = {
+  findUser,
+  getUserIdentifier
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..4618fa5de27025243b116cac144618eb0ab37550
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/captcha.js
@@ -0,0 +1,76 @@
+const {
+  ERROR
+} = require('../../common/error')
+
+async function getNeedCaptcha ({
+  uid,
+  username,
+  mobile,
+  email,
+  type = 'login',
+  limitDuration = 7200000, // 两小时
+  limitTimes = 3 // 记录次数
+} = {}) {
+  const db = uniCloud.database()
+  const dbCmd = db.command
+  // 当用户最近“2小时内(limitDuration)”登录失败达到3次(limitTimes)时。要求用户提交验证码
+  const now = Date.now()
+  const uniIdLogCollection = db.collection('uni-id-log')
+  const userIdentifier = {
+    user_id: uid,
+    username,
+    mobile,
+    email
+  }
+
+  let totalKey = 0; let deleteKey = 0
+  for (const key in userIdentifier) {
+    totalKey++
+    if (!userIdentifier[key] || typeof userIdentifier[key] !== 'string') {
+      deleteKey++
+      delete userIdentifier[key]
+    }
+  }
+
+  if (deleteKey === totalKey) {
+    throw new Error('System error') // 正常情况下不会进入此条件，但是考虑到后续会有其他开发者修改此云对象，在此处做一个判断
+  }
+
+  const {
+    data: recentRecord
+  } = await uniIdLogCollection.where({
+    ip: this.getClientInfo().clientIP,
+    ...userIdentifier,
+    type,
+    create_date: dbCmd.gt(now - limitDuration)
+  })
+    .orderBy('create_date', 'desc')
+    .limit(limitTimes)
+    .get()
+  return recentRecord.length === limitTimes && recentRecord.every(item => item.state === 0)
+}
+
+async function verifyCaptcha (params = {}) {
+  const {
+    captcha,
+    scene
+  } = params
+  if (!captcha) {
+    throw {
+      errCode: ERROR.CAPTCHA_REQUIRED
+    }
+  }
+  const payload = await this.uniCaptcha.verify({
+    deviceId: this.getClientInfo().deviceId,
+    captcha,
+    scene
+  })
+  if (payload.errCode) {
+    throw payload
+  }
+}
+
+module.exports = {
+  getNeedCaptcha,
+  verifyCaptcha
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..11166d52994ec2c07c0daa2d7d2250f7e501989f
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/config.js
@@ -0,0 +1,135 @@
+const {
+  getWeixinPlatform
+} = require('./weixin')
+const createConfig = require('uni-config-center')
+
+const requiredConfig = {
+  'web.h5-weixin': ['appid', 'appsecret'],
+  'web.web-weixin': ['appid', 'appsecret'],
+  'app.weixin': ['appid', 'appsecret'],
+  'mp-weixin.weixin': ['appid', 'appsecret'],
+  'app.qq': ['appid', 'appsecret'],
+  'mp-alipay.alipay': ['appid', 'privateKey'],
+  'app.apple': ['bundleId']
+}
+
+const uniIdConfig = createConfig({
+  pluginId: 'uni-id'
+})
+
+class ConfigUtils {
+  constructor ({
+    context
+  } = {}) {
+    this.context = context
+    this.clientInfo = context.getClientInfo()
+    const {
+      appId,
+      uniPlatform
+    } = this.clientInfo
+    this.appId = appId
+    switch (uniPlatform) {
+      case 'app':
+      case 'app-plus':
+        this.platform = 'app'
+        break
+      case 'web':
+      case 'h5':
+        this.platform = 'web'
+        break
+      default:
+        this.platform = uniPlatform
+        break
+    }
+  }
+
+  getConfigArray () {
+    let configContent
+    try {
+      configContent = require('uni-config-center/uni-id/config.json')
+    } catch (error) {
+      throw new Error('Invalid config file\n' + error.message)
+    }
+    if (configContent[0]) {
+      return Object.values(configContent)
+    }
+    configContent.isDefaultConfig = true
+    return [configContent]
+  }
+
+  getAppConfig () {
+    const configArray = this.getConfigArray()
+    return configArray.find(item => item.dcloudAppid === this.appId) || configArray.find(item => item.isDefaultConfig)
+  }
+
+  getPlatformConfig () {
+    const appConfig = this.getAppConfig()
+    if (!appConfig) {
+      throw new Error(
+        `Config for current app (${this.appId}) was not found, please check your config file or client appId`)
+    }
+    const platform = this.platform
+    if (
+      (this.platform === 'app' && appConfig['app-plus']) ||
+      (this.platform === 'web' && appConfig.h5)
+    ) {
+      throw new Error(
+        `Client platform is ${this.platform}, but ${this.platform === 'web' ? 'h5' : 'app-plus'} was found in config. Please refer to: https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary?id=m-to-co`
+      )
+    }
+
+    const defaultConfig = {
+      tokenExpiresIn: 7200,
+      tokenExpiresThreshold: 1200,
+      passwordErrorLimit: 6,
+      passwordErrorRetryTime: 3600
+    }
+    return Object.assign(defaultConfig, appConfig, appConfig[platform])
+  }
+
+  getOauthProvider ({
+    provider
+  } = {}) {
+    const clientPlatform = this.platform
+    let oatuhProivder = provider
+    if (provider === 'weixin' && clientPlatform === 'web') {
+      const weixinPlatform = getWeixinPlatform.call(this.context)
+      if (weixinPlatform === 'h5' || weixinPlatform === 'web') {
+        oatuhProivder = 'weixin-' + weixinPlatform // weixin-h5 公众号，weixin-web pc端
+      }
+    }
+    return oatuhProivder
+  }
+
+  getOauthConfig ({
+    provider
+  } = {}) {
+    const config = this.getPlatformConfig()
+    const clientPlatform = this.platform
+    const oatuhProivder = this.getOauthProvider({
+      provider
+    })
+    const requireConfigKey = requiredConfig[`${clientPlatform}.${oatuhProivder}`] || []
+    if (!config.oauth || !config.oauth[oatuhProivder]) {
+      throw new Error(`Config param required: ${clientPlatform}.oauth.${oatuhProivder}`)
+    }
+    const oauthConfig = config.oauth[oatuhProivder]
+    requireConfigKey.forEach((item) => {
+      if (!oauthConfig[item]) {
+        throw new Error(`Config param required: ${clientPlatform}.oauth.${oatuhProivder}.${item}`)
+      }
+    })
+    return oauthConfig
+  }
+
+  getHooks () {
+    if (uniIdConfig.hasFile('hooks/index.js')) {
+      return require(
+        uniIdConfig.resolve('hooks/index.js')
+      )
+    }
+    return {}
+  }
+}
+
+module.exports = ConfigUtils
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..84233c3ed8bb311680ac13d23e7dbcaa50564bf7
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/fission.js
@@ -0,0 +1,192 @@
+const {
+  dbCmd,
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+/**
+ * 获取随机邀请码，邀请码由大写字母加数字组成，由于存在手动输入邀请码的场景，从可选字符中去除 0、1、I、O
+ * @param {number} len 邀请码长度，默认6位
+ * @returns {string} 随机邀请码
+ */
+function getRandomInviteCode (len = 6) {
+  const charArr = ['2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
+  let code = ''
+  for (let i = 0; i < len; i++) {
+    code += charArr[Math.floor(Math.random() * charArr.length)]
+  }
+  return code
+}
+
+/**
+ * 获取可用的邀请码，至多尝试十次以获取可用邀请码。从10亿可选值中随机，碰撞概率较低
+ * 也有其他方案可以尝试，比如在数据库内设置一个从0开始计数的数字，每次调用此方法时使用updateAndReturn使数字加1并返回加1后的值，根据这个值生成对应的邀请码，比如（22222A + 1 == 22222B），此方式性能理论更好，但是不适用于旧项目
+ * @param {object} param
+ * @param {string} param.inviteCode 初始随机邀请码
+ */
+async function getValidInviteCode () {
+  let retry = 10
+  let code
+  let codeValid = false
+  while (retry > 0 && !codeValid) {
+    retry--
+    code = getRandomInviteCode()
+    const getUserRes = await userCollection.where({
+      my_invite_code: code
+    }).limit(1).get()
+    if (getUserRes.data.length === 0) {
+      codeValid = true
+      break
+    }
+  }
+  if (!codeValid) {
+    throw {
+      errCode: ERROR.SET_INVITE_CODE_FAILED
+    }
+  }
+  return code
+}
+
+/**
+ * 根据邀请码查询邀请人
+ * @param {object} param
+ * @param {string} param.inviteCode 邀请码
+ * @param {string} param.queryUid 受邀人id，非空时校验不可被下家或自己邀请
+ * @returns
+ */
+async function findUserByInviteCode ({
+  inviteCode,
+  queryUid
+} = {}) {
+  if (typeof inviteCode !== 'string') {
+    throw {
+      errCode: ERROR.SYSTEM_ERROR
+    }
+  }
+  // 根据邀请码查询邀请人
+  let getInviterRes
+  if (queryUid) {
+    getInviterRes = await userCollection.where({
+      _id: dbCmd.neq(queryUid),
+      inviter_uid: dbCmd.not(dbCmd.all([queryUid])),
+      my_invite_code: inviteCode
+    }).get()
+  } else {
+    getInviterRes = await userCollection.where({
+      my_invite_code: inviteCode
+    }).get()
+  }
+  if (getInviterRes.data.length > 1) {
+    // 正常情况下不可能进入此条件，以防用户自行修改数据库出错，在此做出判断
+    throw {
+      errCode: ERROR.SYSTEM_ERROR
+    }
+  }
+  const inviterRecord = getInviterRes.data[0]
+  if (!inviterRecord) {
+    throw {
+      errCode: ERROR.INVALID_INVITE_CODE
+    }
+  }
+  return inviterRecord
+}
+
+/**
+ * 根据邀请码生成邀请信息
+ * @param {object} param
+ * @param {string} param.inviteCode 邀请码
+ * @param {string} param.queryUid 受邀人id，非空时校验不可被下家或自己邀请
+ * @returns
+ */
+async function generateInviteInfo ({
+  inviteCode,
+  queryUid
+} = {}) {
+  const inviterRecord = await findUserByInviteCode({
+    inviteCode,
+    queryUid
+  })
+  // 倒叙拼接当前用户邀请链
+  const inviterUid = inviterRecord.inviter_uid || []
+  inviterUid.unshift(inviterRecord._id)
+  return {
+    inviterUid,
+    inviteTime: Date.now()
+  }
+}
+
+/**
+ * 检查当前用户是否可以接受邀请，如果可以返回用户记录
+ * @param {string} uid
+ */
+async function checkInviteInfo (uid) {
+  // 检查当前用户是否已有邀请人
+  const getUserRes = await userCollection.doc(uid).field({
+    my_invite_code: true,
+    inviter_uid: true
+  }).get()
+  const userRecord = getUserRes.data[0]
+  if (!userRecord) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+  if (userRecord.inviter_uid && userRecord.inviter_uid.length > 0) {
+    throw {
+      errCode: ERROR.CHANGE_INVITER_FORBIDDEN
+    }
+  }
+  return userRecord
+}
+
+/**
+ * 指定用户接受邀请码邀请
+ * @param {object} param
+ * @param {string} param.uid 用户uid
+ * @param {string} param.inviteCode 邀请人的邀请码
+ * @returns
+ */
+async function acceptInvite ({
+  uid,
+  inviteCode
+} = {}) {
+  await checkInviteInfo(uid)
+  const {
+    inviterUid,
+    inviteTime
+  } = await generateInviteInfo({
+    inviteCode,
+    queryUid: uid
+  })
+
+  if (inviterUid === uid) {
+    throw {
+      errCode: ERROR.INVALID_INVITE_CODE
+    }
+  }
+
+  // 更新当前用户的邀请人信息
+  await userCollection.doc(uid).update({
+    inviter_uid: inviterUid,
+    invite_time: inviteTime
+  })
+
+  // 更新当前用户邀请的用户的邀请人信息，这步可能较为耗时
+  await userCollection.where({
+    inviter_uid: uid
+  }).update({
+    inviter_uid: dbCmd.push(inviterUid)
+  })
+
+  return {
+    errCode: 0,
+    errMsg: ''
+  }
+}
+
+module.exports = {
+  acceptInvite,
+  generateInviteInfo,
+  getValidInviteCode
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..35fb0acbbe8a6ae0c26ee250f077c3e7ee0afc01
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/login.js
@@ -0,0 +1,217 @@
+const {
+  findUser
+} = require('./account')
+const {
+  userCollection,
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const PasswordUtils = require('./password')
+
+async function realPreLogin (params = {}) {
+  const {
+    user
+  } = params
+  const appId = this.getClientInfo().appId
+  const userMatched = await findUser({
+    userQuery: user,
+    authorizedApp: appId
+  })
+  if (userMatched.length === 0) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  } else if (userMatched.length > 1) {
+    throw {
+      errCode: ERROR.ACCOUNT_CONFLICT
+    }
+  }
+  const userRecord = userMatched[0]
+  checkLoginUserRecord(userRecord)
+  return userRecord
+}
+
+async function preLogin (params = {}) {
+  const {
+    user
+  } = params
+  try {
+    const user = await realPreLogin.call(this, params)
+    return user
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      data: user,
+      type: LOG_TYPE.LOGIN
+    })
+    throw error
+  }
+}
+
+async function preLoginWithPassword (params = {}) {
+  const {
+    user,
+    password
+  } = params
+  try {
+    const userRecord = await realPreLogin.call(this, params)
+    const {
+      passwordErrorLimit,
+      passwordErrorRetryTime
+    } = this.config
+    const {
+      clientIP
+    } = this.getClientInfo()
+    // 根据ip地址，密码错误次数过多，锁定登录
+    let loginIPLimit = userRecord.login_ip_limit || []
+    // 清理无用记录
+    loginIPLimit = loginIPLimit.filter(item => item.last_error_time > Date.now() - passwordErrorRetryTime * 1000)
+    let currentIPLimit = loginIPLimit.find(item => item.ip === clientIP)
+    if (currentIPLimit && currentIPLimit.error_times >= passwordErrorLimit) {
+      throw {
+        errCode: ERROR.PASSWORD_ERROR_EXCEED_LIMIT
+      }
+    }
+    const passwordUtils = new PasswordUtils({
+      passwordSecret: this.config.passwordSecret
+    })
+
+    const {
+      success: checkPasswordSuccess,
+      refreshPasswordInfo
+    } = passwordUtils.checkUserPassword({
+      password,
+      passwordHash: userRecord.password,
+      passwordSecretVersion: userRecord.password_secret_version
+    })
+    if (!checkPasswordSuccess) {
+      // 更新用户ip对应的密码错误记录
+      if (!currentIPLimit) {
+        currentIPLimit = {
+          ip: clientIP,
+          error_times: 1,
+          last_error_time: Date.now()
+        }
+        loginIPLimit.push(currentIPLimit)
+      } else {
+        currentIPLimit.error_times++
+        currentIPLimit.last_error_time = Date.now()
+      }
+      await userCollection.doc(userRecord._id).update({
+        login_ip_limit: loginIPLimit
+      })
+      throw {
+        errCode: ERROR.PASSWORD_ERROR
+      }
+    }
+    const extraData = {}
+    if (refreshPasswordInfo) {
+      extraData.password = refreshPasswordInfo.passwordHash
+      extraData.password_secret_version = refreshPasswordInfo.version
+    }
+
+    const currentIPLimitIndex = loginIPLimit.indexOf(currentIPLimit)
+    if (currentIPLimitIndex > -1) {
+      loginIPLimit.splice(currentIPLimitIndex, 1)
+    }
+    extraData.login_ip_limit = loginIPLimit
+    return {
+      user: userRecord,
+      extraData
+    }
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      data: user,
+      type: LOG_TYPE.LOGIN
+    })
+    throw error
+  }
+}
+
+function checkLoginUserRecord (user) {
+  switch (user.status) {
+    case undefined:
+    case 0:
+      break
+    case 1:
+      throw {
+        errCode: ERROR.ACCOUNT_BANNED
+      }
+    case 2:
+      throw {
+        errCode: ERROR.ACCOUNT_AUDITING
+      }
+    case 3:
+      throw {
+        errCode: ERROR.ACCOUNT_AUDIT_FAILED
+      }
+    case 4:
+      throw {
+        errCode: ERROR.ACCOUNT_CLOSED
+      }
+    default:
+      break
+  }
+}
+
+async function thirdPartyLogin (params = {}) {
+  const {
+    user
+  } = params
+  return {
+    mobileComfirmd: user.mobile_comfirmd,
+    emailComfirmd: user.email_comfirmd
+  }
+}
+
+async function postLogin (params = {}) {
+  const {
+    user,
+    extraData,
+    isThirdParty = false
+  } = params
+  const uid = user._id
+  const updateData = {
+    last_login_date: Date.now(),
+    last_login_ip: this.getClientInfo().clientIP,
+    ...extraData
+  }
+  const {
+    token,
+    tokenExpired
+  } = await this.uniIdCommon.createToken({
+    uid
+  })
+  await userCollection.doc(uid).update(updateData)
+  await this.middleware.uniIdLog({
+    data: {
+      user_id: uid
+    },
+    type: LOG_TYPE.LOGIN
+  })
+  return {
+    errCode: 0,
+    newToken: {
+      token,
+      tokenExpired
+    },
+    uid,
+    ...(
+      isThirdParty
+        ? thirdPartyLogin({
+          user
+        })
+        : {}
+    )
+  }
+}
+
+module.exports = {
+  preLogin,
+  postLogin,
+  checkLoginUserRecord,
+  preLoginWithPassword
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..19ee9205249380741fcd780634d440327ae06056
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/password.js
@@ -0,0 +1,116 @@
+const {
+  getType
+} = require('../../common/utils')
+const crypto = require('crypto')
+
+const PasswordHashMethod = {
+  'hmac-sha1': function (content, secret) {
+    const hmac = crypto.createHmac('sha1', secret.toString('ascii'))
+    hmac.update(content)
+    return hmac.digest('hex')
+  }
+}
+
+class PasswordUtils {
+  constructor ({
+    passwordSecret
+  } = {}) {
+    const passwordSecretType = getType(passwordSecret)
+    if (passwordSecretType === 'array') {
+      this.passwordSecret = passwordSecret.sort((a, b) => {
+        return a.version - b.version
+      })
+    } else if (passwordSecretType === 'string') {
+      this.passwordSecret = [{ value: passwordSecret }]
+    } else {
+      throw new Error('Invalid password secret')
+    }
+  }
+
+  getSecretByVersion (params = {}) {
+    const {
+      version
+    } = params
+    if (!version && version !== 0) {
+      return this.getOldestSecret()
+    }
+    if (this.passwordSecret.length === 1) {
+      return this.passwordSecret[0]
+    }
+    return this.passwordSecret.find(item => item.version === version)
+  }
+
+  getLastestSecret () {
+    return this.passwordSecret[this.passwordSecret.length - 1]
+  }
+
+  getOldestSecret () {
+    return this.passwordSecret[0]
+  }
+
+  checkUserPassword (params = {}) {
+    const {
+      password,
+      passwordHash: passwordHashToCheck,
+      passwordSecretVersion,
+      autoRefresh = true
+    } = params
+    const currentPasswordSecret = this.getSecretByVersion({
+      version: passwordSecretVersion
+    })
+    if (!currentPasswordSecret) {
+      throw new Error('Invalid password version')
+    }
+    const {
+      value: passwordSecret
+    } = currentPasswordSecret
+    const {
+      passwordHash
+    } = this.generatePasswordHash({
+      password,
+      passwordSecret,
+      passwordSecretVersion
+    })
+    if (passwordHashToCheck !== passwordHash) {
+      return {
+        success: false
+      }
+    }
+    let refreshPasswordInfo
+    if (autoRefresh && passwordSecretVersion !== this.getLastestSecret().version) {
+      refreshPasswordInfo = this.generatePasswordHash({
+        password
+      })
+    }
+    return {
+      success: true,
+      refreshPasswordInfo
+    }
+  }
+
+  generatePasswordHash (params = {}) {
+    let {
+      password,
+      passwordSecret,
+      passwordSecretVersion
+    } = params
+    if (getType(password) !== 'string') {
+      throw new Error('Invalid password')
+    }
+    password = password && password.trim()
+    if (!password) {
+      throw new Error('Invalid password')
+    }
+    if (!passwordSecret) {
+      const lastestSecret = this.getLastestSecret()
+      passwordSecret = lastestSecret.value
+      passwordSecretVersion = lastestSecret.version
+    }
+    return {
+      passwordHash: PasswordHashMethod['hmac-sha1'](password, passwordSecret),
+      version: passwordSecretVersion
+    }
+  }
+}
+
+module.exports = PasswordUtils
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..22a56520b533af6b64eb84377b28d89404429c6e
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/qq.js
@@ -0,0 +1,149 @@
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+
+function getQQPlatform () {
+  const platform = this.clientPlatform
+  switch (platform) {
+    case 'app':
+    case 'app-plus':
+      return 'app'
+    case 'mp-qq':
+      return 'mp'
+    default:
+      throw new Error('Unsupported qq platform')
+  }
+}
+
+async function saveQQUserKey ({
+  openid,
+  sessionKey, // QQ小程序用户sessionKey
+  accessToken, // App端QQ用户accessToken
+  accessTokenExpired // App端QQ用户accessToken过期时间
+} = {}) {
+  // 微信公众平台、开放平台refreshToken有效期均为30天（微信没有在网络请求里面返回30天这个值，务必注意未来可能出现调整，需及时更新此处逻辑）。
+  // 此前QQ开放平台有调整过accessToken的过期时间：[access_token有效期由90天缩短至30天](https://wiki.connect.qq.com/%E3%80%90qq%E4%BA%92%E8%81%94%E3%80%91access_token%E6%9C%89%E6%95%88%E6%9C%9F%E8%B0%83%E6%95%B4)
+  const appId = this.getClientInfo().appId
+  const qqPlatform = getQQPlatform.call(this)
+  const keyObj = {
+    dcloudAppid: appId,
+    openid,
+    platform: 'qq-' + qqPlatform
+  }
+  switch (qqPlatform) {
+    case 'mp':
+      await this.uniOpenBridge.setSessionKey(keyObj, {
+        session_key: sessionKey
+      }, 30 * 24 * 60 * 60)
+      break
+    case 'app':
+    case 'h5':
+    case 'web':
+      await this.uniOpenBridge.setUserAccessToken(keyObj, {
+        access_token: accessToken,
+        access_token_expired: accessTokenExpired
+      }, Math.floor((accessTokenExpired - Date.now()) / 1000))
+      break
+    default:
+      break
+  }
+}
+
+function generateQQCache ({
+  sessionKey, // QQ小程序用户sessionKey
+  accessToken, // App端QQ用户accessToken
+  accessTokenExpired // App端QQ用户accessToken过期时间
+} = {}) {
+  const platform = getQQPlatform.call(this)
+  let cache
+  switch (platform) {
+    case 'app':
+      cache = {
+        access_token: accessToken,
+        access_token_expired: accessTokenExpired
+      }
+      break
+    case 'mp':
+      cache = {
+        session_key: sessionKey
+      }
+      break
+    default:
+      throw new Error('Unsupported qq platform')
+  }
+  return {
+    third_party: {
+      [`${platform}_qq`]: cache
+    }
+  }
+}
+
+function getQQOpenid ({
+  userRecord
+} = {}) {
+  const qqPlatform = getQQPlatform.call(this)
+  const appId = this.getClientInfo().appId
+  const qqOpenidObj = userRecord.qq_openid
+  if (!qqOpenidObj) {
+    return
+  }
+  return qqOpenidObj[`${qqPlatform}_${appId}`] || qqOpenidObj[qqPlatform]
+}
+
+async function getQQCacheFallback ({
+  userRecord,
+  key
+} = {}) {
+  const platform = getQQPlatform.call(this)
+  const thirdParty = userRecord && userRecord.third_party
+  if (!thirdParty) {
+    return
+  }
+  const qqCache = thirdParty[`${platform}_qq`]
+  return qqCache && qqCache[key]
+}
+
+async function getQQCache ({
+  uid,
+  userRecord,
+  key
+} = {}) {
+  const qqPlatform = getQQPlatform.call(this)
+  const appId = this.getClientInfo().appId
+
+  if (!userRecord) {
+    const getUserRes = await userCollection.doc(uid).get()
+    userRecord = getUserRes.data[0]
+  }
+  if (!userRecord) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+  const openid = getQQOpenid.call(this, {
+    userRecord
+  })
+  const getCacheMethod = qqPlatform === 'mp' ? 'getSessionKey' : 'getUserAccessToken'
+  const userKey = await this.uniOpenBridge[getCacheMethod]({
+    dcloudAppid: appId,
+    platform: 'qq-' + qqPlatform,
+    openid
+  })
+  if (userKey) {
+    return userKey[key]
+  }
+  return getQQCacheFallback({
+    userRecord,
+    key
+  })
+}
+
+module.exports = {
+  getQQPlatform,
+  generateQQCache,
+  getQQCache,
+  saveQQUserKey
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..3eae52af0bfe9034790ca17d308b725a6cf1bf0b
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/register.js
@@ -0,0 +1,201 @@
+const {
+  userCollection,
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  findUser
+} = require('./account')
+const {
+  getValidInviteCode,
+  generateInviteInfo
+} = require('./fission')
+const PasswordUtils = require('./password')
+const merge = require('lodash.merge')
+
+async function realPreRegister (params = {}) {
+  const {
+    user
+  } = params
+  const userMatched = await findUser({
+    userQuery: user,
+    authorizedApp: this.getClientInfo().appId
+  })
+  if (userMatched.length > 0) {
+    throw {
+      errCode: ERROR.ACCOUNT_EXISTS
+    }
+  }
+}
+
+async function preRegister (params = {}) {
+  try {
+    await realPreRegister.call(this, params)
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.REGISTER
+    })
+    throw error
+  }
+}
+
+async function preRegisterWithPassword (params = {}) {
+  const {
+    user,
+    password
+  } = params
+  await preRegister.call(this, {
+    user
+  })
+  const passwordUtils = new PasswordUtils({
+    passwordSecret: this.config.passwordSecret
+  })
+  const {
+    passwordHash,
+    version
+  } = passwordUtils.generatePasswordHash({
+    password
+  })
+  const extraData = {
+    password: passwordHash,
+    password_secret_version: version
+  }
+  return {
+    user,
+    extraData
+  }
+}
+
+async function thirdPartyRegister ({
+  user = {}
+} = {}) {
+  return {
+    mobileConfirmed: !!(user.mobile && user.mobile_confirmed) || false,
+    emailConfirmed: !!(user.email && user.email_confirmed) || false
+  }
+}
+
+async function postRegister (params = {}) {
+  const {
+    user,
+    extraData = {},
+    isThirdParty = false,
+    inviteCode
+  } = params
+  const {
+    appId,
+    appName,
+    appVersion,
+    appVersionCode,
+    channel,
+    scene,
+    clientIP,
+    osName
+  } = this.getClientInfo()
+
+  merge(user, extraData)
+
+  const registerChannel = channel || scene
+  user.register_env = {
+    appid: appId || '',
+    uni_platform: this.clientPlatform || '',
+    os_name: osName || '',
+    app_name: appName || '',
+    app_version: appVersion || '',
+    app_version_code: appVersionCode || '',
+    channel: registerChannel ? registerChannel + '' : '', // channel可能为数字，统一存为字符串
+    client_ip: clientIP || ''
+  }
+
+  user.register_date = Date.now()
+  user.dcloud_appid = [appId]
+
+  if (user.username) {
+    user.username = user.username.toLowerCase()
+  }
+  if (user.email) {
+    user.email = user.email.toLowerCase()
+  }
+
+  const {
+    autoSetInviteCode, // 注册时自动设置邀请码
+    forceInviteCode // 必须有邀请码才允许注册，注意此逻辑不可对admin生效
+  } = this.config
+  if (autoSetInviteCode) {
+    user.my_invite_code = await getValidInviteCode()
+  }
+
+  const isAdmin = user.role && user.role.includes('admin')
+
+  if (forceInviteCode && !isAdmin && !inviteCode) {
+    throw {
+      errCode: ERROR.INVALID_INVITE_CODE
+    }
+  }
+
+  if (inviteCode) {
+    const {
+      inviterUid,
+      inviteTime
+    } = await generateInviteInfo({
+      inviteCode
+    })
+    user.inviter_uid = inviterUid
+    user.invite_time = inviteTime
+  }
+
+  const beforeRegister = this.hooks.beforeRegister
+  let userRecord = user
+  if (beforeRegister) {
+    userRecord = await beforeRegister({
+      userRecord,
+      clientInfo: this.getClientInfo()
+    })
+  }
+
+  const {
+    id: uid
+  } = await userCollection.add(userRecord)
+
+  const {
+    token,
+    tokenExpired
+  } = await this.uniIdCommon.createToken({
+    uid
+  })
+
+  await this.middleware.uniIdLog({
+    data: {
+      user_id: uid
+    },
+    type: LOG_TYPE.REGISTER
+  })
+
+  return {
+    errCode: 0,
+    uid,
+    newToken: {
+      token,
+      tokenExpired
+    },
+    ...(
+      isThirdParty
+        ? thirdPartyRegister({
+          user: {
+            ...userRecord,
+            _id: uid
+          }
+        })
+        : {}
+    )
+  }
+}
+
+module.exports = {
+  preRegister,
+  preRegisterWithPassword,
+  postRegister
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..efd55e53e5531aff025c63697af26c615d1d0e01
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/relate.js
@@ -0,0 +1,62 @@
+const {
+  findUser
+} = require('./account')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  userCollection
+} = require('../../common/constants')
+const merge = require('lodash.merge')
+
+/**
+ *
+ * @param {object} param
+ * @param {string} param.uid 用户id
+ * @param {string} param.bindAccount 要绑定的三方账户、手机号或邮箱
+ */
+async function preBind ({
+  uid,
+  bindAccount,
+  logType
+} = {}) {
+  const userMatched = await findUser({
+    userQuery: bindAccount,
+    authorizedApp: this.getClientInfo().appId
+  })
+  if (userMatched.length > 0) {
+    await this.middleware.uniIdLog({
+      data: {
+        user_id: uid
+      },
+      type: logType,
+      success: false
+    })
+    throw {
+      errCode: ERROR.BIND_CONFLICT
+    }
+  }
+}
+
+async function postBind ({
+  uid,
+  extraData = {},
+  bindAccount,
+  logType
+} = {}) {
+  await userCollection.doc(uid).update(merge(bindAccount, extraData))
+  await this.middleware.uniIdLog({
+    data: {
+      user_id: uid
+    },
+    type: logType
+  })
+  return {
+    errCode: 0
+  }
+}
+
+module.exports = {
+  preBind,
+  postBind
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..1f45a7004c436ae66b7335685490020047b05363
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/sms.js
@@ -0,0 +1,81 @@
+const {
+  setMobileVerifyCode
+} = require('./verify-code')
+const {
+  getVerifyCode
+} = require('../../common/utils')
+
+/**
+ * 发送短信
+ * @param {object} param
+ * @param {string} param.mobile       手机号
+ * @param {object} param.code         可选，验证码
+ * @param {object} param.scene        短信场景
+ * @param {object} param.templateId   可选，短信模板id
+ * @returns
+ */
+async function sendSmsCode ({
+  mobile,
+  code,
+  scene,
+  templateId
+} = {}) {
+  const requiredParams = [
+    'name',
+    'smsKey',
+    'smsSecret',
+    'codeExpiresIn'
+  ]
+  const smsConfig = (this.config.service && this.config.service.sms) || {}
+  for (let i = 0; i < requiredParams.length; i++) {
+    const key = requiredParams[i]
+    if (!smsConfig[key]) {
+      throw new Error(`Missing config param: service.sms.${key}`)
+    }
+  }
+  if (!code) {
+    code = getVerifyCode()
+  }
+  let action
+  switch (scene) {
+    case 'login-by-sms':
+      action = this.t('login')
+      break
+    default:
+      action = this.t('verify-mobile')
+      break
+  }
+  const sceneConfig = smsConfig.scene || {}
+  if (!templateId) {
+    templateId = sceneConfig.templateId
+  }
+  if (!templateId) {
+    throw new Error('"templateId" is required')
+  }
+  const codeExpiresIn = sceneConfig.codeExpiresIn || smsConfig.codeExpiresIn
+  await setMobileVerifyCode.call(this, {
+    mobile,
+    code,
+    expiresIn: codeExpiresIn,
+    scene
+  })
+  await uniCloud.sendSms({
+    smsKey: smsConfig.smsKey,
+    smsSecret: smsConfig.smsSecret,
+    phone: mobile,
+    templateId,
+    data: {
+      name: smsConfig.name,
+      code,
+      action,
+      expMinute: '' + Math.round(codeExpiresIn / 60)
+    }
+  })
+  return {
+    errCode: 0
+  }
+}
+
+module.exports = {
+  sendSmsCode
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..cd758fe5bb718051a416a5a7f7cc7d296a310a25
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/unified-login.js
@@ -0,0 +1,98 @@
+const {
+  checkLoginUserRecord,
+  postLogin
+} = require('./login')
+const {
+  postRegister
+} = require('./register')
+const {
+  findUser
+} = require('./account')
+const {
+  ERROR
+} = require('../../common/error')
+
+async function realPreUnifiedLogin (params = {}) {
+  const {
+    user,
+    type
+  } = params
+  const appId = this.getClientInfo().appId
+  const userMatched = await findUser({
+    userQuery: user,
+    authorizedApp: appId
+  })
+  if (userMatched.length === 0) {
+    if (type === 'login') {
+      throw {
+        errCode: ERROR.ACCOUNT_NOT_EXISTS
+      }
+    }
+    return {
+      type: 'register',
+      user
+    }
+  } if (userMatched.length === 1) {
+    if (type === 'register') {
+      throw {
+        errCode: ERROR.ACCOUNT_EXISTS
+      }
+    }
+    const userRecord = userMatched[0]
+    checkLoginUserRecord(userRecord)
+    return {
+      type: 'login',
+      user: userRecord
+    }
+  } else if (userMatched.length > 1) {
+    throw {
+      errCode: ERROR.ACCOUNT_CONFLICT
+    }
+  }
+}
+
+async function preUnifiedLogin (params = {}) {
+  try {
+    const result = await realPreUnifiedLogin.call(this, params)
+    return result
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false
+    })
+    throw error
+  }
+}
+
+async function postUnifiedLogin (params = {}) {
+  const {
+    user,
+    extraData = {},
+    isThirdParty = false,
+    type,
+    inviteCode
+  } = params
+  let result
+  if (type === 'login') {
+    result = await postLogin.call(this, {
+      user,
+      extraData,
+      isThirdParty
+    })
+  } else if (type === 'register') {
+    result = await postRegister.call(this, {
+      user,
+      extraData,
+      isThirdParty,
+      inviteCode
+    })
+  }
+  return {
+    ...result,
+    type
+  }
+}
+
+module.exports = {
+  preUnifiedLogin,
+  postUnifiedLogin
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..ba3cb440b7c2591acb09e111165f948f6fe0e23d
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/univerify.js
@@ -0,0 +1,27 @@
+async function getPhoneNumber ({
+  // eslint-disable-next-line camelcase
+  access_token,
+  openid
+} = {}) {
+  const requiredParams = ['apiKey', 'apiSecret']
+  const univerifyConfig = (this.config.service && this.config.service.univerify) || {}
+  for (let i = 0; i < requiredParams.length; i++) {
+    const key = requiredParams[i]
+    if (!univerifyConfig[key]) {
+      throw new Error(`Missing config param: service.univerify.${key}`)
+    }
+  }
+  return uniCloud.getPhoneNumber({
+    provider: 'univerify',
+    appid: this.getClientInfo().appId,
+    apiKey: univerifyConfig.apiKey,
+    apiSecret: univerifyConfig.apiSecret,
+    // eslint-disable-next-line camelcase
+    access_token,
+    openid
+  })
+}
+
+module.exports = {
+  getPhoneNumber
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..ced33b9f5624192ac3aecef5b917c7fb9aa775cc
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/update-user-info.js
@@ -0,0 +1,25 @@
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  USER_STATUS
+} = require('../../common/constants')
+async function setUserStatus (uid, status) {
+  const updateData = {
+    status
+  }
+  if (status !== USER_STATUS.NORMAL) {
+    updateData.valid_token_date = Date.now()
+  }
+  await userCollection.doc(uid).update({
+    status
+  })
+  // TODO 此接口尚不完善，例如注销后其他客户端可能存在有效token，支持Redis后此处会补充额外逻辑
+  return {
+    errCode: 0
+  }
+}
+
+module.exports = {
+  setUserStatus
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..acebc6bdac3aed5d86c7ba28ae93285888bf5686
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/verify-code.js
@@ -0,0 +1,152 @@
+const {
+  dbCmd,
+  verifyCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  getVerifyCode
+} = require('../../common/utils')
+
+async function setVerifyCode ({
+  mobile,
+  email,
+  code,
+  expiresIn,
+  scene
+} = {}) {
+  const now = Date.now()
+  const record = {
+    mobile,
+    email,
+    scene,
+    code: code || getVerifyCode(),
+    state: 0,
+    ip: this.getClientInfo().clientIP,
+    created_date: now,
+    expired_date: now + expiresIn * 1000
+  }
+  await verifyCollection.add(record)
+  return {
+    errCode: 0
+  }
+}
+
+async function setEmailVerifyCode ({
+  email,
+  code,
+  expiresIn,
+  scene
+} = {}) {
+  email = email && email.trim()
+  if (!email) {
+    throw {
+      errCode: ERROR.INVALID_EMAIL
+    }
+  }
+  email = email.toLowerCase()
+  return setVerifyCode.call(this, {
+    email,
+    code,
+    expiresIn,
+    scene
+  })
+}
+
+async function setMobileVerifyCode ({
+  mobile,
+  code,
+  expiresIn,
+  scene
+} = {}) {
+  mobile = mobile && mobile.trim()
+  if (!mobile) {
+    throw {
+      errCode: ERROR.INVALID_MOBILE
+    }
+  }
+  return setVerifyCode.call(this, {
+    mobile,
+    code,
+    expiresIn,
+    scene
+  })
+}
+
+async function verifyEmailCode ({
+  email,
+  code,
+  scene
+} = {}) {
+  email = email && email.trim()
+  if (!email) {
+    throw {
+      errCode: ERROR.INVALID_EMAIL
+    }
+  }
+  email = email.toLowerCase()
+  const {
+    data: codeRecord
+  } = await verifyCollection.where({
+    email,
+    scene,
+    code,
+    state: 0,
+    expired_date: dbCmd.gt(Date.now())
+  }).limit(1).get()
+
+  if (codeRecord.length === 0) {
+    throw {
+      errCode: ERROR.EMAIL_VERIFY_CODE_ERROR
+    }
+  }
+  await verifyCollection.doc(codeRecord[0]._id).update({
+    state: 1
+  })
+  return {
+    errCode: 0
+  }
+}
+
+async function verifyMobileCode ({
+  mobile,
+  code,
+  scene
+} = {}) {
+  mobile = mobile && mobile.trim()
+  if (!mobile) {
+    throw {
+      errCode: ERROR.INVALID_MOBILE
+    }
+  }
+  const {
+    data: codeRecord
+  } = await verifyCollection.where({
+    mobile,
+    scene,
+    code,
+    state: 0,
+    expired_date: dbCmd.gt(Date.now())
+  }).limit(1).get()
+
+  if (codeRecord.length === 0) {
+    throw {
+      errCode: ERROR.MOBILE_VERIFY_CODE_ERROR
+    }
+  }
+
+  await verifyCollection.doc(codeRecord[0]._id).update({
+    state: 1
+  })
+  return {
+    errCode: 0
+  }
+}
+
+module.exports = {
+  verifyEmailCode,
+  verifyMobileCode,
+  setEmailVerifyCode,
+  setMobileVerifyCode
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..fc27f77d69123efd6d0ba1e9b6968fed275802cf
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/weixin.js
@@ -0,0 +1,186 @@
+const crypto = require('crypto')
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+
+function decryptWeixinData ({
+  encryptedData,
+  sessionKey,
+  iv
+} = {}) {
+  const oauthConfig = this.configUtils.getOauthConfig({
+    provider: 'weixin'
+  })
+  const decipher = crypto.createDecipheriv(
+    'aes-128-cbc',
+    Buffer.from(sessionKey, 'base64'),
+    Buffer.from(iv, 'base64')
+  )
+  // 设置自动 padding 为 true，删除填充补位
+  decipher.setAutoPadding(true)
+  let decoded
+  decoded = decipher.update(encryptedData, 'base64', 'utf8')
+  decoded += decipher.final('utf8')
+  decoded = JSON.parse(decoded)
+  if (decoded.watermark.appid !== oauthConfig.appid) {
+    throw new Error('Invalid wechat appid in decode content')
+  }
+  return decoded
+}
+
+function getWeixinPlatform () {
+  const platform = this.clientPlatform
+  const userAgent = this.getClientInfo().userAgent
+  switch (platform) {
+    case 'app':
+    case 'app-plus':
+      return 'app'
+    case 'mp-weixin':
+      return 'mp'
+    case 'h5':
+    case 'web':
+      return userAgent.indexOf('MicroMessenger') > -1 ? 'h5' : 'web'
+    default:
+      throw new Error('Unsupported weixin platform')
+  }
+}
+
+async function saveWeixinUserKey ({
+  openid,
+  sessionKey, // 微信小程序用户sessionKey
+  accessToken, // App端微信用户accessToken
+  refreshToken, // App端微信用户refreshToken
+  accessTokenExpired // App端微信用户accessToken过期时间
+} = {}) {
+  // 微信公众平台、开放平台refreshToken有效期均为30天（微信没有在网络请求里面返回30天这个值，务必注意未来可能出现调整，需及时更新此处逻辑）。
+  // 此前QQ开放平台有调整过accessToken的过期时间：[access_token有效期由90天缩短至30天](https://wiki.connect.qq.com/%E3%80%90qq%E4%BA%92%E8%81%94%E3%80%91access_token%E6%9C%89%E6%95%88%E6%9C%9F%E8%B0%83%E6%95%B4)
+
+  const appId = this.getClientInfo().appId
+  const weixinPlatform = getWeixinPlatform.call(this)
+  const keyObj = {
+    dcloudAppid: appId,
+    openid,
+    platform: 'weixin-' + weixinPlatform
+  }
+  switch (weixinPlatform) {
+    case 'mp':
+      await this.uniOpenBridge.setSessionKey(keyObj, {
+        session_key: sessionKey
+      }, 30 * 24 * 60 * 60)
+      break
+    case 'app':
+    case 'h5':
+    case 'web':
+      await this.uniOpenBridge.setUserAccessToken(keyObj, {
+        access_token: accessToken,
+        refresh_token: refreshToken,
+        access_token_expired: accessTokenExpired
+      }, 30 * 24 * 3600)
+      break
+    default:
+      break
+  }
+}
+
+function generateWeixinCache ({
+  sessionKey, // 微信小程序用户sessionKey
+  accessToken, // App端微信用户accessToken
+  refreshToken, // App端微信用户refreshToken
+  accessTokenExpired // App端微信用户accessToken过期时间
+} = {}) {
+  const platform = getWeixinPlatform.call(this)
+  let cache
+  switch (platform) {
+    case 'app':
+    case 'h5':
+    case 'web':
+      cache = {
+        access_token: accessToken,
+        refresh_token: refreshToken,
+        access_token_expired: accessTokenExpired
+      }
+      break
+    case 'mp':
+      cache = {
+        session_key: sessionKey
+      }
+      break
+    default:
+      throw new Error('Unsupported weixin platform')
+  }
+  return {
+    third_party: {
+      [`${platform}_weixin`]: cache
+    }
+  }
+}
+
+function getWeixinOpenid ({
+  userRecord
+} = {}) {
+  const weixinPlatform = getWeixinPlatform.call(this)
+  const appId = this.getClientInfo().appId
+  const wxOpenidObj = userRecord.wx_openid
+  if (!wxOpenidObj) {
+    return
+  }
+  return wxOpenidObj[`${weixinPlatform}_${appId}`] || wxOpenidObj[weixinPlatform]
+}
+
+async function getWeixinCacheFallback ({
+  userRecord,
+  key
+} = {}) {
+  const platform = getWeixinPlatform.call(this)
+  const thirdParty = userRecord && userRecord.third_party
+  if (!thirdParty) {
+    return
+  }
+  const weixinCache = thirdParty[`${platform}_weixin`]
+  return weixinCache && weixinCache[key]
+}
+
+async function getWeixinCache ({
+  uid,
+  userRecord,
+  key
+} = {}) {
+  const weixinPlatform = getWeixinPlatform.call(this)
+  const appId = this.getClientInfo().appId
+  if (!userRecord) {
+    const getUserRes = await userCollection.doc(uid).get()
+    userRecord = getUserRes.data[0]
+  }
+  if (!userRecord) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+  const openid = getWeixinOpenid.call(this, {
+    userRecord
+  })
+  const getCacheMethod = weixinPlatform === 'mp' ? 'getSessionKey' : 'getUserAccessToken'
+  const userKey = await this.uniOpenBridge[getCacheMethod]({
+    dcloudAppid: appId,
+    platform: 'weixin-' + weixinPlatform,
+    openid
+  })
+  if (userKey) {
+    return userKey[key]
+  }
+  return getWeixinCacheFallback({
+    userRecord,
+    key
+  })
+}
+
+module.exports = {
+  decryptWeixinData,
+  getWeixinPlatform,
+  generateWeixinCache,
+  getWeixinCache,
+  saveWeixinUserKey
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..e333fe01f2689e67f71e841195f8657e14290c02
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/access-control.js
@@ -0,0 +1,59 @@
+const methodPermission = require('../config/permission')
+const {
+  ERROR
+} = require('../common/error')
+
+function isAccessAllowed (user, setting) {
+  const {
+    role: userRole = [],
+    permission: userPermission = []
+  } = user
+  const {
+    role: settingRole = [],
+    permission: settingPermission = []
+  } = setting
+  if (userRole.includes('admin')) {
+    return
+  }
+  if (
+    settingRole.length > 0 &&
+    settingRole.every(item => !userRole.includes(item))
+  ) {
+    throw {
+      errCode: ERROR.PERMISSION_ERROR
+    }
+  }
+  if (
+    settingPermission.length > 0 &&
+    settingPermission.every(item => !userPermission.includes(item))
+  ) {
+    throw {
+      errCode: ERROR.PERMISSION_ERROR
+    }
+  }
+}
+
+module.exports = async function () {
+  const methodName = this.getMethodName()
+  if (!(methodName in methodPermission)) {
+    return
+  }
+  const {
+    auth,
+    role,
+    permission
+  } = methodPermission[methodName]
+  if (auth || role || permission) {
+    await this.middleware.auth()
+  }
+  if (role && role.length === 0) {
+    throw new Error('[AccessControl]Empty role array is not supported')
+  }
+  if (permission && permission.length === 0) {
+    throw new Error('[AccessControl]Empty permission array is not supported')
+  }
+  return isAccessAllowed(this.authInfo, {
+    role,
+    permission
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..4c78b24d56ed0dc30bef102a6a7438b4c1c14a72
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/auth.js
@@ -0,0 +1,17 @@
+module.exports = async function () {
+  if (this.authInfo) { // 多次执行auth时如果第一次成功后续不再执行
+    return
+  }
+  const token = this.getUniIdToken()
+  const payload = await this.uniIdCommon.checkToken(token)
+  if (payload.errCode) {
+    throw payload
+  }
+  this.authInfo = payload
+  if (payload.token) {
+    this.response.newToken = {
+      token: payload.token,
+      tokenExpired: payload.tokenExpired
+    }
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..0af498a4dfb9bb9a21b72ada7f14efeb30c0aaa0
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/index.js
@@ -0,0 +1,7 @@
+module.exports = {
+  auth: require('./auth'),
+  uniIdLog: require('./uni-id-log'),
+  validate: require('./validate'),
+  accessControl: require('./access-control'),
+  ...require('./rbac')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..f42ef8d9fea154c7766279efa4d82454620d9896
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/rbac.js
@@ -0,0 +1,39 @@
+const {
+  ERROR
+} = require('../common/error')
+
+function hasRole (...roleList) {
+  const userRole = this.authInfo.role || []
+  if (userRole.includes('admin')) {
+    return
+  }
+  const isMatch = roleList.every(roleItem => {
+    return userRole.includes(roleItem)
+  })
+  if (!isMatch) {
+    throw {
+      errCode: ERROR.PERMISSION_ERROR
+    }
+  }
+}
+
+function hasPermission (...permissionList) {
+  const userRole = this.authInfo.role || []
+  const userPermission = this.authInfo.permission || []
+  if (userRole.includes('admin')) {
+    return
+  }
+  const isMatch = permissionList.every(permissionItem => {
+    return userPermission.includes(permissionItem)
+  })
+  if (!isMatch) {
+    throw {
+      errCode: ERROR.PERMISSION_ERROR
+    }
+  }
+}
+
+module.exports = {
+  hasRole,
+  hasPermission
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..37ce6552929d1527ab274775e5ae21cf7cd1506f
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/uni-id-log.js
@@ -0,0 +1,39 @@
+const db = uniCloud.database()
+module.exports = async function ({
+  data = {},
+  success = true,
+  type = 'login'
+} = {}) {
+  const now = Date.now()
+  const uniIdLogCollection = db.collection('uni-id-log')
+  const requiredDataKeyList = ['user_id', 'username', 'email', 'mobile']
+  const dataCopy = {}
+  for (let i = 0; i < requiredDataKeyList.length; i++) {
+    const key = requiredDataKeyList[i]
+    if (key in data && typeof data[key] === 'string') {
+      dataCopy[key] = data[key]
+    }
+  }
+  const {
+    appId,
+    clientIP,
+    deviceId,
+    userAgent
+  } = this.getClientInfo()
+  const logData = {
+    appid: appId,
+    device_id: deviceId,
+    ip: clientIP,
+    type,
+    ua: userAgent,
+    create_date: now,
+    ...dataCopy
+  }
+
+  if (success) {
+    logData.state = 1
+  } else {
+    logData.state = 0
+  }
+  return uniIdLogCollection.add(logData)
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..52ff04769c0f4498a90111b7cf79313cb4683823
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/middleware/validate.js
@@ -0,0 +1,7 @@
+module.exports = function (value = {}, schema = {}) {
+  const validateRes = this.validator.validate(value, schema)
+  if (validateRes) {
+    delete validateRes.schemaKey
+    throw validateRes
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..f1bdf9691024f5d71510c912c45e305f8c8e17db
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/close-account.js
@@ -0,0 +1,16 @@
+const {
+  setUserStatus
+} = require('../../lib/utils/update-user-info')
+const {
+  USER_STATUS
+} = require('../../common/constants')
+
+/**
+ * 注销账户
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#close-account
+ * @returns
+ */
+module.exports = async function () {
+  const { uid } = this.authInfo
+  return setUserStatus(uid, USER_STATUS.CLOSED)
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..7b8599a526446a2d55f70d04bed82e9098f71d53
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/get-account-info.js
@@ -0,0 +1,69 @@
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+
+function isUsernameSet (userRecord) {
+  return !!userRecord.username
+}
+function isNicknameSet (userRecord) {
+  return !!userRecord.nickname
+}
+function isPasswordSet (userRecord) {
+  return !!userRecord.password
+}
+function isMobileBound (userRecord) {
+  return !!(userRecord.mobile && userRecord.mobile_confirmed)
+}
+function isEmailBound (userRecord) {
+  return !!(userRecord.email && userRecord.email_confirmed)
+}
+function isWeixinBound (userRecord) {
+  return !!(
+    userRecord.wx_unionid ||
+    Object.keys(userRecord.wx_openid || {}).length
+  )
+}
+function isQQBound (userRecord) {
+  return !!(
+    userRecord.qq_unionid ||
+    Object.keys(userRecord.qq_openid || {}).length
+  )
+}
+function isAlipayBound (userRecord) {
+  return !!userRecord.ali_openid
+}
+function isAppleBound (userRecord) {
+  return !!userRecord.apple_openid
+}
+
+/**
+ * 获取账户账户简略信息
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-account-info
+ */
+module.exports = async function () {
+  const {
+    uid
+  } = this.authInfo
+  const getUserRes = await userCollection.doc(uid).get()
+  const userRecord = getUserRes && getUserRes.data && getUserRes.data[0]
+  if (!userRecord) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+  return {
+    errCode: 0,
+    isUsernameSet: isUsernameSet(userRecord),
+    isNicknameSet: isNicknameSet(userRecord),
+    isPasswordSet: isPasswordSet(userRecord),
+    isMobileBound: isMobileBound(userRecord),
+    isEmailBound: isEmailBound(userRecord),
+    isWeixinBound: isWeixinBound(userRecord),
+    isQQBound: isQQBound(userRecord),
+    isAlipayBound: isAlipayBound(userRecord),
+    isAppleBound: isAppleBound(userRecord)
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..6b743753356652f7e353633e0862742e42deb03b
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/index.js
@@ -0,0 +1,6 @@
+module.exports = {
+  updatePwd: require('./update-pwd'),
+  resetPwdBySms: require('./reset-pwd-by-sms'),
+  closeAccount: require('./close-account'),
+  getAccountInfo: require('./get-account-info')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..646834f321004dcd5bfa40d61db364bee7503c1a
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-sms.js
@@ -0,0 +1,119 @@
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  getNeedCaptcha,
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  verifyMobileCode
+} = require('../../lib/utils/verify-code')
+const {
+  userCollection,
+  SMS_SCENE,
+  CAPTCHA_SCENE,
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  findUser
+} = require('../../lib/utils/account')
+const PasswordUtils = require('../../lib/utils/password')
+
+/**
+ * 通过短信验证码重置密码
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#reset-pwd-by-sms
+ * @param {object} params
+ * @param {string} params.mobile   手机号
+ * @param {string} params.mobile   短信验证码
+ * @param {string} params.password 密码
+ * @param {string} params.captcha  图形验证码
+ * @returns {object}
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    mobile: 'mobile',
+    code: 'string',
+    password: 'password',
+    captcha: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    mobile,
+    code,
+    password,
+    captcha
+  } = params
+
+  const needCaptcha = await getNeedCaptcha.call(this, {
+    mobile,
+    type: LOG_TYPE.RESET_PWD_BY_SMS
+  })
+  if (needCaptcha) {
+    await verifyCaptcha.call(this, {
+      captcha,
+      scene: CAPTCHA_SCENE.RESET_PWD_BY_SMS
+    })
+  }
+  try {
+    // 验证手机号验证码，验证不通过时写入失败日志
+    await verifyMobileCode({
+      mobile,
+      code,
+      scene: SMS_SCENE.RESET_PWD_BY_SMS
+    })
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      data: {
+        mobile
+      },
+      type: LOG_TYPE.RESET_PWD_BY_SMS,
+      success: false
+    })
+    throw error
+  }
+  // 根据手机号查找匹配的用户
+  const userMatched = await findUser.call(this, {
+    userQuery: {
+      mobile
+    },
+    authorizedApp: [this.getClientInfo().appId]
+  })
+  if (userMatched.length === 0) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  } else if (userMatched.length > 1) {
+    throw {
+      errCode: ERROR.ACCOUNT_CONFLICT
+    }
+  }
+  const { _id: uid } = userMatched[0]
+  const {
+    passwordHash,
+    version
+  } = new PasswordUtils({
+    passwordSecret: this.config.passwordSecret
+  }).generatePasswordHash({
+    password
+  })
+  // 更新用户密码
+  await userCollection.doc(uid).update({
+    password: passwordHash,
+    password_secret_version: version,
+    valid_token_date: Date.now()
+  })
+
+  // 写入成功日志
+  await this.middleware.uniIdLog({
+    data: {
+      mobile
+    },
+    type: LOG_TYPE.RESET_PWD_BY_SMS
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..7329b736445393accaf754f20aef82e11b24c298
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/update-pwd.js
@@ -0,0 +1,67 @@
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const PasswordUtils = require('../../lib/utils/password')
+/**
+ * 更新密码
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#update-pwd
+ * @param {object} params
+ * @param {string} params.oldPassword 旧密码
+ * @param {string} params.newPassword 新密码
+ * @returns {object}
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    oldPassword: 'string', // 防止密码规则调整导致旧密码无法更新
+    newPassword: 'password'
+  }
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+  const getUserRes = await userCollection.doc(uid).get()
+  const userRecord = getUserRes.data[0]
+  if (!userRecord) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+  const {
+    oldPassword,
+    newPassword
+  } = params
+  const passwordUtils = new PasswordUtils({
+    passwordSecret: this.config.passwordSecret
+  })
+  const {
+    success: checkPasswordSuccess
+  } = passwordUtils.checkUserPassword({
+    password: oldPassword,
+    passwordHash: userRecord.password,
+    passwordSecretVersion: userRecord.password_secret_version,
+    autoRefresh: false
+  })
+  if (!checkPasswordSuccess) {
+    throw {
+      errCode: ERROR.PASSWORD_ERROR
+    }
+  }
+
+  const {
+    passwordHash,
+    version
+  } = passwordUtils.generatePasswordHash({
+    password: newPassword
+  })
+
+  await userCollection.doc(uid).update({
+    password: passwordHash,
+    password_secret_version: version,
+    valid_token_date: Date.now() // refreshToken时会校验，如果创建token时间在此时间点之前，则拒绝下发新token，返回token失效错误码
+  })
+  // 执行更新密码操作后客户端应将用户退出重新登录
+  return {
+    errCode: 0
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..988ee5b8e01457a6c11197c96b239dd59d6aff1f
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/add-user.js
@@ -0,0 +1,81 @@
+const {
+  findUser
+} = require('../../lib/utils/account')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  userCollection
+} = require('../../common/constants')
+const PasswordUtils = require('../../lib/utils/password')
+
+/**
+ * 新增用户
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#add-user
+ * @param {Object}  params
+ * @param {String}  params.username       用户名
+ * @param {String}  params.password       密码
+ * @param {String}  params.nickname       昵称
+ * @param {Array}   params.authorizedApp  允许登录的AppID列表
+ * @param {Array}   params.role           用户角色列表
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    username: 'username',
+    password: 'password',
+    authorizedApp: {
+      required: false,
+      type: 'array<string>'
+    }, // 指定允许登录的app，传空数组或不传时表示可以不可以在任何端登录
+    nickname: {
+      required: false,
+      type: 'nickname'
+    },
+    role: {
+      require: false,
+      type: 'array<string>'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    username,
+    password,
+    authorizedApp,
+    nickname,
+    role
+  } = params
+  const userMatched = await findUser({
+    userQuery: {
+      username
+    },
+    authorizedApp
+  })
+  if (userMatched.length) {
+    throw {
+      errCode: ERROR.ACCOUNT_EXISTS
+    }
+  }
+  const passwordUtils = new PasswordUtils({
+    passwordSecret: this.config.passwordSecret
+  })
+  const {
+    passwordHash,
+    version
+  } = passwordUtils.generatePasswordHash({
+    password
+  })
+
+  await userCollection.add({
+    username,
+    password: passwordHash,
+    password_secret_version: version,
+    dcloud_appid: authorizedApp || [],
+    nickname,
+    role: role || []
+  })
+
+  return {
+    errCode: 0
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..9c9c723d931d0114e35286eb91149fe059cf3b20
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/index.js
@@ -0,0 +1,3 @@
+module.exports = {
+  addUser: require('./add-user')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..476e23427b81752a94c19602ecb41dde16bc689b
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/get-supported-login-type.js
@@ -0,0 +1,71 @@
+function isMobileCodeSupported () {
+  const config = this.config
+  return !!(config.service && config.service.sms && config.service.sms.smsKey)
+}
+
+function isUniverifySupport () {
+  const config = this.config
+  return !!(config.service && config.service.univerify && config.service.univerify.apiKey)
+}
+
+function isWeixinSupported () {
+  this.configUtils.getOauthConfig({
+    provider: 'weixin'
+  })
+  return true
+}
+
+function isQQSupported () {
+  this.configUtils.getOauthConfig({
+    provider: 'qq'
+  })
+  return true
+}
+
+function isAppleSupported () {
+  this.configUtils.getOauthConfig({
+    provider: 'apple'
+  })
+  return true
+}
+
+function isAlipaySupported () {
+  this.configUtils.getOauthConfig({
+    provider: 'alipay'
+  })
+  return true
+}
+
+const loginTypeTester = {
+  'mobile-code': isMobileCodeSupported,
+  univerify: isUniverifySupport,
+  weixin: isWeixinSupported,
+  qq: isQQSupported,
+  apple: isAppleSupported,
+  alipay: isAlipaySupported
+}
+
+/**
+ * 获取支持的登录方式
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-supported-login-type
+ * @returns
+ */
+module.exports = async function () {
+  const supportedLoginType = [
+    'username-password',
+    'mobile-password',
+    'email-password'
+  ]
+  for (const type in loginTypeTester) {
+    try {
+      if (loginTypeTester[type].call(this)) {
+        supportedLoginType.push(type)
+      }
+    } catch (error) { }
+  }
+  return {
+    errCode: 0,
+    errMsg: '',
+    supportedLoginType
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..e22f9f2cb4624998e8e5c0a9d98d9a501ee6dacd
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/index.js
@@ -0,0 +1,3 @@
+module.exports = {
+  getSupportedLoginType: require('./get-supported-login-type')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..2461e061785728ae1cbb39e2d34ddb440be2eeff
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/accept-invite.js
@@ -0,0 +1,25 @@
+const {
+  acceptInvite
+} = require('../../lib/utils/fission')
+
+/**
+ * 接受邀请
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#accept-invite
+ * @param {Object} params
+ * @param {String} params.inviteCode  邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    inviteCode: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const {
+    inviteCode
+  } = params
+  const uid = this.authInfo.uid
+  return acceptInvite({
+    uid,
+    inviteCode
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..93d46719ca702b115db3e92f7c6c6fe27afad658
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/get-invited-user.js
@@ -0,0 +1,80 @@
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  coverMobile
+} = require('../../common/utils')
+
+/**
+ * 获取受邀用户
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-invited-user
+ * @param {Object} params
+ * @param {Number} params.level       获取受邀用户的级数，1表示直接邀请的用户
+ * @param {Number} params.limit       返回数据大小
+ * @param {Number} params.offset      返回数据偏移
+ * @param {Boolean} params.needTotal  是否需要返回总数
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    level: 'number',
+    limit: {
+      required: false,
+      type: 'number'
+    },
+    offset: {
+      required: false,
+      type: 'number'
+    },
+    needTotal: {
+      required: false,
+      type: 'boolean'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    level,
+    limit = 20,
+    offset = 0,
+    needTotal = false
+  } = params
+  const uid = this.authInfo.uid
+  const query = {
+    [`inviter_uid.${level - 1}`]: uid
+  }
+  const getUserRes = await userCollection.where(query)
+    .field({
+      _id: true,
+      avatar: true,
+      avatar_file: true,
+      username: true,
+      nickname: true,
+      mobile: true,
+      invite_time: true
+    })
+    .orderBy('invite_time', 'desc')
+    .skip(offset)
+    .limit(limit)
+    .get()
+
+  const invitedUser = getUserRes.data.map(item => {
+    return {
+      uid: item._id,
+      username: item.username,
+      nickname: item.nickname,
+      mobile: coverMobile(item.mobile),
+      inviteTime: item.invite_time,
+      avatar: item.avatar,
+      avatarFile: item.avatar_file
+    }
+  })
+  const result = {
+    errCode: 0,
+    invitedUser
+  }
+  if (needTotal) {
+    const getTotalRes = await userCollection.where(query).count()
+    result.total = getTotalRes.total
+  }
+  return result
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..4a9bee11743e422d1be4cecda7ccc0cab6788e74
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/fission/index.js
@@ -0,0 +1,4 @@
+module.exports = {
+  acceptInvite: require('./accept-invite'),
+  getInvitedUser: require('./get-invited-user')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..e1d8593b5903b005a3d911fb63134b75e7c4ddea
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/index.js
@@ -0,0 +1,19 @@
+module.exports = {
+  login: require('./login'),
+  loginBySms: require('./login-by-sms'),
+  loginByUniverify: require('./login-by-univerify'),
+  loginByWeixin: require('./login-by-weixin'),
+  loginByAlipay: require('./login-by-alipay'),
+  loginByQQ: require('./login-by-qq'),
+  loginByApple: require('./login-by-apple'),
+  loginByBaidu: require('./login-by-baidu'),
+  loginByDingtalk: require('./login-by-dingtalk'),
+  loginByToutiao: require('./login-by-toutiao'),
+  loginByDouyin: require('./login-by-douyin'),
+  loginByWeibo: require('./login-by-weibo'),
+  loginByTaobao: require('./login-by-taobao'),
+  loginByEmailLink: require('./login-by-email-link'),
+  loginByEmailCode: require('./login-by-email-code'),
+  loginByFacebook: require('./login-by-facebook'),
+  loginByGoogle: require('./login-by-google')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..d5d463147a1bb805d12c13e38e621169d7b948a9
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-alipay.js
@@ -0,0 +1,70 @@
+const {
+  initAlipay
+} = require('../../lib/third-party/index')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  preUnifiedLogin,
+  postUnifiedLogin
+} = require('../../lib/utils/unified-login')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+
+/**
+ * 支付宝登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-alipay
+ * @param {Object} params
+ * @param {String} params.code        支付宝小程序客户端登录返回的code
+ * @param {String} params.inviteCode  邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    code: 'string',
+    inviteCode: {
+      type: 'string',
+      required: false
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    code,
+    inviteCode
+  } = params
+  const alipayApi = initAlipay.call(this)
+  let getAlipayAccountResult
+  try {
+    getAlipayAccountResult = await alipayApi.code2Session(code)
+  } catch (error) {
+    console.error(error)
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.LOGIN
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+
+  const {
+    openid
+  } = getAlipayAccountResult
+
+  const {
+    type,
+    user
+  } = await preUnifiedLogin.call(this, {
+    user: {
+      ali_openid: openid
+    }
+  })
+  return postUnifiedLogin.call(this, {
+    user,
+    extraData: {},
+    isThirdParty: true,
+    type,
+    inviteCode
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..5f39e62348c673c870b0a4da10a68f544d7c82fa
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-apple.js
@@ -0,0 +1,77 @@
+const {
+  initApple
+} = require('../../lib/third-party/index')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  preUnifiedLogin,
+  postUnifiedLogin
+} = require('../../lib/utils/unified-login')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+
+/**
+ * 苹果登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-apple
+ * @param {Object} params
+ * @param {String} params.identityToken 苹果登录返回的identityToken
+ * @param {String} params.nickname      用户昵称
+ * @param {String} params.inviteCode    邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    identityToken: 'string',
+    nickname: {
+      required: false,
+      type: 'nickname'
+    },
+    inviteCode: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    identityToken,
+    nickname,
+    inviteCode
+  } = params
+  const appleApi = initApple.call(this)
+  let verifyResult
+  try {
+    verifyResult = await appleApi.verifyIdentityToken(identityToken)
+  } catch (error) {
+    console.error(error)
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.LOGIN
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+  const {
+    openid
+  } = verifyResult
+
+  const {
+    type,
+    user
+  } = await preUnifiedLogin.call(this, {
+    user: {
+      apple_openid: openid
+    }
+  })
+  return postUnifiedLogin.call(this, {
+    user,
+    extraData: {
+      nickname
+    },
+    isThirdParty: true,
+    type,
+    inviteCode
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..856449dcaefd02dcc40934fec3fbfec8e8cb6a68
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-baidu.js
@@ -0,0 +1,9 @@
+/**
+ * 百度登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByBaidu] is not yet implemented')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..afe1f016fdf70f0d2e4de01358d6b49294dda3c4
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-dingtalk.js
@@ -0,0 +1,9 @@
+/**
+ * 钉钉登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByDingtalk] is not yet implemented')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..8cd4ab563115eb9b07d85d5f79d185c2ff2ee081
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-douyin.js
@@ -0,0 +1,9 @@
+/**
+ * 抖音登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByDouyin] is not yet implemented')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..c3af08f0c677ce8214a006aa4fa7a51a6a9909a6
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-code.js
@@ -0,0 +1,9 @@
+/**
+ * 邮箱验证码登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByEmailCode] is not yet implemented')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..0ebbf3acef93d4265e094e35cf49c6fbf1a7538e
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-email-link.js
@@ -0,0 +1,9 @@
+/**
+ * 邮箱点击链接登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByEmailLink] is not yet implemented')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..5c93bd4d242d579923ceed479a1f6bf51e54dc24
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-facebook.js
@@ -0,0 +1,9 @@
+/**
+ * Facebook登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByFacebook] is not yet implemented')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..8054ece6a4aeb94c85d37d9df7c4bc0aac4a93cc
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-google.js
@@ -0,0 +1,9 @@
+/**
+ * Google登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByGoogle] is not yet implemented')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..13379d724a5fbb1593b0c3c3d26318133048cf46
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-qq.js
@@ -0,0 +1,164 @@
+const {
+  initQQ
+} = require('../../lib/third-party/index')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  preUnifiedLogin,
+  postUnifiedLogin
+} = require('../../lib/utils/unified-login')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  getQQPlatform,
+  generateQQCache,
+  saveQQUserKey
+} = require('../../lib/utils/qq')
+const url = require('url')
+
+/**
+ * QQ登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-qq
+ * @param {Object} params
+ * @param {String} params.code                  QQ小程序登录返回的code参数
+ * @param {String} params.accessToken           App端QQ登录返回的accessToken参数
+ * @param {String} params.accessTokenExpired    accessToken过期时间，由App端QQ登录返回的expires_in参数计算而来，单位：毫秒
+ * @param {String} params.inviteCode            邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    code: {
+      type: 'string',
+      required: false
+    },
+    accessToken: {
+      type: 'string',
+      required: false
+    },
+    accessTokenExpired: {
+      type: 'number',
+      required: false
+    },
+    inviteCode: {
+      type: 'string',
+      required: false
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    code,
+    accessToken,
+    accessTokenExpired,
+    inviteCode
+  } = params
+  const {
+    appId
+  } = this.getClientInfo()
+  const qqApi = initQQ.call(this)
+  const qqPlatform = getQQPlatform.call(this)
+  let apiName
+  switch (qqPlatform) {
+    case 'mp':
+      apiName = 'code2Session'
+      break
+    case 'app':
+      apiName = 'getOpenidByToken'
+      break
+    default:
+      throw new Error('Unsupported qq platform')
+  }
+  let getQQAccountResult
+  try {
+    getQQAccountResult = await qqApi[apiName]({
+      code,
+      accessToken
+    })
+  } catch (error) {
+    console.error(error)
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.LOGIN
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+
+  const {
+    openid,
+    unionid,
+    // 保存下面的字段
+    sessionKey // QQ小程序用户sessionKey
+  } = getQQAccountResult
+
+  const {
+    type,
+    user
+  } = await preUnifiedLogin.call(this, {
+    user: {
+      qq_openid: {
+        [qqPlatform]: openid
+      },
+      qq_unionid: unionid
+    }
+  })
+  const extraData = {
+    qq_openid: {
+      [`${qqPlatform}_${appId}`]: openid
+    }
+  }
+  if (type === 'register' && qqPlatform !== 'mp') {
+    const {
+      nickname,
+      avatar
+    } = await qqApi.getUserInfo({
+      accessToken,
+      openid
+    })
+    // eslint-disable-next-line n/no-deprecated-api
+    const extName = url.parse(avatar).pathname.split('.').pop()
+    const cloudPath = `user/avatar/${openid.slice(-8) + Date.now()}-avatar.${extName}`
+    const getAvatarRes = await uniCloud.httpclient.request(avatar)
+    if (getAvatarRes.status >= 400) {
+      throw {
+        errCode: ERROR.GET_THIRD_PARTY_USER_INFO_FAILED
+      }
+    }
+    const {
+      fileID
+    } = await uniCloud.uploadFile({
+      cloudPath,
+      fileContent: getAvatarRes.data
+    })
+    extraData.nickname = nickname
+    extraData.avatar_file = {
+      name: cloudPath,
+      extname: extName,
+      url: fileID
+    }
+  }
+  await saveQQUserKey.call(this, {
+    openid,
+    sessionKey,
+    accessToken,
+    accessTokenExpired
+  })
+  return postUnifiedLogin.call(this, {
+    user,
+    extraData: {
+      ...extraData,
+      ...generateQQCache.call(this, {
+        openid,
+        sessionKey, // QQ小程序用户sessionKey
+        accessToken, // App端QQ用户accessToken
+        accessTokenExpired // App端QQ用户accessToken过期时间
+      })
+    },
+    isThirdParty: true,
+    type,
+    inviteCode
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..8f9aeaf997d0be7026033bca8961aeb41062be4c
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-sms.js
@@ -0,0 +1,99 @@
+const {
+  getNeedCaptcha,
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  verifyMobileCode
+} = require('../../lib/utils/verify-code')
+const {
+  preUnifiedLogin,
+  postUnifiedLogin
+} = require('../../lib/utils/unified-login')
+const {
+  CAPTCHA_SCENE,
+  SMS_SCENE,
+  LOG_TYPE
+} = require('../../common/constants')
+
+/**
+ * 短信验证码登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-sms
+ * @param {Object} params
+ * @param {String} params.mobile      手机号
+ * @param {String} params.code        短信验证码
+ * @param {String} params.captcha     图形验证码
+ * @param {String} params.inviteCode  邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    mobile: 'mobile',
+    code: 'string',
+    captcha: {
+      required: false,
+      type: 'string'
+    },
+    inviteCode: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    mobile,
+    code,
+    captcha,
+    inviteCode
+  } = params
+
+  const needCaptcha = await getNeedCaptcha.call(this, {
+    mobile
+  })
+
+  if (needCaptcha) {
+    await verifyCaptcha.call(this, {
+      captcha,
+      scene: CAPTCHA_SCENE.LOGIN_BY_SMS
+    })
+  }
+
+  try {
+    await verifyMobileCode({
+      mobile,
+      code,
+      scene: SMS_SCENE.LOGIN_BY_SMS
+    })
+  } catch (error) {
+    console.log(error, {
+      mobile,
+      code,
+      type: SMS_SCENE.LOGIN_BY_SMS
+    })
+    await this.middleware.uniIdLog({
+      success: false,
+      data: {
+        mobile
+      },
+      type: LOG_TYPE.LOGIN
+    })
+    throw error
+  }
+
+  const {
+    type,
+    user
+  } = await preUnifiedLogin.call(this, {
+    user: {
+      mobile
+    }
+  })
+  return postUnifiedLogin.call(this, {
+    user,
+    extraData: {
+      mobile_confirmed: 1
+    },
+    isThirdParty: false,
+    type,
+    inviteCode
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..6a6d5994e0bc9952c09fcf5274a92082ddca370c
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-taobao.js
@@ -0,0 +1,9 @@
+/**
+ * 淘宝登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByTaobao] is not yet implemented')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..133aadbaad31f2a5ba411c7afb5f82f7fc2c00f1
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-toutiao.js
@@ -0,0 +1,9 @@
+/**
+ * 头条登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByToutiao] is not yet implemented')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..53e681c68636dcc4e8f5abeb9f00f9ef0ffab73e
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-univerify.js
@@ -0,0 +1,69 @@
+const {
+  getPhoneNumber
+} = require('../../lib/utils/univerify')
+const {
+  preUnifiedLogin,
+  postUnifiedLogin
+} = require('../../lib/utils/unified-login')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+
+/**
+ * App端一键登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-univerify
+ * @param {Object} params
+ * @param {String} params.access_token  APP端一键登录返回的access_token
+ * @param {String} params.openid        APP端一键登录返回的openid
+ * @param {String} params.inviteCode    邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    access_token: 'string',
+    openid: 'string',
+    inviteCode: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    // eslint-disable-next-line camelcase
+    access_token,
+    openid,
+    inviteCode
+  } = params
+
+  let mobile
+  try {
+    const phoneInfo = await getPhoneNumber.call(this, {
+      // eslint-disable-next-line camelcase
+      access_token,
+      openid
+    })
+    mobile = phoneInfo.phoneNumber
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.LOGIN
+    })
+    throw error
+  }
+  const {
+    user,
+    type
+  } = await preUnifiedLogin.call(this, {
+    user: {
+      mobile
+    }
+  })
+  return postUnifiedLogin.call(this, {
+    user,
+    extraData: {
+      mobile_confirmed: 1
+    },
+    type,
+    inviteCode
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..496cdb4b262e60ad861b64f207f3e3ac8a377102
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weibo.js
@@ -0,0 +1,9 @@
+/**
+ * 微博登录
+ * @param {Object} params
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[loginByWeibo] is not yet implemented')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..84c7ddc1f254894ea224ca2d3cc1e401b0135052
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin.js
@@ -0,0 +1,154 @@
+const {
+  initWeixin
+} = require('../../lib/third-party/index')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  preUnifiedLogin,
+  postUnifiedLogin
+} = require('../../lib/utils/unified-login')
+const {
+  generateWeixinCache,
+  getWeixinPlatform,
+  saveWeixinUserKey
+} = require('../../lib/utils/weixin')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const url = require('url')
+
+/**
+ * 微信登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin
+ * @param {Object} params
+ * @param {String} params.code          微信登录返回的code
+ * @param {String} params.inviteCode    邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    code: 'string',
+    inviteCode: {
+      type: 'string',
+      required: false
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    code,
+    inviteCode
+  } = params
+  const {
+    appId
+  } = this.getClientInfo()
+  const weixinApi = initWeixin.call(this)
+  const weixinPlatform = getWeixinPlatform.call(this)
+  let apiName
+  switch (weixinPlatform) {
+    case 'mp':
+      apiName = 'code2Session'
+      break
+    case 'app':
+    case 'h5':
+    case 'web':
+      apiName = 'getOauthAccessToken'
+      break
+    default:
+      throw new Error('Unsupported weixin platform')
+  }
+  let getWeixinAccountResult
+  try {
+    getWeixinAccountResult = await weixinApi[apiName](code)
+  } catch (error) {
+    console.error(error)
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.LOGIN
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+
+  const {
+    openid,
+    unionid,
+    // 保存下面四个字段
+    sessionKey, // 微信小程序用户sessionKey
+    accessToken, // App端微信用户accessToken
+    refreshToken, // App端微信用户refreshToken
+    expired: accessTokenExpired // App端微信用户accessToken过期时间
+  } = getWeixinAccountResult
+
+  const {
+    type,
+    user
+  } = await preUnifiedLogin.call(this, {
+    user: {
+      wx_openid: {
+        [weixinPlatform]: openid
+      },
+      wx_unionid: unionid
+    }
+  })
+  const extraData = {
+    wx_openid: {
+      [`${weixinPlatform}_${appId}`]: openid
+    }
+  }
+  if (type === 'register' && weixinPlatform !== 'mp') {
+    const {
+      nickname,
+      avatar
+    } = await weixinApi.getUserInfo({
+      accessToken,
+      openid
+    })
+    // eslint-disable-next-line n/no-deprecated-api
+    const avatarPath = url.parse(avatar).pathname
+    const extName = avatarPath.indexOf('.') > -1 ? url.parse(avatar).pathname.split('.').pop() : 'jpg'
+    const cloudPath = `user/avatar/${openid.slice(-8) + Date.now()}-avatar.${extName}`
+    const getAvatarRes = await uniCloud.httpclient.request(avatar)
+    if (getAvatarRes.status >= 400) {
+      throw {
+        errCode: ERROR.GET_THIRD_PARTY_USER_INFO_FAILED
+      }
+    }
+    const {
+      fileID
+    } = await uniCloud.uploadFile({
+      cloudPath,
+      fileContent: getAvatarRes.data
+    })
+    extraData.nickname = nickname
+    extraData.avatar_file = {
+      name: cloudPath,
+      extname: extName,
+      url: fileID
+    }
+  }
+  await saveWeixinUserKey.call(this, {
+    openid,
+    sessionKey,
+    accessToken,
+    refreshToken,
+    accessTokenExpired
+  })
+  return postUnifiedLogin.call(this, {
+    user,
+    extraData: {
+      ...extraData,
+      ...generateWeixinCache.call(this, {
+        openid,
+        sessionKey, // 微信小程序用户sessionKey
+        accessToken, // App端微信用户accessToken
+        refreshToken, // App端微信用户refreshToken
+        accessTokenExpired // App端微信用户accessToken过期时间
+      })
+    },
+    isThirdParty: true,
+    type,
+    inviteCode
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..97e9cfea7ec33c546196fd03cf03464179954a50
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login.js
@@ -0,0 +1,94 @@
+const {
+  preLoginWithPassword,
+  postLogin
+} = require('../../lib/utils/login')
+const {
+  getNeedCaptcha,
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  CAPTCHA_SCENE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+
+/**
+ * 用户名密码登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login
+ * @param {Object} params
+ * @param {String} params.username  用户名
+ * @param {String} params.mobile    手机号
+ * @param {String} params.email     邮箱
+ * @param {String} params.password  密码
+ * @param {String} params.captcha   图形验证码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    username: {
+      required: false,
+      type: 'username'
+    },
+    mobile: {
+      required: false,
+      type: 'mobile'
+    },
+    email: {
+      required: false,
+      type: 'email'
+    },
+    password: 'password',
+    captcha: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    username,
+    mobile,
+    email,
+    password,
+    captcha
+  } = params
+  if (!username && !mobile && !email) {
+    throw {
+      errCode: ERROR.INVALID_USERNAME
+    }
+  } else if (
+    (username && email) ||
+    (username && mobile) ||
+    (email && mobile)
+  ) {
+    throw {
+      errCode: ERROR.INVALID_PARAM
+    }
+  }
+  const needCaptcha = await getNeedCaptcha.call(this, {
+    username,
+    mobile,
+    email
+  })
+  if (needCaptcha) {
+    await verifyCaptcha.call(this, {
+      captcha,
+      scene: CAPTCHA_SCENE.LOGIN_BY_PWD
+    })
+  }
+  const {
+    user,
+    extraData
+  } = await preLoginWithPassword.call(this, {
+    user: {
+      username,
+      mobile,
+      email
+    },
+    password
+  })
+  return postLogin.call(this, {
+    user,
+    extraData
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..544be2b715a7beb3b51e15e028b5231a6016b3be
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/index.js
@@ -0,0 +1,3 @@
+module.exports = {
+  logout: require('./logout')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..98f2ddacc8aa772d6d1f41cff01b736da7d07f16
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/logout/logout.js
@@ -0,0 +1,48 @@
+const {
+  dbCmd,
+  LOG_TYPE,
+  deviceCollection,
+  userCollection
+} = require('../../common/constants')
+
+/**
+ * 用户退出登录
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#logout
+ * @returns
+ */
+module.exports = async function () {
+  const {
+    uniIdToken,
+    deviceId
+  } = this.getClientInfo()
+  const {
+    uid
+  } = await this.uniIdCommon.checkToken(
+    uniIdToken,
+    {
+      autoRefresh: false
+    }
+  )
+
+  // 删除token
+  await userCollection.doc(uid).update({
+    token: dbCmd.pull(uniIdToken)
+  })
+
+  // 仅当device表的device_id和user_id均对应时才进行更新
+  await deviceCollection.where({
+    device_id: deviceId,
+    user_id: uid
+  }).update({
+    token_expired: 0
+  })
+  await this.middleware.uniIdLog({
+    data: {
+      user_id: uid
+    },
+    type: LOG_TYPE.LOGOUT
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..8f8a167b1720f7e981e2fd955f647521c53253d0
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/authorize-app-login.js
@@ -0,0 +1,37 @@
+const {
+  isAuthorizeApproved
+} = require('./utils')
+const {
+  dbCmd,
+  userCollection
+} = require('../../common/constants')
+
+/**
+ * 授权用户登录应用
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#authorize-app-login
+ * @param {Object} params
+ * @param {String} params.uid   用户id
+ * @param {String} params.appId 授权的应用的AppId
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    uid: 'string',
+    appId: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const {
+    uid,
+    appId
+  } = params
+  await isAuthorizeApproved({
+    uid,
+    appIdList: [appId]
+  })
+  await userCollection.doc(uid).update({
+    dcloud_appid: dbCmd.push(appId)
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..ce9cc7b07ae9c8300b8a25e6eb14ba49e89af56b
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/index.js
@@ -0,0 +1,5 @@
+module.exports = {
+  authorizeAppLogin: require('./authorize-app-login'),
+  removeAuthorizedApp: require('./remove-authorized-app'),
+  setAuthorizedApp: require('./set-authorized-app')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..6334e537009c01745f7d947c9246712bfa012310
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/remove-authorized-app.js
@@ -0,0 +1,30 @@
+const {
+  dbCmd,
+  userCollection
+} = require('../../common/constants')
+
+/**
+ * 移除用户登录授权
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#remove-authorized-app
+ * @param {Object} params
+ * @param {String} params.uid   用户id
+ * @param {String} params.appId 取消授权的应用的AppId
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    uid: 'string',
+    appId: 'string'
+  }
+  this.moddleware.validate(params, schema)
+  const {
+    uid,
+    appId
+  } = params
+  await userCollection.doc(uid).update({
+    dcloud_appid: dbCmd.pull(appId)
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..a438ef998052f3d1b66ebe5a3792ad194625ce71
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/set-authorized-app.js
@@ -0,0 +1,36 @@
+const {
+  isAuthorizeApproved
+} = require('./utils')
+const {
+  userCollection
+} = require('../../common/constants')
+
+/**
+ * 设置用户允许登录的应用列表
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#set-authorized-app
+ * @param {Object} params
+ * @param {String} params.uid       用户id
+ * @param {Array} params.appIdList 允许登录的应用AppId列表
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    uid: 'string',
+    appIdList: 'array<string>'
+  }
+  this.middleware.validate(params, schema)
+  const {
+    uid,
+    appIdList
+  } = params
+  await isAuthorizeApproved({
+    uid,
+    appIdList
+  })
+  await userCollection.doc(uid).update({
+    dcloud_appid: appIdList
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..0c0eb859e68d97c72d77bebdee92f08faeb13e45
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/multi-end/utils.js
@@ -0,0 +1,36 @@
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  findUser
+} = require('../../lib/utils/account')
+
+async function isAuthorizeApproved ({
+  uid,
+  appIdList
+} = {}) {
+  const getUserRes = await userCollection.doc(uid).get()
+  const userRecord = getUserRes.data[0]
+  if (!userRecord) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  }
+  const userMatched = await findUser({
+    userQuery: userRecord,
+    authorizedApp: appIdList
+  })
+
+  if (userMatched.some(item => item._id !== uid)) {
+    throw {
+      errCode: ERROR.ACCOUNT_CONFLICT
+    }
+  }
+}
+
+module.exports = {
+  isAuthorizeApproved
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..d3a7b14261440a5b702a6c52fb108a6233b13301
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/index.js
@@ -0,0 +1,4 @@
+module.exports = {
+  registerUser: require('./register-user'),
+  registerAdmin: require('./register-admin')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..a5535f682f4648e9a717531556a03c15338c9647
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-admin.js
@@ -0,0 +1,61 @@
+const {
+  userCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  preRegisterWithPassword,
+  postRegister
+} = require('../../lib/utils/register')
+
+/**
+ * 注册管理员
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#register-admin
+ * @param {Object} params
+ * @param {String} params.username   用户名
+ * @param {String} params.password   密码
+ * @param {String} params.nickname   昵称
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    username: 'username',
+    password: 'password',
+    nickname: {
+      type: 'nickname',
+      required: false
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    username,
+    password,
+    nickname
+  } = params
+  const getAdminRes = await userCollection.where({
+    role: 'admin'
+  }).limit(1).get()
+  if (getAdminRes.data.length > 0) {
+    return {
+      errCode: ERROR.ADMIN_EXISTS
+    }
+  }
+  const {
+    user,
+    extraData
+  } = await preRegisterWithPassword.call(this, {
+    user: {
+      username
+    },
+    password
+  })
+  return postRegister.call(this, {
+    user,
+    extraData: {
+      ...extraData,
+      nickname,
+      role: ['admin']
+    }
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..510d7683af513dd2c08c670fff799dad734a4d12
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user.js
@@ -0,0 +1,68 @@
+const {
+  postRegister,
+  preRegisterWithPassword
+} = require('../../lib/utils/register')
+const {
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  CAPTCHA_SCENE
+} = require('../../common/constants')
+
+/**
+ * 注册普通用户
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#register-user
+ * @param {Object} params
+ * @param {String} params.username    用户名
+ * @param {String} params.password    密码
+ * @param {String} params.captcha     图形验证码
+ * @param {String} params.nickname    昵称
+ * @param {String} params.inviteCode  邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    username: 'username',
+    password: 'password',
+    captcha: 'string',
+    nickname: {
+      required: false,
+      type: 'nickname'
+    },
+    inviteCode: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    username,
+    password,
+    nickname,
+    captcha,
+    inviteCode
+  } = params
+
+  await verifyCaptcha.call(this, {
+    captcha,
+    scene: CAPTCHA_SCENE.REGISTER
+  })
+
+  const {
+    user,
+    extraData
+  } = await preRegisterWithPassword.call(this, {
+    user: {
+      username
+    },
+    password
+  })
+  return postRegister.call(this, {
+    user,
+    extraData: {
+      ...extraData,
+      nickname
+    },
+    inviteCode
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..7c0c399bdf48f258e0ba896e115b2f9f27c11beb
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-alipay.js
@@ -0,0 +1,63 @@
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  initAlipay
+} = require('../../lib/third-party/index')
+
+/**
+ * 绑定支付宝账号
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-alipay
+ * @param {Object} params
+ * @param {String} params.code  支付宝小程序登录返回的code参数
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    code: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+  const {
+    code
+  } = params
+  const alipayApi = initAlipay.call(this)
+  let getAlipayAccountResult
+  try {
+    getAlipayAccountResult = await alipayApi().code2Session(code)
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.BIND_ALIPAY
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+
+  const {
+    openid
+  } = getAlipayAccountResult
+
+  const bindAccount = {
+    apple_openid: openid
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_APPLE
+  })
+  return postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {},
+    logType: LOG_TYPE.BIND_APPLE
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..eb87f8b7efe75e9ce85ad4890039702ad882639f
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-apple.js
@@ -0,0 +1,62 @@
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  initApple
+} = require('../../lib/third-party/index')
+
+/**
+ * 绑定苹果账号
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-apple
+ * @param {Object} params
+ * @param {String} params.identityToken 苹果登录返回identityToken
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    identityToken: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+  const {
+    identityToken
+  } = params
+  const appleApi = initApple.call(this)
+  let verifyResult
+  try {
+    verifyResult = await appleApi.verifyIdentityToken(identityToken)
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.BIND_APPLE
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+  const {
+    openid
+  } = verifyResult
+
+  const bindAccount = {
+    apple_openid: openid
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_APPLE
+  })
+  return postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {},
+    logType: LOG_TYPE.BIND_APPLE
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..5da72590bb8a367ac2631257085f6707183ce44d
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-mp-weixin.js
@@ -0,0 +1,73 @@
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  decryptWeixinData,
+  getWeixinCache
+} = require('../../lib/utils/weixin')
+
+/**
+ * 通过微信绑定手机号
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-mp-weixin
+ * @param {Object} params
+ * @param {String} params.encryptedData   微信获取手机号返回的加密信息
+ * @param {String} params.iv              微信获取手机号返回的初始向量
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  /**
+   * 微信小程序的规则是客户端应先使用checkSession接口检测上次获取的sessionKey是否仍有效
+   * 如果有效则直接使用上次存储的sessionKey即可
+   * 如果无效应重新调用login接口再次刷新sessionKey
+   * 因此此接口不应直接使用客户端login获取的code，只能使用缓存的sessionKey
+   */
+  const schema = {
+    encryptedData: 'string',
+    iv: 'string'
+  }
+  const {
+    encryptedData,
+    iv
+  } = params
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+
+  const sessionKey = await getWeixinCache.call(this, {
+    uid,
+    key: 'session_key'
+  })
+  if (!sessionKey) {
+    throw new Error('Session key not found')
+  }
+  const {
+    purePhoneNumber: mobile
+  } = decryptWeixinData.call(this, {
+    encryptedData,
+    sessionKey,
+    iv
+  })
+
+  const bindAccount = {
+    mobile
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_MOBILE
+  })
+  await postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {
+      mobile_confirmed: 1
+    },
+    logType: LOG_TYPE.BIND_MOBILE
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..2275b054161365cb150f72bd672e09195da2d72e
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-sms.js
@@ -0,0 +1,92 @@
+const {
+  getNeedCaptcha,
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  LOG_TYPE,
+  SMS_SCENE,
+  CAPTCHA_SCENE
+} = require('../../common/constants')
+const {
+  verifyMobileCode
+} = require('../../lib/utils/verify-code')
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+
+/**
+ * 通过短信验证码绑定手机号
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-sms
+ * @param {Object} params
+ * @param {String} params.mobile    手机号
+ * @param {String} params.code      短信验证码
+ * @param {String} params.captcha   图形验证码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    mobile: 'mobile',
+    code: 'string',
+    captcha: {
+      type: 'string',
+      required: false
+    }
+  }
+  const {
+    mobile,
+    code,
+    captcha
+  } = params
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+
+  // 判断是否需要验证码
+  const needCaptcha = await getNeedCaptcha.call(this, {
+    uid,
+    type: LOG_TYPE.BIND_MOBILE
+  })
+  if (needCaptcha) {
+    await verifyCaptcha.call(this, {
+      captcha,
+      scene: CAPTCHA_SCENE.BIND_MOBILE_BY_SMS
+    })
+  }
+
+  try {
+    // 验证手机号验证码，验证不通过时写入失败日志
+    await verifyMobileCode({
+      mobile,
+      code,
+      scene: SMS_SCENE.BIND_MOBILE_BY_SMS
+    })
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      data: {
+        user_id: uid
+      },
+      type: LOG_TYPE.BIND_MOBILE,
+      success: false
+    })
+    throw error
+  }
+  const bindAccount = {
+    mobile
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_MOBILE
+  })
+  await postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {
+      mobile_confirmed: 1
+    },
+    logType: LOG_TYPE.BIND_MOBILE
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..2970c61cedc73f2a73c402c49db44e1e284d72d3
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-mobile-by-univerify.js
@@ -0,0 +1,70 @@
+const {
+  getPhoneNumber
+} = require('../../lib/utils/univerify')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+
+/**
+ * 通过一键登录绑定手机号
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-mobile-by-univerify
+ * @param {Object} params
+ * @param {String} params.openid        APP端一键登录返回的openid
+ * @param {String} params.access_token  APP端一键登录返回的access_token
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    openid: 'string',
+    access_token: 'string'
+  }
+  const {
+    openid,
+    // eslint-disable-next-line camelcase
+    access_token
+  } = params
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+  let mobile
+  try {
+    const phoneInfo = await getPhoneNumber.call(this, {
+      // eslint-disable-next-line camelcase
+      access_token,
+      openid
+    })
+    mobile = phoneInfo.phoneNumber
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      data: {
+        user_id: uid
+      },
+      type: LOG_TYPE.BIND_MOBILE
+    })
+    throw error
+  }
+
+  const bindAccount = {
+    mobile
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_MOBILE
+  })
+  await postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {
+      mobile_confirmed: 1
+    },
+    logType: LOG_TYPE.BIND_MOBILE
+  })
+  return {
+    errCode: 0
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..ef801a23fdbd5893abba0729a2e65df80449316f
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-qq.js
@@ -0,0 +1,110 @@
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  initQQ
+} = require('../../lib/third-party/index')
+const {
+  generateQQCache,
+  getQQPlatform,
+  saveQQUserKey
+} = require('../../lib/utils/qq')
+
+/**
+ * 绑定QQ
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-qq
+ * @param {Object} params
+ * @param {String} params.code          小程序端QQ登录返回的code
+ * @param {String} params.accessToken   APP端QQ登录返回的accessToken
+ * @param {String} params.accessTokenExpired    accessToken过期时间，由App端QQ登录返回的expires_in参数计算而来，单位：毫秒
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    code: {
+      type: 'string',
+      required: false
+    },
+    accessToken: {
+      type: 'string',
+      required: false
+    },
+    accessTokenExpired: {
+      type: 'number',
+      required: false
+    }
+  }
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+  const {
+    code,
+    accessToken,
+    accessTokenExpired
+  } = params
+  const qqPlatform = getQQPlatform.call(this)
+  const appId = this.getClientInfo().appId
+  const qqApi = initQQ.call(this)
+  const clientPlatform = this.clientPlatform
+  const apiName = clientPlatform === 'mp-qq' ? 'code2Session' : 'getOpenidByToken'
+  let getQQAccountResult
+  try {
+    getQQAccountResult = await qqApi[apiName]({
+      code,
+      accessToken
+    })
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.BIND_QQ
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+
+  const {
+    openid,
+    unionid,
+    // 保存下面四个字段
+    sessionKey // 微信小程序用户sessionKey
+  } = getQQAccountResult
+
+  const bindAccount = {
+    qq_openid: {
+      [clientPlatform]: openid
+    },
+    qq_unionid: unionid
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_QQ
+  })
+  await saveQQUserKey.call(this, {
+    openid,
+    sessionKey,
+    accessToken,
+    accessTokenExpired
+  })
+  return postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {
+      qq_openid: {
+        [`${qqPlatform}_${appId}`]: openid
+      },
+      ...generateQQCache.call(this, {
+        openid,
+        sessionKey
+      })
+    },
+    logType: LOG_TYPE.BIND_QQ
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..b0165077c7fc0f140f78b33c070da18fa9065b27
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/bind-weixin.js
@@ -0,0 +1,100 @@
+const {
+  preBind,
+  postBind
+} = require('../../lib/utils/relate')
+const {
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  generateWeixinCache,
+  saveWeixinUserKey,
+  getWeixinPlatform
+} = require('../../lib/utils/weixin')
+const {
+  initWeixin
+} = require('../../lib/third-party/index')
+const {
+  ERROR
+} = require('../../common/error')
+
+/**
+ * 绑定微信
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#bind-weixin
+ * @param {Object} params
+ * @param {String} params.code  微信登录返回的code
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    code: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const uid = this.authInfo.uid
+  const {
+    code
+  } = params
+  const weixinPlatform = getWeixinPlatform.call(this)
+  const appId = this.getClientInfo().appId
+
+  const weixinApi = initWeixin.call(this)
+  const clientPlatform = this.clientPlatform
+  const apiName = clientPlatform === 'mp-weixin' ? 'code2Session' : 'getOauthAccessToken'
+  let getWeixinAccountResult
+  try {
+    getWeixinAccountResult = await weixinApi[apiName](code)
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      success: false,
+      type: LOG_TYPE.BIND_WEIXIN
+    })
+    throw {
+      errCode: ERROR.GET_THIRD_PARTY_ACCOUNT_FAILED
+    }
+  }
+
+  const {
+    openid,
+    unionid,
+    // 保存下面四个字段
+    sessionKey, // 微信小程序用户sessionKey
+    accessToken, // App端微信用户accessToken
+    refreshToken, // App端微信用户refreshToken
+    expired: accessTokenExpired // App端微信用户accessToken过期时间
+  } = getWeixinAccountResult
+
+  const bindAccount = {
+    wx_openid: {
+      [clientPlatform]: openid
+    },
+    wx_unionid: unionid
+  }
+  await preBind.call(this, {
+    uid,
+    bindAccount,
+    logType: LOG_TYPE.BIND_WEIXIN
+  })
+  await saveWeixinUserKey.call(this, {
+    openid,
+    sessionKey,
+    accessToken,
+    refreshToken,
+    accessTokenExpired
+  })
+  return postBind.call(this, {
+    uid,
+    bindAccount,
+    extraData: {
+      wx_openid: {
+        [`${weixinPlatform}_${appId}`]: openid
+      },
+      ...generateWeixinCache.call(this, {
+        openid,
+        sessionKey, // 微信小程序用户sessionKey
+        accessToken, // App端微信用户accessToken
+        refreshToken, // App端微信用户refreshToken
+        accessTokenExpired // App端微信用户accessToken过期时间
+      })
+    },
+    logType: LOG_TYPE.BIND_WEIXIN
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..5352792029a447de179156aa1713af1de4cdde94
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/relate/index.js
@@ -0,0 +1,9 @@
+module.exports = {
+  bindMobileBySms: require('./bind-mobile-by-sms'),
+  bindMobileByUniverify: require('./bind-mobile-by-univerify'),
+  bindMobileByMpWeixin: require('./bind-mobile-by-mp-weixin'),
+  bindAlipay: require('./bind-alipay'),
+  bindApple: require('./bind-apple'),
+  bindQQ: require('./bind-qq'),
+  bindWeixin: require('./bind-weixin')
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/get-h5-weixin-config.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/get-h5-weixin-config.js
new file mode 100644
index 0000000000000000000000000000000000000000..967792dd4a97f18155e19a0c1a676f02dd21f4f3
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/get-h5-weixin-config.js
@@ -0,0 +1,58 @@
+const {
+  getWeixinPlatform
+} = require('../../lib/utils/weixin')
+const {
+  getNonceStr
+} = require('../../common/utils')
+const {
+  createHash
+} = require('crypto')
+
+/**
+ * 获取微信公众号config参数
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-h5-weixin-config
+ * @param {object} params
+ * @param {string} params.url  当前页面url不带hash部分
+ * @returns
+ */
+module.exports = async function (params) {
+  const schema = {
+    url: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const {
+    url
+  } = params
+  const oauthConfig = this.configUtils.getOauthConfig({
+    provider: 'weixin'
+  })
+  const {
+    appId
+  } = this.getClientInfo()
+  const weixinPlatform = getWeixinPlatform.call(this)
+  const getTicketRes = await this.uniOpenBridge.getTicket({
+    dcloudAppid: appId,
+    platform: weixinPlatform + '-weixin'
+  })
+  if (!getTicketRes) {
+    throw new Error('Wechat official account ticket not found, please referer to: https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login-by-weixin-h5')
+  }
+  const ticket = getTicketRes.ticket
+  const signContent = {
+    jsapi_ticket: ticket,
+    noncestr: getNonceStr(),
+    timestamp: Math.floor(Date.now() / 1000),
+    url: url.split('#')[0]
+  }
+  const signStr = Object.keys(signContent).sort().reduce(function (str, key) {
+    return str + key + '=' + signContent[key] + '&'
+  }, '').replace(/&$/, '')
+  const signature = createHash('sha1').update(signStr, 'utf8').digest('hex')
+  return {
+    errCode: 0,
+    appId: oauthConfig.appid, // 公众号的唯一标识
+    timestamp: signContent.timestamp, // 生成签名的时间戳
+    nonceStr: signContent.noncestr, // 生成签名的随机串
+    signature // 签名
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..11729f6b943df4fcac6c01fd32397fb7a33b4f79
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/index.js
@@ -0,0 +1,4 @@
+module.exports = {
+  refreshToken: require('./refresh-token'),
+  setPushCid: require('./set-push-cid')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..0c1837e692cbe0a1db8716c45c03f1cc29287cc2
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/refresh-token.js
@@ -0,0 +1,19 @@
+/**
+ * 刷新token
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#refresh-token
+ */
+module.exports = async function () {
+  const {
+    token,
+    tokenExpired
+  } = await this.uniIdCommon.refreshToken({
+    token: this.getUniIdToken()
+  })
+  return {
+    errCode: 0,
+    newToken: {
+      token,
+      tokenExpired
+    }
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..68c18c62475b29a82fc10746f7786088472fd041
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/set-push-cid.js
@@ -0,0 +1,141 @@
+const {
+  deviceCollection
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+
+async function setOpendbDevice ({
+  pushClientId
+} = {}) {
+  // 仅新增，如果存在进行更新操作
+  const {
+    appId,
+    deviceId,
+    deviceBrand,
+    deviceModel,
+    osName,
+    osVersion,
+    osLanguage,
+    osTheme,
+    devicePixelRatio,
+    windowWidth,
+    windowHeight,
+    screenWidth,
+    screenHeight,
+    romName,
+    romVersion
+  } = this.getClientInfo()
+  const platform = this.clientPlatform
+  const now = Date.now()
+
+  const db = uniCloud.database()
+  const opendbDeviceCollection = db.collection('opendb-device')
+  const getDeviceRes = await opendbDeviceCollection.where({
+    device_id: deviceId
+  }).get()
+  const data = {
+    appid: appId,
+    device_id: deviceId,
+    vendor: deviceBrand,
+    model: deviceModel,
+    uni_platform: platform,
+    os_name: osName,
+    os_version: osVersion,
+    os_language: osLanguage,
+    os_theme: osTheme,
+    pixel_ratio: devicePixelRatio,
+    window_width: windowWidth,
+    window_height: windowHeight,
+    screen_width: screenWidth,
+    screen_height: screenHeight,
+    rom_name: romName,
+    rom_version: romVersion,
+    last_update_date: now,
+    push_clientid: pushClientId
+  }
+  if (getDeviceRes.data.length > 0) {
+    await opendbDeviceCollection.where({
+      device_id: deviceId
+    }).update(data)
+    return
+  }
+  data.create_date = now
+  await opendbDeviceCollection.add(data)
+}
+
+/**
+ * 更新device表的push_clien_id
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#set-push-cid
+ * @param {object} params
+ * @param {string} params.pushClientId  客户端pushClientId
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    pushClientId: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const {
+    deviceId,
+    appId,
+    osName
+  } = this.getClientInfo()
+  let platform = this.clientPlatform
+  if (platform === 'app') {
+    platform += osName
+  }
+
+  const {
+    uid,
+    exp
+  } = this.authInfo
+  const { pushClientId } = params
+  const tokenExpired = exp * 1000
+  const getDeviceRes = await deviceCollection.where({
+    device_id: deviceId
+  }).get()
+  console.log(getDeviceRes)
+  if (getDeviceRes.data.length > 1) {
+    return {
+      errCode: ERROR.SYSTEM_ERROR
+    }
+  }
+  const deviceRecord = getDeviceRes.data[0]
+  await setOpendbDevice.call(this, {
+    pushClientId
+  })
+  if (!deviceRecord) {
+    await deviceCollection.add({
+      user_id: uid,
+      device_id: deviceId,
+      token_expired: tokenExpired,
+      push_clientid: pushClientId,
+      appid: appId
+    })
+    return {
+      errCode: 0
+    }
+  }
+  // 同一用户允许更新token_expired，不同用户在token_expired小于Date.now()时允许更新。搭配逻辑：用户退出登录时将token_expired置0
+  if (
+    deviceRecord.user_id === uid ||
+    (deviceRecord.token_expired < Date.now())
+  ) {
+    await deviceCollection.where({
+      device_id: deviceId
+    }).update({
+      user_id: uid,
+      token_expired: tokenExpired,
+      push_clientid: pushClientId,
+      appid: appId
+    })
+    return {
+      errCode: 0
+    }
+  }
+
+  return {
+    errCode: ERROR.SYSTEM_ERROR
+  }
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..1d77f5e5a3b67ad6953039bcca032d81feaf35c8
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/create-captcha.js
@@ -0,0 +1,34 @@
+const {
+  CAPTCHA_SCENE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+
+/**
+ * 创建图形验证码
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#create-captcha
+ * @param {Object} params
+ * @param {String} params.scene   图形验证码使用场景
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    scene: 'string'
+  }
+  this.middleware.validate(params, schema)
+
+  const deviceId = this.getClientInfo().deviceId
+  const {
+    scene
+  } = params
+  if (!(Object.values(CAPTCHA_SCENE).includes(scene))) {
+    throw {
+      errCode: ERROR.INVALID_PARAM
+    }
+  }
+  return this.uniCaptcha.create({
+    deviceId,
+    scene
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..fba352403d93b49e23eca46a5bc22545843267f7
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/index.js
@@ -0,0 +1,7 @@
+module.exports = {
+  createCaptcha: require('./create-captcha'),
+  refreshCaptcha: require('./refresh-captcha'),
+  sendSmsCode: require('./send-sms-code'),
+  sendEmailLink: require('./send-email-link'),
+  sendEmailCode: require('./send-email-code')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..e5df246280ade7d3fbc1eed6b01470e1ba11406c
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/refresh-captcha.js
@@ -0,0 +1,34 @@
+const {
+  CAPTCHA_SCENE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+
+/**
+ * 刷新图形验证码
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#refresh-captcha
+ * @param {Object} params
+ * @param {String} params.scene   图形验证码使用场景
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    scene: 'string'
+  }
+  this.middleware.validate(params, schema)
+
+  const deviceId = this.getClientInfo().deviceId
+  const {
+    scene
+  } = params
+  if (!(Object.values(CAPTCHA_SCENE).includes(scene))) {
+    throw {
+      errCode: ERROR.INVALID_PARAM
+    }
+  }
+  return this.uniCaptcha.refresh({
+    deviceId,
+    scene
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..6f2a5fdb66ddfcf5b2af15fc4c4b945cb56fd662
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-code.js
@@ -0,0 +1,12 @@
+/**
+ * 发送邮箱验证码，可用于登录、注册、绑定邮箱、修改密码等操作
+ * @tutorial
+ * @param {Object} params
+ * @param {String} params.email     邮箱
+ * @param {String} params.scene     使用场景
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[sendEmailCode] is not yet implemented')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..f643434a436ac4b6041bf901e7144aff5bc63bc8
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-link.js
@@ -0,0 +1,12 @@
+/**
+ * 发送邮箱链接，可用于登录、注册、绑定邮箱、修改密码等操作
+ * @tutorial
+ * @param {Object} params
+ * @param {String} params.email     邮箱
+ * @param {String} params.scene     使用场景
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  // 此接口暂未实现，欢迎向我们提交pr
+  throw new Error('api[sendEmailLink] is not yet implemented')
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..a29c1011dec0f6402289de185f3e89a8f7532293
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-sms-code.js
@@ -0,0 +1,71 @@
+const {
+  sendSmsCode
+} = require('../../lib/utils/sms')
+const {
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  SMS_SCENE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
+
+/**
+ * 发送短信验证码
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#send-sms-code
+ * @param {Object} params
+ * @param {String} params.mobile    手机号
+ * @param {String} params.captcha   图形验证码
+ * @param {String} params.scene     短信验证码使用场景
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    mobile: 'mobile',
+    captcha: 'string',
+    scene: 'string'
+  }
+  this.middleware.validate(params, schema)
+  const {
+    mobile,
+    captcha,
+    scene
+  } = params
+  if (!(Object.values(SMS_SCENE).includes(scene))) {
+    throw {
+      errCode: ERROR.INVALID_PARAM
+    }
+  }
+  await verifyCaptcha.call(this, {
+    scene: 'send-sms-code',
+    captcha
+  })
+
+  // -- 测试代码
+  const {
+    templateId
+  } = (this.config.service &&
+    this.config.service.sms &&
+    this.config.service.sms.scene &&
+    this.config.service.sms.scene[scene]) || {}
+  if (!templateId) {
+    require('../../lib/utils/verify-code')
+      .setMobileVerifyCode.call(this, {
+        mobile: params.mobile,
+        code: '123456',
+        expiresIn: 180,
+        scene
+      })
+    return {
+      errCode: 'uni-id-invalid-sms-template-id',
+      errMsg: `未找到scene=${scene},的短信模版templateId。\n已启动测试模式，直接使用：123456作为短信验证码即可。\n如果是正式项目，请在路径：/common/uni-config-center/uni-id/config.json中service->sms中配置密钥等信息\n更多详情：https://uniapp.dcloud.io/uniCloud/uni-id.html#config`
+    }
+  }
+  // -- 测试代码
+
+  return sendSmsCode.call(this, {
+    mobile,
+    scene
+  })
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..e8f580ac652b9890d5ceefa469010f719b89fe11
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "uni-id-co",
+  "version": "1.0.10",
+  "description": "",
+  "main": "index.js",
+  "keywords": [],
+  "author": "DCloud",
+  "dependencies": {
+    "jsonwebtoken": "8.5.1",
+    "lodash.merge": "^4.6.2",
+    "uni-captcha": "file:../../../../uni-captcha/uniCloud/cloudfunctions/common/uni-captcha",
+    "uni-config-center": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
+    "uni-id-common": "file:../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common",
+    "uni-open-bridge-common": "file:../../../../uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common"
+  },
+  "extensions": {}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/uniCloud/database/opendb-device.schema.json b/uni_modules/uni-id-pages/uniCloud/database/opendb-device.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..529b672ca053d845b35793b5ec6d61b3d08065fe
--- /dev/null
+++ b/uni_modules/uni-id-pages/uniCloud/database/opendb-device.schema.json
@@ -0,0 +1,142 @@
+{
+	"bsonType": "object",
+	"required": [],
+	"permission": {
+		"read": false,
+		"create": true,
+		"update": false,
+		"delete": false
+	},
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"appid": {
+			"bsonType": "string",
+			"description": "DCloud appid"
+		},
+		"device_id": {
+			"bsonType": "string",
+			"description": "设备唯一标识"
+		},
+		"vendor": {
+			"bsonType": "string",
+			"description": "设备厂商"
+		},
+		"push_clientid": {
+			"bsonType": "string",
+			"description": "推送设备客户端标识"
+		},
+		"imei": {
+			"bsonType": "string",
+			"description": "国际移动设备识别码IMEI(International Mobile Equipment Identity)"
+		},
+		"oaid": {
+			"bsonType": "string",
+			"description": "移动智能设备标识公共服务平台提供的匿名设备标识符(OAID)"
+		},
+		"idfa": {
+			"bsonType": "string",
+			"description": "iOS平台配置应用使用广告标识(IDFA)"
+		},
+		"imsi": {
+			"bsonType": "string",
+			"description": "国际移动用户识别码(International Mobile Subscriber Identification Number)"
+		},
+		"model": {
+			"bsonType": "string",
+			"description": "设备型号"
+		},
+		"platform": {
+			"bsonType": "string",
+			"description": "平台类型"
+		},
+		"uni_platform": {
+			"bsonType": "string",
+			"description": "uni-app 运行平台，与条件编译平台相同。"
+		},
+		"os_name": {
+			"bsonType": "string",
+			"description": "ios|android|windows|mac|linux "
+		},
+		"os_version": {
+			"bsonType": "string",
+			"description": "操作系统版本号 "
+		},
+		"os_language": {
+			"bsonType": "string",
+			"description": "操作系统语言 "
+		},
+		"os_theme": {
+			"bsonType": "string",
+			"description": "操作系统主题 light|dark"
+		},
+		"pixel_ratio": {
+			"bsonType": "string",
+			"description": "设备像素比 "
+		},
+		"network_model": {
+			"bsonType": "string",
+			"description": "设备网络型号wifi/3G/4G/"
+		},
+		"window_width": {
+			"bsonType": "string",
+			"description": "设备窗口宽度 "
+		},
+		"window_height": {
+			"bsonType": "string",
+			"description": "设备窗口高度"
+		},
+		"screen_width": {
+			"bsonType": "string",
+			"description": "设备屏幕宽度"
+		},
+		"screen_height": {
+			"bsonType": "string",
+			"description": "设备屏幕高度"
+		},
+		"rom_name": {
+			"bsonType": "string",
+			"description": "rom 名称"
+		},
+		"rom_version": {
+			"bsonType": "string",
+			"description": "rom 版本"
+		},
+		"location_latitude": {
+			"bsonType": "double",
+			"description": "纬度"
+		},
+		"location_longitude": {
+			"bsonType": "double",
+			"description": "经度"
+		},
+		"location_country": {
+			"bsonType": "string",
+			"description": "国家"
+		},
+		"location_province": {
+			"bsonType": "string",
+			"description": "省份"
+		},
+		"location_city": {
+			"bsonType": "string",
+			"description": "城市"
+		},
+		"create_date": {
+			"bsonType": "timestamp",
+			"description": "创建时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		},
+		"last_update_date": {
+			"bsonType": "timestamp",
+			"description": "最后一次修改时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		}
+	},
+	"version": "0.0.1"
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/uni-id-device.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-device.schema.json
similarity index 76%
rename from uniCloud-aliyun/database/uni-id-device.schema.json
rename to uni_modules/uni-id-pages/uniCloud/database/uni-id-device.schema.json
index da0244fcc66600083a763f9bc02aa857c629e5de..4981d75215fc48da914738bca125aedbe0aefac8 100644
--- a/uniCloud-aliyun/database/uni-id-device.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-device.schema.json
@@ -1,64 +1,83 @@
-{
-	"bsonType": "object",
-	"required": ["user_id"],
-	"properties": {
-		"_id": {
-			"description": "ID，系统自动生成"
-		},
-		"user_id": {
-			"bsonType": "string",
-			"description": "用户id，参考uni-id-users表"
-		},
-		"ua": {
-			"bsonType": "string",
-			"description": "userAgent"
-		},
-		"uuid": {
-			"bsonType": "string",
-			"description": "设备唯一标识(需要加密存储)"
-		},
-		"vendor": {
-			"bsonType": "string",
-			"description": "设备厂商"
-		},
-		"push_clientid": {
-			"bsonType": "string",
-			"description": "推送设备客户端标识"
-		},
-		"imei": {
-			"bsonType": "string",
-			"description": "国际移动设备识别码IMEI(International Mobile Equipment Identity)"
-		},
-		"oaid": {
-			"bsonType": "string",
-			"description": "移动智能设备标识公共服务平台提供的匿名设备标识符(OAID)"
-		},
-		"idfa": {
-			"bsonType": "string",
-			"description": "iOS平台配置应用使用广告标识(IDFA)"
-		},
-		"model": {
-			"bsonType": "string",
-			"description": "设备型号"
-		},
-		"platform": {
-			"bsonType": "string",
-			"description": "平台类型"
-		},
-		"create_date": {
-			"bsonType": "timestamp",
-			"description": "创建时间",
-			"forceDefaultValue": {
-				"$env": "now"
-			}
-		},
-		"last_active_date": {
-			"bsonType": "timestamp",
-			"description": "最后登录时间"
-		},
-		"last_active_ip": {
-			"bsonType": "string",
-			"description": "最后登录IP"
-		}
-	}
-}
+{
+	"bsonType": "object",
+	"required": [
+		"user_id"
+	],
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"user_id": {
+			"bsonType": "string",
+			"description": "用户id，参考uni-id-users表"
+		},
+		"ua": {
+			"bsonType": "string",
+			"description": "userAgent"
+		},
+		"uuid": {
+			"bsonType": "string",
+			"description": "设备唯一标识(需要加密存储)"
+		},
+		"os_name": {
+			"bsonType": "string",
+			"description": "ios|android|windows|mac|linux "
+		},
+		"os_version": {
+			"bsonType": "string",
+			"description": "操作系统版本号 "
+		},
+		"os_language": {
+			"bsonType": "string",
+			"description": "操作系统语言 "
+		},
+		"os_theme": {
+			"bsonType": "string",
+			"description": "操作系统主题 light|dark"
+		},
+		"vendor": {
+			"bsonType": "string",
+			"description": "设备厂商"
+		},
+		"push_clientid": {
+			"bsonType": "string",
+			"description": "推送设备客户端标识"
+		},
+		"imei": {
+			"bsonType": "string",
+			"description": "国际移动设备识别码IMEI(International Mobile Equipment Identity)"
+		},
+		"oaid": {
+			"bsonType": "string",
+			"description": "移动智能设备标识公共服务平台提供的匿名设备标识符(OAID)"
+		},
+		"idfa": {
+			"bsonType": "string",
+			"description": "iOS平台配置应用使用广告标识(IDFA)"
+		},
+		"model": {
+			"bsonType": "string",
+			"description": "设备型号"
+		},
+		"platform": {
+			"bsonType": "string",
+			"description": "平台类型"
+		},
+		"create_date": {
+			"bsonType": "timestamp",
+			"description": "创建时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		},
+		"last_active_date": {
+			"bsonType": "timestamp",
+			"description": "最后登录时间"
+		},
+		"last_active_ip": {
+			"bsonType": "string",
+			"description": "最后登录IP"
+		}
+	},
+	"version": "0.0.1"
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/uni-id-log.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-log.schema.json
similarity index 53%
rename from uniCloud-aliyun/database/uni-id-log.schema.json
rename to uni_modules/uni-id-pages/uniCloud/database/uni-id-log.schema.json
index cb1d86b2b96395dd3a2abd8286b713b00e680556..31dfaeb04b9880ee515f1b469e86718cb398d856 100644
--- a/uniCloud-aliyun/database/uni-id-log.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-log.schema.json
@@ -1,41 +1,67 @@
-{
-	"bsonType": "object",
-	"required": ["user_id"],
-	"properties": {
-		"_id": {
-			"description": "ID，系统自动生成"
-		},
-		"user_id": {
-			"bsonType": "string",
-			"description": "用户id，参考uni-id-users表"
-		},
-		"ua": {
-			"bsonType": "string",
-			"description": "userAgent"
-		},
-		"device_uuid": {
-			"bsonType": "string",
-			"description": "设备唯一标识(需要加密存储)"
-		},
-		"type": {
-			"bsonType": "string",
-			"enum": ["login", "logout"],
-			"description": "登录类型"
-		},
-		"state": {
-			"bsonType": "int",
-			"description": "结果：0 失败、1 成功"
-		},
-		"ip": {
-			"bsonType": "string",
-			"description": "ip地址"
-		},
-		"create_date": {
-			"bsonType": "timestamp",
-			"description": "创建时间",
-			"forceDefaultValue": {
-				"$env": "now"
-			}
-		}
-	}
+{
+	"bsonType": "object",
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"create_date": {
+			"bsonType": "timestamp",
+			"description": "创建时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		},
+		"device_uuid": {
+			"bsonType": "string",
+			"description": "设备唯一标识"
+		},
+		"ip": {
+			"bsonType": "string",
+			"description": "ip地址"
+		},
+		"state": {
+			"bsonType": "int",
+			"description": "结果：0 失败、1 成功"
+		},
+		"type": {
+			"bsonType": "string",
+			"description": "操作类型",
+			"enum": [
+				"logout",
+				"login",
+				"register",
+				"reset-pwd",
+				"bind-mobile",
+				"bind-weixin",
+				"bind-qq",
+				"bind-apple",
+				"bind-alipay"
+			]
+		},
+		"ua": {
+			"bsonType": "string",
+			"description": "userAgent"
+		},
+		"user_id": {
+			"bsonType": "string",
+			"description": "用户id，参考uni-id-users表"
+		},
+		"username": {
+			"bsonType": "string",
+			"description": "用户名"
+		},
+		"email": {
+			"bsonType": "string",
+			"description": "邮箱"
+		},
+		"mobile": {
+			"bsonType": "string",
+			"description": "手机号"
+		},
+		"appid": {
+			"bsonType": "string",
+			"description": "客户端DCloud AppId"
+		}
+	},
+	"required": []
 }
diff --git a/uniCloud-aliyun/database/uni-id-permissions.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-permissions.schema.json
similarity index 82%
rename from uniCloud-aliyun/database/uni-id-permissions.schema.json
rename to uni_modules/uni-id-pages/uniCloud/database/uni-id-permissions.schema.json
index c5dba1e2a399544c680ff799b41cf0254e333363..014b3cab6c2df93efa2059b6b3afb559cce50653 100644
--- a/uniCloud-aliyun/database/uni-id-permissions.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-permissions.schema.json
@@ -1,46 +1,49 @@
-{
-	"bsonType": "object",
-	"required": ["permission_id", "permission_name"],
-	"properties": {
-		"_id": {
-			"description": "存储文档 ID，系统自动生成"
-		},
-		"permission_id": {
-			"bsonType": "string",
-			"description": "权限唯一标识，不可修改，不允许重复",
-			"label": "权限标识",
-			"trim": "both",
-			"title": "权限ID",
-			"component": {
-				"name": "input"
-			}
-		},
-		"permission_name": {
-			"bsonType": "string",
-			"description": "权限名称",
-			"label": "权限名称",
-			"title": "权限名称",
-			"trim": "both",
-			"component": {
-				"name": "input"
-			}
-		},
-		"comment": {
-			"bsonType": "string",
-			"description": "备注",
-			"label": "备注",
-			"title": "备注",
-			"trim": "both",
-			"component": {
-				"name": "textarea"
-			}
-		},
-		"create_date": {
-			"bsonType": "timestamp",
-			"description": "创建时间",
-			"forceDefaultValue": {
-				"$env": "now"
-			}
-		}
-	}
-}
+{
+	"bsonType": "object",
+	"properties": {
+		"_id": {
+			"description": "存储文档 ID，系统自动生成"
+		},
+		"comment": {
+			"bsonType": "string",
+			"component": {
+				"name": "textarea"
+			},
+			"description": "备注",
+			"label": "备注",
+			"title": "备注",
+			"trim": "both"
+		},
+		"create_date": {
+			"bsonType": "timestamp",
+			"description": "创建时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		},
+		"permission_id": {
+			"bsonType": "string",
+			"component": {
+				"name": "input"
+			},
+			"description": "权限唯一标识，不可修改，不允许重复",
+			"label": "权限标识",
+			"title": "权限ID",
+			"trim": "both"
+		},
+		"permission_name": {
+			"bsonType": "string",
+			"component": {
+				"name": "input"
+			},
+			"description": "权限名称",
+			"label": "权限名称",
+			"title": "权限名称",
+			"trim": "both"
+		}
+	},
+	"required": [
+		"permission_id",
+		"permission_name"
+	]
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/uni-id-roles.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-roles.schema.json
similarity index 81%
rename from uniCloud-aliyun/database/uni-id-roles.schema.json
rename to uni_modules/uni-id-pages/uniCloud/database/uni-id-roles.schema.json
index c07ebf76671009b3489c51e2e2d92f044a2bba4b..de7a015c9ae345939a902eaa2cc8ccc6b3632a41 100644
--- a/uniCloud-aliyun/database/uni-id-roles.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-roles.schema.json
@@ -1,46 +1,48 @@
-{
-	"bsonType": "object",
-	"required": ["role_id"],
-	"permission": {
-		"read": false,
-		"create": false,
-		"update": false,
-		"delete": false
-	},
-	"properties": {
-		"_id": {
-			"description": "存储文档 ID，系统自动生成"
-		},
-		"role_id": {
-			"title": "唯一ID",
-			"bsonType": "string",
-			"description": "角色唯一标识，不可修改，不允许重复",
-			"trim": "both"
-		},
-		"role_name": {
-			"title": "名称",
-			"bsonType": "string",
-			"description": "角色名称",
-			"trim": "both"
-		},
-		"permission": {
-			"title": "权限",
-			"bsonType": "array",
-			"foreignKey": "uni-id-permissions.permission_id",
-			"description": "角色拥有的权限列表"
-		},
-		"comment": {
-			"title": "备注",
-			"bsonType": "string",
-			"description": "备注",
-			"trim": "both"
-		},
-		"create_date": {
-			"bsonType": "timestamp",
-			"description": "创建时间",
-			"forceDefaultValue": {
-				"$env": "now"
-			}
-		}
-	}
-}
+{
+	"bsonType": "object",
+	"permission": {
+		"create": false,
+		"delete": false,
+		"read": false,
+		"update": false
+	},
+	"properties": {
+		"_id": {
+			"description": "存储文档 ID，系统自动生成"
+		},
+		"comment": {
+			"bsonType": "string",
+			"description": "备注",
+			"title": "备注",
+			"trim": "both"
+		},
+		"create_date": {
+			"bsonType": "timestamp",
+			"description": "创建时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		},
+		"permission": {
+			"bsonType": "array",
+			"description": "角色拥有的权限列表",
+			"foreignKey": "uni-id-permissions.permission_id",
+			"title": "权限"
+		},
+		"role_id": {
+			"bsonType": "string",
+			"description": "角色唯一标识，不可修改，不允许重复",
+			"title": "唯一ID",
+			"trim": "both"
+		},
+		"role_name": {
+			"bsonType": "string",
+			"description": "角色名称",
+			"title": "名称",
+			"trim": "both"
+		}
+	},
+	"required": [
+		"role_id"
+	]
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/uni-id-users.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
similarity index 74%
rename from uniCloud-aliyun/database/uni-id-users.schema.json
rename to uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
index c32b8289341d58992a35c1c6cd96175bd8e491f4..106d79fd7d2f0e60ab7949d866802907b9296dc2 100644
--- a/uniCloud-aliyun/database/uni-id-users.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
@@ -1,366 +1,402 @@
-{
+{
 	"bsonType": "object",
-	"permission":{
-		"read":true,
-		"update":"doc._id == auth.uid"
-	},
-	"required": [],
-	"properties": {
-		"_id": {
-			"description": "存储文档 ID（用户 ID），系统自动生成"
-		},
-		"username": {
-			"bsonType": "string",
-			"title": "用户名",
-			"description": "用户名，不允许重复",
+	"permission": {
+		"update": "doc._id == auth.uid",
+		"read": true
+	},
+	"properties": {
+		"_id": {
+			"description": "存储文档 ID（用户 ID），系统自动生成"
+		},
+		"ali_openid": {
+			"bsonType": "string",
+			"description": "支付宝平台openid",
+			"permission": {
+				"write": false
+			}
+		},
+		"apple_openid": {
+			"bsonType": "string",
+			"description": "苹果登录openid",
+			"permission": {
+				"write": false
+			}
+		},
+		"avatar": {
+			"bsonType": "string",
+			"description": "头像地址",
+			"title": "头像地址",
+			"trim": "both"
+		},
+		"avatar_file": {
+			"bsonType": "file",
+			"description": "用file类型方便使用uni-file-picker组件",
+			"title": "头像文件"
+		},
+		"comment": {
+			"bsonType": "string",
+			"description": "备注",
+			"title": "备注",
 			"trim": "both",
-			"permission":{
-				"write":false
-			}
-		},
-		"password": {
-			"bsonType": "password",
-			"title": "密码",
-			"description": "密码，加密存储",
+			"permission": {
+				"write": false
+			}
+		},
+		"dcloud_appid": {
+			"bsonType": "array",
+			"description": "允许登录的客户端的appid列表",
+			"foreignKey": "opendb-app-list.appid",
+			"permission": {
+				"write": false
+			}
+		},
+		"department_id": {
+			"bsonType": "array",
+			"description": "部门ID",
+			"enum": {
+				"collection": "opendb-department",
+				"field": "_id as value, name as text",
+				"orderby": "name asc"
+			},
+			"enumType": "tree",
+			"title": "部门",
+			"permission": {
+				"write": false
+			}
+		},
+		"email": {
+			"bsonType": "string",
+			"description": "邮箱地址",
+			"format": "email",
+			"title": "邮箱",
 			"trim": "both",
-			"permission":{
-				"write":false
+			"permission": {
+				"write": false
 			}
-		},
-		"password_secret_version": {
-			"bsonType": "int",
-			"title": "passwordSecret",
-			"description": "密码使用的passwordSecret版本",
-			"permission":{
-				"write":false
-			}
-		},
-		"nickname": {
-			"bsonType": "string",
-			"title": "昵称",
-			"description": "用户昵称",
-			"trim": "both"
-		},
-		"gender": {
-			"bsonType": "int",
-			"title": "性别",
-			"description": "用户性别：0 未知 1 男性 2 女性",
-			"defaultValue": 0,
-			"enum": [{
-					"text": "未知",
-					"value": 0
-				},
-				{
-					"text": "男",
-					"value": 1
-				},
-				{
-					"text": "女",
-					"value": 2
-				}
-			]
-		},
-		"status": {
-			"bsonType": "int",
-			"description": "用户状态：0 正常 1 禁用 2 审核中 3 审核拒绝",
-			"title": "用户状态",
+		},
+		"email_confirmed": {
+			"bsonType": "int",
 			"defaultValue": 0,
-			"permission":{
-				"write":false
-			},
-			"enum": [{
-					"text": "正常",
-					"value": 0
-				},
-				{
-					"text": "禁用",
-					"value": 1
-				},
-				{
-					"text": "审核中",
-					"value": 2
-				},
-				{
-					"text": "审核拒绝",
-					"value": 3
-				}
-			]
-		},
-		"mobile": {
-			"bsonType": "string",
-			"title": "手机号码",
-			"description": "手机号码",
-			"pattern": "^\\+?[0-9-]{3,20}$",
-			"trim": "both",
-			"permission":{
-				"write":false
-			}
-		},
-		"mobile_confirmed": {
-			"bsonType": "int",
-			"description": "手机号验证状态：0 未验证 1 已验证",
-			"title": "手机号验证状态",
-			"defaultValue": 0,
-			"enum": [{
-					"text": "未验证",
-					"value": 0
-				},
-				{
-					"text": "已验证",
-					"value": 1
-				}
+			"description": "邮箱验证状态：0 未验证 1 已验证",
+			"enum": [{
+					"text": "未验证",
+					"value": 0
+				},
+				{
+					"text": "已验证",
+					"value": 1
+				}
 			],
-			"permission":{
-				"write":false
-			}
-		},
-		"email": {
-			"bsonType": "string",
-			"format": "email",
-			"title": "邮箱",
-			"description": "邮箱地址",
-			"trim": "both",
-			"permission":{
-				"write":false
-			}
-		},
-		"email_confirmed": {
-			"bsonType": "int",
-			"description": "邮箱验证状态：0 未验证 1 已验证",
-			"title": "邮箱验证状态",
-			"defaultValue": 0,
-			"enum": [{
-					"text": "未验证",
-					"value": 0
-				},
-				{
-					"text": "已验证",
-					"value": 1
-				}
+			"title": "邮箱验证状态",
+			"permission": {
+				"write": false
+			}
+		},
+		"gender": {
+			"bsonType": "int",
+			"defaultValue": 0,
+			"description": "用户性别：0 未知 1 男性 2 女性",
+			"enum": [{
+					"text": "未知",
+					"value": 0
+				},
+				{
+					"text": "男",
+					"value": 1
+				},
+				{
+					"text": "女",
+					"value": 2
+				}
 			],
-			"permission":{
-				"write":false
-			}
-		},
-		"avatar": {
-			"bsonType": "string",
-			"title": "头像地址",
-			"description": "头像地址",
-			"trim": "both"
-		},
-		"avatar_file": {
-			"bsonType": "file",
-			"title": "头像文件",
-			"description": "用file类型方便使用uni-file-picker组件"
-		},
-		"department_id": {
-			"bsonType": "array",
-			"description": "部门ID",
-			"permission":{
-				"write":false
-			},
-			"title": "部门",
-			"enumType": "tree",
-			"enum": {
-				"collection": "opendb-department",
-				"orderby": "name asc",
-				"field": "_id as value, name as text"
-			}
-		},
-		"role": {
-			"bsonType": "array",
-			"title": "角色",
-			"description": "用户角色",
-			"enum": {
-				"collection": "uni-id-roles",
-				"field": "role_id as value, role_name as text"
-			},
-			"foreignKey": "uni-id-roles.role_id",
-			"permission": {
-				"write": false
-			}
-		},
-		"wx_unionid": {
-			"bsonType": "string",
-			"description": "微信unionid",
-			"permission":{
-				"write":false
-			}
-		},
-		"wx_openid": {
-			"bsonType": "object",
-			"description": "微信各个平台openid",
-			"properties": {
-				"app-plus": {
-					"bsonType": "string",
-					"description": "app平台微信openid"
-				},
-				"mp-weixin": {
-					"bsonType": "string",
-					"description": "微信小程序平台openid"
-				}
-			},
-			"permission":{
-				"write":false
-			}
-		},
-		"ali_openid": {
-			"bsonType": "string",
-			"description": "支付宝平台openid",
-			"permission":{
-				"write":false
-			}
-		},
-		"apple_openid": {
-			"bsonType": "string",
-			"description": "苹果登录openid",
-			"permission":{
-				"write":false
-			}
-		},
-		"comment": {
-			"bsonType": "string",
-			"title": "备注",
-			"description": "备注",
+			"title": "性别",
+			"permission": {
+				"write": false
+			}
+		},
+		"invite_time": {
+			"bsonType": "timestamp",
+			"description": "受邀时间",
+			"permission": {
+				"write": false
+			}
+		},
+		"inviter_uid": {
+			"bsonType": "array",
+			"description": "用户全部上级邀请者",
 			"trim": "both",
-			"permission":{
-				"write":false
-			}
-		},
-		"realname_auth": {
-			"bsonType": "object",
-			"description": "实名认证信息",
-			"required": [
-				"type",
-				"auth_status"
-			],
-			"permission":{
-				"write":false
-			},
-			"properties": {
-				"type": {
-					"bsonType": "int",
-					"minimum": 0,
-					"maximum": 1,
-					"description": "用户类型：0 个人用户 1 企业用户"
-				},
-				"auth_status": {
-					"bsonType": "int",
-					"minimum": 0,
-					"maximum": 3,
-					"description": "认证状态：0 未认证 1 等待认证 2 认证通过 3 认证失败"
-				},
-				"auth_date": {
-					"bsonType": "timestamp",
-					"description": "认证通过时间"
-				},
-				"real_name": {
-					"bsonType": "string",
-					"description": "真实姓名/企业名称"
-				},
-				"identity": {
-					"bsonType": "string",
-					"description": "身份证号码/营业执照号码"
-				},
-				"id_card_front": {
-					"bsonType": "string",
-					"description": "身份证正面照 URL"
-				},
-				"id_card_back": {
-					"bsonType": "string",
-					"description": "身份证反面照 URL"
-				},
-				"in_hand": {
-					"bsonType": "string",
-					"description": "手持身份证照片 URL"
-				},
-				"license": {
-					"bsonType": "string",
-					"description": "营业执照 URL"
-				},
-				"contact_person": {
-					"bsonType": "string",
-					"description": "联系人姓名"
-				},
-				"contact_mobile": {
-					"bsonType": "string",
-					"description": "联系人手机号码"
-				},
-				"contact_email": {
-					"bsonType": "string",
-					"description": "联系人邮箱"
-				}
-			}
-		},
-		"score": {
-			"bsonType": "int",
-			"description": "用户积分，积分变更记录可参考：uni-id-scores表定义",
-			"permission":{
-				"write":false
-			}
-		},
-		"register_date": {
-			"bsonType": "timestamp",
-			"description": "注册时间",
-			"forceDefaultValue": {
-				"$env": "now"
-			},
-			"permission":{
-				"write":false
-			}
-		},
-		"register_ip": {
-			"bsonType": "string",
-			"description": "注册时 IP 地址",
-			"forceDefaultValue": {
-				"$env": "clientIP"
-			},
-			"permission":{
-				"write":false
-			}
-		},
-		"last_login_date": {
-			"bsonType": "timestamp",
+			"permission": {
+				"write": false
+			}
+		},
+		"last_login_date": {
+			"bsonType": "timestamp",
 			"description": "最后登录时间",
-			"permission":{
-				"write":false
-			}
-		},
-		"last_login_ip": {
-			"bsonType": "string",
+			"permission": {
+				"write": false
+			}
+		},
+		"last_login_ip": {
+			"bsonType": "string",
 			"description": "最后登录时 IP 地址",
-			"permission":{
-				"write":false
-			}
-		},
-		"token": {
-			"bsonType": "array",
-			"description": "用户token",
-			"permission":{
-				"write":false
-			}
-		},
-		"inviter_uid": {
-			"bsonType": "array",
-			"description": "用户全部上级邀请者",
+			"permission": {
+				"write": false
+			}
+		},
+		"mobile": {
+			"bsonType": "string",
+			"description": "手机号码",
+			"pattern": "^\\+?[0-9-]{3,20}$",
+			"title": "手机号码",
 			"trim": "both",
-			"permission":{
-				"write":false
-			}
-		},
-		"invite_time": {
-			"bsonType": "timestamp",
-			"description": "受邀时间",
-			"permission":{
-				"write":false
-			}
-		},
-		"my_invite_code": {
-			"bsonType": "string",
+			"permission": {
+				"write": false
+			}
+		},
+		"mobile_confirmed": {
+			"bsonType": "int",
+			"defaultValue": 0,
+			"description": "手机号验证状态：0 未验证 1 已验证",
+			"enum": [{
+					"text": "未验证",
+					"value": 0
+				},
+				{
+					"text": "已验证",
+					"value": 1
+				}
+			],
+			"title": "手机号验证状态",
+			"permission": {
+				"write": false
+			}
+		},
+		"my_invite_code": {
+			"bsonType": "string",
 			"description": "用户自身邀请码",
-			"permission":{
-				"write":false
-			}
-		}
-	}
+			"permission": {
+				"write": false
+			}
+		},
+		"nickname": {
+			"bsonType": "string",
+			"description": "用户昵称",
+			"title": "昵称",
+			"trim": "both"
+		},
+		"password": {
+			"bsonType": "password",
+			"description": "密码，加密存储",
+			"title": "密码",
+			"trim": "both",
+			"permission": {
+				"write": false,
+				"read": false
+			}
+		},
+		"password_secret_version": {
+			"bsonType": "int",
+			"description": "密码使用的passwordSecret版本",
+			"title": "passwordSecret",
+			"permission": {
+				"write": false,
+				"read": false
+			}
+		},
+		"realname_auth": {
+			"bsonType": "object",
+			"description": "实名认证信息",
+			"permission": {
+				"write": false
+			},
+			"properties": {
+				"auth_date": {
+					"bsonType": "timestamp",
+					"description": "认证通过时间"
+				},
+				"auth_status": {
+					"bsonType": "int",
+					"description": "认证状态：0 未认证 1 等待认证 2 认证通过 3 认证失败",
+					"maximum": 3,
+					"minimum": 0
+				},
+				"contact_email": {
+					"bsonType": "string",
+					"description": "联系人邮箱"
+				},
+				"contact_mobile": {
+					"bsonType": "string",
+					"description": "联系人手机号码"
+				},
+				"contact_person": {
+					"bsonType": "string",
+					"description": "联系人姓名"
+				},
+				"id_card_back": {
+					"bsonType": "string",
+					"description": "身份证反面照 URL"
+				},
+				"id_card_front": {
+					"bsonType": "string",
+					"description": "身份证正面照 URL"
+				},
+				"identity": {
+					"bsonType": "string",
+					"description": "身份证号码/营业执照号码"
+				},
+				"in_hand": {
+					"bsonType": "string",
+					"description": "手持身份证照片 URL"
+				},
+				"license": {
+					"bsonType": "string",
+					"description": "营业执照 URL"
+				},
+				"real_name": {
+					"bsonType": "string",
+					"description": "真实姓名/企业名称"
+				},
+				"type": {
+					"bsonType": "int",
+					"description": "用户类型：0 个人用户 1 企业用户",
+					"maximum": 1,
+					"minimum": 0
+				}
+			},
+			"required": [
+				"type",
+				"auth_status"
+			]
+		},
+		"register_date": {
+			"bsonType": "timestamp",
+			"description": "注册时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		},
+		"register_ip": {
+			"bsonType": "string",
+			"description": "注册时 IP 地址",
+			"forceDefaultValue": {
+				"$env": "clientIP"
+			}
+		},
+		"role": {
+			"bsonType": "array",
+			"description": "用户角色",
+			"enum": {
+				"collection": "uni-id-roles",
+				"field": "role_id as value, role_name as text"
+			},
+			"foreignKey": "uni-id-roles.role_id",
+			"permission": {
+				"write": false
+			},
+			"title": "角色"
+		},
+		"score": {
+			"bsonType": "int",
+			"description": "用户积分，积分变更记录可参考：uni-id-scores表定义",
+			"permission": {
+				"write": false
+			}
+		},
+		"status": {
+			"bsonType": "int",
+			"defaultValue": 0,
+			"description": "用户状态：0 正常 1 禁用 2 审核中 3 审核拒绝",
+			"permission": {
+				"write": false
+			},
+			"enum": [{
+					"text": "正常",
+					"value": 0
+				},
+				{
+					"text": "禁用",
+					"value": 1
+				},
+				{
+					"text": "审核中",
+					"value": 2
+				},
+				{
+					"text": "审核拒绝",
+					"value": 3
+				}
+			],
+			"title": "用户状态"
+		},
+		"token": {
+			"bsonType": "array",
+			"description": "用户token"
+		},
+		"username": {
+			"bsonType": "string",
+			"description": "用户名，不允许重复",
+			"title": "用户名",
+			"trim": "both",
+			"permission": {
+				"write": false
+			}
+		},
+		"wx_openid": {
+			"bsonType": "object",
+			"description": "微信各个平台openid",
+			"properties": {
+				"app": {
+					"bsonType": "string",
+					"description": "app平台微信openid"
+				},
+				"mp": {
+					"bsonType": "string",
+					"description": "微信小程序平台openid"
+				},
+				"h5": {
+					"bsonType": "string",
+					"description": "微信公众号登录openid"
+				},
+				"web": {
+					"bsonType": "string",
+					"description": "PC页面扫码登录openid"
+				}
+			},
+			"permission": {
+				"write": false
+			}
+		},
+		"wx_unionid": {
+			"bsonType": "string",
+			"description": "微信unionid",
+			"permission": {
+				"write": false
+			}
+		},
+		"qq_openid": {
+			"bsonType": "object",
+			"description": "QQ各个平台openid",
+			"properties": {
+				"app": {
+					"bsonType": "string",
+					"description": "app平台QQ openid"
+				},
+				"mp": {
+					"bsonType": "string",
+					"description": "QQ小程序平台openid"
+				}
+			},
+			"permission": {
+				"write": false
+			}
+		},
+		"qq_unionid": {
+			"bsonType": "string",
+			"description": "QQ unionid",
+			"permission": {
+				"write": false
+			}
+		}
+	},
+	"required": []
 }
diff --git a/uni_modules/uni-list/changelog.md b/uni_modules/uni-list/changelog.md
index b86237ea334ae2de12a3902c189c15840fe84d8b..6aa6e4e0028e0a51f0b0ca9c29912fa70a8a1315 100644
--- a/uni_modules/uni-list/changelog.md
+++ b/uni_modules/uni-list/changelog.md
@@ -1,18 +1,20 @@
+## 1.2.1（2022-03-30）
+- 删除无用文件
 ## 1.2.0（2021-11-23）
 - 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
 - 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-list](https://uniapp.dcloud.io/component/uniui/uni-list)
-## 1.1.3（2021-08-30）
-- 修复 在vue3中to属性在发行应用的时候报错的bug
-## 1.1.2（2021-07-30）
-- 优化 vue3下事件警告的问题
-## 1.1.1（2021-07-21）
-- 修复 与其他组件嵌套使用时，点击失效的Bug
-## 1.1.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 1.0.17（2021-05-12）
-- 新增 组件示例地址
-## 1.0.16（2021-02-05）
-- 优化 组件引用关系，通过uni_modules引用组件
-## 1.0.15（2021-02-05）
-- 调整为uni_modules目录规范
-- 修复 uni-list-chat 角标显示不正常的问题
+## 1.1.3（2021-08-30）
+- 修复 在vue3中to属性在发行应用的时候报错的bug
+## 1.1.2（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.1（2021-07-21）
+- 修复 与其他组件嵌套使用时，点击失效的Bug
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.17（2021-05-12）
+- 新增 组件示例地址
+## 1.0.16（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.0.15（2021-02-05）
+- 调整为uni_modules目录规范
+- 修复 uni-list-chat 角标显示不正常的问题
diff --git a/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue b/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
index 553dea2cc0a33e3ec09823b6e2a64a21b615ebea..d145b5498febefe29d34fee987d7bd3122a0e6d8 100644
--- a/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
+++ b/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
@@ -69,7 +69,7 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
 	.uni-list-ad {
 		position: relative;
 		border: 1px red solid;
@@ -104,4 +104,4 @@
 	}
 
 	/* #endif */
-</style>
+</style>
diff --git 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
index a56c8be7b28c782bd44d5a3621d345b620c5121b..04e56b82f9902b0a23740e69d93e46133cc5ea7a 100644
--- 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
@@ -7,7 +7,7 @@
 			<view class="uni-list-chat__container">
 				<view class="uni-list-chat__header-warp">
 					<view v-if="avatarCircle || avatarList.length === 0" class="uni-list-chat__header" :class="{ 'header--circle': avatarCircle }">
-						<image class="uni-list-chat__header-image" :src="avatar" mode="aspectFill"></image>
+						<image class="uni-list-chat__header-image" :class="{ 'header--circle': avatarCircle }" :src="avatar" mode="aspectFill"></image>
 					</view>
 					<!-- 头像组 -->
 					<view v-else class="uni-list-chat__header">
@@ -217,10 +217,10 @@
 	};
 </script>
 
-<style lang="scss" scoped>
-	$uni-font-size-lg:16px;
-	$uni-spacing-row-sm: 5px;
-	$uni-spacing-row-base: 10px;
+<style lang="scss" >
+	$uni-font-size-lg:16px;
+	$uni-spacing-row-sm: 5px;
+	$uni-spacing-row-base: 10px;
 	$uni-spacing-row-lg: 15px;
 	$background-color: #fff;
 	$divide-line-color: #e5e5e5;
@@ -535,4 +535,4 @@
 		left: 0;
 		/* #endif */
 	}
-</style>
+</style>
diff --git 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
index 3f667af15ca2e63e5863cfb73dc0d525ea80d425..2c7d9ea7cec731113cce0f3e76301e6f5e37b181 100644
--- 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
@@ -1,260 +1,267 @@
-<template>
-	<!-- #ifdef APP-NVUE -->
-	<cell>
-		<!-- #endif -->
-
-		<view :class="{ 'uni-list-item--disabled': disabled }"
-			:hover-class="(!clickable && !link) || disabled || showSwitch ? '' : 'uni-list-item--hover'"
-			class="uni-list-item" @click="onClick">
-			<view v-if="!isFirstChild" class="border--left" :class="{ 'uni-list--border': border }"></view>
-			<view class="uni-list-item__container"
-				:class="{ 'container--right': showArrow || link, 'flex--direction': direction === 'column' }">
-				<slot name="header">
-					<view class="uni-list-item__header">
-						<view v-if="thumb" class="uni-list-item__icon">
-							<image :src="thumb" class="uni-list-item__icon-img" :class="['uni-list--' + thumbSize]" />
-						</view>
-						<view v-else-if="showExtraIcon" class="uni-list-item__icon">
-							<uni-icons :color="extraIcon.color" :size="extraIcon.size" :type="extraIcon.type" />
-						</view>
-					</view>
-				</slot>
-				<slot name="body">
-					<view class="uni-list-item__content"
-						:class="{ 'uni-list-item__content--center': thumb || showExtraIcon || showBadge || showSwitch }">
-						<text v-if="title" class="uni-list-item__content-title"
-							:class="[ellipsis !== 0 && ellipsis <= 2 ? 'uni-ellipsis-' + ellipsis : '']">{{ title }}</text>
-						<text v-if="note" class="uni-list-item__content-note">{{ note }}</text>
-					</view>
-				</slot>
-				<slot name="footer">
-					<view v-if="rightText || showBadge || showSwitch" class="uni-list-item__extra"
-						:class="{ 'flex--justify': direction === 'column' }">
-						<text v-if="rightText" class="uni-list-item__extra-text">{{ rightText }}</text>
-						<uni-badge v-if="showBadge" :type="badgeType" :text="badgeText" />
-						<switch v-if="showSwitch" :disabled="disabled" :checked="switchChecked"
-							@change="onSwitchChange" />
-					</view>
-				</slot>
-			</view>
-			<uni-icons v-if="showArrow || link" :size="16" class="uni-icon-wrapper" color="#bbb" type="arrowright" />
-		</view>
-		<!-- #ifdef APP-NVUE -->
-	</cell>
-	<!-- #endif -->
-</template>
-
-<script>
-	/**
-	 * ListItem 列表子组件
-	 * @description 列表子组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=24
-	 * @property {String} 	title 							标题
-	 * @property {String} 	note 							描述
-	 * @property {String} 	thumb 							左侧缩略图，若thumb有值，则不会显示扩展图标
-	 * @property {String}  	thumbSize = [lg|base|sm]		略缩图大小
-	 * 	@value 	 lg			大图
-	 * 	@value 	 base		一般
-	 * 	@value 	 sm			小图
-	 * @property {String} 	badgeText						数字角标内容
-	 * @property {String} 	badgeType 						数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)
-	 * @property {String} 	rightText 						右侧文字内容
-	 * @property {Boolean} 	disabled = [true|false]			是否禁用
-	 * @property {Boolean} 	clickable = [true|false] 		是否开启点击反馈
-	 * @property {String} 	link = [navigateTo|redirectTo|reLaunch|switchTab] 是否展示右侧箭头并开启点击反馈
-	 *  @value 	navigateTo 	同 uni.navigateTo()
-	 * 	@value redirectTo 	同 uni.redirectTo()
-	 * 	@value reLaunch   	同 uni.reLaunch()
-	 * 	@value switchTab  	同 uni.switchTab()
-	 * @property {String | PageURIString} 	to  			跳转目标页面
-	 * @property {Boolean} 	showBadge = [true|false] 		是否显示数字角标
-	 * @property {Boolean} 	showSwitch = [true|false] 		是否显示Switch
-	 * @property {Boolean} 	switchChecked = [true|false] 	Switch是否被选中
-	 * @property {Boolean} 	showExtraIcon = [true|false] 	左侧是否显示扩展图标
-	 * @property {Object} 	extraIcon 						扩展图标参数，格式为 {color: '#4cd964',size: '22',type: 'spinner'}
-	 * @property {String} 	direction = [row|column]		排版方向
-	 * @value row 			水平排列
-	 * @value column 		垂直排列
-	 * @event {Function} 	click 							点击 uniListItem 触发事件
-	 * @event {Function} 	switchChange 					点击切换 Switch 时触发
-	 */
-	export default {
-		name: 'UniListItem',
-		emits: ['click', 'switchChange'],
-		props: {
-			direction: {
-				type: String,
-				default: 'row'
-			},
-			title: {
-				type: String,
-				default: ''
-			},
-			note: {
-				type: String,
-				default: ''
-			},
-			ellipsis: {
-				type: [Number,String],
-				default: 0
-			},
-			disabled: {
-				type: [Boolean, String],
-				default: false
-			},
-			clickable: {
-				type: Boolean,
-				default: false
-			},
-			showArrow: {
-				type: [Boolean, String],
-				default: false
-			},
-			link: {
-				type: [Boolean, String],
-				default: false
-			},
-			to: {
-				type: String,
-				default: ''
-			},
-			showBadge: {
-				type: [Boolean, String],
-				default: false
-			},
-			showSwitch: {
-				type: [Boolean, String],
-				default: false
-			},
-			switchChecked: {
-				type: [Boolean, String],
-				default: false
-			},
-			badgeText: {
-				type: String,
-				default: ''
-			},
-			badgeType: {
-				type: String,
-				default: 'success'
-			},
-			rightText: {
-				type: String,
-				default: ''
-			},
-			thumb: {
-				type: String,
-				default: ''
-			},
-			thumbSize: {
-				type: String,
-				default: 'base'
-			},
-			showExtraIcon: {
-				type: [Boolean, String],
-				default: false
-			},
-			extraIcon: {
-				type: Object,
-				default () {
-					return {
-						type: 'contact',
-						color: '#000000',
-						size: 20
-					};
-				}
-			},
-			border: {
-				type: Boolean,
-				default: true
-			}
-		},
-		// inject: ['list'],
-		data() {
-			return {
-				isFirstChild: false
-			};
-		},
-		mounted() {
-			this.list = this.getForm()
-			// 判断是否存在 uni-list 组件
-			if (this.list) {
-				if (!this.list.firstChildAppend) {
-					this.list.firstChildAppend = true;
-					this.isFirstChild = true;
-				}
-			}
-		},
-		methods: {
-			/**
-			 * 获取父元素实例
-			 */
-			getForm(name = 'uniList') {
-				let parent = this.$parent;
-				let parentName = parent.$options.name;
-				while (parentName !== name) {
-					parent = parent.$parent;
-					if (!parent) return false
-					parentName = parent.$options.name;
-				}
-				return parent;
-			},
-			onClick() {
-				if (this.to !== '') {
-					this.openPage();
-					return;
-				}
-				if (this.clickable || this.link) {
-					this.$emit('click', {
-						data: {}
-					});
-				}
-			},
-			onSwitchChange(e) {
-				this.$emit('switchChange', e.detail);
-			},
-			openPage() {
-				if (['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'].indexOf(this.link) !== -1) {
-					this.pageApi(this.link);
-				} else {
-					this.pageApi('navigateTo');
-				}
-			},
-			pageApi(api) {
-				let callback = {
-					url: this.to,
-					success: res => {
-						this.$emit('click', {
-							data: res
-						});
-					},
-					fail: err => {
-						this.$emit('click', {
-							data: err
-						});
-					}
-				}
-				switch (api) {
-					case 'navigateTo':
-						uni.navigateTo(callback)
-						break
-					case 'redirectTo':
-						uni.redirectTo(callback)
-						break
-					case 'reLaunch':
-						uni.reLaunch(callback)
-						break
-					case 'switchTab':
-						uni.switchTab(callback)
-						break
-					default:
-					uni.navigateTo(callback)
-				}
-			}
-		}
-	};
-</script>
-
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell>
+		<!-- #endif -->
+
+		<view :class="{ 'uni-list-item--disabled': disabled }"
+			:hover-class="(!clickable && !link) || disabled || showSwitch ? '' : 'uni-list-item--hover'"
+			class="uni-list-item" @click="onClick">
+			<view v-if="!isFirstChild" class="border--left" :class="{ 'uni-list--border': border }"></view>
+			<view class="uni-list-item__container"
+				:class="{ 'container--right': showArrow || link, 'flex--direction': direction === 'column' }">
+				<slot name="header">
+					<view class="uni-list-item__header">
+						<view v-if="thumb" class="uni-list-item__icon">
+							<image :src="thumb" class="uni-list-item__icon-img" :class="['uni-list--' + thumbSize]" />
+						</view>
+						<view v-else-if="showExtraIcon" class="uni-list-item__icon">
+							<uni-icons :color="extraIcon.color" :size="extraIcon.size" :type="extraIcon.type" />
+						</view>
+					</view>
+				</slot>
+				<slot name="body">
+					<view class="uni-list-item__content"
+						:class="{ 'uni-list-item__content--center': thumb || showExtraIcon || showBadge || showSwitch }">
+						<text v-if="title" class="uni-list-item__content-title"
+							:class="[ellipsis !== 0 && ellipsis <= 2 ? 'uni-ellipsis-' + ellipsis : '']">{{ title }}</text>
+						<text v-if="note" class="uni-list-item__content-note">{{ note }}</text>
+					</view>
+				</slot>
+				<slot name="footer">
+					<view v-if="rightText || showBadge || showSwitch" class="uni-list-item__extra"
+						:class="{ 'flex--justify': direction === 'column' }">
+						<text v-if="rightText" class="uni-list-item__extra-text">{{ rightText }}</text>
+						<uni-badge v-if="showBadge" :type="badgeType" :text="badgeText" :custom-style="badgeStyle" />
+						<switch v-if="showSwitch" :disabled="disabled" :checked="switchChecked"
+							@change="onSwitchChange" />
+					</view>
+				</slot>
+			</view>
+			<uni-icons v-if="showArrow || link" :size="16" class="uni-icon-wrapper" color="#bbb" type="arrowright" />
+		</view>
+		<!-- #ifdef APP-NVUE -->
+	</cell>
+	<!-- #endif -->
+</template>
+
+<script>
+	/**
+	 * ListItem 列表子组件
+	 * @description 列表子组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=24
+	 * @property {String} 	title 							标题
+	 * @property {String} 	note 							描述
+	 * @property {String} 	thumb 							左侧缩略图，若thumb有值，则不会显示扩展图标
+	 * @property {String}  	thumbSize = [lg|base|sm]		略缩图大小
+	 * 	@value 	 lg			大图
+	 * 	@value 	 base		一般
+	 * 	@value 	 sm			小图
+	 * @property {String} 	badgeText						数字角标内容
+	 * @property {String} 	badgeType 						数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)
+	 * @property {Object}   badgeStyle           数字角标样式
+	 * @property {String} 	rightText 						右侧文字内容
+	 * @property {Boolean} 	disabled = [true|false]			是否禁用
+	 * @property {Boolean} 	clickable = [true|false] 		是否开启点击反馈
+	 * @property {String} 	link = [navigateTo|redirectTo|reLaunch|switchTab] 是否展示右侧箭头并开启点击反馈
+	 *  @value 	navigateTo 	同 uni.navigateTo()
+	 * 	@value redirectTo 	同 uni.redirectTo()
+	 * 	@value reLaunch   	同 uni.reLaunch()
+	 * 	@value switchTab  	同 uni.switchTab()
+	 * @property {String | PageURIString} 	to  			跳转目标页面
+	 * @property {Boolean} 	showBadge = [true|false] 		是否显示数字角标
+	 * @property {Boolean} 	showSwitch = [true|false] 		是否显示Switch
+	 * @property {Boolean} 	switchChecked = [true|false] 	Switch是否被选中
+	 * @property {Boolean} 	showExtraIcon = [true|false] 	左侧是否显示扩展图标
+	 * @property {Object} 	extraIcon 						扩展图标参数，格式为 {color: '#4cd964',size: '22',type: 'spinner'}
+	 * @property {String} 	direction = [row|column]		排版方向
+	 * @value row 			水平排列
+	 * @value column 		垂直排列
+	 * @event {Function} 	click 							点击 uniListItem 触发事件
+	 * @event {Function} 	switchChange 					点击切换 Switch 时触发
+	 */
+	export default {
+		name: 'UniListItem',
+		emits: ['click', 'switchChange'],
+		props: {
+			direction: {
+				type: String,
+				default: 'row'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			note: {
+				type: String,
+				default: ''
+			},
+			ellipsis: {
+				type: [Number,String],
+				default: 0
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			clickable: {
+				type: Boolean,
+				default: false
+			},
+			showArrow: {
+				type: [Boolean, String],
+				default: false
+			},
+			link: {
+				type: [Boolean, String],
+				default: false
+			},
+			to: {
+				type: String,
+				default: ''
+			},
+			showBadge: {
+				type: [Boolean, String],
+				default: false
+			},
+			showSwitch: {
+				type: [Boolean, String],
+				default: false
+			},
+			switchChecked: {
+				type: [Boolean, String],
+				default: false
+			},
+			badgeText: {
+				type: String,
+				default: ''
+			},
+			badgeType: {
+				type: String,
+				default: 'success'
+			},
+			badgeStyle:{
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			rightText: {
+				type: String,
+				default: ''
+			},
+			thumb: {
+				type: String,
+				default: ''
+			},
+			thumbSize: {
+				type: String,
+				default: 'base'
+			},
+			showExtraIcon: {
+				type: [Boolean, String],
+				default: false
+			},
+			extraIcon: {
+				type: Object,
+				default () {
+					return {
+						type: '',
+						color: '#000000',
+						size: 20
+					};
+				}
+			},
+			border: {
+				type: Boolean,
+				default: true
+			}
+		},
+		// inject: ['list'],
+		data() {
+			return {
+				isFirstChild: false
+			};
+		},
+		mounted() {
+			this.list = this.getForm()
+			// 判断是否存在 uni-list 组件
+			if (this.list) {
+				if (!this.list.firstChildAppend) {
+					this.list.firstChildAppend = true;
+					this.isFirstChild = true;
+				}
+			}
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniList') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+			onClick() {
+				if (this.to !== '') {
+					this.openPage();
+					return;
+				}
+				if (this.clickable || this.link) {
+					this.$emit('click', {
+						data: {}
+					});
+				}
+			},
+			onSwitchChange(e) {
+				this.$emit('switchChange', e.detail);
+			},
+			openPage() {
+				if (['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'].indexOf(this.link) !== -1) {
+					this.pageApi(this.link);
+				} else {
+					this.pageApi('navigateTo');
+				}
+			},
+			pageApi(api) {
+				let callback = {
+					url: this.to,
+					success: res => {
+						this.$emit('click', {
+							data: res
+						});
+					},
+					fail: err => {
+						this.$emit('click', {
+							data: err
+						});
+					}
+				}
+				switch (api) {
+					case 'navigateTo':
+						uni.navigateTo(callback)
+						break
+					case 'redirectTo':
+						uni.redirectTo(callback)
+						break
+					case 'reLaunch':
+						uni.reLaunch(callback)
+						break
+					case 'switchTab':
+						uni.switchTab(callback)
+						break
+					default:
+					uni.navigateTo(callback)
+				}
+			}
+		}
+	};
+</script>
+
 <style lang="scss">
 	$uni-font-size-sm:12px;
 	$uni-font-size-base:14px;
@@ -266,209 +273,182 @@
 	$uni-img-size-lg:40px;
 	$uni-border-color:#e5e5e5;
 	$uni-bg-color-hover:#f1f1f1;
-	$uni-text-color-grey:#999;
-	$list-item-pd: $uni-spacing-col-lg $uni-spacing-row-lg;
-
-	.uni-list-item {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		font-size: $uni-font-size-lg;
-		position: relative;
-		justify-content: space-between;
-		align-items: center;
-		background-color: #fff;
-		flex-direction: row;
-		/* #ifdef H5 */
-		cursor: pointer;
-		/* #endif */
-	}
-
-	.uni-list-item--disabled {
-		opacity: 0.3;
-	}
-
-	.uni-list-item--hover {
-		background-color: $uni-bg-color-hover;
-	}
-
-	.uni-list-item__container {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		padding: $list-item-pd;
-		padding-left: $uni-spacing-row-lg;
-		flex: 1;
-		overflow: hidden;
-		// align-items: center;
-	}
-
-	.container--right {
-		padding-right: 0;
-	}
-
-	// .border--left {
-	// 	margin-left: $uni-spacing-row-lg;
-	// }
-
-	.uni-list--border {
-		position: absolute;
-		top: 0;
-		right: 0;
-		left: 0;
-		/* #ifdef APP-NVUE */
-		border-top-color: $uni-border-color;
-		border-top-style: solid;
-		border-top-width: 0.5px;
-		/* #endif */
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-list--border:after {
-		position: absolute;
-		top: 0;
-		right: 0;
-		left: 0;
-		height: 1px;
-		content: '';
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-		background-color: $uni-border-color;
-	}
-
-	/* #endif */
-
-	.uni-list-item__content {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		padding-right: 8px;
-		flex: 1;
-		color: #3b4144;
-		// overflow: hidden;
-		flex-direction: column;
-		justify-content: space-between;
-		overflow: hidden;
-	}
-
-	.uni-list-item__content--center {
-		justify-content: center;
-	}
-
-	.uni-list-item__content-title {
-		font-size: $uni-font-size-base;
-		color: #3b4144;
-		overflow: hidden;
-	}
-
-	.uni-list-item__content-note {
-		margin-top: 6rpx;
-		color: $uni-text-color-grey;
-		font-size: $uni-font-size-sm;
-		overflow: hidden;
-	}
-
-	.uni-list-item__extra {
-		// width: 25%;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: flex-end;
-		align-items: center;
-	}
-
-	.uni-list-item__header {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.uni-list-item__icon {
-		margin-right: 18rpx;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.uni-list-item__icon-img {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		height: $uni-img-size-base;
-		width: $uni-img-size-base;
-		margin-right: 10px;
-	}
-
-	.uni-icon-wrapper {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		align-items: center;
-		padding: 0 10px;
-	}
-
-	.flex--direction {
-		flex-direction: column;
-		/* #ifndef APP-NVUE */
-		align-items: initial;
-		/* #endif */
-	}
-
-	.flex--justify {
-		/* #ifndef APP-NVUE */
-		justify-content: initial;
-		/* #endif */
-	}
-
-	.uni-list--lg {
-		height: $uni-img-size-lg;
-		width: $uni-img-size-lg;
-	}
-
-	.uni-list--base {
-		height: $uni-img-size-base;
-		width: $uni-img-size-base;
-	}
-
-	.uni-list--sm {
-		height: $uni-img-size-sm;
-		width: $uni-img-size-sm;
-	}
-
-	.uni-list-item__extra-text {
-		color: $uni-text-color-grey;
-		font-size: $uni-font-size-sm;
-	}
-
-	.uni-ellipsis-1 {
-		/* #ifndef APP-NVUE */
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		/* #endif */
-		/* #ifdef APP-NVUE */
+	$uni-text-color-grey:#999;
+	$list-item-pd: $uni-spacing-col-lg $uni-spacing-row-lg;
+	.uni-list-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		font-size: $uni-font-size-lg;
+		position: relative;
+		justify-content: space-between;
+		align-items: center;
+		background-color: #fff;
+		flex-direction: row;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+	.uni-list-item--disabled {
+		opacity: 0.3;
+	}
+	.uni-list-item--hover {
+		background-color: $uni-bg-color-hover;
+	}
+	.uni-list-item__container {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: $list-item-pd;
+		padding-left: $uni-spacing-row-lg;
+		flex: 1;
+		overflow: hidden;
+		// align-items: center;
+	}
+	.container--right {
+		padding-right: 0;
+	}
+	// .border--left {
+	// 	margin-left: $uni-spacing-row-lg;
+	// }
+	.uni-list--border {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		/* #ifdef APP-NVUE */
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		/* #endif */
+	}
+	/* #ifndef APP-NVUE */
+	.uni-list--border:after {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		content: '';
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		background-color: $uni-border-color;
+	}
+	/* #endif */
+	.uni-list-item__content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		padding-right: 8px;
+		flex: 1;
+		color: #3b4144;
+		// overflow: hidden;
+		flex-direction: column;
+		justify-content: space-between;
+		overflow: hidden;
+	}
+	.uni-list-item__content--center {
+		justify-content: center;
+	}
+	.uni-list-item__content-title {
+		font-size: $uni-font-size-base;
+		color: #3b4144;
+		overflow: hidden;
+	}
+	.uni-list-item__content-note {
+		margin-top: 6rpx;
+		color: $uni-text-color-grey;
+		font-size: $uni-font-size-sm;
+		overflow: hidden;
+	}
+	.uni-list-item__extra {
+		// width: 25%;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: flex-end;
+		align-items: center;
+	}
+	.uni-list-item__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+	}
+	.uni-list-item__icon {
+		margin-right: 18rpx;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+	.uni-list-item__icon-img {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		height: $uni-img-size-base;
+		width: $uni-img-size-base;
+		margin-right: 10px;
+	}
+	.uni-icon-wrapper {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		padding: 0 10px;
+	}
+	.flex--direction {
+		flex-direction: column;
+		/* #ifndef APP-NVUE */
+		align-items: initial;
+		/* #endif */
+	}
+	.flex--justify {
+		/* #ifndef APP-NVUE */
+		justify-content: initial;
+		/* #endif */
+	}
+	.uni-list--lg {
+		height: $uni-img-size-lg;
+		width: $uni-img-size-lg;
+	}
+	.uni-list--base {
+		height: $uni-img-size-base;
+		width: $uni-img-size-base;
+	}
+	.uni-list--sm {
+		height: $uni-img-size-sm;
+		width: $uni-img-size-sm;
+	}
+	.uni-list-item__extra-text {
+		color: $uni-text-color-grey;
+		font-size: $uni-font-size-sm;
+	}
+	.uni-ellipsis-1 {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
 		lines: 1;
-		text-overflow:ellipsis;
-		/* #endif */
-	}
-
-	.uni-ellipsis-2 {
-		/* #ifndef APP-NVUE */
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		-webkit-box-orient: vertical;
-		/* #endif */
-
-		/* #ifdef APP-NVUE */
+		text-overflow:ellipsis;
+		/* #endif */
+	}
+	.uni-ellipsis-2 {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		/* #endif */
+		/* #ifdef APP-NVUE */
 		lines: 2;
-		text-overflow:ellipsis;
-		/* #endif */
-	}
+		text-overflow:ellipsis;
+		/* #endif */
+	}
 </style>
diff --git a/uni_modules/uni-list/components/uni-list/uni-list.vue b/uni_modules/uni-list/components/uni-list/uni-list.vue
index a5bc80fab779d04d5470de230c80eafee476accf..7940afc4c1da9f3f5f8a1876249b8963d8a41cf9 100644
--- a/uni_modules/uni-list/components/uni-list/uni-list.vue
+++ b/uni_modules/uni-list/components/uni-list/uni-list.vue
@@ -54,8 +54,8 @@ export default {
 	}
 };
 </script>
-<style lang="scss" scoped>
-$uni-bg-color:#ffffff;
+<style lang="scss" >
+$uni-bg-color:#ffffff;
 $uni-border-color:#e5e5e5;
 .uni-list {
 	/* #ifndef APP-NVUE */
@@ -105,4 +105,4 @@ $uni-border-color:#e5e5e5;
 }
 
 /* #endif */
-</style>
+</style>
diff --git a/uni_modules/uni-list/components/uni-list/uni-refresh.vue b/uni_modules/uni-list/components/uni-list/uni-refresh.vue
index 2c64158a6293c4c9d67c8e551d8365a90fcfcd80..3b4c5a230061935d31d8332663b8a511b5143759 100644
--- a/uni_modules/uni-list/components/uni-list/uni-refresh.vue
+++ b/uni_modules/uni-list/components/uni-list/uni-refresh.vue
@@ -1,65 +1,65 @@
-<template>
-    <!-- #ifdef APP-NVUE -->
-    <refresh :display="display" @refresh="onrefresh" @pullingdown="onpullingdown">
-        <slot />
-    </refresh>
-    <!-- #endif -->
-    <!-- #ifndef APP-NVUE -->
-    <view ref="uni-refresh" class="uni-refresh" v-show="isShow">
-        <slot />
-    </view>
-    <!-- #endif -->
-</template>
-
-<script>
-    export default {
-        name: 'UniRefresh',
-        props: {
-            display: {
-                type: [String],
-                default: "hide"
-            }
-        },
-        data() {
-            return {
-                pulling: false
-            }
-        },
-        computed: {
-            isShow() {
-                if (this.display === "show" || this.pulling === true) {
-                    return true;
-                }
-                return false;
-            }
-        },
-        created() {},
-        methods: {
-            onchange(value) {
-                this.pulling = value;
-            },
-            onrefresh(e) {
-                this.$emit("refresh", e);
-            },
-            onpullingdown(e) {
-                // #ifdef APP-NVUE
-                this.$emit("pullingdown", e);
-                // #endif
-                // #ifndef APP-NVUE
-                var detail = {
-                    viewHeight: 90,
-                    pullingDistance: e.height
-                }
-                this.$emit("pullingdown", detail);
-                // #endif
-            }
-        }
-    }
-</script>
-
-<style>
-    .uni-refresh {
-        height: 0;
-        overflow: hidden;
-    }
-</style>
+<template>
+    <!-- #ifdef APP-NVUE -->
+    <refresh :display="display" @refresh="onrefresh" @pullingdown="onpullingdown">
+        <slot />
+    </refresh>
+    <!-- #endif -->
+    <!-- #ifndef APP-NVUE -->
+    <view ref="uni-refresh" class="uni-refresh" v-show="isShow">
+        <slot />
+    </view>
+    <!-- #endif -->
+</template>
+
+<script>
+    export default {
+        name: 'UniRefresh',
+        props: {
+            display: {
+                type: [String],
+                default: "hide"
+            }
+        },
+        data() {
+            return {
+                pulling: false
+            }
+        },
+        computed: {
+            isShow() {
+                if (this.display === "show" || this.pulling === true) {
+                    return true;
+                }
+                return false;
+            }
+        },
+        created() {},
+        methods: {
+            onchange(value) {
+                this.pulling = value;
+            },
+            onrefresh(e) {
+                this.$emit("refresh", e);
+            },
+            onpullingdown(e) {
+                // #ifdef APP-NVUE
+                this.$emit("pullingdown", e);
+                // #endif
+                // #ifndef APP-NVUE
+                var detail = {
+                    viewHeight: 90,
+                    pullingDistance: e.height
+                }
+                this.$emit("pullingdown", detail);
+                // #endif
+            }
+        }
+    }
+</script>
+
+<style>
+    .uni-refresh {
+        height: 0;
+        overflow: hidden;
+    }
+</style>
diff --git a/uni_modules/uni-list/components/uni-list/uni-refresh.wxs b/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
index 9ef364e092dbae2ec45dcd6a279a27263c890103..818a6b721b1172073d91c1f6a456d2b54d772f77 100644
--- a/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
+++ b/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
@@ -1,87 +1,87 @@
-var pullDown = {
-    threshold: 95,
-    maxHeight: 200,
-    callRefresh: 'onrefresh',
-    callPullingDown: 'onpullingdown',
-    refreshSelector: '.uni-refresh'
-};
-
-function ready(newValue, oldValue, ownerInstance, instance) {
-    var state = instance.getState()
-    state.canPullDown = newValue;
-    // console.log(newValue);
-}
-
-function touchStart(e, instance) {
-    var state = instance.getState();
-    state.refreshInstance = instance.selectComponent(pullDown.refreshSelector);
-    state.canPullDown = (state.refreshInstance != null && state.refreshInstance != undefined);
-    if (!state.canPullDown) {
-        return
-    }
-
-    // console.log("touchStart");
-
-    state.height = 0;
-    state.touchStartY = e.touches[0].pageY || e.changedTouches[0].pageY;
-    state.refreshInstance.setStyle({
-        'height': 0
-    });
-    state.refreshInstance.callMethod("onchange", true);
-}
-
-function touchMove(e, ownerInstance) {
-    var instance = e.instance;
-    var state = instance.getState();
-    if (!state.canPullDown) {
-        return
-    }
-
-    var oldHeight = state.height;
-    var endY = e.touches[0].pageY || e.changedTouches[0].pageY;
-    var height = endY - state.touchStartY;
-    if (height > pullDown.maxHeight) {
-        return;
-    }
-
-    var refreshInstance = state.refreshInstance;
-    refreshInstance.setStyle({
-        'height': height + 'px'
-    });
-
-    height = height < pullDown.maxHeight ? height : pullDown.maxHeight;
-    state.height = height;
-    refreshInstance.callMethod(pullDown.callPullingDown, {
-        height: height
-    });
-}
-
-function touchEnd(e, ownerInstance) {
-    var state = e.instance.getState();
-    if (!state.canPullDown) {
-        return
-    }
-
-    state.refreshInstance.callMethod("onchange", false);
-
-    var refreshInstance = state.refreshInstance;
-    if (state.height > pullDown.threshold) {
-        refreshInstance.callMethod(pullDown.callRefresh);
-        return;
-    }
-
-    refreshInstance.setStyle({
-        'height': 0
-    });
-}
-
-function propObserver(newValue, oldValue, instance) {
-    pullDown = newValue;
-}
-
-module.exports = {
-    touchmove: touchMove,
-    touchstart: touchStart,
-    touchend: touchEnd,
-    propObserver: propObserver
-}
+var pullDown = {
+    threshold: 95,
+    maxHeight: 200,
+    callRefresh: 'onrefresh',
+    callPullingDown: 'onpullingdown',
+    refreshSelector: '.uni-refresh'
+};
+
+function ready(newValue, oldValue, ownerInstance, instance) {
+    var state = instance.getState()
+    state.canPullDown = newValue;
+    // console.log(newValue);
+}
+
+function touchStart(e, instance) {
+    var state = instance.getState();
+    state.refreshInstance = instance.selectComponent(pullDown.refreshSelector);
+    state.canPullDown = (state.refreshInstance != null && state.refreshInstance != undefined);
+    if (!state.canPullDown) {
+        return
+    }
+
+    // console.log("touchStart");
+
+    state.height = 0;
+    state.touchStartY = e.touches[0].pageY || e.changedTouches[0].pageY;
+    state.refreshInstance.setStyle({
+        'height': 0
+    });
+    state.refreshInstance.callMethod("onchange", true);
+}
+
+function touchMove(e, ownerInstance) {
+    var instance = e.instance;
+    var state = instance.getState();
+    if (!state.canPullDown) {
+        return
+    }
+
+    var oldHeight = state.height;
+    var endY = e.touches[0].pageY || e.changedTouches[0].pageY;
+    var height = endY - state.touchStartY;
+    if (height > pullDown.maxHeight) {
+        return;
+    }
+
+    var refreshInstance = state.refreshInstance;
+    refreshInstance.setStyle({
+        'height': height + 'px'
+    });
+
+    height = height < pullDown.maxHeight ? height : pullDown.maxHeight;
+    state.height = height;
+    refreshInstance.callMethod(pullDown.callPullingDown, {
+        height: height
+    });
+}
+
+function touchEnd(e, ownerInstance) {
+    var state = e.instance.getState();
+    if (!state.canPullDown) {
+        return
+    }
+
+    state.refreshInstance.callMethod("onchange", false);
+
+    var refreshInstance = state.refreshInstance;
+    if (state.height > pullDown.threshold) {
+        refreshInstance.callMethod(pullDown.callRefresh);
+        return;
+    }
+
+    refreshInstance.setStyle({
+        'height': 0
+    });
+}
+
+function propObserver(newValue, oldValue, instance) {
+    pullDown = newValue;
+}
+
+module.exports = {
+    touchmove: touchMove,
+    touchstart: touchStart,
+    touchend: touchEnd,
+    propObserver: propObserver
+}
diff --git a/uni_modules/uni-list/package.json b/uni_modules/uni-list/package.json
index 9349a7eec1f7d48a4fe1ee5ededce0f663813ead..66e8bef0c687903d3d0ca857ac97450f34a07565 100644
--- a/uni_modules/uni-list/package.json
+++ b/uni_modules/uni-list/package.json
@@ -1,91 +1,91 @@
-{
-  "id": "uni-list",
-  "displayName": "uni-list 列表",
-  "version": "1.2.0",
-  "description": "List 组件 ，帮助使用者快速构建列表。",
-  "keywords": [
-    "",
-    "uni-ui",
-    "uniui",
-    "列表",
-    "",
-    "list"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [
-      "uni-badge",
-      "uni-icons"
-    ],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "y"
-        }
-      }
-    }
-  }
+{
+  "id": "uni-list",
+  "displayName": "uni-list 列表",
+  "version": "1.2.1",
+  "description": "List 组件 ，帮助使用者快速构建列表。",
+  "keywords": [
+    "",
+    "uni-ui",
+    "uniui",
+    "列表",
+    "",
+    "list"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-badge",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/uni_modules/uni-list/readme.md b/uni_modules/uni-list/readme.md
index 1bc5b951abd0a7d7554ca572a0a6f489fb58d658..32c28654eb9654bfa833a5de6012f44c4fe854db 100644
--- a/uni_modules/uni-list/readme.md
+++ b/uni_modules/uni-list/readme.md
@@ -1,347 +1,346 @@
-
-
-## List 列表
-> **组件名：uni-list**
-> 代码块： `uList`、`uListItem`
-> 关联组件：`uni-list-item`、`uni-badge`、`uni-icons`、`uni-list-chat`、`uni-list-ad`
-
-
-List 列表组件，包含基本列表样式、可扩展插槽机制、长列表性能优化、多端兼容。
-
-在vue页面里，它默认使用页面级滚动。在app-nvue页面里，它默认使用原生list组件滚动。这样的长列表，在滚动出屏幕外后，系统会回收不可见区域的渲染内存资源，不会造成滚动越长手机越卡的问题。
-
-uni-list组件是父容器，里面的核心是uni-list-item子组件，它代表列表中的一个可重复行，子组件可以无限循环。
-
-uni-list-item有很多风格，uni-list-item组件通过内置的属性，满足一些常用的场景。当内置属性不满足需求时，可以通过扩展插槽来自定义列表内容。
-
-内置属性可以覆盖的场景包括：导航列表、设置列表、小图标列表、通信录列表、聊天记录列表。
-
-涉及很多大图或丰富内容的列表，比如类今日头条的新闻列表、类淘宝的电商列表，需要通过扩展插槽实现。
-
-下文均有样例给出。
-
-uni-list不包含下拉刷新和上拉翻页。上拉翻页另见组件：[uni-load-more](https://ext.dcloud.net.cn/plugin?id=29)
-
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 组件需要依赖 `sass` 插件 ，请自行手动安装
-> - 组件内部依赖 `'uni-icons'` 、`uni-badge` 组件
-> - `uni-list` 和 `uni-list-item` 需要配套使用，暂不支持单独使用 `uni-list-item`
-> - 只有开启点击反馈后，会有点击选中效果
-> - 使用插槽时，可以完全自定义内容
-> - note 、rightText 属性暂时没做限制，不支持文字溢出隐藏，使用时应该控制长度显示或通过默认插槽自行扩展
-> - 支付宝小程序平台需要在支付宝小程序开发者工具里开启 component2 编译模式，开启方式： 详情 --> 项目配置 --> 启用 component2 编译
-> - 如果需要修改 `switch`、`badge` 样式，请使用插槽自定义
-> - 在 `HBuilderX` 低版本中，可能会出现组件显示 `undefined` 的问题，请升级最新的 `HBuilderX` 或者 `cli`
-> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
- 
-
-### 基本用法 
-
-- 设置 `title` 属性，可以显示列表标题
-- 设置 `disabled` 属性，可以禁用当前项
-
-```html
-<uni-list>
-	<uni-list-item  title="列表文字" ></uni-list-item>
-	<uni-list-item :disabled="true" title="列表禁用状态" ></uni-list-item>
-</uni-list>
-			 
-```
-
-### 多行内容显示
-
-- 设置 `note` 属性 ，可以在第二行显示描述文本信息
-
-```html
-<uni-list>
-	<uni-list-item title="列表文字" note="列表描述信息"></uni-list-item>
-	<uni-list-item :disabled="true" title="列表文字" note="列表禁用状态"></uni-list-item>
-</uni-list>
-
-```
-
-### 右侧显示角标、switch
-
-- 设置 `show-badge` 属性 ，可以显示角标内容
-- 设置 `show-switch` 属性，可以显示 switch 开关
-
-```html
-<uni-list>
-	<uni-list-item  title="列表右侧显示角标" :show-badge="true" badge-text="12" ></uni-list-item>
-	<uni-list-item title="列表右侧显示 switch"  :show-switch="true"  @switchChange="switchChange" ></uni-list-item>
-</uni-list>
-
-```
-
-### 左侧显示略缩图、图标  
-
-- 设置 `thumb` 属性 ，可以在列表左侧显示略缩图
-- 设置 `show-extra-icon` 属性，并指定 `extra-icon` 可以在左侧显示图标
-
-```html
- <uni-list>
- 	<uni-list-item title="列表左侧带略缩图" note="列表描述信息" thumb="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png"
- 	 thumb-size="lg" rightText="右侧文字"></uni-list-item>
- 	<uni-list-item :show-extra-icon="true" :extra-icon="extraIcon1" title="列表左侧带扩展图标" ></uni-list-item>
-</uni-list>
-```
-
-### 开启点击反馈和右侧箭头
-- 设置 `clickable` 为 `true` ，则表示这是一个可点击的列表，会默认给一个点击效果，并可以监听 `click` 事件
-- 设置 `link` 属性，会自动开启点击反馈，并给列表右侧添加一个箭头
-- 设置 `to` 属性，可以跳转页面，`link` 的值表示跳转方式，如果不指定，默认为 `navigateTo`
-
-```html
-
-<uni-list>
-	<uni-list-item title="开启点击反馈" clickable  @click="onClick" ></uni-list-item>
-	<uni-list-item title="默认 navigateTo 方式跳转页面" link to="/pages/vue/index/index" @click="onClick($event,1)" ></uni-list-item>
-	<uni-list-item title="reLaunch 方式跳转页面" link="reLaunch" to="/pages/vue/index/index" @click="onClick($event,1)" ></uni-list-item>
-</uni-list>
-
-```
-
-
-### 聊天列表示例
-- 设置 `clickable` 为 `true` ，则表示这是一个可点击的列表，会默认给一个点击效果，并可以监听 `click` 事件
-- 设置 `link` 属性，会自动开启点击反馈，`link` 的值表示跳转方式，如果不指定，默认为 `navigateTo`
-- 设置 `to` 属性，可以跳转页面
-- `time` 属性，通常会设置成时间显示，但是这个属性不仅仅可以设置时间，你可以传入任何文本，注意文本长度可能会影响显示
-- `avatar` 和 `avatarList` 属性同时只会有一个生效，同时设置的话，`avatarList` 属性的长度大于1 ，`avatar` 属性将失效
-- 可以通过默认插槽自定义列表右侧内容
-
-```html
-
-<uni-list>
-	<uni-list :border="true">
-		<!-- 显示圆形头像 -->
-		<uni-list-chat :avatar-circle="true" title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" ></uni-list-chat>
-		<!-- 右侧带角标 -->
-		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-text="12"></uni-list-chat>
-		<!-- 头像显示圆点 -->
-		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
-		<!-- 头像显示角标 -->
-		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="99"></uni-list-chat>
-		<!-- 显示多头像 -->
-		<uni-list-chat title="uni-app" :avatar-list="avatarList" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
-		<!-- 自定义右侧内容 -->
-		<uni-list-chat title="uni-app" :avatar-list="avatarList" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot">
-			<view class="chat-custom-right">
-				<text class="chat-custom-text">刚刚</text>
-				<!-- 需要使用 uni-icons 请自行引入 -->
-				<uni-icons type="star-filled" color="#999" size="18"></uni-icons>
-			</view>
-		</uni-list-chat>
-	</uni-list>
-</uni-list>
-
-```
-
-```javascript
-
-export default {
-	components: {},
-	data() {
-		return {
-			avatarList: [{
-				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
-			}, {
-				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
-			}, {
-				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
-			}]
-		}
-	}
-}
-
-```
-
-
-```css
-
-.chat-custom-right {
-	flex: 1;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: column;
-	justify-content: space-between;
-	align-items: flex-end;
-}
-
-.chat-custom-text {
-	font-size: 12px;
-	color: #999;
-}
-
-```
-
-## API
-
-### List Props
-
-属性名			|类型		|默认值		|	说明																									
-:-:				|:-:		|:-:		|	:-:	
-border			|Boolean	|true		|	是否显示边框
-
-
-### ListItem Props
-
-属性名			|类型		|默认值		|	说明																					
-:-:				|:-:		|:-:		|	:-:	
-title			|String		|-			|	标题
-note			|String		|-			|	描述
-ellipsis		|Number		|0			|	title 是否溢出隐藏，可选值，0:默认;  1:显示一行;	2:显示两行;【nvue 暂不支持】
-thumb			|String		|-			|	左侧缩略图，若thumb有值，则不会显示扩展图标
-thumbSize		|String 	|medium 	|	略缩图尺寸，可选值，lg:大图;  medium:一般;	sm:小图;
-showBadge		|Boolean	|false		|	是否显示数字角标	
-badgeText		|String		|-			|	数字角标内容
-badgeType		|String		|-			|	数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)					
-rightText		|String		|-			|	右侧文字内容
-disabled		|Boolean	|false		|	是否禁用	
-showArrow 		|Boolean	|true		|	是否显示箭头图标			
-link			|String 	|navigateTo	|	新页面跳转方式，可选值见下表
-to				|String		|-			|	新页面跳转地址，如填写此属性，click 会返回页面是否跳转成功			
-clickable		|Boolean	|false		|	是否开启点击反馈
-showSwitch	    |Boolean	|false		|	是否显示Switch																			
-switchChecked	|Boolean	|false		|	Switch是否被选中																			
-showExtraIcon   |Boolean	|false		|	左侧是否显示扩展图标																		
-extraIcon		|Object		|-			|	扩展图标参数，格式为 ``{color: '#4cd964',size: '22',type: 'spinner'}``，参考 [uni-icons](https://ext.dcloud.net.cn/plugin?id=28)	
-direction		| String	|row		|	排版方向，可选值，row:水平排列;  column:垂直排列; 3个插槽是水平排还是垂直排，也受此属性控制
-
-
-#### Link Options
-
-属性名				|	说明
-:-:					|	:-:
-navigateTo 	| 	同 uni.navigateTo()
-redirectTo 	|	同 uni.reLaunch()
-reLaunch		|	同 uni.reLaunch()
-switchTab  	|	同 uni.switchTab()
-
-### ListItem Events
-
-事件称名			|说明									|返回参数			
-:-:				|:-:									|:-:				
-click			|点击 uniListItem 触发事件，需开启点击反馈	|-					
-switchChange	|点击切换 Switch 时触发，需显示 switch		|e={value:checked}	
-
-
-
-### ListItem Slots
-
-名称	 	|	说明					
-:-:		|	:-:						
-header	|	左/上内容插槽，可完全自定义默认显示
-body	|	中间内容插槽，可完全自定义中间内容				
-footer	|	右/下内容插槽，可完全自定义右侧内容		
-
-
-> **通过插槽扩展**
-> 需要注意的是当使用插槽时，内置样式将会失效，只保留排版样式，此时的样式需要开发者自己实现
-> 如果	`uni-list-item` 组件内置属性样式无法满足需求，可以使用插槽来自定义uni-list-item里的内容。
-> uni-list-item提供了3个可扩展的插槽：`header`、`body`、`footer`
-> - 当 `direction` 属性为 `row` 时表示水平排列，此时 `header` 表示列表的左边部分，`body` 表示列表的中间部分，`footer` 表示列表的右边部分
-> - 当 `direction` 属性为 `column` 时表示垂直排列，此时 `header` 表示列表的上边部分，`body` 表示列表的中间部分，`footer` 表示列表的下边部分
-> 开发者可以只用1个插槽，也可以3个一起使用。在插槽中可自主编写view标签，实现自己所需的效果。
-
-	
-**示例**
-
-```html
-<uni-list>
-	<uni-list-item title="自定义右侧插槽" note="列表描述信息" link>
-		<template slot="header">
-			<image class="slot-image" src="/static/logo.png" mode="widthFix"></image>
-		</template>
-	</uni-list-item>
-	<uni-list-item>
-		<!-- 自定义 header -->
-		<view slot="header" class="slot-box"><image class="slot-image" src="/static/logo.png" mode="widthFix"></image></view>
-		<!-- 自定义 body -->
-		<text slot="body" class="slot-box slot-text">自定义插槽</text>
-		<!-- 自定义 footer-->
-		<template slot="footer">
-			<image class="slot-image" src="/static/logo.png" mode="widthFix"></image>
-		</template>
-	</uni-list-item>
-</uni-list>
-```
-
-
-
-
-
-### ListItemChat Props
-
-属性名			|类型		|默认值		|	说明																		
-:-:				|:-:		|:-:		|	:-:	
-title 			|String		|-			|	标题
-note 			|String		|-			|	描述
-clickable		|Boolean	|false		|	是否开启点击反馈
-badgeText		|String		|-			|	数字角标内容，设置为 `dot` 将显示圆点
-badgePositon 	|String		|right		|	角标位置
-link			|String 	|navigateTo	|	是否展示右侧箭头并开启点击反馈，可选值见下表
-clickable		|Boolean	|false		|	是否开启点击反馈
-to				|String		|-			|	跳转页面地址，如填写此属性，click 会返回页面是否跳转成功	
-time			|String 	|-			|	右侧时间显示
-avatarCircle 	|Boolean 	|false		|	是否显示圆形头像
-avatar			|String 	|-			|	头像地址，avatarCircle 不填时生效
-avatarList 		|Array	 	|-			|	头像组，格式为 [{url:''}]
-
-#### Link Options
-
-属性名		|	说明
-:-:			|	:-:
-navigateTo 	| 	同 uni.navigateTo()
-redirectTo 	|	同 uni.reLaunch()
-reLaunch	|	同 uni.reLaunch()
-switchTab  	|	同 uni.switchTab()
-
-### ListItemChat Slots
-
-名称	 	|	说明					
-:-		|	:-						
-default	|	自定义列表右侧内容（包括时间和角标显示）
-
-### ListItemChat Events
-事件称名			|	说明						|	返回参数			
-:-:				|	:-:						|	:-:	
-@click			|	点击 uniListChat 触发事件	|	{data:{}}	，如有 to 属性，会返回页面跳转信息	
-
-
-
-
-
-
-## 基于uni-list扩展的页面模板
-
-通过扩展插槽，可实现多种常见样式的列表
-
-**新闻列表类**
-
-1. 云端一体混合布局：[https://ext.dcloud.net.cn/plugin?id=2546](https://ext.dcloud.net.cn/plugin?id=2546)
-2. 云端一体垂直布局，大图模式：[https://ext.dcloud.net.cn/plugin?id=2583](https://ext.dcloud.net.cn/plugin?id=2583)
-3. 云端一体垂直布局，多行图文混排：[https://ext.dcloud.net.cn/plugin?id=2584](https://ext.dcloud.net.cn/plugin?id=2584)
-4. 云端一体垂直布局，多图模式：[https://ext.dcloud.net.cn/plugin?id=2585](https://ext.dcloud.net.cn/plugin?id=2585)
-5. 云端一体水平布局，左图右文：[https://ext.dcloud.net.cn/plugin?id=2586](https://ext.dcloud.net.cn/plugin?id=2586)
-6. 云端一体水平布局，左文右图：[https://ext.dcloud.net.cn/plugin?id=2587](https://ext.dcloud.net.cn/plugin?id=2587)
-7. 云端一体垂直布局，无图模式，主标题+副标题：[https://ext.dcloud.net.cn/plugin?id=2588](https://ext.dcloud.net.cn/plugin?id=2588)
-
-**商品列表类**
-
-1. 云端一体列表/宫格视图互切：[https://ext.dcloud.net.cn/plugin?id=2651](https://ext.dcloud.net.cn/plugin?id=2651)
-2. 云端一体列表（宫格模式）：[https://ext.dcloud.net.cn/plugin?id=2671](https://ext.dcloud.net.cn/plugin?id=2671)
-3. 云端一体列表（列表模式）：[https://ext.dcloud.net.cn/plugin?id=2672](https://ext.dcloud.net.cn/plugin?id=2672)
-
-## 组件示例
-
+## List 列表
+> **组件名：uni-list**
+> 代码块： `uList`、`uListItem`
+> 关联组件：`uni-list-item`、`uni-badge`、`uni-icons`、`uni-list-chat`、`uni-list-ad`
+
+
+List 列表组件，包含基本列表样式、可扩展插槽机制、长列表性能优化、多端兼容。
+
+在vue页面里，它默认使用页面级滚动。在app-nvue页面里，它默认使用原生list组件滚动。这样的长列表，在滚动出屏幕外后，系统会回收不可见区域的渲染内存资源，不会造成滚动越长手机越卡的问题。
+
+uni-list组件是父容器，里面的核心是uni-list-item子组件，它代表列表中的一个可重复行，子组件可以无限循环。
+
+uni-list-item有很多风格，uni-list-item组件通过内置的属性，满足一些常用的场景。当内置属性不满足需求时，可以通过扩展插槽来自定义列表内容。
+
+内置属性可以覆盖的场景包括：导航列表、设置列表、小图标列表、通信录列表、聊天记录列表。
+
+涉及很多大图或丰富内容的列表，比如类今日头条的新闻列表、类淘宝的电商列表，需要通过扩展插槽实现。
+
+下文均有样例给出。
+
+uni-list不包含下拉刷新和上拉翻页。上拉翻页另见组件：[uni-load-more](https://ext.dcloud.net.cn/plugin?id=29)
+
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+> **注意事项**
+> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
+> - 组件需要依赖 `sass` 插件 ，请自行手动安装
+> - 组件内部依赖 `'uni-icons'` 、`uni-badge` 组件
+> - `uni-list` 和 `uni-list-item` 需要配套使用，暂不支持单独使用 `uni-list-item`
+> - 只有开启点击反馈后，会有点击选中效果
+> - 使用插槽时，可以完全自定义内容
+> - note 、rightText 属性暂时没做限制，不支持文字溢出隐藏，使用时应该控制长度显示或通过默认插槽自行扩展
+> - 支付宝小程序平台需要在支付宝小程序开发者工具里开启 component2 编译模式，开启方式： 详情 --> 项目配置 --> 启用 component2 编译
+> - 如果需要修改 `switch`、`badge` 样式，请使用插槽自定义
+> - 在 `HBuilderX` 低版本中，可能会出现组件显示 `undefined` 的问题，请升级最新的 `HBuilderX` 或者 `cli`
+> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
+ 
+
+### 基本用法 
+
+- 设置 `title` 属性，可以显示列表标题
+- 设置 `disabled` 属性，可以禁用当前项
+
+```html
+<uni-list>
+	<uni-list-item  title="列表文字" ></uni-list-item>
+	<uni-list-item :disabled="true" title="列表禁用状态" ></uni-list-item>
+</uni-list>
+			 
+```
+
+### 多行内容显示
+
+- 设置 `note` 属性 ，可以在第二行显示描述文本信息
+
+```html
+<uni-list>
+	<uni-list-item title="列表文字" note="列表描述信息"></uni-list-item>
+	<uni-list-item :disabled="true" title="列表文字" note="列表禁用状态"></uni-list-item>
+</uni-list>
+
+```
+
+### 右侧显示角标、switch
+
+- 设置 `show-badge` 属性 ，可以显示角标内容
+- 设置 `show-switch` 属性，可以显示 switch 开关
+
+```html
+<uni-list>
+	<uni-list-item  title="列表右侧显示角标" :show-badge="true" badge-text="12" ></uni-list-item>
+	<uni-list-item title="列表右侧显示 switch"  :show-switch="true"  @switchChange="switchChange" ></uni-list-item>
+</uni-list>
+
+```
+
+### 左侧显示略缩图、图标  
+
+- 设置 `thumb` 属性 ，可以在列表左侧显示略缩图
+- 设置 `show-extra-icon` 属性，并指定 `extra-icon` 可以在左侧显示图标
+
+```html
+ <uni-list>
+ 	<uni-list-item title="列表左侧带略缩图" note="列表描述信息" thumb="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png"
+ 	 thumb-size="lg" rightText="右侧文字"></uni-list-item>
+ 	<uni-list-item :show-extra-icon="true" :extra-icon="extraIcon1" title="列表左侧带扩展图标" ></uni-list-item>
+</uni-list>
+```
+
+### 开启点击反馈和右侧箭头
+- 设置 `clickable` 为 `true` ，则表示这是一个可点击的列表，会默认给一个点击效果，并可以监听 `click` 事件
+- 设置 `link` 属性，会自动开启点击反馈，并给列表右侧添加一个箭头
+- 设置 `to` 属性，可以跳转页面，`link` 的值表示跳转方式，如果不指定，默认为 `navigateTo`
+
+```html
+
+<uni-list>
+	<uni-list-item title="开启点击反馈" clickable  @click="onClick" ></uni-list-item>
+	<uni-list-item title="默认 navigateTo 方式跳转页面" link to="/pages/vue/index/index" @click="onClick($event,1)" ></uni-list-item>
+	<uni-list-item title="reLaunch 方式跳转页面" link="reLaunch" to="/pages/vue/index/index" @click="onClick($event,1)" ></uni-list-item>
+</uni-list>
+
+```
+
+
+### 聊天列表示例
+- 设置 `clickable` 为 `true` ，则表示这是一个可点击的列表，会默认给一个点击效果，并可以监听 `click` 事件
+- 设置 `link` 属性，会自动开启点击反馈，`link` 的值表示跳转方式，如果不指定，默认为 `navigateTo`
+- 设置 `to` 属性，可以跳转页面
+- `time` 属性，通常会设置成时间显示，但是这个属性不仅仅可以设置时间，你可以传入任何文本，注意文本长度可能会影响显示
+- `avatar` 和 `avatarList` 属性同时只会有一个生效，同时设置的话，`avatarList` 属性的长度大于1 ，`avatar` 属性将失效
+- 可以通过默认插槽自定义列表右侧内容
+
+```html
+
+<uni-list>
+	<uni-list :border="true">
+		<!-- 显示圆形头像 -->
+		<uni-list-chat :avatar-circle="true" title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" ></uni-list-chat>
+		<!-- 右侧带角标 -->
+		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-text="12" :badge-style="{backgroundColor:'#FF80AB'}"></uni-list-chat>
+		<!-- 头像显示圆点 -->
+		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
+		<!-- 头像显示角标 -->
+		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="99"></uni-list-chat>
+		<!-- 显示多头像 -->
+		<uni-list-chat title="uni-app" :avatar-list="avatarList" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
+		<!-- 自定义右侧内容 -->
+		<uni-list-chat title="uni-app" :avatar-list="avatarList" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot">
+			<view class="chat-custom-right">
+				<text class="chat-custom-text">刚刚</text>
+				<!-- 需要使用 uni-icons 请自行引入 -->
+				<uni-icons type="star-filled" color="#999" size="18"></uni-icons>
+			</view>
+		</uni-list-chat>
+	</uni-list>
+</uni-list>
+
+```
+
+```javascript
+
+export default {
+	components: {},
+	data() {
+		return {
+			avatarList: [{
+				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
+			}, {
+				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
+			}, {
+				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
+			}]
+		}
+	}
+}
+
+```
+
+
+```css
+
+.chat-custom-right {
+	flex: 1;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: flex-end;
+}
+
+.chat-custom-text {
+	font-size: 12px;
+	color: #999;
+}
+
+```
+
+## API
+
+### List Props
+
+属性名			|类型		|默认值		|	说明																									
+:-:				|:-:		|:-:		|	:-:	
+border			|Boolean	|true		|	是否显示边框
+
+
+### ListItem Props
+
+属性名			|类型		|默认值		|	说明																					
+:-:				|:-:		|:-:		|	:-:	
+title			|String		|-			|	标题
+note			|String		|-			|	描述
+ellipsis		|Number		|0			|	title 是否溢出隐藏，可选值，0:默认;  1:显示一行;	2:显示两行;【nvue 暂不支持】
+thumb			|String		|-			|	左侧缩略图，若thumb有值，则不会显示扩展图标
+thumbSize		|String 	|medium 	|	略缩图尺寸，可选值，lg:大图;  medium:一般;	sm:小图;
+showBadge		|Boolean	|false		|	是否显示数字角标	
+badgeText		|String		|-			|	数字角标内容
+badgeType		|String		|-			|	数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)	
+badgeStyle  |Object   |-      | 数字角标样式，使用uni-badge的custom-style参数
+rightText		|String		|-			|	右侧文字内容
+disabled		|Boolean	|false		|	是否禁用	
+showArrow 		|Boolean	|true		|	是否显示箭头图标			
+link			|String 	|navigateTo	|	新页面跳转方式，可选值见下表
+to				|String		|-			|	新页面跳转地址，如填写此属性，click 会返回页面是否跳转成功			
+clickable		|Boolean	|false		|	是否开启点击反馈
+showSwitch	    |Boolean	|false		|	是否显示Switch																			
+switchChecked	|Boolean	|false		|	Switch是否被选中																			
+showExtraIcon   |Boolean	|false		|	左侧是否显示扩展图标																		
+extraIcon		|Object		|-			|	扩展图标参数，格式为 ``{color: '#4cd964',size: '22',type: 'spinner'}``，参考 [uni-icons](https://ext.dcloud.net.cn/plugin?id=28)	
+direction		| String	|row		|	排版方向，可选值，row:水平排列;  column:垂直排列; 3个插槽是水平排还是垂直排，也受此属性控制
+
+
+#### Link Options
+
+属性名				|	说明
+:-:					|	:-:
+navigateTo 	| 	同 uni.navigateTo()
+redirectTo 	|	同 uni.reLaunch()
+reLaunch		|	同 uni.reLaunch()
+switchTab  	|	同 uni.switchTab()
+
+### ListItem Events
+
+事件称名			|说明									|返回参数			
+:-:				|:-:									|:-:				
+click			|点击 uniListItem 触发事件，需开启点击反馈	|-					
+switchChange	|点击切换 Switch 时触发，需显示 switch		|e={value:checked}	
+
+
+
+### ListItem Slots
+
+名称	 	|	说明					
+:-:		|	:-:						
+header	|	左/上内容插槽，可完全自定义默认显示
+body	|	中间内容插槽，可完全自定义中间内容				
+footer	|	右/下内容插槽，可完全自定义右侧内容		
+
+
+> **通过插槽扩展**
+> 需要注意的是当使用插槽时，内置样式将会失效，只保留排版样式，此时的样式需要开发者自己实现
+> 如果	`uni-list-item` 组件内置属性样式无法满足需求，可以使用插槽来自定义uni-list-item里的内容。
+> uni-list-item提供了3个可扩展的插槽：`header`、`body`、`footer`
+> - 当 `direction` 属性为 `row` 时表示水平排列，此时 `header` 表示列表的左边部分，`body` 表示列表的中间部分，`footer` 表示列表的右边部分
+> - 当 `direction` 属性为 `column` 时表示垂直排列，此时 `header` 表示列表的上边部分，`body` 表示列表的中间部分，`footer` 表示列表的下边部分
+> 开发者可以只用1个插槽，也可以3个一起使用。在插槽中可自主编写view标签，实现自己所需的效果。
+
+	
+**示例**
+
+```html
+<uni-list>
+	<uni-list-item title="自定义右侧插槽" note="列表描述信息" link>
+		<template slot="header">
+			<image class="slot-image" src="/static/logo.png" mode="widthFix"></image>
+		</template>
+	</uni-list-item>
+	<uni-list-item>
+		<!-- 自定义 header -->
+		<view slot="header" class="slot-box"><image class="slot-image" src="/static/logo.png" mode="widthFix"></image></view>
+		<!-- 自定义 body -->
+		<text slot="body" class="slot-box slot-text">自定义插槽</text>
+		<!-- 自定义 footer-->
+		<template slot="footer">
+			<image class="slot-image" src="/static/logo.png" mode="widthFix"></image>
+		</template>
+	</uni-list-item>
+</uni-list>
+```
+
+
+
+
+
+### ListItemChat Props
+
+属性名			|类型		|默认值		|	说明																		
+:-:				|:-:		|:-:		|	:-:	
+title 			|String		|-			|	标题
+note 			|String		|-			|	描述
+clickable		|Boolean	|false		|	是否开启点击反馈
+badgeText		|String		|-			|	数字角标内容，设置为 `dot` 将显示圆点
+badgePositon 	|String		|right		|	角标位置
+link			|String 	|navigateTo	|	是否展示右侧箭头并开启点击反馈，可选值见下表
+clickable		|Boolean	|false		|	是否开启点击反馈
+to				|String		|-			|	跳转页面地址，如填写此属性，click 会返回页面是否跳转成功	
+time			|String 	|-			|	右侧时间显示
+avatarCircle 	|Boolean 	|false		|	是否显示圆形头像
+avatar			|String 	|-			|	头像地址，avatarCircle 不填时生效
+avatarList 		|Array	 	|-			|	头像组，格式为 [{url:''}]
+
+#### Link Options
+
+属性名		|	说明
+:-:			|	:-:
+navigateTo 	| 	同 uni.navigateTo()
+redirectTo 	|	同 uni.reLaunch()
+reLaunch	|	同 uni.reLaunch()
+switchTab  	|	同 uni.switchTab()
+
+### ListItemChat Slots
+
+名称	 	|	说明					
+:-		|	:-						
+default	|	自定义列表右侧内容（包括时间和角标显示）
+
+### ListItemChat Events
+事件称名			|	说明						|	返回参数			
+:-:				|	:-:						|	:-:	
+@click			|	点击 uniListChat 触发事件	|	{data:{}}	，如有 to 属性，会返回页面跳转信息	
+
+
+
+
+
+
+## 基于uni-list扩展的页面模板
+
+通过扩展插槽，可实现多种常见样式的列表
+
+**新闻列表类**
+
+1. 云端一体混合布局：[https://ext.dcloud.net.cn/plugin?id=2546](https://ext.dcloud.net.cn/plugin?id=2546)
+2. 云端一体垂直布局，大图模式：[https://ext.dcloud.net.cn/plugin?id=2583](https://ext.dcloud.net.cn/plugin?id=2583)
+3. 云端一体垂直布局，多行图文混排：[https://ext.dcloud.net.cn/plugin?id=2584](https://ext.dcloud.net.cn/plugin?id=2584)
+4. 云端一体垂直布局，多图模式：[https://ext.dcloud.net.cn/plugin?id=2585](https://ext.dcloud.net.cn/plugin?id=2585)
+5. 云端一体水平布局，左图右文：[https://ext.dcloud.net.cn/plugin?id=2586](https://ext.dcloud.net.cn/plugin?id=2586)
+6. 云端一体水平布局，左文右图：[https://ext.dcloud.net.cn/plugin?id=2587](https://ext.dcloud.net.cn/plugin?id=2587)
+7. 云端一体垂直布局，无图模式，主标题+副标题：[https://ext.dcloud.net.cn/plugin?id=2588](https://ext.dcloud.net.cn/plugin?id=2588)
+
+**商品列表类**
+
+1. 云端一体列表/宫格视图互切：[https://ext.dcloud.net.cn/plugin?id=2651](https://ext.dcloud.net.cn/plugin?id=2651)
+2. 云端一体列表（宫格模式）：[https://ext.dcloud.net.cn/plugin?id=2671](https://ext.dcloud.net.cn/plugin?id=2671)
+3. 云端一体列表（列表模式）：[https://ext.dcloud.net.cn/plugin?id=2672](https://ext.dcloud.net.cn/plugin?id=2672)
+
+## 组件示例
+
 点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/list/list](https://hellouniapp.dcloud.net.cn/pages/extUI/list/list)
\ No newline at end of file
diff --git a/uni_modules/uni-open-bridge-common/changelog.md b/uni_modules/uni-open-bridge-common/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..88198145de175687df2a584193a24b31e2de8d98
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/changelog.md
@@ -0,0 +1,2 @@
+## 1.0.0（2022-08-22）
+- 首次发布
diff --git a/uni_modules/uni-open-bridge-common/package.json b/uni_modules/uni-open-bridge-common/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..7c9aa6b787ea750ea781543a0cac9ac0124f54d2
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "uni-open-bridge-common",
+  "displayName": "uni-open-bridge-common",
+  "version": "1.0.0",
+  "description": "统一接管微信等三方平台认证凭据",
+  "keywords": [
+    "uni-open-bridge-common",
+    "access_token",
+    "session_key",
+    "ticket"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.5.2"
+  },
+  "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
diff --git a/uni_modules/uni-open-bridge-common/readme.md b/uni_modules/uni-open-bridge-common/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..de28c36e067fb692b8f4cd23bc80941ea956e305
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/readme.md
@@ -0,0 +1,5 @@
+# uni-open-bridge-common
+
+`uni-open-bridge-common` 是统一接管微信等三方平台认证凭据（包括但不限于`access_token`、`session_key`、`encrypt_key`、`ticket`）的开源库。
+
+文档链接 [https://uniapp.dcloud.net.cn/uniCloud/uni-open-bridge#common](https://uniapp.dcloud.net.cn/uniCloud/uni-open-bridge#common)
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/bridge-error.js b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/bridge-error.js
new file mode 100644
index 0000000000000000000000000000000000000000..b6cfe66170d1958f57cee2e3715fc4984682c379
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/bridge-error.js
@@ -0,0 +1,26 @@
+'use strict';
+
+class BridgeError extends Error {
+
+  constructor(code, message) {
+    super(message)
+
+    this._code = code
+  }
+
+  get code() {
+    return this._code
+  }
+
+  get errCode() {
+    return this._code
+  }
+
+  get errMsg() {
+    return this.message
+  }
+}
+
+module.exports = {
+  BridgeError
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..a08f9973d0b1215db4832bb79b294f733947d652
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/config.js
@@ -0,0 +1,95 @@
+'use strict';
+
+const {
+  PlatformType
+} = require('./consts.js')
+
+const configCenter = require('uni-config-center')
+
+const OauthConfig = {
+  'weixin-mp': ['mp-weixin', 'oauth', 'weixin'],
+  'weixin-h5': ['web', 'oauth', 'weixin-h5']
+}
+
+class ConfigBase {
+
+  constructor() {
+    this._ready = false
+    this._uniId = null
+
+    const uniIdConfig = configCenter({
+      pluginId: 'uni-id'
+    })
+
+    this._uniId = uniIdConfig.config()
+
+    this._ready = true
+  }
+
+  getAppConfig(appid) {
+    if (Array.isArray(this._uniId)) {
+      return this._uniId.find((item) => {
+        return (item.dcloudAppid === appid)
+      })
+    }
+    return this._uniId
+  }
+
+  get ready() {
+    return this._ready
+  }
+}
+
+class AppConfig extends ConfigBase {
+
+  constructor() {
+    super()
+  }
+
+  get(appid, platform) {
+    if (!this.isSupport(platform)) {
+      return null
+    }
+
+    let appConfig = this.getAppConfig(appid)
+    if (!appConfig) {
+      return null
+    }
+
+    return this.getOauthConfig(appConfig, platform)
+  }
+
+  isSupport(platformName) {
+    return (AppConfig.Support_Platforms.indexOf(platformName) >= 0)
+  }
+
+  getOauthConfig(appConfig, platformName) {
+    let tree = OauthConfig[platformName]
+    let node = appConfig
+    for (let i = 0; i < tree.length; i++) {
+      let nodeName = tree[i]
+      if (node[nodeName]) {
+        node = node[nodeName]
+      } else {
+        node = null
+        break
+      }
+    }
+
+    if (node && node.appid && node.appsecret) {
+      return {
+        appid: node.appid,
+        secret: node.appsecret
+      }
+    }
+
+    return null
+  }
+}
+
+AppConfig.Support_Platforms = [PlatformType.WEIXIN_MP, PlatformType.WEIXIN_H5]
+
+
+module.exports = {
+  AppConfig
+};
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..32077bc90cc55b6a2d5a1dec8eb746933a154d1f
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/consts.js
@@ -0,0 +1,19 @@
+'use strict';
+
+const HTTP_STATUS = {
+  SUCCESS: 200
+}
+
+const PlatformType = {
+  WEIXIN_MP: 'weixin-mp',
+  WEIXIN_H5: 'weixin-h5',
+  WEIXIN_APP: 'weixin-app',
+  WEIXIN_WEB: 'weixin-web',
+  QQ_MP: 'qq-mp',
+  QQ_APP: 'qq-app'
+}
+
+module.exports = {
+  HTTP_STATUS,
+  PlatformType
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..d1c1c62a9f67add06dda1247486bdb89dd2c3280
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/index.js
@@ -0,0 +1,210 @@
+'use strict';
+
+const {
+  PlatformType
+} = require('./consts.js')
+
+const {
+  AppConfig
+} = require('./config.js')
+
+const {
+  Storage,
+  Factory
+} = require('./storage.js')
+
+const {
+  BridgeError
+} = require('./bridge-error.js')
+
+const {
+  WeixinServer
+} = require('./weixin-server.js')
+
+const appConfig = new AppConfig()
+
+class AccessToken extends Storage {
+
+  constructor() {
+    super('access-token', ['dcloudAppid', 'platform'])
+  }
+
+  async fallback(parameters) {
+    const oauthConfig = appConfig.get(parameters.dcloudAppid, parameters.platform)
+    const methodName = (parameters.platform === PlatformType.WEIXIN_MP) ? 'GetMPAccessTokenData' :
+      'GetH5AccessTokenData'
+    const responseData = await WeixinServer[methodName](oauthConfig)
+
+    const duration = responseData.expires_in
+    delete responseData.expires_in
+
+    return {
+      value: responseData,
+      duration
+    }
+  }
+}
+
+class UserAccessToken extends Storage {
+
+  constructor() {
+    super('user-access-token', ['dcloudAppid', 'platform', 'openid'])
+  }
+}
+
+class SessionKey extends Storage {
+
+  constructor() {
+    super('session-key', ['dcloudAppid', 'platform', 'openid'])
+  }
+}
+
+class Encryptkey extends Storage {
+
+  constructor() {
+    super('encrypt-key', ['dcloudAppid', 'platform', 'openid'])
+  }
+
+  getKeyString(key) {
+    return `${super.getKeyString(key)}-${key.version}`
+  }
+
+  getExpiresIn(value) {
+    if (value <= 0) {
+      return 60
+    }
+    return value
+  }
+
+  async fallback(parameters) {
+    const accessToken = await Factory.Get(AccessToken, parameters)
+    const userSession = await Factory.Get(SessionKey, parameters)
+
+    const responseData = await WeixinServer.GetUserEncryptKeyData({
+      openid: parameters.openid,
+      access_token: accessToken.access_token,
+      session_key: userSession.session_key
+    })
+
+    const keyInfo = responseData.key_info_list.find((item) => {
+      return item.version = parameters.version
+    })
+
+    const value = {
+      encrypt_key: keyInfo.encrypt_key,
+      iv: keyInfo.iv
+    }
+
+    return {
+      value,
+      duration: keyInfo.expire_in
+    }
+  }
+}
+
+class Ticket extends Storage {
+
+  constructor() {
+    super('ticket', ['dcloudAppid', 'platform'])
+  }
+
+  async fallback(parameters) {
+    const accessToken = await Factory.Get(AccessToken, {
+      dcloudAppid: parameters.dcloudAppid,
+      platform: PlatformType.WEIXIN_H5
+    })
+
+    const responseData = await WeixinServer.GetH5TicketData(accessToken)
+
+    const duration = responseData.expires_in
+    delete responseData.expires_in
+
+    return {
+      value: responseData,
+      duration
+    }
+  }
+}
+
+
+// exports
+
+async function getAccessToken(key, fallback) {
+  return await Factory.Get(AccessToken, key, fallback)
+}
+
+async function setAccessToken(key, value, expiresIn) {
+  await Factory.Set(AccessToken, key, value, expiresIn)
+}
+
+async function removeAccessToken(key) {
+  await Factory.Remove(AccessToken, key)
+}
+
+async function getUserAccessToken(key, fallback) {
+  return await Factory.Get(UserAccessToken, key, fallback)
+}
+
+async function setUserAccessToken(key, value, expiresIn) {
+  await Factory.Set(UserAccessToken, key, value, expiresIn)
+}
+
+async function removeUserAccessToken(key) {
+  await Factory.Remove(UserAccessToken, key)
+}
+
+async function getSessionKey(key, fallback) {
+  return await Factory.Get(SessionKey, key, fallback)
+}
+
+async function setSessionKey(key, value, expiresIn) {
+  await Factory.Set(SessionKey, key, value, expiresIn)
+}
+
+async function removeSessionKey(key) {
+  await Factory.Remove(SessionKey, key)
+}
+
+async function getEncryptKey(key, fallback) {
+  return await Factory.Get(Encryptkey, key, fallback)
+}
+
+async function setEncryptKey(key, value, expiresIn) {
+  await Factory.Set(Encryptkey, key, value, expiresIn)
+}
+
+async function removeEncryptKey(key) {
+  await Factory.Remove(Encryptkey, key)
+}
+
+async function getTicket(key, fallback) {
+  return await Factory.Get(Ticket, key, fallback)
+}
+
+async function setTicket(key, value, expiresIn) {
+  await Factory.Set(Ticket, key, value, expiresIn)
+}
+
+async function removeTicket(key) {
+  await Factory.Remove(Ticket, key)
+}
+
+module.exports = {
+  getAccessToken,
+  setAccessToken,
+  removeAccessToken,
+  getUserAccessToken,
+  setUserAccessToken,
+  removeUserAccessToken,
+  getSessionKey,
+  setSessionKey,
+  removeSessionKey,
+  getEncryptKey,
+  setEncryptKey,
+  removeEncryptKey,
+  getTicket,
+  setTicket,
+  removeTicket,
+  PlatformType,
+  WeixinServer
+}
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/package.json b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..a017b49a3472401b639652785e3583fa26e3cee8
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "uni-open-bridge-common",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
+  }
+}
\ No newline at end of file
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..8345be39c7032bab675371443610261377a8f9ef
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/storage.js
@@ -0,0 +1,117 @@
+'use strict';
+
+const {
+  Validator
+} = require('./validator.js')
+
+const {
+  CacheKeyCascade
+} = require('./uni-cloud-cache.js')
+
+class Storage {
+
+  constructor(type, keys) {
+    this._type = type || null
+    this._keys = keys || []
+  }
+
+  async get(key, fallback) {
+    this.validateKey(key)
+    const result = await this.create(key, fallback).get()
+    return result.value
+  }
+
+  async set(key, value, expiresIn) {
+    this.validateKey(key)
+    this.validateValue(value)
+    const expires_in = this.getExpiresIn(expiresIn)
+    if (expires_in !== 0) {
+      await this.create(key).set(this.getValue(value), expires_in)
+    }
+  }
+
+  async remove(key) {
+    this.validateKey(key)
+    await this.create(key).remove()
+  }
+
+  async ttl(key) {
+    this.validateKey(key)
+    // 后续考虑支持
+  }
+
+  getKeyString(key) {
+    const keyArray = [Storage.Prefix]
+    this._keys.forEach((name) => {
+      keyArray.push(key[name])
+    })
+    keyArray.push(this._type)
+    return keyArray.join(':')
+  }
+
+  getValue(value) {
+    return value
+  }
+
+  getExpiresIn(value) {
+    if (value !== undefined) {
+      return value
+    }
+    return -1
+  }
+
+  validateKey(key) {
+    Validator.Key(this._keys, key)
+  }
+
+  validateValue(value) {
+    Validator.Value(value)
+  }
+
+  create(key, fallback) {
+    const keyString = this.getKeyString(key)
+    const options = {
+      layers: [{
+        type: 'database',
+        key: keyString
+      }, {
+        type: 'redis',
+        key: keyString
+      }]
+    }
+    if (fallback !== null) {
+      const fallbackFunction = fallback || this.fallback
+      if (fallbackFunction) {
+        options.fallback = async () => {
+          return await fallbackFunction(key)
+        }
+      }
+    }
+    return new CacheKeyCascade(options)
+  }
+}
+Storage.Prefix = "uni-id"
+
+const Factory = {
+
+  async Get(T, key, fallback) {
+    return await Factory.MakeUnique(T).get(key, fallback)
+  },
+
+  async Set(T, key, value, expiresIn) {
+    await Factory.MakeUnique(T).set(key, value, expiresIn)
+  },
+
+  async Remove(T, key) {
+    await Factory.MakeUnique(T).remove(key)
+  },
+
+  MakeUnique(T) {
+    return new T()
+  }
+}
+
+module.exports = {
+  Storage,
+  Factory
+};
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/uni-cloud-cache.js b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/uni-cloud-cache.js
new file mode 100644
index 0000000000000000000000000000000000000000..f17044fd654d6d3655e1ca311c9678d308c59057
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/uni-cloud-cache.js
@@ -0,0 +1,324 @@
+const db = uniCloud.database()
+
+function getType(value) {
+  return Object.prototype.toString.call(value).slice(8, -1).toLowerCase()
+}
+
+const validator = {
+  key: function(value) {
+    const err = new Error('Invalid key')
+    if (typeof value !== 'string') {
+      throw err
+    }
+    const valueTrim = value.trim()
+    if (!valueTrim || valueTrim !== value) {
+      throw err
+    }
+  },
+  value: function(value) {
+    // 仅作简单校验
+    const type = getType(value)
+    const validValueType = ['null', 'number', 'string', 'array', 'object']
+    if (validValueType.indexOf(type) === -1) {
+      throw new Error('Invalid value type')
+    }
+  },
+  duration: function(value) {
+    const err = new Error('Invalid duration')
+    if (value === undefined) {
+      return
+    }
+    if (typeof value !== 'number' || value === 0) {
+      throw err
+    }
+  }
+}
+
+/**
+ * 入库时 expired 为过期时间对应的时间戳，永不过期用-1表示
+ * 返回结果时 与redis对齐，-1表示永不过期，-2表示已过期或不存在
+ */
+class DatabaseCache {
+  constructor({
+    collection = 'opendb-open-data'
+  } = {}) {
+    this.type = 'db'
+    this.collection = db.collection(collection)
+  }
+
+  _serializeValue(value) {
+    return value === undefined ? null : JSON.stringify(value)
+  }
+
+  _deserializeValue(value) {
+    return value ? JSON.parse(value) : value
+  }
+
+  async set(key, value, duration) {
+    validator.key(key)
+    validator.value(value)
+    validator.duration(duration)
+    value = this._serializeValue(value)
+    await this.collection.doc(key).set({
+      value,
+      expired: duration && duration !== -1 ? Date.now() + duration : -1
+    })
+  }
+
+  async _getWithDuration(key) {
+    const getKeyRes = await this.collection.doc(key).get()
+    const record = getKeyRes.data[0]
+    if (!record) {
+      return {
+        value: null,
+        duration: -2
+      }
+    }
+    const value = this._deserializeValue(record.value)
+    const expired = record.expired
+    if (expired === -1) {
+      return {
+        value,
+        duration: -1
+      }
+    }
+    const duration = expired - Date.now()
+    if (duration <= 0) {
+      await this.remove(key)
+      return {
+        value: null,
+        duration: -2
+      }
+    }
+    return {
+      value,
+      duration: Math.floor(duration / 1000)
+    }
+  }
+
+  async get(key, {
+    withDuration = true
+  } = {}) {
+    const result = await this._getWithDuration(key)
+    if (!withDuration) {
+      delete result.duration
+    }
+    return result
+  }
+
+  async remove(key) {
+    await this.collection.doc(key).remove()
+  }
+}
+
+class RedisCache {
+  constructor() {
+    this.type = 'redis'
+    this.redis = uniCloud.redis()
+  }
+
+  _serializeValue(value) {
+    return value === undefined ? null : JSON.stringify(value)
+  }
+
+  _deserializeValue(value) {
+    return value ? JSON.parse(value) : value
+  }
+
+  async set(key, value, duration) {
+    validator.key(key)
+    validator.value(value)
+    validator.duration(duration)
+    value = this._serializeValue(value)
+    if (!duration || duration === -1) {
+      await this.redis.set(key, value)
+    } else {
+      await this.redis.set(key, value, 'EX', duration)
+    }
+  }
+
+  async get(key, {
+    withDuration = false
+  } = {}) {
+    let value = await this.redis.get(key)
+    value = this._deserializeValue(value)
+    if (!withDuration) {
+      return {
+        value
+      }
+    }
+    const durationSecond = await this.redis.ttl(key)
+    let duration
+    switch (durationSecond) {
+      case -1:
+        duration = -1
+        break
+      case -2:
+        duration = -2
+        break
+      default:
+        duration = durationSecond
+        break
+    }
+    return {
+      value,
+      duration
+    }
+  }
+
+  async remove(key) {
+    await this.redis.del(key)
+  }
+}
+
+class Cache {
+  constructor({
+    type,
+    collection
+  } = {}) {
+    if (type === 'database') {
+      return new DatabaseCache({
+        collection
+      })
+    } else if (type === 'redis') {
+      return new RedisCache()
+    } else {
+      throw new Error('Invalid cache type')
+    }
+  }
+}
+
+class CacheKey {
+  constructor({
+    type,
+    collection,
+    cache,
+    key,
+    fallback
+  } = {}) {
+    this.cache = cache || new Cache({
+      type,
+      collection
+    })
+    this.key = key
+    this.fallback = fallback
+  }
+
+  async set(value, duration) {
+    await this.cache.set(this.key, value, duration)
+  }
+
+  async setWithSync(value, duration, syncMethod) {
+    await Promise.all([
+      this.set(this.key, value, duration),
+      syncMethod(value, duration)
+    ])
+  }
+
+  async get() {
+    let {
+      value,
+      duration
+    } = await this.cache.get(this.key)
+    if (value !== null && value !== undefined) {
+      return {
+        value,
+        duration
+      }
+    }
+    if (!this.fallback) {
+      return {
+        value: null,
+        duration: -2
+      }
+    }
+    const fallbackResult = await this.fallback()
+    value = fallbackResult.value
+    duration = fallbackResult.duration
+    if (value !== null && duration !== undefined) {
+      await this.cache.set(this.key, value, duration)
+    }
+    return {
+      value,
+      duration
+    }
+  }
+
+  async remove() {
+    await this.cache.remove(this.key)
+  }
+}
+
+class CacheKeyCascade {
+  constructor({
+    layers, // [{cache, type, collection, key}] 从低级到高级排序，[DbCacheKey, RedisCacheKey]
+    fallback
+  } = {}) {
+    this.layers = layers
+    this.cacheLayers = []
+    let lastCacheKey
+    for (let i = 0; i < layers.length; i++) {
+      const {
+        type,
+        cache,
+        collection,
+        key
+      } = layers[i]
+      const lastCacheKeyTemp = lastCacheKey
+      try {
+        const currentCacheKey = new CacheKey({
+          type,
+          collection,
+          cache,
+          key,
+          fallback: i === 0 ? fallback : function() {
+            return lastCacheKeyTemp.get()
+          }
+        })
+        this.cacheLayers.push(currentCacheKey)
+        lastCacheKey = currentCacheKey
+      } catch (e) {}
+    }
+    this.highLevelCache = lastCacheKey
+  }
+
+  async set(value, duration) {
+    return Promise.all(
+      this.cacheLayers.map(item => {
+        return item.set(value, duration)
+      })
+    )
+  }
+
+  async setWithSync(value, duration, syncMethod) {
+    const setPromise = this.cacheLayers.map(item => {
+      return item.set(value, duration)
+    })
+    return Promise.all(
+      [
+        ...setPromise,
+        syncMethod(value, duration)
+      ]
+    )
+  }
+
+  async get() {
+    return this.highLevelCache.get()
+  }
+
+  async remove() {
+    await Promise.all(
+      this.cacheLayers.map(cacheKeyItem => {
+        return cacheKeyItem.remove()
+      })
+    )
+  }
+}
+
+module.exports = {
+  Cache,
+  DatabaseCache,
+  RedisCache,
+  CacheKey,
+  CacheKeyCascade
+}
diff --git a/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/validator.js b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/validator.js
new file mode 100644
index 0000000000000000000000000000000000000000..231dc8b14e84201e4a16a7de2366c4d137eb781f
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/validator.js
@@ -0,0 +1,31 @@
+const Validator = {
+
+  Key(keyArray, parameters) {
+    for (let i = 0; i < keyArray.length; i++) {
+      const keyName = keyArray[i]
+      if (typeof parameters[keyName] !== 'string') {
+        Validator.ThrowNewError(`Invalid ${keyName}`)
+      }
+      if (parameters[keyName].length < 1) {
+        Validator.ThrowNewError(`Invalid ${keyName}`)
+      }
+    }
+  },
+
+  Value(value) {
+    if (value === undefined) {
+      Validator.ThrowNewError('Invalid Value')
+    }
+    if (typeof value !== 'object') {
+      Validator.ThrowNewError('Invalid Value Type')
+    }
+  },
+
+  ThrowNewError(message) {
+    throw new Error(message)
+  }
+}
+
+module.exports = {
+  Validator
+}
diff --git 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
new file mode 100644
index 0000000000000000000000000000000000000000..28d695d74794fbc48095d962abb44ec9f0e1cc78
--- /dev/null
+++ b/uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common/weixin-server.js
@@ -0,0 +1,161 @@
+'use strict';
+
+const crypto = require('crypto')
+
+const {
+  HTTP_STATUS
+} = require('./consts.js')
+
+const {
+  BridgeError
+} = require('./bridge-error.js')
+
+class WeixinServer {
+
+  constructor(options = {}) {
+    this._appid = options.appid
+    this._secret = options.secret
+  }
+
+  getAccessToken() {
+    return uniCloud.httpclient.request(WeixinServer.AccessToken_Url, {
+      dataType: 'json',
+      method: 'POST',
+      data: {
+        appid: this._appid,
+        secret: this._secret,
+        grant_type: "client_credential"
+      }
+    })
+  }
+
+  // 使用客户端获取的 code 从微信服务器换取 openid，code 仅可使用一次
+  codeToSession(code) {
+    return uniCloud.httpclient.request(WeixinServer.Code2Session_Url, {
+      dataType: 'json',
+      data: {
+        appid: this._appid,
+        secret: this._secret,
+        js_code: code,
+        grant_type: 'authorization_code'
+      }
+    })
+  }
+
+  getUserEncryptKey({
+    access_token,
+    openid,
+    session_key
+  }) {
+    console.log(access_token, openid, session_key);
+    const signature = crypto.createHmac('sha256', session_key).update('').digest('hex')
+    return uniCloud.httpclient.request(WeixinServer.User_Encrypt_Key_Url, {
+      dataType: 'json',
+      method: 'POST',
+      dataAsQueryString: true,
+      data: {
+        access_token,
+        openid: openid,
+        signature: signature,
+        sig_method: 'hmac_sha256'
+      }
+    })
+  }
+
+  getAccessTokenH5() {
+    return uniCloud.httpclient.request(WeixinServer.AccessToken_H5_Url, {
+      dataType: 'json',
+      method: 'GET',
+      data: {
+        appid: this._appid,
+        secret: this._secret,
+        grant_type: "client_credential"
+      }
+    })
+  }
+
+  getTicket(access_token) {
+    return uniCloud.httpclient.request(WeixinServer.Ticket_Url, {
+      dataType: 'json',
+      dataAsQueryString: true,
+      method: 'POST',
+      data: {
+        access_token
+      }
+    })
+  }
+}
+
+WeixinServer.AccessToken_Url = 'https://api.weixin.qq.com/cgi-bin/token'
+WeixinServer.Code2Session_Url = 'https://api.weixin.qq.com/sns/jscode2session'
+WeixinServer.User_Encrypt_Key_Url = 'https://api.weixin.qq.com/wxa/business/getuserencryptkey'
+WeixinServer.AccessToken_H5_Url = 'https://api.weixin.qq.com/cgi-bin/token'
+WeixinServer.Ticket_Url = 'https://api.weixin.qq.com/cgi-bin/ticket/getticket?type=jsapi'
+
+WeixinServer.GetMPAccessToken = function(options) {
+  return new WeixinServer(options).getAccessToken()
+}
+
+WeixinServer.GetCodeToSession = function(options) {
+  return new WeixinServer(options).codeToSession(options.code)
+}
+
+WeixinServer.GetUserEncryptKey = function(options) {
+  return new WeixinServer(options).getUserEncryptKey(options)
+}
+
+WeixinServer.GetH5AccessToken = function(options) {
+  return new WeixinServer(options).getAccessTokenH5()
+}
+
+WeixinServer.GetH5Ticket = function(options) {
+  return new WeixinServer(options).getTicket(options.access_token)
+}
+
+////////////////////////////////////////////////////////////////
+
+WeixinServer.GetResponseData = function(response) {
+  console.log("WeixinServer::response", response)
+
+  if (response.status !== HTTP_STATUS.SUCCESS) {
+    throw new BridgeError(response.status, response.status)
+  }
+
+  const responseData = response.data
+
+  if (responseData.errcode !== undefined && responseData.errcode !== 0) {
+    throw new BridgeError(responseData.errcode, responseData.errmsg)
+  }
+
+  return responseData
+}
+
+WeixinServer.GetMPAccessTokenData = async function(options) {
+  const response = await new WeixinServer(options).getAccessToken()
+  return WeixinServer.GetResponseData(response)
+}
+
+WeixinServer.GetCodeToSessionData = async function(options) {
+  const response = await new WeixinServer(options).codeToSession(options.code)
+  return WeixinServer.GetResponseData(response)
+}
+
+WeixinServer.GetUserEncryptKeyData = async function(options) {
+  const response = await new WeixinServer(options).getUserEncryptKey(options)
+  return WeixinServer.GetResponseData(response)
+}
+
+WeixinServer.GetH5AccessTokenData = async function(options) {
+  const response = await new WeixinServer(options).getAccessTokenH5()
+  return WeixinServer.GetResponseData(response)
+}
+
+WeixinServer.GetH5TicketData = async function(options) {
+  const response = await new WeixinServer(options).getTicket(options.access_token)
+  return WeixinServer.GetResponseData(response)
+}
+
+
+module.exports = {
+  WeixinServer
+}
diff --git a/uni_modules/uni-open-bridge/changelog.md b/uni_modules/uni-open-bridge/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/uni_modules/uni-open-bridge/package.json b/uni_modules/uni-open-bridge/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..e88a0a781af48d8a913af82feb9bdfe978c36454
--- /dev/null
+++ b/uni_modules/uni-open-bridge/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "uni-open-bridge",
+  "displayName": "uni-open-bridge",
+  "version": "1.0.0",
+  "description": "uni-open-bridge",
+  "keywords": [
+    "uni-open-bridge"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "uniCloud",
+        "云函数模板"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "",
+      "data": "",
+      "permissions": ""
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "u",
+        "aliyun": "u"
+      },
+      "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
diff --git a/uni_modules/uni-open-bridge/readme.md b/uni_modules/uni-open-bridge/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..9f4f9f70ec400545cbeb3b1e288d6882eedffa14
--- /dev/null
+++ b/uni_modules/uni-open-bridge/readme.md
@@ -0,0 +1,577 @@
+# uni-open-bridge
+
+`uni-open-bridge` 
+
+
+## config.json
+
+```json
+{
+  "schedule": {
+    "__UNI__xxxxxx": {
+      "enable": true,
+      "mp-weixin": {
+        "enable": true,
+        "tasks": ["accessToken"]
+      },
+      "h5-weixin": {
+        "enable": false,
+        "tasks": ["ticket"]
+      }
+    }
+  },
+  "ipWhitelist": ["0.0.0.0"]
+}
+```
+
+## http 调用
+
+请求类型 `POST`, 需要配置IP白名单字段 `ipWhitelist`，参见 `config.json`
+
+### getAccessToken
+
+Url
+
+```
+https://xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx.bspapp.com/uni-open-bridge/getAccessToken
+```
+
+参数
+
+```json
+{
+  "dcloudAppid": "__UNI__xxx",
+  "platform": "mp-weixin"
+}
+```
+
+### setAccessToken
+
+Url
+
+```
+https://xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx.bspapp.com/uni-open-bridge/setAccessToken
+```
+
+```json
+{
+  "dcloudAppid": "__UNI__xxx",
+  "platform": "mp-weixin",
+  "value": {
+    "access_token": ""
+  },
+  "expiresIn": 7200
+}
+```
+
+### removeAccessToken
+
+Url
+
+```
+https://xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx.bspapp.com/uni-open-bridge/removeAccessToken
+```
+
+参数
+
+```json
+{
+  "dcloudAppid": "__UNI__xxx",
+  "platform": "mp-weixin"
+}
+```
+
+### getUserKey
+
+Url
+
+```
+https://xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx.bspapp.com/uni-open-bridge/getUserKey
+```
+
+参数
+
+```json
+{
+  "dcloudAppid": "__UNI__xxx",
+  "platform": "mp-weixin",
+  "openid": ""
+}
+```
+
+### setUserKey
+
+Url
+
+```
+https://xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx.bspapp.com/uni-open-bridge/setUserKey
+```
+
+参数
+
+```json
+{
+  "dcloudAppid": "__UNI__xxx",
+  "platform": "mp-weixin",
+  "openid": "",
+  "value": {
+    "session_key": ""
+  },
+  "expiresIn": 7200
+}
+```
+
+### removeUserKey
+
+Url
+
+```
+https://xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx.bspapp.com/uni-open-bridge/removeUserKey
+```
+
+参数
+
+```json
+{
+  "dcloudAppid": "__UNI__xxx",
+  "platform": "mp-weixin",
+  "openid": ""
+}
+```
+
+### getTicket
+
+Url
+
+```
+https://xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx.bspapp.com/uni-open-bridge/getTicket
+```
+
+参数
+
+```json
+{
+  "dcloudAppid": "__UNI__xxx",
+  "platform": "mp-weixin"
+}
+```
+
+
+### setTicket
+
+Url
+
+```
+https://xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx.bspapp.com/uni-open-bridge/setTicket
+```
+
+参数
+
+```json
+{
+  "dcloudAppid": "__UNI__xxx",
+  "platform": "mp-weixin",
+  "value": {
+    "ticket": ""
+  },
+  "expiresIn": 7200
+}
+```
+
+### removeTicket
+
+Url
+
+```
+https://xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx.bspapp.com/uni-open-bridge/removeTicket
+```
+
+参数
+
+```json
+{
+  "dcloudAppid": "__UNI__xxx",
+  "platform": "mp-weixin"
+}
+```
+
+
+
+
+
+# uni-open-bridge-common
+
+`uni-open-bridge-common` 是 `uni-id` 体系中用于 `开放平台数据` 管理的公共模块。
+
+> `云函数公共模块`是不同云函数共享代码的一种方式。如果你不了解什么是`云函数公共模块`，请另读文档[公共模块](https://uniapp.dcloud.io/uniCloud/cf-common)
+
+`uni-open-bridge-common` 提供了 `access_token`、`session_key`、`encrypt_key`、`ticket` 的读取、写入、删除操作。
+
+`uni-open-bridge-common` 支持多层 读取 / 写入 机制，`redis -> database -> fallback`，优先级如下:
+
+如果用户没有开通 `redis` 或者操作失败，透传到 `database`，`database` 失败后，如果用户配置了 `fallback`，继续调用 `fallback` 方法，否则抛出 `Error`
+
+`database` 对应的表为: `opendb-open-data`
+
+
+## access_token
+
+`access_token` 是微信小程序全局唯一后台接口调用凭据，调用绝大多数后台接口时都需使用。开发者可以通过 getAccessToken 接口获取并进行妥善保存。[详情](https://developers.weixin.qq.com/miniprogram/dev/framework/server-ability/backend-api.html#access_token)
+
+
+### getAccessToken(key: Object)
+
+读取 access_token
+
+
+### setAccessToken(key: Object, value: Object, expiresIn: Number)
+
+写入 access_token
+
+
+### removeAccessToken(key: Object)
+
+删除 access_token
+
+
+### key 属性
+
+|参数				|类型			|必填	|描述																															|
+|:-:				|:-:			|:-:	|:-:																															|
+|dcloudAppid|String		|是		|DCloud应用appid。[详情](https://ask.dcloud.net.cn/article/35907)	|
+|platform		|String		|是		|[详情](#platform)																								|
+|fallback		|Function	|否		|[详情](#fallback)																								|
+
+### value 属性
+
+|参数					|类型		|描述					|
+|:-:					|:-:		|:-:					|
+|access_token	|String	|							|
+
+### expiresIn
+
+有效时间(秒)
+
+
+### 示例代码
+
+```js
+'use strict';
+
+const {
+  getAccessToken,
+  setAccessToken,
+  removeAccessToken
+} = require('uni-open-bridge-common')
+
+exports.main = async (event, context) => {
+  const key = {
+    dcloudAppid: '',
+    platform: ''
+  }
+  const value = {
+    access_token: ''
+  }
+  const expiresIn = 7200
+
+  // 写入 (redis / 数据库)
+  await setAccessToken(key, value, expiresIn)
+
+  // 读取 (redis / 数据库)
+  let result1 = await getAccessToken(key)
+
+  // 删除
+  await removeAccessToken(key)
+
+
+  // 删除后读取, 返回 null
+  let result2 = await getAccessToken(key)
+  console.log(result2) // null
+
+  return null
+};
+```
+
+
+## user_key
+
+平台对应的值
+
+|平台				|值					|描述																																																								|
+|:-:				|:-:				|:-:																																																								|
+|微信小程序	|session_key|微信小程序会话密钥。[详情](https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-login/code2Session.html)	|
+
+
+### getUserKey(key: Object)
+
+读取 user_key
+
+
+### setUserKey(key: Object, value: Object, expiresIn: Number)
+
+写入 user_key
+
+
+### removeUserKey(key: Object)
+
+删除 user_key
+
+
+### key 属性
+
+|参数				|类型			|必填	|描述																															|
+|:-:				|:-:			|:-:	|:-:																															|
+|dcloudAppid|String		|是		|DCloud应用appid。[详情](https://ask.dcloud.net.cn/article/35907)	|
+|platform		|String		|是		|[详情](#platform)																								|
+|openid			|String		|是		|																																	|
+|fallback		|Function	|否		|[详情](#fallback)																								|
+
+### value 属性
+
+|参数				|类型		|描述								|
+|:-:				|:-:		|:-:								|
+|session_key|String	|微信小程序会话密钥	|
+
+### expiresIn
+
+有效时间(秒)
+
+
+### 示例代码
+
+```js
+'use strict';
+
+const {
+  getUserKey,
+  setUserKey,
+  removeUserKey,
+} = require('uni-open-bridge-common')
+
+exports.main = async (event, context) => {
+  const key = {
+    dcloudAppid: '',
+    platform: '',
+    openid: ''
+  }
+  const value = {
+    'session_key': ''
+  }
+  const expiresIn = 7200
+
+  // 写入 (redis / 数据库)
+  await setUserKey(key, value, expiresIn)
+
+  // 读取 (redis / 数据库)
+  let result1 = await getUserKey(key)
+
+  // 删除
+  await removeUserKey(key)
+
+
+  // 删除后读取, 返回 null
+  let result2 = await getUserKey(key)
+  console.log(result2) // null
+
+  return null
+};
+```
+
+
+## encrypt_key
+
+为了避免小程序与开发者后台通信时数据被截取和篡改，微信侧维护了一个用户维度的可靠key，用于小程序和后台通信时进行加密和签名。[详情](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/user-encryptkey.html)
+
+开发者可以分别通过小程序前端和微信后台提供的接口，获取用户的加密 key。
+
+
+### getEncryptKey(key: Object)
+
+读取 encrypt_key
+
+
+### setEncryptKey(key: Object, value: Object, expiresIn: Number)
+
+写入 encrypt_key
+
+
+### removeEncryptKey(key: Object)
+
+删除 encrypt_key
+
+
+### key 属性
+
+|参数				|类型			|必填	|描述																															|
+|:-:				|:-:			|:-:	|:-:																															|
+|dcloudAppid|String		|是		|DCloud应用appid。[详情](https://ask.dcloud.net.cn/article/35907)	|
+|platform		|String		|是		|[详情](#platform)																								|
+|openid			|String		|是		|																																	|
+|version		|Number		|是		|版本																															|
+|fallback		|Function	|否		|[详情](#fallback)																								|
+
+
+### value 属性
+
+|参数				|类型		|描述			|
+|:-:				|:-:		|:-:			|
+|encrypt_key|String	|加密 key	|
+|iv					|String	|加密 iv	  |
+
+### expiresIn
+
+有效时间(秒)
+
+
+### 示例代码
+
+```js
+'use strict';
+
+const {
+  getEncryptKey,
+  setEncryptKey,
+  removeEncryptKey
+} = require('uni-open-bridge-common')
+
+exports.main = async (event, context) => {
+  const key = {
+    dcloudAppid: '',
+    platform: '',
+    openid: '',
+    version: 1
+  }
+  const value = {
+    encrypt_key: '',
+    iv: ''
+  }
+  const expiresIn = 7200
+
+  // 写入 (redis / 数据库)
+  await setEncryptKey(key, value, expiresIn)
+
+  // 读取 (redis / 数据库)
+  let result1 = await getEncryptKey(key)
+
+  // 删除
+  await removeEncryptKey(key)
+
+  // 删除后读取, 返回 null
+  let result2 = await getEncryptKey(key)
+  console.log(result2) // null
+
+  return null
+};
+```
+
+
+## ticket
+
+`ticket` 是公众号用于调用微信 JS 接口的临时票据。[详情](https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html#62)
+
+
+### getTicket(key: Object)
+
+读取 ticket
+
+
+### setTicket(key: Object, value: Object, expiresIn: Number)
+
+写入 ticket
+
+
+### removeTicket(key: Object)
+
+删除 ticket
+
+
+### key 属性
+
+|参数				|类型			|必填	|描述																															|
+|:-:				|:-:			|:-:	|:-:																															|
+|dcloudAppid|String		|是		|DCloud应用appid。[详情](https://ask.dcloud.net.cn/article/35907)	|
+|platform		|String		|是		|[详情](#platform)																								|
+|fallback		|Function	|否		|[详情](#fallback)																								|
+
+### value 属性
+
+|参数				|类型		|描述			|
+|:-:				|:-:		|:-:			|
+|ticket			|String	|					|
+
+### expiresIn
+
+有效时间(秒)
+
+
+### 示例代码
+
+```js
+'use strict';
+
+const {
+  getTicket,
+  setTicket,
+  removeTicket
+} = require('uni-open-bridge-common')
+
+exports.main = async (event, context) => {
+  const key = {
+    dcloudAppid: '',
+    platform: ''
+  }
+  const value = {
+    ticket: ''
+  }
+  const expiresIn = 7200
+
+  // 写入 (redis / 数据库)
+  await setTicket(key, value, expiresIn)
+
+  // 读取 (redis / 数据库)
+  let result1 = await getTicket(key)
+
+  // 删除
+  await removeTicket(key)
+
+
+  // 删除后读取, 返回 null
+  let result2 = await getTicket(key)
+  console.log(result2) // null
+
+  return null
+};
+```
+
+
+## Platform@platform
+
+平台对应的值
+
+|值					|描述				|
+|:-:				|:-:				|
+|mp-weixin	|微信小程序	|
+|app-weixin	|微信 App	  |
+|h5-weixin	|微信公众号	|
+|web-weixin	|微信pc网页	|
+|mp-qq			|QQ 小程序		|
+|app-qq			|QQ App			|
+
+
+## fallback@fallback
+
+可选 `async function fallback()`，当 `reids -> database` 都找不到对应 `key` 时，调用此方法，需要返回数据格式如下
+
+```json
+{
+  value: null,
+  duration: 1
+}
+```
+
+
+
+注意事项
+
+- 所有方法类型为 `async`，需要使用 `await`
+- 所有方法校验 `key` 属性是否有效，无效则 `throw new Error()`，对 `value` 仅校验是否为 `undefined`
diff --git a/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/basic.js b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/basic.js
new file mode 100644
index 0000000000000000000000000000000000000000..b59f040957c6eccc64010eb548fc99e52123ab8a
--- /dev/null
+++ b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/basic.js
@@ -0,0 +1,131 @@
+'use strict';
+
+class Command {
+
+  constructor() {
+    this._registered = {}
+  }
+
+  async execute(name, args) {
+    if (this._registered[name]) {
+      return await this._registered[name].execute(args)
+    }
+  }
+
+  canExecute(name, args) {
+    if (this._registered[name] && this._registered[name].canExecute) {
+      this._registered[name].canExecute(args)
+    }
+    return false
+  }
+
+  register(name, execute, canExecute) {
+    this._registered[name] = {
+      execute,
+      canExecute
+    }
+  }
+}
+
+class Task {
+
+  constructor(id) {
+    this._id = id || this._newTaskId()
+
+    this._state = Task.TASK_STATE.WAITING
+  }
+
+  async run() {}
+
+  async cancel() {}
+
+  async taskAction() {}
+
+  _newTaskId() {
+    let guid = ''
+    const format = 'xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx'
+    for (let i = 0; i < format.length; i++) {
+      if (format[i] === 'x') {
+        guid += (Math.random() * 16 | 0).toString(16)
+      } else {
+        guid += format[i]
+      }
+    }
+    return guid.toUpperCase()
+  }
+
+  get id() {
+    return this._id
+  }
+  set id(value) {
+    this._id = value
+  }
+
+  get state() {
+    return this._state
+  }
+  set state(value) {
+    this._state = value
+  }
+}
+
+Task.TASK_STATE = {
+  WAITING: "WAITING",
+  RESOLVING: "RESOLVING",
+  RESOLVED: "RESOLVED",
+  EXECUTING: "EXECUTING",
+  ERROR: "ERROR",
+  COMPLETED: "COMPLETED",
+  CANCELLING: "CANCELLING",
+  CANCELLED: "CANCELLED"
+}
+
+class TaskManager {
+
+  constructor() {
+    this._tasks = []
+  }
+
+  get tasks() {
+    return this._tasks
+  }
+
+  clear() {
+    this._tasks.length = 0
+  }
+
+  getTask(id) {
+    return this._tasks.find((item) => {
+      return (item.id == id)
+    })
+  }
+
+  addTask(task) {
+    this._tasks.push(task)
+  }
+
+  deleteTask(id) {
+    const index = this.findIndex(id)
+    if (index < 0) {
+      return
+    }
+
+    this._tasks[index].cancel()
+
+    if (index > -1) {
+      this._tasks.splice(index, 1)
+    }
+  }
+
+  findIndex(id) {
+    return this._tasks.findIndex((item) => {
+      return (item.id == id)
+    })
+  }
+}
+
+module.exports = {
+  Command,
+  Task,
+  TaskManager
+};
diff --git a/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/config.js b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/config.js
new file mode 100644
index 0000000000000000000000000000000000000000..83adffaa81f55a68587be7828cc995aa891bb38c
--- /dev/null
+++ b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/config.js
@@ -0,0 +1,197 @@
+'use strict';
+
+const {
+  PlatformType
+} = require('./consts.js')
+
+const configCenter = require('uni-config-center')
+
+const OauthConfig = {
+  'mp-weixin': ['oauth', 'weixin'],
+  'h5-weixin': ['oauth', 'weixin']
+}
+
+class TaskConfig {
+
+  constructor(options) {
+    this._dcloudAppid = options.dcloudAppid
+    this._appid = options.appid
+    this._secret = options.secret
+    this._platform = options.platform
+    this._tasks = options.tasks
+    this._timeout = 1000 * 10
+  }
+
+  get dcloudAppid() {
+    return this._dcloudAppid
+  }
+
+  get appid() {
+    return this._appid
+  }
+
+  get secret() {
+    return this._secret
+  }
+
+  get platform() {
+    return this._platform
+  }
+
+  get tasks() {
+    return this._tasks
+  }
+}
+
+class ConfigBase {
+
+  constructor() {
+    const uniIdConfig = configCenter({
+      pluginId: 'uni-id'
+    })
+    const openBridgeConfig = configCenter({
+      pluginId: 'uni-open-bridge'
+    })
+
+    this._uniId = uniIdConfig.config()
+    this._openBridge = openBridgeConfig.config()
+
+    this._ready = true
+  }
+
+  getAppConfig(appid) {
+    if (Array.isArray(this._uniId)) {
+      return this._uniId.find((item) => {
+        return (item.dcloudAppid === appid)
+      })
+    }
+
+    if (this._uniId.dcloudAppid === appid) {
+      return this._uniId
+    }
+
+    return null
+  }
+
+  inWhitelist(ip) {
+    return (this.ipWhitelist.indexOf(ip) > -1)
+  }
+
+  get openBridge() {
+    return this._openBridge
+  }
+
+  get ipWhitelist() {
+    return this._openBridge.ipWhitelist
+  }
+
+  get ready() {
+    return this._ready
+  }
+}
+
+class OpenBridgeConfig extends ConfigBase {
+
+  constructor() {
+    super()
+
+    this._tasks = []
+
+    this.resolve()
+  }
+
+  get tasks() {
+    return this._tasks
+  }
+
+  resolve() {
+    this._tasks.length = 0
+
+    const appids = Object.keys(this.openBridge.schedule)
+
+    for (let i = 0; i < appids.length; i++) {
+      const appid = appids[i]
+      let appConfig = this.getAppConfig(appid)
+
+      if (appConfig != null) {
+        const schedule = this.openBridge.schedule[appid]
+        if (schedule) {
+          this.resolveSchedule(appid, appConfig, schedule)
+        }
+      }
+    }
+  }
+
+  resolveSchedule(dcloudAppid, appConfig, schedule) {
+    if (schedule.enable !== true) {
+      return
+    }
+
+    const schedulePlatforms = Object.keys(schedule)
+
+    for (let i = 0; i < schedulePlatforms.length; i++) {
+      const platformName = schedulePlatforms[i]
+      const scheduleTask = schedule[platformName]
+
+      if (!scheduleTask.enable) {
+        continue
+      }
+
+      if (!this.isSupport(platformName)) {
+        continue
+      }
+
+      const oauthConfig = this.getOauthConfig(appConfig, platformName)
+      if (!oauthConfig) {
+        continue
+      }
+
+      this._tasks.push({
+        platform: platformName,
+        tasks: scheduleTask.tasks,
+        dcloudAppid: dcloudAppid,
+        appid: oauthConfig.appid,
+        secret: oauthConfig.secret
+      })
+    }
+  }
+
+  isSupport(platformName) {
+    return (OpenBridgeConfig.Support_Platforms.indexOf(platformName) >= 0)
+  }
+
+  getOauthConfig(appConfig, platformName) {
+    const platformConfig = appConfig[platformName]
+    if (!platformConfig) {
+      return null
+    }
+
+    let tree = OauthConfig[platformName]
+    let node = platformConfig
+    for (let i = 0; i < tree.length; i++) {
+      let nodeName = tree[i]
+      if (node[nodeName]) {
+        node = node[nodeName]
+      } else {
+        node = null
+        break
+      }
+    }
+
+    if (node && node.appid && node.appsecret) {
+      return {
+        appid: node.appid,
+        secret: node.appsecret
+      }
+    }
+
+    return null
+  }
+}
+
+OpenBridgeConfig.Support_Platforms = ['mp-weixin', 'h5-weixin']
+
+
+module.exports = {
+  OpenBridgeConfig
+};
diff --git a/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/consts.js b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/consts.js
new file mode 100644
index 0000000000000000000000000000000000000000..c163e96be0428374c64957e4b855e21c068f37b6
--- /dev/null
+++ b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/consts.js
@@ -0,0 +1,19 @@
+'use strict';
+
+const HTTP_STATUS = {
+  SUCCESS: 200
+}
+
+const PlatformType = {
+  MP_WEIXIN: 'mp-weixin',
+  H5_WEIXIN: 'h5-weixin',
+  APP_WEIXIN: 'app-weixin',
+  WEB_WEIXIN: 'web-weixin',
+  MP_QQ: 'mp-qq',
+  APP_QQ: 'app-qq'
+}
+
+module.exports = {
+  HTTP_STATUS,
+  PlatformType
+}
diff --git a/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/index.mp-weixin.js b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/index.mp-weixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..25556ef900022c7cf47d6bb9aa6a66533cd94a94
--- /dev/null
+++ b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/index.mp-weixin.js
@@ -0,0 +1,93 @@
+'use strict';
+
+const {
+  getAccessToken,
+  setAccessToken,
+  removeAccessToken,
+  getUserKey,
+  setUserKey,
+  removeUserKey,
+  getEncryptKey,
+  setEncryptKey,
+  removeEncryptKey,
+  getTicket,
+  setTicket,
+  removeTicket
+} = require('uni-open-bridge-common')
+
+const {
+  Command
+} = require('./basic.js');
+
+const {
+  OpenBridgeConfig
+} = require('./config.js')
+
+const openBridgeConfig = new OpenBridgeConfig()
+
+class MainFrame extends Command {
+
+  constructor() {
+    super()
+
+    MainFrame.Commands.forEach((name) => {
+      this.register(name, this[name].bind(this))
+    })
+  }
+
+  async getAccessToken(parameters) {
+    return await getAccessToken(parameters)
+  }
+
+  async setAccessToken(parameters) {
+    return await setAccessToken(parameters, parameters.value, parameters.expiresIn)
+  }
+
+  async removeAccessToken(parameters) {
+    return await removeAccessToken(parameters)
+  }
+
+  async getUserKey(parameters) {
+    return await getUserKey(parameters, null)
+  }
+
+  async setUserKey(parameters) {
+    return await setUserKey(parameters, parameters.value, parameters.expiresIn)
+  }
+
+  async removeUserKey(parameters) {
+    return await removeUserKey(parameters)
+  }
+
+  async getTicket(parameters) {
+    return await getTicket(parameters, null)
+  }
+
+  async setTicket(parameters) {
+    return await setTicket(parameters, parameters.value, parameters.expiresIn)
+  }
+
+  async removeTicket(parameters) {
+    return await removeTicket(parameters)
+  }
+
+  checkIP(ip) {
+    return openBridgeConfig.inWhitelist(ip)
+  }
+}
+
+MainFrame.Commands = [
+  'getAccessToken',
+  'setAccessToken',
+  'removeAccessToken',
+  'getUserKey',
+  'setUserKey',
+  'removeUserKey',
+  'getTicket',
+  'setTicket',
+  'removeTicket'
+];
+
+const commands = new MainFrame();
+
+module.exports = commands;
diff --git a/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/index.obj.js b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/index.obj.js
new file mode 100644
index 0000000000000000000000000000000000000000..71d6ae911c1fbe1cbdeeedbab813f002c99d1d7c
--- /dev/null
+++ b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/index.obj.js
@@ -0,0 +1,62 @@
+'use strict';
+
+const {
+  PlatformType
+} = require('./consts.js')
+
+const runTask = require('./index.task.js')
+const weixinCommand = require('./index.mp-weixin.js')
+
+async function executeCommand() {
+  const methodName = this.getMethodName()
+  const parameters = JSON.parse(this.getHttpInfo().body)
+
+  if (parameters.platform === PlatformType.MP_WEIXIN) {
+    return await weixinCommand.execute(methodName, parameters)
+  }
+
+  throw new Error('Invalid Platform')
+}
+
+module.exports = {
+  async _timing() {
+    console.log('triggered by timing')
+    await runTask()
+  },
+  async _before() {
+    const clientInfo = this.getClientInfo()
+    if (!weixinCommand.checkIP(clientInfo.clientIP)) {
+      throw new Error("Invalid IP:" + clientInfo.clientIP)
+    }
+  },
+  // async runTask() {
+  //   await runTask()
+  // },
+  async getAccessToken() {
+    return await executeCommand.call(this)
+  },
+  async setAccessToken() {
+    return await executeCommand.call(this)
+  },
+  async removeAccessToken() {
+    return await executeCommand.call(this)
+  },
+  async getUserKey() {
+    return await executeCommand.call(this)
+  },
+  async setUserKey() {
+    return await executeCommand.call(this)
+  },
+  async removeUserKey() {
+    return await executeCommand.call(this)
+  },
+  async getTicket() {
+    return await executeCommand.call(this)
+  },
+  async setTicket() {
+    return await executeCommand.call(this)
+  },
+  async removeTicket() {
+    return await executeCommand.call(this)
+  }
+}
diff --git a/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/index.task.js b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/index.task.js
new file mode 100644
index 0000000000000000000000000000000000000000..017dc888418840b23d64d8fbe47e2091f655a140
--- /dev/null
+++ b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/index.task.js
@@ -0,0 +1,86 @@
+'use strict';
+
+const {
+  OpenBridgeConfig
+} = require('./config.js')
+
+const {
+  TaskManager
+} = require('./basic.js')
+
+const {
+  TaskAccessTokenMP
+} = require('./task-mp-weixin.js')
+
+const {
+  TaskAccessTokenH5,
+  TaskTicket
+} = require('./task-h5-weixin.js')
+
+const TaskMapping = {
+  'mp-weixin': {
+    'accessToken': TaskAccessTokenMP
+  },
+  'h5-weixin': {
+    'accessToken': TaskAccessTokenH5,
+    'ticket': TaskTicket
+  }
+}
+
+class ScheduleManager extends TaskManager {
+
+  constructor() {
+    super()
+  }
+
+  async runAll() {
+    for (let i = 0; i < this.tasks.length; i++) {
+      const task = this.tasks[i]
+
+      try {
+        await task.run()
+      } catch (e) {
+        console.log("task.run::", e)
+      }
+    }
+  }
+
+  newTask(T, config) {
+    const newTask = new T(config)
+
+    super.addTask(newTask)
+
+    return newTask
+  }
+}
+
+ScheduleManager.instance = function() {
+  if (!ScheduleManager._instance) {
+    ScheduleManager._instance = new ScheduleManager()
+  }
+  return ScheduleManager._instance
+}
+
+async function main() {
+  const openBridgeConfig = new OpenBridgeConfig()
+
+  ScheduleManager.instance().clear()
+
+  for (let taskConfig of openBridgeConfig.tasks) {
+    let {
+      platform,
+      tasks
+    } = taskConfig
+
+    for (let taskName of tasks) {
+      const platformTask = TaskMapping[platform]
+      if (platformTask) {
+        ScheduleManager.instance().newTask(platformTask[taskName], taskConfig)
+      }
+    }
+  }
+
+  await ScheduleManager.instance().runAll()
+}
+
+module.exports = main;
diff --git a/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/package.json b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..7aad3d934202f322a65aadb7fb26226e1beaa772
--- /dev/null
+++ b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "uni-open-bridge",
+  "dependencies": {
+    "uni-open-bridge-common": "file:../common/uni-open-bridge-common",
+    "uni-config-center": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
+  },
+  "extensions": {
+    "uni-cloud-jql": {}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/task-h5-weixin.js b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/task-h5-weixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..c5950ae4268a8a962c8fc9d07bb3cc3343f0a944
--- /dev/null
+++ b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/task-h5-weixin.js
@@ -0,0 +1,67 @@
+'use strict';
+
+const {
+  getAccessToken,
+  setAccessToken,
+  removeAccessToken,
+  getTicket,
+  setTicket,
+  removeTicket
+} = require('uni-open-bridge-common')
+
+const {
+  Task
+} = require('./basic.js')
+
+const {
+  PlatformType
+} = require('./consts.js')
+
+class TaskAccessTokenH5 extends Task {
+
+  constructor(config) {
+    super()
+
+    this._config = config || null
+  }
+
+  async run() {
+    const key = {
+      dcloudAppid: this._config.dcloudAppid,
+      platform: PlatformType.H5_WEIXIN
+    }
+
+    const result = await getAccessToken(key)
+
+    console.log("setAccessToken...", key, result)
+  }
+}
+
+TaskAccessTokenH5.ID = 'TaskAccessTokenH5'
+
+class TaskTicket extends Task {
+
+  constructor(config) {
+    super()
+
+    this._config = config || null
+  }
+
+  async run() {
+    const key = {
+      dcloudAppid: this._config.dcloudAppid,
+      platform: PlatformType.H5_WEIXIN
+    }
+
+    const result = await getTicket(key)
+
+    console.log("setTicket...", key, result)
+  }
+}
+
+TaskTicket.ID = 'TaskTicket'
+
+module.exports = {
+  TaskAccessTokenH5,
+  TaskTicket
+}
diff --git a/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/task-mp-weixin.js b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/task-mp-weixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..547aaa799688d1af56140f7e7d9dfacdd92764cd
--- /dev/null
+++ b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/uni-open-bridge/task-mp-weixin.js
@@ -0,0 +1,41 @@
+'use strict';
+
+const {
+  getAccessToken,
+  setAccessToken,
+  removeAccessToken
+} = require('uni-open-bridge-common')
+
+const {
+  Task
+} = require('./basic.js')
+
+const {
+  PlatformType
+} = require('./consts.js')
+
+class TaskAccessTokenMP extends Task {
+
+  constructor(config) {
+    super()
+
+    this._config = config || null
+  }
+
+  async run() {
+    const key = {
+      dcloudAppid: this._config.dcloudAppid,
+      platform: PlatformType.MP_WEIXIN
+    }
+
+    const result = await getAccessToken(key)
+
+    console.log("setAccessToken...", key, result)
+  }
+}
+
+TaskAccessTokenMP.ID = 'TaskAccessTokenMP'
+
+module.exports = {
+  TaskAccessTokenMP
+}
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
index 6b1c03b46ab02535b9ce9bbaac7ea4c70bceb6b2..a9e2d668244f888b84bbf7d881c25280e637c25f 100644
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
@@ -1,3 +1,9 @@
+## 1.7.9（2022-04-02）
+- 修复 弹出层内部无法滚动的bug
+## 1.7.8（2022-03-28）
+- 修复 小程序中高度错误的bug
+## 1.7.7（2022-03-17）
+- 修复 快速调用open出现问题的Bug
 ## 1.7.6（2022-02-14）
 - 修复 safeArea 属性不能设置为false的bug
 ## 1.7.5（2022-01-19）
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
index c29e344b98755bd21bc7e26eb86a3dfe0ec6eb85..a3ced3d800772e2bbc3be1e80c5267345515e23f 100644
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -1,9 +1,13 @@
 <template>
-	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']" @touchmove.stop.prevent="clear">
-		<view @touchstart="touchstart" >
-			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
-			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
-				<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear"><slot /></view>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<view @touchstart="touchstart">
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
+				:duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
+				:show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear">
+					<slot />
+				</view>
 			</uni-transition>
 		</view>
 		<!-- #ifdef H5 -->
@@ -13,425 +17,458 @@
 </template>
 
 <script>
-// #ifdef H5
-import keypress from './keypress.js'
-// #endif
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
 
-/**
- * PopUp 弹出层
- * @description 弹出层组件，为了解决遮罩弹层的问题
- * @tutorial https://ext.dcloud.net.cn/plugin?id=329
- * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
- * 	@value top 顶部弹出
- * 	@value center 中间弹出
- * 	@value bottom 底部弹出
- * 	@value left		左侧弹出
- * 	@value right  右侧弹出
- * 	@value message 消息提示
- * 	@value dialog 对话框
- * 	@value share 底部分享示例
- * @property {Boolean} animation = [true|false] 是否开启动画
- * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
- * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
- * @property {String}  backgroundColor 主窗口背景色
- * @property {String}  maskBackgroundColor 蒙版颜色
- * @property {Boolean} safeArea		   是否适配底部安全区
- * @event {Function} change 打开关闭弹窗触发，e={show: false}
- * @event {Function} maskClick 点击遮罩触发
- */
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {Boolean} safeArea		   是否适配底部安全区
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
 
-export default {
-	name: 'uniPopup',
-	components: {
-		// #ifdef H5
-		keypress
-		// #endif
-	},
-	emits:['change','maskClick'],
-	props: {
-		// 开启动画
-		animation: {
-			type: Boolean,
-			default: true
-		},
-		// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
-		// message: 消息提示 ; dialog : 对话框
-		type: {
-			type: String,
-			default: 'center'
-		},
-		// maskClick
-		isMaskClick: {
-			type: Boolean,
-			default: null
-		},
-		// TODO 2 个版本后废弃属性 ，使用 isMaskClick
-		maskClick: {
-			type: Boolean,
-			default: null
-		},
-		backgroundColor: {
-			type: String,
-			default: 'none'
-		},
-		safeArea:{
-			type: Boolean,
-			default: true
-		},
-		maskBackgroundColor: {
-			type: String,
-			default: 'rgba(0, 0, 0, 0.4)'
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
 		},
-	},
-
-	watch: {
-		/**
-		 * 监听type类型
-		 */
-		type: {
-			handler: function(type) {
-				if (!this.config[type]) return
-				this[this.config[type]](true)
+		emits: ['change', 'maskClick'],
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
 			},
-			immediate: true
-		},
-		isDesktop: {
-			handler: function(newVal) {
-				if (!this.config[newVal]) return
-				this[this.config[this.type]](true)
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
 			},
-			immediate: true
-		},
-		/**
-		 * 监听遮罩是否可点击
-		 * @param {Object} val
-		 */
-		maskClick: {
-			handler: function(val) {
-				this.mkclick = val
+			// maskClick
+			isMaskClick: {
+				type: Boolean,
+				default: null
 			},
-			immediate: true
-		},
-		isMaskClick: {
-			handler: function(val) {
-				this.mkclick = val
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
 			},
-			immediate: true
-		},
-		// H5 下禁止底部滚动
-		showPopup(show) {
-			// #ifdef H5
-			// fix by mehaotian 处理 h5 滚动穿透的问题
-			document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
-			// #endif
-		}
-	},
-	data() {
-		return {
-			duration: 300,
-			ani: [],
-			showPopup: false,
-			showTrans: false,
-			popupWidth: 0,
-			popupHeight: 0,
-			config: {
-				top: 'top',
-				bottom: 'bottom',
-				center: 'center',
-				left: 'left',
-				right: 'right',
-				message: 'top',
-				dialog: 'center',
-				share: 'bottom'
+			backgroundColor: {
+				type: String,
+				default: 'none'
 			},
-			maskClass: {
-				position: 'fixed',
-				bottom: 0,
-				top: 0,
-				left: 0,
-				right: 0,
-				backgroundColor: 'rgba(0, 0, 0, 0.4)'
+			safeArea: {
+				type: Boolean,
+				default: true
 			},
-			transClass: {
-				position: 'fixed',
-				left: 0,
-				right: 0
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
 			},
-			maskShow: true,
-			mkclick: true,
-			popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
-		}
-	},
-	computed: {
-		isDesktop() {
-			return this.popupWidth >= 500 && this.popupHeight >= 500
 		},
-		bg() {
-			if (this.backgroundColor === '' || this.backgroundColor === 'none') {
-				return 'transparent'
-			}
-			return this.backgroundColor
-		}
-	},
-	mounted() {
-		const fixSize = () => {
-			const { windowWidth, windowHeight, windowTop, safeArea,screenHeight ,safeAreaInsets } = uni.getSystemInfoSync()
-			this.popupWidth = windowWidth
-			this.popupHeight = windowHeight + windowTop
-			// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
-			if(safeArea && this.safeArea){
-				// #ifdef MP-WEIXIN
-				this.safeAreaInsets = screenHeight - safeArea.bottom
-				// #endif
-				// #ifndef MP-WEIXIN
-				this.safeAreaInsets = safeAreaInsets.bottom
+
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(type) {
+					if (!this.config[type]) return
+					this[this.config[type]](true)
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					if (!this.config[newVal]) return
+					this[this.config[this.type]](true)
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
 				// #endif
-			}else{
-				this.safeAreaInsets = 0
 			}
-		}
-		fixSize()
-		// #ifdef H5
-		// window.addEventListener('resize', fixSize)
-		// this.$once('hook:beforeDestroy', () => {
-		// 	window.removeEventListener('resize', fixSize)
-		// })
-		// #endif
-	},
-	created() {
-		// this.mkclick =  this.isMaskClick || this.maskClick
-		if(this.isMaskClick === null && this.maskClick === null){
-			this.mkclick  = true
-		}else{
-			this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
-		}
-		if (this.animation) {
-			this.duration = 300
-		} else {
-			this.duration = 0
-		}
-		// TODO 处理 message 组件生命周期异常的问题
-		this.messageChild = null
-		// TODO 解决头条冒泡的问题
-		this.clearPropagation = false
-		this.maskClass.backgroundColor = this.maskBackgroundColor
-	},
-	methods: {
-		/**
-		 * 公用方法，不显示遮罩层
-		 */
-		closeMask() {
-			this.maskShow = false
-		},
-		/**
-		 * 公用方法，遮罩层禁止点击
-		 */
-		disableMask() {
-			this.mkclick = false
 		},
-		// TODO nvue 取消冒泡
-		clear(e) {
-			// #ifndef APP-NVUE
-			e.stopPropagation()
-			// #endif
-			this.clearPropagation = true
-		},
-
-		open(direction) {
-			let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
-			if (!(direction && innerType.indexOf(direction) !== -1)) {
-				direction = this.type
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				popupWidth: 0,
+				popupHeight: 0,
+				config: {
+					top: 'top',
+					bottom: 'bottom',
+					center: 'center',
+					left: 'left',
+					right: 'right',
+					message: 'top',
+					dialog: 'center',
+					share: 'bottom'
+				},
+				maskClass: {
+					position: 'fixed',
+					bottom: 0,
+					top: 0,
+					left: 0,
+					right: 0,
+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
 			}
-			if (!this.config[direction]) {
-				console.error('缺少类型：', direction)
-				return
-			}
-			this[this.config[direction]]()
-			this.$emit('change', {
-				show: true,
-				type: direction
-			})
-		},
-		close(type) {
-			this.showTrans = false
-			this.$emit('change', {
-				show: false,
-				type: this.type
-			})
-			clearTimeout(this.timer)
-			// // 自定义关闭事件
-			// this.customOpen && this.customClose()
-			this.timer = setTimeout(() => {
-				this.showPopup = false
-			}, 300)
-		},
-		// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
-		touchstart(){
-			this.clearPropagation = false
 		},
-
-		onTap() {
-			if (this.clearPropagation) {
-				// fix by mehaotian 兼容 nvue
-				this.clearPropagation = false
-				return
+		computed: {
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
 			}
-			this.$emit('maskClick')
-			if (!this.mkclick) return
-			this.close()
 		},
-		/**
-		 * 顶部弹出样式处理
-		 */
-		top(type) {
-			this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
-			this.ani = ['slide-top']
-			this.transClass = {
-				position: 'fixed',
-				left: 0,
-				right: 0,
-				backgroundColor: this.bg
-			}
-			// TODO 兼容 type 属性 ，后续会废弃
-			if (type) return
-			this.showPopup = true
-			this.showTrans = true
-			this.$nextTick(() => {
-				if (this.messageChild && this.type === 'message') {
-					this.messageChild.timerClose()
+		mounted() {
+			const fixSize = () => {
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
 				}
-			})
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
 		},
-		/**
-		 * 底部弹出样式处理
-		 */
-		bottom(type) {
-			this.popupstyle = 'bottom'
-			this.ani = ['slide-bottom']
-			this.transClass = {
-				position: 'fixed',
-				left: 0,
-				right: 0,
-				bottom: 0,
-				paddingBottom: this.safeAreaInsets+'px',
-				backgroundColor: this.bg
-			}
-			// TODO 兼容 type 属性 ，后续会废弃
-			if (type) return
-			this.showPopup = true
-			this.showTrans = true
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
 		},
-		/**
-		 * 中间弹出样式处理
-		 */
-		center(type) {
-			this.popupstyle = 'center'
-			this.ani = ['zoom-out', 'fade']
-			this.transClass = {
-				position: 'fixed',
-				/* #ifndef APP-NVUE */
-				display: 'flex',
-				flexDirection: 'column',
-				/* #endif */
-				bottom: 0,
-				left: 0,
-				right: 0,
-				top: 0,
-				justifyContent: 'center',
-				alignItems: 'center'
-			}
-			// TODO 兼容 type 属性 ，后续会废弃
-			if (type) return
-			this.showPopup = true
-			this.showTrans = true
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
 		},
-		left(type) {
-			this.popupstyle = 'left'
-			this.ani = ['slide-left']
-			this.transClass = {
-				position: 'fixed',
-				left: 0,
-				bottom: 0,
-				top: 0,
-				backgroundColor: this.bg,
-				/* #ifndef APP-NVUE */
-				display: 'flex',
-				flexDirection: 'column'
-				/* #endif */
+		// #endif
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
 			}
-			// TODO 兼容 type 属性 ，后续会废弃
-			if (type) return
-			this.showPopup = true
-			this.showTrans = true
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
 		},
-		right(type) {
-			this.popupstyle = 'right'
-			this.ani = ['slide-right']
-			this.transClass = {
-				position: 'fixed',
-				bottom: 0,
-				right: 0,
-				top: 0,
-				backgroundColor: this.bg,
-				/* #ifndef APP-NVUE */
-				display: 'flex',
-				flexDirection: 'column'
-				/* #endif */
+		methods: {
+			setH5Visible() {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = 'visible'
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					clearTimeout(this.timer)
+					this.showPopup = false
+				}
+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+				if (!(direction && innerType.indexOf(direction) !== -1)) {
+					direction = this.type
+				}
+				if (!this.config[direction]) {
+					console.error('缺少类型：', direction)
+					return
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.type
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				// this.customOpen && this.customClose()
+				this.timer = setTimeout(() => {
+					this.showPopup = false
+				}, 300)
+			},
+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+			touchstart() {
+				this.clearPropagation = false
+			},
+
+			onTap() {
+				if (this.clearPropagation) {
+					// fix by mehaotian 兼容 nvue
+					this.clearPropagation = false
+					return
+				}
+				this.$emit('maskClick')
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					if (this.messageChild && this.type === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					bottom: 0,
+					paddingBottom: this.safeAreaInsets + 'px',
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				this.ani = ['zoom-out', 'fade']
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center'
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			left(type) {
+				this.popupstyle = 'left'
+				this.ani = ['slide-left']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			right(type) {
+				this.popupstyle = 'right'
+				this.ani = ['slide-right']
+				this.transClass = {
+					position: 'fixed',
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
 			}
-			// TODO 兼容 type 属性 ，后续会废弃
-			if (type) return
-			this.showPopup = true
-			this.showTrans = true
 		}
 	}
-}
 </script>
-<style lang="scss" >
-.uni-popup {
-	position: fixed;
-	/* #ifndef APP-NVUE */
-	z-index: 99;
-	/* #endif */
-	&.top,
-	&.left,
-	&.right {
-		/* #ifdef H5 */
-		top: var(--window-top);
-		/* #endif */
-		/* #ifndef H5 */
-		top: 0;
-		/* #endif */
-	}
-	.uni-popup__wrapper {
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
 		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: relative;
-		/* iphonex 等安全区设置，底部安全区适配 */
-		/* #ifndef APP-NVUE */
-		// padding-bottom: constant(safe-area-inset-bottom);
-		// padding-bottom: env(safe-area-inset-bottom);
+		z-index: 99;
+
 		/* #endif */
+		&.top,
 		&.left,
 		&.right {
 			/* #ifdef H5 */
-			padding-top: var(--window-top);
+			top: var(--window-top);
 			/* #endif */
 			/* #ifndef H5 */
-			padding-top: 0;
+			top: 0;
+			/* #endif */
+		}
+
+		.uni-popup__wrapper {
+			/* #ifndef APP-NVUE */
+			display: block;
+			/* #endif */
+			position: relative;
+
+			/* iphonex 等安全区设置，底部安全区适配 */
+			/* #ifndef APP-NVUE */
+			// padding-bottom: constant(safe-area-inset-bottom);
+			// padding-bottom: env(safe-area-inset-bottom);
 			/* #endif */
-			flex: 1;
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
 		}
 	}
-}
 
-.fixforpc-z-index {
-	/* #ifndef APP-NVUE */
-	z-index: 999;
-	/* #endif */
-}
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
 
-.fixforpc-top {
-	top: 0;
-}
-</style>
+	.fixforpc-top {
+		top: 0;
+	}
+</style>
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
index 9ff1de00b5f1920f96c763e9e01a9ba60a4d7ee7..069e9ce514c0772845417e9287ddb5cd44fb1e44 100644
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-popup",
 	"displayName": "uni-popup 弹出层",
-	"version": "1.7.6",
+	"version": "1.7.9",
 	"description": " Popup 组件，提供常用的弹层",
 	"keywords": [
         "uni-ui",
diff --git a/uni_modules/uni-sign-in/components/uni-sign-in/uni-sign-in.vue b/uni_modules/uni-sign-in/components/uni-sign-in/uni-sign-in.vue
index 39c0193db60824610893a820306782c8599b52ab..a195b743509df323d121cd91c9ef5d0a97ec0e76 100644
--- a/uni_modules/uni-sign-in/components/uni-sign-in/uni-sign-in.vue
+++ b/uni_modules/uni-sign-in/components/uni-sign-in/uni-sign-in.vue
@@ -82,10 +82,7 @@
 				let res = await this.getSignedInInfo();
 				console.log(res);
 				if (res && res.length == 0) {
-					let {
-						_id: userId
-					} = uni.getStorageSync('userInfo')
-					console.log(userId, uni.getStorageSync('userInfo'));
+					let userId= uniCloud.getCurrentUserInfo().uid
 					if (!userId) {
 						return uni.navigateTo({
 							url: "/pages/ucenter/login-page/index/index"
diff --git a/uni_modules_tools/change_after.js b/uni_modules_tools/change_after.js
deleted file mode 100644
index 431dc4e0f2c2898ec2bd616dd66ed769f5b9538e..0000000000000000000000000000000000000000
--- a/uni_modules_tools/change_after.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const fs = require('fs');
-module.exports = function(){
-	console.log('开始执行脚本change_after');
-/*	let changelog = fs.readFileSync(process.cwd() + '/changelog.md', 'utf-8').split("##")[1].split("\n").slice(1).join(' ');
-	console.log(changelog);
-	// 这里是修改完相关敏感配置后执行的脚本，你可以在这里自定义逻辑，
-
-
-  // 比如执行git提交命令
-	var shell = require("shelljs");
-	var exec = shell.exec;
-	
-	if (exec('git add .').code !== 0) {
-	  shell.echo('Error: Git add failed');
-	  shell.exit(1);
-	}
-	if (exec(`git commit -a -m "${changelog}"`).code !== 0) {
-	  shell.echo('Error: Git commit failed');
-	  shell.exit(1);
-	}
-	if (exec('git push').code !== 0) {
-	  shell.echo('Error: Git commit failed');
-	  shell.exit(1);
-	}
-	shell.exec(`echo git success ${changelog}`);
-  */
-}
\ No newline at end of file
diff --git a/uni_modules_tools/package.json b/uni_modules_tools/package.json
deleted file mode 100644
index 5fdc53706ecffa46d9d9ae7c3988cb3a578c7fa1..0000000000000000000000000000000000000000
--- a/uni_modules_tools/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "uni_modules_tools",
-  "version": "1.0.0",
-  "description": "本插件是一个[uni_modules钩子脚本](https://uniapp.dcloud.io/uni_modules?id=uni_modulesconfigjson)，仅限uni_modules插件使用 #### 为什么使用 uni_modules_tools 在实际开发中很多插件需要配置文件才可以正常运行，比如uni-id、uni-pay等； 有些配置内容属于密钥，在发表到插件市场的时候我们通常不希望这些配置被暴露。 传统的方式你需要手动备份密钥内容，上传结束后再将配置填回。这样插件作者发表插件会比较不便。",
-  "main": "main.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "hjson": "^3.2.2"
-  }
-}
diff --git a/uni_modules_tools/readme.md b/uni_modules_tools/readme.md
deleted file mode 100644
index dc309e5a6df36c0bc81b04000281ea47ffdce03f..0000000000000000000000000000000000000000
--- a/uni_modules_tools/readme.md
+++ /dev/null
@@ -1,84 +0,0 @@
-本插件是一个[uni_modules钩子脚本](https://uniapp.dcloud.io/uni_modules?id=uni_modulesconfigjson)，仅限uni_modules插件使用
-#### 为什么使用 uni_modules_tools
-在实际开发中很多插件需要配置文件才可以正常运行，比如uni-id、uni-pay等；
-有些配置内容属于密钥，在发表到插件市场的时候我们通常不希望这些配置被暴露。
-传统的方式你需要手动备份密钥内容，上传结束后再将配置填回。这样插件作者发表插件会比较不便。
-
-而现在有了 `uni_modules_tools` 只需配置`/uni_modules_tools/config.js`即实现
-- 在插件上传之前，自动根据配置改写项目中对应配置。
-- 上传结束（成功和失败都触发）后自动恢复项目中的配置。
-
-#### 示例目录结构
-<pre>
-├─ uni_modules						// 存放uni_module规范的插件。
-│	└─uni-config-center
-│		└─uniCloud
-│			└─cloudfunctions
-│				└─common
-│					└─uni-config-center
-│						└─uni-id
-│							└─config.json
-├─ manifest.json
-├─ uni_modules.config.json		//uni_modules的配置文件
-└─ uni_modules_tools
-	├─ copy						//用于自动修改配置文件时的，临时备份目录
-	├─ config.js				//插件配置文件，下面会有示例说明
-	├─ main.js					//插件核心代码，入口文件；你无需修改此文件中的代码，除非你了解内部逻辑
-	└─ readme.md 				//插件文档
-</pre>
-
-
-#### 使用方式
-`/uni_modules_tools/config.js`的格式为：
-```
-{
-	"文件路径" : {"键名":"改后的内容"}
-}
-```
-
-- 文件仅支持json格式，如：`manifest.json`、`uni-config-center`下的`config.json`等
-
-使用示例，比如你需要：
-- 修改manifest.json文件的appid内容改为：请重新获取appid
-- 修改uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json 文件的内容app-plus -> oauth -> weixin 和 apple 下的 `appid` `appsecret` `apple`值为：`请填写你的自己的appid` `请填写你的自己的appsecret` `请填写你的自己的bundleId`
-
-1. 配置,根目录下的`/uni_modules_tools/config.js`文件，如下：
-
-```
-{
-	"/manifest.json": {
-		"appid": "请重新获取appid"
-	},
-	"/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json": {
-		"app-plus": {
-			"oauth": {
-				"weixin": {
-					"appid": "请填写你的自己的appid",
-					"appsecret": "请填写你的自己的appsecret"
-				},
-				"apple": {
-					"bundleId": "请填写你的自己的bundleId"
-				}
-			}
-		}
-	}
-}
-```
-
-2. 根目录下的`/uni_modules.config.json`配置如下：
-```
-{
-	"scripts":{
-		"preupload": "node uni_modules_tools/main.js change",
-		"postupload": "node uni_modules_tools/main.js recovery"
-	}
-}
-```
-
-3. 项目依赖hjson-js需要在uni_modules_tools目录，执行npm install完成依赖的安装
-
-#### 测试方式
-- 在项目根目录直接执行 `node uni_modules_tools/main.js change` 	即可测试修改相关配置的效果
-- 在项目根目录直接执行 `node uni_modules_tools/main.js recovery` 即可测试恢复相关配置的效果
-
-> 本插件中使用了[hjson-js](https://www.npmjs.com/package/hjson) 感谢@hjson-js的作者
\ No newline at end of file