diff --git a/README.md b/README.md
index 1a8b116465655ecbd2902141ad42087e795eef32..faccd69a3011d62d1fde0e92e504c24f259aad8e 100644
--- a/README.md
+++ b/README.md
@@ -1,569 +1,3 @@
-#### 视频介绍
-<a target="_blank" href="https://www.bilibili.com/video/BV17p4y1a71x?p=11">
-    <img src="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-f184e7c3-1912-41b2-b81f-435d1b37c7b4/71d310a5-ef69-4ca5-88c8-9a3abf8fb8e3.png" alt="腾讯课堂uniCloud视频教程" style="width: 70%;margin-bottom:26px;">
-</a>
-
-注：视频会有滞后问题，入门为主。最新的完整功能请看以下文档
-
-#### 简介
-uni-starter是一个集成了大量商用项目常见功能的，云端一体应用快速开发基本项目模版。
-
-APP有很多通用的功能，比如登录注册、头像、设置、banner、... uni-starter将这些功能都已经集成好。
-
-直接在`hbuilderx`新建项目选择`uni-starter`模板，即可在此基础上快速开发自己的特色业务。
-
-有了`uni-starter`，再加上`schema2code`生成前端页面，一个简单应用就可以快速完成。
-
-如果说[uniCloud admin](https://uniapp.dcloud.io/uniCloud/admin)是管理端项目的基本项目模版，那么uni-starter则是用户端、尤其是移动端的基础项目模板。
-
-`uni-starter` + `uniCloud admin` 提供了用户端和管理端的基本项目模版，应用开发从未如此简单快捷！
-
-##### 扫码体验：h5版演示效果（链接：[https://uni-starter.dcloud.net.cn](https://uni-starter.dcloud.net.cn)）
-<img src="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-f184e7c3-1912-41b2-b81f-435d1b37c7b4/0625ae17-1262-45cb-a713-cdbf02df5c0a.png" style="width: 120px;">
-
-### uni-starter集成包括：
-1. 用户管理：
-	- 登录注册（用户名密码登录、手机号验证码登录、APP一键登录、微信登录、Apple登录、微信小程序登录）
-	- 修改密码、忘记密码、头像更换（集成图片裁剪）、昵称修改、积分查看、退出登录
-2. 系统设置：
-	- App更新（整包升级、wgt升级、强制升级，后台搭配uniCloud admin的升级中心插件管理）
-	- 推送开关（app）、清除缓存（app）
-	- 指纹解锁（app）、人脸解锁（app）
-	- 多语言切换
-	- 账号注销（正在完善中...）
-3. 隐私权限：内置Android先弹出隐私协议对话框，然后再向用户申请设备权限
-4. 权限引导：当应用拒绝授权某些权限，但在后续使用中又需要这个权限；此时实现：引导用户可“一键跳转至系统设置”中开启。
-	- 而不是报错让用户自己去找解决方案（更好的用户体验）。
-	- 采用高内聚低耦合的设计结构，直接在应用启动时，应用拦截器中实现。免去在每个业务代码中处理这类问题，更优雅更方便。
-	- 已实现项目：摄像头、相册、获取GPS定位、网络2/3/4/5G和Wi-Fi。你可以参考这些实现，处理更多该类场景的处理。uni-starter也会持续更新完善。
-5. 实用功能
-	- 问题与反馈、关于、隐私政策、用户服务协议
-	- banner（后台搭配uniCloud admin的banner插件管理）
-	- 新闻的搜索、列表、详情、分享。通过clientDB实现，开发者直接修改定义的表名等参数，即可轻松改为自己的业务
-	- 可覆盖原生层的分享菜单
-	- h5版在页面顶部（全局悬浮）引导用户点击下载App
-	- 营销裂变：点击“分销推荐”，生成带用户inviteCode参数的应用下载页（H5），一键分享到微信或微信朋友圈等。被邀请人打开下载页面点击下载，设备剪贴板的内容会被自动设置为邀请者的inviteCode。被邀请人下载app之后通过任何方式登录（含：注册并登录），uni-starter框架会自动获取设备剪切板中的inviteCode提交到服务端绑定关联关系。
-6. 更好的性能：首页采用nvue，fast编译模式，加快App端启动速度
-7. 内置拦截器：
-	- 页面路由拦截，配置需强制登录的页面；打开时自动检测`token`若无效就自动跳转到登录页
-	- 调用云函数（callFunction）拦截器，自动携带必要参数、自动处理响应体。详见9.自动完成1-2
-8. 自动完成：
-	- 分析uniCloud.callfunction和clientDB操作的响应体，判断code执行对应的操作如跳转到登录页，自动续期token
-	- 操作注册/登录操作自动获取客户端设备：push_clientid、imei、oaid、idfa新增/更新到数据表uni-id-device
-	- 异常恢复处理：断网恢复后自动重连“因网络错误导致的”网络请求
-	- 为迎合苹果App Store的规则，登录与分享功能项显示之前自动检测是否安装了对应客户端。比如：设备未安装微信则不显示微信快捷登录和微信分享选项
-
-* 更多功能模块会不断更新，请持续关注本插件 
-
-## 快速体验部署流程
-#### 1. 开通uniCloud
-- 开通`uniCloud`：本项目是云端一体的，它的云端代码需要部署在uniCloud云服务空间里，需要开通uniCloud。在[https://unicloud.dcloud.net.cn/](https://unicloud.dcloud.net.cn/)登录，按云厂商要求进行实名认证。
-- 在uniCloud认证通过后，创建一个服务空间给本项目使用。选择阿里云或腾讯云均可，两种服务空间差异[详情](https://uniapp.dcloud.net.cn/uniCloud/price)
-
-#### 2. 运行云服务空间初始化向导
-<img style="width:61.8%" src="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-f184e7c3-1912-41b2-b81f-435d1b37c7b4/472d8525-4e64-4a86-a77a-8c37c4379610.jpg" />
-<img style="width:61.8%" src="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-f184e7c3-1912-41b2-b81f-435d1b37c7b4/78b3f17c-cf70-4cdf-9ada-1796753ffeac.jpg" />
-<img style="width:61.8%" src="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-f184e7c3-1912-41b2-b81f-435d1b37c7b4/09916d79-4753-4baa-9b95-baa831f1a873.jpg" />
-
-## 功能模块介绍
-### 1.登录模块
-|登录类型	|描述					|
-|--			|--					|
-|smsCode	|验证码登录			|
-|univerify	|读取手机SIM卡一键登录	|
-|username	|账号密码登录			|
-|weixin		|微信登录				|
-|apple		|苹果登录				|
-
-配置文件：`项目根目录/uni-starter.config.js`
-```js
-{
-	"router":{
-		"login":["username","smsCode"]
-	}
-}
-```
-
-#### 启用登录方式
-如上示例配置为：`["username","smsCode"]` 表示启用：验证码登录、账号密码登录。
-
-同理配置为：`["weixin","username","smsCode"]` 则表示启用：微信登录、验证码登录、账号密码登录。
-
-总结：需要几项列举几项即可。
-
-#### 优先级
-在uni-starter框架中执行`uni.navigateTo({url: "/pages/ucenter/login-page/index/index"})`，会根据配置跳转到相应的登录页面。如果配置内容为：`["username","smsCode"]`会自动切换到"配置的第0项，也就是`username`类型的登录方式对应的页面”，即`账户登录`方式页面，路径：`/pages/ucenter/login-page/pwd-login/pwd-login`
-
-#### 平台差异性配置
-这里支持用[条件编译](https://uniapp.dcloud.io/platform?id=%e6%9d%a1%e4%bb%b6%e7%bc%96%e8%af%91)因此你可以配置在不同平台下拥有的登录方式。
-如下配置，即表示仅在APP端启用“短信验证码登录”
-```js
-"login": [
-	"username","univerify","weixin","apple"
-	// #ifdef APP-PLUS
-		"smsCode",
-	// #endif
-]
-```
-
-#### 生效策略
-登录方式有如上5种，虽然你希望有几种登录方式就在配置中列举几种。但是有的登录方式可能因为设备环境问题而不被支持；
-比如你正确地配置了微信登录，而用户的手机并没有安装微信，这样微信登录功能就无法使用。
-并且如果出现这种情况你的app会被iOS的App Store拒绝上架。
-所以在这里，我们的生效策略在检测：你是否有列举到某个配置项为前提的情况下，增加了检测当前环境是否支持，如果不支持会自动隐藏。
-
-#### 在uni-app框架中配置：
-在应用模块：`manifest.json` App模块配置 --> OAuth（登录鉴权）--> 勾选并配置你所需要的模块
-+ 一键登录：
-	[开通配置](https://dev.dcloud.net.cn/uniLogin)
-	[使用指南](https://uniapp.dcloud.io/univerify)
-+ [苹果登录集成指南](https://ask.dcloud.net.cn/article/36651) 
-+ 短信登录：
->`uni-id-cf`文件路径：`/uniCloud-aliyun/cloudfunctions/uni-id-cf/index.js`
-
-	测试期间，为节约资源。统一虚拟短信验证码为：123456。正式使用注视掉`uni-id-cf`第339-344行即可
-	使用本功能需要在[DCloud开发者中心](https://dev.dcloud.net.cn/uniSms)开通并充值
-	教程参考[短信服务开通指南](https://ask.dcloud.net.cn/article/37534)
-	修改短信注册/登录发生验证码的模板id，在`uni-id-cf`搜索 `const templateId = '11753'` 替换为自己申请的模板id
-
-#### 服务端配置
-uni-starter服务端使用[uni-config-center](https://ext.dcloud.net.cn/plugin?id=4425)统一管理这些配置，
-文件路径`/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json`
-详情下文[目录结构](#id=catalogue) 和[uni-id配置说明](https://uniapp.dcloud.io/uniCloud/uni-id?id=configjson%e7%9a%84%e8%af%b4%e6%98%8e)
-
-### 2.路由拦截
-#### 应用场景
-有些页面，限允许已经登录后用户才访问。
-常规的做法是打开这类页面之前，检查（前端校验）uni_id_token的值是否有效,如果无效会自动跳转到登录页面。
-而这样的页面有很多，入口也不少。面向过程的写法会产生大量的代码冗余，且不易维护。
-而uni-starter基于拦截器（`uni.addInterceptor`），提供了仅需简单配置即可实现的路由拦截功能。
-#### 配置方式
-支持两种模式（二选一）
-##### 黑名单模式
-列举需要强制登录的页面完整路径（支持正则）
-##### 白名单模式
-列举不需要强制登录即可访问的页面完整路径（支持正则）
-#### 配置示例
-配置文件：`项目根目录/uni-starter.config.js`
-
-```js
-"router": {
-		"needLogin" : [
-		 	{pattern:/^\/pages\/list.*/},	//支持正则表达式
-				"/uni_modules/uni-news-favorite/pages/uni-news-favorite/list",
-				"/uni_modules/uni-feedback/pages/uni-feedback/add"
-		],
-/*
-	请注意上下，黑名单（needLogin）、白名单（visitor）两种配置模式二选一不可同时使用
-*/
-		"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"
-		]
-}
-```
-
-##### 优势：
-传统的路由管理方式是对uni-app框架路由写法的二次封装，自定义的写法不支持ide的代码提示,且不优雅。
-另外不同插件作者封装不同的路由管理方式，这样做出来的插件与用户的项目结合时，路由写法不统一的差异需要去磨平。
-为此`uni-starter`基于`uni.addInterceptor`(拦截器)实现路由管理。
-
-##### 注意：
-- uni-starter的路由拦截，仅在调用路由API（navigateTo、redirectTo、reLaunch、switchTab）时触发。应用的首页是由系统自动打开，不会触发拦截器。首页需要强制登录才能访问的场景，不由路由控制。但不用担心，如果未登录的用户，打开了需要登录才能访问页面，必定会触发需要携带有效token才能访问的API。此时则会返回相应的响应体，uni-starter监测到token无效这类的响应体也会自动跳转到登录页（这种效果需要前后端都开发完成才体验到）。
-- uni-starter框架不能将登录页`/pages/ucenter/login-page/index/index`设置为首页，否则由拦截器实现的路由管理将生效。
-- 拦截器实现的路由控制，是在路由跳转未完成之前触发。路由切换方式（navigateTo、redirectTo、reLaunch、switchTab）URL参数必须使用绝对路径路
-
-### 3.h5版在页面顶部引导用户`点击下载App`
-把h5端用户引流到APP端，是一个非常实用的功能。相对于h5，APP端有更高的用户留存和更好的产品体验。
-uni-starter集成了这个功能，你只需直接在`项目根目录/uni-starter.config.js`的"h5"->"openApp"中配置相关内容，即可开启全局悬浮的下载引导。
-这也是一个演示开发者如何在h5端做全局悬浮块的例子。你也可以在`/common/openApp.js`中修改他的样式等代码等，注意他只支持原生js语法。
-
-### 4.分享模块
-一个可覆盖原生层分享模块
-- 应用配置：`manifest.json` App模块配置 --> Share --> 勾选并配置你所需要的模块
-- 分享功能配置参数，随着应用的业务场景决定，在各场景调用的时候配置。参考uni-starter的`/pages/list/detail.vue`的`methods -> shareClick`
-- 更多`uni-share`的介绍 [详情](https://ext.dcloud.net.cn/plugin?id=4860)
-
-### 5.升级中心相关
-为了解决开发者维护多个 App 升级繁琐，重复逻辑过多，管理不便的问题，升级中心`uni-upgrade-center`应运而生。
-提供了简单、易用、统一的 App 管理、App 版本管理、安装包发布管理，升级检测更新管理。
-- 升级中心分为两个部分：`uni-upgrade-center` Admin管理后台和`uni-upgrade-center - Admin`前台检测更新。
-- `uni-upgrade-center`的介绍 [详情](https://ext.dcloud.net.cn/plugin?id=4542)
-- `uni-upgrade-center - Admin`的介绍 [详情](https://ext.dcloud.net.cn/plugin?id=4470)
-
-### 6.意见反馈
-- 客户端[详情](https://ext.dcloud.net.cn/plugin?id=50)
-- admin端[详情](https://ext.dcloud.net.cn/plugin?id=4992)
-
-### 7.指纹识别模块
-- `manifest.json` App模块配置 --> `Fingerprint`指纹识别
-
-### 8.消息推送模块
-- `manifest.json` App模块配置 --> `push`消息推送
-
-### 9.隐私政策弹框
-根据工业和信息化部关于开展APP侵害用户权益专项整治要求，App提交到应用市场必须满足以下条件：
-- 应用启动运行时需弹出隐私政策协议，说明应用采集用户数据
-- 应用不能强制要求用户授予权限，即不能“不给权限不让用”
-+ 如不希望应用启动时申请“读写手机存储”和“访问设备信息”权限，请参考：https://ask.dcloud.net.cn/article/36549
-
-配置弹出“隐私协议和政策”打开项目的manifest.json文件，切换到“源码视图”项
-在`manifest.json` -> `app-plus` -> `privacy` 节点下添加 prompt节点
-```js
-"privacy" : {
-	"prompt" : "template",
-	"template" : {
-		"title" : "服务协议和隐私政策",
-		"message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://ask.dcloud.net.cn/protocol.html\">《服务协议》</a>和<a href=\"https://ask.dcloud.net.cn/protocol.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
-		"buttonAccept" : "同意",
-		"buttonRefuse" : "暂不同意"
-	}
-}
-```
-- prompt
-  字符串类型，必填，隐私政策提示框配置策略，可取值template、custom、none，默认值为none
-  + template
-     使用原生提示框模板，可自定义标题、内容已经按钮上的文本
-  + custom
-     自定义隐私政策提示框，uni-app项目中推荐使用nvue页面进行自定义，5+ APP使用html页面进行自定义
-  + none
-    不弹出隐私政策提示框
-- template
-  json格式，可选，模板提示框上显示的内容
-	+ title
-	  模板提示框上的标题，默认为“服务协议和隐私政策”
-	+ message
-	  模板提示框上的内容，richtext类型字符串，支持a/font/br等节点，点击a链接会调用内置页面打开其href属性中链接地址。
-	  **注意：务必配置此提示内容，或参考上面示例内容并修改《服务协议》和《隐私政策》链接地址**
-	+ buttonAccept
-	  模板提示框上接受按钮的文本，默认值为“我知道了”
-	+ buttonRefuse
-	  模板提示框上拒绝按钮的文本，默认不显示此按钮
-	+ second
-	  HBuilderX3.1.12+版本新增支持隐私提示框二次确认提示，用于配置二次确认提示框显示内容，message属性值不为空时弹出二次确认提示框
-		+ title 二次确认提示框上的标题
-		+ message 二次确认提示框上的内容，支持richtext类型字符串
-		+ buttonAccept 二次确认提示框上接受按钮的文本
-		+ buttonRefuse 二次确认提示框上拒绝按钮的文本
-
-> 更多Android平台隐私与政策提示框配置方法，[详情](https://ask.dcloud.net.cn/article/36937)
-
-##### 注意：
-1. 最新的华为应用市场要求，隐私政策提示框上接受按钮的文本，必须为“同意”而不能是其他有歧义的文字。
-2. 配置后提交云端打包后生效。理论上绝大部分和`manifest.json`生效相关的配置均需要提交云打包后生效
-
-### 10.拦截器改造后的uniCloud
-1. Debug，调试期间开启Debug。接口一旦fail就会弹出真实错误信息。否则将弹出，系统错误请稍后再试！
-```js
-	if(Debug){
-		console.log(e);
-		uni.showModal({
-			content: JSON.stringify(e),
-			showCancel: false
-		});
-	}
-```
-2. 断网自动重试，当callFunction为fail时检测是否因断网引起。如果是会提醒用户并且会在恢复网络之后自动重新发起请求
-3. 常规的errCoder自动执行对应程序，如token无效/过期自动跳转到登录页面。
-4. token自动续期。
-
-### 11.举例路由控制原理，深入了解拦截器的使用
-比如你希望在打开用户中心等页面之前，都检查一下该用户是否登录，否则就重定向到登录页面。使用拦截器你可以用以下写法在应用入口定义全局生效：
-	
-```js
-	//定义各个页面，这里为了演示uni-starter框架是把该定义写在全局配置uni-starter.config.js中
-	let needLogin = ["/pages/ucenter/userinfo/userinfo", ... ] 
-	
-	uni.addInterceptor("navigateTo", {
-		invoke(e) { // 调用前拦截
-			//获取用户的token
-			const token = uni.getStorageSync('uni_id_token')
-			//获取当前页面路径（即url去掉"?"和"?"后的参数）
-			const url = e.url.split('?')[0]
-			//判断要打开的页面是否需要验证登录
-			if (needLogin.includes(url) && token == '') {
-				uni.showToast({
-					title: '该页面需要登录才能访问，请先登录',
-					icon: 'none'
-				})
-				uni.navigateTo({
-					url: "/pages/ucenter/login-page/index/index"
-				})
-				return false
-			}
-		},
-		fail(err) { // 失败回调拦截 
-			console.log(err);
-		},
-	})
-```
-- 而路由跳转方法不仅有`uni.navigateTo`还有`uni.redirectTo`,`uni.reLaunch`,`uni.switchTab`；
-- 另外我们还希望控制直接跳转至哪种登录类型
-所以在uni-starter框架中我们这样定义：
-uni-starter/common/appInit.js 的第228-280行
-```js
-	const {"router": {needLogin,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')
-				//获取当前页面路径（即url去掉"?"和"?"后的参数）
-				const url = e.url.split('?')[0]
-				//判断要打开的页面是否需要验证登录
-				if (needLogin.includes(url) && token == '') {
-					uni.showToast({
-						title: '该页面需要登录才能访问，请先登录',
-						icon: 'none'
-					})
-					uni.navigateTo({
-						url: "/pages/ucenter/login-page/index/index"
-					})
-					return false
-				}
-				//控制登录优先级
-				if (url == '/pages/ucenter/login-page/index/index') {
-					//一键登录（univerify）、账号（username）、验证码登录（短信smsCode）
-					if (login[0] == 'univerify') {
-						if(e.url == url) { e.url += '?' } //添加参数之前判断是否带了`？`号如果没有就补上，因为当开发场景本身有参数的情况下是已经带了`？`号
-						e.url += "univerify_first=true"
-					} else if (login[0] == 'username') {
-						e.url = "/pages/ucenter/login-page/pwd-login/pwd-login"
-					}
-				}
-				return true
-			},
-			fail(err) { // 失败回调拦截 
-				console.log(err);
-			},
-		})
-	})
-```
-
-### 12.关于升级
-- 项目升级
-
-	uni-starter遵循uni-app的插件模块化规范，即：[uni_modules](https://uniapp.dcloud.io/uni_modules) 。他是个项目类型的插件。在项目的根目录下有一个符合uni_modules规范的package.json文件，在这个文件右键-从插件市场更新即可更新该插件。
-	
-- 插件升级
-
-	非项目类型的uni_modules插件，是项目根目录下的uni_modules目录下。以插件ID为插件文件夹命名，在该目录右键也会看到“从插件市场更新”选项，点击即可更新该插件。
-
-### 13.多语言国际化
-	uni-starter支持多语言国际化。默认开启，可以在`uni-starter.config.js`->`i18n`->`enable`中配置
-	如果你启用了多语言国际化需要先阅读：[uni-app多语言国际化](https://uniapp.dcloud.io/collocation/i18n?id=%e6%a1%86%e6%9e%b6%e5%86%85%e7%bd%ae%e7%bb%84%e4%bb%b6%e5%92%8capi%e5%9b%bd%e9%99%85%e5%8c%96)
-	
-## 应用启动时序介绍
-文件路径： App.vue
-```js
-	import initApp from '@/common/appInit.js';
-	export default {
-		onLaunch: function() {
-			initApp();
-		}
-	}
-```
-onLaunch生命周期执行了
-1. 全局监听clientDB的err事件，
-	- 判断是否为token过期失效等需要重新登录的问题。自动跳转到登录页面
-	- 检测本地的token是否有效（存在且并未过期）否则跳转到登录页面
-2. 预登录一键登录功能
-3. 执行了initApp()包含以下操作
-	1. 读取uni-starter.config并挂载到globalData的config下
-	2. 读取应用版本号，并存到globalData下
-	3. 检查是否有可更新的应用版本，决定是否启动在线更新版本
-	4. 监听设备的网络变化并以uni.showToast APi的方式提醒用户
-	5. 使用[拦截器](https://uniapp.dcloud.io/api/interceptor?id=addinterceptor) 实现
-		- 页面路由拦截，配置需强制登录的页面；打开时检测，如果token无效就自动跳转到登录页
-		- 优雅实现：自动引导打开`选择图片`所需要的权限。当调用`uni.chooseImage`时检测到无权限自动开启引导。并不是在每次调用接口时处理这类问题，你可以参考该例子做更多该类场景的处理。uni-starter也会持续完善
-
-
-## 配置文件
-uni-starter提供了`uni-starter.config.js`，可配置选择登录注册方式及优先级等，可指定该应用是否强制登录才能进入某个页面。配置项内容如下：
-```js
-module.exports = {
-	"h5": {
-		"url": "https://static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com", //	前端网页托管的域名
-		 // 在h5端全局悬浮引导用户下载app的功能 更多自定义要求在/common/openApp.js中修改
-		"openApp": {
-			//点击悬浮下载栏后打开的网页链接
-			"openUrl": 'https://sj.qq.com/myapp/detail.htm?apkName=com.tencent.android.qqdownloader&info=6646FD239A6EBA9E2DEE5DFC7E18D867',
-			//左侧显示的应用名称
-			"appname": 'uni-starter',
-			//应用的图标
-			"logo": './static/logo.png',
-		}
-	},
-	"mp": {
-		"weixin": {
-			//微信小程序原始id，微信小程序分享时
-			"id": "gh_132465798"
-		}
-	},
-	"router": {
-		//配置需要路由拦截的页面地址，在打开这些页面之前会自动检查（无需联网）uni_id_token的值，如果token无效就自动跳转到登录页
-		"needLogin": [
-			"/pages/ucenter/userinfo/userinfo",
-			"/uni_modules/uni-news-favorite/pages/uni-news-favorite/list",
-		],
-		"login": ["smsCode","univerify", "username", "weixin", "apple"],
-		/* 
-			这里会根据数组的第0项，决定登录方式的第一优先级是哪种登录方式。
-			所有你希望拥有的登录方式这里都需要一一列举，未列举到的或设备环境不支持的登录方式将被隐藏。
-			如果你需要在不同平台有不同的配置，直接用条件编译即可。
-		*/
-	},
-	//关于应用
-	"about": {
-		//应用名称
-		"appName": "uni-starter",
-		//应用logo
-		"logo": "/static/logo.png",
-		//公司名称
-		"company": "数字天堂（北京）网络技术有限公司",
-		//口号
-		"slogan": "为开发而生",
-		//政策协议
-		"agreements": [{
-				"title": "用户服务协议", //协议名称
-				"url": "https://ask.dcloud.net.cn/protocol.html" //对应的网络链接
-			},
-			{
-				"title": "隐私政策",
-				"url": "https://ask.dcloud.net.cn/protocol.html"
-			}
-		],
-		//应用的链接，用于分享到第三方平台和生成关于我们页的二维码
-		"download": "https://m3w.cn/uniapp"
-	},
-	//用于打开应用市场评分界面
-	"marketId":{
-		"ios":"id1417078253",
-		"android":"123456"
-	},
-	//配置多语言国际化。i18n为英文单词 internationalization的首末字符i和n，18为中间的字符数 是“国际化”的简称
-	"i18n":{
-		"enable":false //默认启用，国际化。如果你不想使用国际化相关功能，请改为false
-	}
-}
-```
-
-## 目录结构@catalogue
-<pre>
-uni-starter
-├─uniCloud-aliyun	
-│	├─cloudfunctions 云函数目录
-│	|	├─common 公共模块
-│	│	|	├─uni-config-center		uni-starter的服务端配置中心，项目所有云函数的配置在这里填写 <a target="_blank" href="https://ext.dcloud.net.cn/plugin?id=4425">详情</a>
-│	│	|	|	├─index.js			config-center入口文件
-│	│	|	|	└─uni-id			uni-id模块配置目录
-│	│	|	|		├─config.json	uni-id对应的配置数据：微信登录、一键登录、短信验证码登录等key都在这里填写<a target="_blank" href="https://ext.dcloud.net.cn/plugin?id=4425">详情</a>
-│	│	|	|		└─file.cert		uni-id依赖的配置文件,假如你使用微信发红包功能，需要的证书文件就是放到这里
-│	|	|	└───uni-id				uni-id用户体系 <a target="_blank" href="https://uniapp.dcloud.io/uniCloud/uni-id">详情</a>
-│	|	├─uni-analyse-searchhot		云端一体搜索模板依赖的云函数 <a target="_blank" href="https://ext.dcloud.net.cn/plugin?id=3851">详情</a>
-│	|	└─uni-id-cf				用户中心云函数，实现用户注册、修改密码、发送验证码、快捷登录（微信、短信、账户、一键登录）
-│	└──database						云数据目录
-│		├─db_init.json				db_init.json初始化数据库文件，其中不再包含schema <a target="_blank" href="https://uniapp.dcloud.net.cn/uniCloud/hellodb?id=db-init">详情</a>
-│		├─opendb-app-versions.schema.json		应用版本，表结构文件
-│		├─opendb-banner.schema.json	        	横幅数据表，表结构文件
-│		├─opendb-feedback.schema.json	        意见反馈表，表结构文件
-│		├─opendb-news-articles.schema.json	    新闻文章表，表结构文件
-│		├─opendb-news-categories.schema.json	新闻分类表，表结构文件
-│		├─opendb-news-comments.schema.json		新闻评论表，表结构文件
-│		├─opendb-news-favorite.schema.json		新闻收藏表，表结构文件
-│		├─opendb-search-hot.schema.json			热门搜索表，表结构文件
-│		├─opendb-search-log.schema.json			搜索记录表，表结构文件
-│		├─opendb-verify-codes.schema.json		验证码表，表结构文件
-│		├─uni-id-log.schema.json	        	登录日志表，表结构文件
-│		├─uni-id-scores.schema.json	        	用户积分表，表结构文件
-│		└─uni-id-users.schema.json	        	用户表，表结构文件
-├─pages										业务页面文件存放的目录
-│	├─common						
-│	│	└─webview							webview目录
-│	│		└─webview.vue					webview页面	用于实现跨端的web页面浏览
-│	├─grid
-│	│	└─grid.vue	 						带宫格和banner的示例页面
-│	├─list
-│	│	├─list.vue	 						新闻列表
-│	│	├─search
-│	│	│	└─search						云端一体搜索插件
-│	│	└─detail.vue						新闻详情
-│	├─ucenter
-│	│	├─about								关于我们
-│	│	│	└─about
-│	│	├─login-page						登录模块
-│	|	|	├─common						登录模块公共库
-│	│	│	│	├─login-page.css			公共样式库
-│	│	│	│	├─login-page.mixin.js		公共mixin
-│	│	│	│	└─loginSuccess.js			公共登录成功后操作
-│	|	|	├─index							短信验证码登录，手机号码输入页面
-│	|	|	├─phone-code					短信验证码登录，验证码输入页面
-│	|	|	├─pwd-login						账户密码登录
-│	|	|	├─pwd-retrieve					密码重置
-│	│	│	└─register						注册账户模块
-│	│	│		├─validator.js
-│	│	│		└─register.vue
-│	│	├─read-news-log						新闻阅读记录
-│	│	│	└─read-news-log
-│	│	├─settings						
-│	│	│	├─dc-push
-│	│	│	│	└─push.js					push权限操作SDK
-│	│	│	└─settings.vue					app设置
-│	│	├─userinfo							用户个人信息
-│	│	│	├─bind-mobile
-│	│	│	│	└─bind-mobile.vue			绑定手机号码
-│	│	│	├─limeClipper					图片裁剪插件,来源[limeClipper](https://ext.dcloud.net.cn/plugin?id=3594) @作者： 陌上华年
-│	│	│	│	├─images
-│	│	│	│	│	├─photo.svg
-│	│	│	│	│	└─rotate.svg
-│	│	│	│	├─index.css
-│	│	│	│	├─limeClipper.vue
-│	│	│	│	├─README.md
-│	│	│	│	└─utils.js
-│	│	│	├─main.js
-│	│	│	├─cropImage.vue	引用limeClipper的图片裁剪模块，为了方便二开可能会出现兼容`vue`与`nvue`，所以做成了`页面`而不是`组件`
-│	│	│	└─userinfo.vue
-│	|	└─ucenter.vue						用户中心
-│	|
-├─static	 						存放应用引用的本地静态资源（如图片、视频等）的目录，<b>注意：</b>静态资源只能存放于此
-├─uni_modules						存放[uni_module](/uni_modules)规范的插件。
-├─uni_modules_tools					uni_modules插件上传辅助脚本 <a href="https://ext.dcloud.net.cn/plugin?id=5256">详情</a>。
-├─main.js							Vue初始化入口文件
-├─App.vue							应用配置，用来配置App全局样式以及监听 <a href="/collocation/frame/lifecycle?id=应用生命周期">应用生命周期</a>
-├─uni-starter.config				uni-starter的前端的配置文件，项目所有模块的配置在这里填写。详见该文件的代码注释。
-├─manifest.json	 					配置应用名称、appid、logo、版本等打包信息，<a href="/collocation/manifest">详见</a>
-└─pages.json						配置页面路由、导航条、选项卡等页面类信息，<a href="/collocation/pages">详见</a>
-</pre>
-完整的uni-app目录结构[详情](https://uniapp.dcloud.io/frame?id=%e7%9b%ae%e5%bd%95%e7%bb%93%e6%9e%84)
-
-## 常见API示范
-1. 判断当前用户是否拥有某角色`uniIDHasRole` 演示页面：`/pages/grid/grid` [API文档详情：](https://uniapp.dcloud.io/api/global?id=uniidhasrole)
-2. 指纹解锁、人脸解锁  演示页面：`/pages/ucenter/settings/settings` [API文档详情：](https://uniapp.dcloud.io/api/system/authentication)
-
-## 注意事项
-1. 真机运行需要制作自定义基座，制作后选择运行到自定义基座
-2. 苹果登录的图标，需要满足苹果应用市场的审核规范请勿随便修改；如需修改请先阅读:[Sign in with Apple Button](https://appleid.apple.com/signinwithapple/button)
-3. 应用登录功能，默认不勾选同意隐私权限是响应安卓应用市场的规范；请勿修改该逻辑。
-
-## FAQ：常见问题
-1. 提示“公共模块uni-id缺少配置信息”解决方案：在cloudfunctions右键‘上传所有云函数、公共模块及actions’之后，需要在cloudfunctions -> common -> uni-config-center 目录单独上传一次，右键‘上传公共模块’。
-2. 本项目代码可以商用，无需为DCloud付费。但不能把本项目的代码改造用于非uni-app和uniCloud的技术体系。即，不能将后台改成php、java等其他后台，这将违反使用许可协议。
-
-## 相关案例
-[
-	![](https://vkceyugu.cdn.bspapp.com/VKCEYUGU-f184e7c3-1912-41b2-b81f-435d1b37c7b4/dd4c366f-6165-46c0-8500-5a679d7e5463.jpg)
-](https://ext.dcloud.net.cn/search?q=uni-starter)
-（点击跳转到案例列表）
-
-
-## 第三方插件（感谢插件作者，排名不分前后）：
-1. 图片裁剪 [limeClipper](https://ext.dcloud.net.cn/plugin?id=3594) @作者： 陌上华年
-2. 二维码生成 [Sansnn-uQRCode](https://ext.dcloud.net.cn/plugin?id=1287) @作者： 3snn
-3. clipboard.js [clipboard](https://clipboardjs.com/)
\ No newline at end of file
+<h2>
+文档已移至 <a href="https://uniapp.dcloud.io/uniCloud/uni-starter.html" target="_blank">uni-starter文档</a>
+</h2>
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index 58e7f258a44b89d8d454898480b5dd4a6eab3082..6a216ac6db9f721ab50b0e881d7791d4594ad7fd 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,22 @@
+## 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）
+- 修改`uni-starter.config.js`->`debug`的默认值为`false`
+## 1.2.3（2022-05-20）
+- 默认关闭`manifest.json`中的扩展配置
+- `uni-starter.config.js` 新增debug,用于配置是否开启调试模式
+## 1.2.2（2022-05-19）
+- 优化登陆体验，账号密码登陆错误超过2次，再显示图形验证码进行人机校验。
+## 1.2.1（2022-05-18）
+- 修复在某些情况下，微信小程序端验证码显示错误的问题
+## 1.2.0（2022-05-16）
+- 短信验证码登陆、绑定手机号码新增防刷逻辑。当短信验证码输入错误2次以上，弹出图形验证码进行人机校验。
+- uni-id-cf，新增防刷机制。更改loginLog为uniIdLog 记录各类uni-id操作，并新增action字段记录操作的行为名称
+- 注册账号新增需要输入图形验证码
+## 1.1.34（2022-05-12）
+修复绑定手机号码，未验证空验证码的问题。注意：请确保项目依赖的uni-id版本为3.3.18+
+## 1.1.33（2022-02-24）
+修复微信小程序端，个人资料-绑定手机号码，一键获取微信资料中手机号码绑定授权，点击“拒绝”时toast：encryptedData 不可为空的问题
 ## 1.1.32（2022-02-24）
 - 删除多余文件：`uniCloud/database/opendb-news-articles-detail.schema.json`
 - 修复当用户选择验证码登陆方式，在输入验证码页面，点击微信登陆时报“你未同意隐私政策协议”的问题
diff --git a/common/appInit.js b/common/appInit.js
index 2cd4864c0b9afbe7f4b22e4319686591f7c634e1..da70ffd2acfb32c8c1fac8f2652fdd5db79550d2 100644
--- a/common/appInit.js
+++ b/common/appInit.js
@@ -8,7 +8,8 @@ import interceptorChooseImage from '@/uni_modules/json-interceptor-chooseImage/j
 // #endif
 const db = uniCloud.database()
 export default async function() {
-	let loginConfig = uniStarterConfig.router.login
+	let loginConfig = uniStarterConfig.router.login;
+	const debug = uniStarterConfig.debug;
 	//清除有配置但设备环境不支持的登录项
 	// #ifdef APP-PLUS
 	await new Promise((callBack) => {
@@ -94,7 +95,6 @@ export default async function() {
 				url: '/pages/ucenter/login-page/index/index'
 			})
 		}
-		return code
 	}
 	// 绑定clientDB错误事件
 	db.on('error', onDBError)
@@ -153,7 +153,6 @@ export default async function() {
 		}
 	})
 
-	const Debug = false;
 	//拦截器封装callFunction
 	let callFunctionOption;
 	uniCloud.addInterceptor('callFunction', {
@@ -199,8 +198,9 @@ export default async function() {
 		complete(e) {
 			// console.log(JSON.stringify(e));
 		},
-		fail(e) { // 失败回调拦截
-			if (Debug) {
+		fail(e) { // 失败回调拦截
+			console.error('网络请求错误码：',JSON.stringify(e));
+			if (debug) {
 				uni.showModal({
 					content: JSON.stringify(e),
 					showCancel: false
@@ -375,7 +375,7 @@ export default async function() {
 			},
 			fail(err) { // 失败回调拦截 
 				console.log(err);
-				if (Debug) {
+				if (debug) {
 					console.log(err);
 					uni.showModal({
 						content: JSON.stringify(err),
diff --git a/components/uni-agreements/uni-agreements.vue b/components/uni-agreements/uni-agreements.vue
index 8d82aa0b18837e465c5ea72d8792b5bb09fb4ab2..d94a5b76d88a0422f894cd84871e0b4c2ad60752 100644
--- a/components/uni-agreements/uni-agreements.vue
+++ b/components/uni-agreements/uni-agreements.vue
@@ -16,7 +16,7 @@
 		name:"uni-agreements",
 		computed:{
 			agreements(){
-				return getApp({allowDefault: true}).globalData.config.about.agreements||[]
+				return getApp().globalData.config.about.agreements||[]
 			}
 		},
 		methods:{
diff --git a/components/uni-bindMobileByMpWeixin/uni-bindMobileByMpWeixin.vue b/components/uni-bindMobileByMpWeixin/uni-bindMobileByMpWeixin.vue
index bc07a6d6bd579e86db54f5a97f20ad2a1825b35a..c1246e515916058503b5f54ff21b1fc13d1248ce 100644
--- a/components/uni-bindMobileByMpWeixin/uni-bindMobileByMpWeixin.vue
+++ b/components/uni-bindMobileByMpWeixin/uni-bindMobileByMpWeixin.vue
@@ -70,29 +70,33 @@
 				})
 			},
 			bindMobileByMpWeixin(e) {
-				console.log(e.detail);
-				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
-							})
+				console.log(e.detail);
+				if(e.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()
 						}
-						this.closeMe()
-					}
-				})
+					})
+				}else{
+					this.closeMe()
+				}
 			},
 			async open(uid) {
 				userId = uid
diff --git a/components/uni-load-state/uni-load-state.vue b/components/uni-load-state/uni-load-state.vue
index 744471e0d38cce340f0717e2512cc7a64ffd632a..25b2902c4c62acebe3bb1f34297f23d65769e172 100644
--- a/components/uni-load-state/uni-load-state.vue
+++ b/components/uni-load-state/uni-load-state.vue
@@ -115,7 +115,8 @@
 
 <style scoped>
 	.box {
-		flex: 1;
+		flex: 1;
+		width: 700rpx;
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
@@ -123,7 +124,6 @@
 	.uni-load-more{
 		align-items: center;
 		justify-content: center;
-		width: 690rpx;
 	}
 	.state-text {
 		text-align: center;
diff --git a/components/uni-quick-login/uni-quick-login.vue b/components/uni-quick-login/uni-quick-login.vue
index 96a024f663c6188dd4d30d009f494f41db9141d8..cd8662c78f100e78677da3ac7b005a745438fa1e 100644
--- a/components/uni-quick-login/uni-quick-login.vue
+++ b/components/uni-quick-login/uni-quick-login.vue
@@ -32,10 +32,10 @@
 	export default {
 		computed: {
 			loginConfig() {
-				return getApp({allowDefault: true}).globalData.config.router.login
+				return getApp().globalData.config.router.login
 			},
 			agreements() {
-				return getApp({allowDefault: true}).globalData.config.about.agreements || []
+				return getApp().globalData.config.about.agreements || []
 			}
 		},
 		data() {
@@ -335,7 +335,7 @@
 				console.log({
 					params,
 					type
-				});
+				});
 				let action = 'loginBy' + type.trim().toLowerCase().replace(type[0], type[0].toUpperCase())
 				uniCloud.callFunction({
 					name: 'uni-id-cf',
diff --git a/components/uni-send-sms-code/uni-send-sms-code.vue b/components/uni-send-sms-code/uni-send-sms-code.vue
index 235a098ee0491aa1e9e3611a422a977ef9b9514c..bf92c3075bd1216e89d3adc52bd426e863462ffd 100644
--- a/components/uni-send-sms-code/uni-send-sms-code.vue
+++ b/components/uni-send-sms-code/uni-send-sms-code.vue
@@ -53,15 +53,13 @@
 			};
 		},
 		computed: {
-
 			innerText() {
 				if (this.reverseNumber == 0) return this.$t('common.getVerifyCode');
-				return this.$t('smsCode.resendVerifyCode')+ '('+this.reverseNumber+'s)';
+				return this.$t('smsCode.resendVerifyCode') + '(' + this.reverseNumber + 's)';
 			}
 		},
 		created() {
 			this.initClick();
-			// console.log(this.$t('smsCode.resendVerifyCode'));
 		},
 		methods: {
 			initClick() {
@@ -85,9 +83,11 @@
 							"type": this.codeType
 						},
 					},
-				}).then(({result})=>{
+				}).then(({
+					result
+				}) => {
 					console.log(result);
-					if(result.code===0){
+					if (result.code === 0) {
 						uni.showToast({
 							title: this.$t('smsCode.sendSuccessTip'),
 							icon: 'none'
@@ -95,18 +95,19 @@
 						this.reverseNumber = Number(this.count);
 						this.getCode();
 						this.$emit('getCode');
-					}else{
+					} else {
 						uni.showModal({
 							content: result.msg,
 							showCancel: false
 						});
 					}
 					return result
-				}).catch((reason)=>{
-						console.log(reason,'reason----');
+				}).catch((reason) => {
+					console.log(reason, 'reason----');
 						return reason
-					})
-				/* return await uniCloud.callFunction({
+				})
+				
+				/* uniCloud.callFunction({
 					name: 'uni-id-cf',
 					data: {
 						action: 'sendSmsCode',
@@ -115,9 +116,11 @@
 							"type": this.codeType
 						},
 					},
-					success: ({result}) => {
+					success: ({
+						result
+					}) => {
 						console.log(result);
-						if(result.code===0){
+						if (result.code === 0) {
 							uni.showToast({
 								title: this.$t('smsCode.sendSuccessTip'),
 								icon: 'none'
@@ -125,7 +128,7 @@
 							this.reverseNumber = Number(this.count);
 							this.getCode();
 							this.$emit('getCode');
-						}else{
+						} else {
 							uni.showModal({
 								content: result.msg,
 								showCancel: false
@@ -150,13 +153,14 @@
 </script>
 
 <style lang="scss" scoped>
-/* #ifndef APP-NVUE */
-view{
-	display: flex;
-	box-sizing: border-box;
-	flex-direction: column;
-}
-/* #endif */
+	/* #ifndef APP-NVUE */
+	view {
+		display: flex;
+		box-sizing: border-box;
+		flex-direction: column;
+	}
+
+	/* #endif */
 	.short-code-btn {
 		width: 200rpx;
 		height: 85rpx;
@@ -166,11 +170,13 @@ view{
 		justify-content: center;
 		align-items: center;
 	}
+
 	.inner-text {
 		font-size: 28rpx;
 		color: #AAAAAA;
 	}
+
 	.inner-text-active {
 		color: #007aff;
 	}
-</style>
+</style>
diff --git a/main.js b/main.js
index dcd2e463ceec110000ae7e77bec3cf6dd856fa3d..ee65e43fdd8a11fae2868934148eade8295fc70c 100644
--- a/main.js
+++ b/main.js
@@ -2,7 +2,7 @@ import App from './App'
 import store from './store'
 import i18n from './lang/i18n'
 
-// uni.showModal = ()=>{};
+uni.showModal = ()=>{};
 
 // #ifndef VUE3
 import Vue from 'vue'
diff --git a/package.json b/package.json
index 83cf66dc86e249278ff273655d2ab38cba50e464..1d91d4b3f3c558fc8b0035c80670f923713c2fc9 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,15 @@
 {
 	"id": "uni-starter",
 	"displayName": "uni-starter",
-	"version": "1.1.32",
+	"version": "1.2.5",
 	"description": "云端一体应用快速开发基本项目模版",
 	"keywords": [
-        "login",
-        "登录",
-        "搜索",
-        "uni-id实例",
-        "留言板"
-    ],
+		"login",
+		"登录",
+		"搜索",
+		"uni-id实例",
+		"留言板"
+	],
 	"repository": "https://gitcode.net/dcloud/uni-starter",
 	"engines": {
 		"HBuilderX": "^3.2.6"
@@ -38,7 +38,10 @@
 		"npmurl": ""
 	},
 	"uni_modules": {
-		"dependencies": [],
+		"dependencies": [
+			"uni-id-cf",
+			"uni-captcha"
+		],
 		"encrypt": [],
 		"platforms": {
 			"cloud": {
@@ -82,6 +85,6 @@
 		}
 	},
 	"dependencies": {
-		"@jest/test-sequencer": "^27.0.6"
+		"@jest/test-sequencer": "^27.5.1"
 	}
 }
diff --git a/pages.json b/pages.json
index d4ed64383abfb61dcd4a2893a61c8cbf750321c7..bcb5ccbe8e440fa7ca1a87763c28db0dba0b6514 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,6 @@
 {
-	"pages": [{
+	"pages": [
+		{
 			"path": "pages/list/list",
 			"style": {
 				// #ifndef APP-PLUS
@@ -176,7 +177,11 @@
 		"navigationBarTitleText": "uni-starter",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#F8F8F8",
-		"enablePullDownRefresh": false
+		"enablePullDownRefresh": false,
+		// "maxWidth":375,
+		"rpxCalcMaxDeviceWidth":375,
+		"rpxCalcBaseDeviceWidth":375
+		// "rpxCalcIncludeWidth":0
 	},
 	"condition": {
 		"list": [{
diff --git a/pages/grid/grid.vue b/pages/grid/grid.vue
index 90a63ac51b08d5198a8140be880ed711cc336955..55a04b76fc31a492a8195f73fc112e02563944fb 100644
--- a/pages/grid/grid.vue
+++ b/pages/grid/grid.vue
@@ -2,39 +2,39 @@
 	<view class="warp">
 		<!-- #ifdef APP-PLUS -->
 		<status-bar />
-		<!-- #endif -->
+		<!-- #endif -->
 		
-		<!-- banner -->
-		<unicloud-db ref="bannerdb" v-slot:default="{data, loading, error, options}" collection="opendb-banner"
-			field="_id,bannerfile,open_url,title" @load="onqueryload">
-			<!-- 当无banner数据时显示占位图 -->
-			<image v-if="!(loading||data.length)" class="banner-image" src="/static/grid/empty.png" mode="aspectFill" :draggable="false" />
-			<uni-swiper-dot v-else class="uni-swiper-dot-box" @clickItem="clickItem" :info="data" 
-				:current="current" field="content">
-				<swiper class="swiper-box" @change="changeSwiper" :current="swiperDotIndex">
-					<swiper-item v-for="(item, index) in data" :key="item._id">
-						<view class="swiper-item" @click="clickBannerItem(item)">
-							<image class="banner-image" :src="item.bannerfile.url" mode="aspectFill" :draggable="false" />
-						</view>
-					</swiper-item>
-				</swiper>
-			</uni-swiper-dot>
-		</unicloud-db>
+		<!-- banner -->
+		<unicloud-db ref="bannerdb" v-slot:default="{data, loading, error, options}" collection="opendb-banner"
+			field="_id,bannerfile,open_url,title" @load="onqueryload">
+			<!-- 当无banner数据时显示占位图 -->
+			<image v-if="!(loading||data.length)" class="banner-image" src="/static/grid/empty.png" mode="aspectFill" :draggable="false" />
+			<uni-swiper-dot v-else class="uni-swiper-dot-box" @clickItem="clickItem" :info="data" 
+				:current="current" field="content">
+				<swiper class="swiper-box" @change="changeSwiper" :current="swiperDotIndex">
+					<swiper-item v-for="(item, index) in data" :key="item._id">
+						<view class="swiper-item" @click="clickBannerItem(item)">
+							<image class="banner-image" :src="item.bannerfile.url" mode="aspectFill" :draggable="false" />
+						</view>
+					</swiper-item>
+				</swiper>
+			</uni-swiper-dot>
+		</unicloud-db>
+		
 		
-		
-	<!-- 宫格 -->
+	<!-- 宫格 -->
 		<uni-section :title="$t('grid.grid')" style="margin: 0;" type="line"></uni-section>
 		<view class="example-body">
-			<uni-grid class="uni-grid-box" :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" />
-							<text class="text">{{item}}</text>
-						</view>
-					</uni-grid-item>
+			<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" />
+							<text class="text">{{item}}</text>
+						</view>
+					</uni-grid-item>
 				</template>
 			</uni-grid>
 		</view>
@@ -60,21 +60,20 @@
 		computed: {
 			...mapGetters({
 				hasLogin: 'user/hasLogin'
-			})
-		},
-		onLoad() {
-			console.log(uni.getStorageSync('uni_id_token'),"00000000000000000000");
-			let gridList = []
-			for (var i = 0; i < 3; i++) {
-				gridList.push( this.$t('grid.visibleToAll') )
-			}
-			for (var i = 0; i < 3; i++) {
-				gridList.push( this.$t('grid.invisibleToTourists') )
-			}
-			for (var i = 0; i < 3; i++) {
-				gridList.push( this.$t('grid.adminVisible') )
-			}
-			this.gridList = gridList
+			})
+		},
+		onLoad() {
+			let gridList = []
+			for (var i = 0; i < 3; i++) {
+				gridList.push( this.$t('grid.visibleToAll') )
+			}
+			for (var i = 0; i < 3; i++) {
+				gridList.push( this.$t('grid.invisibleToTourists') )
+			}
+			for (var i = 0; i < 3; i++) {
+				gridList.push( this.$t('grid.adminVisible') )
+			}
+			this.gridList = gridList
 		},
 		methods: {
 			change(e) {
@@ -86,7 +85,7 @@
 			/**
 			 * banner加载后触发的回调
 			 */
-			onqueryload(data) {
+			onqueryload(data) {
 			},
 			changeSwiper(e) {
 				this.current = e.detail.current
@@ -220,4 +219,4 @@
 	.uni-input-placeholder {
 		font-size: 28rpx;
 	}
-</style>
+</style>
diff --git a/pages/list/detail.vue b/pages/list/detail.vue
index 1b80e683d5577ba250a30f38dfa19bd3c47ada42..9d1d55879b67c606321730fa5e394a59b240286d 100644
--- a/pages/list/detail.vue
+++ b/pages/list/detail.vue
@@ -121,7 +121,7 @@
 			} else {
 				uni.showToast({
 					icon: 'none',
-					title: this.$t('listDetail').newsErr
+					title: this.$t('listDetail.newsErr')
 				})
 			}
 		},
@@ -193,7 +193,7 @@
 			 */
 			followClick() {
 				uni.showToast({
-					title:this.$t('listDetail').follow,
+					title:this.$t('listDetail.follow'),
 					icon: 'none'
 				});
 			},
@@ -224,7 +224,7 @@
 					},
 					menus: [{
 							"img": "/static/app-plus/sharemenu/wechatfriend.png",
-							"text": this.$t('common').wechatFriends,
+							"text": this.$t('common.wechatFriends'),
 							"share": {
 								"provider": "weixin",
 								"scene": "WXSceneSession"
@@ -232,7 +232,7 @@
 						},
 						{
 							"img": "/static/app-plus/sharemenu/wechatmoments.png",
-							"text": this.$t('common').wechatBbs,
+							"text": this.$t('common.wechatBbs'),
 							"share": {
 								"provider": "weixin",
 								"scene": "WXSceneTimeline"
@@ -240,7 +240,7 @@
 						},
 						{
 							"img": "/static/app-plus/sharemenu/mp_weixin.png",
-							"text": this.$t('common').wechatApplet,
+							"text": this.$t('common.wechatApplet'),
 							"share": {
 								provider: "weixin",
 								scene: "WXSceneSession",
@@ -256,7 +256,7 @@
 						},
 						{
 							"img": "/static/app-plus/sharemenu/weibo.png",
-							"text": this.$t('common').weibo,
+							"text": this.$t('common.weibo'),
 							"share": {
 								"provider": "sinaweibo"
 							}
@@ -270,16 +270,16 @@
 						},
 						{
 							"img": "/static/app-plus/sharemenu/copyurl.png",
-							"text": this.$t('common').copy,
+							"text": this.$t('common.copy'),
 							"share": "copyurl"
 						},
 						{
 							"img": "/static/app-plus/sharemenu/more.png",
-							"text": this.$t('common').more,
+							"text": this.$t('common.more'),
 							"share": "shareSystem"
 						}
 					],
-					cancelText: this.$t('common').cancelShare,
+					cancelText: this.$t('common.cancelShare'),
 				}, e => { //callback
 					console.log(e);
 				})
diff --git a/pages/list/list.nvue b/pages/list/list.nvue
index b83ceb911408a98486980096f1cd7cd86f5a8907..b273cfe825a2077d471401dcaf813bea23427d5e 100644
--- a/pages/list/list.nvue
+++ b/pages/list/list.nvue
@@ -12,18 +12,18 @@
 		</view>
 
 		<unicloud-db ref='udb' v-slot:default="{data,pagination,hasMore, loading, error, options}" @error="onqueryerror"
-			:collection="colList" :page-size="10"
+			:collection="colList" :page-size="10"
 			>
 			<!-- 基于 uni-list 的页面布局 field="user_id.username"-->
 			<uni-list class="uni-list" :border="false" :style="{height:listHight}">
-				
-				<!-- 作用于app端nvue页面的下拉加载 -->
-				<!-- #ifdef APP-NVUE -->
-				<refreshBox @refresh="refresh" :loading="loading"></refreshBox>
+				
+				<!-- 作用于app端nvue页面的下拉加载 -->
+				<!-- #ifdef APP-NVUE -->
+				<refreshBox @refresh="refresh" :loading="loading"></refreshBox>
 				<!-- #endif -->
+
 				<!-- 列表渲染 -->
-				<uni-list-item :to="'/pages/list/detail?id='+item._id+'&title='+item.title" v-for="(item,index) in data"
-					:key="index">
+				<uni-list-item :to="'/pages/list/detail?id='+item._id+'&title='+item.title" v-for="(item,index) in data" :key="index">
 					<!-- 通过header插槽定义列表左侧图片 -->
 					<template v-slot:header>
 						<image class="avatar" :src="item.avatar" mode="aspectFill"></image>
@@ -39,18 +39,18 @@
 							</view>
 						</view>
 					</template>
-				</uni-list-item>
-				<!-- 加载状态：上拉加载更多，加载中，没有更多数据了，加载错误 -->
-				<!-- #ifdef APP-PLUS -->
-				<uni-list-item>
-					<template v-slot:body>
+				</uni-list-item>
+				<!-- 加载状态：上拉加载更多，加载中，没有更多数据了，加载错误 -->
+				<!-- #ifdef APP-PLUS -->
+				<uni-list-item>
+					<template v-slot:body>
 				<!-- #endif -->
 						<uni-load-state @networkResume="refresh" :state="{data,pagination,hasMore, loading, error}"
 							@loadMore="loadMore">
-						</uni-load-state>
-				<!-- #ifdef APP-PLUS -->
-					</template>
-				</uni-list-item>
+						</uni-load-state>
+				<!-- #ifdef APP-PLUS -->
+					</template>
+				</uni-list-item>
 				<!-- #endif -->
 			</uni-list>
 		</unicloud-db>
@@ -58,11 +58,11 @@
 </template>
 
 <script>
-	var cdbRef, currentWebview;
+	let cdbRef;
 	import statusBar from "@/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar";
 
 	import Gps from '@/uni_modules/json-gps/js_sdk/gps.js';
-	const gps = new Gps(),db = uniCloud.database();
+	const gps = new Gps(),db = uniCloud.database();
 
 	export default {
 		components: {
@@ -75,22 +75,20 @@
 				} else {
 					return '请输入搜索内容'
 				}
-			},
-			colList(){
-				return [
-					db.collection('opendb-news-articles').where(this.where).field('avatar,title,last_modify_date,user_id').getTemp(),
-					db.collection('uni-id-users').field('_id,username').getTemp()
-				]
+			},
+			colList(){
+				return [
+					db.collection('opendb-news-articles').where(this.where).field('avatar,title,last_modify_date,user_id').getTemp(),
+					db.collection('uni-id-users').field('_id,username').getTemp()
+				]
 			}
 		},
 		data() {
-			return {
+			return {
 				where: '"article_status" == 1',
 				keyword: "",
-				refreshState: 0,
-				listHight: 0,
-				dataList:[],
 				showRefresh: false,
+				listHight: 0
 			}
 		},
 		watch: {
@@ -103,7 +101,7 @@
 				}
 			}
 		},
-		async onReady() {
+		async onReady() {
 			// #ifdef APP-NVUE
 			/* 可用窗口高度 - 搜索框高 - 状态栏高 */
 			this.listHight = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - 50 + 'px';
@@ -114,9 +112,8 @@
 			cdbRef = this.$refs.udb
 		},
 		async onShow() {
-			console.log(getApp({allowDefault: true}),"00000");
-			this.keyword = getApp({allowDefault: true}).globalData.searchText
-			getApp({allowDefault: true}).globalData.searchText = ''
+			this.keyword = getApp().globalData.searchText
+			getApp().globalData.searchText = ''
 			//这里仅演示如何，在onShow生命周期获取设备位置，并在设备或者应用没有权限时自动引导。设置完毕自动重新获取。
 			//你可以基于他做自己的业务，比如：根据距离由近到远排序列表数据等
 			// uni.showLoading({
@@ -124,10 +121,10 @@
 			// });
 			//默认h5端不获取定位
 			// #ifndef H5
-			// let location = await gps.getLocation({
-			// 	geocode: true
-			// })
-			// console.log(location);
+			let location = await gps.getLocation({
+				geocode: true
+			})
+			console.log(location);
 			// #endif
 			// if(location){
 			// 	uni.showToast({
@@ -138,11 +135,6 @@
 			// uni.hideLoading()
 		},
 		methods: {
-			loadData(e){
-				console.log("e: ----",e[0]);
-				this.dataList = e[0]
-				console.log("this.dataList: ",this.dataList);
-			},
 			searchClick(e) { //点击搜索框
 				uni.hideKeyboard();
 				uni.navigateTo({
@@ -157,11 +149,10 @@
 				cdbRef.loadData({
 					clear: true
 				}, () => {
-					uni.stopPullDownRefresh()
-					// #ifdef APP-NVUE
-					this.showRefresh = false
-					// #endif
-
+					uni.stopPullDownRefresh()
+					// #ifdef APP-NVUE
+					this.showRefresh = false
+					// #endif
 					console.log('end');
 				})
 				console.log('refresh');
@@ -173,20 +164,20 @@
 				console.error(e);
 			},
 			onpullingdown(e) {
-				console.log(e);
-				this.showRefresh = true
-				if(e.pullingDistance>100){
-					this.refresh()
+				console.log(e);
+				this.showRefresh = true
+				if(e.pullingDistance>100){
+					this.refresh()
 				}
 			}
 		},
-		// #ifndef APP-NVUE
-		onPullDownRefresh() {
-			this.refresh()
-		},
-		onReachBottom() {
-			this.loadMore()
-		}
+		// #ifndef APP-NVUE
+		onPullDownRefresh() {
+			this.refresh()
+		},
+		onReachBottom() {
+			this.loadMore()
+		}
 		// #endif
 	}
 </script>
@@ -209,13 +200,13 @@
 		margin-right: 10rpx;
 	}
 
-	.main {
-		justify-content: space-between;
+	.main {
+		justify-content: space-between;
+		flex: 1;
 	}
 
 	.title {
-		width: 480rpx;
-		font-size: 32rpx;
+		font-size: 16px;
 	}
 
 	.info {
@@ -225,7 +216,7 @@
 
 	.author,
 	.last_modify_date {
-		font-size: 28rpx;
+		font-size: 14px;
 		color: #999999;
 	}
 
@@ -251,5 +242,4 @@
 		z-index: 999;
 		/* #endif */
 	}
-</style>
-
+</style>
diff --git a/pages/list/list.test1.js b/pages/list/list.test1.js
index 7ec3c49c240c61c39932efa37b37c4336fb94359..1373455c597302bb840da64e4d42244259a2a3b5 100644
--- a/pages/list/list.test1.js
+++ b/pages/list/list.test1.js
@@ -13,7 +13,7 @@ describe('pages/list/list.vue', () => {
 	})
 	
 	it('点击搜索跳转', async () => {
-		expect.assertions(2);
+		// expect.assertions(2);
 		const searchTo = await page.callMethod('searchClick')
 		await page.waitFor(300)
 		expect((await program.currentPage()).path).toBe('pages/list/search/search')
diff --git a/pages/list/search/search.test.js b/pages/list/search/search.test1.js
similarity index 100%
rename from pages/list/search/search.test.js
rename to pages/list/search/search.test1.js
diff --git a/pages/ucenter/about/about.vue b/pages/ucenter/about/about.vue
index 235e3c5c81d685671182344ad5e5656fd36ba62e..a30fad239d7e389d293dac5065d5f294080ac94a 100644
--- a/pages/ucenter/about/about.vue
+++ b/pages/ucenter/about/about.vue
@@ -41,8 +41,8 @@
 		},
 		computed: {
 			uniStarterConfig() {
-				console.log(getApp({allowDefault: true}),"getApp----------------");
-				return getApp({allowDefault: true}).globalData.config
+				console.log(getApp());
+				return getApp().globalData.config
 			}
 		},
 		data() {
@@ -54,7 +54,6 @@
 		},
 		created() {
 			this.about = this.uniStarterConfig.about
-			console.log("this.about:------ ",this.about);
 			uni.setNavigationBarTitle({
 				title: this.$t('about.about')+ " " + this.about.appName
 			})
@@ -77,7 +76,7 @@
 				},
 				menus: [{
 						"img": "/static/app-plus/sharemenu/wechatfriend.png",
-						"text": this.$t('common').wechatFriends,
+						"text": this.$t('common.wechatFriends'),
 						"share": {
 							"provider": "weixin",
 							"scene": "WXSceneSession"
@@ -85,7 +84,7 @@
 					},
 					{
 						"img": "/static/app-plus/sharemenu/wechatmoments.png",
-						"text":  this.$t('common').wechatBbs,
+						"text":  this.$t('common.wechatBbs'),
 						"share": {
 							"provider": "weixin",
 							"scene": "WXSceneTimeline"
@@ -93,7 +92,7 @@
 					},
 					{
 						"img": "/static/app-plus/sharemenu/weibo.png",
-						"text":  this.$t('common').weibo,
+						"text":  this.$t('common.weibo'),
 						"share": {
 							"provider": "sinaweibo"
 						}
@@ -107,16 +106,16 @@
 					},
 					{
 						"img": "/static/app-plus/sharemenu/copyurl.png",
-						"text": this.$t('common').copy,
+						"text": this.$t('common.copy'),
 						"share": "copyurl"
 					},
 					{
 						"img": "/static/app-plus/sharemenu/more.png",
-						"text": this.$t('common').more,
+						"text": this.$t('common.more'),
 						"share": "shareSystem"
 					}
 				],
-				cancelText: this.$t('common').cancelShare,
+				cancelText: this.$t('common.cancelShare'),
 			}, e => { //callback
 				console.log(e);
 			})
@@ -127,7 +126,7 @@
 				title
 			}) {
 				uni.navigateTo({
-					url: '/pages/common/webview/webview?url=' + url + '&title=' + title,
+					url: '/pages/common/webview/webview?url=' + url + '&title=' + title,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}
@@ -145,8 +144,9 @@
 	}
 	/* #endif */
 	.about {
-		width: 750rpx;
-		flex-direction: column;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
 	}
 
 	.box {
@@ -181,13 +181,12 @@
 	}
 
 	.copyright {
-		width: 750rpx;
 		font-size: 32rpx;
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
 		bottom: 20px;
-		left: 0;
+		// left: 0;
 		position: fixed;
 	}
 
diff --git a/pages/ucenter/login-page/common/login-page.css b/pages/ucenter/login-page/common/login-page.css
index d30c21c562bcdadbc2ace0e5b49b361135e8f0bb..4189236f739afe71edf8c02fdefd22c9f70d1796 100644
--- a/pages/ucenter/login-page/common/login-page.css
+++ b/pages/ucenter/login-page/common/login-page.css
@@ -9,7 +9,7 @@ view {
 
 .content {
 	padding: 0 50rpx;
-	width: 750rpx;
+	/* width: 750rpx; */
 	flex: 1;
 }
 
diff --git a/pages/ucenter/login-page/index/index.vue b/pages/ucenter/login-page/index/index.vue
index 8d1a855dc67725bb0e93fbfa5a70d8419519eee7..e1750d5ce521c4af434976f4beac9d218b16a5e6 100644
--- a/pages/ucenter/login-page/index/index.vue
+++ b/pages/ucenter/login-page/index/index.vue
@@ -6,12 +6,12 @@
 		<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>
+		</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" :type="isPhone?'primary':'default'"
+			<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>
@@ -91,7 +91,7 @@
 			sendShortMsg() {
 				if (!this.agree) {
 					return uni.showToast({
-						title: this.$t('common').noAgree,
+						title: this.$t('common.noAgree'),
 						icon: 'none'
 					});
 				}
diff --git a/pages/ucenter/login-page/phone-code/phone-code.vue b/pages/ucenter/login-page/phone-code/phone-code.vue
index b482e62e4729cb8e631940193d85ccd56b6dd0f0..9cd8992bd4c0dd5172a89d5086025ed05f5e2145 100644
--- a/pages/ucenter/login-page/phone-code/phone-code.vue
+++ b/pages/ucenter/login-page/phone-code/phone-code.vue
@@ -4,92 +4,113 @@
 		<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')">
+			<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
+			<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-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],
+		mixins: [mixin],
 		data() {
 			return {
-				code:'',
-				phone:''
+				code: '',
+				phone: '',
+				captcha: false
 			}
 		},
 		computed: {
 			tipText() {
-				return this.$t('common.verifyCodeSend')+ `${this.phone}。`;
+				return this.$t('common.verifyCodeSend') + `${this.phone}。`;
 			},
-			canSubmit(){
-				return this.code.length==6;
+			canSubmit() {
+				return this.code.length == 6;
 			}
 		},
-		onLoad({phoneNumber,phoneArea}) {
+		onLoad({
+			phoneNumber,
+			phoneArea
+		}) {
 			this.phone = phoneNumber;
 		},
 		onReady() {
-			if(this.phone.length==11){
+			if (this.phone.length == 11) {
 				this.$refs.sendSmsCode.start();
 			}
 		},
 		methods: {
-			async submit(){ //完成并提交
+			async submit() { //完成并提交
 				return await uniCloud.callFunction({
-					name:'uni-id-cf',
-					data:{
-						action:'loginBySms',
-						params:{
-							"mobile":this.phone,
-							"code":this.code
+					name: 'uni-id-cf',
+					data: {
+						action: 'loginBySms',
+						params: {
+							"mobile": this.phone,
+							"code": this.code,
+							"captcha": this.captcha
 						},
 					}
-				}).then(({result})=>{
-					if(result.code === 0){
+				}).then(({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)
-					}else{
-						uni.showModal({
-							content: result.msg,
-							showCancel: false
-						});
 					}
 					return result
+				}).finally((e)=>{
+					console.log("e: ",e);
+					this.captcha = false
 				})
-			
-				// uniCloud.callFunction({
-				// 	name:'uni-id-cf',
-				// 	data:{
-				// 		action:'loginBySms',
-				// 		params:{
-				// 			"mobile":this.phone,
-				// 			"code":this.code
-				// 		},
-				// 	},
-				// 	success: ({result}) => {
-				// 		if(result.code === 0){
-				// 			this.loginSuccess(result)
-				// 		}else{
-				// 			uni.showModal({
-				// 				content: result.msg,
-				// 				showCancel: false
-				// 			});
-				// 		}
-				// 	}
-				// })
+
+
+				/* 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>
+</style>
diff --git a/pages/ucenter/login-page/pwd-login/pwd-login.vue b/pages/ucenter/login-page/pwd-login/pwd-login.vue
index 7fc70d7985680c137389be07c1739d3664520422..b5baa76a448d697321ebb37411e32674896a990c 100644
--- a/pages/ucenter/login-page/pwd-login/pwd-login.vue
+++ b/pages/ucenter/login-page/pwd-login/pwd-login.vue
@@ -4,11 +4,8 @@
 		<text class="title">{{$t('pwdLogin.pwdLogin')}}</text>
 		<input class="input-box" :inputBorder="false" v-model="username" :placeholder="$t('pwdLogin.placeholder')"/>
 		<input type="password" class="input-box" :inputBorder="false" v-model="password" :placeholder="$t('pwdLogin.passwordPlaceholder')"/>
-		<view class="captcha-box" v-if="captchaBase64">
-			<image class="captcha-img" @click="createCaptcha" :src="captchaBase64" mode="widthFix"></image>
-			<input type="text" class="input-box captcha" :inputBorder="false" v-model="captcha" :placeholder="$t('pwdLogin.verifyCodePlaceholder')"/>
-		</view>
-		<uni-agreements @setAgree="agree = $event"></uni-agreements>
+		<uni-captcha v-if="needCaptcha" scene="login" v-model="captcha"></uni-captcha>
+		<uni-agreements class="agreement" @setAgree="agree = $event"></uni-agreements>
 		<button class="send-btn" :disabled="!canLogin" :type="canLogin?'primary':'default'"
 			@click="pwdLogin">{{$t('pwdLogin.login')}}</button>
 		<!-- 忘记密码 -->
@@ -28,14 +25,14 @@
 			return {
 				"password": "",
 				"username": "",
-				"agree": false,
-				"captchaBase64":"",
-				"captcha":""
+				"agree": false,
+				"captcha":'',
+				"needCaptcha":false
 			}
 		},
 		computed: {
 			canLogin() {
-				return this.username.length && this.isPwd;
+				return this.username.length && this.isPwd && this.agree;
 			},
 			isPwd() {
 				return /^.{6,20}$/.test(this.password);
@@ -51,10 +48,6 @@
 					url: '../pwd-retrieve/pwd-retrieve?phoneNumber=' + (this.isPhone ? this.username : '') +
 						'&phoneArea=' + this.currenPhoneArea
 				})
-				// uni.redirectTo({
-				// 	url: '../pwd-retrieve/pwd-retrieve?phoneNumber=' + (this.isPhone ? this.username : '') +
-				// 		'&phoneArea=' + this.currenPhoneArea
-				// })
 			},
 			/**
 			 * 密码登录
@@ -62,12 +55,11 @@
 			async pwdLogin() {
 				if (!this.agree) {
 					return uni.showToast({
-						title: this.$t('common').noAgree,
+						title: this.$t('common.noAgree'),
 						icon: 'none'
 					});
 				}
 				return await uniCloud.callFunction({
-					name:'uni-id-cf',
 					data:{
 						action:'login',
 						params:{
@@ -76,23 +68,24 @@
 							"captcha":this.captcha
 						},
 					},
-				}).then(({result}) => {
+				}).then(({result})=>{
 					console.log(result);
 					if (result.code === 0) {
 						this.loginSuccess(result)
 					} else {
 						if (result.needCaptcha) {
 							uni.showToast({
-								title: result.msg,
+								title: result.msg||'完成',
 								icon: 'none'
 							});
-							this.createCaptcha()
+							this.needCaptcha = true
+							// this.createCaptcha()
 						}else{
 							uni.showModal({
-								title: this.$t('common').error,
+								title: this.$t('common.error'),
 								content: result.msg,
 								showCancel: false,
-								confirmText: this.$t('common').gotIt
+								confirmText: this.$t('common.gotIt')
 							});
 						}
 					}
@@ -101,63 +94,43 @@
 					console.log("res:-- ",res);
 					return res
 				})
-				// 下边是可以登录
-				// uniCloud.callFunction({
-				// 	name:'uni-id-cf',
-				// 	data:{
-				// 		action:'login',
-				// 		params:{
-				// 			"username": this.username,
-				// 			"password": this.password,
-				// 			"captcha":this.captcha
-				// 		},
-				// 	},
-				// 	success: ({result}) => {
-				// 		console.log(result);
-				// 		if (result.code === 0) {
-				// 			this.loginSuccess(result)
-				// 		} else {
-				// 			if (result.needCaptcha) {
-				// 				uni.showToast({
-				// 					title: result.msg,
-				// 					icon: 'none'
-				// 				});
-				// 				this.createCaptcha()
-				// 			}else{
-				// 				uni.showModal({
-				// 					title: this.$t('common').error,
-				// 					content: result.msg,
-				// 					showCancel: false,
-				// 					confirmText: this.$t('common').gotIt
-				// 				});
-				// 			}
-				// 		}
-				// 	}
-				// })
-			},
-			createCaptcha(){
-				uniCloud.callFunction({
-					name:'uni-id-cf',
-					data:{
-						action:'createCaptcha',
-						params:{
-							scene: "login"
-						},
-					},
-					success: ({result}) => {
-						if (result.code === 0) {
-							this.captchaBase64 = result.captchaBase64
-						}else{
-							uni.showModal({
-								content: result.msg,
-								showCancel: false
-							});
-						}
-					}
-				})
+				// 下边是可以登录
+				/* uniCloud.callFunction({
+					name:'uni-id-cf',
+					data:{
+						action:'login',
+						params:{
+							"username": this.username,
+							"password": this.password,
+							"captcha":this.captcha
+						},
+					},
+					success: ({result}) => {
+						console.log(result);
+						if (result.code === 0) {
+							this.loginSuccess(result)
+						} else {
+							if (result.needCaptcha) {
+								uni.showToast({
+									title: result.msg||'完成',
+									icon: 'none'
+								});
+								this.needCaptcha = true
+								// this.createCaptcha()
+							}else{
+								uni.showModal({
+									title: this.$t('common.error'),
+									content: result.msg,
+									showCancel: false,
+									confirmText: this.$t('common.gotIt')
+								});
+							}
+						}
+					}
+				}) */
 			},
 			/* 前往注册 */
-			toRegister(e) {
+			toRegister() {
 				uni.navigateTo({
 					url: '/pages/ucenter/login-page/register/register'
 				})
@@ -166,7 +139,7 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
 	@import url("../common/login-page.css");
 
 	.auth-box {
@@ -186,17 +159,8 @@
 	.toRegister {
 		margin-top: 80px;
 		width: 600rpx;
-	}
-	.captcha-box{
-		flex-direction: row;
-		align-items: center;
-		justify-content: flex-end;
-	}
-	.captcha-img{
-		margin: 0 15px 10px 0;
-		width: 250rpx;
-	}
-	.captcha{
-		width: 350rpx;
+	}
+	.agreement{
+		margin-top: 10px;
 	}
 </style>
diff --git a/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue b/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue
index 3d0705c54a12cca656d0b79720b5f28bd6b8522b..567e2ab89556543c39054f7ed3bf34ffc6f98676 100644
--- a/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue
+++ b/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue
@@ -2,11 +2,12 @@
 	<view class="content">
 		<!-- 顶部文字 -->
 		<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
-		<uni-forms ref="form" :value="formData" :rules="rules">
+		<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-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"
@@ -36,10 +37,10 @@
 		mixins: [mixin],
 		data() {
 			return {
-				lock:false,
+				lock: false,
 				formData: {
 					"phone": "",
-					"code":"",
+					"code": "",
 					'pwd': '',
 					'pwd2': ''
 				},
@@ -69,7 +70,7 @@
 					pwd: {
 						rules: [{
 								required: true,
-								errorMessage:this.$t('common.newPasswordPlaceholder'),
+								errorMessage: this.$t('common.newPasswordPlaceholder'),
 							},
 							{
 								pattern: /^.{6,20}$/,
@@ -80,7 +81,7 @@
 					pwd2: {
 						rules: [{
 								required: true,
-								errorMessage:this.$t('common.confirmPassword'),
+								errorMessage: this.$t('common.confirmPassword'),
 							},
 							{
 								pattern: /^.{6,20}$/,
@@ -133,34 +134,42 @@
 			if (this.formData.phone) {
 				this.$refs.shortCode.start();
 			}
+			this.$refs.form.setRules(this.rules)
 		},
 		methods: {
 			/**
 			 * 完成并提交
 			 */
-			 submit() {
+			submit() {
+				console.log("formData", this.formData);
+				console.log('rules', this.rules);
 				this.$refs.form.validate()
-					.then( async res => {
+					.then(async res => {
 						return await uniCloud.callFunction({
-							name:'uni-id-cf',
-							data:{
-								action:'resetPwdBySmsCode',
-								params:{
+							name: 'uni-id-cf',
+							data: {
+								action: 'resetPwdBySmsCode',
+								params: {
 									"mobile": this.formData.phone,
 									"code": this.formData.code,
 									"password": this.formData.pwd
 								},
 							}
-						}).then(({result})=>{
+						}).then(({
+							result
+						}) => {
 							console.log(result);
 							uni.showToast({
-								title: result.msg||'更新成功',
+								title: result.msg || '更新成功',
 								icon: 'none'
 							});
 							if (result.code === 0) {
 								uni.navigateBack()
 							}
 							return result
+						}).catch((reason) => {
+							console.log(reason, 'reason----');
+							return reason
 						})
 						
 						// uniCloud.callFunction({
@@ -176,7 +185,7 @@
 						// 	success: ({result}) => {
 						// 		console.log(result);
 						// 		uni.showToast({
-						// 			title: result.msg,
+						// 			title: result.msg||'更新成功',
 						// 			icon: 'none'
 						// 		});
 						// 		if (result.code === 0) {
@@ -192,7 +201,8 @@
 
 <style>
 	@import url("../common/login-page.css");
-	.content{
+
+	.content {
 		padding-top: 36rpx;
 	}
-</style>
+</style>
diff --git a/pages/ucenter/login-page/register/register.vue b/pages/ucenter/login-page/register/register.vue
index ff0c1ee2d53bded19309d0c08d031d3e6f9866fe..a7e66184a81e6a032daccd73cf15fe22cb439844 100644
--- a/pages/ucenter/login-page/register/register.vue
+++ b/pages/ucenter/login-page/register/register.vue
@@ -2,38 +2,55 @@
 	<view class="uni-container">
 		<uni-forms ref="form" :value="formData" :rules="rules" validate-trigger="submit" err-show-type="undertext">
 			<uni-forms-item name="username" required>
-				<uni-easyinput :inputBorder="false" class="easyinput" :placeholder="$t('register.usernamePlaceholder')" v-model="formData.username" trim="both" />
+				<uni-easyinput :inputBorder="false" class="easyinput" :placeholder="$t('register.usernamePlaceholder')"
+					v-model="formData.username" trim="both" />
 			</uni-forms-item>
 			<uni-forms-item name="nickname">
-				<uni-easyinput :inputBorder="false" class="easyinput" :placeholder="$t('register.nicknamePlaceholder')" v-model="formData.nickname" trim="both" style="width: 660rpx;" />
+				<uni-easyinput :inputBorder="false" class="easyinput" :placeholder="$t('register.nicknamePlaceholder')"
+					v-model="formData.nickname" trim="both" />
 			</uni-forms-item>
 			<uni-forms-item name="password" v-model="formData.password" required>
-				<uni-easyinput :inputBorder="false" class="easyinput" :placeholder="$t('register.passwordDigitsPlaceholder')" type="password" v-model="formData.password" trim="both" />
+				<uni-easyinput :inputBorder="false" class="easyinput"
+					:placeholder="$t('register.passwordDigitsPlaceholder')" type="password" v-model="formData.password"
+					trim="both" />
 			</uni-forms-item>
 			<uni-forms-item name="pwd2" v-model="formData.pwd2" required>
-				<uni-easyinput :inputBorder="false" class="easyinput" :placeholder="$t('register.passwordAgain')" type="password" v-model="formData.pwd2" trim="both" />
+				<uni-easyinput :inputBorder="false" class="easyinput" :placeholder="$t('register.passwordAgain')"
+					type="password" v-model="formData.pwd2" trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="captcha" required>
+				<uni-captcha scene="register" v-model="formData.captcha"></uni-captcha>
 			</uni-forms-item>
 			<uni-agreements @setAgree="agree = $event"></uni-agreements>
-			<button class="send-btn" type="primary" @click="submit">{{$t('register.registerAndLogin')}}</button>
+			<button class="send-btn" :disabled="!canSubmit" :type="canSubmit?'primary':'default'"
+				@click="submit">{{$t('register.registerAndLogin')}}</button>
 		</uni-forms>
 	</view>
 </template>
 
 <script>
-import rules from './validator.js';
-import mixin from '../common/login-page.mixin.js';
+	import rules from './validator.js';
+	import mixin from '../common/login-page.mixin.js';
 	export default {
-		mixins:[mixin],
+		mixins: [mixin],
 		data() {
 			return {
 				formData: {
 					"username": "",
 					"nickname": "",
-					'password':'',
-					'pwd2':''
+					"password": "",
+					"pwd2": "",
+					"captcha": ""
 				},
 				rules,
-				agree:false
+				agree: false,
+			}
+		},
+		computed: {
+			canSubmit() {
+				/* return this.formData.username.length && this.formData.password.length && this.formData.captcha.length ==
+					4 && this.agree */
+				return this.formData.username.length && this.formData.password.length && this.agree
 			}
 		},
 		onReady() {
@@ -49,9 +66,9 @@ import mixin from '../common/login-page.mixin.js';
 			 * 触发表单提交
 			 */
 			submit() {
-				if(!this.agree){
+				if (!this.agree) {
 					return uni.showToast({
-						title: this.$t('common').noAgree,
+						title: this.$t('common.noAgree'),
 						icon: 'none'
 					});
 				}
@@ -59,9 +76,9 @@ import mixin from '../common/login-page.mixin.js';
 					mask: true
 				})
 				return this.$refs.form.validate().then(async(res) => {
-					console.log("res: ",res);
+						// this.submitForm(res)
 						let msg = await this.submitForm(res)
-						console.log("msg: --------------",msg);
+						console.log("msg: --------------", msg);
 						return msg
 					}).catch((errors) => {
 						console.log(errors);
@@ -73,38 +90,42 @@ import mixin from '../common/login-page.mixin.js';
 			},
 			async submitForm(params) {
 				return await uniCloud.callFunction({
-					name:'uni-id-cf',
-					data:{
-						action:'register',
-						params,
-					},
-				}).then(({result}) => {
-					if(result.code === 0){
-						this.loginSuccess(result)
-					}else{
-						uni.showModal({
-							content: result.msg,
-							showCancel: false
-						});
-					}
-					console.log(result);
-					return result
-				})
-				.catch((errors) => {
-					console.log(errors);
-					return errors
-				})
+						name: 'uni-id-cf',
+						data: {
+							action: 'register',
+							params,
+						},
+					}).then(({
+						result
+					}) => {
+						if (result.code === 0) {
+							this.loginSuccess(result)
+						} else {
+							uni.showModal({
+								content: result.msg,
+								showCancel: false
+							});
+						}
+						console.log(result);
+						return result
+					})
+					.catch((errors) => {
+						console.log(errors);
+						return errors
+					})
 				// uniCloud.callFunction({
-				// 	name:'uni-id-cf',
-				// 	data:{
-				// 		action:'register',
+				// 	name: 'uni-id-cf',
+				// 	data: {
+				// 		action: 'register',
 				// 		params,
 				// 	},
-				// 	success: ({result}) => {
+				// 	success: ({
+				// 		result
+				// 	}) => {
 				// 		console.log(result);
-				// 		if(result.code === 0){
+				// 		if (result.code === 0) {
 				// 			this.loginSuccess(result)
-				// 		}else{
+				// 		} else {
 				// 			uni.showModal({
 				// 				content: result.msg,
 				// 				showCancel: false
@@ -117,15 +138,18 @@ import mixin from '../common/login-page.mixin.js';
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
 	@import url("../common/login-page.css");
+
 	.uni-container {
 		padding: 15px;
 	}
-	.send-btn{
-		margin-top: 5px;
+
+	.send-btn {
+		margin-top: 15px;
 	}
-	.uni-container ::v-deep .uni-forms-item__label{
+
+	.uni-container ::v-deep .uni-forms-item__label {
 		width: 15px !important;
 	}
-</style>
+</style>
diff --git a/pages/ucenter/settings/settings.vue b/pages/ucenter/settings/settings.vue
index c012f431829601fba926933821b865274b6e24bf..d0c44b4a1057bcdc9fd579e6cf9a300202202ca5 100644
--- a/pages/ucenter/settings/settings.vue
+++ b/pages/ucenter/settings/settings.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<!-- 功能列表 -->
-		<uni-list class="mt10" :border="false">
+		<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 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>
@@ -34,7 +34,7 @@
 	import pushServer from './dc-push/push.js';
 	import {
 		mapMutations,
-		mapGetters,
+		mapGetters,
 		mapActions
 	} from 'vuex';
 	export default {
@@ -43,22 +43,19 @@
 				pushServer:pushServer,
 				supportMode:[],
 				pushIsOn:"wait",
-				currentLanguage:"",
-				uniToken:""
+				currentLanguage:""
 			}
 		},
 		computed: {
 			...mapGetters({
 				'userInfo': 'user/info',
 				'hasLogin': 'user/hasLogin',
-			}),
-			i18nEnable(){
-				return getApp({allowDefault: true}).globalData.config.i18n.enable
+			}),
+			i18nEnable(){
+				return getApp().globalData.config.i18n.enable
 			}
 		},
 		onLoad() {
-			this.uniToken = uni.getStorageSync('uni_id_token')
-			console.log("uniToken: ",this.uniToken);
 			this.currentLanguage = uni.getStorageSync('CURRENT_LANG') == "en"?'English':'简体中文'
 			
 			uni.setNavigationBarTitle({
@@ -87,7 +84,7 @@
 		methods: {
 			...mapActions({
 				logout: 'user/logout'
-			}),
+			}),
 			toEdit() {
 				uni.navigateTo({
 					url: '/pages/ucenter/userinfo/userinfo'
@@ -184,28 +181,21 @@
 				})
 			},
 			clickLogout() {
-				console.log("this.hasLogin:---------------- ",this.hasLogin);
 				if (this.hasLogin) {
-					this.logout()
-					uni.navigateBack();
-					// uni.showModal({
-					// 	title: this.$t('settings.tips'),
-					// 	content: this.$t('settings.exitLogin'),
-					// 	cancelText: this.$t('settings.cancelText'),
-					// 	confirmText: this.$t('settings.confirmText'),
-					// 	success: res => {
-					// 		if (res.confirm) {
-					// 			this.logout()
-					// 			uni.navigateBack();
-					// 		}
-					// 	},
-					// 	fail: (err) => {
-					// 		console.log("err: ",err);
-					// 	},
-					// 	complete: (com) => {
-					// 		console.log("com: ",com);
-					// 	}
-					// });
+					uni.showModal({
+						title: this.$t('settings.tips'),
+						content: this.$t('settings.exitLogin'),
+						cancelText: this.$t('settings.cancelText'),
+						confirmText: this.$t('settings.confirmText'),
+						success: res => {
+							if (res.confirm) {
+								this.logout()
+								uni.navigateBack();
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					});
 				} else {
 					uni.navigateTo({
 						url: '/pages/ucenter/login-page/index/index'
@@ -213,10 +203,10 @@
 				}
 			},
 			clearTmp() {
-				// uni.showLoading({
-				// 	title: this.$t('settings.clearing'),
-				// 	mask: true
-				// });
+				uni.showLoading({
+					title: this.$t('settings.clearing'),
+					mask: true
+				});
 				/*
 				任何临时存储或删除不直接影响程序运行逻辑（清除缓存必定造成业务逻辑的变化，如：打开页面的图片不从缓存中读取而从网络请求）的内容都可以视为缓存。主要有storage、和file写入。
 				缓存分为三部分		
@@ -265,17 +255,17 @@
 						if(
 							!res.tapIndex && language=='zh-Hans' || res.tapIndex && language=='en'
 						){
-							const globalData = getApp({allowDefault: true}).globalData
+							const globalData = getApp().globalData
 							if (language === 'en') {
 								language = globalData.locale = 'zh-Hans'
 							} else {
 								language = globalData.locale = 'en'
 							}
 							uni.setStorageSync('CURRENT_LANG', language)
-							getApp({allowDefault: true}).globalData.$i18n.locale = language
-							this.currentLanguage = res.tapIndex?'简体中文':'English'
-							if(uni.setLocale){
-								uni.setLocale(language)
+							getApp().globalData.$i18n.locale = language
+							this.currentLanguage = res.tapIndex?'简体中文':'English'
+							if(uni.setLocale){
+								uni.setLocale(language)
 							}
 							uni.reLaunch({
 								url: '/pages/list/list',
diff --git a/pages/ucenter/ucenter.test.js b/pages/ucenter/ucenter.test.js
index dc0738e21e39aa8291b65f9a5f2e46dd82c441ba..3f281baa9d19f6ab8c222b33028beffe3551b2f3 100644
--- a/pages/ucenter/ucenter.test.js
+++ b/pages/ucenter/ucenter.test.js
@@ -5,7 +5,7 @@ describe('pages/ucenter/ucenter.vue', () => {
 		page = await program.switchTab('/pages/ucenter/ucenter')
 		await page.waitFor(300)
 	})
-
+	
 	it('宫格', async () => {
 		const getGrid = await page.data('gridList')
 		// console.log("getGrid: ",getGrid);
@@ -19,10 +19,11 @@ describe('pages/ucenter/ucenter.vue', () => {
 	})
 	
 
-	it('普通签到', async () => {
+	/* it('普通签到', async () => {
 
-		
+		console.log("process.env.UNI_PLATFORM: ",process.env.UNI_PLATFORM);
 		if (process.env.UNI_PLATFORM === "h5" || process.env.UNI_PLATFORM === "mp-weixin") {
+			console.log('mp-h5');
 			await page.callMethod('signIn')
 			await page.waitFor(300)
 			await program.screenshot({
@@ -32,6 +33,7 @@ describe('pages/ucenter/ucenter.vue', () => {
 		
 		
 		if (process.env.UNI_PLATFORM === "app-plus") {
+			console.log('app');
 			const signInByAdRes = await page.callMethod('signInByAd')
 			
 			await page.waitFor(300)
@@ -43,7 +45,7 @@ describe('pages/ucenter/ucenter.vue', () => {
 			})
 			
 		}
-	})
+	}) */
 
 	it('我的积分', async () => {
 		// expect.assertions(1);
@@ -53,12 +55,11 @@ describe('pages/ucenter/ucenter.vue', () => {
 		console.log("getScoreRes: ", getScoreRes);
 		if (getScoreRes) {
 			console.log("今日已签到");
-			expect(getScoreRes.score).not.toBeUndefined();
-			expect(getScoreRes.balance).toBeGreaterThanOrEqual(getScoreRes.score);
+			// expect(getScoreRes.score).not.toBeUndefined();
+			// expect(getScoreRes.balance).toBeGreaterThanOrEqual(getScoreRes.score);
 		} else {
 			console.log("签到失败");
 		}
 	})
 
-
 })
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 23e02c73fc2eedc7a396abf4ffdc7a58381631f2..21a375ed6a459adc66901624e491769966f58e73 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -2,7 +2,8 @@
 	<view class="center">
 		<uni-sign-in ref="signIn"></uni-sign-in>
 		<view class="userInfo" @click.capture="toUserInfo">
-			<cloud-image width="150rpx" height="150rpx" v-if="userInfo.avatar_file&&userInfo.avatar_file.url" :src="userInfo.avatar_file.url"></cloud-image>
+			<cloud-image width="150rpx" height="150rpx" v-if="userInfo.avatar_file&&userInfo.avatar_file.url"
+				:src="userInfo.avatar_file.url"></cloud-image>
 			<image v-else class="logo-img" src="@/static/uni-center/defaultAvatarUrl.png"></image>
 			<view class="logo-title">
 				<text class="uer-name" v-if="hasLogin">{{userInfo.nickname||userInfo.username||userInfo.mobile}}</text>
@@ -37,16 +38,18 @@
 	} 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-PLUS
+	// #ifdef APP
 	import UniShare from '@/uni_modules/uni-share/js_sdk/uni-share.js';
 	const uniShare = new UniShare()
 	// #endif
 	const db = uniCloud.database();
 	export default {
-		// #ifdef APP-PLUS
-		onBackPress({from}) {
-			if(from=='backbutton'){
-				this.$nextTick(function(){
+		// #ifdef APP
+		onBackPress({
+			from
+		}) {
+			if (from == 'backbutton') {
+				this.$nextTick(function() {
 					uniShare.hide()
 				})
 				return uniShare.isShow;
@@ -94,7 +97,7 @@
 						},
 						//#endif
 						{
-							"title":this.$t('mine.readArticles'),
+							"title": this.$t('mine.readArticles'),
 							"to": '/pages/ucenter/read-news-log/read-news-log',
 							"icon": "flag"
 						},
@@ -136,28 +139,22 @@
 						"style": "solid", // 边框样式
 						"radius": "100%" // 边框圆角，支持百分比
 					}
-				},
-				uniToken:""
+				}
 			}
 		},
-		async onLoad() {
-			// const loginRes = await pwdLogin()
-			// console.log(loginRes,'-------------');
-			// this.uniToken = loginRes.token
+		onLoad() {
+			this.uniToken = uni.getStorageSync('uni_id_token')
+			console.log("uniToken: ", this.uniToken);
 			// console.log(313,this.userInfo,this.hasLogin);
-			
 			//#ifdef APP-PLUS
-			console.log(this.appVersion,"this.appVersion--------");
 			this.ucenterList[this.ucenterList.length - 2].unshift({
-				title:this.$t('mine.checkUpdate'),// this.this.$t('mine.checkUpdate')"检查更新"
+				title: this.$t('mine.checkUpdate'), // this.this.$t('mine.checkUpdate')"检查更新"
 				rightText: this.appVersion.version + '-' + this.appVersion.versionCode,
 				event: 'checkVersion',
 				icon: 'loop',
 				showBadge: this.appVersion.hasNew
 			})
 			//#endif
-			this.uniToken = uni.getStorageSync('uni_id_token')
-			console.log("uniToken: ",this.uniToken);
 		},
 		computed: {
 			...mapGetters({
@@ -167,7 +164,7 @@
 			// #ifdef APP-PLUS
 			,
 			appVersion() {
-				return getApp({allowDefault: true}).appVersion
+				return getApp().appVersion
 			}
 			// #endif
 			,
@@ -187,7 +184,7 @@
 			signIn() { //普通签到
 				this.$refs.signIn.open()
 			},
-			signInByAd(){ //看激励视频广告签到
+			signInByAd() { //看激励视频广告签到
 				this.$refs.signIn.showRewardedVideoAd()
 			},
 			/**
@@ -218,7 +215,7 @@
 			tapGrid(index) {
 				uni.showToast({
 					// title: '你点击了，第' + (index + 1) + '个',
-					title: this.$t('mine.clicked') + " " + (index + 1) ,
+					title: this.$t('mine.clicked') + " " + (index + 1),
 					icon: 'none'
 				});
 			},
@@ -246,14 +243,13 @@
 			 * 获取积分信息
 			 */
 			async getScore() {
-				console.log("this.userInfo:------------- ",this.userInfo);
 				if (!this.userInfo) return uni.showToast({
 					title: this.$t('mine.checkScore'),
 					icon: 'none'
 				});
-				// uni.showLoading({
-				// 	mask: true
-				// })
+				uni.showLoading({
+					mask: true
+				})
 				return await db.collection("uni-id-scores")
 					.where('"user_id" == $env.uid')
 					.field('score,balance')
@@ -261,23 +257,21 @@
 					.limit(1)
 					.get()
 					.then((res) => {
-						console.log(res,"res------");
+						console.log(res);
 						const data = res.result.data[0];
-						console.log("data: ",data);
 						let msg = '';
-						msg = data ? (this.$t('mine.currentScore')+ data.balance) : this.$t('mine.noScore');
+						msg = data ? (this.$t('mine.currentScore') + data.balance) : this.$t('mine.noScore');
 						uni.showToast({
 							title: msg,
 							icon: 'none'
 						});
-						console.log("msg:---- ",msg);
 						return data
-					}).catch((reason)=>{
-						console.log(reason,'这是失败的操作');
+					}).catch((reason) => {
+						console.log(reason, '这是失败的操作');
 						return reason
-					}).finally((e)=>{
-						console.log("e:----- ",e);
-						// uni.hideLoading()
+					}).finally((e) => {
+						uni.hideLoading()
+						console.log("e: ", e);
 						return e
 					})
 			},
@@ -312,7 +306,7 @@
 					},
 					menus: [{
 							"img": "/static/app-plus/sharemenu/wechatfriend.png",
-							"text": this.$t('common').wechatFriends,
+							"text": this.$t('common.wechatFriends'),
 							"share": {
 								"provider": "weixin",
 								"scene": "WXSceneSession"
@@ -320,7 +314,7 @@
 						},
 						{
 							"img": "/static/app-plus/sharemenu/wechatmoments.png",
-							"text": this.$t('common').wechatBbs,
+							"text": this.$t('common.wechatBbs'),
 							"share": {
 								"provider": "weixin",
 								"scene": "WXSceneTimeline"
@@ -328,7 +322,7 @@
 						},
 						{
 							"img": "/static/app-plus/sharemenu/weibo.png",
-							"text": this.$t('common').weibo,
+							"text": this.$t('common.weibo'),
 							"share": {
 								"provider": "sinaweibo"
 							}
@@ -342,16 +336,16 @@
 						},
 						{
 							"img": "/static/app-plus/sharemenu/copyurl.png",
-							"text": this.$t('common').copy,
+							"text": this.$t('common.copy'),
 							"share": "copyurl"
 						},
 						{
 							"img": "/static/app-plus/sharemenu/more.png",
-							"text": this.$t('common').more,
+							"text": this.$t('common.more'),
 							"share": "shareSystem"
 						}
 					],
-					cancelText: this.$t('common').cancelShare,
+					cancelText: this.$t('common.cancelShare'),
 				}, e => { //callback
 					console.log(e);
 				})
@@ -372,6 +366,7 @@
 	page {
 		background-color: #f8f8f8;
 	}
+
 	/* #endif*/
 
 	.center {
@@ -381,7 +376,6 @@
 	}
 
 	.userInfo {
-		width: 750rpx;
 		padding: 20rpx;
 		padding-top: 50px;
 		background-image: url(../../static/uni-center/headers.png);
@@ -426,7 +420,7 @@
 	}
 
 	.uni-grid .text {
-		font-size: 30rpx;
+		font-size: 16px;
 		height: 25px;
 		line-height: 25px;
 		color: #817f82;
@@ -474,4 +468,4 @@
 		/* #endif */
 		background-color: #DD524D;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/ucenter/userinfo/bind-mobile/bind-mobile.vue b/pages/ucenter/userinfo/bind-mobile/bind-mobile.vue
index 66dcef633ab483d2c1da06d8cf5cfc34b0dae8ab..8264b595d9a5c1f02e514e6d676198ee90288ace 100644
--- a/pages/ucenter/userinfo/bind-mobile/bind-mobile.vue
+++ b/pages/ucenter/userinfo/bind-mobile/bind-mobile.vue
@@ -1,16 +1,18 @@
 <template>
-	<view class="box">
+	<view class="uni-content">
 		<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
-		<uni-easyinput clearable focus type="number" class="input-box" :inputBorder="false" v-model="formData.phone"
-			maxlength="11" :placeholder="$t('common.phonePlaceholder')"></uni-easyinput>
+		<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.phone"></uni-send-sms-code>
+				<uni-send-sms-code ref="shortCode" code-type="bind" :phone="formData.mobile"></uni-send-sms-code>
 			</template>
 		</uni-easyinput>
-		<button class="send-btn-box" :disabled="!canSubmit" :type="canSubmit?'primary':'default'"
-			@click="submit">{{$t('common.submit')}}</button>
+		<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>
@@ -23,26 +25,22 @@
 			return {
 				currenPhoneArea: '',
 				formData: {
-					phone:"",
-					code:""
+					phone: "",
+					code: "",
+					captcha: false
 				}
 			}
 		},
 		computed: {
 			tipText() {
-				return this.$t('common.verifyCodeSend')+ `${this.currenPhoneArea} ${this.formData.phone}。` + this.$t('common.passwordDigits')
+				return "验证码已通过短信发送至" + `${this.currenPhoneArea} ${this.formData.mobile}。` + "密码为6 - 20位"
 			},
 			canSubmit() {
-				return true//this.isPhone() && this.isCode();
+				return this.isPhone() && this.isCode();
 			}
 		},
-		onLoad(event) {
-			uni.setNavigationBarTitle({
-				title:this.$t('bindMobile.navigationBarTitle')
-			})
-		},
-		onReady() {
-		},
+		onLoad(event) {},
+		onReady() {},
 		methods: {
 			...mapMutations({
 				setUserInfo: 'user/login'
@@ -53,54 +51,80 @@
 			async submit() {
 				console.log(this.formData);
 				return await uniCloud.callFunction({
-					name:'uni-id-cf',
+					name: 'uni-id-cf',
 					data: {
 						action: 'bindMobileBySms',
-						params: {
-							"mobile": this.formData.phone,
-							"code": this.formData.code
-						},
-					}
+						params: this.formData
+					},
 				}).then(({result})=>{
 					console.log(result);
-					this.setUserInfo({"mobile":result.mobile})
 					uni.showToast({
-						title: result.msg||'完成',
+						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()
 					}
 					return result
-				}).catch((reason)=>{
-					console.log(reason,'reason----');
-					return reason
+				}).catch((reason)=>{
+					console.log(reason,'reason----');
+					return reason
 				})
-				// uniCloud.callFunction({
-				// 	name:'uni-id-cf',
-				// 	data:{
-				// 		action:'bindMobileBySms',
-				// 		params:{
-				// 			"mobile": this.formData.phone,
-				// 			"code": this.formData.code
-				// 		},
-				// 	},
-				// 	success: ({result}) => {
-				// 		console.log(result);
-				// 		this.setUserInfo({"mobile":result.mobile})
-				// 		uni.showToast({
-				// 			title: result.msg,
-				// 			icon: 'none'
-				// 		});
-				// 		if (result.code === 0) {
-				// 			uni.navigateBack()
-				// 		}
-				// 	}
-				// })
+				
+				/* 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.phone);
+				let isPhone = reg_phone.test(this.formData.mobile);
 				return isPhone;
 			},
 			isCode() {
@@ -113,17 +137,18 @@
 </script>
 
 <style>
-	.box {
+	.uni-content {
+		padding: 0;
 		align-items: center;
 		justify-content: center;
 		padding: 50rpx;
 		padding-top: 10px;
 	}
-/* #ifndef APP-NVUE  || VUE3 */
-	.box /deep/ .uni-easyinput__content {
-		height: 50px;
-	}
-/* #endif */
+
+	/* #ifndef APP-NVUE  || VUE3 */
+	.uni-content /deep/ .uni-easyinput__content {}
+
+	/* #endif */
 	.input-box {
 		width: 100%;
 		margin-top: 16px;
@@ -131,10 +156,10 @@
 		border-radius: 6rpx;
 		flex-direction: row;
 		flex-wrap: nowrap;
+		margin-bottom: 10px;
 	}
 
 	.send-btn-box {
-		width: 650rpx;
 		margin-top: 15px;
 	}
-</style>
+</style>
diff --git a/pages/ucenter/userinfo/userinfo.vue b/pages/ucenter/userinfo/userinfo.vue
index e107f3cfaba47bd718290aeed18caa315ef6ff50..00a61044bec7b7aa01ffe17a1af7a0aed0bc0816 100644
--- a/pages/ucenter/userinfo/userinfo.vue
+++ b/pages/ucenter/userinfo/userinfo.vue
@@ -6,21 +6,21 @@
 					<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>
+						<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-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>
+		</uni-popup>
+		<uni-bindMobileByMpWeixin ref="uni-bindMobileByMpWeixin"></uni-bindMobileByMpWeixin>
 	</view>
 </template>
 <script>
@@ -40,15 +40,13 @@
 					otherLoginButton: {
 						"title": "其他号码绑定",
 					}
-				},
-				uniToken:''
+				}
 			}
-		},
+		},
 		onLoad() {
 			this.uniToken = uni.getStorageSync('uni_id_token')
-			console.log("uniToken: ",this.uniToken);
-			
-			this.univerifyStyle.authButton.title = this.$t('userinfo.bindPhoneNumber')
+			console.log("uniToken: ",this.uniToken);
+			this.univerifyStyle.authButton.title = this.$t('userinfo.bindPhoneNumber')
 			this.univerifyStyle.otherLoginButton.title = this.$t('userinfo.bindOtherLogin')
 			uni.setNavigationBarTitle({
 				title: this.$t('userinfo.navigationBarTitle')
@@ -58,17 +56,17 @@
 			...mapGetters({
 				userInfo: 'user/info',
 				login: 'user/hasLogin'
-			}),
+			}),
 			avatar_file() {
-				if (this.userInfo.avatar_file && this.userInfo.avatar_file.url) {
+				if (this.userInfo.avatar_file && this.userInfo.avatar_file.url) {
 					return this.userInfo.avatar_file
 				}
 			}
-		},
-		methods: {
+		},
+		methods: {
 			...mapMutations({
 				setUserInfo: 'user/login'
-			}),
+			}),
 			bindMobile() {
 				// #ifdef APP-PLUS
 				uni.preLogin({
@@ -80,13 +78,13 @@
 						this.bindMobileBySmsCode()
 					}
 				})
-				// #endif
+				// #endif
+				
+				// #ifdef MP-WEIXIN
+				this.$refs['uni-bindMobileByMpWeixin'].open()
+				// #endif
 				
-				// #ifdef MP-WEIXIN
-				this.$refs['uni-bindMobileByMpWeixin'].open()
-				// #endif
-				
-				// #ifdef H5
+				// #ifdef H5
 					//...去用验证码绑定
 				this.bindMobileBySmsCode()
 				// #endif
@@ -132,40 +130,34 @@
 					}
 				})
 			},
-			bindMobileBySmsCode() {
+			bindMobileBySmsCode() {
 				uni.navigateTo({
-					url: '/pages/ucenter/userinfo/bind-mobile/bind-mobile',
-					complete: (res) => {
-						console.log("res: ",res);
-					}
+					url: '/pages/ucenter/userinfo/bind-mobile/bind-mobile'
 				})
 			},
 			async setNickname(nickname) {
 				console.log(nickname);
 				if (nickname) {
-					return await usersTable.where('_id==$env.uid').update({
-						nickname
-					}).then(e => {
-						console.log(e.result,"e.result---------");
+					return await 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'
-							// });
+							uni.showToast({
+								title:this.$t('common.updateSucceeded'),
+								icon: 'none'
+							});
 							this.setUserInfo({
 								nickname
 							});
 						} else {
-							// uni.showToast({
-							// 	title: this.$t('userinfo.noChange'),
-							// 	icon: 'none'
-							// });
+							uni.showToast({
+								title: this.$t('userinfo.noChange'),
+								icon: 'none'
+							});
 						}
 						return e.result
-					})
-					.catch((reason)=>{
-						console.log(reason,'reason----');
-						return reason
+					}).catch((reason)=>{
+						console.log(reason,'reason----');
+						return reason
 					})
 					this.$refs.dialog.close()
 				} else {
@@ -287,10 +279,10 @@
 
 	.chooseAvatar {
 		border: dotted 1px #ddd;
-		border-radius: 10px;
+		border-radius: 10px;
 		text-align: center;
 		width: 50px;
 		height: 50px;
 		line-height: 50px;
 	}
-</style>
+</style>
diff --git a/static/screenshot/about-app.png b/static/screenshot/about-app.png
index f2bc027737ce26591fc6af20d6539ef18ff0e60c..ecb3ebf454bed012abf190734b84aa681a852af7 100644
Binary files a/static/screenshot/about-app.png and b/static/screenshot/about-app.png differ
diff --git a/static/screenshot/about-h5.png b/static/screenshot/about-h5.png
index 77b68c17bf38b2288c29fa1162edb0989c03c8b4..a27efbacf8d4ec584cd1e2c4cf6b098c14742134 100644
Binary files a/static/screenshot/about-h5.png and b/static/screenshot/about-h5.png differ
diff --git a/static/screenshot/sign-h5.png b/static/screenshot/sign-h5.png
index 2e3ddb85dd4596f99cf4b5a85f3c90a1cb9d0828..a696db0f6db1bc95f451b73669b7763821577f16 100644
Binary files a/static/screenshot/sign-h5.png and b/static/screenshot/sign-h5.png differ
diff --git a/static/uni-center/headers.png b/static/uni-center/headers.png
index 0a8a4ad2bd55122db45c0de819b85da87df4f50f..4233e82cf1ef1d850dc9c3772ecde21836f78bfc 100644
Binary files a/static/uni-center/headers.png and b/static/uni-center/headers.png differ
diff --git a/uni-starter.config.js b/uni-starter.config.js
index ce5a744081d563e30178bfa02d92e3b1995b4386..22dab4f014a90653a51df7186eac2c34822c6a46 100644
--- a/uni-starter.config.js
+++ b/uni-starter.config.js
@@ -1,8 +1,10 @@
 //这是应用的配置页面，App.vue挂载到getApp().globalData.config
 export default {
+	//是否打开调试模式
+	"debug":false,
 	"h5": {
 		"url": "https://uni-starter.dcloud.net.cn", //	前端网页托管的域名	
-		// 在h5端全局悬浮引导用户下载app的功能 更多自定义要求在/common/openApp.js中修改	
+		 // 在h5端全局悬浮引导用户下载app的功能 更多自定义要求在/common/openApp.js中修改	
 		// "openApp": { //如不需要本功能直接移除本节点即可	
 		// 	//点击悬浮下载栏后打开的网页链接
 		// 	"openUrl": '/#/pages/ucenter/invite/invite',
@@ -28,11 +30,10 @@ export default {
 				2.visitor：白名单模式。枚举游客可访问的页面。
 			* 注意：黑名单与白名单模式二选一
 		*/
-		"needLogin": [{
-				pattern: /^\/pages\/list.*/
-			}, //支持正则表达式
-			// "/uni_modules/uni-news-favorite/pages/uni-news-favorite/list",
-			// "/uni_modules/uni-feedback/pages/uni-feedback/add"
+		"needLogin" : [
+		 	{pattern:/^\/pages\/list.*/},	//支持正则表达式
+				// "/uni_modules/uni-news-favorite/pages/uni-news-favorite/list",
+				// "/uni_modules/uni-feedback/pages/uni-feedback/add"
 		],
 		// "visitor" : [
 		// 	"/",//注意入口页必须直接写 "/"
@@ -44,14 +45,12 @@ export default {
 		// 	"/pages/ucenter/about/about",
 		// 	"/pages/ucenter/settings/settings"
 		// ],
-
 		/*
 		login:配置登录类型与优先级
 			未列举到的，或设备环境不支持的选项，将被隐藏。如果你需要在不同平台有不同的配置，直接用条件编译即可
 			根据数组的第0项，决定登录方式的第一优先级。
 		*/
 		"login": ["username", "univerify", "weixin", "smsCode", "apple"],
-		// "login": ["univerify"]
 	},
 	//关于应用
 	"about": {
@@ -65,30 +64,30 @@ export default {
 		"slogan": "云端一体应用快速开发模版",
 		//政策协议
 		"agreements": [{
-				"title": "用户服务条款", // 为了多语言国际化请在 lang/en.js 和 lang/zh-Hans.js中配置", 
+				"title": "用户服务协议", //如果开启了多语言国际化，本配置将失效。请在 lang/en.js 和 lang/zh-Hans.js中配置
 				"url": "https://ask.dcloud.net.cn/protocol.html" //对应的网络链接
 			},
 			{
-				"title": "隐私政策", //为了多语言国际化请在 lang/en.js 和 lang/zh-Hans.js中配置
-				"url": "https://ask.dcloud.net.cn/protocol.html"
+				"title": "隐私政策", //如果开启了多语言国际化，本配置将失效。请在 lang/en.js 和 lang/zh-Hans.js中配置
+				"url": "https://ask.dcloud.net.cn/protocol.html" //对应的网络链接
 			}
 		],
 		//应用的链接，用于分享到第三方平台和生成关于我们页的二维码
 		"download": "",
 		//version
-		"version": "1.0.0" //用于非app端显示，app端自动获取
+		"version":"1.0.0" //用于非app端显示，app端自动获取
 	},
-	"download": { //用于生成二合一下载页面
-		"ios": "https://itunes.apple.com/cn/app/hello-uni-app/id1417078253?mt=8",
-		"android": "https://vkceyugu.cdn.bspapp.com/VKCEYUGU-97fca9f2-41f6-449f-a35e-3f135d4c3875/6d754387-a6c3-48ed-8ad2-e8f39b40fc01.apk"
+	"download":{ //用于生成二合一下载页面
+		"ios":"https://itunes.apple.com/cn/app/hello-uni-app/id1417078253?mt=8",
+		"android":"https://vkceyugu.cdn.bspapp.com/VKCEYUGU-97fca9f2-41f6-449f-a35e-3f135d4c3875/6d754387-a6c3-48ed-8ad2-e8f39b40fc01.apk"
 	},
 	//用于打开应用市场评分界面
-	"marketId": {
-		"ios": "id1417078253",
-		"android": "123456"
+	"marketId":{
+		"ios":"id1417078253",
+		"android":"123456"
 	},
 	//配置多语言国际化。i18n为英文单词 internationalization的首末字符i和n，18为中间的字符数 是“国际化”的简称
-	"i18n": {
-		"enable": false //默认关闭，国际化。如果你想使用国际化相关功能，请改为true
+	"i18n":{
+		"enable":false //默认关闭，国际化。如果你想使用国际化相关功能，请改为true
 	}
-}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-badge/changelog.md b/uni_modules/uni-badge/changelog.md
index 4ca8c5b477a3f996a515460a986c96c6bf63d4ef..544ecc135b69587852ea7708654345908f9f83bc 100644
--- a/uni_modules/uni-badge/changelog.md
+++ b/uni_modules/uni-badge/changelog.md
@@ -1,3 +1,10 @@
+## 1.2.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-badge](https://uniapp.dcloud.io/component/uniui/uni-badge)
+## 1.1.7（2021-11-08）
+- 优化 升级ui
+- 修改 size 属性默认值调整为 small
+- 修改 type 属性，默认值调整为 error，info 替换 default
 ## 1.1.6（2021-09-22）
 - 修复 在字节小程序上样式不生效的 bug
 ## 1.1.5（2021-07-30）
diff --git a/uni_modules/uni-badge/components/uni-badge/uni-badge.vue b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
index cbd8548cb7c1180702e32855e6a9e7fbf9ec150c..5e11cc693d32f4d7d30a46654d24fcd2f6c73e2f 100644
--- a/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
+++ b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
@@ -2,8 +2,7 @@
 	<view class="uni-badge--x">
 		<slot />
 		<text v-if="text" :class="classNames" :style="[badgeWidth, positionStyle, customStyle, dotStyle]"
-			class="uni-badge"
-			@click="onClick()">{{displayValue}}</text>
+			class="uni-badge" @click="onClick()">{{displayValue}}</text>
 	</view>
 </template>
 
@@ -13,26 +12,33 @@
 	 * @description 数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21
 	 * @property {String} text 角标内容
-	 * @property {String} type = [default|primary|success|warning|error] 颜色类型
-	 * 	@value default 灰色
+	 * @property {String} size = [normal|small] 角标内容
+	 * @property {String} type = [info|primary|success|warning|error] 颜色类型
+	 * 	@value info 灰色
 	 * 	@value primary 蓝色
 	 * 	@value success 绿色
 	 * 	@value warning 黄色
 	 * 	@value error 红色
-	 * @property {String} size = [normal|small] Badge 大小
-	 * 	@value normal 一般尺寸
-	 * 	@value small 小尺寸
 	 * @property {String} inverted = [true|false] 是否无需背景颜色
+	 * @property {Number} maxNum 展示封顶的数字值，超过 99 显示 99+
+	 * @property {String} absolute = [rightTop|rightBottom|leftBottom|leftTop] 开启绝对定位, 角标将定位到其包裹的标签的四角上		
+	 * 	@value rightTop 右上
+	 * 	@value rightBottom 右下
+	 * 	@value leftTop 左上
+	 * 	@value leftBottom 左下
+	 * @property {Array[number]} offset	距定位角中心点的偏移量，只有存在 absolute 属性时有效，例如：[-10, -10] 表示向外偏移 10px，[10, 10] 表示向 absolute 指定的内偏移 10px
+	 * @property {String} isDot = [true|false] 是否显示为一个小点
 	 * @event {Function} click 点击 Badge 触发事件
 	 * @example <uni-badge text="1"></uni-badge>
 	 */
+
 	export default {
 		name: 'UniBadge',
-		emits:['click'],
+		emits: ['click'],
 		props: {
 			type: {
 				type: String,
-				default: 'default'
+				default: 'error'
 			},
 			inverted: {
 				type: Boolean,
@@ -62,7 +68,7 @@
 			},
 			size: {
 				type: String,
-				default: 'normal'
+				default: 'small'
 			},
 			customStyle: {
 				type: Object,
@@ -136,10 +142,14 @@
 					height: '10px',
 					borderRadius: '10px'
 				}
-			},
-			displayValue() {
-				const { isDot, text, maxNum } = this
-				return isDot ? '' : (Number(text) > maxNum ? `${maxNum}+` : text)
+			},
+			displayValue() {
+				const {
+					isDot,
+					text,
+					maxNum
+				} = this
+				return isDot ? '' : (Number(text) > maxNum ? `${maxNum}+` : text)
 			}
 		},
 		methods: {
@@ -151,9 +161,15 @@
 </script>
 
 <style lang="scss" scoped>
+	$uni-primary: #2979ff !default;
+	$uni-success: #4cd964 !default;
+	$uni-warning: #f0ad4e !default;
+	$uni-error: #dd524d !default;
+	$uni-info: #909399 !default;
+
+
 	$bage-size: 12px;
 	$bage-small: scale(0.8);
-	$bage-height: 20px;
 
 	.uni-badge--x {
 		/* #ifdef APP-NVUE */
@@ -169,6 +185,11 @@
 		position: absolute;
 	}
 
+	.uni-badge--small {
+		transform: $bage-small;
+		transform-origin: center center;
+	}
+
 	.uni-badge {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -177,77 +198,71 @@
 		/* #endif */
 		justify-content: center;
 		flex-direction: row;
-		height: $bage-height;
-		line-height: $bage-height;
-		color: $uni-text-color;
+		height: 20px;
+		line-height: 18px;
+		color: #fff;
 		border-radius: 100px;
-		background-color: $uni-bg-color-hover;
+		background-color: $uni-info;
 		background-color: transparent;
+		border: 1px solid #fff;
 		text-align: center;
 		font-family: 'Helvetica Neue', Helvetica, sans-serif;
 		font-size: $bage-size;
 		/* #ifdef H5 */
+		z-index: 999;
 		cursor: pointer;
 		/* #endif */
-	}
 
-	.uni-badge--inverted {
-		padding: 0 5px 0 0;
-		color: $uni-bg-color-hover;
-	}
+		&--info {
+			color: #fff;
+			background-color: $uni-info;
+		}
 
-	.uni-badge--default {
-		color: $uni-text-color;
-		background-color: $uni-bg-color-hover;
-	}
+		&--primary {
+			background-color: $uni-primary;
+		}
 
-	.uni-badge--default-inverted {
-		color: $uni-text-color-grey;
-		background-color: transparent;
-	}
+		&--success {
+			background-color: $uni-success;
+		}
 
-	.uni-badge--primary {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-primary;
-	}
+		&--warning {
+			background-color: $uni-warning;
+		}
 
-	.uni-badge--primary-inverted {
-		color: $uni-color-primary;
-		background-color: transparent;
-	}
+		&--error {
+			background-color: $uni-error;
+		}
 
-	.uni-badge--success {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-success;
-	}
+		&--inverted {
+			padding: 0 5px 0 0;
+			color: $uni-info;
+		}
 
-	.uni-badge--success-inverted {
-		color: $uni-color-success;
-		background-color: transparent;
-	}
+		&--info-inverted {
+			color: $uni-info;
+			background-color: transparent;
+		}
 
-	.uni-badge--warning {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-warning;
-	}
+		&--primary-inverted {
+			color: $uni-primary;
+			background-color: transparent;
+		}
 
-	.uni-badge--warning-inverted {
-		color: $uni-color-warning;
-		background-color: transparent;
-	}
+		&--success-inverted {
+			color: $uni-success;
+			background-color: transparent;
+		}
 
-	.uni-badge--error {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-error;
-	}
+		&--warning-inverted {
+			color: $uni-warning;
+			background-color: transparent;
+		}
 
-	.uni-badge--error-inverted {
-		color: $uni-color-error;
-		background-color: transparent;
-	}
+		&--error-inverted {
+			color: $uni-error;
+			background-color: transparent;
+		}
 
-	.uni-badge--small {
-		transform: $bage-small;
-		transform-origin: center center;
 	}
 </style>
diff --git a/uni_modules/uni-badge/package.json b/uni_modules/uni-badge/package.json
index 4efafd509b3489e15a5081e838f51456acfbb9a4..7ba6d2f67ebddbff45a7997e8e6c845bd65dd043 100644
--- a/uni_modules/uni-badge/package.json
+++ b/uni_modules/uni-badge/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-badge",
   "displayName": "uni-badge 数字角标",
-  "version": "1.1.6",
+  "version": "1.2.0",
   "description": "数字角标（徽章）组件，在元素周围展示消息提醒，一般用于列表、九宫格、按钮等地方。",
   "keywords": [
     "",
diff --git a/uni_modules/uni-badge/readme.md b/uni_modules/uni-badge/readme.md
index d29680be1c2da3d0e6ad943e41568f7d1161fc84..bdf175da9f759cafe6a4bc910c0e8ac0d20fcff7 100644
--- a/uni_modules/uni-badge/readme.md
+++ b/uni_modules/uni-badge/readme.md
@@ -1,58 +1,10 @@
-
-
 ## Badge 数字角标
 > **组件名：uni-badge**
 > 代码块： `uBadge`
 
-
 数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景，
 
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<uni-badge size="small" :text="100" absolute="rightBottom" type="primary">
-	<button type="default">右上</button>
-</uni-badge>
-<uni-badge text="1"></uni-badge>
-<uni-badge text="2" type="purple" @click="bindClick"></uni-badge>
-<uni-badge text="3" type="primary" :inverted="true"></uni-badge>
-
-```
-
-
-## API
-
-### Badge Props
-
-|属性名				|类型		|默认值	|说明																																														|
-|:-:					|:-:		|:-:		|:-:																																														|
-|text					|String	|-			|角标内容																																												|
-|type					|String	|default|颜色类型，可选值：default（灰色）、primary（蓝色）、success（绿色）、warning(黄色)、error(红色)|
-|size					|String	|normal	|Badge 大小，可取值：normal、small																															|
-|is-dot				|Boolean|false	|不展示数字，只有一个小点																																				|
-|max-num				|String/Numbuer|99	|展示封顶的数字值，超过 99 显示99+					|		
-|custom-style	|Object	|		{}		|自定义 Badge 样式, 样式对象语法																																|
-|inverted			|Boolean|false	|是否无需背景颜色，为 true 时，背景颜色将变为文字的字体颜色																			|
-|absolute	(不支持 nvue)	|String|	rightTop|开启绝对定位, 角标将定位到其包裹的标签的四个角上，可选值： rightTop(右上角)、rightBottom（右下角）、leftBottom（左下角）	、leftTop（左上角）	|
-|offset			|Array[number]|	[0, 0]|距定位角中心点的偏移量，[-10, -10] 表示向 absolute 指定的方向偏移 10px，[10, 10] 表示向 absolute 指定的反方向偏移 10px，只有存在 absolute 属性时有效，与absolute 的值一一对应（例如：值为rightTop， 对应 offset 为 [right, Top]）|
-
-### Badge Events
-
-|事件名	|事件说明			|返回参数	|
-|:-:	|:-:				|:-:		|
-|@click	|点击 Badge 触发事件| -			|
-
-
-
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-badge)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-## 组件示例
 
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/badge/badge](https://hellouniapp.dcloud.net.cn/pages/extUI/badge/badge)
\ No newline at end of file
diff --git a/uni_modules/uni-calendar/changelog.md b/uni_modules/uni-calendar/changelog.md
index 454f13d38cbb666310b799fa6aeec20748706b92..6df4493eb6ea268de09092e4bd1b70cc766abd91 100644
--- a/uni_modules/uni-calendar/changelog.md
+++ b/uni_modules/uni-calendar/changelog.md
@@ -1,3 +1,7 @@
+## 1.4.5（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
+## 1.4.4（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
 ## 1.4.3（2021-09-22）
 - 修复 startDate、 endDate 属性失效的 bug
 ## 1.4.2（2021-08-24）
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
index 1364c0a9d564d1bf8819c052330dcfe1c19832db..a4b96ce346a34ed1f3c07840bdad138a780e38dd 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
@@ -388,14 +388,17 @@
 	}
 
 	.uni-calendar--fixed {
-		position: fixed;
-		bottom: calc(var(--window-bottom));
+		position: fixed;
+		/* #ifdef APP-NVUE */
+		bottom: 0;
+		/* #endif */
 		left: 0;
 		right: 0;
 		transition-property: transform;
 		transition-duration: 0.3s;
 		transform: translateY(460px);
-		/* #ifndef APP-NVUE */
+		/* #ifndef APP-NVUE */
+		bottom: calc(var(--window-bottom));
 		z-index: 99;
 		/* #endif */
 	}
diff --git a/uni_modules/uni-calendar/package.json b/uni_modules/uni-calendar/package.json
index 4c9db65549e2f251bf0bc63238addffd7b30c03d..40455c8702569aa7271c4b77461a85ebdd6da2d4 100644
--- a/uni_modules/uni-calendar/package.json
+++ b/uni_modules/uni-calendar/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-calendar",
   "displayName": "uni-calendar 日历",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "日历组件",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-captcha/changelog.md b/uni_modules/uni-captcha/changelog.md
index a710020dbc70b575fc9b169f02a83fa61347edfd..703a268752ab4ae27973fe597e1e6bc75eff543d 100644
--- a/uni_modules/uni-captcha/changelog.md
+++ b/uni_modules/uni-captcha/changelog.md
@@ -1,4 +1,30 @@
-## 0.1.1（2021-03-04）
-- refresh不再读取上一条验证码状态
+## 0.6.0（2022-05-27）
+- 新增：支持在`uni-config-center`中根据场景值配置
+- 修复：弹窗式验证码，输入内容后点击取消，重新打开验证码的值仍然存在的问题
+## 0.5.2（2022-05-19）
+- 修复在Vue3的兼容问题
+## 0.5.1（2022-05-18）
+- 修复在某些情况下微信小程序端验证码显示错误的问题
+## 0.5.0（2022-05-17）
+- 新增支持在`uni-captcha-co`->`config`配置验证码
+## 0.4.1（2022-05-16）
+- 新增示例项目
+## 0.4.0（2022-05-16）
+- 集成创建、刷新、显示验证码的云端一体验证码组件
+- 云对象`uni-captcha-co`集成获取验证码的api，`getImageCaptcha`
+## 0.3.1（2022-05-13）
+- 新增  返回值符合响应体规范
+## 0.3.0（2022-05-13）
+- 新增  支持 uni-config-center 配置
+## 0.2.2（2022-04-25）
+- 修复  0.2.1 版本引起的使用 image 组件验证码不显示的Bug
+## 0.2.1（2022-04-18）
+- 更新  优化字体
+## 0.2.0（2022-04-14）
+- 新增  使用 svg 表现形式更好
+- 新增  使用字体，可以任意替换默认字体
+- 新增  支持设置字体大小
+- 新增  支持忽略某些字符
+- 注意  更新之后请重新上传公共模块
 ## 0.1.0（2021-03-01）
 - 调整为uni_modules目录规范
diff --git a/uni_modules/uni-captcha/components/uni-captcha/uni-captcha.vue b/uni_modules/uni-captcha/components/uni-captcha/uni-captcha.vue
new file mode 100644
index 0000000000000000000000000000000000000000..3d3334344d02fdfdfb6ee470b514014632681159
--- /dev/null
+++ b/uni_modules/uni-captcha/components/uni-captcha/uni-captcha.vue
@@ -0,0 +1,167 @@
+<template>
+	<view class="captcha-box">
+		<view class="captcha-img-box">
+			<uni-icons class="loding" size="20px" color="#BBB" v-if="loging" type="spinner-cycle"></uni-icons>
+			<image class="captcha-img" :class="{opacity:loging}" @click="getImageCaptcha" :src="captchaBase64"
+				mode="widthFix"></image>
+		</view>
+		<input @blur="focusCaptchaInput = false" :focus="focusCaptchaInput" type="text" class="captcha"
+			:inputBorder="false" maxlength="4" v-model="val" placeholder="请输入验证码">
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			modelValue:String,
+			value:String,
+			scene: {
+				type: String,
+				default () {
+					return ""
+				}
+			},
+			focus: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			}
+		},
+		computed:{
+			val:{
+				get(){
+					return this.value||this.modelValue
+				},
+				set(value){
+					// console.log(value);
+					// TODO 兼容 vue2
+					// #ifdef VUE2
+					this.$emit('input', value);
+					// #endif
+					
+					// TODO　兼容　vue3
+					// #ifdef VUE3
+					this.$emit('update:modelValue', value)
+					// #endif
+				}
+			}
+		},
+		data() {
+			return {
+				focusCaptchaInput: false,
+				captchaBase64: "",
+				loging: false
+			};
+		},
+		watch: {
+			scene: {
+				handler(scene) {
+					if (scene) {
+						this.getImageCaptcha(this.focus)
+					} else {
+						uni.showToast({
+							title: 'scene不能为空',
+							icon: 'none'
+						});
+					}
+				},
+				immediate:true
+			}
+		},
+		methods: {
+			getImageCaptcha(focus = true) {
+				this.loging = true
+				if (focus) {
+					this.val = ''
+					this.focusCaptchaInput = true
+				}
+				const uniIdCo = uniCloud.importObject("uni-captcha-co", {
+					customUI: true
+				})
+				uniIdCo.getImageCaptcha({
+						scene: this.scene
+					}).then(result => {
+						// console.log(result);
+						this.captchaBase64 = result.captchaBase64
+					})
+					.catch(e => {
+						uni.showToast({
+							title: e.message,
+							icon: 'none'
+						});
+					}).finally(e => {
+						this.loging = false
+					})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.captcha-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: flex-end;
+		flex: 1;
+	}
+
+	.captcha-img-box,
+	.captcha {
+		height: 44px;
+		line-height: 44px;
+	}
+
+	.captcha-img-box {
+		position: relative;
+		background-color: #FEFAE7;
+	}
+
+	.captcha {
+		background-color: #F8F8F8;
+		font-size: 14px;
+		flex: 1;
+		padding: 0 20rpx;
+		margin-left: 20rpx;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.captcha-img-box,
+	.captcha-img,
+	.loding {
+		height: 44px !important;
+		width: 100px;
+	}
+	
+	.captcha-img{
+		cursor: pointer;
+	}
+
+	.loding {
+		z-index: 9;
+		color: #bbb;
+		position: absolute;
+		text-align: center;
+		line-height: 45px;
+		animation: rotate 1s linear infinite;
+	}
+
+	.opacity {
+		opacity: 0.5;
+	}
+
+	@keyframes rotate {
+		from {
+			transform: rotate(0deg)
+		}
+
+		to {
+			transform: rotate(360deg)
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.vue b/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.vue
new file mode 100644
index 0000000000000000000000000000000000000000..64ec5b1bfec8d0d2bcd2ec627f910c783c815d63
--- /dev/null
+++ b/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.vue
@@ -0,0 +1,140 @@
+<template>
+	<uni-popup ref="popup" type="center">
+		<view class="popup-captcha">
+			<view class="content">
+				<text class="title">{{title}}</text>
+				<uni-captcha :focus="focus" :scene="scene" v-model="val"></uni-captcha>
+			</view>
+			<view class="button-box">
+				<view @click="close" class="btn">取消</view>
+				<view @click="confirm" class="btn confirm">确认</view>
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				focus: false
+			}
+		},
+		props: {
+			modelValue:String,
+			value:String,
+			scene: {
+				type: String,
+				default () {
+					return ""
+				}
+			},
+			title: {
+				type: String,
+				default () {
+					return ""
+				}
+			},
+		},
+		computed:{
+			val:{
+				get(){
+					return this.value||this.modelValue
+				},
+				set(value){
+					// console.log(value);
+					// TODO 兼容 vue2
+					// #ifdef VUE2
+					this.$emit('input', value);
+					// #endif
+					
+					// TODO　兼容　vue3
+					// #ifdef VUE3
+					this.$emit('update:modelValue', value)
+					// #endif
+				}
+			}
+		},
+		methods: {
+			open() {
+				this.focus = true
+				this.val = ""
+				this.$refs.popup.open()
+			},
+			close() {
+				this.focus = false
+				this.$refs.popup.close()
+			},
+			confirm() {
+				if(!this.val||this.val.length < 4){
+					return uni.showToast({
+						title: '请填写验证码',
+						icon: 'none'
+					});
+				}
+				this.close()
+				this.$emit('confirm')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/* #ifndef APP-NVUE */
+	view {
+		display: flex;
+		flex-direction: column;
+	}
+
+	/* #endif */
+	.popup-captcha {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		max-width: 600px;
+		/* #endif */
+		width: 600rpx;
+		padding-bottom: 0;
+		background-color: #FFF;
+		border-radius: 10px;
+		flex-direction: column;
+		position: relative;
+	}
+
+	.popup-captcha .content {
+		padding: 1.3em 0.8em;
+	}
+
+	.popup-captcha .title {
+		text-align: center;
+		word-wrap: break-word;
+		word-break: break-all;
+		white-space: pre-wrap;
+		font-weight: 400;
+		font-size: 18px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		color: #111;
+		margin-bottom: 15px;
+	}
+
+	.button-box {
+		height: 44px;
+		border-top: solid 1px #eee;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-around;
+	}
+	.button-box ,.btn{
+		height: 44px;
+		line-height: 44px;
+	}
+	.button-box .btn{
+		flex: 1;
+		margin: 1px;
+		text-align: center;
+	}
+	.button-box .confirm{
+		color: #007aff;
+		border-left: solid 1px #eee;
+	}
+</style>
diff --git a/uni_modules/uni-captcha/package.json b/uni_modules/uni-captcha/package.json
index 7245ea0fc88f8725eace8210063c393e6d373961..1a147798fed2856994f64b418432ac45dfdfc1ff 100644
--- a/uni_modules/uni-captcha/package.json
+++ b/uni_modules/uni-captcha/package.json
@@ -1,8 +1,8 @@
 {
   "id": "uni-captcha",
   "displayName": "uni-captcha",
-  "version": "0.1.1",
-  "description": "简洁、高效、灵活可配置的云端验证码模块",
+  "version": "0.6.0",
+  "description": "云端一体图形验证码组件",
   "keywords": [
     "uniCloud",
     "captcha",
@@ -73,6 +73,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
         }
       }
     }
diff --git a/uni_modules/uni-captcha/readme.md b/uni_modules/uni-captcha/readme.md
index 295d852f7646fb801eefa88dfdb4dddac6b14cbe..d929f633b9698b2170088fa85b572884eea7d77d 100644
--- a/uni_modules/uni-captcha/readme.md
+++ b/uni_modules/uni-captcha/readme.md
@@ -1,92 +1,3 @@
-## uni 验证码验证文档
-
-> 用途：主要使用在登录、需要人机校验或其他限制调用的场景
-
-> 验证码生成、校验都在服务端。页面使用返回的 base64 显示。[云端一体登陆模板](https://ext.dcloud.net.cn/plugin?id=13)已集成，可下载体验。
-
-> 数据表使用[opendb-verify-codes](https://gitee.com/dcloud/opendb/blob/master/collection/opendb-verify-codes/collection.json)
-
-### 获取验证码@create
-
-用法：`uniCaptcha.create(Object params);`
-
-**参数说明**
-
-| 字段            | 类型   | 必填 | 默认值  | 说明                                            |
-| --------------- | ------ | ---- | ------- | ----------------------------------------------- |
-| scene           | String | 是   | 4       | 使用场景值，用于防止不同功能的验证码混用        |
-| deviceId        | String | -    | -       | 设备 id，如果不传，将自动从 uniCloud 上下文获取 |
-| width           | Number | -    | 100     | 图片宽度                                        |
-| height          | Number | -    | 40      | 图片高度                                        |
-| backgroundColor | String | -    | #FFFAE8 | 验证码背景色                                    |
-| size            | Number | -    | 4       | 验证码长度，最多 6 个字符                       |
-| noise           | Number | -    | 4       | 验证码干扰线条数                                |
-| expiresDate     | Number | -    | 180     | 验证码过期时间(s)                               |
-
-**响应参数**
-
-| 字段          | 类型   | 说明                |
-| ------------- | ------ | ------------------- |
-| code          | Number | 错误码，0 表示成功  |
-| message       | String | 详细信息            |
-| captchaBase64 | String | 验证码：base64 格式 |
-
-`注意：`
-
-- 重新生成后，上条验证码作废
-
-### 校验验证码@verify
-
-用法：`uniCaptcha.verify(Object params);`
-
-**参数说明**
-
-| 字段     | 类型   | 必填 | 默认值 | 说明                                            |
-| -------- | ------ | ---- | ------ | ----------------------------------------------- |
-| scene    | String | 是   | -      | 类型，用于防止不同功能的验证码混用              |
-| captcha  | String | 是   | -      | 验证码                                          |
-| deviceId | String | -    | -      | 设备 id，如果不传，将自动从 uniCloud 上下文获取 |
-
-**响应参数**
-
-| 字段    | 类型   | 说明               |
-| ------- | ------ | ------------------ |
-| code    | Number | 错误码，0 表示成功 |
-| message | String | 详细信息           |
-
-`注意：`
-
-- 若提示验证码失效，请重新获取
-
-### 刷新验证码@refresh
-
-用法：`uniCaptcha.refresh(Object params);`
-
-**参数说明**
-
-| 字段     | 类型   | 必填 | 默认值 | 说明                                            |
-| -------- | ------ | ---- | ------ | ----------------------------------------------- |
-| scene    | String | 是   | -      | 类型，用于防止不同功能的验证码混用              |
-| deviceId | String | -    | -      | 设备 id，如果不传，将自动从 uniCloud 上下文获取 |
-
-**响应参数**
-
-| 字段          | 类型   | 说明                |
-| ------------- | ------ | ------------------- |
-| code          | Number | 错误码，0 表示成功  |
-| message       | String | 详细信息            |
-| captchaBase64 | String | 验证码：base64 格式 |
-
-`注意：`
-
-- 支持传入 create 方法的所有参数，如果不传，则自动按照 deviceId 匹配上次生成时的配置生成新的验证码
-
-## 错误码
-
-_详细信息请查看 message 中查看_
-
-|  模块  | 模块码 | 错误代码 |        错误信息         |
-| :----: | :----: | :------: | :---------------------: |
-| 验证码 |  100   |    01    | （10001）验证码生成失败 |
-|        |        |    02    | （10002）验证码校验失败 |
-|        |        |    03    | （10003）验证码刷新失败 |
+<h2>
+文档已移至 <a href="https://uniapp.dcloud.io/uniCloud/uni-captcha.html" target="_blank">uni-captcha文档</a>
+</h2>
\ No newline at end of file
diff --git a/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/fonts/font.ttf b/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/fonts/font.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a60ce88613704bc7fe02dbff52043c3757a0c9d7
Binary files /dev/null and b/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/fonts/font.ttf differ
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 241fb67add560da76cd4d2cae99a060af56cb001..fe2692aed61362fefaeb8814e032f8a1e3fabeb6 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 t,e=(t=require("fs"))&&"object"==typeof t&&"default"in t?t.default:t,n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function r(t){return t&&t.__esModule&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t}function o(t,e){return t(e={exports:{}},e.exports),e.exports}var i=o((function(t,e){Object.defineProperty(e,"__esModule",{value:!0}),e.font16x32=e.font12x24=e.font8x16=void 0;var n="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";e.font8x16={w:8,h:16,fonts:n,data:[[0,0,0,0,0,0,0,60,66,30,34,66,66,63,0,0],[0,0,0,192,64,64,64,88,100,66,66,66,100,88,0,0],[0,0,0,0,0,0,0,28,34,64,64,64,34,28,0,0],[0,0,0,6,2,2,2,30,34,66,66,66,38,27,0,0],[0,0,0,0,0,0,0,60,66,126,64,64,66,60,0,0],[0,0,0,15,17,16,16,126,16,16,16,16,16,124,0,0],[0,0,0,0,0,0,0,62,68,68,56,64,60,66,66,60],[0,0,0,192,64,64,64,92,98,66,66,66,66,231,0,0],[0,0,0,48,48,0,0,112,16,16,16,16,16,124,0,0],[0,0,0,12,12,0,0,28,4,4,4,4,4,4,68,120],[0,0,0,192,64,64,64,78,72,80,104,72,68,238,0,0],[0,0,0,112,16,16,16,16,16,16,16,16,16,124,0,0],[0,0,0,0,0,0,0,254,73,73,73,73,73,237,0,0],[0,0,0,0,0,0,0,220,98,66,66,66,66,231,0,0],[0,0,0,0,0,0,0,60,66,66,66,66,66,60,0,0],[0,0,0,0,0,0,0,216,100,66,66,66,68,120,64,224],[0,0,0,0,0,0,0,30,34,66,66,66,34,30,2,7],[0,0,0,0,0,0,0,238,50,32,32,32,32,248,0,0],[0,0,0,0,0,0,0,62,66,64,60,2,66,124,0,0],[0,0,0,0,0,16,16,124,16,16,16,16,16,12,0,0],[0,0,0,0,0,0,0,198,66,66,66,66,70,59,0,0],[0,0,0,0,0,0,0,231,66,36,36,40,16,16,0,0],[0,0,0,0,0,0,0,215,146,146,170,170,68,68,0,0],[0,0,0,0,0,0,0,110,36,24,24,24,36,118,0,0],[0,0,0,0,0,0,0,231,66,36,36,40,24,16,16,224],[0,0,0,0,0,0,0,126,68,8,16,16,34,126,0,0],[0,0,0,16,16,24,40,40,36,60,68,66,66,231,0,0],[0,0,0,248,68,68,68,120,68,66,66,66,68,248,0,0],[0,0,0,62,66,66,128,128,128,128,128,66,68,56,0,0],[0,0,0,248,68,66,66,66,66,66,66,66,68,248,0,0],[0,0,0,252,66,72,72,120,72,72,64,66,66,252,0,0],[0,0,0,252,66,72,72,120,72,72,64,64,64,224,0,0],[0,0,0,60,68,68,128,128,128,142,132,68,68,56,0,0],[0,0,0,231,66,66,66,66,126,66,66,66,66,231,0,0],[0,0,0,124,16,16,16,16,16,16,16,16,16,124,0,0],[0,0,0,62,8,8,8,8,8,8,8,8,8,8,136,240],[0,0,0,238,68,72,80,112,80,72,72,68,68,238,0,0],[0,0,0,224,64,64,64,64,64,64,64,64,66,254,0,0],[0,0,0,238,108,108,108,108,84,84,84,84,84,214,0,0],[0,0,0,199,98,98,82,82,74,74,74,70,70,226,0,0],[0,0,0,56,68,130,130,130,130,130,130,130,68,56,0,0],[0,0,0,252,66,66,66,66,124,64,64,64,64,224,0,0],[0,0,0,56,68,130,130,130,130,130,178,202,76,56,6,0],[0,0,0,252,66,66,66,124,72,72,68,68,66,227,0,0],[0,0,0,62,66,66,64,32,24,4,2,66,66,124,0,0],[0,0,0,254,146,16,16,16,16,16,16,16,16,56,0,0],[0,0,0,231,66,66,66,66,66,66,66,66,66,60,0,0],[0,0,0,231,66,66,68,36,36,40,40,24,16,16,0,0],[0,0,0,214,146,146,146,146,170,170,108,68,68,68,0,0],[0,0,0,231,66,36,36,24,24,24,36,36,66,231,0,0],[0,0,0,238,68,68,40,40,16,16,16,16,16,56,0,0],[0,0,0,126,132,4,8,8,16,32,32,66,66,252,0,0],[0,0,0,24,36,66,66,66,66,66,66,66,36,24,0,0],[0,0,0,16,112,16,16,16,16,16,16,16,16,124,0,0],[0,0,0,60,66,66,66,4,4,8,16,32,66,126,0,0],[0,0,0,60,66,66,4,24,4,2,2,66,68,56,0,0],[0,0,0,4,12,20,36,36,68,68,126,4,4,30,0,0],[0,0,0,126,64,64,64,88,100,2,2,66,68,56,0,0],[0,0,0,28,36,64,64,88,100,66,66,66,36,24,0,0],[0,0,0,126,68,68,8,8,16,16,16,16,16,16,0,0],[0,0,0,60,66,66,66,36,24,36,66,66,66,60,0,0],[0,0,0,24,36,66,66,66,38,26,2,2,36,56,0,0]]},e.font12x24={w:12,h:24,fonts:n,data:[[0,0,0,0,0,0,0,0,0,0,15,48,48,7,28,48,96,96,96,113,62,0,0,0,0,0,0,0,0,0,0,0,0,0,128,192,192,192,192,192,192,192,192,208,240,0,0,0],[0,0,0,0,16,112,48,48,48,48,51,60,56,48,48,48,48,48,48,56,47,0,0,0,0,0,0,0,0,0,0,0,0,0,128,192,96,96,96,96,96,96,64,192,128,0,0,0],[0,0,0,0,0,0,0,0,0,0,15,49,49,97,96,96,96,96,48,48,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,64,64,128,0,0,0,0],[0,0,0,0,0,1,0,0,0,0,30,49,48,96,96,96,96,96,32,49,30,0,0,0,0,0,0,0,64,192,192,192,192,192,192,192,192,192,192,192,192,192,192,224,128,0,0,0],[0,0,0,0,0,0,0,0,0,0,7,24,16,48,63,48,48,48,24,28,7,0,0,0,0,0,0,0,0,0,0,0,0,0,128,192,96,96,224,0,0,0,32,64,128,0,0,0],[0,0,0,0,0,3,6,12,12,12,127,12,12,12,12,12,12,12,12,12,63,0,0,0,0,0,0,0,0,192,96,96,0,0,192,0,0,0,0,0,0,0,0,0,128,0,0,0],[0,0,0,0,0,0,0,0,0,0,15,25,48,48,48,25,31,48,62,31,96,96,112,31,0,0,0,0,0,0,0,0,0,0,112,144,192,192,192,128,0,0,0,192,96,96,224,128],[0,0,0,0,16,112,48,48,48,48,55,56,48,48,48,48,48,48,48,48,121,0,0,0,0,0,0,0,0,0,0,0,0,0,128,192,192,192,192,192,192,192,192,192,224,0,0,0],[0,0,0,0,0,6,6,0,0,0,62,6,6,6,6,6,6,6,6,6,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,0,0,0],[0,0,0,0,0,1,1,0,0,0,15,1,1,1,1,1,1,1,1,1,1,1,51,62,0,0,0,0,0,128,128,0,0,0,128,128,128,128,128,128,128,128,128,128,128,128,0,0],[0,0,0,0,16,112,48,48,48,48,51,49,51,50,54,62,59,51,49,49,121,0,0,0,0,0,0,0,0,0,0,0,0,0,192,0,0,0,0,0,0,0,128,128,224,0,0,0],[0,0,0,0,2,62,6,6,6,6,6,6,6,6,6,6,6,6,6,6,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,0,0,0],[0,0,0,0,0,0,0,0,0,0,238,119,102,102,102,102,102,102,102,102,247,0,0,0,0,0,0,0,0,0,0,0,0,0,224,96,96,96,96,96,96,96,96,96,112,0,0,0],[0,0,0,0,0,0,0,0,0,0,115,60,48,48,48,48,48,48,48,48,121,0,0,0,0,0,0,0,0,0,0,0,0,0,128,192,192,192,192,192,192,192,192,192,224,0,0,0],[0,0,0,0,0,0,0,0,0,0,15,25,48,96,96,96,96,96,48,48,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,192,96,96,96,96,96,192,192,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,119,56,48,48,48,48,48,48,48,56,55,48,48,124,0,0,0,0,0,0,0,0,0,0,128,192,96,96,96,96,96,96,192,192,128,0,0,0],[0,0,0,0,0,0,0,0,0,0,30,49,48,96,96,96,96,96,32,49,30,0,0,3,0,0,0,0,0,0,0,0,0,0,64,192,192,192,192,192,192,192,192,192,192,192,192,224],[0,0,0,0,0,0,0,0,0,0,249,26,28,24,24,24,24,24,24,24,255,0,0,0,0,0,0,0,0,0,0,0,0,0,224,96,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,15,24,48,48,28,15,1,32,32,48,63,0,0,0,0,0,0,0,0,0,0,0,0,0,224,96,32,0,0,128,192,96,96,192,128,0,0,0],[0,0,0,0,0,0,4,4,12,12,127,12,12,12,12,12,12,12,12,12,7,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,64,64,128,0,0,0],[0,0,0,0,0,0,0,0,0,16,113,48,48,48,48,48,48,48,48,57,30,0,0,0,0,0,0,0,0,0,0,0,0,64,192,192,192,192,192,192,192,192,192,224,128,0,0,0],[0,0,0,0,0,0,0,0,0,0,124,56,24,24,12,12,12,7,7,7,2,0,0,0,0,0,0,0,0,0,0,0,0,0,240,96,64,64,128,128,128,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,247,99,99,103,55,53,57,57,57,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,176,32,32,32,32,192,192,192,192,128,128,0,0,0],[0,0,0,0,0,0,0,0,0,0,125,24,25,13,14,6,7,11,25,17,123,0,0,0,0,0,0,0,0,0,0,0,0,0,224,128,128,0,0,0,0,0,128,192,224,0,0,0],[0,0,0,0,0,0,0,0,0,0,125,56,24,24,13,13,13,6,6,2,4,4,40,56,0,0,0,0,0,0,0,0,0,0,224,128,128,128,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,63,33,35,3,7,6,14,12,28,24,63,0,0,0,0,0,0,0,0,0,0,0,0,0,192,128,128,0,0,0,0,32,32,96,192,0,0,0],[0,0,0,0,0,6,6,14,11,11,19,17,17,17,31,32,32,32,32,96,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,192,192,192,96,96,240,0,0,0],[0,0,0,0,0,255,97,96,96,96,96,97,127,96,96,96,96,96,96,96,255,0,0,0,0,0,0,0,0,0,128,192,192,192,192,128,0,192,64,96,96,96,96,192,128,0,0,0],[0,0,0,0,0,7,24,48,48,32,96,96,96,96,96,96,96,48,48,24,15,0,0,0,0,0,0,0,0,224,96,32,32,0,0,0,0,0,0,0,32,32,64,128,0,0,0,0],[0,0,0,0,0,254,97,96,96,96,96,96,96,96,96,96,96,96,96,99,254,0,0,0,0,0,0,0,0,0,128,192,192,96,96,96,96,96,96,96,96,192,192,128,0,0,0,0],[0,0,0,0,0,255,96,96,96,96,97,97,127,97,97,96,96,96,96,96,255,0,0,0,0,0,0,0,0,192,64,32,0,0,0,0,0,0,0,0,0,32,32,64,192,0,0,0],[0,0,0,0,0,255,96,96,96,96,97,97,127,97,97,96,96,96,96,96,240,0,0,0,0,0,0,0,0,192,192,32,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,15,24,48,48,32,96,96,96,96,99,96,96,48,48,24,15,0,0,0,0,0,0,0,0,64,192,64,64,0,0,0,0,0,240,192,192,192,192,192,0,0,0,0],[0,0,0,0,0,240,96,96,96,96,96,96,127,96,96,96,96,96,96,96,240,0,0,0,0,0,0,0,0,240,96,96,96,96,96,96,224,96,96,96,96,96,96,96,240,0,0,0],[0,0,0,0,0,63,6,6,6,6,6,6,6,6,6,6,6,6,6,6,63,0,0,0,0,0,0,0,0,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,0,0,0],[0,0,0,0,0,15,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,97,99,62,0,0,0,0,0,240,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,0,0],[0,0,0,0,0,243,96,97,98,98,100,108,124,118,103,99,99,97,96,96,241,0,0,0,0,0,0,0,0,224,128,0,0,0,0,0,0,0,0,0,128,128,192,224,240,0,0,0],[0,0,0,0,0,240,96,96,96,96,96,96,96,96,96,96,96,96,96,96,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,32,64,192,0,0,0],[0,0,0,0,0,240,112,112,112,89,89,89,89,90,78,78,78,78,68,68,228,0,0,0,0,0,0,0,0,240,224,224,224,96,96,96,96,96,96,96,96,96,96,96,240,0,0,0],[0,0,0,0,0,224,112,112,88,88,76,70,70,67,67,65,64,64,64,64,224,0,0,0,0,0,0,0,0,112,32,32,32,32,32,32,32,32,32,160,224,224,96,96,32,0,0,0],[0,0,0,0,0,15,25,48,48,96,96,96,96,96,96,96,96,48,48,25,15,0,0,0,0,0,0,0,0,0,128,192,64,96,96,96,96,96,96,96,96,64,192,128,0,0,0,0],[0,0,0,0,0,255,96,96,96,96,96,96,96,127,96,96,96,96,96,96,240,0,0,0,0,0,0,0,0,128,192,96,96,96,96,96,192,128,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,15,25,48,48,96,96,96,96,96,96,96,110,50,49,17,15,1,0,0,0,0,0,0,0,0,128,192,64,96,96,96,96,96,96,96,96,64,192,128,128,224,192,0],[0,0,0,0,0,255,96,96,96,96,96,96,127,102,99,99,97,97,96,96,240,0,0,0,0,0,0,0,0,128,192,96,96,96,96,192,0,0,0,0,128,128,192,192,112,0,0,0],[0,0,0,0,0,31,48,96,96,96,112,60,15,3,0,0,64,64,96,112,79,0,0,0,0,0,0,0,0,32,224,32,32,0,0,0,0,192,192,96,96,96,96,192,128,0,0,0],[0,0,0,0,0,127,70,134,134,6,6,6,6,6,6,6,6,6,6,6,15,0,0,0,0,0,0,0,0,224,32,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,240,96,96,96,96,96,96,96,96,96,96,96,96,96,48,31,0,0,0,0,0,0,0,0,112,32,32,32,32,32,32,32,32,32,32,32,32,32,64,128,0,0,0],[0,0,0,0,0,248,112,48,48,48,48,24,24,24,24,13,13,13,15,6,6,0,0,0,0,0,0,0,0,240,96,64,64,64,128,128,128,128,128,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,247,102,102,102,102,103,55,55,59,59,59,59,57,17,17,17,0,0,0,0,0,0,0,0,112,32,32,64,64,64,64,64,128,128,128,128,128,0,0,0,0,0,0],[0,0,0,0,0,121,48,24,24,25,13,14,6,6,7,11,11,25,17,48,121,0,0,0,0,0,0,0,0,224,192,128,128,0,0,0,0,0,0,0,128,128,128,192,224,0,0,0],[0,0,0,0,0,248,112,48,48,24,24,13,13,14,6,6,6,6,6,6,31,0,0,0,0,0,0,0,0,240,96,64,128,128,128,0,0,0,0,0,0,0,0,0,128,0,0,0],[0,0,0,0,0,63,32,65,1,3,3,3,6,6,12,12,24,24,56,48,127,0,0,0,0,0,0,0,0,224,192,192,128,128,0,0,0,0,0,0,0,32,32,64,192,0,0,0],[0,0,0,0,0,15,25,48,48,96,96,96,96,96,96,96,96,48,48,25,15,0,0,0,0,0,0,0,0,0,128,192,192,96,96,96,96,96,96,96,96,192,192,128,0,0,0,0],[0,0,0,0,0,2,6,62,6,6,6,6,6,6,6,6,6,6,6,6,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,0,0,0],[0,0,0,0,0,31,33,64,96,96,0,1,1,3,4,8,16,32,64,127,127,0,0,0,0,0,0,0,0,0,128,192,192,192,192,128,128,0,0,0,64,64,64,192,192,0,0,0],[0,0,0,0,0,30,35,97,97,97,1,3,14,1,0,0,96,96,96,33,31,0,0,0,0,0,0,0,0,0,0,128,128,128,128,0,0,128,128,192,192,192,192,128,0,0,0,0],[0,0,0,0,0,1,3,3,5,9,9,17,33,33,65,127,1,1,1,1,7,0,0,0,0,0,0,0,128,128,128,128,128,128,128,128,128,128,128,224,128,128,128,128,224,0,0,0],[0,0,0,0,0,63,63,32,32,32,32,47,49,32,0,0,96,96,65,33,31,0,0,0,0,0,0,0,0,192,192,0,0,0,0,0,128,192,192,192,192,192,128,128,0,0,0,0],[0,0,0,0,0,7,24,48,48,32,96,103,104,112,96,96,96,32,48,24,15,0,0,0,0,0,0,0,0,128,192,192,0,0,0,128,192,96,96,96,96,96,64,192,0,0,0,0],[0,0,0,0,0,31,63,48,32,32,0,1,1,2,2,2,6,6,6,6,6,0,0,0,0,0,0,0,0,224,224,64,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,31,48,96,96,96,112,60,15,51,32,96,96,96,96,48,15,0,0,0,0,0,0,0,0,128,192,96,96,96,64,192,0,128,192,96,96,96,96,192,128,0,0,0],[0,0,0,0,0,15,48,48,96,96,96,96,96,49,30,0,0,0,48,49,30,0,0,0,0,0,0,0,0,0,128,192,64,96,96,96,224,96,96,96,192,192,128,128,0,0,0,0]]},e.font16x32={w:16,h:32,fonts:n,data:[[0,0,0,0,0,0,0,0,0,0,0,0,0,15,24,48,48,0,1,14,56,48,96,96,96,48,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,96,48,48,48,240,48,48,48,48,48,50,242,28,0,0,0,0,0],[0,0,0,0,0,8,120,24,24,24,24,24,24,24,27,28,28,24,24,24,24,24,24,24,28,30,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,24,12,6,6,6,6,6,6,6,4,12,24,224,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,3,14,24,24,48,48,48,48,48,48,24,24,12,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,48,24,24,24,0,0,0,0,4,4,8,16,224,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,7,12,24,24,48,48,48,48,48,48,16,24,12,7,0,0,0,0,0,0,0,0,0,0,8,120,24,24,24,24,24,24,216,56,24,24,24,24,24,24,24,24,24,56,94,144,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,3,12,24,16,48,48,63,48,48,48,24,24,14,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,48,24,8,12,12,252,0,0,0,4,8,24,224,0,0,0,0,0],[0,0,0,0,0,0,0,1,1,3,3,3,3,63,3,3,3,3,3,3,3,3,3,3,3,3,31,0,0,0,0,0,0,0,0,0,0,0,124,195,3,3,0,0,0,248,0,0,0,0,0,0,0,0,0,0,0,0,240,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,3,12,8,24,24,24,8,12,15,24,24,15,15,16,48,48,48,28,7,0,0,0,0,0,0,0,0,0,0,0,0,0,238,54,24,24,24,24,24,48,224,0,0,240,252,14,6,6,6,28,240],[0,0,0,0,0,8,120,24,24,24,24,24,24,25,27,28,24,24,24,24,24,24,24,24,24,24,126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,24,12,12,12,12,12,12,12,12,12,12,12,63,0,0,0,0,0],[0,0,0,0,0,0,1,1,1,0,0,0,0,31,1,1,1,1,1,1,1,1,1,1,1,1,31,0,0,0,0,0,0,0,0,0,0,0,192,192,192,0,0,0,128,128,128,128,128,128,128,128,128,128,128,128,128,128,248,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,24,15,0,0,0,0,0,0,28,28,28,0,0,0,8,248,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,48,96,192],[0,0,0,0,0,8,120,24,24,24,24,24,24,24,24,24,24,24,25,27,28,24,24,24,24,24,126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,124,48,96,192,128,128,128,192,224,96,48,56,24,62,0,0,0,0,0],[0,0,0,0,0,0,31,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,31,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,248,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,16,119,57,49,49,49,49,49,49,49,49,49,49,49,123,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,204,140,140,140,140,140,140,140,140,140,140,140,222,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,8,120,27,28,24,24,24,24,24,24,24,24,24,24,126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,24,12,12,12,12,12,12,12,12,12,12,12,63,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,3,14,8,24,48,48,48,48,48,48,24,24,12,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,56,12,12,6,6,6,6,6,6,12,12,24,224,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,8,121,26,28,24,24,24,24,24,24,24,24,28,30,25,24,24,24,24,126,0,0,0,0,0,0,0,0,0,0,0,0,0,240,24,12,4,6,6,6,6,6,6,12,12,24,224,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,3,12,24,24,48,48,48,48,48,48,16,24,12,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,196,60,28,12,12,12,12,12,12,12,12,28,60,204,12,12,12,12,63],[0,0,0,0,0,0,0,0,0,0,0,0,6,126,6,6,7,7,6,6,6,6,6,6,6,6,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,102,134,0,0,0,0,0,0,0,0,0,0,224,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,7,12,24,24,24,14,7,1,0,32,32,48,56,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,228,28,12,4,0,0,192,240,56,12,12,12,24,240,0,0,0,0,0],[0,0,0,0,0,0,0,0,1,1,1,3,7,63,3,3,3,3,3,3,3,3,3,3,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,0,0,0,0,0,0,0,0,0,4,4,136,240,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,8,120,24,24,24,24,24,24,24,24,24,24,24,12,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,60,12,12,12,12,12,12,12,12,12,12,28,47,200,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,126,24,24,28,12,12,14,6,6,7,3,3,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,24,16,16,32,32,64,64,64,128,128,128,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,251,113,48,49,49,25,25,26,26,14,14,14,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,239,198,196,196,196,200,200,104,104,112,112,112,32,32,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,63,14,14,7,3,3,1,1,2,6,4,8,24,124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,124,16,32,32,64,128,192,192,224,96,48,48,24,126,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,126,24,24,12,12,12,6,6,3,3,3,1,1,1,1,1,1,50,60,0,0,0,0,0,0,0,0,0,0,0,0,0,62,24,16,16,16,32,32,32,64,64,64,128,128,128,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,63,48,32,32,0,1,1,3,7,14,12,28,56,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,48,112,96,192,192,128,0,0,4,4,12,24,248,0,0,0,0,0],[0,0,0,0,0,0,3,3,3,2,6,4,4,4,12,8,8,8,31,16,16,16,48,32,32,96,248,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,192,192,192,192,96,96,96,96,240,48,48,48,48,24,24,24,62,0,0,0,0,0],[0,0,0,0,0,0,127,24,24,24,24,24,24,24,24,31,24,24,24,24,24,24,24,24,24,24,127,0,0,0,0,0,0,0,0,0,0,0,224,56,28,12,12,12,12,24,48,224,24,12,4,6,6,6,6,6,12,24,240,0,0,0,0,0],[0,0,0,0,0,0,3,6,8,24,48,48,32,96,96,96,96,96,96,96,96,48,48,48,24,12,3,0,0,0,0,0,0,0,0,0,0,0,228,28,12,4,2,2,0,0,0,0,0,0,0,0,0,2,2,4,12,24,224,0,0,0,0,0],[0,0,0,0,0,0,127,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,127,0,0,0,0,0,0,0,0,0,0,0,192,112,24,12,12,12,6,6,6,6,6,6,6,6,6,12,12,8,24,112,192,0,0,0,0,0],[0,0,0,0,0,0,127,24,24,24,24,24,24,24,24,31,24,24,24,24,24,24,24,24,24,24,127,0,0,0,0,0,0,0,0,0,0,0,252,12,4,6,2,0,16,16,48,240,48,16,16,0,0,0,2,2,4,12,252,0,0,0,0,0],[0,0,0,0,0,0,127,24,24,24,24,24,24,24,24,31,24,24,24,24,24,24,24,24,24,24,126,0,0,0,0,0,0,0,0,0,0,0,254,14,2,3,1,0,8,8,24,248,24,8,8,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,3,14,8,24,48,48,32,96,96,96,96,96,96,96,96,48,48,24,24,12,3,0,0,0,0,0,0,0,0,0,0,0,200,56,8,8,4,4,0,0,0,0,0,0,63,12,12,12,12,12,12,16,224,0,0,0,0,0],[0,0,0,0,0,0,252,48,48,48,48,48,48,48,48,48,63,48,48,48,48,48,48,48,48,48,252,0,0,0,0,0,0,0,0,0,0,0,126,24,24,24,24,24,24,24,24,24,248,24,24,24,24,24,24,24,24,24,126,0,0,0,0,0],[0,0,0,0,0,0,31,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,31,0,0,0,0,0,0,0,0,0,0,0,248,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,248,0,0,0,0,0],[0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,112,112,113,63,0,0,0,0,0,0,254,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,192,128,0],[0,0,0,0,0,0,126,24,24,24,24,24,24,25,25,27,29,28,24,24,24,24,24,24,24,24,126,0,0,0,0,0,0,0,0,0,0,0,62,24,16,32,96,64,128,128,128,128,192,192,224,96,112,48,56,24,12,12,63,0,0,0,0,0],[0,0,0,0,0,0,126,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,4,12,252,0,0,0,0,0],[0,0,0,0,0,0,248,56,56,56,56,44,44,44,44,46,38,38,38,38,35,35,35,35,35,33,249,0,0,0,0,0,0,0,0,0,0,0,31,28,28,28,60,44,44,44,108,76,76,76,76,140,140,140,140,12,12,12,63,0,0,0,0,0],[0,0,0,0,0,0,248,56,60,44,44,46,38,39,35,35,33,33,32,32,32,32,32,32,32,32,248,0,0,0,0,0,0,0,0,0,0,0,62,8,8,8,8,8,8,8,8,136,136,200,200,232,104,120,56,56,56,24,24,0,0,0,0,0],[0,0,0,0,0,0,3,12,24,16,48,48,96,96,96,96,96,96,96,96,96,48,48,16,24,12,3,0,0,0,0,0,0,0,0,0,0,0,192,48,24,8,12,12,6,6,6,6,6,6,6,6,6,4,12,8,24,48,192,0,0,0,0,0],[0,0,0,0,0,0,127,24,24,24,24,24,24,24,24,24,31,24,24,24,24,24,24,24,24,24,126,0,0,0,0,0,0,0,0,0,0,0,240,24,12,6,6,6,6,6,12,24,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,3,12,24,48,48,48,96,96,96,96,96,96,96,96,96,39,52,56,24,12,3,0,0,0,0,0,0,0,0,0,0,0,192,48,24,8,12,4,6,6,6,6,6,6,6,6,6,134,204,76,104,112,224,50,62,28,0,0],[0,0,0,0,0,0,127,24,24,24,24,24,24,24,24,31,25,24,24,24,24,24,24,24,24,24,126,0,0,0,0,0,0,0,0,0,0,0,224,56,28,12,12,12,12,24,48,224,192,192,224,96,96,112,48,48,56,24,30,0,0,0,0,0],[0,0,0,0,0,0,7,12,24,48,48,48,48,24,30,7,1,0,0,0,0,32,32,16,24,28,19,0,0,0,0,0,0,0,0,0,0,0,228,28,12,4,4,0,0,0,0,192,240,120,28,14,6,6,6,6,12,24,240,0,0,0,0,0],[0,0,0,0,0,0,63,49,33,65,65,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,7,0,0,0,0,0,0,0,0,0,0,0,252,132,134,130,130,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,224,0,0,0,0,0],[0,0,0,0,0,0,252,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,16,28,7,0,0,0,0,0,0,0,0,0,0,0,62,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,16,32,192,0,0,0,0,0],[0,0,0,0,0,0,124,24,24,24,12,12,12,12,6,6,6,7,3,3,3,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,31,4,4,4,8,8,8,8,16,16,16,48,32,32,32,192,192,192,192,128,128,0,0,0,0,0],[0,0,0,0,0,0,251,97,97,97,49,48,49,49,49,49,50,26,26,26,28,28,28,12,8,8,8,0,0,0,0,0,0,0,0,0,0,0,207,134,132,132,132,132,196,200,200,200,200,72,104,112,112,112,112,48,32,32,32,0,0,0,0,0],[0,0,0,0,0,0,126,24,28,12,12,14,6,7,3,3,1,1,2,2,4,4,8,8,16,16,124,0,0,0,0,0,0,0,0,0,0,0,124,16,16,32,32,64,64,128,128,128,128,192,192,224,96,96,48,48,24,24,62,0,0,0,0,0],[0,0,0,0,0,0,126,56,24,24,12,12,14,6,6,3,3,3,1,1,1,1,1,1,1,1,7,0,0,0,0,0,0,0,0,0,0,0,62,8,8,16,16,48,32,32,64,64,64,128,128,128,128,128,128,128,128,128,224,0,0,0,0,0],[0,0,0,0,0,0,31,24,16,32,32,0,0,0,1,1,3,3,7,6,14,12,28,24,56,48,127,0,0,0,0,0,0,0,0,0,0,0,252,24,24,48,112,96,224,192,192,128,128,0,0,0,0,0,4,4,8,24,248,0,0,0,0,0],[0,0,0,0,0,0,3,6,12,24,24,24,48,48,48,48,48,48,48,48,48,24,24,24,12,6,3,0,0,0,0,0,0,0,0,0,0,0,224,48,24,12,12,4,6,6,6,6,6,6,6,6,6,4,12,12,24,48,224,0,0,0,0,0],[0,0,0,0,0,0,0,1,31,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,31,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,192,248,0,0,0,0,0],[0,0,0,0,0,0,7,8,16,32,32,48,48,0,0,0,0,0,0,1,2,4,8,16,32,63,63,0,0,0,0,0,0,0,0,0,0,0,224,56,24,12,12,12,12,12,24,16,32,64,128,0,0,4,4,4,12,248,248,0,0,0,0,0],[0,0,0,0,0,0,7,24,48,48,48,48,0,0,0,3,0,0,0,0,0,48,48,48,48,24,7,0,0,0,0,0,0,0,0,0,0,0,192,112,48,24,24,24,24,48,96,192,112,24,8,12,12,12,12,8,24,48,192,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,1,1,2,6,4,8,8,16,32,32,127,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,48,112,112,240,112,112,112,112,112,112,112,112,112,112,254,112,112,112,112,112,112,254,0,0,0,0],[0,0,0,0,0,0,15,15,8,8,8,16,16,19,20,24,16,0,0,0,0,48,48,32,32,16,15,0,0,0,0,0,0,0,0,0,0,0,252,252,0,0,0,0,0,224,48,24,8,12,12,12,12,12,12,24,24,48,192,0,0,0,0,0],[0,0,0,0,0,0,1,3,4,8,24,24,16,48,49,54,60,56,48,48,48,48,24,24,12,6,3,0,0,0,0,0,0,0,0,0,0,0,240,8,12,12,0,0,0,0,240,24,12,6,6,6,6,6,6,4,12,24,224,0,0,0,0,0],[0,0,0,0,0,0,31,31,56,48,32,32,0,0,0,0,0,0,1,1,1,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,252,252,8,16,16,32,32,64,64,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,7,12,24,48,48,48,56,28,14,7,13,24,48,96,96,96,96,96,48,24,7,0,0,0,0,0,0,0,0,0,0,0,224,48,24,12,12,12,12,24,16,224,224,112,56,28,12,12,12,12,24,48,192,0,0,0,0,0],[0,0,0,0,0,0,7,24,48,48,96,96,96,96,96,96,48,24,15,0,0,0,0,48,48,48,15,0,0,0,0,0,0,0,0,0,0,0,192,32,16,24,8,12,12,12,12,28,60,108,140,12,24,24,24,48,96,192,128,0,0,0,0,0]]}}));r(i);i.font16x32,i.font12x24,i.font8x16;var a=o((function(t,r){var o=n&&n.__awaiter||function(t,e,n,r){return new(n||(n=Promise))((function(o,i){function a(t){try{s(r.next(t))}catch(t){i(t)}}function c(t){try{s(r.throw(t))}catch(t){i(t)}}function s(t){var e;t.done?o(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(a,c)}s((r=r.apply(t,e||[])).next())}))},a=n&&n.__generator||function(t,e){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function c(i){return function(c){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=a.trys,(o=o.length>0&&o[o.length-1])||6!==i[0]&&2!==i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){a.label=i[1];break}if(6===i[0]&&a.label<o[1]){a.label=o[1],o=i;break}if(o&&a.label<o[2]){a.label=o[2],a.ops.push(i);break}o[2]&&a.ops.pop(),a.trys.pop();continue}i=e.call(t,a)}catch(t){i=[6,t],r=0}finally{n=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,c])}}};Object.defineProperty(r,"__esModule",{value:!0}),r.BMP24=void 0;var c=function(){function t(t,e){var n=4*Math.ceil(3*t/4),r=n*e;this.w=t,this.h=e,this.fileLen=r+54,this._lineByteNum=n,this._data=Buffer.alloc(this.fileLen),function(t,e,n,r,o){var i=t;i.write("BM"),i.writeInt32LE(e,2),i.writeInt8(122,6),i.writeInt32LE(54,10),i.writeInt32LE(40,14),i.writeInt32LE(r,18),i.writeInt32LE(o,22),i.writeInt16LE(1,26),i.writeInt16LE(24,28),i.writeInt32LE(n,34)}(this._data,this.fileLen,r,t,e)}return t.prototype.getFileData=function(){return this._data},t.prototype.getDataUrl=function(){return"data:image/bmp;base64,"+this._data.toString("base64")},t.prototype.getData=function(){return this._data.slice(54)},t.prototype.drawPoint=function(t,e,n){this.drawPointRGB(t,e,{red:n>>16&255,green:n>>8&255,blue:255&n})},t.prototype.drawPointRGB=function(t,e,n){if(!(t>=this.w||e>=this.h||t<0||e<0)){var r=this.h-e-1,o=54+3*t+this._lineByteNum*r;this._data.writeUInt8(n.blue,o),this._data.writeUInt8(n.green,o+1),this._data.writeUInt8(n.red,o+2)}},t.prototype.getPointRGB=function(t,e){if(t>=this.w||e>=this.h||t<0||e<0)throw new Error("out of range");var n=this.h-e-1,r=54+3*t+this._lineByteNum*n;return{blue:this._data.readUInt8(r),green:this._data.readUInt8(r+1),red:this._data.readUInt8(r+2)}},t.prototype.drawLineH=function(t,e,n,r){if(t>e){var o=e;e=t,t=o}for(;t<=e;t++)this.drawPoint(t,n,r)},t.prototype.drawLineV=function(t,e,n,r){if(t>e){var o=e;e=t,t=o}for(;t<=e;t++)this.drawPoint(n,t,r)},t.prototype.drawLine=function(t,e,n,r,o){var i=t,a=e,c=n>t?n-t:t-n,s=r>e?r-e:e-r,d=!1,f=n>t?1:-1,u=r>e?1:-1;if(s>c){var h=c;c=s,s=h,d=!0}for(var l=(s<<1)-c,w=0;w<=c;w++)this.drawPoint(i,a,o),l>=0&&(d?i+=f:a+=u,l-=c<<1),d?a+=u:i+=f,l+=s<<1},t.prototype.drawRect=function(t,e,n,r,o){var i=t+n-1,a=e+r-1;this.drawLineH(t,i,e,o),this.drawLineH(t,i,a,o),this.drawLineV(e,a,t,o),this.drawLineV(e,a,i,o)},t.prototype.fillRect=function(t,e,n,r,o){var i=t+n-1,a=e+r-1;if(t>i){var c=i;i=t,t=c}if(e>a){c=a;a=e,e=c}for(;e<=a;e++)for(var s=t;s<=i;s++)this.drawPoint(s,e,o)},t.prototype.drawCircle=function(t,e,n,r){for(var o=0,i=n,a=3-2*n;o<i;)this.drawPoint(t+o,e+i,r),this.drawPoint(t-o,e+i,r),this.drawPoint(t+o,e-i,r),this.drawPoint(t-o,e-i,r),this.drawPoint(t+i,e+o,r),this.drawPoint(t-i,e+o,r),this.drawPoint(t+i,e-o,r),this.drawPoint(t-i,e-o,r),a<0?a=a+4*o+6:(a=a+4*(o-i)+10,i-=1),o+=1;o===i&&(this.drawPoint(t+o,e+i,r),this.drawPoint(t-o,e+i,r),this.drawPoint(t+o,e-i,r),this.drawPoint(t-o,e+i,r),this.drawPoint(t+i,e+o,r),this.drawPoint(t-i,e+o,r),this.drawPoint(t+i,e-o,r),this.drawPoint(t-i,e-o,r))},t.prototype.drawChar=function(t,e,n,r,o){var i=r.fonts.indexOf(t);if(!(i<0))for(var a=n,c=e,s=0,d=r.data[i];s<d.length;s++){c=e;for(var f=d[s];f>0;f<<=1)128&f&&this.drawPoint(c,a,o),c++;++a-n>=r.h&&(a=n,e+=8)}},t.prototype.drawString=function(t,e,n,r,o){for(var i=0,a=t;i<a.length;i++){var c=a[i];this.drawChar(c,e,n,r,o),e+=r.w}},t.loadFromFile=function(n){return o(this,void 0,void 0,(function(){return a(this,(function(r){return[2,new Promise((function(r,o){e.readFile(n,(function(e,n){if(e)return o(e);if(54!==n.readInt32LE(10))return o(new Error("unsupported format: headlen !== 54"));if(40!==n.readInt32LE(14))return o(new Error("unsupported format: bitmapInfoHead.length !== 40"));if(24!==n.readInt32LE(28))return o(new Error("unsupported format: only support 24bit bmp"));var i=new t(0,0);i.w=n.readInt32LE(18),i.h=n.readInt32LE(22),i.fileLen=n.length,i._lineByteNum=4*Math.ceil(3*i.w/4),i._data=n,r(i)}))}))]}))}))},t.font8x16=i.font8x16,t.font12x24=i.font12x24,t.font16x32=i.font16x32,t}();r.BMP24=c}));r(a);a.BMP24;const c=a.BMP24,s="ABCDEFGHKMNPQRSTUVWXYZabcdefghkmnpqrstuvwxyz1234567890";function d(t,e,n){const r=function(t){let e="";for(let n=0;n<t;n++)e+=s.charAt(Math.random()*s.length|0);return e}(e);let o=0;for(let i=0;i<r.length;i++){const a=f(n),c=8+h(-10,10);t.drawChar(r[i],o,c,a,h(0,16777215)),o=t.w/e*(i+1)}return r}function f(t){const e={small:c.font8x16,medium:c.font12x24,big:c.font16x32},n=Object.keys(e).reduce((n,r)=>(t.includes(r)&&n.push(e[r]),n),[]);return n[Math.random()*n.length|0]}function u(t={}){const e=["small","medium","big"],n={backgroundColor:16775912,size:4,noise:4,width:100,height:40,fontSize:["medium","big"]};let{backgroundColor:r,size:o,noise:i,width:a,height:s,fontSize:f}=Object.assign({},n,t);"string"==typeof r&&(r=r.replace("#","0x")),f instanceof Array||(f=[]),f.filter(t=>e.includes(t)),f.length||(f=n.fontSize),o=o>6?6:o;const u=new c(a,s);u.fillRect(0,0,a,s,r),function(t,e){for(let n=1;n<e;n++){const e=t.w/n,r=t.h,o=l().replace("#","0x"),i=h(-5,10),a=h(10,15),c=10,s=1;for(let n=-e;n<e;n+=.1){const d=Math.floor(r/c*Math.sin(n/a)+r/2+i),f=Math.floor(n+e);for(let e=0;e<s;e++)t.drawPoint(f,d+e,o)}}}(u,i);return{text:d(u,o,f),base64:"data:image/jpeg;base64,"+u.getFileData().toString("base64")}}const h=function(t,e){return Math.round(t+Math.random()*(e-t))},l=function(t){const e=h(0,24)/24,n=h(60,80)/100,r=t?function(t){if("#"!==t[0])return 1;3===(t=t.slice(1)).length&&(t=t[0]+t[0]+t[1]+t[1]+t[2]+t[2]);const e=parseInt(t,16),n=e>>16,r=e>>8&255,o=255&e,i=Math.max(n,r,o),a=Math.min(n,r,o);return(i+a)/510}(t):1;let o,i;r>=.5?(o=Math.round(100*r)-45,i=Math.round(100*r)-25):(o=Math.round(100*r)+25,i=Math.round(100*r)+45);const a=h(o,i)/100,c=a<.5?a*(a+n):a+n-a*n,s=2*a-c,d=Math.floor(255*w(s,c,e+1/3)),f=Math.floor(255*w(s,c,e));return"#"+(Math.floor(255*w(s,c,e-1/3))|f<<8|d<<16|1<<24).toString(16).slice(1)};function w(t,e,n){return 6*(n=(n+1)%1)<1?t+(e-t)*n*6:2*n<1?e:3*n<2?t+(e-t)*(2/3-n)*6:t}const p=Object.prototype.toString;function g(t){return"[object Object]"===p.call(t)}function y(){"development"===process.env.NODE_ENV&&console.log(...arguments)}const v=async function(){};function m(t){return v.constructor===t.constructor?async function(){const e=await t.apply(this,arguments);return g(e)&&e.msg&&(e.message=e.msg),e}:function(){const e=t.apply(this,arguments);return g(e)&&e.msg&&(e.message=e.msg),e}}const b=uniCloud.database().collection("opendb-verify-codes"),_={};var I=Object.freeze({__proto__:null,create:async function(t={}){let{scene:e,expiresDate:n,deviceId:r,...o}=t;if(r=r||__ctx__.DEVICEID,!r)throw new Error("deviceId不可为空");if(!e)throw new Error("scene验证码场景不可为空");try{const{text:i,base64:a}=u(o),c=await this.setVerifyCode({deviceId:r,code:i,expiresDate:n,scene:e});return c.code>0?{...c,code:10001}:(_[r]=t,{code:0,msg:"验证码获取成功",captchaBase64:a})}catch(t){return{code:10001,msg:"验证码生成失败："+t.message}}},verify:async function({deviceId:t,captcha:e,scene:n}){if(!(t=t||__ctx__.DEVICEID))throw new Error("deviceId不可为空");if(!n)throw new Error("scene验证码场景不可为空");try{const r=await this.verifyCode({deviceId:t,code:e,scene:n});return r.code>0?{...r,code:10002}:{code:0,msg:"验证码通过"}}catch(t){return{code:10002,msg:"验证码校验失败："+t.message}}},refresh:async function(t={}){let{scene:e,expiresDate:n,deviceId:r,...o}=t;if(r=r||__ctx__.DEVICEID,!r)throw new Error("deviceId不可为空");if(!e)throw new Error("scene验证码场景不可为空");const i=await b.where({deviceId:r,scene:e}).orderBy("created_date","desc").limit(1).get();if(i&&i.data&&i.data.length>0){const t=i.data[0];await b.doc(t._id).update({state:2});let a={};Object.keys(o).length>0&&(_[r]=Object.assign({},_[r],o)),a=_[r];let c={};try{c=await this.create(Object.assign({},a,{deviceId:r,scene:e,expiresDate:n}))}catch(t){return{code:50403,msg:t.message}}return c.code>0?{...c,code:10003}:{code:0,msg:"验证码刷新成功",captchaBase64:c.captchaBase64}}return{code:10003,msg:`验证码刷新失败：无此设备在${e}场景信息，请重新获取`}},setVerifyCode:async function({deviceId:t,code:e,expiresDate:n,scene:r}){if(!t)return{code:10101,msg:"deviceId不可为空"};if(!e)return{code:10102,msg:"验证码不可为空"};n||(n=180);const o=Date.now(),i={deviceId:t,scene:r,code:e.toLocaleLowerCase(),state:0,ip:__ctx__.CLIENTIP,created_date:o,expired_date:o+1e3*n};return y("addRes",await b.add(i)),{code:0,deviceId:t}},verifyCode:async function({deviceId:t,code:e,scene:n}){if(!t)return{code:10101,msg:"deviceId不可为空"};if(!e)return{code:10102,msg:"验证码不可为空"};const r=Date.now(),o={deviceId:t,scene:n,code:e.toLocaleLowerCase(),state:0},i=await b.where(o).orderBy("created_date","desc").limit(1).get();if(y("verifyRecord:",i),i&&i.data&&i.data.length>0){const t=i.data[0];if(t.expired_date<r)return{code:10103,msg:"验证码已失效"};return y("upRes",await b.doc(t._id).update({state:1})),{code:0,msg:"验证通过"}}return{code:10104,msg:"验证码错误"}}});class x{}for(const t in I)x.prototype[t]=m(I[t]);const P=new x,E=new Proxy(P,{get(t,e){if(e in t)return"function"==typeof t[e]?t[e].bind(E):t[e]}});module.exports=E;
+"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:"ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄€‹›ﬁﬂ‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ","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;
diff --git a/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/package.json b/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/package.json
index f5e9cd9e34135384a20303bcffc85863fd3bbc65..2bb07ec8c0d0da397669bd1854637b12cf4d7bc9 100644
--- a/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/package.json
+++ b/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni-captcha",
-  "version": "0.1.1",
+  "version": "0.2.2",
   "description": "uni-captcha",
   "main": "index.js",
   "homepage": "https://ext.dcloud.net.cn/plugin?id=4048",
@@ -9,5 +9,8 @@
     "url": "git+https://gitee.com/dcloud/uni-captcha"
   },
   "author": "DCloud",
-  "license": "Apache-2.0"
+  "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-captcha/uniCloud/cloudfunctions/uni-captcha-co/index.obj.js b/uni_modules/uni-captcha/uniCloud/cloudfunctions/uni-captcha-co/index.obj.js
new file mode 100644
index 0000000000000000000000000000000000000000..09b36ac9ecaef591b568dfcd6518f3f788267898
--- /dev/null
+++ b/uni_modules/uni-captcha/uniCloud/cloudfunctions/uni-captcha-co/index.obj.js
@@ -0,0 +1,32 @@
+// 开发文档: https://uniapp.dcloud.net.cn/uniCloud/cloud-obj
+//导入验证码公共模块
+const uniCaptcha = require('uni-captcha')
+//获取数据库对象
+const db = uniCloud.database();
+//获取数据表opendb-verify-codes对象
+const verifyCodes = db.collection('opendb-verify-codes')
+module.exports = {
+	async getImageCaptcha({
+		scene
+	}) {
+		//获取设备id
+		let {
+			deviceId,
+			platform
+		} = this.getClientInfo();
+		//根据：设备id、场景值、状态，查找记录是否存在
+		let res = await verifyCodes.where({
+			scene,
+			deviceId,
+			state: 0
+		}).limit(1).get()
+		//如果已存在则调用刷新接口，反之调用插件接口
+		let action = res.data.length ? 'refresh' : 'create'
+		//执行并返回结果
+		//导入配置，配置优先级说明：此处配置 > uni-config-center
+		return await uniCaptcha[action]({
+			scene, //来源客户端传递，表示：使用场景值，用于防止不同功能的验证码混用
+			uniPlatform: platform
+		})
+	}
+}
diff --git a/uni_modules/uni-captcha/uniCloud/cloudfunctions/uni-captcha-co/package.json b/uni_modules/uni-captcha/uniCloud/cloudfunctions/uni-captcha-co/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..b5188c3ff1d1c0f44665bd437fa7017dd20cf866
--- /dev/null
+++ b/uni_modules/uni-captcha/uniCloud/cloudfunctions/uni-captcha-co/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "uni-captcha-co",
+  "dependencies": {
+    "uni-captcha": "file:../common/uni-captcha",
+    "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/uniCloud-aliyun/database/opendb-verify-codes.schema.json b/uni_modules/uni-captcha/uniCloud/database/opendb-verify-codes.schema.json
similarity index 72%
rename from uniCloud-aliyun/database/opendb-verify-codes.schema.json
rename to uni_modules/uni-captcha/uniCloud/database/opendb-verify-codes.schema.json
index 8f86479d5508ed71158be14fe685a9e0c7de7b83..1f3be590712e9eb110bd753c8392d784be9aad6d 100644
--- a/uniCloud-aliyun/database/opendb-verify-codes.schema.json
+++ b/uni_modules/uni-captcha/uniCloud/database/opendb-verify-codes.schema.json
@@ -1,41 +1,45 @@
-{
-	"bsonType": "object",
-	"required": [],
-	"properties": {
-		"_id": {
-			"description": "ID，系统自动生成"
-		},
-		"mobile": {
-			"bsonType": "string",
-			"description": "手机号码"
-		},
-		"email": {
-			"bsonType": "string",
-			"description": "邮箱"
-		},
-		"code": {
-			"bsonType": "string",
-			"description": "验证码"
-		},
-		"type": {
-			"bsonType": "string",
-			"description": "验证类型：login, bind, unbind, pay"
-		},
-		"state": {
-			"bsonType": "int",
-			"description": "验证状态：0 未验证、1 已验证、2 已作废"
-		},
-		"ip": {
-			"bsonType": "string",
-			"description": "请求时客户端IP地址"
-		},
-		"created_at": {
-			"bsonType": "timestamp",
-			"description": "创建时间"
-		},
-		"expired_at": {
-			"bsonType": "timestamp",
-			"description": "过期时间"
-		}
-	}
-}
+{
+	"bsonType": "object",
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"code": {
+			"bsonType": "string",
+			"description": "验证码"
+		},
+		"create_date": {
+			"bsonType": "timestamp",
+			"description": "创建时间"
+		},
+		"device_uuid": {
+			"bsonType": "string",
+			"description": "设备UUID，常用于图片验证码"
+		},
+		"email": {
+			"bsonType": "string",
+			"description": "邮箱"
+		},
+		"expired_date": {
+			"bsonType": "timestamp",
+			"description": "过期时间"
+		},
+		"ip": {
+			"bsonType": "string",
+			"description": "请求时客户端IP地址"
+		},
+		"mobile": {
+			"bsonType": "string",
+			"description": "手机号码"
+		},
+		"scene": {
+			"bsonType": "string",
+			"description": "使用验证码的场景，如：login, bind, unbind, pay"
+		},
+		"state": {
+			"bsonType": "int",
+			"description": "验证状态：0 未验证、1 已验证、2 已作废"
+		}
+	},
+	"required": []
+}
\ No newline at end of file
diff --git a/uni_modules/uni-card/changelog.md b/uni_modules/uni-card/changelog.md
index c84f1ace5d86ce7b0105d5ff6228c52d2423ee25..c3cd8c45ace0d5838a3f1c1eff8ea0fc349afb9c 100644
--- a/uni_modules/uni-card/changelog.md
+++ b/uni_modules/uni-card/changelog.md
@@ -1,12 +1,26 @@
+## 1.3.1（2021-12-20）
+- 修复 在vue页面下略缩图显示不正常的bug
+## 1.3.0（2021-11-19）
+- 重构插槽的用法 ，header 替换为 title 
+- 新增 actions 插槽
+- 新增 cover 封面图属性和插槽
+- 新增 padding 内容默认内边距离
+- 新增 margin 卡片默认外边距离
+- 新增 spacing 卡片默认内边距
+- 新增 shadow 卡片阴影属性
+- 取消 mode 属性，可使用组合插槽代替
+- 取消 note 属性 ，使用actions插槽代替
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-card](https://uniapp.dcloud.io/component/uniui/uni-card)
 ## 1.2.1（2021-07-30）
 - 优化 vue3下事件警告的问题
-## 1.2.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 1.1.8（2021-07-01）
-- 优化 图文卡片无图片加载时，提供占位图标
-- 新增 header 插槽，自定义卡片头部（ 图文卡片 mode="style" 时，不支持）
-- 修复 thumbnail 不存在仍然占位的 bug
-## 1.1.7（2021-05-12）
-- 新增 组件示例地址
-## 1.1.6（2021-02-04）
-- 调整为uni_modules目录规范
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-07-01）
+- 优化 图文卡片无图片加载时，提供占位图标
+- 新增 header 插槽，自定义卡片头部（ 图文卡片 mode="style" 时，不支持）
+- 修复 thumbnail 不存在仍然占位的 bug
+## 1.1.7（2021-05-12）
+- 新增 组件示例地址
+## 1.1.6（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-card/components/uni-card/uni-card.vue b/uni_modules/uni-card/components/uni-card/uni-card.vue
index 7458b777f1368d1802b2b3d77103e5a742149639..045c082a7933d7832c1f1694eda421162dac9594 100644
--- a/uni_modules/uni-card/components/uni-card/uni-card.vue
+++ b/uni_modules/uni-card/components/uni-card/uni-card.vue
@@ -1,58 +1,36 @@
 <template>
-	<view class="uni-card uni-border"
-		:class="{ 'uni-card--full': isFull === true || isFull === 'true', 'uni-card--shadow': isShadow === true || isShadow === 'true'}">
-		<!-- 基础 -->
-		<view v-if="mode === 'basic' && title" @click.stop="onClick" class="uni-card__head-padding">
-			<view class="uni-card__header uni-border-bottom">
-				<slot name="header">
-					<view v-if="thumbnail" class="uni-card__header-extra-img-view">
-						<image :src="thumbnail" class="uni-card__header-extra-img" />
-					</view>
-					<text class="uni-card__header-title-text">{{ title }}</text>
-					<text v-if="extra" class="uni-card__header-extra-text">{{ extra }}</text>
-				</slot>
+	<view class="uni-card" :class="{ 'uni-card--full': isFull, 'uni-card--shadow': isShadow,'uni-card--border':border}"
+		:style="{'margin':isFull?0:margin,'padding':spacing,'box-shadow':isShadow?shadow:''}">
+		<!-- 封面 -->
+		<slot name="cover">
+			<view v-if="cover" class="uni-card__cover">
+				<image class="uni-card__cover-image" mode="widthFix" @click="onClick('cover')" :src="cover"></image>
 			</view>
-		</view>
-		<!-- 标题 -->
-		<view v-if="mode === 'title'" @click.stop="onClick" class="uni-card__head-padding">
-			<view class="uni-card__title uni-border-bottom">
-				<slot name="header">
-					<view class="uni-card__title-box">
-						<view v-if="thumbnail" class="uni-card__title-header">
-							<image class="uni-card__title-header-image" :src="thumbnail" mode="scaleToFill" />
-						</view>
-						<view class="uni-card__title-content">
-							<text class="uni-card__title-content-title uni-ellipsis">{{ title }}</text>
-							<text class="uni-card__title-content-extra uni-ellipsis">{{ subTitle }}</text>
-						</view>
+		</slot>
+		<slot name="title">
+			<view v-if="title || extra" class="uni-card__header">
+				<!-- 卡片标题 -->
+				<view class="uni-card__header-box" @click="onClick('title')">
+					<view v-if="thumbnail" class="uni-card__header-avatar">
+						<image class="uni-card__header-avatar-image" :src="thumbnail" mode="aspectFit" />
 					</view>
-					<view v-if="extra">
-						<text class="uni-card__header-extra-text">{{ extra }}</text>
+					<view class="uni-card__header-content">
+						<text class="uni-card__header-content-title uni-ellipsis">{{ title }}</text>
+						<text v-if="title&&subTitle"
+							class="uni-card__header-content-subtitle uni-ellipsis">{{ subTitle }}</text>
 					</view>
-				</slot>
+				</view>
+				<view class="uni-card__header-extra" @click="onClick('extra')">
+					<text class="uni-card__header-extra-text">{{ extra }}</text>
+				</view>
 			</view>
+		</slot>
+		<!-- 卡片内容 -->
+		<view class="uni-card__content" :style="{padding:padding}" @click="onClick('content')">
+			<slot></slot>
 		</view>
-		<!-- 图文 -->
-		<view v-if="mode === 'style'" class="uni-card__thumbnailimage" @click.stop="onClick">
-			<view class="uni-card__thumbnailimage-box">
-				<image v-if="thumbnail" class="uni-card__thumbnailimage-image" :src="thumbnail" mode="aspectFill" />
-				<uni-icons v-if="!thumbnail" type="image" size="30" color="#999" />
-			</view>
-			<view v-if="title" class="uni-card__thumbnailimage-title">
-				<text class="uni-card__thumbnailimage-title-text">{{ title }}</text>
-			</view>
-		</view>
-		<!-- 内容 -->
-		<view class="uni-card__content uni-card__content--pd" @click.stop="onClick">
-			<view v-if="mode === 'style' && extra" class=""><text class="uni-card__content-extra">{{ extra }}</text>
-			</view>
-			<slot />
-		</view>
-		<!-- 底部 -->
-		<view v-if="note" class="uni-card__footer uni-border-top">
-			<slot name="footer">
-				<text class="uni-card__footer-text">{{ note }}</text>
-			</slot>
+		<view class="uni-card__actions" @click="onClick('actions')">
+			<slot name="actions"></slot>
 		</view>
 	</view>
 </template>
@@ -63,22 +41,22 @@
 	 * @description 卡片视图组件
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=22
 	 * @property {String} title 标题文字
-	 * @property {String} subTitle 副标题（仅仅mode=title下生效）
+	 * @property {String} subTitle 副标题
+	 * @property {Number} padding 内容内边距
+	 * @property {Number} margin 卡片外边距
+	 * @property {Number} spacing 卡片内边距
 	 * @property {String} extra 标题额外信息
-	 * @property {String} note 底部信息
+	 * @property {String} cover 封面图（本地路径需要引入）
 	 * @property {String} thumbnail 标题左侧缩略图
-	 * @property {String} mode = [basic|style|title] 卡片模式
-	 * 	@value basic 基础卡片
-	 * 	@value style 图文卡片
-	 * 	@value title 标题卡片
-	 * @property {Boolean} isFull = [true | false] 卡片内容是否通栏，为 true 时将去除padding值
-	 * @property {Boolean} isShadow = [true | false] 卡片内容是否开启阴影
+	 * @property {Boolean} is-full = [true | false] 卡片内容是否通栏，为 true 时将去除padding值
+	 * @property {Boolean} is-shadow = [true | false] 卡片内容是否开启阴影
+	 * @property {String} shadow 卡片阴影
+	 * @property {Boolean} border 卡片边框
 	 * @event {Function} click 点击 Card 触发事件
-	 * @example <uni-card title="标题文字" thumbnail="xxx.jpg" extra="额外信息" note="Tips">内容主体，可自定义内容及样式</uni-card>
 	 */
 	export default {
 		name: 'UniCard',
-		emits:['click'],
+		emits: ['click'],
 		props: {
 			title: {
 				type: String,
@@ -88,11 +66,23 @@
 				type: String,
 				default: ''
 			},
+			padding: {
+				type: String,
+				default: '10px'
+			},
+			margin: {
+				type: String,
+				default: '15px'
+			},
+			spacing: {
+				type: String,
+				default: '0 10px'
+			},
 			extra: {
 				type: String,
 				default: ''
 			},
-			note: {
+			cover: {
 				type: String,
 				default: ''
 			},
@@ -100,10 +90,6 @@
 				type: String,
 				default: ''
 			},
-			mode: {
-				type: String,
-				default: 'basic'
-			},
 			isFull: {
 				// 内容区域是否通栏
 				type: Boolean,
@@ -111,300 +97,157 @@
 			},
 			isShadow: {
 				// 是否开启阴影
-				type: [Boolean, String],
-				default: false
+				type: Boolean,
+				default: true
+			},
+			shadow: {
+				type: String,
+				default: '0px 0px 3px 1px rgba(0, 0, 0, 0.08)'
+			},
+			border: {
+				type: Boolean,
+				default: true
 			}
 		},
 		methods: {
-			onClick() {
-				this.$emit('click')
+			onClick(type) {
+				this.$emit('click', type)
 			}
 		}
 	}
 </script>
 
-<style lang="scss" scoped>
-	.uni-card {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		flex: 1;
-		box-shadow: 0 0 0 rgba(0, 0, 0, 0);
-		/* #endif */
-		margin: $uni-spacing-col-lg $uni-spacing-row-lg;
-		background-color: $uni-bg-color;
-		position: relative;
-		flex-direction: column;
-		border-radius: 5px;
-		overflow: hidden;
-		/* #ifdef H5 */
-		cursor: pointer;
-		/* #endif */
-	}
-
+<style lang="scss">
+	$uni-border-3: #EBEEF5 !default;
+	$uni-shadow-base:0 0px 6px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+	$uni-main-color: #3a3a3a !default;
+	$uni-base-color: #6a6a6a !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-spacing-sm: 8px !default;
+	$uni-border-color:$uni-border-3;
+	$uni-shadow: $uni-shadow-base;
+	$uni-card-title: 15px;
+	$uni-cart-title-color:$uni-main-color;
+	$uni-card-subtitle: 12px;
+	$uni-cart-subtitle-color:$uni-secondary-color;
+	$uni-card-spacing: 10px;
+	$uni-card-content-color: $uni-base-color;
 
-
-	.uni-border {
-		position: relative;
-		/* #ifdef APP-NVUE */
-		border-color: $uni-border-color;
-		border-style: solid;
-		border-width: 0.5px;
-		/* #endif */
-		z-index: 1;
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-border:after {
-		content: '';
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		top: 0;
-		right: 0;
-		border: 1px solid $uni-border-color;
-		border-radius: 10px;
-		box-sizing: border-box;
-		width: 200%;
-		height: 200%;
-		transform: scale(0.5);
-		transform-origin: left top;
-		z-index: -1;
-	}
-
-	/* #endif */
-
-	.uni-border-bottom {
-		position: relative;
-		/* #ifdef APP-NVUE */
-		border-bottom-color: $uni-border-color;
-		border-bottom-style: solid;
-		border-bottom-width: 0.5px;
-		/* #endif */
-		z-index: 1;
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-border-bottom:after {
-		content: '';
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		top: 0;
-		right: 0;
-		border-bottom: 1px solid $uni-border-color;
-		box-sizing: border-box;
-		width: 200%;
-		height: 200%;
-		transform: scale(0.5);
-		transform-origin: left top;
-		z-index: -1;
-	}
-
-	/* #endif */
-	.uni-border-top {
-		position: relative;
-		/* #ifdef APP-NVUE */
-		border-top-color: $uni-border-color;
-		border-top-style: solid;
-		border-top-width: 0.5px;
-		/* #endif */
-		z-index: 1;
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-border-top:after {
-		content: '';
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		top: 0;
-		right: 0;
-		border-top: 1px solid $uni-border-color;
-		box-sizing: border-box;
-		width: 200%;
-		height: 200%;
-		transform: scale(0.5);
-		transform-origin: left top;
-		z-index: -1;
-	}
-
-	/* #endif */
-
-	.uni-card__thumbnailimage {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		// display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: center;
-		height: 150px;
-		background-color: #F1F1F1;
-		overflow: hidden;
-	}
-
-	.uni-card__thumbnailimage-box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		height: 150px;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		overflow: hidden;
-	}
-
-	.uni-card__thumbnailimage-image {
-		flex: 1;
-	}
-
-	.uni-card__thumbnailimage-title {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		flex-direction: row;
-		padding: $uni-spacing-col-base $uni-spacing-col-lg;
-		background-color: $uni-bg-color-mask;
-	}
-
-	.uni-card__thumbnailimage-title-text {
-		flex: 1;
-		font-size: $uni-font-size-base;
-		color: #fff;
-	}
-
-	.uni-card__title {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		padding: 10px;
-
-	}
-
-	.uni-card__title-box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		align-items: center;
-		overflow: hidden;
-	}
-
-	.uni-card__title-header {
-		width: 40px;
-		height: 40px;
+	.uni-card {
+		margin: $uni-card-spacing;
+		padding: 0 $uni-spacing-sm;
+		border-radius: 4px;
 		overflow: hidden;
-		border-radius: 5px;
-		padding-right: 10px;
-	}
-
-	.uni-card__title-header-image {
-		width: 40px;
-		height: 40px;
-	}
-
-	.uni-card__title-content {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: center;
+		font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+		background-color: #fff;
 		flex: 1;
-		height: 40px;
-		overflow: hidden;
-	}
-
-	.uni-card__title-content-title {
-		font-size: $uni-font-size-base;
-		line-height: 22px;
-	}
-
-	.uni-card__title-content-extra {
-		font-size: $uni-font-size-sm;
-		line-height: 27px;
-		color: $uni-text-color-grey;
-	}
-
-	.uni-card__header {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		position: relative;
-		flex-direction: row;
-		padding: $uni-spacing-col-lg;
-		align-items: center;
-	}
 
-	.uni-card__header-title {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		margin-right: $uni-spacing-col-base;
-		justify-content: flex-start;
-		align-items: center;
-	}
-
-	.uni-card__header-title-text {
-		font-size: $uni-font-size-lg;
-		flex: 1;
-		color: #333;
-	}
+		.uni-card__cover {
+			position: relative;
+			margin-top: $uni-card-spacing;
+			flex-direction: row;
+			overflow: hidden;
+			border-radius: 4px;
+			.uni-card__cover-image {
+				flex: 1;
+				// width: 100%;
+				/* #ifndef APP-PLUS */
+				vertical-align: middle;
+				/* #endif */
+			}
+		}
 
-	.uni-card__header-extra-img {
-		height: $uni-img-size-sm;
-		width: $uni-img-size-sm;
-		margin-right: $uni-spacing-col-base;
-	}
+		.uni-card__header {
+			display: flex;
+			border-bottom: 1px $uni-border-color solid;
+			flex-direction: row;
+			align-items: center;
+			padding: $uni-card-spacing;
+			overflow: hidden;
+
+			.uni-card__header-box {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				/* #endif */
+				flex: 1;
+				flex-direction: row;
+				align-items: center;
+				overflow: hidden;
+			}
 
-	.uni-card__header-extra-text {
-		flex: 1;
-		margin-left: $uni-spacing-col-base;
-		font-size: $uni-font-size-sm;
-		text-align: right;
-		color: $uni-text-color-grey;
-	}
+			.uni-card__header-avatar {
+				width: 40px;
+				height: 40px;
+				overflow: hidden;
+				border-radius: 5px;
+				margin-right: $uni-card-spacing;
+				.uni-card__header-avatar-image {
+					flex: 1;
+					width: 40px;
+					height: 40px;
+				}
+			}
 
-	.uni-card__content {
-		color: $uni-text-color;
-	}
+			.uni-card__header-content {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				/* #endif */
+				flex-direction: column;
+				justify-content: center;
+				flex: 1;
+				// height: 40px;
+				overflow: hidden;
+
+				.uni-card__header-content-title {
+					font-size: $uni-card-title;
+					color: $uni-cart-title-color;
+					// line-height: 22px;
+				}
+
+				.uni-card__header-content-subtitle {
+					font-size: $uni-card-subtitle;
+					margin-top: 5px;
+					color: $uni-cart-subtitle-color;
+				}
+			}
 
-	.uni-card__content--pd {
-		padding: $uni-spacing-col-lg;
-	}
+			.uni-card__header-extra {
+				line-height: 12px;
 
-	.uni-card__content-extra {
-		font-size: $uni-font-size-base;
-		padding-bottom: 10px;
-		color: $uni-text-color-grey;
-	}
+				.uni-card__header-extra-text {
+					font-size: 12px;
+					color: $uni-cart-subtitle-color;
+				}
+			}
+		}
 
-	.uni-card__footer {
-		justify-content: space-between;
-		padding: $uni-spacing-col-lg;
-	}
+		.uni-card__content {
+			padding: $uni-card-spacing;
+			font-size: 14px;
+			color: $uni-card-content-color;
+			line-height: 22px;
+		}
 
-	.uni-card__footer-text {
-		color: $uni-text-color-grey;
-		font-size: $uni-font-size-sm;
+		.uni-card__actions {
+			font-size: 12px;
+		}
 	}
+
+	.uni-card--border {
+		border: 1px solid $uni-border-color;
+	}
 
 	.uni-card--shadow {
 		position: relative;
 		/* #ifndef APP-NVUE */
-		box-shadow: 0px 0px 5px 1px rgba(0, 0, 0, 0.1);
+		box-shadow: $uni-shadow;
 		/* #endif */
 	}
 
 	.uni-card--full {
 		margin: 0;
+		border-left-width: 0;
+		border-left-width: 0;
 		border-radius: 0;
 	}
 
@@ -424,8 +267,4 @@
 		lines: 1;
 		/* #endif */
 	}
-
-	.uni-card__head-padding {
-		// mar: 12px;
-	}
 </style>
diff --git a/uni_modules/uni-card/package.json b/uni_modules/uni-card/package.json
index 79533648372c7bd339e04d86911da660ce844ea0..f16224de2b73a95a4f4708243b9b5818ba53ff3d 100644
--- a/uni_modules/uni-card/package.json
+++ b/uni_modules/uni-card/package.json
@@ -1,85 +1,90 @@
-{
-  "id": "uni-card",
-  "displayName": "uni-card 卡片",
-  "version": "1.2.1",
-  "description": "Card 组件，提供常见的卡片样式。",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "card",
-    "",
-    "卡片"
-],
-  "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-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"
-        }
-      }
-    }
-  }
-}
+{
+  "id": "uni-card",
+  "displayName": "uni-card 卡片",
+  "version": "1.3.1",
+  "description": "Card 组件，提供常见的卡片样式。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "card",
+    "",
+    "卡片"
+],
+  "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-icons",
+			"uni-scss"
+		],
+    "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"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-card/readme.md b/uni_modules/uni-card/readme.md
index 6f72c837d0df7a5022e84c11257a47e79992f12a..7434e71d2897720b157a92ee90c6f51a7d2bbf98 100644
--- a/uni_modules/uni-card/readme.md
+++ b/uni_modules/uni-card/readme.md
@@ -4,101 +4,9 @@
 > **组件名：uni-card**
 > 代码块： `uCard`
 
-
 卡片视图组件。
 
-### 安装方式
-
-本组件符合[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)
-
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 因为平台兼容问题 ， 目前 APP-NVUE 安卓平台下不支持阴影
-
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<!-- 一般用法 -->
-<uni-card title="标题文字" thumbnail="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" extra="额外信息" note="Tips">
-    内容主体，可自定义内容及样式
-</uni-card>
-
-<!-- 内容通栏 -->
-<uni-card is-full="true" title="DCloud" thumbnail="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" extra="2018.12.12" >
-    <image src="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" style="width: 100%;"></image>
-</uni-card>
-
-<!-- 图文卡片模式 -->
-<uni-card
-	title="标题文字"
-	mode="style"
-	:is-shadow="true"
-	thumbnail="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png"
-	extra="Dcloud 2019-05-20 12:32:19"
-	note="Tips"
->
-		uni-app 是一个使用 Vue.js 开发所有前端应用的框架，开发者编写一套代码，可编译到iOS、Android、H5、以及各种小程序等多个平台。即使不跨端，uni-app同时也是更好的小程序开发框架。
-</uni-card>
-
-<!-- 标题卡片模式 -->
-<uni-card 
-	title="Dcloud" 
-	mode="title" 
-	:is-shadow="true" 
-	thumbnail="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" 
-	extra="技术没有上限" 
-	note="Tips"
->
-	uni-app 是一个使用 Vue.js 开发所有前端应用的框架，开发者编写一套代码，可编译到iOS、Android、H5、以及各种小程序等多个平台。即使不跨端，uni-app同时也是更好的小程序开发框架。
-</uni-card>
-
-<!-- 自定义底部按钮 -->
-<uni-card title="Dcloud" note="true">
-	默认内容
-	<template v-slot:footer>
-		<view class="footer-box">
-			<view>喜欢</view>
-			<view>评论</view>
-			<view>分享</view>
-		</view>
-	</template>
-</uni-card>
-```
-
-## API
-
-### Card Props
-
-|属性名			|类型		|默认值	|说明																			|
-|:-:				|:-:		|:-:		|:-:																			|
-|title			|String	|-			|标题文字																			|
-|extra			|String	|-			|标题额外信息																		|
-|note				|String	|-			|底部信息																			|
-|thumbnail	|String	|-			|标题左侧缩略图,支持网络图片，本地图片，本图片需要传入一个绝对路径，如：`/static/xxx.png`	|
-|mode				|String	|basic	|卡片模式 ，可选值， basic：基础卡片 ；style ：图文卡片 ； title ：标题卡片				|
-|isFull			|Boolean|false	|卡片内容是否通栏，为true时将去除padding值											|
-|isShadow		|Boolean|false	|卡片内容是否开启阴影																|
-
-
-### Card Events
-
-|事件称名	|事件说明						|返回参数	|
-|:-:		|:-:							|:-:		|
-|@click	|点击 Card 触发事件	|-			|
-
-
-### Card Slots
-
-|插槽称名	|说明				|
-|:-:		|:-:				|
-|header	|卡片头部插槽（ 图文卡片 mode="style" 时，不支持）|
-|footer	|卡片底部插槽 |
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-card)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-## 组件示例
 
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/card/card](https://hellouniapp.dcloud.net.cn/pages/extUI/card/card)
\ No newline at end of file
diff --git a/uni_modules/uni-collapse/changelog.md b/uni_modules/uni-collapse/changelog.md
index c0dba72e0ede34c4b8922c78684c63281578b02a..292e4c79f34d8291119fc98bedf97c40b12dd015 100644
--- a/uni_modules/uni-collapse/changelog.md
+++ b/uni_modules/uni-collapse/changelog.md
@@ -1,27 +1,36 @@
+## 1.4.3（2022-01-25）
+- 修复 初始化的时候 ，open 属性失效的bug
+## 1.4.2（2022-01-21）
+- 修复 微信小程序resize后组件收起的bug
+## 1.4.1（2021-11-22）
+- 修复 vue3中个别scss变量无法找到的问题
+## 1.4.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-collapse](https://uniapp.dcloud.io/component/uniui/uni-collapse)
 ## 1.3.3（2021-08-17）
 - 优化 show-arrow 属性默认为true
-## 1.3.2（2021-08-17）
-- 新增 show-arrow 属性，控制是否显示右侧箭头
-## 1.3.1（2021-07-30）
-- 优化 vue3下小程序事件警告的问题
-## 1.3.0（2021-07-30）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 1.2.2（2021-07-21）
-- 修复 由1.2.0版本引起的 change 事件返回 undefined 的Bug
-## 1.2.1（2021-07-21）
-- 优化 组件示例
-## 1.2.0（2021-07-21）
-- 新增 组件折叠动画
-- 新增 value\v-model 属性 ，动态修改面板折叠状态
-- 新增 title 插槽 ，可定义面板标题
-- 新增 border 属性 ，显示隐藏面板内容分隔线
-- 新增 title-border 属性 ，显示隐藏面板标题分隔线
-- 修复 resize 方法失效的Bug
-- 修复 change 事件返回参数不正确的Bug
-- 优化 H5、App 平台自动更具内容更新高度，无需调用 reszie() 方法
-## 1.1.7（2021-05-12）
-- 新增 组件示例地址
-## 1.1.6（2021-02-05）
-- 优化 组件引用关系，通过uni_modules引用组件
-## 1.1.5（2021-02-05）
+## 1.3.2（2021-08-17）
+- 新增 show-arrow 属性，控制是否显示右侧箭头
+## 1.3.1（2021-07-30）
+- 优化 vue3下小程序事件警告的问题
+## 1.3.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.2（2021-07-21）
+- 修复 由1.2.0版本引起的 change 事件返回 undefined 的Bug
+## 1.2.1（2021-07-21）
+- 优化 组件示例
+## 1.2.0（2021-07-21）
+- 新增 组件折叠动画
+- 新增 value\v-model 属性 ，动态修改面板折叠状态
+- 新增 title 插槽 ，可定义面板标题
+- 新增 border 属性 ，显示隐藏面板内容分隔线
+- 新增 title-border 属性 ，显示隐藏面板标题分隔线
+- 修复 resize 方法失效的Bug
+- 修复 change 事件返回参数不正确的Bug
+- 优化 H5、App 平台自动更具内容更新高度，无需调用 reszie() 方法
+## 1.1.7（2021-05-12）
+- 新增 组件示例地址
+## 1.1.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.1.5（2021-02-05）
 - 调整为uni_modules目录规范
\ No newline at end of file
diff --git a/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue b/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
index 32d63739cc75aaad1d35b30c869434441e7e5049..b2aad1fd0bbe4190e674506216f35613b54c9e74 100644
--- a/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
+++ b/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
@@ -11,11 +11,10 @@
 					</view>
 				</slot>
 			</view>
-			<view
-				v-if="showArrow"
+			<view v-if="showArrow"
 				:class="{ 'uni-collapse-item__title-arrow-active': isOpen, 'uni-collapse-item--animation': showAnimation === true }"
 				class="uni-collapse-item__title-arrow">
-				<uni-icons :color="disabled?'#ddd':'#bbb'" size="14" type="arrowdown" />
+				<uni-icons :color="disabled?'#ddd':'#bbb'" size="14" type="bottom" />
 			</view>
 		</view>
 		<view class="uni-collapse-item__wrap" :class="{'is--transition':showAnimation}"
@@ -96,7 +95,7 @@
 				type: Boolean,
 				default: true
 			},
-			showArrow:{
+			showArrow: {
 				type: Boolean,
 				default: true
 			}
@@ -115,31 +114,32 @@
 		watch: {
 			open(val) {
 				this.isOpen = val
-				this.onClick(val,'init')
+				this.onClick(val, 'init')
 			}
 		},
 		updated(e) {
-			this.$nextTick(()=> {
+			this.$nextTick(() => {
 				this.init(true)
 			})
 		},
-		created(){
+		created() {
 			this.collapse = this.getCollapse()
 			this.oldHeight = 0
-		},
-		// #ifndef VUE3
-		// TODO vue2
-		destroyed() {
-			if (this.__isUnmounted) return
-			this.uninstall()
-		},
+			this.onClick(this.open, 'init')
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.uninstall()
+		},
 		// #endif
-		// #ifdef VUE3
-		// TODO vue3
-		unmounted() {
-			this.__isUnmounted = true
-			this.uninstall()
-		},
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.__isUnmounted = true
+			this.uninstall()
+		},
 		// #endif
 		mounted() {
 			if (!this.collapse) return
@@ -181,14 +181,14 @@
 					})
 				}
 			},
-			onClick(isOpen,type) {
+			onClick(isOpen, type) {
 				if (this.disabled) return
 				this.isOpen = isOpen
 				if (this.isOpen && this.collapse) {
 					this.collapse.setAccordion(this)
 				}
-				if(type !== 'init'){
-					this.collapse.onChange(isOpen,this)
+				if (type !== 'init') {
+					this.collapse.onChange(isOpen, this)
 				}
 			},
 			getCollapseHeight(type, index = 0) {
@@ -213,7 +213,7 @@
 						// #endif
 						this.isheight = true
 						if (type) return
-						this.onClick(this.open,'init')
+						this.onClick(this.isOpen, 'init')
 					})
 					.exec()
 			},
@@ -228,7 +228,7 @@
 						// #endif
 						this.isheight = true
 						if (type) return
-						this.onClick(this.open,'init')
+						this.onClick(this.open, 'init')
 					}
 				})
 			},
@@ -249,7 +249,7 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 	.uni-collapse-item {
 		/* #ifndef APP-NVUE */
 		box-sizing: border-box;
@@ -296,7 +296,7 @@
 				/* #endif */
 				&.is-disabled {
 					.uni-collapse-item__title-text {
-						color: $uni-text-color-disable;
+						color: #999;
 					}
 				}
 
@@ -311,14 +311,14 @@
 			}
 
 			&-img {
-				height: $uni-img-size-base;
-				width: $uni-img-size-base;
+				height: 22px;
+				width: 22px;
 				margin-right: 10px;
 			}
 
 			&-text {
 				flex: 1;
-				font-size: $uni-font-size-base;
+				font-size: 14px;
 				/* #ifndef APP-NVUE */
 				white-space: nowrap;
 				color: inherit;
@@ -343,7 +343,7 @@
 				transform: rotate(0deg);
 
 				&-active {
-					transform: rotate(180deg);
+					transform: rotate(-180deg);
 				}
 			}
 
diff --git a/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue b/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue
index f16d8fa7dab0711b095853fdd59f2f344588169d..f87bb253d6feaf6ba446f0f06d3c8e44a3bf008b 100644
--- a/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue
+++ b/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue
@@ -51,7 +51,7 @@
 			}
 		},
 		watch: {
-			dataValue(val) {
+			dataValue(val) {
 				this.setOpen(val)
 			}
 		},
@@ -59,14 +59,15 @@
 			this.childrens = []
 			this.names = []
 		},
-		mounted() {
-			this.setOpen(this.dataValue)
+		mounted() {
+			this.$nextTick(()=>{
+				this.setOpen(this.dataValue)
+			})
 		},
 		methods: {
 			setOpen(val) {
 				let str = typeof val === 'string'
-				let arr = Array.isArray(val)
-
+				let arr = Array.isArray(val)
 				this.childrens.forEach((vm, index) => {
 					if (str) {
 						if (val === vm.nameSync) {
@@ -76,10 +77,10 @@
 							}
 							vm.isOpen = true
 						}
-					}
+					}
 					if (arr) {
 						val.forEach(v => {
-							if (v === vm.nameSync) {
+							if (v === vm.nameSync) {
 								if (this.accordion) {
 									console.warn('accordion 属性为 true ,v-model 类型应该为 string')
 									return
@@ -131,7 +132,7 @@
 		}
 	}
 </script>
-<style lang="scss" scoped>
+<style lang="scss" >
 	.uni-collapse {
 		/* #ifndef APP-NVUE */
 		width: 100%;
@@ -141,6 +142,6 @@
 		flex: 1;
 		/* #endif */
 		flex-direction: column;
-		background-color: $uni-bg-color;
+		background-color: #fff;
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-collapse/package.json b/uni_modules/uni-collapse/package.json
index 59731d5b9abd39d5058be5eb78ad0562b8a7a7fb..65349cf9f7056e882abba6128c0dfc66fc244a91 100644
--- a/uni_modules/uni-collapse/package.json
+++ b/uni_modules/uni-collapse/package.json
@@ -1,88 +1,89 @@
-{
-  "id": "uni-collapse",
-  "displayName": "uni-collapse 折叠面板",
-  "version": "1.3.3",
-  "description": "Collapse 组件，可以折叠 / 展开的内容区域。",
-  "keywords": [
-    "uni-ui",
-    "折叠",
-    "折叠面板",
-    "手风琴"
-],
-  "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-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": "u"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
+{
+  "id": "uni-collapse",
+  "displayName": "uni-collapse 折叠面板",
+  "version": "1.4.3",
+  "description": "Collapse 组件，可以折叠 / 展开的内容区域。",
+  "keywords": [
+    "uni-ui",
+    "折叠",
+    "折叠面板",
+    "手风琴"
+],
+  "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"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-collapse/readme.md b/uni_modules/uni-collapse/readme.md
index 12e872fb1d6f51bdb6fb8259043b1fa3c04b47a2..bc758ebc4f3eee187ee494de5745fe33b69bd3e0 100644
--- a/uni_modules/uni-collapse/readme.md
+++ b/uni_modules/uni-collapse/readme.md
@@ -8,269 +8,5 @@
 
 折叠面板用来折叠/显示过长的内容或者是列表。通常是在多内容分类项使用，折叠不重要的内容，显示重要内容。点击可以展开折叠部分。
 
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 组件需要依赖 `sass` 插件 ，请自行手动安装
-> - `App` 端默认关闭组件动画 ，因为 `height` 动画开销比较大，会导致页面卡顿，请酌情使用动画
-> - 如在使用组件过程从发现卡顿严重，请尝试停用组件动画，问题原因如上
-> - 在小程序端组件内容发生变化，需要手动调用 resize() 方法，手动更新几点信息，避免出现内容错位
-> - 如需自定义组件默认边框颜色等，请使用插槽自定义内容并合理使用 `border ` 和 `title-border` 属性
-> - 折叠面板仅支持嵌套使用，请勿单独使用
-> - 组件支持 nvue ，需要在 `manifest.json > app-plus` 节点下配置 `"nvueStyleCompiler" : "uni-app"` 
-> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-
-
-### 安装方式
-
-本组件符合[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)
-
-
-### 基本用法
-
-使用 `title` 属性指定面板显示内容 
-
-使用 `open` 属性默认打开当前面板
-
-使用 `disabled` 属性禁用面板
-
-
-```html
-<uni-collapse>
-	<uni-collapse-item title="默认开启" :open="true">
-		<text>折叠内容</text>
-	</uni-collapse-item>
-	<uni-collapse-item title="折叠内容">
-			<text>折叠内容</text>
-	</uni-collapse-item>
-	<uni-collapse-item title="禁用状态" disabled>
-		<text>折叠内容</text>
-	</uni-collapse-item>
-</uni-collapse>
-```
-
-### 手风琴效果
-
-使用 `accordion` 属性，可以仅打开一个面板并关闭其他已经打开的面板，效果类似手风琴
-
-设置 `accordion` 属性时，`open` 属性则生效在最后一个组件
-
-```html
-<uni-collapse accordion>
-	<uni-collapse-item title="手风琴效果">
-		<text>折叠内容</text>
-	</uni-collapse-item>
-	<uni-collapse-item title="手风琴效果">
-			<text>折叠内容</text>
-	</uni-collapse-item>
-	<uni-collapse-item title="禁用状态" disabled>
-		<text>折叠内容</text>
-	</uni-collapse-item>
-</uni-collapse>
-```
-
-### 动态设置折叠面板打开状态
-
-使用 `v-model` 属性，动态设置面板的显示状态
-
-使用 `name` 属性设置每个面板的唯一标识，如不设置使用默认索引，从字符串 `"0"` 开始记数
-
-**注意**
-
-- 如果 `accordion` 属性为 `true` 则 `v-model` 类型为 `String`
-- 如果 `accordion` 属性为 `false` 则 `v-model` 类型为 `Array`
-- 请注意 `v-model` 属性与 `open` 属性请勿一起使用 ，建议只使用 `v-model`
-
-```html
-<uni-collapse v-model="value">
-	<uni-collapse-item name="key1" title="默认开启">
-		<text>折叠内容</text>
-	</uni-collapse-item>
-	<uni-collapse-item name="key2" title="默认开启">
-			<text>折叠内容</text>
-	</uni-collapse-item>
-	<uni-collapse-item name="key3" title="默认不开启">
-			<text>折叠内容</text>
-	</uni-collapse-item>
-</uni-collapse>
-```
-
-```javascript
-export default {
-	data(){
-		return {
-			value:['key1','key2'],
-			// 如果设置了 accordion 属性，则使用 string 类型
-			// value:'key1'
-		}
-	}
-}
-```
-
-### 使用动画
-
-使用 `show-animation` 属性开启或关闭面板折叠动画，默认动画开启
-
-**注意**
-
-- `App` 端默认关闭组件动画 ，因为 height 动画开销比较大，会导致页面卡顿，请酌情使用动画，如出现明显卡顿，尝试关闭动画
-
-
-```html
-<uni-collapse>
-	<uni-collapse-item :show-animation="true" title="开启动画">
-		<text>折叠内容</text>
-	</uni-collapse-item>
-	<uni-collapse-item :show-animation="true"  title="开启动画">
-			<text>折叠内容</text>
-	</uni-collapse-item>
-	<uni-collapse-item :show-animation="false"  title="不开启动画">
-			<text>折叠内容</text>
-	</uni-collapse-item>
-</uni-collapse>
-```
-
-### 配置图片
-
-使用 `thumb` 配置图片地址， 可在面板左侧显示一个图片
-
-如需显示更多内容，如图标等，请见下方自定义插槽的说明
-
-```html
-<uni-collapse>
-	<uni-collapse-item title="标题文字"
-		thumb="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png">
-		<view class="content">
-			<text class="text">折叠内容主体，可自定义内容及样式</text>
-		</view>
-	</uni-collapse-item>
-</uni-collapse>
-```
-
-### 自定义插槽
-
-如果需要自定义面板显示，可以使用 `title` 插槽达成完全自定义。下面是一个使用 `uni-list` 的列表示例，需要引入 `uni-list` 组件
-
-```html
-<uni-collapse>
-	<!-- 因为list默认带一条分隔线，所以使用 titleBorder="none" 取消面板的分隔线 -->
-	<uni-collapse-item title-border="none" :border="false">
-		<template v-slot:title>
-			<uni-list>
-				<uni-list-item title="标题使用自定义标题插槽" :show-extra-icon="true" :extra-icon="extraIcon">
-				</uni-list-item>
-			</uni-list>
-		</template>
-		<view class="content">
-			<text class="text">折叠内容主体，可自定义内容及样式</text>
-		</view>
-	</uni-collapse-item>
-</uni-collapse>
-```
-
-**注意**
-
-- 在折叠面板组件中使用list时，在 App-Nvue 下请勿单独使用 uni-list-item，会导致组件无法正常显示，其他平台不做限制
-- 在默认插槽里使用 uni-list 组件与上方示例一样，直接写在默认插槽里即可
-
-## API
-
-### Collapse Props
-
-|属性名|类型|默认值|说明|
-|:-:|:-:|:-:|:-:|
-|value/v-model|String/Array|-|当前激活面板改变时触发(如果是手风琴模式，参数类型为string，否则为array)|
-|accordion|Boolean|false|是否开启手风琴效果	|
-
-### Collapse Event
-
-|事件称名|说明|返回值|
-|:-:|:-:|:-:|
-|@change|切换面板时触发	|切换面板时触发，如果是手风琴模式，返回类型为string，否则为array|
-
-### Collapse Methods
-
-|方法名称|说明|
-|:-:|:-:|
-|resize	|更新当前列表高度|
-
-> **提示**
-> - resize 方法解决动态添加数据，带动画的折叠面板高度不更新的问题
-> - 需要在数据渲染完毕之后使用 `resize` 方法。推荐在 `this.$nextTick()` 中使用
-> - 当前只有小程序端需要调用此方法，H5\App 端已经做了处理，不需要手动更新高度
-> ```html
-> 	<view>
-> 		<uni-collapse ref="collapse" v-model="value">
-> 			<uni-collapse-item title="默认开启" >
-> 				<view class="content">
-> 					<text class="text">{{content}}</text>
-> 				</view>
-> 			</uni-collapse-item>
-> 			<uni-collapse-item title="折叠内容">
-> 				<view class="content">
-> 					<text class="text">折叠内容主体，这是一段比较长内容。默认折叠主要内容，只显示当前项标题。点击标题展开，才能看到这段文字。再次点击标题，折叠内容。</text>
-> 				</view>
-> 			</uni-collapse-item>
-> 		</uni-collapse>
-> 		<button class="button" type="primary" @click="add">动态修改内容</button>
-> 	</view>
-> ```
-> ```javascript
-> export default {
-> 	data() {
-> 		return {
-> 			value:['0'],
-> 			content: '折叠内容主体，可自定义内容及样式，点击按钮修改内容使高度发生变化。',
-> 		}
-> 	},
-> 	methods: {
-> 		add() {
-> 			if (this.content.length > 35) {
-> 				this.content = '折叠内容主体，可自定义内容及样式，点击按钮修改内容使高度发生变化。'
-> 			} else {
-> 				this.content = '折叠内容主体，这是一段比较长内容。通过点击按钮修改后内容后，使组件高度发生变化，在次点击按钮恢复之前的内容和高度。'
-> 			}
-> 			// TODO 小程序中不支持自动更新 ，需要手动resize 更新组件高度
-> 			// #ifdef MP
-> 			this.$nextTick(() => {
-> 				this.$refs.collapse.resize()
-> 			})
-> 			// #endif
-> 		}
-> 	}
-> }
-> ```
-
-
-### CollapseItem Props
-
-|属性名|类型|默认值|说明|
-|:-:|:-:|:-:|:-:|
-|title|String|-|标题文字|
-|thumb|String|-|标题左侧缩略图|
-|disabled|Boolean|false|是否禁用|
-|open|Boolean|false|是否展开面板|
-|show-animation|Boolean|false|开启动画|
-|border|Boolean|true|折叠面板内容分隔线|
-|title-border|String|auto|折叠面板标题分隔线可选值见下方 **TitleBorder Params**|
-|show-arrow|Boolean|true|是否显示右侧箭头|
-
-#### TitleBorder Params
-
-|参数名|说明|
-|:-:|:-:|
-|auto|分隔线自动显示|
-|none|不显示分隔线|
-|show|一直显示分隔线|
-
-### Collapse Slots
-
-|插槽名|说明|
-|:-:| :-:|
-|default|默认插槽|
-|title|面板标题插槽，如使用此插槽禁用样式效果将失效|
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/collapse/collapse](https://hellouniapp.dcloud.net.cn/pages/extUI/collapse/collapse)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-collapse)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-combox/changelog.md b/uni_modules/uni-combox/changelog.md
index 77cedbd7cc4b66c4dcb920ca4026f69ca4cc363c..15256a2e79a8bb35f08b25e22338183edd47a09f 100644
--- a/uni_modules/uni-combox/changelog.md
+++ b/uni_modules/uni-combox/changelog.md
@@ -1,5 +1,10 @@
-## 0.1.0（2021-07-30）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.1（2021-11-23）
+- 优化 label、label-width 属性
+## 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-combox](https://uniapp.dcloud.io/component/uniui/uni-combox)
+## 0.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 0.0.6（2021-05-12）
 - 新增 组件示例地址
 ## 0.0.5（2021-04-21）
diff --git a/uni_modules/uni-combox/components/uni-combox/uni-combox.vue b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
index 3c201d3a2a178309089ddd3d9530dc6af9b06c02..98bf152e30457eb9c037d82859c69af4bdfb9fec 100644
--- a/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
+++ b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
@@ -1,22 +1,26 @@
 <template>
-	<view class="uni-combox">
+	<view class="uni-combox" :class="border ? '' : 'uni-combox__no-border'">
 		<view v-if="label" class="uni-combox__label" :style="labelStyle">
 			<text>{{label}}</text>
 		</view>
 		<view class="uni-combox__input-box">
-			<input class="uni-combox__input" type="text" :placeholder="placeholder" v-model="inputVal" @input="onInput"
-			 @focus="onFocus" @blur="onBlur" />
-			<uni-icons class="uni-combox__input-arrow" type="arrowdown" size="14" @click="toggleSelector"></uni-icons>
-			<view class="uni-combox__selector" v-if="showSelector">
-				<scroll-view scroll-y="true" class="uni-combox__selector-scroll">
-					<view class="uni-combox__selector-empty" v-if="filterCandidatesLength === 0">
-						<text>{{emptyTips}}</text>
-					</view>
-					<view class="uni-combox__selector-item" v-for="(item,index) in filterCandidates" :key="index" @click="onSelectorClick(index)">
-						<text>{{item}}</text>
-					</view>
-				</scroll-view>
-			</view>
+			<input class="uni-combox__input" type="text" :placeholder="placeholder" 
+			placeholder-class="uni-combox__input-plac" v-model="inputVal" @input="onInput" @focus="onFocus" 
+@blur="onBlur" />
+			<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" @click="toggleSelector">
+			</uni-icons>
+		</view>
+		<view class="uni-combox__selector" v-if="showSelector">
+			<view class="uni-popper__arrow"></view>
+			<scroll-view scroll-y="true" class="uni-combox__selector-scroll">
+				<view class="uni-combox__selector-empty" v-if="filterCandidatesLength === 0">
+					<text>{{emptyTips}}</text>
+				</view>
+				<view class="uni-combox__selector-item" v-for="(item,index) in filterCandidates" :key="index" 
+				@click="onSelectorClick(index)">
+					<text>{{item}}</text>
+				</view>
+			</scroll-view>
 		</view>
 	</view>
 </template>
@@ -35,8 +39,12 @@
 	 */
 	export default {
 		name: 'uniCombox',
-		emits:['input','update:modelValue'],
+		emits: ['input', 'update:modelValue'],
 		props: {
+			border: {
+				type: Boolean,
+				default: true
+			},
 			label: {
 				type: String,
 				default: ''
@@ -81,11 +89,9 @@
 		computed: {
 			labelStyle() {
 				if (this.labelWidth === 'auto') {
-					return {}
-				}
-				return {
-					width: this.labelWidth
+					return ""
 				}
+				return `width: ${this.labelWidth}`
 			},
 			filterCandidates() {
 				return this.candidates.filter((item) => {
@@ -144,10 +150,15 @@
 
 <style lang="scss" scoped>
 	.uni-combox {
+		font-size: 14px;
+		border: 1px solid #DCDFE6;
+		border-radius: 4px;
+		padding: 6px 10px;
+		position: relative;
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
-		height: 40px;
+		// height: 40px;
 		flex-direction: row;
 		align-items: center;
 		// border-bottom: solid 1px #DDDDDD;
@@ -172,13 +183,14 @@
 
 	.uni-combox__input {
 		flex: 1;
-		font-size: 16px;
+		font-size: 14px;
 		height: 22px;
 		line-height: 22px;
 	}
 
-	.uni-combox__input-arrow {
-		padding: 10px;
+	.uni-combox__input-plac {
+		font-size: 14px;
+		color: #999;
 	}
 
 	.uni-combox__selector {
@@ -186,13 +198,15 @@
 		box-sizing: border-box;
 		/* #endif */
 		position: absolute;
-		top: 42px;
+		top: calc(100% + 12px);
 		left: 0;
 		width: 100%;
 		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
 		border-radius: 6px;
-		box-shadow: #DDDDDD 4px 4px 8px, #DDDDDD -4px -4px 8px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 		z-index: 2;
+		padding: 4px 0;
 	}
 
 	.uni-combox__selector-scroll {
@@ -202,21 +216,6 @@
 		/* #endif */
 	}
 
-	.uni-combox__selector::before {
-		/* #ifndef APP-NVUE */
-		content: '';
-		/* #endif */
-		position: absolute;
-		width: 0;
-		height: 0;
-		border-bottom: solid 6px #FFFFFF;
-		border-right: solid 6px transparent;
-		border-left: solid 6px transparent;
-		left: 50%;
-		top: -6px;
-		margin-left: -6px;
-	}
-
 	.uni-combox__selector-empty,
 	.uni-combox__selector-item {
 		/* #ifndef APP-NVUE */
@@ -226,8 +225,12 @@
 		line-height: 36px;
 		font-size: 14px;
 		text-align: center;
-		border-bottom: solid 1px #DDDDDD;
-		margin: 0px 10px;
+		// border-bottom: solid 1px #DDDDDD;
+		padding: 0px 10px;
+	}
+
+	.uni-combox__selector-item:hover {
+		background-color: #f9f9f9;
 	}
 
 	.uni-combox__selector-empty:last-child,
@@ -236,4 +239,37 @@
 		border-bottom: none;
 		/* #endif */
 	}
+
+	// picker 弹出层通用的指示小三角
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-combox__no-border {
+		border: none;
+	}
 </style>
diff --git a/uni_modules/uni-combox/package.json b/uni_modules/uni-combox/package.json
index 951a901598afdd9aac83954b290f6aca402fcbec..3fed6140a9c50c12004ce4f5f169e0d57d4efe1e 100644
--- a/uni_modules/uni-combox/package.json
+++ b/uni_modules/uni-combox/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-combox",
   "displayName": "uni-combox 组合框",
-  "version": "0.1.0",
+  "version": "1.0.1",
   "description": "可以选择也可以输入的表单项 ",
   "keywords": [
     "uni-ui",
@@ -42,6 +42,7 @@
   },
   "uni_modules": {
     "dependencies": [
+			"uni-scss",
 			"uni-icons"
 		],
     "encrypt": [],
@@ -78,6 +79,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-combox/readme.md b/uni_modules/uni-combox/readme.md
index edab4d409d273103f364792c5b891f9da57644bf..ffa2cc864bd3b883cede1b9243b114ecf608a275 100644
--- a/uni_modules/uni-combox/readme.md
+++ b/uni_modules/uni-combox/readme.md
@@ -7,46 +7,5 @@
 
 组合框组件。
 
-### 平台兼容性说明
-
-**暂不支持nvue**
-
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-```html
-<uni-combox label="所在城市" :candidates="candidates" placeholder="请选择所在城市" v-model="city"></uni-combox>
-```
-
-## API
-
-### Combox Props
-
-|属性名		|类型			|默认值		|说明								|
-|:-:		|:-:			|:-:		|:-:								|
-|label		|String			|-			|标签文字							|
-|value		|String			|-			|combox的值							|
-|labelWidth	|String			|auto		|标签宽度，有单位字符串，如:'100px'	|
-|placeholder|String			|-			|输入框占位符						|
-|candidates	|Array/String	|[]			|候选字段							|
-|emptyTips	|String			|无匹配项	|无匹配项时的提示语					|
-
-### Combox Events
-
-|事件称名	|说明					|返回值												|
-|:-:		|:-:					|:-:													|
-|@input	|combox输入事件	|返回combox值|
-
-
-
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/combox/combox](https://hellouniapp.dcloud.net.cn/pages/extUI/combox/combox)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-combox)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-countdown/changelog.md b/uni_modules/uni-countdown/changelog.md
index e551725b461a2e2b5e52dec681e5585e6705794a..f25beefca64d4da9c8617324d652dff3b2ab3f36 100644
--- a/uni_modules/uni-countdown/changelog.md
+++ b/uni_modules/uni-countdown/changelog.md
@@ -1,3 +1,13 @@
+## 1.2.2（2022-01-19）
+- 修复 在微信小程序中样式不生效的bug
+## 1.2.1（2022-01-18）
+- 新增 update 方法 ，在动态更新时间后，刷新组件
+## 1.2.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-countdown](https://uniapp.dcloud.io/component/uniui/uni-countdown)
+## 1.1.3（2021-10-18）
+- 重构
+- 新增 font-size 支持自定义字体大小
 ## 1.1.2（2021-08-24）
 - 新增 支持国际化
 ## 1.1.1（2021-07-30）
diff --git a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
index 1f916bd5e8ac788c749b0f8882bd69fc7e31dd86..5f63365e338108d39d1b8b7e4cd98ae70df7faf8 100644
--- a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
+++ b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
@@ -1,25 +1,23 @@
 <template>
 	<view class="uni-countdown">
-		<text v-if="showDay" :style="{ borderColor: borderColor, color: color, backgroundColor: backgroundColor }"
-			class="uni-countdown__number">{{ d }}</text>
-		<text v-if="showDay" :style="{ color: splitorColor }" class="uni-countdown__splitor">{{dayText}}</text>
-		<text :style="{ borderColor: borderColor, color: color, backgroundColor: backgroundColor }"
-			class="uni-countdown__number">{{ h }}</text>
-		<text :style="{ color: splitorColor }" class="uni-countdown__splitor">{{ showColon ? ':' : hourText }}</text>
-		<text :style="{ borderColor: borderColor, color: color, backgroundColor: backgroundColor }"
-			class="uni-countdown__number">{{ i }}</text>
-		<text :style="{ color: splitorColor }" class="uni-countdown__splitor">{{ showColon ? ':' : minuteText }}</text>
-		<text :style="{ borderColor: borderColor, color: color, backgroundColor: backgroundColor }"
-			class="uni-countdown__number">{{ s }}</text>
-		<text v-if="!showColon" :style="{ color: splitorColor }" class="uni-countdown__splitor">{{secondText}}</text>
+		<text v-if="showDay" :style="[timeStyle]" class="uni-countdown__number">{{ d }}</text>
+		<text v-if="showDay" :style="[splitorStyle]" class="uni-countdown__splitor">{{dayText}}</text>
+		<text :style="[timeStyle]" class="uni-countdown__number">{{ h }}</text>
+		<text :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : hourText }}</text>
+		<text :style="[timeStyle]" class="uni-countdown__number">{{ i }}</text>
+		<text :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : minuteText }}</text>
+		<text :style="[timeStyle]" class="uni-countdown__number">{{ s }}</text>
+		<text v-if="!showColon" :style="[splitorStyle]" class="uni-countdown__splitor">{{secondText}}</text>
 	</view>
 </template>
 <script>
 	import {
-	initVueI18n
+		initVueI18n
 	} from '@dcloudio/uni-i18n'
 	import messages from './i18n/index.js'
-	const {	t	} = initVueI18n(messages)
+	const {
+		t
+	} = initVueI18n(messages)
 	/**
 	 * Countdown 倒计时
 	 * @description 倒计时组件
@@ -32,14 +30,14 @@
 	 * @property {Number} second 秒
 	 * @property {Number} timestamp 时间戳
 	 * @property {Boolean} showDay = [true|false] 是否显示天数
-	 * @property {Boolean} showColon = [true|false] 是否以冒号为分隔符
+	 * @property {Boolean} show-colon = [true|false] 是否以冒号为分隔符
 	 * @property {String} splitorColor 分割符号颜色
 	 * @event {Function} timeup 倒计时时间到触发事件
 	 * @example <uni-countdown :day="1" :hour="1" :minute="12" :second="40"></uni-countdown>
 	 */
 	export default {
 		name: 'UniCountdown',
-		emits:['timeup'],
+		emits: ['timeup'],
 		props: {
 			showDay: {
 				type: Boolean,
@@ -55,19 +53,19 @@
 			},
 			backgroundColor: {
 				type: String,
-				default: '#FFFFFF'
-			},
-			borderColor: {
-				type: String,
-				default: '#000000'
+				default: ''
 			},
 			color: {
 				type: String,
-				default: '#000000'
+				default: '#333'
+			},
+			fontSize: {
+				type: Number,
+				default: 14
 			},
 			splitorColor: {
 				type: String,
-				default: '#000000'
+				default: '#333'
 			},
 			day: {
 				type: Number,
@@ -115,15 +113,38 @@
 			secondText(val) {
 				return t("uni-countdown.s")
 			},
+			timeStyle() {
+				const {
+					color,
+					backgroundColor,
+					fontSize
+				} = this
+				return {
+					color,
+					backgroundColor,
+					fontSize: `${fontSize}px`,
+					width: `${fontSize * 22 / 14}px`, // 按字体大小为 14px 时的比例缩放
+ 					lineHeight: `${fontSize * 20 / 14}px`,
+					borderRadius: `${fontSize * 3 / 14}px`,
+				}
+			},
+			splitorStyle() {
+				const { splitorColor, fontSize, backgroundColor } = this
+				return {
+					color: splitorColor,
+					fontSize: `${fontSize * 12 / 14}px`,
+					margin: backgroundColor ? `${fontSize * 4 / 14}px` : ''
+				}
+			}
 		},
 		watch: {
 			day(val) {
 				this.changeFlag()
 			},
-			hour(val) {
+			hour(val) {
 				this.changeFlag()
 			},
-			minute(val) {
+			minute(val) {
 				this.changeFlag()
 			},
 			second(val) {
@@ -193,13 +214,15 @@
 				this.d = day
 				this.h = hour
 				this.i = minute
-				this.s = second
+				this.s = second
 			},
 			startData() {
 				this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
-				if (this.seconds <= 0) {
+				if (this.seconds <= 0) {
+					this.seconds = this.toSeconds(0, 0, 0, 0, 0)
+					this.countDown()
 					return
-				}
+				}
 				clearInterval(this.timer)
 				this.countDown()
 				this.timer = setInterval(() => {
@@ -210,8 +233,11 @@
 					}
 					this.countDown()
 				}, 1000)
+			},
+			update(){
+				this.startData();
 			},
-			changeFlag() {
+			changeFlag() {
 				if (!this.syncFlag) {
 					this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
 					this.startData();
@@ -222,39 +248,24 @@
 	}
 </script>
 <style lang="scss" scoped>
-	$countdown-height: 48rpx;
-	$countdown-width: 52rpx;
+	$font-size: 14px;
 
-	.uni-countdown {
-		/* #ifndef APP-NVUE */
+	.uni-countdown {
 		display: flex;
-		/* #endif */
 		flex-direction: row;
 		justify-content: flex-start;
-		padding: 2rpx 0;
-	}
+		align-items: center;
 
-	.uni-countdown__splitor {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		line-height: $countdown-height;
-		padding: 5rpx;
-		font-size: $uni-font-size-sm;
-	}
+		&__splitor {
+			margin: 0 2px;
+			font-size: $font-size;
+			color: #333;
+		}
 
-	.uni-countdown__number {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-		width: $countdown-width;
-		height: $countdown-height;
-		line-height: $countdown-height;
-		margin: 5rpx;
-		text-align: center;
-		font-size: $uni-font-size-sm;
+		&__number {
+			border-radius: 3px;
+			text-align: center;
+			font-size: $font-size;
+		}
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-countdown/package.json b/uni_modules/uni-countdown/package.json
index 7960b62e9ff41de8976a2f4e3ba1d2ea00f06668..70e99ee7cf615d5a60a69c3dc9495cdf0d75de7b 100644
--- a/uni_modules/uni-countdown/package.json
+++ b/uni_modules/uni-countdown/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-countdown",
   "displayName": "uni-countdown 倒计时",
-  "version": "1.1.2",
+  "version": "1.2.2",
   "description": "CountDown 倒计时组件",
   "keywords": [
     "uni-ui",
@@ -40,7 +40,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": ["uni-scss"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -78,7 +78,7 @@
         },
         "Vue": {
             "vue2": "y",
-            "vue3": "u"
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-countdown/readme.md b/uni_modules/uni-countdown/readme.md
index 25c2a3a2756009668fe23208a4aab6048f088d10..4bcb1aa71694bf71daad7a822897d29485f5b74d 100644
--- a/uni_modules/uni-countdown/readme.md
+++ b/uni_modules/uni-countdown/readme.md
@@ -4,54 +4,7 @@
 > **组件名：uni-countdown**
 > 代码块： `uCountDown`
 
-
 倒计时组件。
 
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<!-- 一般用法 -->
-<uni-countdown :day="1" :hour="1" :minute="12" :second="40"></uni-countdown>
-
-<!-- 不显示天数 -->
-<uni-countdown :show-day="false" :hour="12" :minute="12" :second="12"></uni-countdown>
-
-<!-- 修改颜色 -->
-<uni-countdown color="#FFFFFF" background-color="#00B26A" border-color="#00B26A" :day="1" :hour="2" :minute="30" :second="0"></uni-countdown>
-```
-
-## API
-
-### Countdown Props 
-
-|属性名				|类型	|默认值	|说明				|
-|:-:				|:-:	|:-:	|:-:				|
-|backgroundColor	|String	|#FFFFFF|背景色				|
-|color				|String	|#000000|文字颜色			|
-|splitorColor		|String	|#000000|分割符号颜色			|
-|day				|Number	|0		|天数				|
-|hour				|Number	|0		|小时				|
-|minute				|Number	|0		|分钟				|
-|second				|Number	|0		|秒					|
-|showDay			|Boolean|true	|是否显示天数		|
-|showColon			|Boolean|true	|是否以冒号为分隔符	|
-|start			|Boolean|true	|是否初始化组件后就开始倒计时|
-
-### Countdown Events
-
-|事件称名	|说明							|返回值	|
-|:-:		|:-:							|:-:		|
-|@timeup|倒计时时间到触发事件	|-			|
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/countdown/countdown](https://hellouniapp.dcloud.net.cn/pages/extUI/countdown/countdown)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-countdown)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ 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 47e9f4c23dc963643fed6b72abda998b61656360..d8f420b9a6cfec68b7fd755ab516f26f8f2dfd39 100644
--- a/uni_modules/uni-data-checkbox/changelog.md
+++ b/uni_modules/uni-data-checkbox/changelog.md
@@ -1,36 +1,41 @@
+## 1.0.1（2022-02-07）
+- 修复 multiple 为 true 时，v-model 的值为 null 报错的 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-data-checkbox](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox)
 ## 0.2.5（2021-08-23）
 - 修复 在uni-forms中 modelValue 中不存在当前字段，当前字段必填写也不参与校验的问题
 ## 0.2.4（2021-08-17）
 - 修复 单选 list 模式下 ，icon 为 left 时，选中图标不显示的问题
-## 0.2.3（2021-08-11）
-- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
-## 0.2.2（2021-07-30）
-- 优化 在uni-forms组件，与label不对齐的问题
-## 0.2.1（2021-07-27）
-- 修复 单选默认值为0不能选中的Bug
-## 0.2.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 0.1.11（2021-07-06）
-- 优化 删除无用日志
-## 0.1.10（2021-07-05）
-- 修复 由 0.1.9 引起的非 nvue 端图标不显示的问题
-## 0.1.9（2021-07-05）
-- 修复 nvue 黑框样式问题
-## 0.1.8（2021-06-28）
-- 修复 selectedTextColor 属性不生效的Bug
-## 0.1.7（2021-06-02）
-- 新增 map 属性，可以方便映射text/value属性
-## 0.1.6（2021-05-26）
-- 修复 不关联服务空间的情况下组件报错的Bug
-## 0.1.5（2021-05-12）
-- 新增 组件示例地址
-## 0.1.4（2021-04-09）
-- 修复 nvue 下无法选中的问题
-## 0.1.3（2021-03-22）
-- 新增 disabled属性
-## 0.1.2（2021-02-24）
-- 优化 默认颜色显示
-## 0.1.1（2021-02-24）
-- 新增 支持nvue
-## 0.1.0（2021-02-18）
-- “暂无数据”显示居中
+## 0.2.3（2021-08-11）
+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+## 0.2.2（2021-07-30）
+- 优化 在uni-forms组件，与label不对齐的问题
+## 0.2.1（2021-07-27）
+- 修复 单选默认值为0不能选中的Bug
+## 0.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.1.11（2021-07-06）
+- 优化 删除无用日志
+## 0.1.10（2021-07-05）
+- 修复 由 0.1.9 引起的非 nvue 端图标不显示的问题
+## 0.1.9（2021-07-05）
+- 修复 nvue 黑框样式问题
+## 0.1.8（2021-06-28）
+- 修复 selectedTextColor 属性不生效的Bug
+## 0.1.7（2021-06-02）
+- 新增 map 属性，可以方便映射text/value属性
+## 0.1.6（2021-05-26）
+- 修复 不关联服务空间的情况下组件报错的Bug
+## 0.1.5（2021-05-12）
+- 新增 组件示例地址
+## 0.1.4（2021-04-09）
+- 修复 nvue 下无法选中的问题
+## 0.1.3（2021-03-22）
+- 新增 disabled属性
+## 0.1.2（2021-02-24）
+- 优化 默认颜色显示
+## 0.1.1（2021-02-24）
+- 新增 支持nvue
+## 0.1.0（2021-02-18）
+- “暂无数据”显示居中
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 7d3d52ece4b778e5521347aeaa737bb16aef5d90..300cb5fe6e7e31a60b2bc2c9a15b48dc15ac4315 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
@@ -65,15 +65,9 @@
 	 * @event {Function} change  选中发生变化触发
 	 */
 
-	// import clientdb from './clientdb.js'
 	export default {
 		name: 'uniDataChecklist',
-		// mixins: [clientdb],
 		mixins: [uniCloud.mixinDatacom || {}],
-		// model: {
-		// 	prop: 'modelValue',
-		// 	event: 'update:modelValue'
-		// },
 		emits:['input','update:modelValue','change'],
 		props: {
 			mode: {
@@ -185,8 +179,8 @@
 				},
 				isLocal:true,
 				styles: {
-					selectedColor: '#007aff',
-					selectedTextColor: '#333',
+					selectedColor: '#2979ff',
+					selectedTextColor: '#666',
 				},
 				isTop:0
 			};
@@ -381,7 +375,7 @@
 						selectedArr.push(item[this.map.value])
 					}
 				})
-				return this.dataValue.length > 0 ? this.dataValue : selectedArr
+				return this.dataValue && this.dataValue.length > 0 ? this.dataValue : selectedArr
 			},
 
 			/**
@@ -389,7 +383,7 @@
 			 */
 			setStyleBackgroud(item) {
 				let styles = {}
-				let selectedColor = this.selectedColor?this.selectedColor:'#007aff'
+				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
 				if (this.mode !== 'list') {
 					styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
 				}
@@ -405,7 +399,7 @@
 			setStyleIcon(item) {
 				let styles = {}
 				let classles = ''
-				let selectedColor = this.selectedColor?this.selectedColor:'#007aff'
+				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
 				styles['background-color'] = item.selected?selectedColor:'#fff'
 				styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
 
@@ -422,11 +416,11 @@
 			setStyleIconText(item) {
 				let styles = {}
 				let classles = ''
-				let selectedColor = this.selectedColor?this.selectedColor:'#007aff'
+				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
 				if (this.mode === 'tag') {
-					styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#333'
+					styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#666'
 				} else {
-					styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:selectedColor):'#333'
+					styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:selectedColor):'#666'
 				}
 				if(!item.selected && item.disabled){
 					styles.color = '#999'
@@ -454,7 +448,7 @@
 </script>
 
 <style lang="scss">
-	$checked-color: #007aff;
+	$checked-color: #2979ff;
 	$border-color: #DCDFE6;
 	$disable:0.4;
 
@@ -477,7 +471,7 @@
 	.uni-data-checklist {
 		position: relative;
 		z-index: 0;
-
+		flex: 1;
 		// 多选样式
 		.checklist-group {
 			@include flex;
@@ -510,7 +504,7 @@
 					justify-content: space-between;
 					.checklist-text {
 						font-size: 14px;
-						color: #333;
+						color: #666;
 						margin-left: 5px;
 						line-height: 14px;
 					}
@@ -541,7 +535,7 @@
 					width: 16px;
 					height: 16px;
 					border: 1px solid $border-color;
-					border-radius: 2px;
+					border-radius: 4px;
 					background-color: #fff;
 					z-index: 1;
 					.checkbox__inner-icon {
@@ -657,7 +651,7 @@
 				// 按钮样式
 				&.is--button {
 					margin-right: 10px;
-					padding: 5px 15px;
+					padding: 5px 10px;
 					border: 1px $border-color solid;
 					border-radius: 3px;
 					transition: border-color 0.2s;
@@ -729,7 +723,7 @@
 
 					.checklist-text {
 						margin: 0;
-						color: #333;
+						color: #666;
 					}
 
 					// 禁用
diff --git a/uni_modules/uni-data-checkbox/package.json b/uni_modules/uni-data-checkbox/package.json
index 245595e5030652110030c8c71e91583e385ddf71..64131e75f154b001c2135463a93f064a194c564a 100644
--- a/uni_modules/uni-data-checkbox/package.json
+++ b/uni_modules/uni-data-checkbox/package.json
@@ -1,87 +1,87 @@
-{
-  "id": "uni-data-checkbox",
-  "displayName": "uni-data-checkbox 数据选择器",
-  "version": "0.2.5",
-  "description": "通过数据驱动的单选框和复选框",
-  "keywords": [
-    "uni-ui",
-    "checkbox",
-    "单选",
-    "多选",
-    "单选多选"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": "^3.1.1"
-  },
-  "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-load-more"],
-    "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": "u"
-        }
-      }
-    }
-  }
-}
+{
+  "id": "uni-data-checkbox",
+  "displayName": "uni-data-checkbox 数据选择器",
+  "version": "1.0.1",
+  "description": "通过数据驱动的单选框和复选框",
+  "keywords": [
+    "uni-ui",
+    "checkbox",
+    "单选",
+    "多选",
+    "单选多选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "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-load-more","uni-scss"],
+    "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"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-data-checkbox/readme.md b/uni_modules/uni-data-checkbox/readme.md
index 485008580fc12ce343f67025ba60fec0a60b36f3..6eb253d426b901544142e92748696e89fe0bb2f8 100644
--- a/uni_modules/uni-data-checkbox/readme.md
+++ b/uni_modules/uni-data-checkbox/readme.md
@@ -14,286 +14,5 @@
 
 在uniCloud开发中，`DB Schema`中配置了enum枚举等类型后，在web控制台的[自动生成表单](https://uniapp.dcloud.io/uniCloud/schema?id=autocode)功能中，会自动生成``uni-data-checkbox``组件并绑定好data
 
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 组件需要依赖 `sass` 插件 ，请自行手动安装
-> - 本组件为数据驱动，目的是快速投入使用，只可通过 style 覆盖有限样式，不支持自定义更多样式
-> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-> - 组件支持 nvue ，需要在 `manifest.json > app-plus` 节点下配置 `"nvueStyleCompiler" : "uni-app"` 
-> - 如组件显示有问题 ，请升级 `HBuilderX` 为 `v3.1.0` 以上
-
-
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法
-
-设置 `localdata` 属性后，组件会通过数据渲染出对应的内容，默认显示的是单选框 
-
-需要注意 `:multiple="false"` 时（单选） ， `value/v-model` 的值是 `String|Number` 类型
-
-```html
-<template>
-	<view>
-		<uni-data-checkbox v-model="value" :localdata="range" @change="change"></uni-data-checkbox>
-	</view>
-</template>
-
-```
-
-```javascript
-
-export default {
-	data() { 
-		return {
-			value: 0,
-			range: [{"value": 0,"text": "篮球"	},{"value": 1,"text": "足球"},{"value": 2,"text": "游泳"}]
-		}
-	},
-	methods: {
-		change(e){
-			console.log('e:',e);
-		}
-	}
-}
-```
-
-### 多选框
-
-设置 `multiple` 属性，组件显示为多选框
-
-需要注意 `:multiple="true"` 时（多选） ， `value/v-model` 的值是 `Array` 类型
-
-```html
-<template>
-	<view>
-		<uni-data-checkbox multiple v-model="value" :localdata="range" @change="change"></uni-data-checkbox>
-	</view>
-</template>
-
-```
-
-```javascript
-
-export default {
-	data() { 
-		return {
-			value: [0,2],
-			range: [{"value": 0,"text": "篮球"	},{"value": 1,"text": "足球"},{"value": 2,"text": "游泳"}]
-		}
-	},
-	methods: {
-		change(e){
-			console.log('e:',e);
-		}
-	}
-}
-```
-
-### 设置最大最小值
-
-设置 `:multiple="true"` 时（多选） ，可以设置 `min`、`max` 属性 
-
-如果选中个数小于 `min` 属性设置的值，那么选中内容将不可取消，只有当选中个数大于等于 `min`且小于 `max` 时，才可取消选中
-
-如果选中个数大于等于 `max` 属性设置的值，那么其他未选中内容将不可选
-
-```html
-<template>
-	<view>
-		<uni-data-checkbox min="1" max="2" multiple v-model="value" :localdata="range" @change="change"></uni-data-checkbox>
-	</view>
-</template>
-
-```
-
-```javascript
-
-export default {
-	data() { 
-		return {
-			value: [0,2],
-			range: [{"value": 0,"text": "篮球"	},{"value": 1,"text": "足球"},{"value": 2,"text": "游泳"}]
-		}
-	},
-	methods: {
-		change(e){
-			console.log('e:',e);
-		}
-	}
-}
-```
-
-### 设置禁用
-
-如果需要禁用某项，需要在 `localdata` 属性的数据源中添加 `disable` 属性，而不是在组件中添加 `disable` 属性
-
-```html
-<template>
-	<view>
-		<uni-data-checkbox v-model="value" :localdata="range" @change="change"></uni-data-checkbox>
-	</view>
-</template>
-
-```
-
-```javascript
-
-export default {
-	data() { 
-		return {
-			value: 0,
-			range: [{
-					"value": 0,
-					"text": "篮球"
-				},
-				{
-					"value": 1,
-					"text": "足球",
-					// 禁用当前项
-					"disable":true
-				},
-				{
-					"value": 2,
-					"text": "游泳"
-				}
-			]
-		}
-	},
-	methods: {
-		change(e){
-			console.log('e:',e);
-		}
-	}
-}
-```
-
-
-### 自定义选中颜色
-
-设置 `selectedColor` 属性，可以修改组件选中后的图标及边框颜色
-
-设置 `selectedTextColor` 属性，可以修改组件选中后的文字颜色，如不填写默认同 `selectedColor` 属性 ，`mode` 属性为 `tag` 时，默认为白色
-
-```html
-<template>
-	<view>
-		<uni-data-checkbox　selectedColor＝"red" selectedTextColor="red" multiple v-model="value" :localdata="range" @change="change"></uni-data-checkbox>
-	</view>
-</template>
-
-```
-
-```javascript
-
-export default {
-	data() { 
-		return {
-			value: [0,2],
-			range: [{"value": 0,"text": "篮球"	},{"value": 1,"text": "足球"},{"value": 2,"text": "游泳"}]
-		}
-	},
-	methods: {
-		change(e){
-			console.log('e:',e);
-		}
-	}
-}
-```
-
-### 更多模式
-
-设置 `mode` 属性，可以设置更多显示样式，目前内置样式有四种 `default/list/button/tag` 
-
-如果需要禁用某项，需要在 `localdata` 属性的数据源中添加 `disable` 属性，而不是在组件中添加 `disable` 属性
-
-```html
-<template>
-	<view>
-		<!-- 默认 default -->
-		<uni-data-checkbox v-model="value" :localdata="range" @change="change"></uni-data-checkbox>
-		<!-- 列表 list ，显示左侧图标 -->
-		<uni-data-checkbox mode="list" icon="left" v-model="value" :localdata="range" @change="change"></uni-data-checkbox>
-		<!-- 列表 list ，显示右侧图标 -->
-		<uni-data-checkbox mode="list" icon="right" v-model="value" :localdata="range" @change="change"></uni-data-checkbox>
-		<!-- 按钮 button -->
-		<uni-data-checkbox mode="button" v-model="value" :localdata="range" @change="change"></uni-data-checkbox>
-		<!-- 标签 tag -->
-		<uni-data-checkbox mode="tag" v-model="value" :localdata="range" @change="change"></uni-data-checkbox>
-	</view>
-</template>
-
-```
-
-```javascript
-
-export default {
-	data() { 
-		return {
-			value: 0,
-			range: [{"value": 0,"text": "篮球"	},{"value": 1,"text": "足球"},{"value": 2,"text": "游泳"}]
-		}
-	},
-	methods: {
-		change(e){
-			console.log('e:',e);
-		}
-	}
-}
-```
-
-
-## API
-
-### DataCheckbox Props
-
-| 属性名			| 类型							|可选值									| 默认值| 说明																													|
-| :-:					| :-:								|:-:										|:-:		| :-:																														|
-|value/v-model|Array/String/Number|-											|-			|默认值，multiple=true时为 Array类型，否则为 String或Number类型	|
-|localdata		|Array							|-											|-			|本地渲染数据，												|
-|mode					| String						|default/list/button/tag|default|显示模式			|
-|multiple			|Boolean						|-											|false	|是否多选		|
-|min					|String/Number			|-											|-			|最小选择个数 ，multiple为true时生效		|
-|max					|String/Number			|-											|-			|最大选择个数 ，multiple为true时生效		|
-|wrap					|Boolean						|-											|-			|是否换行显示				|
-|icon					|String							|left/right							|left		|list 列表模式下 icon 显示的位置	|
-|selectedColor|String							|-											|#007aff|选中颜色|
-|selectedTextColor|String					|-											|#333		|选中文本颜色，如不填写则自动显示|
-|emptyText 	|String					|-											|暂无数据		|没有数据时显示的文字 ，本地数据无效|
-|map 				|Object					|-											|{text:'text',value:'value'}		|字段映射，将text/value映射到数据中的其他字段|
-
-#### Localdata Options
-
-`localdata` 属性的格式为数组，数组内每项是对象，需要严格遵循如下格式
-
-|属性名		| 说明				|
-|:-:			| :-:				|
-|text			|显示文本			|
-|value		|选中后的值		|
-|disable	|是否禁用			|
-
-#### Mode Options 
-
-|属性名		| 说明							|
-|:-:			| :-:							|
-|default	|默认值，横向显示		|
-|list			|列表							|
-|button		|按钮							|
-|tag			|标签							|
-
-
-### DataCheckbox Events
-
-| 事件名	| 事件说明								| 返回参数|
-| :-:		| :-:									| :-:			|
-| @change| 选中状态改变时触发事件	| -				|
-
-
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/data-checkbox/data-checkbox](https://hellouniapp.dcloud.net.cn/pages/extUI/data-checkbox/data-checkbox)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-data-picker/changelog.md b/uni_modules/uni-data-picker/changelog.md
index 8d96dc83da45e1c44cb498148af771689f63ca3d..be901afa253c70c10552c4562a7a31201dea8bd5 100644
--- a/uni_modules/uni-data-picker/changelog.md
+++ b/uni_modules/uni-data-picker/changelog.md
@@ -1,74 +1,58 @@
-## 0.4.9（2021-10-28）
-- 修复 VUE2 v-model 概率无效的bug
+## 1.0.4（2022-04-19）
+- 修复 字节小程序 本地数据无法选择下一级的Bug
+## 1.0.3（2022-02-25）
+- 修复 nvue 不支持的 v-show 的 bug
+## 1.0.2（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
+## 1.0.1（2021-11-23）
+- 修复 由上个版本引发的map、v-model等属性不生效的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-data-picker](https://uniapp.dcloud.io/component/uniui/uni-data-picker)
+## 0.4.9（2021-10-28）
+- 修复 VUE2 v-model 概率无效的 bug
 ## 0.4.8（2021-10-27）
-- 修复 v-model 概率无效的bug
+- 修复 v-model 概率无效的 bug
 ## 0.4.7（2021-10-25）
 - 新增 属性 spaceInfo 服务空间配置 HBuilderX 3.2.11+
-- 修复 树型 uniCloud 数据类型为 int 时报错的bug
+- 修复 树型 uniCloud 数据类型为 int 时报错的 bug
 ## 0.4.6（2021-10-19）
-- 修复 非VUE3 v-model 为 0 时无法选中的 bug
+- 修复 非 VUE3 v-model 为 0 时无法选中的 bug
 ## 0.4.5（2021-09-26）
 - 新增 清除已选项的功能（通过 clearIcon 属性配置是否显示按钮），同时提供 clear 方法以供调用，二者等效
 - 修复 readonly 为 true 时报错的 bug
 ## 0.4.4（2021-09-26）
-- 修复 上一版本造成的 map 属性失效的bug
+- 修复 上一版本造成的 map 属性失效的 bug
 - 新增 ellipsis 属性，支持配置 tab 选项长度过长时是否自动省略
 ## 0.4.3（2021-09-24）
-
 - 修复 某些情况下级联未触发的 bug
-
 ## 0.4.2（2021-09-23）
-
 - 新增 提供 show 和 hide 方法，开发者可以通过 ref 调用
 - 新增 选项内容过长自动添加省略号
-
 ## 0.4.1（2021-09-15）
-
 - 新增 map 属性 字段映射，将 text/value 映射到数据中的其他字段
-
 ## 0.4.0（2021-07-13）
-
 - 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-
 ## 0.3.5（2021-06-04）
-
 - 修复 无法加载云端数据的问题
-
 ## 0.3.4（2021-05-28）
-
 - 修复 v-model 无效问题
 - 修复 loaddata 为空数据组时加载时间过长问题
 - 修复 上个版本引出的本地数据无法选择带有 children 的 2 级节点
-
 ## 0.3.3（2021-05-12）
-
 - 新增 组件示例地址
-
 ## 0.3.2（2021-04-22）
-
 - 修复 非树形数据有 where 属性查询报错的问题
-
 ## 0.3.1（2021-04-15）
-
 - 修复 本地数据概率无法回显时问题
-
 ## 0.3.0（2021-04-07）
-
 - 新增 支持云端非树形表结构数据
 - 修复 根节点 parent_field 字段等于 null 时选择界面错乱问题
-
 ## 0.2.0（2021-03-15）
-
 - 修复 nodeclick、popupopened、popupclosed 事件无法触发的问题
-
 ## 0.1.9（2021-03-09）
-
 - 修复 微信小程序某些情况下无法选择的问题
-
 ## 0.1.8（2021-02-05）
-
 - 优化 部分样式在 nvue 上的兼容表现
-
 ## 0.1.7（2021-02-05）
-
 - 调整为 uni_modules 目录规范
diff --git a/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
index efc016f1462bd6b490899821dfc07d099e21e185..a704c02886687b0a2aa77bcca85e074f41030f8c 100644
--- a/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
+++ b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
@@ -16,7 +16,7 @@
 						</view>
 					</scroll-view>
 					<text v-else class="selected-area placeholder">{{placeholder}}</text>
-					<view v-show="clearIcon && !readonly && inputSelected.length" class="icon-clear"
+					<view v-if="clearIcon && !readonly && inputSelected.length" class="icon-clear"
 						@click.stop="clear">
 						<uni-icons type="clear" color="#e1e1e1" size="14"></uni-icons>
 					</view>
@@ -28,6 +28,7 @@
 		</view>
 		<view class="uni-data-tree-cover" v-if="isOpened" @click="handleClose"></view>
 		<view class="uni-data-tree-dialog" v-if="isOpened">
+			<view class="uni-popper__arrow"></view>
 			<view class="dialog-caption">
 				<view class="title-area">
 					<text class="dialog-title">{{popupTitle}}</text>
@@ -181,13 +182,13 @@
 			},
 			show() {
 				this.isOpened = true
-				this.$nextTick(() => {
+				setTimeout(() => {
 					this.$refs.pickerView.updateData({
 						treeData: this._treeData,
 						selected: this.selected,
 						selectedIndex: this.selectedIndex
 					})
-				})
+				}, 200)
 				this.$emit('popupopened')
 			},
 			hide() {
@@ -218,15 +219,15 @@
 				var isTree = dataList.findIndex((item) => {
 					return item.children
 				})
-				if (isTree > -1) {
+				if (isTree > -1) {
 					let inputValue
 					if (Array.isArray(value)) {
 						inputValue = value[value.length - 1]
 						if (typeof inputValue === 'object' && inputValue.value) {
 							inputValue = inputValue.value
 						}
-					} else {
-						inputValue = value
+					} else {
+						inputValue = value
 					}
 					this.inputSelected = this._findNodePath(inputValue, this.localdata)
 					return
@@ -264,7 +265,7 @@
 				}
 				return result
 			},
-			_dispatchEvent(selected) {
+			_dispatchEvent(selected) {
 				let item = {}
 				if (selected.length) {
 					var value = new Array(selected.length)
@@ -272,8 +273,8 @@
 						value[i] = selected[i].value
 					}
 					item = selected[selected.length - 1]
-				} else {
-					item.value = ''
+				} else {
+					item.value = ''
 				}
 				if (this.formItem) {
 					this.formItem.setValue(item.value)
@@ -291,7 +292,7 @@
 	}
 </script>
 
-<style scoped>
+<style >
 	.uni-data-tree {
 		position: relative;
 		font-size: 14px;
@@ -425,7 +426,7 @@
 		display: flex;
 		/* #endif */
 		flex-direction: row;
-		border-bottom: 1px solid #f0f0f0;
+		/* border-bottom: 1px solid #f0f0f0; */
 	}
 
 	.title-area {
@@ -440,7 +441,7 @@
 	}
 
 	.dialog-title {
-		font-weight: bold;
+		/* font-weight: bold; */
 		line-height: 44px;
 	}
 
@@ -483,13 +484,15 @@
 
 		.uni-data-tree-dialog {
 			position: absolute;
-			top: 100%;
+			top: 55px;
 			height: auto;
 			min-height: 400px;
 			max-height: 50vh;
 			background-color: #fff;
-			border-radius: 5px;
-			box-shadow: 0 0 20px 5px rgba(0, 0, 0, .3);
+			border: 1px solid #EBEEF5;
+			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+			border-radius: 4px;
+			overflow: unset;
 		}
 
 		.dialog-caption {
@@ -502,4 +505,35 @@
 	}
 
 	/* #endif */
-</style>
+
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	/* #ifndef APP-NVUE */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+	/* #endif */
+	</style>
diff --git a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
index 8efd48390ca4792c60746ce822591b964dcafa76..e1803010e673e1b6338bffd60de977af6f39923d 100644
--- a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
@@ -58,10 +58,10 @@
 			managedMode: {
 				type: Boolean,
 				default: false
-			},
-			ellipsis: {
-				type: Boolean,
-				default: true
+			},
+			ellipsis: {
+				type: Boolean,
+				default: true
 			}
 		},
 		data() {
@@ -177,7 +177,7 @@
 		}
 	}
 </script>
-<style scoped>
+<style >
 	.uni-data-pickerview {
 		flex: 1;
 		/* #ifndef APP-NVUE */
@@ -288,7 +288,7 @@
 
 	.item {
 		padding: 12px 15px;
-		border-bottom: 1px solid #f0f0f0;
+		/* border-bottom: 1px solid #f0f0f0; */
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
@@ -330,4 +330,4 @@
 		/* #endif */
 		transform: rotate(45deg);
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-data-picker/package.json b/uni_modules/uni-data-picker/package.json
index 0647354f763695637a2be5949772fdb225ade9c0..d1af059e314d3646ab68969579428ce30bef8172 100644
--- a/uni_modules/uni-data-picker/package.json
+++ b/uni_modules/uni-data-picker/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-data-picker",
   "displayName": "uni-data-picker 数据驱动的picker选择器",
-  "version": "0.4.9",
+  "version": "1.0.4",
   "description": "单列、多列级联选择器，常用于省市区城市选择、公司部门选择、多级分类等场景",
   "keywords": [
     "uni-ui",
@@ -44,7 +44,8 @@
   "uni_modules": {
     "dependencies": [
       "uni-load-more",
-			"uni-icons"
+			"uni-icons",
+			"uni-scss"
     ],
     "encrypt": [],
     "platforms": {
diff --git a/uni_modules/uni-data-picker/readme.md b/uni_modules/uni-data-picker/readme.md
index d466274845937e7252a71fbba177b8aff548e736..6cda22406a331df00284904e3955b0d2a2cb37e9 100644
--- a/uni_modules/uni-data-picker/readme.md
+++ b/uni_modules/uni-data-picker/readme.md
@@ -18,269 +18,5 @@
 
 在uniCloud数据表中新建表“uni-id-address”和“opendb-city-china”，这2个表的schema自带foreignKey关联。在“uni-id-address”表的表结构页面使用schema2code生成前端页面，会自动生成地址管理的维护页面，自动从“opendb-city-china”表包含的中国所有省市区信息里选择地址。
 
-
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 组件需要依赖 `sass` 插件 ，请自行手动安装
-> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-> - `<uni-data-picker>` 内部包含了弹出层组件 `<uni-data-pickerview>` 外层的布局可能会影响弹出层，[详情](https://developer.mozilla.org/zh-CN/docs/Web/CSS/Common_CSS_Questions)
-
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`componets`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-## API
-
-### DataPicker Props
-
-|属性名								| 类型						|	可选值 		 | 		默认值			| 说明|
-|:-:									| :-:						|:-:				 | :-:					| :-:	|
-|v-model 							|String/ Number	| -				 	 |	-						|绑定数据|
-|spaceInfo            |Object         |            |              |服务空间配置，[详情](https://uniapp.dcloud.net.cn/uniCloud/init)|
-|localdata						|Array					| 					 |							|数据，[详情](https://gitee.com/dcloud/datacom)|
-|preload 							|Boolean				| true/false |	false				|预加载数据|
-|readonly 						|Boolean				| true/false |	false				|是否禁用|
-|clear-icon 					|Boolean				| true/false |	true				|是否显示清除按钮|
-|ellipsis 						|Boolean				| true/false |	true				|是否隐藏 tab 标签过长的文本|
-|step-searh 					|Boolean				| true/false |	true				|分步查询时，点击节点请求数据|
-|step-search-url			|String					| 					 |							|分步查询时，动态加载云端数据url格式，`https://xxx.com/{parentValue}`(当前版本暂不支持，下版支持)|
-|self-field						|String					| 					 |							|分步查询时当前字段名称|
-|parent-field					|String					| 					 |							|分步查询时父字段名称|
-|collection						|String					| 					 |							|表名。支持输入多个表名，用 `,` 分割|
-|field								|String					| 					 |							|查询字段，多个字段用 `,` 分割|
-|where								|String					| 					 |							|查询条件，内容较多，另见jql文档：[详情](https://uniapp.dcloud.net.cn/uniCloud/uni-clientDB?id=jsquery)|
-|orderby							|String					| 					 |							|排序字段及正序倒叙设置|
-|popup-title					|String					| 					 |							|弹出层标题|
-|map									|Object					|						 |{text:'text',value:'value'}|字段映射，将text/value映射到数据中的其他字段|
-
-> ****
-> `collection/where/orderby` 和 `<unicloud-db>` 的用法一致，[详情](https://uniapp.dcloud.net.cn/uniCloud/unicloud-db)
-
-
-
-### DataPicker Events
-
-|事件称名					| 类型						| 说明																						|
-|:-:							| :-:						|	:-:																						|
-|@change 					|EventHandle		|	选择完成时触发 {detail: {value}}								|
-|@nodeclick				|EventHandle		| 节点被点击时触发																|
-|@stepsearch			|EventHandle		| 动态加载节点数据前触发(当前版本暂不支持，下版支持)	|
-|@popupopened			|EventHandle		| 弹出层弹出时触发																|
-|@popupclosed			|EventHandle		| 弹出层关闭时触发																|
-
-### DataPicker Methods
-
-|方法称名	|说明|参数|
-|:-:|:-:|:-:|
-|show|打开弹出层|-|
-|hide|关闭弹出层|-|
-|clear|清除已选项|-|
-
-**使用方法：**
-```js
-this.$refs.picker.show() // `picker` 为组件的 ref 名称
-```
-
-### DataPicker Slots
-
-|名称|说明|					
-|:-:|:-:|						
-|default|覆盖显示框内容|
-
-
-### 基本用法
-
-#### 云端数据
-
-> **注意事项**
-> - 云端数据需要关联服务空间
-> - 下面示例中使用的表 `opendb-city-china`(中国城市省市区数据，含港澳台), 在[uniCloud控制台](https://unicloud.dcloud.net.cn/)使用opendb创建，[详情](https://gitee.com/dcloud/opendb)
-
-
-```html
-<template>
-  <view>
-    <uni-data-picker placeholder="请选择地址" popup-title="请选择城市" collection="opendb-city-china" field="code as value, name as text" orderby="value asc" :step-searh="true" self-field="code" parent-field="parent_code"
- @change="onchange" @nodeclick="onnodeclick">
-    </uni-data-picker>
-  </view>
-</template>
-```
-
-```js
-<script>
-  export default {
-    data() {
-      return {
-      }
-    },
-    methods: {
-      onchange(e) {
-        const value = e.detail.value
-      },
-      onnodeclick(node) {}
-    }
-  }
-</script>
-
-```
-
-
-
-
-
-#### 本地数据
-
-```html
-<template>
-  <view>
-    <uni-data-picker :localdata="items" popup-title="请选择班级" @change="onchange" @nodeclick="onnodeclick"></uni-data-picker>
-  </view>
-</template>
-```
-
-```js
-<script>
-  export default {
-    data() {
-      return {
-        items: [{
-          text: "一年级",
-          value: "1-0",
-          children: [
-            {
-              text: "1.1班",
-              value: "1-1"
-            },
-            {
-              text: "1.2班",
-              value: "1-2"
-            }
-          ]
-        },
-        {
-          text: "二年级",
-          value: "2-0"
-        },
-        {
-          text: "三年级",
-          value: "3-0"
-        }]
-      }
-    },
-    methods: {
-      onchange(e) {
-        const value = e.detail.value
-      },
-      onnodeclick(node) {
-      }
-    }
-  }
-</script>
-
-```
-
-
-#### 自定义solt
-
-```html
-<uni-data-picker v-slot:default="{data, error, options}" popup-title="请选择所在地区">
-  <view v-if="error" class="error">
-    <text>{{error}}</text>
-  </view>
-  <view v-else-if="data.length" class="selected">
-    <view v-for="(item,index) in data" :key="index" class="selected-item">
-      <text>{{item.text}}</text>
-    </view>
-  </view>
-  <view v-else>
-    <text>请选择</text>
-  </view>
-</uni-data-picker>
-```
-
-
-> **注意事项**
-> `localdata` 和 `collection` 同时配置时，`localdata` 优先
-
-
-
-#### 完整示例
-
-```html
-<template>
-	<view class="container">
-		<uni-data-picker @change="onchange" @nodeclick="onnodeclick" @stepsearch="onstepsearch" @popupopened="onpopupopened"
-		 @popupclosed="onpopupclosed">
-		</uni-data-picker>
-	</view>
-</template>
-```
-
-```js
-<script>
-	export default {
-		data() {
-			return {
-				count: 1
-			}
-		},
-		methods: {
-			onchange(e) {
-				const value = e.detail.value
-			},
-			onnodeclick(node) {
-				// node 当前点击节点
-			},
-			onstepsearch(node, resolve) {
-				if (node.level === 0) {
-					return resolve([{
-						text: 'region1',
-						value: 'region1'
-					}, {
-						text: 'region2',
-						value: 'region1'
-					}]);
-				}
-
-				var hasChild;
-				if (node.text === 'region1') {
-					hasChild = true;
-				} else if (node.text === 'region2') {
-					hasChild = false;
-				} else {
-					hasChild = Math.random() > 0.5;
-				}
-
-				setTimeout(() => {
-					var data;
-					if (hasChild) {
-						data = [{
-							text: 'zone' + this.count++,
-							value: 'zone' + this.count++
-						}, {
-							text: 'zone' + this.count++,
-							value: 'zone' + this.count++
-						}];
-					} else {
-						data = [];
-					}
-
-					resolve(data);
-				}, 500);
-			},
-			onpopupopened() {},
-			onpopupclosed() {}
-		}
-	}
-</script>
-
-```
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/data-picker/data-picker](https://hellouniapp.dcloud.net.cn/pages/extUI/data-picker/data-picker)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-dateformat/changelog.md b/uni_modules/uni-dateformat/changelog.md
index 7006d13a0854c4f636bef64670a4de41526789db..d551d7b88687002c2177d9bcba31b7ae2c3fca44 100644
--- a/uni_modules/uni-dateformat/changelog.md
+++ b/uni_modules/uni-dateformat/changelog.md
@@ -1,3 +1,6 @@
+## 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-dateformat](https://uniapp.dcloud.io/component/uniui/uni-dateformat)
 ## 0.0.5（2021-07-08）
 - 调整 默认时间不再是当前时间，而是显示'-'字符
 ## 0.0.4（2021-05-12）
diff --git a/uni_modules/uni-dateformat/package.json b/uni_modules/uni-dateformat/package.json
index 93023ad9aa63054e368339ae0407d1f97abf584d..99b9df35ac51f1426cd90d96cd764b9d7a3d3dfa 100644
--- a/uni_modules/uni-dateformat/package.json
+++ b/uni_modules/uni-dateformat/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-dateformat",
   "displayName": "uni-dateformat 日期格式化",
-  "version": "0.0.5",
+  "version": "1.0.0",
   "description": "日期格式化组件，可以将日期格式化为1分钟前、刚刚等形式",
   "keywords": [
     "uni-ui",
@@ -42,7 +42,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": ["uni-scss"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -77,6 +77,10 @@
         "快应用": {
           "华为": "y",
           "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-dateformat/readme.md b/uni_modules/uni-dateformat/readme.md
index 7d2da4aa033e718269d8d3d662ce98b4e788c234..37ddb6ecef2875ce33687da3f815de4274d25914 100644
--- a/uni_modules/uni-dateformat/readme.md
+++ b/uni_modules/uni-dateformat/readme.md
@@ -7,71 +7,5 @@
 
 日期格式化组件。
 
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<!-- 一般用法 -->
-<uni-dateformat date="2020/10/20 20:20:20"></uni-dateformat>
-
-<!-- 不显示刚刚/马上/xx分钟前 -->
-<uni-dateformat date="2020/10/20 20:20:20" :threshold="[0,0]"></uni-dateformat>
-```
-
-## API
-
-### Dateformat Props
-
-|属性名		|类型							|默认值					|说明												|
-|:-:		|:-:							|:-:					|:-:												|
-|date		|Object&#124;String&#124;Number	|Date.now()				|要格式化的日期对象/日期字符串/时间戳				|
-|threshold	|Array							|[0, 0]					|转化类型阈值										|
-|format		|String							|'yyyy/MM/dd hh:mm:ss'	|格式字符串											|
-|locale		|String							|zh						|格式化使用的语言，目前支持zh（中文）、en（英文）	|
-
-
-#### Threshold Options
-
-格式化组件会对时间进行用户友好转化，threshold就是用来控制转化的时间阈值的。
-
-以`[60000, 3600000]`为例，将传入时间与当前时间差的绝对值记为delta（单位毫秒）
-
-- `delta < 60000`时，时间会被转化为“刚刚|马上”
-- `delta >= 60000 && delta < 3600000`时，时间会被转化为“xx分钟前|xx分钟后”，如果超过1小时会显示成“xx小时前|xx小时后”，以此类推
-- `delta >= 3600000`时，会按照format参数传入的格式进行格式化
-
-如果不想转化为“马上|刚刚”可以传入`:threshold = "[0,3600000]"`。默认值`[0,0]`既不会转换为“马上|刚刚”也不会转化为“xx分钟前|xx分钟后”
-
-#### Format Options
-
-format接收字符以及含义如下：
-
-|字符	|说明							|
-|:-:	|:-:							|
-|yyyy	|四位年份						|
-|yy		|两位年份						|
-|MM		|两位月份（不足两位在前面补0）	|
-|M		|月份，不自动补0				|
-|dd		|两位天（不足两位在前面补0）	|
-|d		|天，不自动补0					|
-|hh		|两位小时（不足两位在前面补0）	|
-|h		|小时，不自动补0				|
-|mm		|两位分钟（不足两位在前面补0）	|
-|m		|分钟，不自动补0				|
-|ss		|两位秒（不足两位在前面补0）	|
-|s		|秒，不自动补0					|
-|SSS	|三位毫秒（不足三位在前面补0）	|
-|S		|毫秒，不自动补0				|
-
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/dateformat/dateformat](https://hellouniapp.dcloud.net.cn/pages/extUI/dateformat/dateformat)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-dateformat)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/changelog.md b/uni_modules/uni-datetime-picker/changelog.md
index 4182e0c2148f2f6a623c69fddb1d06a778170689..9611a30e6268e12a6e6612f793243608c4e34acd 100644
--- a/uni_modules/uni-datetime-picker/changelog.md
+++ b/uni_modules/uni-datetime-picker/changelog.md
@@ -1,3 +1,16 @@
+## 2.2.4（2022-03-31）
+- 修复 Vue3 下动态赋值,单选类型未响应的 bug
+## 2.2.3（2022-03-28）
+- 修复 Vue3 下动态赋值未响应的 bug
+## 2.2.2（2021-12-10）
+- 修复 clear-icon 属性在小程序平台不生效的 bug
+## 2.2.1（2021-12-10）
+- 修复 日期范围选在小程序平台，必须多点击一次才能取消选中状态的 bug
+## 2.2.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-datetime-picker](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+## 2.1.5（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
 ## 2.1.4（2021-09-10）
 - 修复 hide-second 在移动端的 bug
 - 修复 单选赋默认值时，赋值日期未高亮的 bug
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
index 7c9a093c898e3b039f65c3f67e1449d529b80685..1c95c68decb8f8deead93caf8f750f0c87721e43 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
@@ -6,7 +6,6 @@
 		'uni-calendar-item--after-checked-x':weeks.afterMultiple,
 		}" @click="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)">
 		<view class="uni-calendar-item__weeks-box-item" :class="{
-				'uni-calendar-item--isDay-text': weeks.isDay,
 				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && (calendar.userChecked || !checkHover),
 				'uni-calendar-item--checked-range-text': checkHover,
 				'uni-calendar-item--before-checked':weeks.beforeMultiple,
@@ -15,8 +14,9 @@
 				'uni-calendar-item--disable':weeks.disable,
 				}">
 			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
-			<text class="uni-calendar-item__weeks-box-text">{{weeks.date}}</text>
+			<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
 		</view>
+		<view :class="{'uni-calendar-item--isDay': weeks.isDay}"></view>
 	</view>
 </template>
 
@@ -61,7 +61,7 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
 	.uni-calendar-item__weeks-box {
 		flex: 1;
 		/* #ifndef APP-NVUE */
@@ -70,18 +70,20 @@
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		margin: 3px 0;
+		margin: 1px 0;
+		position: relative;
 	}
 
 	.uni-calendar-item__weeks-box-text {
-		font-size: 12px;
-		// font-size: $uni-font-size-base;
-		// color: $uni-text-color;
+		font-size: 14px;
+		// font-family: Lato-Bold, Lato;
+		font-weight: bold;
+		color: #455997;
 	}
 
 	.uni-calendar-item__weeks-lunar-text {
-		font-size: $uni-font-size-sm;
-		color: $uni-text-color;
+		font-size: 12px;
+		color: #333;
 	}
 
 	.uni-calendar-item__weeks-box-item {
@@ -107,38 +109,43 @@
 		width: 8px;
 		height: 8px;
 		border-radius: 8px;
-		background-color: $uni-color-error;
+		background-color: #dd524d;
 
 	}
 
 	.uni-calendar-item__weeks-box .uni-calendar-item--disable {
 		// background-color: rgba(249, 249, 249, $uni-opacity-disabled);
-		color: $uni-text-color-disable;
 		cursor: default;
 	}
 
-	.uni-calendar-item__weeks-box .uni-calendar-item--isDay-text {
-		color: $uni-color-primary;
+	.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+		color: #D1D1D1;
 	}
 
 	.uni-calendar-item--isDay {
-		background-color: $uni-color-primary;
-		opacity: 0.8;
-		color: #fff;
+		position: absolute;
+		top: 10px;
+		right: 17%;
+		background-color: #dd524d;
+		width:6px;
+		height: 6px;
+		border-radius: 50%;
 	}
 
 	.uni-calendar-item--extra {
-		color: $uni-color-error;
+		color: #dd524d;
 		opacity: 0.8;
 	}
 
 	.uni-calendar-item__weeks-box .uni-calendar-item--checked {
-		background-color: $uni-color-primary;
-		// border-radius: 50%;
+		background-color: #007aff;
+		border-radius: 50%;
 		box-sizing: border-box;
-		border: 6px solid #f2f6fc;
+		border: 3px solid #fff;
+	}
+
+	.uni-calendar-item--checked .uni-calendar-item--checked-text {
 		color: #fff;
-		opacity: 0.8;
 	}
 
 	.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
@@ -146,36 +153,33 @@
 	}
 
 	.uni-calendar-item--multiple {
-		background-color:  #f2f6fc;
+		background-color:  #F6F7FC;
 		// color: #fff;
-		opacity: 0.8;
 	}
 
-	.uni-calendar-item--multiple .uni-calendar-item--before-checked {
+	.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
 		background-color: #409eff;
-		color: #fff !important;
-		// border-radius: 50%;
+		border-radius: 50%;
 		box-sizing: border-box;
-		border: 6px solid #f2f6fc;
+		border: 3px solid #F6F7FC;
 	}
 
-	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
-		background-color: #409eff;;
-		color: #fff !important;
-		// border-radius: 50%;
-		box-sizing: border-box;
-		border: 6px solid #f2f6fc;
+	.uni-calendar-item--before-checked .uni-calendar-item--checked-text,
+	.uni-calendar-item--after-checked .uni-calendar-item--checked-text {
+		color: #fff;
 	}
 
 	.uni-calendar-item--before-checked-x {
-		// border-top-left-radius: 25px;
-		// border-bottom-left-radius: 25px;
-		background-color: #f2f6fc;
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		box-sizing: border-box;
+		background-color: #F6F7FC;
 	}
 
 	.uni-calendar-item--after-checked-x {
-		// border-top-right-radius: 25px;
-		// border-bottom-right-radius: 25px;
-		background-color: #f2f6fc;
+		border-top-right-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: #F6F7FC;
 	}
 </style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
index d04b9cf23ba1d2aec7082721506bdd3ac6d4f835..548849d84637cb25828dbc27e3dfe777f3e0d741 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -3,26 +3,30 @@
 		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
 			@click="clean"></view>
 		<view v-if="insert || show" class="uni-calendar__content"
-			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow}">
-
-			<view class="uni-calendar__header">
+			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow, 'uni-calendar__content-mobile': aniMaskShow}">
+			<view class="uni-calendar__header" :class="{'uni-calendar__header-mobile' :!insert}">
 				<view v-if="left" class="uni-calendar__header-btn-box" @click.stop="pre">
 					<view class="uni-calendar__header-btn uni-calendar--left"></view>
 				</view>
 				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
-					<text class="uni-calendar__header-text">{{ (nowDate.year||'') +' / '+( nowDate.month||'')}}</text>
+					<text
+						class="uni-calendar__header-text">{{ (nowDate.year||'') + ' 年 ' + ( nowDate.month||'') +' 月'}}</text>
 				</picker>
 				<view v-if="right" class="uni-calendar__header-btn-box" @click.stop="next">
 					<view class="uni-calendar__header-btn uni-calendar--right"></view>
 				</view>
-				<!-- <text class="uni-calendar__backtoday" @click="backtoday">回到今天</text> -->
+				<view v-if="!insert" class="dialog-close" @click="clean">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
 
+				<!-- <text class="uni-calendar__backtoday" @click="backtoday">回到今天</text> -->
 			</view>
 			<view class="uni-calendar__box">
 				<view v-if="showMonth" class="uni-calendar__box-bg">
 					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
 				</view>
-				<view class="uni-calendar__weeks">
+				<view class="uni-calendar__weeks" style="padding-bottom: 7px;">
 					<view class="uni-calendar__weeks-day">
 						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
 					</view>
@@ -66,22 +70,23 @@
 				<view class="uni-date-changed--time-start">
 					<view class="uni-date-changed--time-date">{{tempRange.before ? tempRange.before : startDateText}}
 					</view>
-					<time-picker type="time" :start="reactStartTime" v-model="timeRange.startTime" :border="false" :hide-second="hideSecond"
-						:disabled="!tempRange.before" class="time-picker-style">
+					<time-picker type="time" :start="reactStartTime" v-model="timeRange.startTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
 					</time-picker>
 				</view>
 				<uni-icons type="arrowthinright" color="#999" style="line-height: 50px;"></uni-icons>
 				<view class="uni-date-changed--time-end">
 					<view class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : endDateText}}</view>
-					<time-picker type="time" :end="reactEndTime" v-model="timeRange.endTime" :border="false" :hide-second="hideSecond"
-						:disabled="!tempRange.after" class="time-picker-style">
+					<time-picker type="time" :end="reactEndTime" v-model="timeRange.endTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.after" class="time-picker-style">
 					</time-picker>
 				</view>
 			</view>
-			<view v-if="!insert" class="uni-date-changed uni-calendar__header" @click="confirm">
-				<view class="uni-calendar__header-btn-box">
+			<view v-if="!insert" class="uni-date-changed uni-date-btn--ok">
+				<!-- <view class="uni-calendar__header-btn-box">
 					<text class="uni-calendar__button-text uni-calendar--fixed-width">{{okText}}</text>
-				</view>
+				</view> -->
+				<view class="uni-datetime-picker--btn" @click="confirm">确认</view>
 			</view>
 		</view>
 	</view>
@@ -187,10 +192,10 @@
 			checkHover: {
 				type: Boolean,
 				default: true
-			},
-			hideSecond: {
-				type: [Boolean],
-				default: false
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
 			},
 			pleStatus: {
 				type: Object,
@@ -228,25 +233,25 @@
 			date: {
 				immediate: true,
 				handler(newVal, oldVal) {
-					if (!this.range) {
+					if (!this.range) {
 						this.tempSingleDate = newVal
 						setTimeout(() => {
 							this.init(newVal)
 						}, 100)
 					}
 				}
-			},
-			defTime: {
-				immediate: true,
-				handler(newVal, oldVal) {
-					if (!this.range) {
-						this.time = newVal
-					} else {
-						// console.log('-----', newVal);
-						this.timeRange.startTime = newVal.start
-						this.timeRange.endTime = newVal.end
-					}
-				}
+			},
+			defTime: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!this.range) {
+						this.time = newVal
+					} else {
+						// console.log('-----', newVal);
+						this.timeRange.startTime = newVal.start
+						this.timeRange.endTime = newVal.end
+					}
+				}
 			},
 			startDate(val) {
 				this.cale.resetSatrtDate(val)
@@ -361,7 +366,6 @@
 			})
 			// 选中某一天
 			// this.cale.setDate(this.date)
-
 			this.init(this.date)
 			// this.setDay
 		},
@@ -411,8 +415,8 @@
 				} else {
 					this.time = ''
 					this.tempSingleDate = ''
-				}
-				this.calendar.fullDate = ''
+				}
+				this.calendar.fullDate = ''
 				this.setDate()
 			},
 
@@ -425,7 +429,6 @@
 			 * @param {Object} date
 			 */
 			init(date) {
-
 				this.cale.setDate(date)
 				this.weeks = this.cale.weeks
 				this.nowDate = this.calendar = this.cale.getInfo(date)
@@ -591,7 +594,7 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
 	.uni-calendar {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -605,7 +608,7 @@
 		top: 0;
 		left: 0;
 		right: 0;
-		background-color: $uni-bg-color-mask;
+		background-color: rgba(0, 0, 0, 0.4);
 		transition-property: opacity;
 		transition-duration: 0.3s;
 		opacity: 0;
@@ -639,6 +642,12 @@
 		background-color: #fff;
 	}
 
+	.uni-calendar__content-mobile {
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.1);
+	}
+
 	.uni-calendar__header {
 		position: relative;
 		/* #ifndef APP-NVUE */
@@ -648,9 +657,11 @@
 		justify-content: center;
 		align-items: center;
 		height: 50px;
-		// border-bottom-color: $uni-border-color;
-		// border-bottom-style: solid;
-		// border-bottom-width: 1px;
+	}
+
+	.uni-calendar__header-mobile {
+		padding: 10px;
+		padding-bottom: 0;
 	}
 
 	.uni-calendar--fixed-top {
@@ -659,14 +670,13 @@
 		/* #endif */
 		flex-direction: row;
 		justify-content: space-between;
-		border-top-color: $uni-border-color;
+		border-top-color: rgba(0, 0, 0, 0.4);
 		border-top-style: solid;
 		border-top-width: 1px;
 	}
 
 	.uni-calendar--fixed-width {
 		width: 50px;
-		// padding: 0 15px;
 	}
 
 	.uni-calendar__backtoday {
@@ -680,21 +690,21 @@
 		font-size: 12px;
 		border-top-left-radius: 25px;
 		border-bottom-left-radius: 25px;
-		color: $uni-text-color;
-		background-color: $uni-bg-color-hover;
+		color: #fff;
+		background-color: #f1f1f1;
 	}
 
 	.uni-calendar__header-text {
 		text-align: center;
 		width: 100px;
-		font-size: $uni-font-size-base;
-		color: $uni-text-color;
+		font-size: 15px;
+		color: #666;
 	}
 
 	.uni-calendar__button-text {
 		text-align: center;
 		width: 100px;
-		font-size: $uni-font-size-base;
+		font-size: 14px;
 		color: #007aff;
 		/* #ifndef APP-NVUE */
 		letter-spacing: 3px;
@@ -713,12 +723,12 @@
 	}
 
 	.uni-calendar__header-btn {
-		width: 8px;
-		height: 8px;
-		border-left-color: $uni-text-color-placeholder;
+		width: 9px;
+		height: 9px;
+		border-left-color: #808080;
 		border-left-style: solid;
 		border-left-width: 1px;
-		border-top-color: $uni-color-subtitle;
+		border-top-color: #555555;
 		border-top-style: solid;
 		border-top-width: 1px;
 	}
@@ -760,10 +770,13 @@
 
 	.uni-calendar__weeks-day-text {
 		font-size: 12px;
+		color: #B2B2B2;
 	}
 
 	.uni-calendar__box {
 		position: relative;
+		// padding: 0 10px;
+		padding-bottom: 7px;
 	}
 
 	.uni-calendar__box-bg {
@@ -782,7 +795,7 @@
 	.uni-calendar__box-bg-text {
 		font-size: 200px;
 		font-weight: bold;
-		color: $uni-text-color-grey;
+		color: #999;
 		opacity: 0.1;
 		text-align: center;
 		/* #ifndef APP-NVUE */
@@ -795,12 +808,17 @@
 		// line-height: 50px;
 		text-align: center;
 		color: #333;
-		border-top-color: $uni-border-color;
+		border-top-color: #DCDCDC;
+		;
 		border-top-style: solid;
 		border-top-width: 1px;
 		flex: 1;
 	}
 
+	.uni-date-btn--ok {
+		padding: 20px 15px;
+	}
+
 	.uni-date-changed--time-start {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -834,4 +852,47 @@
 	.mr-10 {
 		margin-right: 10px;
 	}
-</style>
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 25px;
+		margin-top: 10px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #737987;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.uni-datetime-picker--btn {
+		border-radius: 100px;
+		height: 40px;
+		line-height: 40px;
+		background-color: #007aff;
+		color: #fff;
+		font-size: 16px;
+		letter-spacing: 5px;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-datetime-picker--btn:active {
+		opacity: 0.7;
+	}
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
index 362b4f8fec775694bbea28c913f763400f15623f..987bba61ccf05ffb0ae20bed64553dcc192e5752 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -5,16 +5,12 @@
 				<view class="uni-date-editor--x" :class="{'uni-date-editor--x__disabled': disabled,
 		'uni-date-x--border': border}">
 					<view v-if="!isRange" class="uni-date-x uni-date-single">
-						<view class="uni-date__icon-logo">
-							<image class="uni-date-editor--logo" :src="iconBase64" mode=""></image>
-						</view>
+						<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
 						<input class="uni-date__x-input" type="text" v-model="singleVal"
 							:placeholder="singlePlaceholderText" :disabled="true" />
 					</view>
 					<view v-else class="uni-date-x uni-date-range">
-						<view class="uni-date__icon-logo">
-							<image class="uni-date-editor--logo" :src="iconBase64" mode=""></image>
-						</view>
+						<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
 						<input class="uni-date__x-input t-c" type="text" v-model="range.startDate"
 							:placeholder="startPlaceholderText" :disabled="true" />
 						<slot>
@@ -23,9 +19,8 @@
 						<input class="uni-date__x-input t-c" type="text" v-model="range.endDate"
 							:placeholder="endPlaceholderText" :disabled="true" />
 					</view>
-					<view v-show="clearIcon && !disabled && (singleVal || (range.startDate && range.endDate))"
-						class="uni-date__icon-clear" @click.stop="clear">
-						<uni-icons type="clear" color="#e1e1e1" size="14"></uni-icons>
+					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
+						<uni-icons type="clear" color="#e1e1e1" size="18"></uni-icons>
 					</view>
 				</view>
 			</slot>
@@ -34,7 +29,8 @@
 		<view v-show="popup" class="uni-date-mask" @click="close"></view>
 		<view v-if="!isPhone" ref="datePicker" v-show="popup" class="uni-date-picker__container">
 			<view v-if="!isRange" class="uni-date-single--x" :style="popover">
-				<view v-show="hasTime" class="uni-date-changed popup-x-header">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="uni-date-changed popup-x-header">
 					<input class="uni-date__input t-c" type="text" v-model="tempSingleDate"
 						:placeholder="selectDateText" />
 					<time-picker type="time" v-model="time" :border="false" :disabled="!tempSingleDate"
@@ -43,9 +39,9 @@
 							:disabled="!tempSingleDate" />
 					</time-picker>
 				</view>
-				<calendar ref="pcSingle" class="uni-date_calendar-pc" :showMonth="false"
-					:start-date="caleRange.startDate" :end-date="caleRange.endDate" :date="defSingleDate"
-					@change="singleChange" />
+				<calendar ref="pcSingle" :showMonth="false" :start-date="caleRange.startDate"
+					:end-date="caleRange.endDate" :date="defSingleDate" @change="singleChange"
+					style="padding: 0 8px;" />
 				<view v-if="hasTime" class="popup-x-footer">
 					<!-- <text class="">此刻</text> -->
 					<text class="confirm" @click="confirmSingleChange">{{okText}}</text>
@@ -54,7 +50,8 @@
 			</view>
 
 			<view v-else class="uni-date-range--x" :style="popover">
-				<view v-show="hasTime" class="popup-x-header uni-date-changed">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="popup-x-header uni-date-changed">
 					<view class="popup-x-header--datetime">
 						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
 							:placeholder="startDateText" />
@@ -77,14 +74,13 @@
 					</view>
 				</view>
 				<view class="popup-x-body">
-					<calendar ref="left" class="uni-date_calendar-pc" :showMonth="false"
-						:start-date="caleRange.startDate" :end-date="caleRange.endDate" :range="true"
-						@change="leftChange" :pleStatus="endMultipleStatus" @firstEnterCale="updateRightCale"
-						@monthSwitch="leftMonthSwitch" />
-					<calendar ref="right" class="uni-date_calendar-pc" :showMonth="false"
-						:start-date="caleRange.startDate" :end-date="caleRange.endDate" :range="true"
-						@change="rightChange" :pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
-						@monthSwitch="rightMonthSwitch" style="border-left: 1px solid #F1F1F1;" />
+					<calendar ref="left" :showMonth="false" :start-date="caleRange.startDate"
+						:end-date="caleRange.endDate" :range="true" @change="leftChange" :pleStatus="endMultipleStatus"
+						@firstEnterCale="updateRightCale" @monthSwitch="leftMonthSwitch" style="padding: 0 8px;" />
+					<calendar ref="right" :showMonth="false" :start-date="caleRange.startDate"
+						:end-date="caleRange.endDate" :range="true" @change="rightChange"
+						:pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
+						@monthSwitch="rightMonthSwitch" style="padding: 0 8px;border-left: 1px solid #F1F1F1;" />
 				</view>
 				<view v-if="hasTime" class="popup-x-footer">
 					<text class="" @click="clear">{{clearText}}</text>
@@ -92,7 +88,7 @@
 				</view>
 			</view>
 		</view>
-		<calendar v-if="isPhone" ref="mobile" :clearDate="false" :date="defSingleDate" :defTime="reactMobDefTime"
+		<calendar v-show="isPhone" ref="mobile" :clearDate="false" :date="defSingleDate" :defTime="reactMobDefTime"
 			:start-date="caleRange.startDate" :end-date="caleRange.endDate" :selectableTimes="mobSelectableTime"
 			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :typeHasTime="hasTime" :insert="false"
 			:hideSecond="hideSecond" @confirm="mobileChange" />
@@ -104,10 +100,10 @@
 	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3962
 	 * @property {String} type 选择器类型
-	 * @property {String|Array} value 绑定值
+	 * @property {String|Number|Array|Date} value 绑定值
 	 * @property {String} placeholder 单选择时的占位内容
 	 * @property {String} start 起始时间
-	 * @property {String} start 终止时间
+	 * @property {String} end 终止时间
 	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
 	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
 	 * @property {String} range-separator 选择范围时的分隔符
@@ -115,6 +111,9 @@
 	 * @property {Boolean} disabled = [true|false] 是否禁用
 	 * @property {Boolean} clearIcon = [true|false] 是否显示清除按钮（仅PC端适用）
 	 * @event {Function} change 确定日期时触发的事件
+	 * @event {Function} show 打开弹出层
+	 * @event {Function} close 关闭弹出层
+	 * @event {Function} clear 清除上次选中的状态和值
 	 **/
 	import calendar from './calendar.vue'
 	import timePicker from './time-picker.vue'
@@ -180,7 +179,6 @@
 				isEmitValue: false,
 				isPhone: false,
 				isFirstShow: true,
-				iconBase64: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABmJLR0QA/wD/AP+gvaeTAAACVklEQVRoge2Zv2vTQRTAP4oWJQQskmolBAnSQVMcSxbp4ubmIEWETu0oIjg5iIOgpLNunfQfMHToUgpOVgfRqRAL4q8WRLQVq4sOdyHPL9/7evfNJReS+8DB433v7r37fl/eu9xBJBKUB0BLt+uDaOOQZb8SUNXyuKuRftg46NeXcBww6M8AC0ANOAycAyb1s7e6+SbNxi/gBfAQ2HadcA7YB/4MUPsKzLos4jzwewAcNy3mhMnx5I/9BiqUAD4DDWAXmAfqWt8Enlq+GBfSbEwAt4AicAxYBO7aTPaGzhu4KvTLQn/Hh9cpmGzcFvqmaXAyaxWE/MGTg93yXsgFUyfbOrJCJ2s8y+tRP21s0fmMTlmih8zT8WnN1GloCmJWaF0CpvrlSAb1/3fJXshNT470hZEIrZeoahqaU8BZ10Exa4XGtiCaKKL+EIHaMX8U81ZEP7ntrwi7n4CfWi7p+UCFdFdh7Rpaps9+mn93rjY2THut0QqtoVlIkpi1QjNyCzEdnl0W+idCXxb6VmKudaGfsbBhRbcHdEWhf5eYt0o6FVR6BjhqYcOKoQkt2y/SAB5rWVbpVeCilmUl3hb6JNeAI1p+ZWEjFzH9hsY2tEwHdHX9DGATWNLyceCeGL/YhY+58LWhy9o0uhJDKw3T4dlr4L6WZab5JvRBGJqs9UPI5R44lQfpx56pUzK0NlA3R6AK1Engu1+/nGhfK7R5bjtwGnXdFfpSJ6190Quz5grqQCC048lFXMhy2nQZWkUVsRowZv8OvLOPCvdHwE5APyKRSMQzfwE22DtT3T5PPwAAAABJRU5ErkJggg=='
 			}
 		},
 		props: {
@@ -235,10 +233,10 @@
 			clearIcon: {
 				type: [Boolean],
 				default: true
-			},
-			hideSecond: {
-				type: [Boolean],
-				default: false
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
 			}
 		},
 		watch: {
@@ -257,6 +255,7 @@
 					}
 				}
 			},
+			// #ifndef VUE3
 			value: {
 				immediate: true,
 				handler(newVal, oldVal) {
@@ -267,7 +266,19 @@
 					this.initPicker(newVal)
 				}
 			},
-
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
 			start: {
 				immediate: true,
 				handler(newVal, oldVal) {
@@ -282,7 +293,6 @@
 					}
 				}
 			},
-
 			end: {
 				immediate: true,
 				handler(newVal, oldVal) {
@@ -309,7 +319,7 @@
 				const res = activeDate === this.caleRange.endDate ? this.caleRange.endTime : ''
 				return res
 			},
-			reactMobDefTime() {
+			reactMobDefTime() {
 				const times = {
 					start: this.tempRange.startTime,
 					end: this.tempRange.endTime
@@ -363,6 +373,16 @@
 			},
 			clearText() {
 				return t("uni-datetime-picker.clear")
+			},
+			showClearIcon() {
+				const {
+					clearIcon,
+					disabled,
+					singleVal,
+					range
+				} = this
+				const bool = clearIcon && !disabled && (singleVal || (range.startDate && range.endDate))
+				return bool
 			}
 		},
 		created() {
@@ -377,7 +397,7 @@
 			// }
 		},
 		mounted() {
-			this.platform()
+			this.platform()
 		},
 		methods: {
 			/**
@@ -437,7 +457,7 @@
 					})
 					this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, defaultRange, {
 						which: 'left'
-					})
+					})
 				}
 			},
 			updateLeftCale(e) {
@@ -493,7 +513,7 @@
 						}
 					}
 
-				}, 20)
+				}, 50)
 			},
 
 			close() {
@@ -685,9 +705,9 @@
 					this.tempSingleDate = ''
 					this.time = ''
 					if (this.isPhone) {
-						this.$refs.mobile.clearCalender()
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
 					} else {
-						this.$refs.pcSingle.clearCalender()
+						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
 					}
 					if (needEmit) {
 						this.formItem && this.formItem.setValue('')
@@ -698,16 +718,16 @@
 				} else {
 					this.range.startDate = ''
 					this.range.endDate = ''
-					this.tempRange.startDate= ''
-					this.tempRange.startTime= ''
-					this.tempRange.endDate= ''
-					this.tempRange.endTime= ''
+					this.tempRange.startDate = ''
+					this.tempRange.startTime = ''
+					this.tempRange.endDate = ''
+					this.tempRange.endTime = ''
 					if (this.isPhone) {
-						this.$refs.mobile.clearCalender()
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
 					} else {
-						this.$refs.left.clearCalender()
-						this.$refs.right.clearCalender()
-						this.$refs.right.next()
+						this.$refs.left && this.$refs.left.clearCalender()
+						this.$refs.right && this.$refs.right.clearCalender()
+						this.$refs.right && this.$refs.right.next()
 					}
 					if (needEmit) {
 						this.formItem && this.formItem.setValue([])
@@ -728,7 +748,8 @@
 				const minute = defVal.getMinutes()
 				const second = defVal.getSeconds()
 				const defDate = year + '-' + this.lessTen(month) + '-' + this.lessTen(day)
-				const defTime = this.lessTen(hour) + ':' + this.lessTen(minute) + (this.hideSecond ? '' : (':' + this.lessTen(second)))
+				const defTime = this.lessTen(hour) + ':' + this.lessTen(minute) + (this.hideSecond ? '' : (':' + this
+					.lessTen(second)))
 				return {
 					defDate,
 					defTime
@@ -782,12 +803,11 @@
 
 	.uni-date-editor--x .uni-date__icon-clear {
 		position: absolute;
-		top: 5px;
+		top: 0;
 		right: 0;
 		display: inline-block;
 		box-sizing: border-box;
-		border: 6px solid transparent;
-		margin-right: 6px;
+		border: 9px solid transparent;
 		/* #ifdef H5 */
 		cursor: pointer;
 		/* #endif */
@@ -846,8 +866,8 @@
 		position: absolute;
 		top: 0;
 		z-index: 999;
-		border: 1px solid #e4e7ed;
-		box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 		border-radius: 4px;
 	}
 
@@ -857,8 +877,8 @@
 		position: absolute;
 		top: 0;
 		z-index: 999;
-		border: 1px solid #e4e7ed;
-		box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 		border-radius: 4px;
 	}
 
@@ -899,7 +919,7 @@
 		border-top-color: #F1F1F1;
 		border-top-style: solid;
 		border-top-width: 1px;
-		background-color: #fff;
+		/* background-color: #fff; */
 		line-height: 40px;
 		text-align: right;
 		color: #666;
@@ -917,7 +937,7 @@
 	}
 
 	.uni-date-changed {
-		background-color: #fff;
+		/* background-color: #fff; */
 		text-align: center;
 		color: #333;
 		border-bottom-color: #F1F1F1;
@@ -946,7 +966,32 @@
 		margin-right: 50px;
 	}
 
-	.uni-date_calendar-pc {
-		padding: 0 6px;
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
index 18b91c36d5177db28f7a36fcad300a06973be3b5..882f006419cca0145b8ec3c775b86547de16f930 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
@@ -1,5 +1,3 @@
-import CALENDAR from './calendar.js'
-
 class Calendar {
 	constructor({
 		date,
@@ -112,7 +110,6 @@ class Calendar {
 			dateArr.push({
 				date: beforeDate,
 				month: full.month - 1,
-				lunar: this.getlunar(full.year, full.month - 1, beforeDate),
 				disable: true
 			})
 		}
@@ -123,7 +120,7 @@ class Calendar {
 	 */
 	_currentMonthDys(dateData, full) {
 		let dateArr = []
-		let fullDate = this.date.fullDate
+		let fullDate = this.date.fullDate
 		for (let i = 1; i <= dateData; i++) {
 			let isinfo = false
 			let nowDate = full.year + '-' + (full.month < 10 ?
@@ -164,16 +161,15 @@ class Calendar {
 				if (multiplesStatus !== -1) {
 					checked = true
 				}
-			}
+			}
 			let data = {
 				fullDate: nowDate,
 				year: full.year,
 				date: i,
 				multiple: this.range ? checked : false,
-				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
-				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
+				beforeMultiple: this.isLogicBefore(nowDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(nowDate, this.multipleStatus.before, this.multipleStatus.after),
 				month: full.month,
-				lunar: this.getlunar(full.year, full.month, i),
 				disable: !(disableBefore && disableAfter),
 				isDay,
 				userChecked: false
@@ -195,7 +191,6 @@ class Calendar {
 			dateArr.push({
 				date: i,
 				month: Number(full.month) + 1,
-				lunar: this.getlunar(full.year, Number(full.month) + 1, i),
 				disable: true
 			})
 		}
@@ -243,7 +238,26 @@ class Calendar {
 			return false
 		}
 	}
-
+
+	/**
+	 *  比较真实起始日期
+	 */
+
+	isLogicBefore(currentDay, before, after) {
+		let logicBefore = before
+		if (before && after) {
+			logicBefore = this.dateCompare(before, after) ? before : after
+		}
+		return this.dateEqual(logicBefore, currentDay)
+	}
+
+	isLogicAfter(currentDay, before, after) {
+		let logicAfter = after
+		if (before && after) {
+			logicAfter = this.dateCompare(before, after) ? after : before
+		}
+		return this.dateEqual(logicAfter, currentDay)
+	}
 
 	/**
 	 * 获取日期范围内所有日期
@@ -266,19 +280,6 @@ class Calendar {
 		}
 		return arr
 	}
-	/**
-	 * 计算阴历日期显示
-	 */
-	getlunar(year, month, date) {
-		return CALENDAR.solar2lunar(year, month, date)
-	}
-	/**
-	 * 设置打点
-	 */
-	setSelectInfo(data, value) {
-		this.selected = value
-		this._getWeek(data)
-	}
 
 	/**
 	 *  获取多选状态
@@ -287,8 +288,7 @@ class Calendar {
 		let {
 			before,
 			after
-		} = this.multipleStatus
-
+		} = this.multipleStatus
 		if (!this.range) return
 		if (before && after) {
 			if (!this.lastHover) {
@@ -301,9 +301,9 @@ class Calendar {
 			this.multipleStatus.fulldate = ''
 			this.lastHover = false
 		} else {
-			this.lastHover = false
 			if (!before) {
-				this.multipleStatus.before = fullDate
+				this.multipleStatus.before = fullDate
+				this.lastHover = false
 			} else {
 				this.multipleStatus.after = fullDate
 				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
@@ -312,7 +312,8 @@ class Calendar {
 				} else {
 					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
 						.before);
-				}
+				}
+				this.lastHover = true
 			}
 		}
 		this._getWeek(fullDate)
diff --git a/uni_modules/uni-datetime-picker/package.json b/uni_modules/uni-datetime-picker/package.json
index 5c3f88af904d968676dc85190e678c1ff9d279f1..0e441033789e2b94eb848d35a67131213b78cda2 100644
--- a/uni_modules/uni-datetime-picker/package.json
+++ b/uni_modules/uni-datetime-picker/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-datetime-picker",
   "displayName": "uni-datetime-picker 日期选择器",
-  "version": "2.1.4",
+  "version": "2.2.4",
   "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
   "keywords": [
     "uni-datetime-picker",
@@ -42,6 +42,7 @@
   },
   "uni_modules": {
     "dependencies": [
+			"uni-scss",
 			"uni-icons"
 		],
     "encrypt": [],
diff --git a/uni_modules/uni-datetime-picker/readme.md b/uni_modules/uni-datetime-picker/readme.md
index 37b5344b918841aaeda9d64495e624b9e2d86ccf..162fbefaa37da718b549160cfe60c8a2fd30d4e6 100644
--- a/uni_modules/uni-datetime-picker/readme.md
+++ b/uni_modules/uni-datetime-picker/readme.md
@@ -1,6 +1,9 @@
 
+
 > `重要通知：组件升级更新 2.0.0 后，支持日期+时间范围选择，组件 ui 将使用日历选择日期，ui 变化较大，同时支持 PC 和 移动端。此版本不向后兼容，不再支持单独的时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）。若仍需使用旧版本，可在插件市场下载*非uni_modules版本*，旧版本将不再维护`
+
 ## DatetimePicker 时间选择器
+
 > **组件名：uni-datetime-picker**
 > 代码块： `uDatetimePicker`
 
@@ -9,151 +12,10 @@
 
 若只是需要单独选择日期和时间，不需要时间戳输入和输出，可使用原生的 picker 组件。
 
-
-___点击 picker 默认值规则：___
+**_点击 picker 默认值规则：_**
 
 - 若设置初始值 value, 会显示在 picker 显示框中
 - 若无初始值 value，则初始值 value 为当前本地时间 Date.now()， 但不会显示在 picker 显示框中
 
-
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<template>
-	<view class="page">
-		<text class="example-info">可以同时选择日期和时间的选择器</text>
-		<uni-section :title="'日期用法：' + single" type="line"></uni-section>
-		<view class="example-body">
-			<uni-datetime-picker type="date" :value="single" start="2021-3-20" end="2021-6-20" @change="change" />
-		</view>
-		<uni-section :title="'时间戳用法：' + single" type="line"></uni-section>
-		<view class="example-body">
-			<uni-datetime-picker returnType="timestamp" @change="changeLog($event)" start="2021-3-20" end="2021-5-20"  />
-		</view>
-		<uni-section :title="'日期时间用法：' + datetimesingle" type="line"></uni-section>
-		<view class="example-body">
-			<uni-datetime-picker type="datetime" v-model="datetimesingle" @change="changeLog" />
-		</view>
-		<uni-section :title="'v-model用法：' + single" type="line"></uni-section>
-		<view class="example-body">
-			<uni-datetime-picker v-model="single" />
-		</view>
-		<uni-section :title="'插槽用法：' + single" type="line"></uni-section>
-		<view class="example-body">
-			<uni-datetime-picker v-model="single">我是一个插槽，点击我</uni-datetime-picker>
-		</view>
-		<uni-section :title="'无边框用法：' + single" type="line"></uni-section>
-		<view class="example-body">
-			<uni-datetime-picker v-model="single" :border="false" />
-		</view>
-		<uni-section :title="'disabled用法：' + single" type="line"></uni-section>
-		<view class="example-body">
-			<uni-datetime-picker v-model="single" disabled />
-		</view>
-		<uni-section :title="'日期范围用法：' + '[' + range + ']'" type="line"></uni-section>
-		<view class="example-body">
-			<uni-datetime-picker v-model="range" type="daterange" start="2021-3-20" end="2021-5-20"
-				rangeSeparator="至" />
-		</view>
-		<uni-section :title="'日期时间范围用法：' + '[' + datetimerange + ']' " type="line"></uni-section>
-		<view class="example-body">
-			<uni-datetime-picker v-model="datetimerange" type="datetimerange"
-				start="2021-3-20 12:00:00" end="2021-6-20 20:00:00" rangeSeparator="至" />
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				single: '2021-04-3',
-				datetimesingle: '2021-04-3',
-				range: ['2021-03-8', '2021-4-20'],
-				datetimerange: ['2021-03-20 20:10:10', '2021-05-10 10:10:10'],
-			}
-		},
-
-		watch: {
-			datetimesingle(newval) {
-				console.log('单选:', this.datetimesingle);
-			},
-			range(newval) {
-				console.log('范围选:', this.range);
-			},
-			datetimerange(newval) {
-				console.log('范围选:', this.datetimerange);
-			}
-		},
-		mounted() {
-			setTimeout(() => {
-				this.datetimesingle = '2021-5-1'
-				this.single = '2021-5-1'
-			},1000)
-		},
-
-		methods:{
-			change(e) {
-				this.single = e
-				console.log('-change事件:', e);
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import '@/common/uni-nvue.scss';
-</style>
-```
-
-## API
-
-### DatetimePicker Props
-
-|属性名						|类型														|默认值		|值域																	|说明																											|
-|:-:							|:-:														|:-:			|																			|:-:																											|
-|type							|String													|datetime	|date/daterange/datetime/datetimerange|选择器类型																								|
-|value						|String、Number、Array(范围选择)、Date|-				|-																		|输入框当前值																							|
-|start						|String、Number									|-				|-																		|最小值，可以使用日期的字符串（String）、时间戳（Number）	|
-|end							|String、Number									|-				|-																		|最大值，可以使用日期的字符串（String）、时间戳（Number）	|
-|return-type			|String													|string		|timestamp 、string、date										|返回值格式																								|
-|border						|Boolean								|true			|																			|是否有边框																								|
-|rangeSeparator		|String													|'-'			|-																		|选择范围时的分隔符																				|
-|placeholder			|String													|-				|-																		|非范围选择时的占位内容																		|
-|start-placeholder|String													|-				|-																		|范围选择时开始日期的占位内容															|
-|end-placeholder	|String													|-				|-																		|范围选择时结束日期的占位内容															|
-|disabled					|Boolean								|false		|																			|是否不可选择																							|
-|clear-icon				|Boolean								|true			|																			|是否显示清除按钮														|
-|hide-second			|Boolean								|false		|																			|是否显示秒，只显示时分												|
-
-
-
-
-### DatetimePicker Events
-
-|事件名称	|说明																								|返回值																																													|
-|:-:			|:-:																								|:-:																																														|
-|change		|确定日期时间时触发的事件，参数为当前选择的日期对象	|单选返回日期字符串，如：'2010-02-3'；范围选返回日期字符串数组，如：['2020-10-1',  '2021-4-1']	|
-|maskClick|点击遮罩层触发																			|-																																															|
-
-### Popup Methods
-
-|方法称名	|说明|参数|
-|:-:|:-:|:-:|
-|show|打开弹出层|-|
-|close|关闭弹出层	|-|
-|clear|清除上次选中的状态和值|-|
-
- ### 
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/datetime-picker/datetime-picker](https://hellouniapp.dcloud.net.cn/pages/extUI/datetime-picker/datetime-picker)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-drawer/changelog.md b/uni_modules/uni-drawer/changelog.md
index 4077ce1c7bc2395b11e54e36fe987409da90d421..b9e7637ed06e631102495c11b01ba577f2617b37 100644
--- a/uni_modules/uni-drawer/changelog.md
+++ b/uni_modules/uni-drawer/changelog.md
@@ -1,5 +1,10 @@
-## 1.1.1（2021-07-30）
-- 优化 vue3下事件警告的问题
+## 1.2.1（2021-11-22）
+- 修复 vue3中个别scss变量无法找到的问题
+## 1.2.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-drawer](https://uniapp.dcloud.io/component/uniui/uni-drawer)
+## 1.1.1（2021-07-30）
+- 优化 vue3下事件警告的问题
 ## 1.1.0（2021-07-13）
 - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.0.7（2021-05-12）
diff --git a/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
index 253d7f502cf32ba8cc27b95d46f98ae5c76514b7..5b551e3c3bcdf735367ef054c7a1730436613435 100644
--- a/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
+++ b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
@@ -105,7 +105,8 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped>
+	$uni-mask: rgba($color: #000000, $alpha: 0.4) ;
 	// 抽屉宽度
 	$drawer-width: 220px;
 
@@ -169,7 +170,7 @@
 		left: 0;
 		bottom: 0;
 		right: 0;
-		background-color: $uni-bg-color-mask;
+		background-color: $uni-mask;
 		transition: opacity 0.3s;
 	}
 
diff --git a/uni_modules/uni-drawer/package.json b/uni_modules/uni-drawer/package.json
index 446171bc382728ee1ce8d4448fc81747bcc6596b..0bd9cf94a5fbeca977609e91502026cfdf9909c8 100644
--- a/uni_modules/uni-drawer/package.json
+++ b/uni_modules/uni-drawer/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-drawer",
   "displayName": "uni-drawer 抽屉",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "抽屉式导航，用于展示侧滑菜单，侧滑导航。",
   "keywords": [
     "uni-ui",
@@ -41,7 +41,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": ["uni-scss"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -76,6 +76,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-drawer/readme.md b/uni_modules/uni-drawer/readme.md
index d4a8b15bbb2c60d89d18ac2a0cea09e87fc161c7..dcf6e6b2eb3c9bc731993899782d39e02457ce7a 100644
--- a/uni_modules/uni-drawer/readme.md
+++ b/uni_modules/uni-drawer/readme.md
@@ -4,83 +4,7 @@
 > **组件名：uni-drawer**
 > 代码块： `uDrawer`
 
-
 抽屉侧滑菜单。
 
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - `width` 属性仅在 `vue` 页面生效，`nvue` 页面因性能问题，不支持动态设置宽度，如需修改，请下载组件修改源码
-
-
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法
-
-
-在 ``template`` 中使用组件
-
-```html
-<template>
-	<view>
-		<button @click="showDrawer" type="primary">右侧弹出 显示Drawer</button>
-		<uni-drawer ref="showRight" mode="right" :mask-click="false">
-			<scroll-view style="height: 100%;" scroll-y="true">
-				<button @click="closeDrawer" type="primary">关闭Drawer</button>
-				<view v-for="item in 60" :key="item">可滚动内容 {{ item }}</view>
-			</scroll-view>
-		</uni-drawer>
-	</view>
-</template>
-
-<script>
-	export default {
-		methods: {
-			showDrawer() {
-				this.$refs.showRight.open();
-			},
-			closeDrawer() {
-				this.$refs.showRight.close();
-			}
-
-		}
-	}
-</script
-```
-
-## API
-
-### Drawer Props
-
-|属性名			|类型	|默认值	|说明															|
-|:-:			|:-:	|:-:	|:-:															|
-|mask			|Boolean|true	|是否显示遮罩													|
-|maskClick		|Boolean|true	|点击遮罩是否可以关闭抽屉										|
-|mode			|String	|left	|Drawe滑出位置，可选值：left（从左侧滑出）， right（从右侧滑出）|
-|width			|Number	|220	|Drawe 宽度，仅vue页面设置生效									|
-
-
-
-
-### Drawer Events
-
-|事件名	|说明				|返回值	|
-|:-:		|:-:				|:-:	|
-|@change|抽屉状态发生变化触发事件	|true：抽屉已经打开；false：抽屉已经关闭；	|
-
-### Drawer Methods
-
-|方法称名	|说明		|参数|
-|:-:		|:-:		|:-:|
-|open		|打开抽屉	|-|
-|close	|关闭抽屉	|-|
-
-
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/drawer/drawer](https://hellouniapp.dcloud.net.cn/pages/extUI/drawer/drawer)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-drawer)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-easyinput/changelog.md b/uni_modules/uni-easyinput/changelog.md
index b9c0029b5d1c0725e7c79df5433866e776f4306b..6c6b0835b66a8c7e7f10446dd963ceb077a2d593 100644
--- a/uni_modules/uni-easyinput/changelog.md
+++ b/uni_modules/uni-easyinput/changelog.md
@@ -1,28 +1,41 @@
+## 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.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 c0a242f52b01ddd26a1c38e41f3bb46c4bddc138..c59736bf223f638db3661925e451fa43a9b906ac 100644
--- a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -1,10 +1,10 @@
 <template>
-	<view class="uni-easyinput" :class="{'uni-easyinput-error':msg}" :style="{color:inputBorder && msg?'#dd524d':styles.color}">
+	<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"
+			 :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="{
@@ -12,10 +12,10 @@
 				 'padding-left':prefixIcon?'':'10px'
 			 }"
 			 :name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder"
-			 :placeholderStyle="placeholderStyle" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType" @focus="onFocus"
+			 :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'"
+				<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>
 			</template>
 			<template v-else-if="suffixIcon">
@@ -24,16 +24,16 @@
 			<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>
+			</template>
 			<slot name="right"></slot>
 		</view>
 	</view>
 </template>
 
-<script>
-	// import {
-	// 	debounce,
-	// 	throttle
+<script>
+	// import {
+	// 	debounce,
+	// 	throttle
 	// } from './common.js'
 	/**
 	 * Easyinput 输入框
@@ -48,7 +48,7 @@
 	 * 	@value idcard		身份证输入键盘，信、支付宝、百度、QQ小程序
 	 * 	@value digit		带小数点的数字键盘	，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
 	 * @property {Boolean}	clearable	是否显示右侧清空内容的图标控件，点击可清空输入框内容（默认true）
-	 * @property {Boolean}	autoHeight	是否自动增高输入区域，type为textarea时有效（默认true）
+	 * @property {Boolean}	autoHeight	是否自动增高输入区域，type为textarea时有效（默认false）
 	 * @property {String }	placeholder	输入框的提示文字
 	 * @property {String }	placeholderStyle	placeholder的样式(内联样式，字符串)，如"color: #ddd"
 	 * @property {Boolean}	focus	是否自动获得焦点（默认false）
@@ -77,7 +77,7 @@
 	 * @example <uni-easyinput v-model="mobile"></uni-easyinput>
 	 */
 
-	export default {
+	 export default {
 		name: 'uni-easyinput',
 		emits:['click','iconClick','update:modelValue','input','focus','blur','confirm'],
 		model:{
@@ -147,7 +147,7 @@
 				default () {
 					return {
 						color: '#333',
-						disableColor: '#eee',
+						disableColor: '#F7F6F6',
 						borderColor: '#e5e5e5'
 					}
 				}
@@ -173,7 +173,7 @@
 			msg() {
 				return this.errorMessage || this.errMsg;
 			},
-			// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
+			// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，用户可以传入字符串数值
 			inputMaxlength() {
 				return Number(this.maxlength);
 			},
@@ -181,7 +181,7 @@
 		watch: {
 			value(newVal) {
 				if (this.errMsg) this.errMsg = ''
-				this.val = newVal
+				this.val = newVal
 				// fix by mehaotian is_reset 在 uni-forms 中定义
 				if (this.form && this.formItem &&!this.is_reset) {
 					this.is_reset = false
@@ -203,19 +203,19 @@
 			}
 		},
 		created() {
-			if(!this.value){
+			if(!this.value && this.value !== 0){
 				this.val = this.modelValue
 			}
-			if(!this.modelValue){
+			if(!this.modelValue && this.modelValue !== 0){
 				this.val = this.value
 			}
 			this.form = this.getForm('uniForms')
 			this.formItem = this.getForm('uniFormsItem')
 			if (this.form && this.formItem) {
-				if (this.formItem.name) {
-					if(!this.is_reset){
-						this.is_reset = false
-						this.formItem.setValue(this.val)
+				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)
@@ -223,10 +223,7 @@
 			}
 		},
 		mounted() {
-			// this.onInput = throttle(this.input, 500)
 			this.$nextTick(() => {
-				// setTimeout(()=>{
-				// },1000)
 				this.focused = this.focus
 			})
 		},
@@ -277,14 +274,10 @@
 			},
 
 			onFocus(event) {
-				// this.focused = true;
 				this.$emit('focus', event);
 			},
 			onBlur(event) {
 				let value = event.detail.value;
-				// setTimeout(() => {
-				// this.focused = false;
-				// }, 100);
 				this.$emit('blur', event);
 			},
 			onConfirm(e) {
@@ -323,7 +316,9 @@
 	};
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
+	$uni-error: #e43d33;
+	$uni-border-1: #DCDFE6 !default;
 	.uni-easyinput {
 		/* #ifndef APP-NVUE */
 		width: 100%;
@@ -332,7 +327,7 @@
 		position: relative;
 		text-align: left;
 		color: #333;
-		font-size: 14px;
+		font-size: 14px;
 	}
 
 	.uni-easyinput__content {
@@ -340,11 +335,11 @@
 		/* #ifndef APP-NVUE */
 		width: 100%;
 		display: flex;
-		box-sizing: border-box;
+		box-sizing: border-box;
 		min-height: 36px;
-		/* #endif */
+		/* #endif */
 		flex-direction: row;
-		align-items: center;
+		align-items: center;
 	}
 
 	.uni-easyinput__content-input {
@@ -357,7 +352,11 @@
 		line-height: 1;
 		font-size: 14px;
 	}
-
+	.uni-easyinput__placeholder-class {
+		color: #999;
+		font-size: 12px;
+		font-weight: 200;
+	}
 	.is-textarea {
 		align-items: flex-start;
 	}
@@ -402,25 +401,16 @@
 		/* #endif */
 		flex-direction: row;
 		align-items: center;
-		border: 1px solid $uni-border-color;
+		border: 1px solid $uni-border-1;
 		border-radius: 4px;
 	}
 
-	.uni-easyinput__right {
-		// margin-left: 5px;
-	}
-
-	// 必填
-	.is-required {
-		color: $uni-color-error;
-	}
-
 	.uni-error-message {
 		position: absolute;
 		bottom: -17px;
 		left: 0;
 		line-height: 12px;
-		color: $uni-color-error;
+		color: $uni-error;
 		font-size: 12px;
 		text-align: left;
 	}
@@ -432,9 +422,13 @@
 	}
 
 	.is-input-error-border {
-		border-color: $uni-color-error;
+		border-color: $uni-error;
+		.uni-easyinput__placeholder-class {
+			color: mix(#fff, $uni-error, 50%);;
+		}
 	}
 
+
 	.uni-easyinput--border {
 		margin-bottom: 0;
 		padding: 10px 15px;
@@ -456,6 +450,12 @@
 	}
 
 	.is-disabled {
-		background-color: #eee;
+		border-color: red;
+		background-color: #F7F6F6;
+		color: #D5D5D5;
+		.uni-easyinput__placeholder-class {
+			color: #D5D5D5;
+			font-size: 12px;
+		}
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-easyinput/package.json b/uni_modules/uni-easyinput/package.json
index 408a182e8574e75949901b52ff531ceb5fc3e506..15482b246dffeec4b073388a786cb9f7a38f2c8f 100644
--- a/uni_modules/uni-easyinput/package.json
+++ b/uni_modules/uni-easyinput/package.json
@@ -1,89 +1,90 @@
-{
-  "id": "uni-easyinput",
-  "displayName": "uni-easyinput 增强输入框",
-  "version": "0.1.4",
-  "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-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": "u"
-        }
-      }
-    }
-  }
+{
+  "id": "uni-easyinput",
+  "displayName": "uni-easyinput 增强输入框",
+  "version": "1.0.5",
+  "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"
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/uni_modules/uni-easyinput/readme.md b/uni_modules/uni-easyinput/readme.md
index ab6c50bf4107aff9cff2e01c44e1f89b949657e1..f1faf8fbbba31f9f404116b32078b1603487d279 100644
--- a/uni_modules/uni-easyinput/readme.md
+++ b/uni_modules/uni-easyinput/readme.md
@@ -7,192 +7,5 @@
 
 easyinput 组件是对原生input组件的增强 ，是专门为配合表单组件[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)而设计的，easyinput 内置了边框，图标等，同时包含 input 所有功能
 
-
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 组件需要依赖 `sass` 插件 ，请自行手动安装
-> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-
-
-### 平台差异说明
-
-暂不支持在nvue页面中使用
-
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法
-
-输入内容后，输入框尾部会显示清除按钮，点击可清除内容，如不需要展示图标，`clearable` 属性设置为 `false` 即可
-
-`clearable` 属性设置为 `true` ，输入框聚焦且内容不为空时，才会显示内容
-
-```html
-<uni-easyinput v-model="value" placeholder="请输入内容"></uni-easyinput>
-```
-
-
-### 输入框带左右图标
-
-设置 `prefixIcon` 属性来显示输入框的头部图标
-
-设置 `suffixIcon` 属性来显示输入框的尾部图标 
-
-注意图标当前只支持 `uni-icons` 内置的图标，当配置 `suffixIcon` 属性后，会覆盖 `:clearable="true"` 和 `type="password"` 时的原有图标
-
-绑定 `@iconClick` 事件可以触发图标的点击 ，返回 `prefix` 表示点击左侧图标，返回 `suffix` 表示点击右侧图标
-
-```html
-
-<!-- 输入框头部图标 -->
-<uni-easyinput prefixIcon="search" v-model="value" placeholder="请输入内容" @iconClick="onClick"></uni-easyinput>
-<!-- 展示输入框尾部图标 -->
-<uni-easyinput suffixIcon="search"  v-model="value" placeholder="请输入内容" @iconClick="onClick"></uni-easyinput>
-```
-
-### 输入框禁用
-
-设置 `disable` 属性可以禁用输入框，此时输入框不可编辑
-
-```html
-<uni-easyinput disabled  v-model="value" placeholder="请输入内容"></uni-easyinput>
-```
-
-### 密码框
-
-设置 `type="password"` 时，输入框内容将会不可见，由实心点代替，同时输入框尾部会显示眼睛图标，点击可切换内容显示状态
-
-```html
-<uni-easyinput type="password" v-model="password" placeholder="请输入密码"></uni-easyinput>
-```
-
-### 输入框聚焦
-
-设置 `focus` 属性可以使输入框聚焦
-
-如果页面存在多个设置 `focus` 属性的输入框，只有最后一个输入框的 `focus` 属性会生效
-
-```html
-<uni-easyinput focus v-model="password" placeholder="请输入内容"></uni-easyinput>
-```
-
-
-### 多行文本
-
-设置 `type="textarea"` 时可输入多行文本
-
-```html
-<uni-easyinput type="textarea" v-model="value" placeholder="请输入内容"></uni-easyinput>
-```
-
-### 多行文本自动高度
-
-设置 `type="textarea"` 时且设置 `autoHeight` 属性，可使用多行文本的自动高度，会跟随内容调整输入框的显示高度
-
-```html
-<uni-easyinput type="textarea" autoHeight v-model="value" placeholder="请输入内容"></uni-easyinput>
-```
-
-### 取消边框
-
-设置 `:inputBorder="false"` 时可取消输入框的边框显示，同时搭配 `uni-forms` 的 `:border="true"` 有较好的效果
-
-```html
-<uni-forms border>
-	<uni-forms-item label="姓名">
-		<uni-easyinput :inputBorder="false" placeholder="请输入姓名"></uni-easyinput>
-	</uni-forms-item>
-	<uni-forms-item label="年龄">
-		<uni-easyinput :inputBorder="false" placeholder="请输入年龄"></uni-easyinput>
-	</uni-forms-item>
-</uni-forms>
-```
-
-
-## API
-
-### Easyinput Props
-
-|属性名| 类型|	可选值|默认值|说明|
-|:-:|:-:|:-:|:-:|:-:|
-|value|String/ Number|-|-|输入内容|
-|type|String|见 type Options|text|输入框的类型（默认text）|
-|clearable|Boolean|-|true| 是否显示右侧清空内容的图标控件(输入框有内容且不禁用时显示)，点击可清空输入框内容|
-|autoHeight|Boolean|-|false|	是否自动增高输入区域，type为textarea时有效|
-|placeholder|String |-| - |	输入框的提示文字|
-|placeholderStyle|String| -	| - |	placeholder的样式(内联样式，字符串)，如"color: #ddd"|
-|focus|Boolean|-|false|是否自动获得焦点|
-|disabled|Boolean|-|false|是否不可输入|
-|maxlength|Number|-|140|最大输入长度，设置为 -1 的时候不限制最大长度|
-|confirmType|String|-|done|设置键盘右下角按钮的文字，仅在type="text"时生效|
-|clearSize|Number|-|15|清除图标的大小，单位px|
-|prefixIcon|String|-|-|输入框头部图标	|
-|suffixIcon|String|-|-|输入框尾部图标|
-|trim|Boolean/String|见 trim Options	| false |	是否自动去除空格，传入类型为 Boolean 时，自动去除前后空格|
-|inputBorder|Boolean|-|true|是否显示input输入框的边框|
-|styles|Object|-|-|	样式自定义|
-|passwordIcon|Boolean|-| true |	type=password 时，是否显示小眼睛图标|
-
-
-#### Type Options
-
-|属性名| 说明|
-|:-:| :-:|
-|text|文本输入键盘|
-|textarea	|多行文本输入键盘|
-|password	|密码输入键盘|
-|number|数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式	|
-|idcard|身份证输入键盘，仅支持微信、支付宝、百度、QQ小程序|
-|digit|带小数点的数字键盘，仅支持微信、支付宝、百度、头条、QQ小程序	|
-
-#### ConfirmType Options
-
-平台差异与 [input](https://uniapp.dcloud.io/component/input) 相同
-
-|属性名	| 说明|
-|:-:| :-:|
-|send|右下角按钮为“发送”	|
-|search	|右下角按钮为“搜索”	|
-|next|右下角按钮为“下一个”|
-|go|右下角按钮为“前往”	|											
-|done|右下角按钮为“完成”	|
-	
-
-#### Styles Options 
-	
-|属性名| 默认值 	|说明|
-|:-:| :-:| :-:|
-|color| #333|	输入文字颜色|
-|disableColor	|#eee|	输入框禁用背景色|
-|borderColor	|#e5e5e5	|	边框颜色|
-
-#### Trim Options
-
-传入类型为 `Boolean` 时，自动去除前后空格,传入类型为 `String` 时，可以单独控制，下面是可选值
-
-|属性名|说明|
-|:-:| :-:|
-|both|去除两端空格|
-|left|去除左侧空格|
-|right|去除右侧空格|
-|all|去除所有空格|
-|none|不去除空格|
-
-
-### Easyinput Events
-
-|事件称名| 说明|返回值|
-|:-:| :-:|:-:|
-|@input|输入框内容发生变化时触发| -|
-|@focus|输入框获得焦点时触发| -|
-|@blur|输入框失去焦点时触发| -|
-|@confirm|点击完成按钮时触发| -|
-|@iconClick	|点击图标时触发| prefix/suffix	|
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/easyinput/easyinput](https://hellouniapp.dcloud.net.cn/pages/extUI/easyinput/easyinput)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-fab/changelog.md b/uni_modules/uni-fab/changelog.md
index 1895c7d7acf1dad0da2edebf9dd4e41b8ce51f9e..24e26b1671be9fdec8bff65c3a7895f31719aace 100644
--- a/uni_modules/uni-fab/changelog.md
+++ b/uni_modules/uni-fab/changelog.md
@@ -1,8 +1,17 @@
+## 1.2.2（2021-12-29）
+- 更新 组件依赖
+## 1.2.1（2021-11-19）
+- 修复 阴影颜色不正确的bug
+## 1.2.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-fab](https://uniapp.dcloud.io/component/uniui/uni-fab)
+## 1.1.1（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
 ## 1.1.0（2021-07-30）
 - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 1.0.7（2021-05-12）
-- 新增 组件示例地址
-## 1.0.6（2021-02-05）
-- 调整为uni_modules目录规范
-- 优化 按钮背景色调整
-- 优化 兼容pc端
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-02-05）
+- 调整为uni_modules目录规范
+- 优化 按钮背景色调整
+- 优化 兼容pc端
diff --git a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
index 599a2d4996d50263e5514f02d38aac6879b758a1..6143a0552a6eedb00697954dde93bf595ab6426c 100644
--- a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
+++ b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
@@ -5,8 +5,7 @@
         'uni-fab--rightBottom': rightBottom,
         'uni-fab--leftTop': leftTop,
         'uni-fab--rightTop': rightTop
-      }"
-		 class="uni-fab">
+      }" class="uni-fab">
 			<view :class="{
           'uni-fab__content--left': horizontal === 'left',
           'uni-fab__content--right': horizontal === 'right',
@@ -14,14 +13,15 @@
           'uni-fab__content--flexDirectionStart': flexDirectionStart,
           'uni-fab__content--flexDirectionEnd': flexDirectionEnd,
 		  'uni-fab__content--other-platform': !isAndroidNvue
-        }"
-			 :style="{ width: boxWidth, height: boxHeight, backgroundColor: styles.backgroundColor }" class="uni-fab__content"
-			 elevation="5">
+        }" :style="{ width: boxWidth, height: boxHeight, backgroundColor: styles.backgroundColor }"
+				class="uni-fab__content" elevation="5">
 				<view v-if="flexDirectionStart || horizontalLeft" class="uni-fab__item uni-fab__item--first" />
-				<view v-for="(item, index) in content" :key="index" :class="{ 'uni-fab__item--active': isShow }" class="uni-fab__item"
-				 @click="_onItemClick(index, item)">
-					<image :src="item.active ? item.selectedIconPath : item.iconPath" class="uni-fab__item-image" mode="widthFix" />
-					<text class="uni-fab__item-text" :style="{ color: item.active ? styles.selectedColor : styles.color }">{{ item.text }}</text>
+				<view v-for="(item, index) in content" :key="index" :class="{ 'uni-fab__item--active': isShow }"
+					class="uni-fab__item" @click="_onItemClick(index, item)">
+					<image :src="item.active ? item.selectedIconPath : item.iconPath" class="uni-fab__item-image"
+						mode="aspectFit" />
+					<text class="uni-fab__item-text"
+						:style="{ color: item.active ? styles.selectedColor : styles.color }">{{ item.text }}</text>
 				</view>
 				<view v-if="flexDirectionEnd || horizontalRight" class="uni-fab__item uni-fab__item--first" />
 			</view>
@@ -32,10 +32,11 @@
 		  'uni-fab__circle--leftTop': leftTop,
 		  'uni-fab__circle--rightTop': rightTop,
 		  'uni-fab__content--other-platform': !isAndroidNvue
-		}"
-		 class="uni-fab__circle uni-fab__plus" :style="{ 'background-color': styles.buttonColor }" @click="_onClick">
-			<view class="fab-circle-v"  :class="{'uni-fab__plus--active': isShow && content.length > 0}"></view>
-			<view class="fab-circle-h" :class="{'uni-fab__plus--active': isShow  && content.length > 0}"></view>
+		}" class="uni-fab__circle uni-fab__plus" :style="{ 'background-color': styles.buttonColor }" @click="_onClick">
+			<uni-icons class="fab-circle-icon" type="plusempty" :color="styles.iconColor" size="32"
+				:class="{'uni-fab__plus--active': isShow && content.length > 0}"></uni-icons>
+			<!-- <view class="fab-circle-v"  :class="{'uni-fab__plus--active': isShow && content.length > 0}"></view>
+			<view class="fab-circle-h" :class="{'uni-fab__plus--active': isShow  && content.length > 0}"></view> -->
 		</view>
 	</view>
 </template>
@@ -67,7 +68,7 @@
 	 */
 	export default {
 		name: 'UniFab',
-		emits:['fabClick','trigger'],
+		emits: ['fabClick', 'trigger'],
 		props: {
 			pattern: {
 				type: Object,
@@ -111,16 +112,17 @@
 					color: '#3c3e49',
 					selectedColor: '#007AFF',
 					backgroundColor: '#fff',
-					buttonColor: '#007AFF'
+					buttonColor: '#007AFF',
+					iconColor: '#fff'
 				}
 			}
 		},
 		computed: {
 			contentWidth(e) {
-				return (this.content.length + 1) * 55 + 10 + 'px'
+				return (this.content.length + 1) * 55 + 15 + 'px'
 			},
 			contentWidthMin() {
-				return 55 + 'px'
+				return '55px'
 			},
 			// 动态计算宽度
 			boxWidth() {
@@ -159,9 +161,11 @@
 			}
 		},
 		watch: {
-			pattern(newValue, oldValue) {
-				//console.log(JSON.stringify(newValue))
-				this.styles = Object.assign({}, this.styles, newValue)
+			pattern: {
+				handler(val, oldVal) {
+					this.styles = Object.assign({}, this.styles, val)
+				},
+				deep: true
 			}
 		},
 		created() {
@@ -173,7 +177,7 @@
 			this.styles = Object.assign({}, this.styles, this.pattern)
 		},
 		methods: {
-			_onClick() {
+			_onClick() {
 				this.$emit('fabClick')
 				if (!this.popMenu) {
 					return
@@ -213,7 +217,9 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
+	$uni-shadow-base:0 1px 5px 2px rgba($color: #000000, $alpha: 0.3) !default;
+
 	.uni-fab {
 		position: fixed;
 		/* #ifndef APP-NVUE */
@@ -222,12 +228,14 @@
 		justify-content: center;
 		align-items: center;
 		z-index: 10;
-	}
-	
-	.uni-cursor-point {
-		/* #ifdef H5 */
-		cursor: pointer;
-		/* #endif */
+		border-radius: 45px;
+		box-shadow: $uni-shadow-base;
+	}
+
+	.uni-cursor-point {
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
 	}
 
 	.uni-fab--active {
@@ -235,43 +243,43 @@
 	}
 
 	.uni-fab--leftBottom {
-		left: 5px;
-		bottom: 20px;
-		/* #ifdef H5 */
-		left: calc(5px + var(--window-left));
-		bottom: calc(20px + var(--window-bottom));
+		left: 15px;
+		bottom: 30px;
+		/* #ifdef H5 */
+		left: calc(15px + var(--window-left));
+		bottom: calc(30px + var(--window-bottom));
 		/* #endif */
-		padding: 10px;
+		// padding: 10px;
 	}
 
 	.uni-fab--leftTop {
-		left: 5px;
+		left: 15px;
 		top: 30px;
-		/* #ifdef H5 */
-		left: calc(5px + var(--window-left));
+		/* #ifdef H5 */
+		left: calc(15px + var(--window-left));
 		top: calc(30px + var(--window-top));
 		/* #endif */
-		padding: 10px;
+		// padding: 10px;
 	}
 
 	.uni-fab--rightBottom {
-		right: 5px;
-		bottom: 20px;
-		/* #ifdef H5 */
-		right: calc(5px + var(--window-right));
-		bottom: calc(20px + var(--window-bottom));
+		right: 15px;
+		bottom: 30px;
+		/* #ifdef H5 */
+		right: calc(15px + var(--window-right));
+		bottom: calc(30px + var(--window-bottom));
 		/* #endif */
-		padding: 10px;
+		// padding: 10px;
 	}
 
 	.uni-fab--rightTop {
-		right: 5px;
+		right: 15px;
 		top: 30px;
-		/* #ifdef H5 */
-		right: calc(5px + var(--window-right));
+		/* #ifdef H5 */
+		right: calc(15px + var(--window-right));
 		top: calc(30px + var(--window-top));
 		/* #endif */
-		padding: 10px;
+		// padding: 10px;
 	}
 
 	.uni-fab__circle {
@@ -284,14 +292,15 @@
 		width: 55px;
 		height: 55px;
 		background-color: #3c3e49;
-		border-radius: 55px;
+		border-radius: 45px;
 		z-index: 11;
+		// box-shadow: $uni-shadow-base;
 	}
 
 	.uni-fab__circle--leftBottom {
 		left: 15px;
 		bottom: 30px;
-		/* #ifdef H5 */
+		/* #ifdef H5 */
 		left: calc(15px + var(--window-left));
 		bottom: calc(30px + var(--window-bottom));
 		/* #endif */
@@ -299,17 +308,17 @@
 
 	.uni-fab__circle--leftTop {
 		left: 15px;
-		top: 40px;
-		/* #ifdef H5 */
+		top: 30px;
+		/* #ifdef H5 */
 		left: calc(15px + var(--window-left));
-		top: calc(40px + var(--window-top));
+		top: calc(30px + var(--window-top));
 		/* #endif */
 	}
 
 	.uni-fab__circle--rightBottom {
 		right: 15px;
 		bottom: 30px;
-		/* #ifdef H5 */
+		/* #ifdef H5 */
 		right: calc(15px + var(--window-right));
 		bottom: calc(30px + var(--window-bottom));
 		/* #endif */
@@ -317,10 +326,10 @@
 
 	.uni-fab__circle--rightTop {
 		right: 15px;
-		top: 40px;
-		/* #ifdef H5 */
+		top: 30px;
+		/* #ifdef H5 */
 		right: calc(15px + var(--window-right));
-		top: calc(40px + var(--window-top));
+		top: calc(30px + var(--window-top));
 		/* #endif */
 	}
 
@@ -344,26 +353,42 @@
 		font-weight: bold;
 	}
 
-	.fab-circle-v {
-		position: absolute;
-		width: 3px;
-		height: 31px;
-		left: 26px;
-		top: 12px;
-		background-color: white;
-		transform: rotate(0deg);
-		transition: transform 0.3s;
-	}
-
-	.fab-circle-h {
-		position: absolute;
-		width: 31px;
-		height: 3px;
-		left: 12px;
-		top: 26px;
-		background-color: white;
+	// .fab-circle-v {
+	// 	position: absolute;
+	// 	width: 2px;
+	// 	height: 24px;
+	// 	left: 0;
+	// 	top: 0;
+	// 	right: 0;
+	// 	bottom: 0;
+	// 	/* #ifndef APP-NVUE */
+	// 	margin: auto;
+	// 	/* #endif */
+	// 	background-color: white;
+	// 	transform: rotate(0deg);
+	// 	transition: transform 0.3s;
+	// }
+
+	// .fab-circle-h {
+	// 	position: absolute;
+	// 	width: 24px;
+	// 	height: 2px;
+	// 	left: 0;
+	// 	top: 0;
+	// 	right: 0;
+	// 	bottom: 0;
+	// 	/* #ifndef APP-NVUE */
+	// 	margin: auto;
+	// 	/* #endif */
+	// 	background-color: white;
+	// 	transform: rotate(0deg);
+	// 	transition: transform 0.3s;
+	// }
+
+	.fab-circle-icon {
 		transform: rotate(0deg);
 		transition: transform 0.3s;
+		font-weight: 200;
 	}
 
 	.uni-fab__plus--active {
@@ -388,7 +413,7 @@
 
 	.uni-fab__content--other-platform {
 		border-width: 0px;
-		box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.2);
+		box-shadow: $uni-shadow-base;
 	}
 
 	.uni-fab__content--left {
@@ -432,17 +457,19 @@
 	}
 
 	.uni-fab__item-image {
-		width: 25px;
-		height: 25px;
-		margin-bottom: 3px;
+		width: 20px;
+		height: 20px;
+		margin-bottom: 4px;
 	}
 
 	.uni-fab__item-text {
 		color: #FFFFFF;
 		font-size: 12px;
+		line-height: 12px;
+		margin-top: 2px;
 	}
 
 	.uni-fab__item--first {
 		width: 55px;
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-fab/package.json b/uni_modules/uni-fab/package.json
index 9e71b42a16e7a81e74174a06029f29182e971299..0f27daa58062cd50946e73006091d621c90f0fd4 100644
--- a/uni_modules/uni-fab/package.json
+++ b/uni_modules/uni-fab/package.json
@@ -1,83 +1,87 @@
-{
-  "id": "uni-fab",
-  "displayName": "uni-fab 悬浮按钮",
-  "version": "1.1.0",
-  "description": "悬浮按钮 fab button ，点击可展开一个图标按钮菜单。",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "按钮",
-    "悬浮按钮",
-    "fab"
-],
-  "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": [],
-    "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"
-        }
-      }
-    }
-  }
-}
+{
+  "id": "uni-fab",
+  "displayName": "uni-fab 悬浮按钮",
+  "version": "1.2.2",
+  "description": "悬浮按钮 fab button ，点击可展开一个图标按钮菜单。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "按钮",
+    "悬浮按钮",
+    "fab"
+],
+  "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"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-fab/readme.md b/uni_modules/uni-fab/readme.md
index 0ed6ce815e18c9df82034c4318051ab34ce72902..9a444e880929df1b9f7efa692b98ebf4f3ed3d8d 100644
--- a/uni_modules/uni-fab/readme.md
+++ b/uni_modules/uni-fab/readme.md
@@ -1,5 +1,3 @@
-
-
 ## Fab 悬浮按钮
 > **组件名：uni-fab**
 > 代码块： `uFab`
@@ -7,85 +5,5 @@
 
 点击可展开一个图形按钮菜单
 
-### 安装方式
-
-本组件符合[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)
-
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 不建议动态修改属性，可能会耗损部分性能。
-> - 展开菜单暂不支持字体图标，使用图片路径时建议使用绝对路径，相对路径可能会有问题。
-> - 选中状态要通过自己控制，如果不希望有选中状态，不处理 `active` 即可。 
-> - 展开菜单建议最多显示四个，如果过多对于小屏手机可能会超出屏幕。
-
-
-### 基本用法
-
-在 `template` 中使用组件
-
-```html
-<template>
-	<view>
-		<uni-fab
-			:pattern="pattern"
-			:content="content"
-			:horizontal="horizontal"
-			:vertical="vertical"
-			:direction="direction"
-			@trigger="trigger"
-		></uni-fab>
-	</view>
-</template>
-```
-
-
-## API
-
-### Fab Props
-
-|  属性名	|    类型	| 默认值		| 说明															|
-| :-:		| :-:		| :-:			| :-:															|
-| pattern	| Object	| -				| 可选样式配置项												|
-| horizontal| String	| 'left'		| 水平对齐方式。`left`:左对齐，`right`：右对齐					|
-| vertical	| String	| 'bottom'		| 垂直对齐方式。`bottom`:下对齐，`top`：上对齐					|
-| direction	| String	| 'horizontal'	| 展开菜单显示方式。`horizontal`:水平显示，`vertical`：垂直显示	|
-| popMenu	| Boolean	| true			| 是否使用弹出菜单											|
-| content	| Array		| -				| 展开菜单内容配置项											|
-
-
-
-**pattern配置项：**
-
-|  参数				|    类型	| 默认值	| 说明				|
-| :-:				|  :-:		| :-:		| :-:				|
-| color				| String	| #3c3e49	| 文字默认颜色		|
-| selectedColor		| String	| #007AFF	| 文字选中时的颜色	|
-| backgroundColor	| String	| #ffffff	| 背景色			|
-| buttonColor		| String	| #3c3e49	| 按钮背景色		|
-
-**content配置项：**
-
-|  参数				|    类型	| 说明			|
-| :-:				|  :-:				| :-:		| :-:			|
-| iconPath			| String	| 图片路径		|
-| selectedIconPath	| String	| 选中后图片路径|
-| text				| String	| 文字			|
-| active			| Boolean	| 是否选中当前	|
-
-### Fab Events
-
-|  参数		|    类型	| 说明							|
-| :-:		|  :-:		| :-:							|
-| @trigger	| Function	| 展开菜单点击事件，返回点击信息|
-| @fabClick	| Function	| 悬浮按钮点击事件				|
-
-
-
-
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/fab/fab](https://hellouniapp.dcloud.net.cn/pages/extUI/fab/fab)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-fab)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-fav/changelog.md b/uni_modules/uni-fav/changelog.md
index f35b81748e84866247f8d42fd67e10fbf59584da..d8a08d4366e6aeb6571b1331f4783cd641ba912a 100644
--- a/uni_modules/uni-fav/changelog.md
+++ b/uni_modules/uni-fav/changelog.md
@@ -1,3 +1,8 @@
+## 1.2.1（2022-05-30）
+- 新增 stat 属性 ，是否开启uni统计功能
+## 1.2.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-fav](https://uniapp.dcloud.io/component/uniui/uni-fav)
 ## 1.1.1（2021-08-24）
 - 新增 支持国际化
 ## 1.1.0（2021-07-13）
diff --git a/uni_modules/uni-fav/components/uni-fav/uni-fav.vue b/uni_modules/uni-fav/components/uni-fav/uni-fav.vue
index b86424586d3596d8c7a11ec35285d402783b6924..8e391c20216c651d864522b1ca597222f2941732 100644
--- a/uni_modules/uni-fav/components/uni-fav/uni-fav.vue
+++ b/uni_modules/uni-fav/components/uni-fav/uni-fav.vue
@@ -15,28 +15,29 @@
 </template>
 
 <script>
-
-	/**
-	 * Fav 收藏按钮
-	 * @description 用于收藏功能，可点击切换选中、不选中的状态
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=864
-	 * @property {Boolean} star = [true|false] 按钮是否带星星
-	 * @property {String} bgColor 未收藏时的背景色
-	 * @property {String} bgColorChecked 已收藏时的背景色
-	 * @property {String} fgColor 未收藏时的文字颜色
-	 * @property {String} fgColorChecked 已收藏时的文字颜色
-	 * @property {Boolean} circle = [true|false] 是否为圆角
-	 * @property {Boolean} checked = [true|false] 是否为已收藏
+
+	/**
+	 * Fav 收藏按钮
+	 * @description 用于收藏功能，可点击切换选中、不选中的状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=864
+	 * @property {Boolean} star = [true|false] 按钮是否带星星
+	 * @property {String} bgColor 未收藏时的背景色
+	 * @property {String} bgColorChecked 已收藏时的背景色
+	 * @property {String} fgColor 未收藏时的文字颜色
+	 * @property {String} fgColorChecked 已收藏时的文字颜色
+	 * @property {Boolean} circle = [true|false] 是否为圆角
+	 * @property {Boolean} checked = [true|false] 是否为已收藏
 	 * @property {Object} contentText = [true|false] 收藏按钮文字
-	 * @event {Function} click 点击 fav按钮触发事件
-	 * @example <uni-fav :checked="true"/>
-	 */
-
-	import {
-		initVueI18n
-	} from '@dcloudio/uni-i18n'
-	import messages from './i18n/index.js'
-	const {	t	} = initVueI18n(messages)
+	 * @property {Boolean} stat 是否开启统计功能
+	 * @event {Function} click 点击 fav按钮触发事件
+	 * @example <uni-fav :checked="true"/>
+	 */
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
 
 	export default {
 		name: "UniFav",
@@ -79,19 +80,23 @@
 						contentFav: ""
 					};
 				}
-			}
-		},
-		computed: {
-			contentDefault() {
-				return this.contentText.contentDefault || t("uni-fav.collect")
-			},
-			contentFav() {
-				return this.contentText.contentFav || t("uni-fav.collected")
 			},
+			stat:{
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			contentDefault() {
+				return this.contentText.contentDefault || t("uni-fav.collect")
+			},
+			contentFav() {
+				return this.contentText.contentFav || t("uni-fav.collected")
+			},
 		},
 		watch: {
-			checked() {
-				if (uni.report) {
+			checked() {
+				if (uni.report && this.stat) {
 					if (this.checked) {
 						uni.report("收藏", "收藏");
 					} else {
@@ -108,7 +113,7 @@
 	};
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
 	$fav-height: 25px;
 
 	.uni-fav {
@@ -122,9 +127,9 @@
 		height: $fav-height;
 		line-height: $fav-height;
 		text-align: center;
-		border-radius: 3px;
-		/* #ifdef H5 */
-		cursor: pointer;
+		border-radius: 3px;
+		/* #ifdef H5 */
+		cursor: pointer;
 		/* #endif */
 	}
 
@@ -151,6 +156,6 @@
 		line-height: $fav-height;
 		align-items: center;
 		justify-content: center;
-		font-size: $uni-font-size-base;
+		font-size: 12px;
 	}
 </style>
diff --git a/uni_modules/uni-fav/package.json b/uni_modules/uni-fav/package.json
index 0556086716f4f1f4035bdfdb781d0ed1d5712939..cc1469716a21aa57d6fb8165cbbae421e5296dbe 100644
--- a/uni_modules/uni-fav/package.json
+++ b/uni_modules/uni-fav/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-fav",
   "displayName": "uni-fav 收藏按钮",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": " Fav 收藏组件，可自定义颜色、大小。",
   "keywords": [
     "fav",
@@ -41,6 +41,7 @@
   },
   "uni_modules": {
     "dependencies": [
+			"uni-scss",
 			"uni-icons"
 		],
     "encrypt": [],
@@ -80,7 +81,7 @@
         },
         "Vue": {
             "vue2": "y",
-            "vue3": "u"
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-fav/readme.md b/uni_modules/uni-fav/readme.md
index 83a01fca35e333c3f942680915632fa0c99a5a8b..4de125d2819979260ad83fa2218e19d7d4754025 100644
--- a/uni_modules/uni-fav/readme.md
+++ b/uni_modules/uni-fav/readme.md
@@ -4,47 +4,7 @@
 > **组件名：uni-fav**
 > 代码块： `uFav`
 
-
 用于收藏功能，可点击切换选中、不选中的状态。
 
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<uni-fav :checked="checked" @click="onClick"/>
-<uni-fav :checked="checked" class="favBtn" circle="true" bgColor="#dd524d" bgColorChecked="#007aff" @click="onClick"/>
-```
-
-## API
-
-### Fav Props
-
-|属性名				|类型	|默认值												|说明				|
-|:-:				|:-:	|:-:												|:-:				|
-|star				|Boolean|true												|按钮是否带星星		|
-|bgColor			|String	|#eeeeee											|未收藏时的背景色	|
-|bgColorChecked	|String	|#007aff											|已收藏时的背景色	|
-|fgColor			|String	|#666666											|未收藏时的文字颜色	|
-|fgColorChecked	|String	|#FFFFFF											|已收藏时的文字颜色	|
-|circle				|Boolean|false												|是否为圆角			|
-|checked			|Boolean|false												|是否为已收藏		|
-|contentText		|Object	|```{contentDefault: '收藏',contentFav: '已收藏'}```|收藏按钮文字		|
-
-
-### Fav Events
-
-|事件称名	|说明					|返回值	|
-|:-:		|:-:					|:-:	|
-|click		|点击 fav按钮 触发事件	|-		|
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/fav/fav](https://hellouniapp.dcloud.net.cn/pages/extUI/fav/fav)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-fav)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/changelog.md b/uni_modules/uni-feedback/changelog.md
index 57c13b89d8bcfe95c907caaef24304a6624980bf..00d331fce4a42e46c17ebb491920a7bbb61623b2 100644
--- a/uni_modules/uni-feedback/changelog.md
+++ b/uni_modules/uni-feedback/changelog.md
@@ -1,2 +1,4 @@
+## 1.0.4（2021-09-26）
+为了数据安全，`opendb-feedback`表的`permission`中`delete`，`update`的值默认为`false`
 ## 1.0.3（2021-08-26）
-删除多余的云函数test2
+删除多余的云函数test2
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/package.json b/uni_modules/uni-feedback/package.json
index fb20e7a1bfc276d8de38e66bc21912e430295d7c..a564d08505e9f9346c944aee87a71930e0431e07 100644
--- a/uni_modules/uni-feedback/package.json
+++ b/uni_modules/uni-feedback/package.json
@@ -1,10 +1,10 @@
 {
   "id": "uni-feedback",
-  "displayName": "问题反馈用户端页面模板",
-  "version": "1.0.3",
-  "description": "问题反馈用户端页面模板，方便开发者快速搭建问题反馈界面",
+  "displayName": "问题反馈页面模板",
+  "version": "1.0.4",
+  "description": "问题反馈页面模板，方便开发者快速搭建问题反馈界面",
   "keywords": [
-    "问题反馈用户端页面模板"
+    "问题反馈页面模板"
 ],
   "repository": "",
   "engines": {
diff --git a/uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback.vue b/uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback.vue
index 9c30b673f484ec0f120b7efabfd67178b0746358..40db16bf6d4144e07035b376df32e8e92aa1ee53 100644
--- a/uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback.vue
+++ b/uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback.vue
@@ -26,6 +26,7 @@
 	import {
 		validator
 	} from '../../js_sdk/validator/opendb-feedback.js';
+	console.log(validator);
 	const db = uniCloud.database();
 	const dbCollectionName = 'opendb-feedback';
 
diff --git a/uni_modules/uni-feedback/readme.md b/uni_modules/uni-feedback/readme.md
index aa0ede5e64cc25f1fab0f667d2e2bf5522571d01..65d91928ee5dd77fc5f6ebf5bff7c21f777f73cf 100644
--- a/uni_modules/uni-feedback/readme.md
+++ b/uni_modules/uni-feedback/readme.md
@@ -1,2 +1 @@
-这是一个问题反馈客户端插件，admin端插件：[https://ext.dcloud.net.cn/plugin?id=4992](https://ext.dcloud.net.cn/plugin?id=4992)
-> 参考案例 [uni-starter](https://ext.dcloud.net.cn/plugin?id=5057)
\ No newline at end of file
+这是一个问题反馈客户端插件，admin端插件：[https://ext.dcloud.net.cn/plugin?id=4992](https://ext.dcloud.net.cn/plugin?id=4992)
\ No newline at end of file
diff --git a/uni_modules/uni-file-picker/changelog.md b/uni_modules/uni-file-picker/changelog.md
index 82bc093d931e4ed56b37b79ab9a90f8b7a1443f9..a01f9bab203f9eb2869e32d89e742ced0bfdfcf4 100644
--- a/uni_modules/uni-file-picker/changelog.md
+++ b/uni_modules/uni-file-picker/changelog.md
@@ -1,5 +1,14 @@
-## 0.2.14（2021-08-23）
-- 新增 参数中返回 fileID 字段
+## 1.0.1（2021-11-23）
+- 修复 参数为对象的情况下，url在某些情况显示错误的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-file-picker](https://uniapp.dcloud.io/component/uniui/uni-file-picker)
+## 0.2.16（2021-11-08）
+- 修复 传入空对象 ，显示错误的Bug
+## 0.2.15（2021-08-30）
+- 修复 return-type="object" 时且存在v-model时，无法删除文件的Bug
+## 0.2.14（2021-08-23）
+- 新增 参数中返回 fileID 字段
 ## 0.2.13（2021-08-23）
 - 修复 腾讯云传入fileID 不能回显的bug
 - 修复 选择图片后，不能放大的问题
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
index ba4d742e367ba4e38e705d2371d1b9f15d6606e9..48c834ab5e2be094e265cb954bad8b714d5825d9 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
@@ -278,7 +278,6 @@
 						files.push(Object.assign({}, v))
 					}
 				})
-			
 				this.uploadFiles(files)
 			},
 			async setValue(newVal, oldVal) {
@@ -293,8 +292,8 @@
 					if (reg.test(url)) {
 						v.fileID = url
 						v.url = await this.getTempFileURL(url)
-					}
-					v.path = v.url
+					}
+					if(v.url) v.path = v.url
 					return v
 				}
 				if (this.returnType === 'object') {
@@ -439,7 +438,7 @@
 				for (let i = 0; i < res.length; i++) {
 					const item = res[i]
 					const index = item.uuid ? this.files.findIndex(p => p.uuid === item.uuid) : item.index
-					
+
 					if (index === -1 || !this.files) break
 					if (item.errMsg === 'request:fail') {
 						this.files[index].url = item.path
@@ -457,7 +456,7 @@
 						}else{
 							this.files[index].url = item.url
 						}
-						
+
 						this.files[index].status = 'success'
 						this.files[index].progress += 1
 						successData.push(this.files[index])
@@ -521,7 +520,7 @@
 					this.setEmit()
 				})
 			},
-			
+
 			/**
 			 * 获取文件名和后缀
 			 * @param {Object} name
@@ -542,8 +541,7 @@
 				let data = []
 				if (this.returnType === 'object') {
 					data = this.backObject(this.files)[0]
-					this.localValue = {}
-					Object.assign(this.localValue, data)
+					this.localValue = data?data:null
 				} else {
 					data = this.backObject(this.files)
 					if (!this.localValue) {
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue b/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
index 6b1741d9a1acae86e978225a414380b3ddd4ca93..51ace0b4e385a6577c4386738516b6a4cefe1574 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
@@ -116,13 +116,15 @@
 				let {
 					border
 				} = this.styles
-				let obj = {}
+				let obj = {}
+				const widthDefaultValue = 1
+				const radiusDefaultValue = 3
 				if (typeof border === 'boolean') {
 					obj.border = border ? '1px #eee solid' : 'none'
 				} else {
-					let width = (border && border.width) || 1
+					let width = (border && border.width) || widthDefaultValue
 					width = this.value2px(width)
-					let radius = (border && border.radius) || 5
+					let radius = (border && border.radius) || radiusDefaultValue
 					radius = this.value2px(radius)
 					obj = {
 						'border-width': width,
@@ -206,7 +208,7 @@
 		left: 0;
 		margin: 5px;
 		border: 1px #eee solid;
-		border-radius: 8px;
+		border-radius: 5px;
 		overflow: hidden;
 	}
 
@@ -271,8 +273,8 @@
 		align-items: center;
 		justify-content: center;
 		position: absolute;
-		top: 5px;
-		right: 5px;
+		top: 3px;
+		right: 3px;
 		height: 26px;
 		width: 26px;
 		border-radius: 50%;
diff --git a/uni_modules/uni-file-picker/package.json b/uni_modules/uni-file-picker/package.json
index 1379d29b9814e1858e6eddc4a055f92db3c64e31..29df9f7220eb9d7fe45764b891bc4ec04081c185 100644
--- a/uni_modules/uni-file-picker/package.json
+++ b/uni_modules/uni-file-picker/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-file-picker",
   "displayName": "uni-file-picker 文件选择上传",
-  "version": "0.2.14",
+  "version": "1.0.1",
   "description": "文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间",
   "keywords": [
     "uni-ui",
@@ -40,7 +40,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": ["uni-scss"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -78,7 +78,7 @@
         },
         "Vue": {
             "vue2": "y",
-            "vue3": "u"
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-file-picker/readme.md b/uni_modules/uni-file-picker/readme.md
index 496327b7f2e9961d2333a315ca7af8a4bf743c75..c8399a5e7e8bbb91f6697170e1783e5d87852057 100644
--- a/uni_modules/uni-file-picker/readme.md
+++ b/uni_modules/uni-file-picker/readme.md
@@ -7,299 +7,5 @@
 
 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
 
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 组件需要依赖 `sass` 插件 ，请自行手动安装
-> - 如不绑定服务空间，`autoUpload`默认为`false`且不可更改
-> - 选择文件目前只支持 `H5` 和 `微信小程序平台` ，且 `微信小程序平台` 使用 `wx.chooseMessageFile()`
-> - v-model 值需要自动上传成功后才会绑定值，一般只用来回显数据
-> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-
-
-
-## API
-
-### FilePicker Props
-
-| 属性名					| 类型			| 默认值	| 可选值								| 说明																	|
-| :-:						| :-:			| :-:		| :-:									| :-:																	|
-| v-model/value	| Array\Object	| -			| -						| 组件数据，通常用来回显 ,类型由`return-type`属性决定	，**格式见下文**	|
-| disabled			| Boolean	| false	| -										| 组件禁用								|
-| readonly			| Boolean	| false	| -										| 组件只读，不可选择，不显示进度，不显示删除按钮								|
-| return-type		| String	| array	| array/object				| 限制 `value` 格式，当为 `object`	 时	，组件只能单选，且会覆盖	|
-| disable-preview| Boolean	| false	| -									| 禁用图片预览，仅	`mode:grid`生效	|
-| del-icon			| Boolean	| true	| -										| 是否显示删除按钮	|
-| auto-upload		| Boolean	| true	| -										| 是否自动上传，值为`true`则只触发@select,可自行上传|
-| limit					| Number\String	| 9	| -									| 最大选择个数 ，h5 会自动忽略多选的部分			|
-| title					| String	| -			| -										| 组件标题，右侧显示上传计数			|
-| mode					| String	| list	| list/grid						| 选择文件后的文件列表样式								|
-| file-mediatype| String	| image	| image/video/all			| 选择文件类型,all 只支持 H5 和微信小程序平台	|
-| file-extname	| Array\String		| -			| -						| 选择文件后缀，字符串的情况下需要用逗号分隔（推荐使用字符串），根据 `file-mediatype` 属性而不同|
-| list-styles	  | Object	| -			| -										| `mode:list` 时的样式			|
-| image-styles	| Object	| -			| -										| `mode:grid` 时的样式	|
-
-
-### value 格式 
-
-三个属性必填，否则影响组件显示
-
-```json 
-[
-	{
-		"name":"file.txt",
-		"extname":"txt",
-		"url":"https://xxxx",
-		// ...
-	}
-]
-
-```
-
-### list-styles 格式 
-
-```json 
-{
-	"borderStyle":{
-		"color":"#eee",		// 边框颜色
-		"width":"1px",		// 边框宽度
-		"style":"solid", 	// 边框样式
-		"radius":"5px" 		// 边框圆角，不支持百分比
-	},
-	"border":false, // 是否显示边框
-	"dividline":true // 是否显示分隔线
-}
-```
-
-### image-styles 格式 
-
-```json 
-{
-	"height": 60,	// 边框高度
-	"width": 60,	// 边框宽度
-	"border":{ // 如果为 Boolean 值，可以控制边框显示与否
-		"color":"#eee",		// 边框颜色
-		"width":"1px",		// 边框宽度
-		"style":"solid", 	// 边框样式
-		"radius":"50%" 		// 边框圆角，支持百分比
-	}
-}
-```
-
-### FilePicker Events
-
-|事件称名		|说明							|	返回值	|					
-|:-:			|:-:							|	:-:	|
-|@select	| 选择文件后触发 		| 见下文|
-|@progress|文件上传时触发			| 见下文|
-|@success	|上传成功触发				| 见下文|
-|@fail		|上传失败触发				| 见下文|
-|@delete	|文件从列表移除时触发| 见下文|
-
-
-#### Callback Params
-
-`**注意**：如果绑定的是腾讯云的服务空间 ，tempFilePaths 将返回 fileID`
-
-```json
-{
-	"progress"			: Number, 		// 上传进度 ，仅 @progress 事件包含此字段
-	"index"				: Number, 		// 上传文件索引 ，仅 @progress 事件包含此字段
-	"tempFile"			: file, 		// 当前文件对象 ，包含文件流，文件大小，文件名称等，仅 @progress 事件包含此字段
-	"tempFiles"			: files, 		// 文件列表,包含文件流，文件大小，文件名称等
-	"tempFilePaths"		: filePaths, 	// 文件地址列表，@sucess 事件为上传后的线上文件地址
-}
-
-```
-
-
-### FilePicker Methods
-
-通过 `$ref` 调用
-
-| 方法称名						| 说明			|		参数 		|				
-| :-:								| :-:		  |		:-:		  |				
-| upload()						| 手动上传 	，如`autoUpload`为`false`  ，必须调用此方法| - |
-| clearFiles(index:Number)	| 清除选择结果| 传如 Number　为删除指定下标的文件 ，不传为删除所有|
-
-### FilePicker Slots
-
-插槽可定义上传按钮显示样式 
-
-|	插槽名 	| 说明 |
-| :-:			| :-:		  |
-|	default	|默认插槽|
-
-## 组件用法
-
-### 基础用法
-
-```html
-<uni-file-picker 
-	v-model="imageValue" 
-	fileMediatype="image" 
-	mode="grid" 
-	@select="select" 
-	@progress="progress" 
-	@success="success" 
-	@fail="fail" 
-/>
-```
-
-```javascript
-export default {
-		data() {
-			return {
-				imageValue:[]
-			}
-		},
-		methods:{
-			// 获取上传状态
-			select(e){
-				console.log('选择文件：',e)
-			},
-			// 获取上传进度
-			progress(e){
-				console.log('上传进度：',e)
-			},
-			
-			// 上传成功
-			success(e){
-				console.log('上传成功')
-			},
-			
-			// 上传失败
-			fail(e){
-				console.log('上传失败：',e)
-			}
-		}
-}
-
-```
-
-### 选择指定后缀图片，且限制选择个数
-
-配置 `file-mediatype` 属性为 `image`，限定只选择图片
-
-配置 `file-extname` 属性为 `'png,jpg'`，限定只选择 `png`和`jpg`后缀的图片
-
-配置 `limit` 属性为 1 ，则最多选择一张图片
-
-配置 `mode` 属性为 `grid` ，可以使用九宫格样式选择图片
-
-
-```html
-<uni-file-picker 
-	v-model="imageValue"  
-	file-mediatype="image"
-	mode="grid"
-	file-extname="png,jpg"
-	:limit="1"
-	@progress="progress" 
-	@success="success" 
-	@fail="fail" 
-	@select="select"
-/>
-```
-
-### 手动上传
-
-配置 `auto-upload` 属性为 `false` ，可以停止自动上传，通过`ref`调用`upload`方法自行选择上传时机
-
-```html
-<view>
-	<uni-file-picker  ref="files" :auto-upload="false"/>
-	<button @click="upload">上传文件</button>
-</view>
-```
-
-```javascript
-export default {
-		data() {},
-		methods:{
-			upload(){
-				this.$refs.files.upload()
-			}
-		}
-}
-
-```
-
-### 单选图片且点击再次选择
-
-配置 `disable-preview` 属性为 `true`，禁用点击预览图片功能
-
-配置 `del-icon` 属性为 `false`，隐藏删除按钮
-
-配置 `return-type` 属性为 `object`，设置 `value` 类型 ，如需绑定 `array`类型 ，则设置`limit:1`，可达到一样的效果
-
-
-
-```html
-<uni-file-picker 
-	disable-preview
-	:del-icon="false"
-	return-type="object"
->选择头像</uni-file-picker>
-```
-
-### 自定义样式
-
-配置 `image-styles` 属性，可以自定义`mode:image`时的回显样式
-
-配置 `list-styles` 属性，可以自定义`mode:video|| mode:all`时的回显样式
-
-```html
-<view>
-	<uni-file-picker fileMediatype="image" :image-styles="imageStyles"/>
-	<uni-file-picker fileMediatype="all" :list-styles="listStyles"/>
-</view>
-```
-
-```javascript
-export default {
-		data() {
-			imageStyles:{
-				width:64,
-				height:64,
-				border:{
-					color:"#ff5a5f",
-					width:2,
-					style:'dashed',
-					radius:'2px'
-				}
-			},
-			listStyles:{
-				// 是否显示边框
-				border: true,
-				// 是否显示分隔线
-				dividline: true,
-				// 线条样式
-				borderStyle: {
-					width:1,
-					color:'blue',
-					radius:2
-				}
-			}
-		}
-}
-
-```
-
-
-
-### 使用插槽 
-
-使用默认插槽可以自定义选择文件按钮样式
-
-```html
-<uni-file-picker 
-	v-model="value" file-mediatype="all">
-	<button>选择文件</button>
-</uni-file-picker>
-```
-
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/file-picker/file-picker](https://hellouniapp.dcloud.net.cn/pages/extUI/file-picker/file-picker)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-file-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-forms/changelog.md b/uni_modules/uni-forms/changelog.md
index 1d19e70603b92d713220f7e9bf422343a9348863..26e120b5c0878e5d3bc2916063da30603f3c87a7 100644
--- a/uni_modules/uni-forms/changelog.md
+++ b/uni_modules/uni-forms/changelog.md
@@ -1,53 +1,60 @@
+## 1.3.2（2021-12-09）
+-
+## 1.3.1（2021-11-19）
+- 修复 label 插槽不生效的bug
+## 1.3.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-forms](https://uniapp.dcloud.io/component/uniui/uni-forms)
 ## 1.2.7（2021-08-13）
 - 修复 没有添加校验规则的字段依然报错的Bug
-## 1.2.6（2021-08-11）
-- 修复 重置表单错误信息无法清除的问题
-## 1.2.5（2021-08-11）
-- 优化 组件文档
-## 1.2.4（2021-08-11）
-- 修复 表单验证只生效一次的问题
-## 1.2.3（2021-07-30）
-- 优化 vue3下事件警告的问题
-## 1.2.2（2021-07-26）
-- 修复 vue2 下条件编译导致destroyed生命周期失效的Bug
-- 修复 1.2.1 引起的示例在小程序平台报错的Bug
-## 1.2.1（2021-07-22）
-- 修复 动态校验表单，默认值为空的情况下校验失效的Bug
-- 修复 不指定name属性时，运行报错的Bug
-- 优化 label默认宽度从65调整至70，使required为true且四字时不换行
-- 优化 组件示例，新增动态校验示例代码
-- 优化 组件文档，使用方式更清晰
-## 1.2.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 1.1.2（2021-06-25）
-- 修复 pattern 属性在微信小程序平台无效的问题
-## 1.1.1（2021-06-22）
-- 修复 validate-trigger属性为submit且err-show-type属性为toast时不能弹出的Bug
-## 1.1.0（2021-06-22）
-- 修复 只写setRules方法而导致校验不生效的Bug
-- 修复 由上个办法引发的错误提示文字错位的Bug
-## 1.0.48（2021-06-21）
-- 修复 不设置 label 属性 ，无法设置label插槽的问题
-## 1.0.47（2021-06-21）
-- 修复 不设置label属性，label-width属性不生效的bug
-- 修复 setRules 方法与rules属性冲突的问题
-## 1.0.46（2021-06-04）
-- 修复 动态删减数据导致报错的问题
-## 1.0.45（2021-06-04）
-- 新增 modelValue 属性 ，value 即将废弃
-## 1.0.44（2021-06-02）
-- 新增 uni-forms-item 可以设置单独的 rules
-- 新增 validate 事件增加 keepitem 参数，可以选择那些字段不过滤
-- 优化 submit 事件重命名为 validate
-## 1.0.43（2021-05-12）
-- 新增 组件示例地址
-## 1.0.42（2021-04-30）
-- 修复 自定义检验器失效的问题
-## 1.0.41（2021-03-05）
-- 更新 校验器
-- 修复 表单规则设置类型为 number 的情况下，值为0校验失败的Bug
-## 1.0.40（2021-03-04）
-- 修复 动态显示uni-forms-item的情况下，submit 方法获取值错误的Bug
-## 1.0.39（2021-02-05）
-- 调整为uni_modules目录规范
-- 修复 校验器传入 int 等类型 ，返回String类型的Bug
+## 1.2.6（2021-08-11）
+- 修复 重置表单错误信息无法清除的问题
+## 1.2.5（2021-08-11）
+- 优化 组件文档
+## 1.2.4（2021-08-11）
+- 修复 表单验证只生效一次的问题
+## 1.2.3（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.2（2021-07-26）
+- 修复 vue2 下条件编译导致destroyed生命周期失效的Bug
+- 修复 1.2.1 引起的示例在小程序平台报错的Bug
+## 1.2.1（2021-07-22）
+- 修复 动态校验表单，默认值为空的情况下校验失效的Bug
+- 修复 不指定name属性时，运行报错的Bug
+- 优化 label默认宽度从65调整至70，使required为true且四字时不换行
+- 优化 组件示例，新增动态校验示例代码
+- 优化 组件文档，使用方式更清晰
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.2（2021-06-25）
+- 修复 pattern 属性在微信小程序平台无效的问题
+## 1.1.1（2021-06-22）
+- 修复 validate-trigger属性为submit且err-show-type属性为toast时不能弹出的Bug
+## 1.1.0（2021-06-22）
+- 修复 只写setRules方法而导致校验不生效的Bug
+- 修复 由上个办法引发的错误提示文字错位的Bug
+## 1.0.48（2021-06-21）
+- 修复 不设置 label 属性 ，无法设置label插槽的问题
+## 1.0.47（2021-06-21）
+- 修复 不设置label属性，label-width属性不生效的bug
+- 修复 setRules 方法与rules属性冲突的问题
+## 1.0.46（2021-06-04）
+- 修复 动态删减数据导致报错的问题
+## 1.0.45（2021-06-04）
+- 新增 modelValue 属性 ，value 即将废弃
+## 1.0.44（2021-06-02）
+- 新增 uni-forms-item 可以设置单独的 rules
+- 新增 validate 事件增加 keepitem 参数，可以选择那些字段不过滤
+- 优化 submit 事件重命名为 validate
+## 1.0.43（2021-05-12）
+- 新增 组件示例地址
+## 1.0.42（2021-04-30）
+- 修复 自定义检验器失效的问题
+## 1.0.41（2021-03-05）
+- 更新 校验器
+- 修复 表单规则设置类型为 number 的情况下，值为0校验失败的Bug
+## 1.0.40（2021-03-04）
+- 修复 动态显示uni-forms-item的情况下，submit 方法获取值错误的Bug
+## 1.0.39（2021-02-05）
+- 调整为uni_modules目录规范
+- 修复 校验器传入 int 等类型 ，返回String类型的Bug
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 b75459b3e6d72b180de8f644444e72f8672bfd73..679b12f9349692459f9fcce0932668a43a5dfa90 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
@@ -2,8 +2,8 @@
 	<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="left">
+				<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>
@@ -180,32 +180,32 @@ export default {
 		}
 		this.init();
 	},
-	// #ifndef VUE3
-	destroyed() {
-		if(this.__isUnmounted) return
-		this.unInit()
-	},
-	// #endif
-	// #ifdef VUE3
-	unmounted(){
-		this.__isUnmounted = true
-		this.unInit()
-	},
+	// #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'))
-				}
-				if(this.labelWid && this.labelWid !=='auto') {
-					this.labelWid +='px'
-				}
+				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'))
+				}
+				if(this.labelWid && this.labelWid !=='auto') {
+					this.labelWid +='px'
+				}
 				this.labelAli = this.labelAlign ? this.labelAlign : labelAlign;
 
 				// 判断第一个 item
@@ -241,16 +241,16 @@ export default {
 				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]
-					}
-				})
-			}
+		},
+		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]
+					}
+				})
+			}
 		},
 		/**
 		 * 获取父元素实例
@@ -293,7 +293,7 @@ export default {
 		 */
 		async triggerCheck(value,formTrigger) {
 			let promise = null;
-			this.errMsg = '';
+			this.errMsg = '';
 			// fix by mehaotian 解决没有检验规则的情况下，抛出错误的问题
 			if (!this.validator || Object.keys(this.formRules).length === 0) return;
 			const isNoField = this.isRequired(this.formRules.rules || []);
@@ -379,7 +379,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
 .uni-forms-item {
 	position: relative;
 	padding: 0px;
@@ -427,8 +427,8 @@ export default {
 	// margin-right: 5px;
 
 	.label-text {
-		font-size: 14px;
-		color: #333;
+		font-size: 13px;
+		color: #666666;
 	}
 	.label-seat {
 		margin-right: 5px;
@@ -452,7 +452,7 @@ export default {
 // 必填
 .is-required {
 	// color: $uni-color-error;
-	color: #f00;
+	color: #dd524d;
 	font-weight: bold;
 }
 
@@ -465,7 +465,7 @@ export default {
 
 .uni-error-message-text {
 	line-height: 22px;
-	color: $uni-color-error;
+	color: #dd524d;
 	font-size: 12px;
 }
 
@@ -476,7 +476,7 @@ export default {
 }
 
 .is-input-error-border {
-	border-color: $uni-color-error;
+	border-color: #dd524d;
 }
 
 .uni-forms-item--border {
@@ -506,4 +506,4 @@ export default {
 .uni-forms--no-padding {
 	padding: 0;
 }
-</style>
+</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 d15b505b0f4dee7f43fa128e462edc44e8e290cf..dff823bb09d7681708bfe3f1be932dcdfb09efe0 100644
--- a/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
+++ b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
@@ -245,8 +245,8 @@
 					item.errMsg = '';
 					const inputComp = this.inputChildrens.find(child => child.rename === item.name);
 					if (inputComp) {
-						inputComp.errMsg = '';
-						// fix by mehaotian 不触发其他组件的 setValue
+						inputComp.errMsg = '';
+						// fix by mehaotian 不触发其他组件的 setValue
 						inputComp.is_reset = true
 						inputComp.$emit('input', inputComp.multiple ? [] : '');
 						inputComp.$emit('update:modelValue', inputComp.multiple ? [] : '');
@@ -459,7 +459,7 @@
 	};
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
 	.uni-forms {
 		// overflow: hidden;
 		// padding: 10px 15px;
@@ -469,4 +469,4 @@
 		// padding: 10px 15px;
 		// padding-top: 22px;
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-forms/package.json b/uni_modules/uni-forms/package.json
index d791aeb99add3868ac16de57752944b5b5e42fa8..dfa7af4c459063564c2ad3942a96a79503e6a905 100644
--- a/uni_modules/uni-forms/package.json
+++ b/uni_modules/uni-forms/package.json
@@ -1,89 +1,90 @@
-{
-  "id": "uni-forms",
-  "displayName": "uni-forms 表单",
-  "version": "1.2.7",
-  "description": "由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据",
-  "keywords": [
-    "uni-ui",
-    "表单",
-    "校验",
-    "表单校验",
-    "表单验证"
-],
-  "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-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": "u"
-        }
-      }
-    }
-  }
-}
+{
+  "id": "uni-forms",
+  "displayName": "uni-forms 表单",
+  "version": "1.3.2",
+  "description": "由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据",
+  "keywords": [
+    "uni-ui",
+    "表单",
+    "校验",
+    "表单校验",
+    "表单验证"
+],
+  "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"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-forms/readme.md b/uni_modules/uni-forms/readme.md
index e8352620b6f85056593f571568f6cdfb8dc11406..63d5a043ee8c43c48d21de1af4855cbef4e0ce50 100644
--- a/uni_modules/uni-forms/readme.md
+++ b/uni_modules/uni-forms/readme.md
@@ -19,812 +19,5 @@ uni-app的内置组件已经有了 `<form>`组件，用于提交表单内容。
 
 另外，`<uni-forms>`组件下面的各个表单项，可以通过`<uni-group>`包裹为不同的分组。同一`<uni-group>`下的不同表单项目将聚拢在一起，同其他group保持垂直间距。`<uni-group>`仅影响视觉效果。
 
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 组件需要依赖 `sass` 插件 ，请自行手动安装
-> - `resetFields` 方法不会重置原生组件和三方组件的值
-> - 如果配置 `validateTrigger` 属性为 `bind` 且表单域组件使用 `input` 事件触发会耗损部分性能，请谨慎使用
-> - 组件支持 nvue ，需要在 `manifest.json > app-plus` 节点下配置 `"nvueStyleCompiler" : "uni-app"` 
-> - uni-forms 中不包含其他表单组件，如需使用 uni-easyinput、uni-data-checkbox 等组件，需要自行引入
-> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-
-
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法 
-
-`uni-forms` 组件通常用来做表单校验和提交。每一个 `uni-forms-item` 是它的一个表单域组件，用来承载表单具体内容，`uni-forms-item` 中可以嵌套 `uni-easyinput`、`uni-data-checkbox` 和 uni-app内置的表单组件 ，不过 uni-app 的内置表单组件需要通过 `binddata` 或者 `uni-forms` 提供的 `setValue` 方法，将内容与 `uni-forms` 关联，才可完成表单的校验与提交（详见后文`表单校验` 部分）
-
-```html
-<template>
-	<view class="">
-		<uni-forms :modelValue="formData">
-			<uni-forms-item label="姓名" name="name">
-				<uni-easyinput type="text" v-model="formData.name" placeholder="请输入姓名" />
-			</uni-forms-item>
-			<uni-forms-item required name="hobby" label="兴趣爱好">
-				<uni-data-checkbox multiple v-model="formData.hobby" :localdata="hobby"/>
-			</uni-forms-item>
-		</uni-forms>
-		<button @click="submitForm">Submit</button>
-	</view>
-</template>
-```
-
-### 对齐方式
-
-使用 `label-position` 属性可以设置所有表单域的位置，默认在左侧
-
-```html
-<template>
-	<view class="">
-		<uni-forms :modelValue="formData" label-position="top">
-			<uni-forms-item label="姓名" name="name">
-				<uni-easyinput type="text" v-model="formData.name" placeholder="请输入姓名" />
-			</uni-forms-item>
-			<uni-forms-item required name="hobby" label="兴趣爱好">
-				<uni-data-checkbox multiple v-model="formData.hobby" :localdata="hobby"/>
-			</uni-forms-item>
-		</uni-forms>
-	</view>
-</template>
-```
-
-## 表单校验
-
-表单校验还可以直接通过 `uniCloud web 控制台` 快速根据 `schema` 自动生成表单维护界面，比如新建页面和编辑页面，自动处理校验规则，更多参考[DB Schema](https://uniapp.dcloud.io/uniCloud/schema)
-
-### 如何使用 
-
-1. `uni-forms` 需要通过 `rules` 属性传入约定的校验规则，详细描述下文`校验规则说明`。
-```html
-<!-- rules 内容详见下方完整示例 -->
-<uni-forms ref="form" :rules="rules">
-	...
-</uni-forms>
-```
-
-2. `uni-forms` 需要绑定`modelValue`属性，值为表单的key\value 组成的对象。
-```html
-<!-- formData、rules 内容详见下方完整示例 -->
-<uni-forms ref="form" :modelValue="formData" :rules="rules">
-	...
-</uni-forms>
-```
-
-3. `uni-forms-item` 需要设置 `name` 属性为当前字段名，字段为 `String` 类型而非变量。
-```html
-<!-- formData、rules 内容详见下方完整示例 -->
-<uni-forms :modelValue="formData" :rules="rules">
-	<uni-forms-item label="姓名" name="name">
-		<uni-easyinput type="text" v-model="formData.name" placeholder="请输入姓名" />
-	</uni-forms-item>
-	<uni-forms-item required name="hobby" label="兴趣爱好">
-		<uni-data-checkbox multiple v-model="formData.hobby" :localdata="hobby"/>
-	</uni-forms-item>
-</uni-forms>
-```
-
-4. 如果使用`uni-easyinput` 和 `uni-data-checkbox` 等关联组件，只需绑定 v-model，无需其他操作。
-5. 如果使用原生 input、checkbox 或三方组件等，只需要给组件绑定 `binddata` 方法即可触发表单校验，无需绑定事件到 `methods` 中，见下方完整示例。
-6. `binddata('name',$event.detail.value,'form')"` 方法接受三个值，
-	- 第一个参数传入当前表单组件所在的 name，同当前父组件 `uni-forms-item` 绑定属性 `name` 的值
-	- 第二个参数传入需要校验的值，内置组件可以通过 `$event.detail.value` 获取到组件的返回值，自定义组件传入需要校验的值即可
-	- 第三个参数传入 `uni-forms` 组件绑定属性 `ref` 的值，通常在多表单的时候需要传入，用来区分表单，如页面中仅有一个 `uni-forms` 可忽略
-7. 如果内置 `binddata` 方法无法满足需求，在当前页面的 `methods` 中复写此方法即可，复写此方法需要调用 `uni-forms` 的 `setValue` 来触发表单校验，见下方 `setValue`方法说明
-
-**完整示例**
-
-```html
-<template>
-	<view>
-		<uni-forms ref="form" :modelValue="formData" :rules="rules">
-			<uni-forms-item label="姓名" name="name">
-				<uni-easyinput type="text" v-model="formData.name" placeholder="请输入姓名" />
-			</uni-forms-item>
-			<uni-forms-item label="邮箱" name="email">
-				<input class="input" v-model="formData.email" type="text" placeholder="请输入用户名" @input="binddata('email',$event.detail.value)" />
-			</uni-forms-item>
-		</uni-forms>
-		<button @click="submit">Submit</button>
-	</view>
-</template>
-			 
-```
-
-```javascript
-export default {
-	data() {
-		return {
-			// 表单数据
-			formData: {
-				name: 'LiMing',
-				email: 'dcloud@email.com'
-			},
-			rules: {
-				// 对name字段进行必填验证
-				name: {
-					rules: [{
-							required: true,
-							errorMessage: '请输入姓名',
-						},
-						{
-							minLength: 3,
-							maxLength: 5,
-							errorMessage: '姓名长度在 {minLength} 到 {maxLength} 个字符',
-						}
-					]
-				},
-				// 对email字段进行必填验证
-				email: {
-					rules: [{
-						format: 'email',
-						errorMessage: '请输入正确的邮箱地址',
-					}]
-				}
-			}
-		}
-	},
-	methods: {
-		/**
-		 * 复写 binddata 方法，如果只是为了校验，无复杂自定义操作，可忽略此方法
-		 * @param {String} name 字段名称
-		 * @param {String} value 表单域的值
-		 */
-		// binddata(name,value){
-		// 通过 input 事件设置表单指定 name 的值
-		//   this.$refs.form.setValue(name, value)
-		// },
-		// 触发提交表单
-		submit() {
-			this.$refs.form.validate().then(res=>{
-				console.log('表单数据信息：', res);
-			}).catch(err =>{
-				console.log('表单错误信息：', err);
-			})
-		}
-	}
-}
-```
-
-> **注意**
-> `modelValue` 对象目前有比较严格的格式要求：
-> - 尽量不要使用嵌套的数据结构，因为表单域指定的`name`值与 modeValue 的 key 是一一对应的，只有一种情况例外，那就是动态校验表单，见下方`动态校验表单`章节
-
-
-### 校验规则说明
-
-校验规则接受一个 `Object` 类型的值，通过传入不同的规则来表示每个表单域的值该如何校验
-
-对象的 `key` 表示当前表单域的字段名，`value` 为具体的校验规则
-
-以下为 `value` 所包含的内容：
-
-|属性名|类型|说明|
-|:-:|:-:|:-:|
-|rules|Array|校验规则，见下方 `rules 属性说明`|
-|validateTrigger| String| 表单校验时机|
-|label|String|当前表单域的字段中文名，多用于 `errorMessage` 的显示，可不填|
-
-
-```javascript
-rules: {
-	// 对name字段进行必填验证
-	name: {
-		// name 字段的校验规则
-		rules:[
-			// 校验 name 不能为空
-			{
-				required: true,
-				message: '请填写姓名',
-			},
-			// 对name字段进行长度验证
-			{
-				minLength: 3,
-				maxLength: 5,
-				message: '{label}长度在 {minLength} 到 {maxLength} 个字符',
-			}
-		],
-		// 当前表单域的字段中文名，可不填写
-		label:'姓名',
-		validateTrigger:'submit'
-	}
-}
-
-```
-
-
-### rules 属性说明
-每一个验证规则中，可以配置多个属性，下面是一些常见规则属性。实际上这里的规范，与uniCloud的[DB Schema](https://uniapp.dcloud.io/uniCloud/schema?id=validator)规范相同。
-
-|属性名|类型|默认值|可选值|说明	|
-|:-:|:-:|:-:|:-:|:-:|
-|required|Boolean|-|-|是否必填，配置此参数不会显示输入框左边的必填星号，如需要，请配置`uni-forms-item`组件的的required为true|
-|range|Array|-|-|数组至少要有一个元素，且数组内的每一个元素都是唯一的。	|
-|format|String|-|-|内置校验规则，如这些规则无法满足需求，可以使用正则匹配或者自定义规则	|
-|pattern|RegExp|-|-|正则表达式，注意事项见下方说明|
-|maximum|Number|-|-| 校验最大值(大于)|
-|minimum|Number|-|-| 校验最小值(小于)		|
-|maxLength|Number|-|-| 校验数据最大长度		|
-|errorMessage|String|-|-|校验失败提示信息语，可添加属性占位符，当前表格内属性都可用作占位符|
-|trigger|String|bind| bind/submit|校验触发时机|
-|validateFunction|Function|-|-|自定义校验规则	|
-
-
-**format属性值说明**
-
-|属性名|说明|
-|:-:|:-:|
-|string|必须是 string 类型，默认类型|
-|number|必须是 number 类型|
-|boolean|必须是 boolean 类型|
-|array|必须是 array 类型|
-|object|必须是 object 类型|
-|url|必须是 url 类型|
-|email|必须是 email 类型|
-
-
-> **pattern属性说明**
-> 在小程序中，json 中不能使用正则对象，如：`/^\S+?@\S+?\.\S+?$/`，使用正则对象会被微信序列化，导致正则失效。
-> 所以建议统一使用字符串的方式来使用正则 ，如`'^\\S+?@\\S+?\\.\\S+?$'` ，需要注意 `\` 需要使用 `\\` 来转译。
-> 如验证邮箱：/^\S+?@\S+?\.\S+?$/ （注意不带引号）,或使用 "^\\S+?@\\S+?\\.\\S+?$"（注意带引号需要使用 `\` 转义）		
-
-
-
-### validateFunction 自定义校验规则使用说明
-`uni-forms` 的 `rules` 基础规则有时候不能满足项目的所有使用场景，这时候可以使用 `validateFunction` 来自定义校验规则
-
-`validateFunction` 方法返回四个参数 `validateFunction:function(rule,value,data,callback){}` ，当然返回参数名开发者可以自定义：
- - rule :  当前校验字段在 rules 中所对应的校验规则
- - value : 当前校验字段的值
- - data	:  所有校验字段的字段和值的对象
- - callback : 校验完成时的回调，一般无需执行callback，返回true(校验通过)或者false(校验失败)即可 ，如果需要显示不同的 `errMessage`，如果校验不通过需要执行 callback('提示错误信息')，如果校验通过，执行callback()即可
-
-
-> **注意**
-> 需要注意，如果需要使用 `validateFunction` 自定义校验规则,则不能采用 `uni-forms` 的 `rules` 属性来配置校验规则，这时候需要通过`ref`，在`onReady`生命周期调用组件的`setRules`方法绑定验证规则
-> 无法通过props传递变量，是因为微信小程序会过滤掉对象中的方法，导致自定义验证规则无效。
-> 	
-
-
-
-
-
-```html
-<template>
-	<view>
-		<uni-forms ref="form" :modelValue="formData">
-			<uni-forms-item label="兴趣爱好" required name="hobby">
-				<uni-data-checkbox v-model="formData.hobby" multiple :localdata="hobbys" />
-			</uni-forms-item>
-		</uni-forms>
-		<button class="button" @click="submit">校验表单</button>
-	</view>
-</template>
-
-```
-
-```javascript
-export default {
-	data() {
-		return {
-			formData:{
-				
-			},
-			rules: {
-				hobby: {
-					rules: [{
-						required: true,
-						errorMessage: '请选择兴趣',
-					},{
-						validateFunction:function(rule,value,data,callback){
-							if (value.length < 2) {
-								callback('请至少勾选两个兴趣爱好')
-							}
-							return true
-						}
-					}]
-				}
-			}
-		}
-	},
-	onReady() {
-		// 需要在onReady中设置规则
-		this.$refs.form.setRules(this.rules)
-	},
-	methods: {
-		submit(form) {
-			this.$refs.form.validate().then(res=>{
-				console.log('表单数据信息：', res);
-			}).catch(err =>{
-				console.log('表单错误信息：', err);
-			})
-		}
-	}
-}
-
-```
-
-
-### validateFunction 异步校验
-
-上面的自定义校验方式为同步校验 ，如果需要异步校验，`validateFunction` 需要返回一个 `Promise` ，校验不通过 执行 `reject(new Error('错误信息'))` 返回对应的错误信息，如果校验通过则直接执行 `resolve()` 即可，在异步校验方法中，不需要使用 `callback` 。
-
-```html
-<template>
-	<view>
-		<uni-forms :modelValue="formData" ref="form">
-			<uni-forms-item name="age" label="年龄">
-				<uni-easyinput v-model="formData.age" type="text" placeholder="请输入年龄" />
-			</uni-forms-item>
-		</uni-forms>
-		<button class="button" @click="submit">校验表单</button>
-	</view>
-</template>
-
-```
-
-```javascript
-export default {
-	data() {
-		return {
-			formData:{
-				age:''
-			},
-			rules: {
-				age: {
-					rules: [{
-						required: true,
-						errorMessage: '请输入年龄',
-					},{
-						validateFunction: (rule, value, data, callback) => {
-							// 异步需要返回 Promise 对象
-							return new Promise((resolve, reject) => {
-								setTimeout(() => {
-									if (value > 10 ) {
-										// 通过返回 resolve
-										resolve()
-									} else {
-										// 不通过返回 reject(new Error('错误信息'))
-										reject(new Error('年龄必须大于十岁'))
-									}
-								}, 2000)
-							})
-						}
-					}]
-				}
-			}
-		}
-	},
-	onReady() {
-		// 需要在onReady中设置规则
-		this.$refs.form.setRules(this.rules)
-	},
-	methods: {
-		/**
-		 * 表单提交
-		 * @param {Object} event
-		 */
-		submit() {
-			uni.showLoading()
-			this.$refs.form.validate().then(res => {
-				uni.hideLoading()
-				console.log('表单数据信息：', res);
-			}).catch(err => {
-				uni.hideLoading()
-				console.log('表单错误信息：', err);
-			})
-		}
-	}
-}
-
-```
-
-
-### 动态表单校验
-
-`uni-forms v1.0.44` 开始增加了动态校验表单的相关内容。
-
-多用于同一个字段需要添加多次的场景，如需要动态创建多个域名参与检验。
-
-1. 在 `formData` 中定义个变量用来接受同一个字段的多个结果。
-```javascript
-dynamicFormData: {
-	email: '',
-	// domains 字段下会有多个结果
-	domains: {}
-}
-```
-
-
-2. 使用 `uni-forms-item` 的 `rules` 属性定义单个表单域的校验规则。
-```html
-<uni-forms-item :label="item.label+' '+index" required
-	:rules="[{'required': true,errorMessage: '域名项必填'}]" :key="item.id">
-	...
-</uni-forms-item>
-```
-
-3. `name` 需要动态指定，格式为： `字段[唯一值]`
-```html
-<uni-forms-item 
-	required
-	:label="item.label+' '+index" 
-	:name="'domains[' + item.id + ']'"
-	:rules="[{'required': true,errorMessage: '域名项必填'}]" 
-	:key="item.id"
-	>
-	...
-</uni-forms-item>
-```
-
-4. 需要绑定值的组件的 v-model 也需要动态指定，格式为：`数据源.字段[唯一值]`
-```html
-<uni-forms-item 
-	required
-	:label="item.label+' '+index" 
-	:name="'domains[' + item.id + ']'"
-	:rules="[{'required': true,errorMessage: '域名项必填'}]" 
-	:key="item.id"
-	>
-	<uni-easyinput v-model="dynamicFormData.domains[item.id]" placeholder="请输入域名" />
-</uni-forms-item>
-```
-
-**完整示例**
-
-```html
-
-<uni-forms ref="dynamicForm" :rules="dynamicRules" :modelValue="dynamicFormData">
-	<uni-forms-item label="邮箱" required name="email">
-		<uni-easyinput v-model="dynamicFormData.email" placeholder="请输入姓名" />
-	</uni-forms-item>
-	<template v-for="(item,index) in dynamicLists">
-		<uni-forms-item :label="item.label+' '+index" required
-			:rules="[{'required': true,errorMessage: '域名项必填'}]" :key="item.id"
-			:name="'domains[' + item.id + ']'">
-			<view class="form-item">
-				<uni-easyinput v-model="dynamicFormData.domains[item.id]" placeholder="请输入域名" />
-				<button class="button" size="mini" type="default" @click="del(item.id)">删除</button>
-			</view>
-		</uni-forms-item>
-	</template>
-
-</uni-forms>
-<view class="button-group">
-	<button type="primary" size="mini" @click="add">新增域名</button>
-	<button type="primary" size="mini" @click="submit('dynamicForm')">提交</button>
-</view>
-
-```
-
-```javascript
-export default {
-	data() {
-		return {
-			// 数据源
-			dynamicFormData: {
-				email: '',
-				domains: {}
-			},
-			// 动态表单数据
-			dynamicLists: [],
-			// 规则
-			dynamicRules: {
-				email: {
-					rules: [{
-						required: true,
-						errorMessage: '域名不能为空'
-					}, {
-						format: 'email',
-						errorMessage: '域名格式错误'
-					}]
-				}
-			}
-		}
-	},
-	methods: {
-		// 新增表单域
-		add() {
-			this.dynamicLists.push({
-				label: '域名',
-				id: Date.now()
-			})
-		},
-		// 删除表单域
-		del(id) {
-			let index = this.dynamicLists.findIndex(v => v.id === id)
-			this.dynamicLists.splice(index, 1)
-		},
-		// 提交
-		submit(ref) {
-			this.$refs[ref].validate((err,value)=>{
-				console.log(err,value);
-			})
-		},
-	}
-}
-
-// 返回值格式 ，根据自有业务，自行处理数据
-{
-	emial:'',
-	domains:{
-		id1:'',
-		id2:'',
-		...
-	}
-}
-```
-
-
-### 表单校验时机说明
-
-不管是在规则里还是`uni-forms`、`uni-forms-item`里，都有 `validateTrigger` 属性， `validateTrigger` 属性规定了表单校验时机，当前只有 `bind`、`submit` 两个值域
-
-- `bind` ： 数据绑定时触发校验，`uni-esayinput` 、`uni-data-checkbox` 组件表现为数据发生变化时。其他内置或三方组件为 `binddata` 事件执行时机
-
-```html
-
-<template>
-	<view>
-		<uni-forms  ref="form" :modelValue="formData" validate-trigger="bind">
-			<uni-forms-item name="age" label="年龄">
-				<!-- uni-easyinput 的校验时机是数据发生变化， 即触发 input 时 -->
-				<uni-easyinput v-model="formData.age" type="text" placeholder="请输入年龄" />
-			</uni-forms-item>
-			<uni-forms-item  name="email" label="邮箱">
-			 <!-- input 的校验时机是触发 binddata 时， 即触发 blur 时 -->
-				<input v-model="formData.email"  @blur="binddata('email',$event.detail.value)" />
-			</uni-forms-item>
-			<button class="button" @click="submit">校验表单</button>
-		</uni-forms>
-	</view>
-</template>
-
-```
-
-- `submit`： 只有提交表单才会触发表单校验
-
-
-对于表单校验时机，同时只会有一个 `validateTrigger` 发生作用，它的作用权重为
-
-**`规则 > uni-forms-item > uni-forms `**
-
-- 如果规则里配置 `validateTrigger` ，则优先使用规则里的 `validateTrigger` 属性来决定表单校验时机
-- 如果规则里没有配置 `validateTrigger` ，则优先使用 `uni-forms-item` 的 `validateTrigger` 属性来决定表单校验时机
-- 如果 `uni-forms-item` 组件里没有配置 `validateTrigger` ，则优先使用 `uni-forms` 的 `validateTrigger` 属性来决定表单校验时机
-- 以此类推，如果都没有使用 `validateTrigger` 属性，则会使用 `uni-forms` 的 `validateTrigger` 属性默认值来决定表单校验时机
-
-
-## API
-
-### Forms Props
-
-|属性名|类型|默认值|可选值|说明|
-|:-:|:-:|:-:|:-:|:-:|
-|value [即将废弃]|Object|-|-| 表单数据|
-|modelValue|Object|-|-| 表单数据|
-|rules|Object|-|-|表单校验规则|
-|validate-trigger|String|submit|bind/submit| 表单校验时机|
-|label-position|String|left|top/left|label 位置|
-|label-width|String/Number|75|-|label 宽度，单位 px|
-|label-align|String|left| left/center/right|label 居中方式|
-|err-show-type|String|undertext| undertext/toast/modal|表单错误信息提示方式|
-|border|Boolean|false|-|是否显示分格线|
-
-### Forms Events
-
-|事件称名|说明|										
-|:-:|:-:|									
-|validate|任意表单项被校验后触发，返回表单校验信息|		
-
-### Forms Methods
-
-|方法称名|说明|						
-|:-:| :-:|						
-|submit[即将废弃]| 对整个表单进行校验的方法，会返回一个 promise|
-|validate|对整个表单进行校验的方法，会返回一个 promise|
-|setValue|设置表单某一项 name 的对应值，通常在 uni-forms-item 和自定表单组件中使用|
-|validateField|部分表单进行校验|
-|clearValidate|移除表单的校验结果|
-|resetFields|重置表单, 需要把 `uni-forms` 的`modelValue`属性改为 `v-model` ,且对内置组件可能不生效|
-
-
-
-### validate(keepItem:Array,callback:Function) 方法说明
-`validate` 方法是对整个表单进行校验，方法接受两个参数
-
-|参数称名|类型|说明|						
-|:-:| :-:|:-:|						
-|keepItem|Array|保留不参与校验的字段|
-|callback|Function|校验完成返回函数|
-
-校验成功后，校验对象只保留指定了`name`的字段（只要 ``uni-forms-item` 绑定了 `name`，哪怕不校验，也会返回），如果需要保留其他字段，则需要 `keepItem` 属性
-
-```html
-
-<template>
-	<view>
-		<uni-forms  ref="form" :modelValue="formData">
-			<uni-forms-item name="age" label="年龄">
-				<uni-easyinput v-model="formData.age" type="text" placeholder="请输入年龄" />
-			</uni-forms-item>
-			
-			<button class="button" @click="submit">校验表单</button>
-		</uni-forms>
-	</view>
-</template>
-
-```
-
-```javascript
-export default {
-	data() {
-		return {
-			formData:{
-				age:''
-			},
-			rules: {
-				// ...
-			}
-		}
-	},
-	onLoad(){
-		this.formData.id = 'testId'
-	},
-	methods: {
-		submit() {
-			// 在 onLoad 生命周期中，formData添加了一个 id 字段 ，此时这个字段是不参数校验的，所以结果中不返回
-			// 在 validate(['id']) 方法中，指定第一个参数 ，即可返回id字段
-			this.$refs.form.validate(['id'],(err,formData)=>{
-				if(!err){
-					console.log('success',formData)
-				}
-			})
-		}
-	}
-}
-
-```
-
-
-`validate` 方法还可以返回一个 `Promise` 对象，如果使用了 `callback` 则`Promise` 返回 `null`，`validate` 方法会优先使用 `callback`。
-
-`callback` 方法会返回两个返回值 :
-- 第一个返回值为检验结果，如果校验失败，则返回失败信息，如果成功，返回 `null` 
-- 第二个返回值校验数据
-
-
-```javascript
-
-// 使用 callback
-// 如果不需要 keepItem 参数 ，则可以省略
-this.$refs.form.validate((err,formData)=>{
-	// 如果校验成功 ，err 返回 null
-	if(!err){
-		console.log('success',formData)
-		return
-	}
-	console.log('error',err)
-}).then(res=>{
-	// res 返回 null
-})
-
-// 使用 Promise
-// 对整个表单进行校验，返回一个 Promise
-this.$refs.form.validate().then((res)=>{
-	// 成功返回，res 为表单数据
-	// 其他逻辑处理 
-	// ...
-}).catch((err)=>{
-	// 表单校验验失败，err 为具体错误信息
-	// 其他逻辑处理
-	// ...
-})
-
-```
-
-### setValue(name:String,value:any) 方法说明
-
-`setValue` 方法通常用于内置组件或三方组件返回值的校验，因为`uni-esayinput` 等 uni 开头的组件内置了对 `uni-forms`的支持，所以这些组件返回的值可以直接使用，但是比如像`input` 这些内置组件值的变化，无法及时通知 `uni-forms` ，从而无法正常的校验，这时就需要我们手动将这些值加入到`uni-forms`的校验。
-
-`setValue` 方法接受两个参数：
-- name: 表单域对应的name
-- value: 表单域对应的值
-
-```html
-
-<template>
-	<view>
-		<uni-forms  ref="form" :modelValue="formData">
-			<uni-forms-item name="age" label="年龄">
-				<input v-model="formData.age" @input="setValue('age',formData.age)">
-			</uni-forms-item>
-			<button class="button" @click="submit">校验表单</button>
-		</uni-forms>
-	</view>
-</template>
-
-```
-
-```javascript
-export default {
-	data() {
-		return {
-			formData:{
-				age:''
-			},
-			rules: {
-				// ...
-			}
-		}
-	},
-	methods: {
-		setValue(name,value){
-			// 设置表单某项对应得值来触发表单校验
-			// 接受两个参数，第一个参数为表单域的 name ，第二个参数为表单域的值
-			this.$refs.form.setValue(name,value)
-		},
-		submit() {
-			this.$refs.form.validate(['id'],(err,formData)=>{
-				if(!err){
-					console.log('success',formData)
-				}
-			})
-		}
-	}
-}
-
-```
-
-### 其他方法说明
-
-```javascript
-
-// 部分表单进行校验，接受一个参数，类型为 String 或 Array ，只校验传入 name 表单域的值
-this.$refs.form.validateField(['name', 'email']).then((res)=>{
-	// 成功返回，res 为对应表单数据
-	// 其他逻辑处理 
-	// ...
-}).catch((err)=>{
-	// 表单校验验失败，err 为具体错误信息
-	// 其他逻辑处理
-	// ...
-})
-
-// 移除表单校验，接受一个参数，类型为 String 或 Array ，只移除传入 name 表单域的值，如果不传入参数，则移除所有
-this.$refs.form.clearValidate(['name', 'email'])
-
-```
-
-
-### FormsItem Props
-
-|属性名|类型|默认值|可选值	|说明|
-|:-:|:-:|:-:|:-:|:-:|
-|name|String|-|-|表单域的属性名，在使用校验规则时必填|
-|required|Boolean|false|-|label 右边显示红色"*"号，样式显示不会对校验规则产生效果|
-|validate-trigger|String|submit|bind/submit|表单校验时机|
-|left-icon|String|-|-| label左边的图标，限uni-ui的图标名称|
-|icon-color|String|#606266|-| 左边通过icon配置的图标的颜色|
-|label|String|-|-| 输入框左边的文字提示|
-|label-width|Number|70|-| label的宽度，单位px|
-|label-align|String|left|left/center/right|label的文字对齐方式|
-|label-position|String|left|top/left|label的文字的位置|
-|error-message|String|-|-|显示的错误提示内容，如果为空字符串或者false，则不显示错误信息|
-
-
-### FormsItem Slots
-|插槽名|说明|
-|:-:| :-:|
-|default|默认插槽|
-|left(已经失效，请使用label代替)|label插槽，自定义label显示内容|
-|label|label插槽，自定义label显示内容|
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/forms/forms](https://hellouniapp.dcloud.net.cn/pages/extUI/forms/forms)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-forms)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-goods-nav/changelog.md b/uni_modules/uni-goods-nav/changelog.md
index b0212bbb6032d390ac36afd730c469cff087af91..c6264c67eb60f25b3438f12332249b2166f8ebb8 100644
--- a/uni_modules/uni-goods-nav/changelog.md
+++ b/uni_modules/uni-goods-nav/changelog.md
@@ -1,3 +1,8 @@
+## 1.2.1（2022-05-30）
+- 新增 stat属性，是否开启uni统计功能
+## 1.2.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-goods-nav](https://uniapp.dcloud.io/component/uniui/uni-goods-nav)
 ## 1.1.1（2021-08-24）
 - 新增 支持国际化
 ## 1.1.0（2021-07-13）
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/en.json b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/en.json
index 4494f2a5c21ee4bb41f977eb9720302346e20168..94f18684066d02d1ba2cdb5aa63b15d432c1f739 100644
--- a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/en.json
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/en.json
@@ -3,4 +3,4 @@
 	"uni-goods-nav.options.cart": "cart",
 	"uni-goods-nav.buttonGroup.addToCart": "add to cart",
 	"uni-goods-nav.buttonGroup.buyNow": "buy now"
-}
+}
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/index.js b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/index.js
index fa8f0f3734de6effb137592fce6c0f722c048432..d2afd081707d24a8b92a8b1c2a30d8e2f19d89f6 100644
--- a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/index.js
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/index.js
@@ -5,4 +5,4 @@ export default {
 	en,
 	'zh-Hans': zhHans,
 	'zh-Hant': zhHant
-}
+}
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hans.json b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hans.json
index 806913a70603b8171525cec67677454ba756e893..84243b03d826f0743c7ee021dcf5412696c9bc86 100644
--- a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hans.json
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hans.json
@@ -3,4 +3,4 @@
 	"uni-goods-nav.options.cart": "购物车",
 	"uni-goods-nav.buttonGroup.addToCart": "加入购物车",
 	"uni-goods-nav.buttonGroup.buyNow": "立即购买"
-}
+}
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hant.json b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hant.json
index e862171d0a0889a7e35409b44567befd3fb45f3b..bfd405e5b2559a72a9b0b6606483411953dd0656 100644
--- a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hant.json
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hant.json
@@ -3,4 +3,4 @@
 	"uni-goods-nav.options.cart": "購物車",
 	"uni-goods-nav.buttonGroup.addToCart": "加入購物車",
 	"uni-goods-nav.buttonGroup.buyNow": "立即購買"
-}
+}
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue b/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
index e2a6baf233db64f27af688ac355eb00b1c2846f6..e7f28b6dc346e1ea061f1a31d88480eb123f2f4d 100644
--- a/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
@@ -18,7 +18,7 @@
 				</view>
 			</view>
 			<view :class="{'uni-tab__right':fill}" class="flex uni-tab__cart-sub-right ">
-				<view v-for="(item,index) in buttonGroup" :key="index" :style="{backgroundColor:item.backgroundColor,color:item.color}"
+				<view v-for="(item,index) in buttonGroup" :key="index" :style="{background:item.backgroundColor,color:item.color}"
 				 class="flex uni-tab__cart-button-right" @click="buttonClick(index,item)"><text :style="{color:item.color}" class="uni-tab__cart-button-right-text">{{ item.text }}</text></view>
 			</view>
 		</view>
@@ -37,7 +37,8 @@
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=865
 	 * @property {Array} options 组件参数
 	 * @property {Array} buttonGroup 组件按钮组参数
-	 * @property {Boolean} fill = [true | false] 组件按钮组参数
+	 * @property {Boolean} fill = [true | false] 组件按钮组参数
+	 * @property {Boolean} stat 是否开启统计功能
 	 * @event {Function} click 左侧点击事件
 	 * @event {Function} buttonClick 右侧按钮组点击事件
 	 * @example <uni-goods-nav :fill="true"  options="" buttonGroup="buttonGroup"  @click="" @buttonClick="" />
@@ -63,12 +64,12 @@
 				default () {
 					return [{
 							text: t("uni-goods-nav.buttonGroup.addToCart"),
-							backgroundColor: '#ffa200',
+							backgroundColor: 'linear-gradient(90deg, #FFCD1E, #FF8A18)',
 							color: '#fff'
 						},
 						{
 							text: t("uni-goods-nav.buttonGroup.buyNow"),
-							backgroundColor: '#ff0000',
+							backgroundColor: 'linear-gradient(90deg, #FE6035, #EF1224)',
 							color: '#fff'
 						}
 					]
@@ -77,6 +78,10 @@
 			fill: {
 				type: Boolean,
 				default: false
+			},
+			stat:{
+				type: Boolean,
+				default: false
 			}
 		},
 		methods: {
@@ -87,7 +92,7 @@
 				})
 			},
 			buttonClick(index, item) {
-				if (uni.report) {
+				if (uni.report && this.stat) {
 					uni.report(item.text, item.text)
 				}
 				this.$emit('buttonClick', {
@@ -99,7 +104,7 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
 	.flex {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -164,7 +169,7 @@
 
 	.uni-tab__text {
 		margin-top: 3px;
-		font-size: $uni-font-size-sm;
+		font-size: 12px;
 		color: #646566;
 	}
 
@@ -182,7 +187,7 @@
 	}
 
 	.uni-tab__cart-button-right-text {
-		font-size: $uni-font-size-base;
+		font-size: 14px;
 		color: #fff;
 	}
 
@@ -221,12 +226,4 @@
 		// width: auto;
 		border-radius: 15px;
 	}
-
-	.uni-tab__color-y {
-		background-color: #ffa200;
-	}
-
-	.uni-tab__color-r {
-		background-color: #ff0000;
-	}
 </style>
diff --git a/uni_modules/uni-goods-nav/package.json b/uni_modules/uni-goods-nav/package.json
index d7d56ee0c151a95d8144272b20037f0bd996132c..636e45e7e1430ab7c2137e4f523a4eb0fb12546f 100644
--- a/uni_modules/uni-goods-nav/package.json
+++ b/uni_modules/uni-goods-nav/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-goods-nav",
   "displayName": "uni-goods-nav 商品导航",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "商品导航组件主要用于电商类应用底部导航，可自定义加入购物车，购买等操作",
   "keywords": [
     "uni-ui",
@@ -40,7 +40,8 @@
   },
   "uni_modules": {
     "dependencies": [
-				"uni-icons"
+			"uni-scss",
+			"uni-icons"
 		],
     "encrypt": [],
     "platforms": {
@@ -79,9 +80,9 @@
         },
         "Vue": {
             "vue2": "y",
-            "vue3": "u"
+            "vue3": "y"
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/uni_modules/uni-goods-nav/readme.md b/uni_modules/uni-goods-nav/readme.md
index 4e47bfda746815456ecb75a35f0ebd6b7f31f127..07df93f55bb4d3e5320cba0f403a58174e1801c2 100644
--- a/uni_modules/uni-goods-nav/readme.md
+++ b/uni_modules/uni-goods-nav/readme.md
@@ -1,111 +1,10 @@
 
 
-### GoodsNav 商品导航
-*已经支持在nvue页面中使用*
+## GoodsNav 商品导航
+> **组件名：uni-goods-nav**
+> 代码块： `uGoodsNav`
 
-商品加入购物车，立即购买，组件名：`uni-goods-nav`，代码块： uGoodsNav。
+商品加入购物车，立即购买等。
 
-### 使用方式
-
-引用组件 
-
-```javascript
-import uniGoodsNav from '@/components/uni-goods-nav/uni-goods-nav.vue'
-export default {
-    components: {uniGoodsNav}
-}
-```
-
-使用组件
-
-```html
-<uni-goods-nav :fill="true"  :options="options" :buttonGroup="buttonGroup"  @click="onClick" @buttonClick="buttonClick" />
-```
-
-```javascript
-export default {
-	data () {
-	  return {
-	    options: [{
-			icon: 'headphones',
-			text: '客服'
-		}, {
-			icon: 'shop',
-			text: '店铺',
-			info: 2,
-			infoBackgroundColor:'#007aff',
-			infoColor:"red"
-		}, {
-			icon: 'cart',
-			text: '购物车',
-			info: 2
-		}],
-	    buttonGroup: [{
-	      text: '加入购物车',
-	      backgroundColor: '#ff0000',
-	      color: '#fff'
-	    },
-	    {
-	      text: '立即购买',
-	      backgroundColor: '#ffa200',
-	      color: '#fff'
-	    }
-	    ]
-	  }
-	},
-	methods: {
-	  onClick (e) {
-	    uni.showToast({
-	      title: `点击${e.content.text}`,
-	      icon: 'none'
-	    })
-	  },
-	  buttonClick (e) {
-	    console.log(e)
-	    this.options[2].info++
-	  }
-	}
-}
-```
-
-### 属性说明
-
-|属性名		|类型	|默认值	|说明			|
-|:-:		|:-:	|:-:	|:-:			|
-|options	|Array	|-		|组件参数		|
-|buttonGroup|Array	|-		|组件按钮组参数	|
-|fill		|Boolean|false	|按钮是否平铺	|
-
-
-**options 参数说明：**
-
-|属性名				|类型	|默认值	|说明													|
-|:-:				|:-:	|:-:	|:-:													|
-|text				|String	|-		|显示文字												    |
-|icon				|String	|		|图标，[参考](https://ext.dcloud.net.cn/plugin?id=28)	    |
-|info				|Number	|0		|右上角数字角标											|
-|infoBackgroundColor|String	|#ff0000|角标背景色												|
-|infoColor			|String	|#fff	|角标前景色												|
-
-**buttonGroup 参数说明：**
-
-|属性名				|类型	|默认值	|说明		|
-|:-:				|:-:	|:-:	|:-:		|
-|text				|String	|-		|按钮文字		|
-|backgroundColor	|String	|-		|按钮背景色	|
-|color				|String	|-		|字体颜色		|
-
-### 事件说明
-
-|事件名			|说明				|返回值				|
-|:-:			|:-:				|:-:				|
-|@click			|左侧点击事件			|e = {index,content}|
-|@buttonClick	|右侧按钮组点击事件	|e = {index,content}|
-
-### 插件预览地址
-
-[https://uniapp.dcloud.io/h5/pages/extUI/goods-nav/goods-nav](https://uniapp.dcloud.io/h5/pages/extUI/goods-nav/goods-nav)
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/goods-nav/goods-nav](https://hellouniapp.dcloud.net.cn/pages/extUI/goods-nav/goods-nav)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-goods-nav)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-grid/changelog.md b/uni_modules/uni-grid/changelog.md
index 8fc506d7f63d4483173d7dba2444e84a5cac3132..184941db61b1cdfcf51ff01e2a79237cdce374a6 100644
--- a/uni_modules/uni-grid/changelog.md
+++ b/uni_modules/uni-grid/changelog.md
@@ -1,5 +1,10 @@
-## 1.3.1（2021-07-30）
-- 优化 vue3下事件警告的问题
+## 1.4.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-grid](https://uniapp.dcloud.io/component/uniui/uni-grid)
+## 1.3.2（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.3.1（2021-07-30）
+- 优化 vue3下事件警告的问题
 ## 1.3.0（2021-07-13）
 - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.2.4（2021-05-12）
diff --git a/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue b/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue
index c63bbc2ba9e9f1fa5e6cd7921f9e75f265ce752a..ab86a04e76b5c9daf52b85c86f6ad1e5b70327d2 100644
--- a/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue
+++ b/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue
@@ -94,34 +94,34 @@
 	.uni-grid-item--border {
 		position: relative;
 		/* #ifdef APP-NVUE */
-		border-bottom-color: $uni-border-color;
+		border-bottom-color: #D2D2D2;
 		border-bottom-style: solid;
 		border-bottom-width: 0.5px;
-		border-right-color: $uni-border-color;
+		border-right-color: #D2D2D2;
 		border-right-style: solid;
 		border-right-width: 0.5px;
 		/* #endif */
 		/* #ifndef APP-NVUE */
 		z-index: 0;
-		border-bottom: 1px $uni-border-color solid;
-		border-right: 1px $uni-border-color solid;
+		border-bottom: 1px #D2D2D2 solid;
+		border-right: 1px #D2D2D2 solid;
 		/* #endif */
 	}
 	.uni-grid-item--border-top {
 		position: relative;
 		/* #ifdef APP-NVUE */
-		border-top-color: $uni-border-color;
+		border-top-color: #D2D2D2;
 		border-top-style: solid;
 		border-top-width: 0.5px;
 		/* #endif */
 		/* #ifndef APP-NVUE */
-		border-top: 1px $uni-border-color solid;
+		border-top: 1px #D2D2D2 solid;
 		z-index: 0;
 		/* #endif */
 	}
 
 
 	.uni-highlight:active {
-		background-color: $uni-bg-color-hover;
+		background-color: #f1f1f1;
 	}
 </style>
diff --git a/uni_modules/uni-grid/components/uni-grid/uni-grid.vue b/uni_modules/uni-grid/components/uni-grid/uni-grid.vue
index b7cc9a4973f06babfa051cb85e9b4de444036605..71edf41d00d64734e05067a9950d501c55d148a7 100644
--- a/uni_modules/uni-grid/components/uni-grid/uni-grid.vue
+++ b/uni_modules/uni-grid/components/uni-grid/uni-grid.vue
@@ -39,7 +39,7 @@
 			// 边框颜色
 			borderColor: {
 				type: String,
-				default: '#e5e5e5'
+				default: '#D2D2D2'
 			},
 			// 是否正方形显示,默认为 true
 			square: {
@@ -130,13 +130,13 @@
 	.uni-grid--border {
 		position: relative;
 		/* #ifdef APP-NVUE */
-		border-left-color: $uni-border-color;
+		border-left-color: #D2D2D2;
 		border-left-style: solid;
 		border-left-width: 0.5px;
 		/* #endif */
 		/* #ifndef APP-NVUE */
 		z-index: 1;
-		border-left: 1px $uni-border-color solid;
+		border-left: 1px #D2D2D2 solid;
 		/* #endif */
 	}
 </style>
diff --git a/uni_modules/uni-grid/package.json b/uni_modules/uni-grid/package.json
index 90306f59842ac39934bc6e17d973ca290490257b..c68c9524a4049b068c116b20bb5753defa228fe7 100644
--- a/uni_modules/uni-grid/package.json
+++ b/uni_modules/uni-grid/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-grid",
   "displayName": "uni-grid 宫格",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Grid 宫格组件，提供移动端常见的宫格布局，如九宫格。",
   "keywords": [
     "uni-ui",
@@ -40,7 +40,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": ["uni-scss","uni-icons"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -75,8 +75,12 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/uni_modules/uni-grid/readme.md b/uni_modules/uni-grid/readme.md
index a748954791c56f14bc6108bffc9f62c99d282c82..0aa44cc13ef465ddef4b714bb2beada21837fae2 100644
--- a/uni_modules/uni-grid/readme.md
+++ b/uni_modules/uni-grid/readme.md
@@ -7,89 +7,5 @@
 
 宫格组件。
 
-### 安装方式
-
-本组件符合[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)
-
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 删除组件自带圆点角标效果，完全交给用户实现，示例有简单角标效果实现
-> - Grid 组件仅在自定义组件模式下支持
-> - column 属性最大值最好不要超过 5 个，如果超过，需要注意内容显示
-> - 支付宝小程序平台需要在支付宝小程序开发者工具里开启 component2 编译模式，开启方式： `详情 --> 项目配置 --> 启用 component2 编译`
-> - 为了避免高度显示错误组件内必须要有内容
-
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<!-- 一般用法 -->
-<uni-grid :column="3">
-	<uni-grid-item>
-		<text class="text">文本</text>
-	</uni-grid-item>
-	<uni-grid-item>
-		<text class="text">文本</text>
-	</uni-grid-item>
-	<uni-grid-item>
-		<text class="text">文本</text>
-	</uni-grid-item>
-</uni-grid>
-
-<!-- 不带边框并矩形显示 -->
-<uni-grid :column="3" :showBorder="false"  :square="false">
-	<uni-grid-item>
-		<text class="text">文本</text>
-	</uni-grid-item>
-	<uni-grid-item>
-		<text class="text">文本</text>
-	</uni-grid-item>
-	<uni-grid-item>
-		<text class="text">文本</text>
-	</uni-grid-item>
-	<uni-grid-item>
-		<text class="text">文本</text>
-	</uni-grid-item>
-	<uni-grid-item>
-		<text class="text">文本</text>
-	</uni-grid-item>
-	<uni-grid-item>
-		<text class="text">文本</text>
-	</uni-grid-item>
-</uni-grid>
-```
-
-## API
-
-### Grid Props
-
-**uni-grid 属性说明：**
-
-|属性名		|类型	|默认值	|说明				|
-|:-:		|:-:	|:-:	|:-:				|
-|column		|Number	|3		|每列显示个数		|
-|borderColor|String	|#d0dee5|边框颜色			|
-|showBorder	|Boolean|true	|是否显示边框		|
-|square		|Boolean|true	|是否方形显示		|
-|highlight	|Boolean|true	|点击背景是否高亮	|
-
-### Grid Events
-|事件名	|说明			|返回值											|
-|:-:	|:-:			|:-:											|
-|@change|点击 grid 触发	|e={detail:{index:0}}，index 为当前点击 gird 下标|
-
-
-### GridItem Props
-
-|属性名|类型		|默认值	|说明										|
-|:-:	|:-:		|:-:	|:-:										|
-|index|Number	|-		|子组件的唯一标识 ，点击gird会返回当前的标识|
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/grid/grid](https://hellouniapp.dcloud.net.cn/pages/extUI/grid/grid)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-grid)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-group/changelog.md b/uni_modules/uni-group/changelog.md
index 6a36f7dfd096b34e82946b9eb8ae1574b04918b1..a7024fdf847c21e4385061cf0e5e62e9e73f9e5d 100644
--- a/uni_modules/uni-group/changelog.md
+++ b/uni_modules/uni-group/changelog.md
@@ -1,8 +1,16 @@
+## 1.2.2（2022-05-30）
+- 新增 stat属性，是否开启uni统计功能
+## 1.2.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.2.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-group](https://uniapp.dcloud.io/component/uniui/uni-group)
+## 1.1.7（2021-11-08）
 ## 1.1.0（2021-07-30）
 - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 - 优化 组件文档
-## 1.0.3（2021-05-12）
-- 新增 组件示例地址
-## 1.0.2（2021-02-05）
-- 调整为uni_modules目录规范
-- 优化 兼容 nvue 页面
+## 1.0.3（2021-05-12）
+- 新增 组件示例地址
+## 1.0.2（2021-02-05）
+- 调整为uni_modules目录规范
+- 优化 兼容 nvue 页面
diff --git a/uni_modules/uni-group/components/uni-group/uni-group.vue b/uni_modules/uni-group/components/uni-group/uni-group.vue
index eaae7f0c0615f9e98bca1f34bc6fb9a8281b8761..40494e98d591e91f6a3d57b9c2d36cf13b8bf458 100644
--- a/uni_modules/uni-group/components/uni-group/uni-group.vue
+++ b/uni_modules/uni-group/components/uni-group/uni-group.vue
@@ -35,6 +35,10 @@
 			mode: {
 				type: String,
 				default: 'default'
+			},
+			stat:{
+				type: Boolean,
+				default: false
 			}
 		},
 		data() {
@@ -45,7 +49,7 @@
 		},
 		watch: {
 			title(newVal) {
-				if (uni.report && newVal !== '') {
+				if (uni.report && this.stat && newVal !== '') {
 					uni.report('title', newVal)
 				}
 			}
@@ -53,7 +57,7 @@
 		created() {
 			this.form = this.getForm()
 			if (this.form) {
-				this.margin = true
+				this.margin = true
 				this.border = this.form.border
 			}
 		},
@@ -77,43 +81,43 @@
 		}
 	}
 </script>
-<style lang="scss" scoped>
+<style lang="scss" >
 	.uni-group {
 		background: #fff;
 		margin-top: 10px;
-		// border: 1px red solid;
+		// border: 1px red solid;
 	}
 
 	.group-margin {
-		// margin: 0 -15px;
+		// margin: 0 -15px;
 	}
 
 	.uni-group__title {
 		/* #ifndef APP-NVUE */
 		display: flex;
-		/* #endif */
+		/* #endif */
 		flex-direction: row;
 		align-items: center;
 		padding-left: 15px;
 		height: 40px;
-		background-color: $uni-bg-color-grey;
+		background-color: #eee;
 		font-weight: normal;
-		color: $uni-text-color;
+		color: #666;
 	}
 
 	.uni-group__content {
 		padding: 15px;
 		// padding-bottom: 5px;
 		// background-color: #FFF;
-	}
-
-	.group-conent-padding {
-		padding: 0 15px;
+	}
+
+	.group-conent-padding {
+		padding: 0 15px;
 	}
 
 	.uni-group__title-text {
-		font-size: $uni-font-size-base;
-		color: $uni-text-color;
+		font-size: 14px;
+		color: #666;
 	}
 
 	.distraction {
@@ -127,4 +131,4 @@
 		overflow: hidden;
 		box-shadow: 0 0 5px 1px rgba($color: #000000, $alpha: 0.08);
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-group/package.json b/uni_modules/uni-group/package.json
index ec178634a892db382e2c5d80e290dffce916cdfd..ea00a08c2bfcfe6aa827bcbcd02d7b2af60ea9ed 100644
--- a/uni_modules/uni-group/package.json
+++ b/uni_modules/uni-group/package.json
@@ -1,83 +1,87 @@
-{
-  "id": "uni-group",
-  "displayName": "uni-group 分组",
-  "version": "1.1.0",
-  "description": "分组组件可用于将组件用于分组，添加间隔，以产生明显的区块",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "group",
-    "分组",
-    ""
-],
-  "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": [],
-    "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"
-        }
-      }
-    }
-  }
+{
+  "id": "uni-group",
+  "displayName": "uni-group 分组",
+  "version": "1.2.2",
+  "description": "分组组件可用于将组件用于分组，添加间隔，以产生明显的区块",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "group",
+    "分组",
+    ""
+],
+  "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"],
+    "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-group/readme.md b/uni_modules/uni-group/readme.md
index deefb22cd115448fcf7f41e50f01bc8f44c62154..bae67f4681bdf53194164e553c1107237bc1cf90 100644
--- a/uni_modules/uni-group/readme.md
+++ b/uni_modules/uni-group/readme.md
@@ -1,54 +1,9 @@
 
+## Group 分组
+> **组件名：uni-group**
+> 代码块： `uGroup`
 
-### Group 分组
+分组组件可用于将组件分组，添加间隔，以产生明显的区块。
 
-分组组件可用于将组件分组，添加间隔，以产生明显的区块，组件名：``uni-group``，代码块： uGroup。
-
-### 平台差异说明
-
-如无特殊说明，则全平台可用
-
-### 组件使用注意事项
-
-为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-
-- 组件需要依赖 `sass` 插件 ，请自行手动安装
-- 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-
-
-### 安装方式
-
-本组件符合[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)
-
-
-### 使用方式
-
-在 ``template`` 中使用组件
-
-```html
-<uni-group title="分组1" top="20">
-    <view>分组1 的内容</view>
-    <view>分组1 的内容</view>
-</uni-group>
-
-<uni-group title="分组2">
-    <view>分组2 的内容</view>
-    <view>分组2 的内容</view>
-</uni-group>
-```
-
-### 属性说明
-
-|属性名|类型|默认值|说明|
-|:-:|:-:|:-:|:-:|
-|title|String|-|主标题|
-|top|Number|-|分组间隔|
-|mode|String|''|模式 ，card 为卡片模式|
-
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/group/group](https://hellouniapp.dcloud.net.cn/pages/extUI/group/group)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-group)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
index 3c01efc160aa64547fb95a8ef75d308eef891cfa..64498853cdd91577d9cb5646bf50b307a83d58fe 100644
--- a/uni_modules/uni-icons/changelog.md
+++ b/uni_modules/uni-icons/changelog.md
@@ -1,3 +1,9 @@
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
 ## 1.3.2（2021-12-01）
 - 优化 示例可复制图标名称
 ## 1.3.1（2021-11-23）
diff --git a/uni_modules/uni-icons/components/uni-icons/icons.js b/uni_modules/uni-icons/components/uni-icons/icons.js
index d18973786f37e0f4193ff9052a398a2bdd464e3a..78899364ed8043d4ac7051a5b6c3821bfd1e802a 100644
--- a/uni_modules/uni-icons/components/uni-icons/icons.js
+++ b/uni_modules/uni-icons/components/uni-icons/icons.js
@@ -173,6 +173,13 @@ export default {
       "unicode": "e6bb",
       "unicode_decimal": 59067
     },
+		{
+		  "icon_id": "24923353",
+		  "name": "arrowthinright",
+		  "font_class": "arrowthinright",
+		  "unicode": "e6bb",
+		  "unicode_decimal": 59067
+		},
     {
       "icon_id": "24923354",
       "name": "arrowthinleft",
@@ -180,6 +187,13 @@ export default {
       "unicode": "e6bc",
       "unicode_decimal": 59068
     },
+		{
+		  "icon_id": "24923354",
+		  "name": "arrowthinleft",
+		  "font_class": "arrowthinleft",
+		  "unicode": "e6bc",
+		  "unicode_decimal": 59068
+		},
     {
       "icon_id": "24923355",
       "name": "arrowthinup",
@@ -187,12 +201,25 @@ export default {
       "unicode": "e6bd",
       "unicode_decimal": 59069
     },
+		{
+		  "icon_id": "24923355",
+		  "name": "arrowthinup",
+		  "font_class": "arrowthinup",
+		  "unicode": "e6bd",
+		  "unicode_decimal": 59069
+		},
     {
       "icon_id": "24923356",
       "name": "arrowthindown",
       "font_class": "arrow-down",
       "unicode": "e6be",
       "unicode_decimal": 59070
+    },{
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrowthindown",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
     },
     {
       "icon_id": "24923349",
@@ -200,6 +227,12 @@ export default {
       "font_class": "bottom",
       "unicode": "e6b8",
       "unicode_decimal": 59064
+    },{
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "arrowdown",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
     },
     {
       "icon_id": "24923346",
@@ -208,6 +241,13 @@ export default {
       "unicode": "e6b5",
       "unicode_decimal": 59061
     },
+		{
+		  "icon_id": "24923346",
+		  "name": "arrowright",
+		  "font_class": "arrowright",
+		  "unicode": "e6b5",
+		  "unicode_decimal": 59061
+		},
     {
       "icon_id": "24923347",
       "name": "arrowup",
@@ -215,6 +255,13 @@ export default {
       "unicode": "e6b6",
       "unicode_decimal": 59062
     },
+		{
+		  "icon_id": "24923347",
+		  "name": "arrowup",
+		  "font_class": "arrowup",
+		  "unicode": "e6b6",
+		  "unicode_decimal": 59062
+		},
     {
       "icon_id": "24923348",
       "name": "arrowleft",
@@ -222,6 +269,13 @@ export default {
       "unicode": "e6b7",
       "unicode_decimal": 59063
     },
+		{
+		  "icon_id": "24923348",
+		  "name": "arrowleft",
+		  "font_class": "arrowleft",
+		  "unicode": "e6b7",
+		  "unicode_decimal": 59063
+		},
     {
       "icon_id": "24923334",
       "name": "eye",
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
index a9f271d7ff1297e6aa697766f42d6b6f645293da..a87f68e428cd685f8e2235754b208014966d2ed3 100644
--- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -1,14 +1,18 @@
 <template>
 	<!-- #ifdef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
 	<!-- #endif -->
 	<!-- #ifndef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
 	<!-- #endif -->
 </template>
 
 <script>
-	import icons from './icons.js';
+	import icons from './icons.js';
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
+	} 
 	// #ifdef APP-NVUE
 	var domModule = weex.requireModule('dom');
 	import iconUrl from './uniicons.ttf'
@@ -61,6 +65,9 @@
 					return unescape(`%u${code.unicode}`)
 				}
 				return ''
+			},
+			iconSize(){
+				return getVal(this.size)
 			}
 		},
 		methods: {
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
index 26ea69831abeee9926a0906a32198e93bf856a00..d1c4e77d4fb10536a1938ec1d31db1b54c815df0 100644
--- a/uni_modules/uni-icons/package.json
+++ b/uni_modules/uni-icons/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "1.3.2",
+  "version": "1.3.5",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-id-cf/changelog.md b/uni_modules/uni-id-cf/changelog.md
index 9b9939466945fa06229a7433018caf1636bfe99d..c3ba933db3dcc54281df0697abf98ba17f2fbedb 100644
--- a/uni_modules/uni-id-cf/changelog.md
+++ b/uni_modules/uni-id-cf/changelog.md
@@ -1,5 +1,7 @@
+## 1.0.14（2022-01-26）
+- 修复 uni-admin 的 'registerUser' 接口，注册用户含有多余字段 uid 
 ## 1.0.13（2022-01-26）
-新增逻辑:调用logout接口后刷新设备信息中token的有效期
+- 新增逻辑:调用logout接口后刷新设备信息中token的有效期
 ## 1.0.12（2022-01-24）
 - 优化设备信息存储逻辑
 - 新增刷新设备信息token有效期的API `renewDeviceTokenExpired`
diff --git a/uni_modules/uni-id-cf/package.json b/uni_modules/uni-id-cf/package.json
index e9684c29219e3662b2590c5edb308735edfd2a01..c84ddcb3e34b116dd3fcbd36f873df1ad979f983 100644
--- a/uni_modules/uni-id-cf/package.json
+++ b/uni_modules/uni-id-cf/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-id-cf",
   "displayName": "uni-id-cf",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "封装uni-id常用接口的云函数，快速实现简单、统一、可扩展的用户管理功能",
   "keywords": [
     "uni-id-cf",
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
index 8d848e1d65cad1671e5ac6733c5a7ccc0633947f..8b73cb3cb841b1aa11870b5440f63fbdd74dda3f 100644
--- 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
@@ -166,10 +166,10 @@ exports.main = async (event, context) => {
 			recordSize = 2;
 		const uniIdLogCollection = db.collection('uni-id-log')
 		let recentRecord = await uniIdLogCollection.where({
-			deviceId: params.deviceId || context.DEVICEID,
-			create_date: dbCmd.gt(now - recordDate),
-			type: 'login'
-		})
+				deviceId: params.deviceId || context.DEVICEID,
+				create_date: dbCmd.gt(now - recordDate),
+				type: 'login'
+			})
 			.orderBy('create_date', 'desc')
 			.limit(recordSize)
 			.get();
@@ -330,10 +330,10 @@ exports.main = async (event, context) => {
 					} = 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
-					})
+							method: 'POST',
+							contentType: 'json', // 指定以application/json发送data内的数据
+							dataType: 'json' // 指定返回值为json格式，自动进行parse
+						})
 					if (wxRes.status == 200) {
 						let {
 							nickname,
@@ -395,11 +395,11 @@ exports.main = async (event, context) => {
 			res = await uniID.checkToken(uniIdToken);
 			break;
 		case 'logout':
-			res = await uniID.logout(uniIdToken)
-			await deviceDB.where({
-				"device_id": context.DEVICEID,
-			}).update({
-				"tokenExpired": Date.now()
+			res = await uniID.logout(uniIdToken)
+			await deviceDB.where({
+				"device_id": context.DEVICEID,
+			}).update({
+				"tokenExpired": Date.now()
 			})
 			break;
 		case 'sendSmsCode':
@@ -519,7 +519,7 @@ exports.main = async (event, context) => {
 			});
 			break;
 
-		// =========================== admin api start =========================
+			// =========================== admin api start =========================
 		case 'registerAdmin': {
 			var {
 				username,
@@ -559,9 +559,9 @@ exports.main = async (event, context) => {
 				}
 
 			}
-		}
 			break;
-		case 'registerUser':
+		}
+		case 'registerUser': {
 			const {
 				userInfo
 			} = await uniID.getUserInfo({
@@ -576,6 +576,7 @@ exports.main = async (event, context) => {
 				// 过滤 dcloud_appid，注册用户成功后再提交
 				const dcloudAppidList = params.dcloud_appid
 				delete params.dcloud_appid
+				delete params.uid
 				res = await uniID.register({
 					autoSetDcloudAppid: false,
 					...params
@@ -590,6 +591,7 @@ exports.main = async (event, context) => {
 				}
 			}
 			break;
+		}
 		case 'updateUser': {
 			const {
 				userInfo
@@ -693,4 +695,4 @@ exports.main = async (event, context) => {
 	}
 	//返回数据给客户端
 	return res
-}
\ No newline at end of file
+}
diff --git a/uni_modules/uni-id/changelog.md b/uni_modules/uni-id/changelog.md
index 24e9b40c7263f60ff2c917b49a976c49ecbba28e..141c67875c4e6e839a37f605aa177aa1cc8c07a2 100644
--- a/uni_modules/uni-id/changelog.md
+++ b/uni_modules/uni-id/changelog.md
@@ -1,3 +1,28 @@
+## 3.3.21（2022-05-24）
+- 修复createInstance传入clientInfo无效的Bug
+## 3.3.20（2022-05-19）
+- 调整以下错误码（账号已注册[uni-id-account-exists]、账号不存在[uni-id-account-not-exists]、账号已绑定[uni-id-account-bound]）
+## 3.3.19（2022-05-19）
+- 修复 addUser 部分情况下会创建出重复账号的Bug
+## 3.3.18（2022-05-12）
+- 调整绑定、解绑邮箱手机号接口，只要传递code参数就进行验证码校验即使传递的值为undefined
+## 3.3.17（2022-05-09）
+- register_env内增加os_name字段用于区分注册时的客户端系统类型
+## 3.3.16（2022-05-09）
+- 修复 addUser接口添加的用户无法使用密码登录的Bug [详情](https://ask.dcloud.net.cn/question/144670)
+## 3.3.15（2022-05-08）
+- 修复config文件语法错误时报`this.t is not a function`的Bug 感谢@寒暄
+## 3.3.14（2022-05-08）
+- 新增 getWeixinUserInfo接口 用于获取app平台微信登录用户的用户信息 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id.html#get-weixin-user-info)
+- 新增 addUser接口 用于手动添加用户 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id.html#add-user)
+- 新增 resetPwdBySms接口 用于使用短信验证码重置密码 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id.html#reset-pwd-by-sms)
+- 新增 refreshToken接口 用于主动刷新用户token [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id.html#refresh-token)
+- 调整 用户注册时记录用户注册环境到 register_env 字段 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id.html#user-table)
+- 调整 用户注册时将注册 ip 移至 register_env 内
+
+## 3.3.13（2022-03-04）
+- createInstance方法支持传递clientInfo [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id.html#create-instance)
+- 修复`this.t is not a function`报错
 ## 3.3.12（2022-01-15）
 - 新增 preferedAppPlatform 配置用于解决uni-app vue2版本vue3版本获取platform不一致的问题 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=prefered-app-platform)
 - 修复 checkToken 未返回自定义token内容的Bug
diff --git a/uni_modules/uni-id/package.json b/uni_modules/uni-id/package.json
index 4c83e1be391361c28b37fcd75e91cbac9fac3fa1..9fefcb31018d0f55dbb9bff3198d1d5e767dd142 100644
--- a/uni_modules/uni-id/package.json
+++ b/uni_modules/uni-id/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-id",
   "displayName": "uni-id",
-  "version": "3.3.12",
+  "version": "3.3.21",
   "description": "简单、统一、可扩展的用户中心",
   "keywords": [
     "uniid",
diff --git a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/index.js b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/index.js
index 64a21789a26205c15c2911bc569d2a7be2c44b60..7d7a22ab4429c8ff04e394fe4785900075447fee 100644
--- a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/index.js
+++ b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/index.js
@@ -1 +1 @@
-"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}var t=e(require("crypto")),r=e(require("buffer")),n=e(require("stream")),i=e(require("util"));const o={PARAM_ERROR:{errCode:"param-error"},PARAM_REQUIRED:{errCode:"param-required"},USER_NOT_EXIST:{errCode:"user-not-exist"},ROLE_NOT_EXIST:{errCode:"role-not-exist"},PERMISSION_NOT_EXIST:{errCode:"permission-not-exist"},MULTI_USER_MATCHED:{errCode:"multi-user-matched"},USER_INFO_ERROR:{errCode:"user-info-error"},USER_ACCOUNT_CONFLICT:{errCode:"user-account-conflict"},USER_ACCOUNT_CLOSED:{errCode:"user-account-closed"},ACCOUNT_ALREADY_REGISTED:{errCode:"account-already-registed"},ACCOUNT_NOT_REGISTED:{errCode:"account-not-registed"},ACCOUNT_already_BOUND:{errCode:"account-already-bound"},UNBIND_FAILED:{errCode:"unbind-failed"},INVALID_INVITE_CODE:{errCode:"invalid-invite-code"},SET_INVITE_CODE_FAILED:{errCode:"set-invite-code-failed"},GET_THIRD_PARTY_ACCOUNT_FAILED:{errCode:"get-third-party-account-failed"}},s={0:{errCode:0,errMsg:""},10001:{errCode:"account-banned"},10002:o.USER_NOT_EXIST,10003:o.MULTI_USER_MATCHED,10004:o.USER_INFO_ERROR,10005:o.USER_ACCOUNT_CONFLICT,10006:o.USER_ACCOUNT_CLOSED,10102:{errCode:"password-error"},10103:{errCode:"password-error-exceed-limit"},10201:o.ACCOUNT_ALREADY_REGISTED,10202:o.ACCOUNT_NOT_REGISTED,10203:o.INVALID_INVITE_CODE,10301:o.ACCOUNT_ALREADY_REGISTED,10302:o.ACCOUNT_NOT_REGISTED,10401:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10402:o.ACCOUNT_ALREADY_REGISTED,10403:o.ACCOUNT_NOT_REGISTED,10501:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10502:o.ACCOUNT_ALREADY_REGISTED,10503:o.ACCOUNT_NOT_REGISTED,10601:o.ACCOUNT_ALREADY_REGISTED,10602:o.ACCOUNT_NOT_REGISTED,10701:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10702:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10703:o.ACCOUNT_ALREADY_REGISTED,10704:o.ACCOUNT_NOT_REGISTED,10705:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10706:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10801:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10802:o.ACCOUNT_ALREADY_REGISTED,10803:o.ACCOUNT_NOT_REGISTED,20101:o.PARAM_REQUIRED,20102:o.ACCOUNT_ALREADY_REGISTED,30101:o.PARAM_REQUIRED,30201:{errCode:"check-device-feature-failed"},30202:{errCode:"token-not-exist"},30203:{errCode:"token-expired"},30204:{errCode:"check-token-failed"},40201:o.USER_NOT_EXIST,40202:{errCode:"invalid-old-password"},50101:o.PARAM_REQUIRED,50102:o.PARAM_ERROR,50201:o.PARAM_REQUIRED,50203:o.PARAM_ERROR,50202:{errCode:"invalid-verify-code"},50301:{errCode:"send-sms-code-failed"},60101:o.ACCOUNT_already_BOUND,60201:o.ACCOUNT_already_BOUND,60301:o.GET_THIRD_PARTY_ACCOUNT_FAILED,60302:o.ACCOUNT_already_BOUND,60401:o.GET_THIRD_PARTY_ACCOUNT_FAILED,60402:o.ACCOUNT_already_BOUND,60501:o.GET_THIRD_PARTY_ACCOUNT_FAILED,60502:o.ACCOUNT_already_BOUND,70101:o.UNBIND_FAILED,70201:o.UNBIND_FAILED,70301:o.UNBIND_FAILED,70401:o.UNBIND_FAILED,70501:o.UNBIND_FAILED,80301:o.USER_NOT_EXIST,80401:o.SET_INVITE_CODE_FAILED,80402:o.SET_INVITE_CODE_FAILED,80501:o.INVALID_INVITE_CODE,80502:o.USER_NOT_EXIST,80503:{errCode:"modify-invite-code-is-not-allowed"},80601:o.GET_THIRD_PARTY_ACCOUNT_FAILED,80602:o.GET_THIRD_PARTY_ACCOUNT_FAILED,80701:o.GET_THIRD_PARTY_ACCOUNT_FAILED,80702:o.GET_THIRD_PARTY_ACCOUNT_FAILED,80801:{errCode:"decrypt-weixin-data-failed"},80802:{errCode:"decrypt-weixin-data-failed"},80803:{errCode:"invalid-weixin-appid"},80804:o.PARAM_REQUIRED,80805:o.PARAM_REQUIRED,80806:o.PARAM_REQUIRED,90001:{errCode:"database-operation-failed"},90002:o.PARAM_REQUIRED,90003:o.PARAM_ERROR,90004:o.USER_NOT_EXIST,90005:o.ROLE_NOT_EXIST,90006:o.PERMISSION_NOT_EXIST};class a extends Error{constructor(e){super(e.message),this.errMsg=e.message||"",Object.defineProperties(this,{message:{get(){return`errCode: ${e.code||""} | errMsg: `+this.errMsg},set(e){this.errMsg=e}}})}}const c=Object.prototype.toString,u=Object.prototype.hasOwnProperty;function d(e,t){return u.call(e,t)}function l(e){return"[object Object]"===c.call(e)}function p(e){return"function"==typeof e}function f(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof e.then}function h(e){return Object.prototype.toString.call(e).slice(8,-1).toLowerCase()}const m=/_(\w)/g,g=/[A-Z]/g;function y(e){return e.replace(m,(e,t)=>t?t.toUpperCase():"")}function w(e){return e.replace(g,e=>"_"+e.toLowerCase())}function v(e,t){let r,n;switch(t){case"snake2camel":n=y,r=m;break;case"camel2snake":n=w,r=g}for(const i in e)if(d(e,i)&&r.test(i)){const r=n(i);e[r]=e[i],delete e[i],l(e[r])?e[r]=v(e[r],t):Array.isArray(e[r])&&(e[r]=e[r].map(e=>v(e,t)))}return e}function _(e){return v(e,"snake2camel")}function b(e){return v(e,"camel2snake")}function E(e){return function(e,t="-"){e=e||new Date;const r=[];return r.push(e.getFullYear()),r.push(("00"+(e.getMonth()+1)).substr(-2)),r.push(("00"+e.getDate()).substr(-2)),r.join(t)}(e=e||new Date)+" "+function(e,t=":"){e=e||new Date;const r=[];return r.push(("00"+e.getHours()).substr(-2)),r.push(("00"+e.getMinutes()).substr(-2)),r.push(("00"+e.getSeconds()).substr(-2)),r.join(t)}(e)}function C(){"development"===process.env.NODE_ENV&&console.log(...arguments)}function T(e=6){let t="";for(let r=0;r<e;r++)t+=Math.floor(10*Math.random());return t}function A(e){return Array.from(new Set(e))}function x(e={},t){if(!t||!e)return e;const r=["_pre","_purify","_post"];t._pre&&(e=t._pre(e));let n={shouldDelete:new Set([])};if(t._purify){const e=t._purify;for(const t in e)e[t]=new Set(e[t]);n=Object.assign(n,e)}if(l(t))for(const i in t){const o=t[i];p(o)&&-1===r.indexOf(i)?e[i]=o(e):"string"==typeof o&&-1===r.indexOf(i)&&(e[i]=e[o],n.shouldDelete.add(o))}else p(t)&&(e=t(e));if(n.shouldDelete)for(const t of n.shouldDelete)delete e[t];return t._post&&(e=t._post(e)),e}function S(e,t){const r=new e(t);return new Proxy(r,{get:function(e,t){if("function"==typeof e[t]&&0!==t.indexOf("_")&&e._protocols&&e._protocols[t]){const r=e._protocols[t];return async function(n){n=x(n,r.args);let i=await e[t](n);return i=x(i,r.returnValue),i}}return e[t]}})}function I(e){if(l(e))if(0===e.code)e.errCode=e.code,e.message=e.errMsg=e.msg,delete e.messageValues;else if(d(s,e.code)){const t=s[e.code];e.errCode="uni-id-"+t.errCode,e.errMsg=this.t(t.errCode,e.messageValues||{})||e.msg,e.message=e.msg=e.errMsg,delete e.messageValues}else e.code&&console.warn(`error code not found, error code: ${e.code}, please contact us`)}var O={"zh-Hans":{alipay:"支付宝",wechat:"微信",user:"用户","user-id":"用户ID","dcloud-appid":"应用Appid","dcloud-appid-list":"应用列表",account:"账号",username:"用户名",email:"邮箱",mobile:"手机号","wechat-openid":"微信openid","wechat-account":"微信账号","alipay-account":"支付宝账号","qq-openid":"QQ openid","qq-account":"QQ账号","apple-account":"苹果账号",password:"密码","verify-code":"验证码","verify-code-type":"验证码类型","user-unique-param":"用户名、邮箱或手机号","role-id":"角色ID","permission-id":"权限ID",login:"登录","verify-mobile":"验证手机","context-param-required":"context内缺少{param}，请使用uniID.createInstance传入客户端信息","config-param-require":"uni-id的配置内缺少{param}","uni-verify-config-required":"请在config.json中配置service.univerify下一键登录相关参数","login-with-invite-type-required":"强制使用邀请码注册时，需指明type为register还是login","type-array-required":"{param}应为数组形式","query-field-warning":"检测到当前使用queryField匹配多字段进行登录操作，需要注意：uni-id并未限制用户名不能是手机号或邮箱，需要开发者自行限制。否则可能出现用户输入abc@xx.com会同时匹配到邮箱为此值的用户和用户名为此值的用户，导致登录失败","add-role-admin-is-not-allowed":"不可新增roleID为admin的角色","password-secret-type-error":"config内passwordSecret类型错误，只可设置string类型和array类型","token-expires-config-warning":"tokenExpiresIn不可小于或等于tokenExpiresThreshold","type-function-required":"{param}应为function类型","dev-warning":"当前正在使用uniID.dev属性，注意此属性仅可用于开发调试","config-file-invalid":"请确保公用模块uni-id对应的配置文件（common/uni-config-center/uni-id/config.json）格式正确（不可包含注释）","config-file-not-found":"请在common/uni-config-center/uni-id/config.json内添加uni-id相关配置信息","hx-version-warning":"当前使用的HBuilderX版本过低，请升级HBuilderX到最新版本","account-banned":"账号已禁用","user-not-exist":"用户不存在","multi-user-matched":"匹配到多个账号","user-info-error":"用户信息不正确","user-account-conflict":"用户账号冲突","user-account-closed":"此账号已注销","password-error":"密码错误","password-error-exceed-limit":"密码错误次数过多，请稍后再试","account-already-registed":"此{type}已注册","account-not-registed":"此{type}尚未注册","invalid-invite-code":"邀请码无效","get-third-party-account-failed":"获取{account}失败","param-required":"{param}不可为空","check-device-feature-failed":"设备特征校验未通过","token-not-exist":"云端已不包含此token","token-expired":"token已过期","check-token-failed":"token校验未通过","invalid-old-password":"旧密码错误","param-error":"{param}参数错误，{reason}","invalid-verify-code":"验证码错误或已失效","send-sms-code-failed":"验证码发送失败","account-already-bound":"此{type}已绑定","unbind-failed":"解绑失败","set-invite-code-failed":"邀请码设置失败","modify-invite-code-is-not-allowed":"邀请码不可修改","decrypt-weixin-data-failed":"解密失败","invalid-weixin-appid":"appid不匹配","database-operation-failed":"数据库读写异常","role-not-exist":"角色不存在","permission-not-exist":"权限不存在","context-required":"uni-id无法获取context.{key}，请使用uniID.createInstance方法传入"},en:{alipay:"alipay",wechat:"wechat",user:"user","user-id":"user id","dcloud-appid":"DCloud appid","dcloud-appid-list":"DCloud appid list",account:"account",username:"username",email:"email",mobile:"phone number","wechat-openid":"wechat openid","wechat-account":"wechat account","alipay-account":"alipay account","qq-openid":"QQ openid","qq-account":"QQ account","apple-account":"apple account",password:"password","verify-code":"verify code","verify-code-type":"verify code type","user-unique-param":"username, email or mobile phone number","role-id":"role id","permission-id":"permission id",login:"login","verify-mobile":"verify mobile phone number","context-param-required":"You should pass {param} in context using uniID.createInstance","config-param-require":"{param} is required in uni-id's config","uni-verify-config-required":"univerify config required: service.univerify","login-with-invite-type-required":"parameter type is required when forceInviteCode set to true","type-array-required":"type of {param} must be array","query-field-warning":"You are using multi query field to login, be aware that uni-id will not check username's fromat, eg: abc@xx.com is a valid username for uni-id. You should check username in your code.","add-role-admin-is-not-allowed":'add role with an id of "admin" is not allowed',"password-secret-type-error":"passwordSecret in config must be string or array","token-expires-config-warning":"tokenExpiresIn must be greater than tokenExpiresThreshold","type-function-required":"{param} must be a function","dev-warning":"warning: uniID.dev is only for development","config-file-invalid":"invalid config file (common/uni-config-center/uni-id/config.json), please note that comment is not allowed","config-file-not-found":"config file (common/uni-config-center/uni-id/config.json) not found","hx-version-warning":"The version of your HBuilderX is too lower, please upgrade to the latest version of HBuilderX","account-banned":"account is banned","user-not-exist":"user does not exist","multi-user-matched":"multiple users are matched","user-info-error":"user info error","user-account-conflict":"user account conflict","user-account-closed":"user account was closed","password-error":"password is incorrect","password-error-exceed-limit":"password error exceed limit","account-already-registed":"{type} is already registed","account-not-registed":"{type} is not registed","invalid-invite-code":"invalid invite code","get-third-party-account-failed":"get {account} failed","param-required":"{param} is required","check-device-feature-failed":"check device feature failed","token-not-exist":"token is not exist","token-expired":"token is expired","check-token-failed":"check token failed","invalid-old-password":"invalid old password","param-error":"{param} error, {reason}","invalid-verify-code":"invalid verify code","send-sms-code-failed":"send sms code failed","account-already-bound":"{type} is already bound","unbind-failed":"unbind failed","set-invite-code-failed":"set invite code failed","modify-invite-code-is-not-allowed":"invite code modification is not allowed","decrypt-weixin-data-failed":"decrypt weixin data failed","invalid-weixin-appid":"invalid weixin appid","database-operation-failed":"database operation failed","role-not-exist":"role does not exist","permission-not-exist":"permission does not exist","context-required":"context.{key} is required, you should pass context using uniID.createInstance"}};const k=uniCloud.database(),j=k.collection("uni-id-users"),R=k.collection("opendb-verify-codes"),P=k.collection("uni-id-roles"),D=k.collection("uni-id-permissions"),q={username:"username",mobile:"mobile",email:"email",wx_unionid:"wechat-account","wx_openid.app-plus":"wechat-account","wx_openid.app":"wechat-account","wx_openid.mp-weixin":"wechat-account",qq_unionid:"qq-account","qq_openid.app-plus":"qq-account","qq_openid.app":"qq-account","qq_openid.mp-weixin":"qq-account",ali_openid:"alipay-account",apple_openid:"alipay-account"},N=90002,L=90003,U=90004,V=90005,M=0,B=1,$=4;async function F({uid:e,status:t}={}){return e?(await j.doc(e).update({status:t,status_update_date:Date.now()}),{code:0}):{code:N,messageValues:{param:this.t("user-id")}}}async function H({name:e,url:t,data:r,options:n,defaultOptions:i}){let o={};const s=b(Object.assign({},r));s&&s.access_token&&delete s.access_token;try{n=Object.assign({},i,n,{data:s}),o=await uniCloud.httpclient.request(t,n)}catch(t){return function(e,t){throw new a({code:t.code||-2,message:t.message||e+" fail"})}(e,t)}let c=o.data;const u=o.headers["content-type"];if(!Buffer.isBuffer(c)||0!==u.indexOf("text/plain")&&0!==u.indexOf("application/json"))Buffer.isBuffer(c)&&(c={buffer:c,contentType:u});else try{c=JSON.parse(c.toString())}catch(e){c=c.toString()}return _(function(e,t){if(t.errcode)throw new a({code:t.errcode||-2,message:t.errmsg||e+" fail"});return delete t.errcode,delete t.errmsg,{...t,errMsg:e+" ok",errCode:0}}(e,c||{errCode:-2,errMsg:"Request failed"}))}function K(e,t){let r="";if(t&&t.accessToken){r=`${e.indexOf("?")>-1?"&":"?"}access_token=${t.accessToken}`}return`${e}${r}`}class G{constructor(e){this.options=Object.assign({baseUrl:"https://api.weixin.qq.com",timeout:5e3},e)}async _requestWxOpenapi({name:e,url:t,data:r,options:n}){const i={method:"GET",dataType:"json",dataAsQueryString:!0,timeout:this.options.timeout};return await H({name:"auth."+e,url:`${this.options.baseUrl}${K(t,r)}`,data:r,options:n,defaultOptions:i})}async code2Session(e){return await this._requestWxOpenapi({name:"code2Session",url:"/sns/jscode2session",data:{grant_type:"authorization_code",appid:this.options.appId,secret:this.options.secret,js_code:e}})}async getOauthAccessToken(e){const t=await this._requestWxOpenapi({name:"getOauthAccessToken",url:"/sns/oauth2/access_token",data:{grant_type:"authorization_code",appid:this.options.appId,secret:this.options.secret,code:e}});return t.expiresIn&&(t.expired=Date.now()+t.expiresIn),t}}async function z({name:e,url:t,data:r,options:n,defaultOptions:i}){let o;n=Object.assign({},i,n,{data:b(Object.assign({},r))});try{o=await uniCloud.httpclient.request(t,n)}catch(t){return function(e,t){throw new a({code:t.code||-2,message:t.message||e+" fail"})}(e,t)}let s=o.data;const c=o.headers["content-type"];if(!Buffer.isBuffer(s)||0!==c.indexOf("text/plain")&&0!==c.indexOf("application/json"))Buffer.isBuffer(s)&&(s={buffer:s,contentType:c});else try{s=JSON.parse(s.toString())}catch(e){s=s.toString()}return _(function(e,t){if(t.ret||t.error){const r=t.ret||t.error||t.errcode||-2,n=t.msg||t.error_description||t.errmsg||e+" fail";throw new a({code:r,message:n})}return delete t.ret,delete t.msg,delete t.error,delete t.error_description,delete t.errcode,delete t.errmsg,{...t,errMsg:e+" ok",errCode:0}}(e,s||{errCode:-2,errMsg:"Request failed"}))}class Q{constructor(e){this.options=Object.assign({baseUrl:"https://graph.qq.com",timeout:5e3},e)}async _requestQQOpenapi({name:e,url:t,data:r,options:n}){const i={method:"GET",dataType:"json",dataAsQueryString:!0,timeout:this.options.timeout};var o,s;return await z({name:"auth."+e,url:(o=this.options.baseUrl,s=t,/^https?:/.test(s)?s:o+s),data:r,options:n,defaultOptions:i})}async getOpenidByToken({accessToken:e}={}){const t=await this._requestQQOpenapi({name:"getOpenidByToken",url:"/oauth2.0/me",data:{accessToken:e,unionid:1,fmt:"json"}});if(t.clientId!==this.options.appId)throw new a({code:"APPID_NOT_MATCH",message:"appid not match"});return{openid:t.openid,unionid:t.unionid}}async code2Session({code:e}={}){return await this._requestQQOpenapi({name:"getOpenidByToken",url:"https://api.q.qq.com/sns/jscode2session",data:{grant_type:"authorization_code",appid:this.options.appId,secret:this.options.secret,js_code:e}})}}const Y={RSA:"RSA-SHA1",RSA2:"RSA-SHA256"};var J={code2Session:{returnValue:{openid:"userId"}}};class X extends class{constructor(e={}){if(!e.appId)throw new Error("appId required");if(!e.privateKey)throw new Error("privateKey required");const t={gateway:"https://openapi.alipay.com/gateway.do",timeout:5e3,charset:"utf-8",version:"1.0",signType:"RSA2",timeOffset:-(new Date).getTimezoneOffset()/60,keyType:"PKCS8"};e.sandbox&&(e.gateway="https://openapi.alipaydev.com/gateway.do"),this.options=Object.assign({},t,e);const r="PKCS8"===this.options.keyType?"PRIVATE KEY":"RSA PRIVATE KEY";this.options.privateKey=this._formatKey(this.options.privateKey,r),this.options.alipayPublicKey&&(this.options.alipayPublicKey=this._formatKey(this.options.alipayPublicKey,"PUBLIC KEY"))}_formatKey(e,t){return`-----BEGIN ${t}-----\n${e}\n-----END ${t}-----`}_formatUrl(e,t){let r=e;const n=["app_id","method","format","charset","sign_type","sign","timestamp","version","notify_url","return_url","auth_token","app_auth_token"];for(const e in t)if(n.indexOf(e)>-1){const n=encodeURIComponent(t[e]);r=`${r}${r.includes("?")?"&":"?"}${e}=${n}`,delete t[e]}return{execParams:t,url:r}}_getSign(e,r){const n=r.bizContent||null;delete r.bizContent;const i=Object.assign({method:e,appId:this.options.appId,charset:this.options.charset,version:this.options.version,signType:this.options.signType,timestamp:E((o=this.options.timeOffset,new Date(Date.now()+6e4*((new Date).getTimezoneOffset()+60*(o||0)))))},r);var o;n&&(i.bizContent=JSON.stringify(b(n)));const s=b(i),a=Object.keys(s).sort().map(e=>{let t=s[e];return"[object String]"!==Array.prototype.toString.call(t)&&(t=JSON.stringify(t)),`${e}=${t}`}).join("&"),c=t.createSign(Y[this.options.signType]).update(a,"utf8").sign(this.options.privateKey,"base64");return Object.assign(s,{sign:c})}async _exec(e,t={},r={}){const n=this._getSign(e,t),{url:i,execParams:o}=this._formatUrl(this.options.gateway,n),{status:s,data:a}=await uniCloud.httpclient.request(i,{method:"POST",data:o,dataType:"text",timeout:this.options.timeout});if(200!==s)throw new Error("request fail");const c=JSON.parse(a),u=e.replace(/\./g,"_")+"_response",d=c[u],l=c.error_response;if(d){if(!r.validateSign||this._checkResponseSign(a,u)){if(!d.code||"10000"===d.code){return{errCode:0,errMsg:d.msg||"",..._(d)}}const e=d.sub_code?`${d.sub_code} ${d.sub_msg}`:""+(d.msg||"unkonwn error");throw new Error(e)}throw new Error("check sign error")}if(l)throw new Error(l.sub_msg||l.msg||"request fail");throw new Error("request fail")}_checkResponseSign(e,r){if(!this.options.alipayPublicKey||""===this.options.alipayPublicKey)return console.warn("options.alipayPublicKey is empty"),!0;if(!e)return!1;const n=this._getSignStr(e,r),i=JSON.parse(e).sign,o=t.createVerify(Y[this.options.signType]);return o.update(n,"utf8"),o.verify(this.options.alipayPublicKey,i,"base64")}_getSignStr(e,t){let r=e.trim();const n=e.indexOf(t+'"'),i=e.lastIndexOf('"sign"');return r=r.substr(n+t.length+1),r=r.substr(0,i),r=r.replace(/^[^{]*{/g,"{"),r=r.replace(/\}([^}]*)$/g,"}"),r}}{constructor(e){super(e),this._protocols=J}async code2Session(e){return await this._exec("alipay.system.oauth.token",{grantType:"authorization_code",code:e})}}function W(e){var t=e[0];return t<"0"||t>"7"?"00"+e:e}function Z(e){var t=e.toString(16);return t.length%2?"0"+t:t}function ee(e){if(e<=127)return Z(e);var t=Z(e);return Z(128+t.length/2)+t}var te="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function re(e,t){return e(t={exports:{}},t.exports),t.exports}var ne=re((function(e,t){var n=r.Buffer;function i(e,t){for(var r in e)t[r]=e[r]}function o(e,t,r){return n(e,t,r)}n.from&&n.alloc&&n.allocUnsafe&&n.allocUnsafeSlow?e.exports=r:(i(r,t),t.Buffer=o),o.prototype=Object.create(n.prototype),i(n,o),o.from=function(e,t,r){if("number"==typeof e)throw new TypeError("Argument must not be a number");return n(e,t,r)},o.alloc=function(e,t,r){if("number"!=typeof e)throw new TypeError("Argument must be a number");var i=n(e);return void 0!==t?"string"==typeof r?i.fill(t,r):i.fill(t):i.fill(0),i},o.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return n(e)},o.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return r.SlowBuffer(e)}})),ie=(ne.Buffer,ne.Buffer);function oe(e){if(this.buffer=null,this.writable=!0,this.readable=!0,!e)return this.buffer=ie.alloc(0),this;if("function"==typeof e.pipe)return this.buffer=ie.alloc(0),e.pipe(this),this;if(e.length||"object"==typeof e)return this.buffer=e,this.writable=!1,process.nextTick(function(){this.emit("end",e),this.readable=!1,this.emit("close")}.bind(this)),this;throw new TypeError("Unexpected data type ("+typeof e+")")}i.inherits(oe,n),oe.prototype.write=function(e){this.buffer=ie.concat([this.buffer,ie.from(e)]),this.emit("data",e)},oe.prototype.end=function(e){e&&this.write(e),this.emit("end",e),this.emit("close"),this.writable=!1,this.readable=!1};var se=oe,ae=r.Buffer,ce=r.SlowBuffer,ue=de;function de(e,t){if(!ae.isBuffer(e)||!ae.isBuffer(t))return!1;if(e.length!==t.length)return!1;for(var r=0,n=0;n<e.length;n++)r|=e[n]^t[n];return 0===r}de.install=function(){ae.prototype.equal=ce.prototype.equal=function(e){return de(this,e)}};var le=ae.prototype.equal,pe=ce.prototype.equal;function fe(e){return(e/8|0)+(e%8==0?0:1)}de.restore=function(){ae.prototype.equal=le,ce.prototype.equal=pe};var he={ES256:fe(256),ES384:fe(384),ES512:fe(521)};var me=function(e){var t=he[e];if(t)return t;throw new Error('Unknown algorithm "'+e+'"')},ge=ne.Buffer;function ye(e){if(ge.isBuffer(e))return e;if("string"==typeof e)return ge.from(e,"base64");throw new TypeError("ECDSA signature must be a Base64 string or a Buffer")}function we(e,t,r){for(var n=0;t+n<r&&0===e[t+n];)++n;return e[t+n]>=128&&--n,n}var ve={derToJose:function(e,t){e=ye(e);var r=me(t),n=r+1,i=e.length,o=0;if(48!==e[o++])throw new Error('Could not find expected "seq"');var s=e[o++];if(129===s&&(s=e[o++]),i-o<s)throw new Error('"seq" specified length of "'+s+'", only "'+(i-o)+'" remaining');if(2!==e[o++])throw new Error('Could not find expected "int" for "r"');var a=e[o++];if(i-o-2<a)throw new Error('"r" specified length of "'+a+'", only "'+(i-o-2)+'" available');if(n<a)throw new Error('"r" specified length of "'+a+'", max of "'+n+'" is acceptable');var c=o;if(o+=a,2!==e[o++])throw new Error('Could not find expected "int" for "s"');var u=e[o++];if(i-o!==u)throw new Error('"s" specified length of "'+u+'", expected "'+(i-o)+'"');if(n<u)throw new Error('"s" specified length of "'+u+'", max of "'+n+'" is acceptable');var d=o;if((o+=u)!==i)throw new Error('Expected to consume entire buffer, but "'+(i-o)+'" bytes remain');var l=r-a,p=r-u,f=ge.allocUnsafe(l+a+p+u);for(o=0;o<l;++o)f[o]=0;e.copy(f,o,c+Math.max(-l,0),c+a);for(var h=o=r;o<h+p;++o)f[o]=0;return e.copy(f,o,d+Math.max(-p,0),d+u),f=(f=f.toString("base64")).replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")},joseToDer:function(e,t){e=ye(e);var r=me(t),n=e.length;if(n!==2*r)throw new TypeError('"'+t+'" signatures must be "'+2*r+'" bytes, saw "'+n+'"');var i=we(e,0,r),o=we(e,r,e.length),s=r-i,a=r-o,c=2+s+1+1+a,u=c<128,d=ge.allocUnsafe((u?2:3)+c),l=0;return d[l++]=48,u?d[l++]=c:(d[l++]=129,d[l++]=255&c),d[l++]=2,d[l++]=s,i<0?(d[l++]=0,l+=e.copy(d,l,0,r)):l+=e.copy(d,l,i,r),d[l++]=2,d[l++]=a,o<0?(d[l++]=0,e.copy(d,l,r)):e.copy(d,l,r+o),d}},_e=ne.Buffer,be="secret must be a string or buffer",Ee="key must be a string or a buffer",Ce="function"==typeof t.createPublicKey;function Te(e){if(!_e.isBuffer(e)&&"string"!=typeof e){if(!Ce)throw Ie(Ee);if("object"!=typeof e)throw Ie(Ee);if("string"!=typeof e.type)throw Ie(Ee);if("string"!=typeof e.asymmetricKeyType)throw Ie(Ee);if("function"!=typeof e.export)throw Ie(Ee)}}function Ae(e){if(!_e.isBuffer(e)&&"string"!=typeof e&&"object"!=typeof e)throw Ie("key must be a string, a buffer or an object")}function xe(e){return e.replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")}function Se(e){var t=4-(e=e.toString()).length%4;if(4!==t)for(var r=0;r<t;++r)e+="=";return e.replace(/\-/g,"+").replace(/_/g,"/")}function Ie(e){var t=[].slice.call(arguments,1),r=i.format.bind(i,e).apply(null,t);return new TypeError(r)}function Oe(e){var t;return t=e,_e.isBuffer(t)||"string"==typeof t||(e=JSON.stringify(e)),e}function ke(e){return function(r,n){!function(e){if(!_e.isBuffer(e)){if("string"==typeof e)return e;if(!Ce)throw Ie(be);if("object"!=typeof e)throw Ie(be);if("secret"!==e.type)throw Ie(be);if("function"!=typeof e.export)throw Ie(be)}}(n),r=Oe(r);var i=t.createHmac("sha"+e,n);return xe((i.update(r),i.digest("base64")))}}function je(e){return function(t,r,n){var i=ke(e)(t,n);return ue(_e.from(r),_e.from(i))}}function Re(e){return function(r,n){Ae(n),r=Oe(r);var i=t.createSign("RSA-SHA"+e);return xe((i.update(r),i.sign(n,"base64")))}}function Pe(e){return function(r,n,i){Te(i),r=Oe(r),n=Se(n);var o=t.createVerify("RSA-SHA"+e);return o.update(r),o.verify(i,n,"base64")}}function De(e){return function(r,n){Ae(n),r=Oe(r);var i=t.createSign("RSA-SHA"+e);return xe((i.update(r),i.sign({key:n,padding:t.constants.RSA_PKCS1_PSS_PADDING,saltLength:t.constants.RSA_PSS_SALTLEN_DIGEST},"base64")))}}function qe(e){return function(r,n,i){Te(i),r=Oe(r),n=Se(n);var o=t.createVerify("RSA-SHA"+e);return o.update(r),o.verify({key:i,padding:t.constants.RSA_PKCS1_PSS_PADDING,saltLength:t.constants.RSA_PSS_SALTLEN_DIGEST},n,"base64")}}function Ne(e){var t=Re(e);return function(){var r=t.apply(null,arguments);return r=ve.derToJose(r,"ES"+e)}}function Le(e){var t=Pe(e);return function(r,n,i){return n=ve.joseToDer(n,"ES"+e).toString("base64"),t(r,n,i)}}function Ue(){return function(){return""}}function Ve(){return function(e,t){return""===t}}Ce&&(Ee+=" or a KeyObject",be+="or a KeyObject");var Me=function(e){var t={hs:ke,rs:Re,ps:De,es:Ne,none:Ue},r={hs:je,rs:Pe,ps:qe,es:Le,none:Ve},n=e.match(/^(RS|PS|ES|HS)(256|384|512)$|^(none)$/i);if(!n)throw Ie('"%s" is not a valid algorithm.\n  Supported algorithms are:\n  "HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "PS256", "PS384", "PS512", "ES256", "ES384", "ES512" and "none".',e);var i=(n[1]||n[3]).toLowerCase(),o=n[2];return{sign:t[i](o),verify:r[i](o)}},Be=r.Buffer,$e=function(e){return"string"==typeof e?e:"number"==typeof e||Be.isBuffer(e)?e.toString():JSON.stringify(e)},Fe=ne.Buffer;function He(e,t){return Fe.from(e,t).toString("base64").replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")}function Ke(e){var t=e.header,r=e.payload,n=e.secret||e.privateKey,o=e.encoding,s=Me(t.alg),a=function(e,t,r){r=r||"utf8";var n=He($e(e),"binary"),o=He($e(t),r);return i.format("%s.%s",n,o)}(t,r,o),c=s.sign(a,n);return i.format("%s.%s",a,c)}function Ge(e){var t=e.secret||e.privateKey||e.key,r=new se(t);this.readable=!0,this.header=e.header,this.encoding=e.encoding,this.secret=this.privateKey=this.key=r,this.payload=new se(e.payload),this.secret.once("close",function(){!this.payload.writable&&this.readable&&this.sign()}.bind(this)),this.payload.once("close",function(){!this.secret.writable&&this.readable&&this.sign()}.bind(this))}i.inherits(Ge,n),Ge.prototype.sign=function(){try{var e=Ke({header:this.header,payload:this.payload.buffer,secret:this.secret.buffer,encoding:this.encoding});return this.emit("done",e),this.emit("data",e),this.emit("end"),this.readable=!1,e}catch(e){this.readable=!1,this.emit("error",e),this.emit("close")}},Ge.sign=Ke;var ze=Ge,Qe=ne.Buffer,Ye=/^[a-zA-Z0-9\-_]+?\.[a-zA-Z0-9\-_]+?\.([a-zA-Z0-9\-_]+)?$/;function Je(e){if(function(e){return"[object Object]"===Object.prototype.toString.call(e)}(e))return e;try{return JSON.parse(e)}catch(e){return}}function Xe(e){var t=e.split(".",1)[0];return Je(Qe.from(t,"base64").toString("binary"))}function We(e){return e.split(".")[2]}function Ze(e){return Ye.test(e)&&!!Xe(e)}function et(e,t,r){if(!t){var n=new Error("Missing algorithm parameter for jws.verify");throw n.code="MISSING_ALGORITHM",n}var i=We(e=$e(e)),o=function(e){return e.split(".",2).join(".")}(e);return Me(t).verify(o,i,r)}function tt(e,t){if(t=t||{},!Ze(e=$e(e)))return null;var r=Xe(e);if(!r)return null;var n=function(e,t){t=t||"utf8";var r=e.split(".")[1];return Qe.from(r,"base64").toString(t)}(e);return("JWT"===r.typ||t.json)&&(n=JSON.parse(n,t.encoding)),{header:r,payload:n,signature:We(e)}}function rt(e){var t=(e=e||{}).secret||e.publicKey||e.key,r=new se(t);this.readable=!0,this.algorithm=e.algorithm,this.encoding=e.encoding,this.secret=this.publicKey=this.key=r,this.signature=new se(e.signature),this.secret.once("close",function(){!this.signature.writable&&this.readable&&this.verify()}.bind(this)),this.signature.once("close",function(){!this.secret.writable&&this.readable&&this.verify()}.bind(this))}i.inherits(rt,n),rt.prototype.verify=function(){try{var e=et(this.signature.buffer,this.algorithm,this.key.buffer),t=tt(this.signature.buffer,this.encoding);return this.emit("done",e,t),this.emit("data",e),this.emit("end"),this.readable=!1,e}catch(e){this.readable=!1,this.emit("error",e),this.emit("close")}},rt.decode=tt,rt.isValid=Ze,rt.verify=et;var nt=rt,it={ALGORITHMS:["HS256","HS384","HS512","RS256","RS384","RS512","PS256","PS384","PS512","ES256","ES384","ES512"],sign:ze.sign,verify:nt.verify,decode:nt.decode,isValid:nt.isValid,createSign:function(e){return new ze(e)},createVerify:function(e){return new nt(e)}},ot=function(e,t){t=t||{};var r=it.decode(e,t);if(!r)return null;var n=r.payload;if("string"==typeof n)try{var i=JSON.parse(n);null!==i&&"object"==typeof i&&(n=i)}catch(e){}return!0===t.complete?{header:r.header,payload:n,signature:r.signature}:n},st=function(e,t){Error.call(this,e),Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor),this.name="JsonWebTokenError",this.message=e,t&&(this.inner=t)};(st.prototype=Object.create(Error.prototype)).constructor=st;var at=st,ct=function(e,t){at.call(this,e),this.name="NotBeforeError",this.date=t};(ct.prototype=Object.create(at.prototype)).constructor=ct;var ut=ct,dt=function(e,t){at.call(this,e),this.name="TokenExpiredError",this.expiredAt=t};(dt.prototype=Object.create(at.prototype)).constructor=dt;var lt=dt,pt=1e3,ft=60*pt,ht=60*ft,mt=24*ht,gt=function(e,t){t=t||{};var r=typeof e;if("string"===r&&e.length>0)return function(e){if((e=String(e)).length>100)return;var t=/^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(e);if(!t)return;var r=parseFloat(t[1]);switch((t[2]||"ms").toLowerCase()){case"years":case"year":case"yrs":case"yr":case"y":return 315576e5*r;case"weeks":case"week":case"w":return 6048e5*r;case"days":case"day":case"d":return r*mt;case"hours":case"hour":case"hrs":case"hr":case"h":return r*ht;case"minutes":case"minute":case"mins":case"min":case"m":return r*ft;case"seconds":case"second":case"secs":case"sec":case"s":return r*pt;case"milliseconds":case"millisecond":case"msecs":case"msec":case"ms":return r;default:return}}(e);if("number"===r&&isFinite(e))return t.long?function(e){var t=Math.abs(e);if(t>=mt)return yt(e,t,mt,"day");if(t>=ht)return yt(e,t,ht,"hour");if(t>=ft)return yt(e,t,ft,"minute");if(t>=pt)return yt(e,t,pt,"second");return e+" ms"}(e):function(e){var t=Math.abs(e);if(t>=mt)return Math.round(e/mt)+"d";if(t>=ht)return Math.round(e/ht)+"h";if(t>=ft)return Math.round(e/ft)+"m";if(t>=pt)return Math.round(e/pt)+"s";return e+"ms"}(e);throw new Error("val is not a non-empty string or a valid number. val="+JSON.stringify(e))};function yt(e,t,r,n){var i=t>=1.5*r;return Math.round(e/r)+" "+n+(i?"s":"")}var wt=function(e,t){var r=t||Math.floor(Date.now()/1e3);if("string"==typeof e){var n=gt(e);if(void 0===n)return;return Math.floor(r+n/1e3)}return"number"==typeof e?r+e:void 0},vt=re((function(e,t){var r;t=e.exports=G,r="object"==typeof process&&process.env&&process.env.NODE_DEBUG&&/\bsemver\b/i.test(process.env.NODE_DEBUG)?function(){var e=Array.prototype.slice.call(arguments,0);e.unshift("SEMVER"),console.log.apply(console,e)}:function(){},t.SEMVER_SPEC_VERSION="2.0.0";var n=Number.MAX_SAFE_INTEGER||9007199254740991,i=t.re=[],o=t.src=[],s=0,a=s++;o[a]="0|[1-9]\\d*";var c=s++;o[c]="[0-9]+";var u=s++;o[u]="\\d*[a-zA-Z-][a-zA-Z0-9-]*";var d=s++;o[d]="("+o[a]+")\\.("+o[a]+")\\.("+o[a]+")";var l=s++;o[l]="("+o[c]+")\\.("+o[c]+")\\.("+o[c]+")";var p=s++;o[p]="(?:"+o[a]+"|"+o[u]+")";var f=s++;o[f]="(?:"+o[c]+"|"+o[u]+")";var h=s++;o[h]="(?:-("+o[p]+"(?:\\."+o[p]+")*))";var m=s++;o[m]="(?:-?("+o[f]+"(?:\\."+o[f]+")*))";var g=s++;o[g]="[0-9A-Za-z-]+";var y=s++;o[y]="(?:\\+("+o[g]+"(?:\\."+o[g]+")*))";var w=s++,v="v?"+o[d]+o[h]+"?"+o[y]+"?";o[w]="^"+v+"$";var _="[v=\\s]*"+o[l]+o[m]+"?"+o[y]+"?",b=s++;o[b]="^"+_+"$";var E=s++;o[E]="((?:<|>)?=?)";var C=s++;o[C]=o[c]+"|x|X|\\*";var T=s++;o[T]=o[a]+"|x|X|\\*";var A=s++;o[A]="[v=\\s]*("+o[T]+")(?:\\.("+o[T]+")(?:\\.("+o[T]+")(?:"+o[h]+")?"+o[y]+"?)?)?";var x=s++;o[x]="[v=\\s]*("+o[C]+")(?:\\.("+o[C]+")(?:\\.("+o[C]+")(?:"+o[m]+")?"+o[y]+"?)?)?";var S=s++;o[S]="^"+o[E]+"\\s*"+o[A]+"$";var I=s++;o[I]="^"+o[E]+"\\s*"+o[x]+"$";var O=s++;o[O]="(?:^|[^\\d])(\\d{1,16})(?:\\.(\\d{1,16}))?(?:\\.(\\d{1,16}))?(?:$|[^\\d])";var k=s++;o[k]="(?:~>?)";var j=s++;o[j]="(\\s*)"+o[k]+"\\s+",i[j]=new RegExp(o[j],"g");var R=s++;o[R]="^"+o[k]+o[A]+"$";var P=s++;o[P]="^"+o[k]+o[x]+"$";var D=s++;o[D]="(?:\\^)";var q=s++;o[q]="(\\s*)"+o[D]+"\\s+",i[q]=new RegExp(o[q],"g");var N=s++;o[N]="^"+o[D]+o[A]+"$";var L=s++;o[L]="^"+o[D]+o[x]+"$";var U=s++;o[U]="^"+o[E]+"\\s*("+_+")$|^$";var V=s++;o[V]="^"+o[E]+"\\s*("+v+")$|^$";var M=s++;o[M]="(\\s*)"+o[E]+"\\s*("+_+"|"+o[A]+")",i[M]=new RegExp(o[M],"g");var B=s++;o[B]="^\\s*("+o[A]+")\\s+-\\s+("+o[A]+")\\s*$";var $=s++;o[$]="^\\s*("+o[x]+")\\s+-\\s+("+o[x]+")\\s*$";var F=s++;o[F]="(<|>)?=?\\s*\\*";for(var H=0;H<35;H++)r(H,o[H]),i[H]||(i[H]=new RegExp(o[H]));function K(e,t){if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),e instanceof G)return e;if("string"!=typeof e)return null;if(e.length>256)return null;if(!(t.loose?i[b]:i[w]).test(e))return null;try{return new G(e,t)}catch(e){return null}}function G(e,t){if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),e instanceof G){if(e.loose===t.loose)return e;e=e.version}else if("string"!=typeof e)throw new TypeError("Invalid Version: "+e);if(e.length>256)throw new TypeError("version is longer than 256 characters");if(!(this instanceof G))return new G(e,t);r("SemVer",e,t),this.options=t,this.loose=!!t.loose;var o=e.trim().match(t.loose?i[b]:i[w]);if(!o)throw new TypeError("Invalid Version: "+e);if(this.raw=e,this.major=+o[1],this.minor=+o[2],this.patch=+o[3],this.major>n||this.major<0)throw new TypeError("Invalid major version");if(this.minor>n||this.minor<0)throw new TypeError("Invalid minor version");if(this.patch>n||this.patch<0)throw new TypeError("Invalid patch version");o[4]?this.prerelease=o[4].split(".").map((function(e){if(/^[0-9]+$/.test(e)){var t=+e;if(t>=0&&t<n)return t}return e})):this.prerelease=[],this.build=o[5]?o[5].split("."):[],this.format()}t.parse=K,t.valid=function(e,t){var r=K(e,t);return r?r.version:null},t.clean=function(e,t){var r=K(e.trim().replace(/^[=v]+/,""),t);return r?r.version:null},t.SemVer=G,G.prototype.format=function(){return this.version=this.major+"."+this.minor+"."+this.patch,this.prerelease.length&&(this.version+="-"+this.prerelease.join(".")),this.version},G.prototype.toString=function(){return this.version},G.prototype.compare=function(e){return r("SemVer.compare",this.version,this.options,e),e instanceof G||(e=new G(e,this.options)),this.compareMain(e)||this.comparePre(e)},G.prototype.compareMain=function(e){return e instanceof G||(e=new G(e,this.options)),Q(this.major,e.major)||Q(this.minor,e.minor)||Q(this.patch,e.patch)},G.prototype.comparePre=function(e){if(e instanceof G||(e=new G(e,this.options)),this.prerelease.length&&!e.prerelease.length)return-1;if(!this.prerelease.length&&e.prerelease.length)return 1;if(!this.prerelease.length&&!e.prerelease.length)return 0;var t=0;do{var n=this.prerelease[t],i=e.prerelease[t];if(r("prerelease compare",t,n,i),void 0===n&&void 0===i)return 0;if(void 0===i)return 1;if(void 0===n)return-1;if(n!==i)return Q(n,i)}while(++t)},G.prototype.inc=function(e,t){switch(e){case"premajor":this.prerelease.length=0,this.patch=0,this.minor=0,this.major++,this.inc("pre",t);break;case"preminor":this.prerelease.length=0,this.patch=0,this.minor++,this.inc("pre",t);break;case"prepatch":this.prerelease.length=0,this.inc("patch",t),this.inc("pre",t);break;case"prerelease":0===this.prerelease.length&&this.inc("patch",t),this.inc("pre",t);break;case"major":0===this.minor&&0===this.patch&&0!==this.prerelease.length||this.major++,this.minor=0,this.patch=0,this.prerelease=[];break;case"minor":0===this.patch&&0!==this.prerelease.length||this.minor++,this.patch=0,this.prerelease=[];break;case"patch":0===this.prerelease.length&&this.patch++,this.prerelease=[];break;case"pre":if(0===this.prerelease.length)this.prerelease=[0];else{for(var r=this.prerelease.length;--r>=0;)"number"==typeof this.prerelease[r]&&(this.prerelease[r]++,r=-2);-1===r&&this.prerelease.push(0)}t&&(this.prerelease[0]===t?isNaN(this.prerelease[1])&&(this.prerelease=[t,0]):this.prerelease=[t,0]);break;default:throw new Error("invalid increment argument: "+e)}return this.format(),this.raw=this.version,this},t.inc=function(e,t,r,n){"string"==typeof r&&(n=r,r=void 0);try{return new G(e,r).inc(t,n).version}catch(e){return null}},t.diff=function(e,t){if(W(e,t))return null;var r=K(e),n=K(t),i="";if(r.prerelease.length||n.prerelease.length){i="pre";var o="prerelease"}for(var s in r)if(("major"===s||"minor"===s||"patch"===s)&&r[s]!==n[s])return i+s;return o},t.compareIdentifiers=Q;var z=/^[0-9]+$/;function Q(e,t){var r=z.test(e),n=z.test(t);return r&&n&&(e=+e,t=+t),e===t?0:r&&!n?-1:n&&!r?1:e<t?-1:1}function Y(e,t,r){return new G(e,r).compare(new G(t,r))}function J(e,t,r){return Y(e,t,r)>0}function X(e,t,r){return Y(e,t,r)<0}function W(e,t,r){return 0===Y(e,t,r)}function Z(e,t,r){return 0!==Y(e,t,r)}function ee(e,t,r){return Y(e,t,r)>=0}function te(e,t,r){return Y(e,t,r)<=0}function re(e,t,r,n){switch(t){case"===":return"object"==typeof e&&(e=e.version),"object"==typeof r&&(r=r.version),e===r;case"!==":return"object"==typeof e&&(e=e.version),"object"==typeof r&&(r=r.version),e!==r;case"":case"=":case"==":return W(e,r,n);case"!=":return Z(e,r,n);case">":return J(e,r,n);case">=":return ee(e,r,n);case"<":return X(e,r,n);case"<=":return te(e,r,n);default:throw new TypeError("Invalid operator: "+t)}}function ne(e,t){if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),e instanceof ne){if(e.loose===!!t.loose)return e;e=e.value}if(!(this instanceof ne))return new ne(e,t);r("comparator",e,t),this.options=t,this.loose=!!t.loose,this.parse(e),this.semver===ie?this.value="":this.value=this.operator+this.semver.version,r("comp",this)}t.rcompareIdentifiers=function(e,t){return Q(t,e)},t.major=function(e,t){return new G(e,t).major},t.minor=function(e,t){return new G(e,t).minor},t.patch=function(e,t){return new G(e,t).patch},t.compare=Y,t.compareLoose=function(e,t){return Y(e,t,!0)},t.rcompare=function(e,t,r){return Y(t,e,r)},t.sort=function(e,r){return e.sort((function(e,n){return t.compare(e,n,r)}))},t.rsort=function(e,r){return e.sort((function(e,n){return t.rcompare(e,n,r)}))},t.gt=J,t.lt=X,t.eq=W,t.neq=Z,t.gte=ee,t.lte=te,t.cmp=re,t.Comparator=ne;var ie={};function oe(e,t){if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),e instanceof oe)return e.loose===!!t.loose&&e.includePrerelease===!!t.includePrerelease?e:new oe(e.raw,t);if(e instanceof ne)return new oe(e.value,t);if(!(this instanceof oe))return new oe(e,t);if(this.options=t,this.loose=!!t.loose,this.includePrerelease=!!t.includePrerelease,this.raw=e,this.set=e.split(/\s*\|\|\s*/).map((function(e){return this.parseRange(e.trim())}),this).filter((function(e){return e.length})),!this.set.length)throw new TypeError("Invalid SemVer Range: "+e);this.format()}function se(e){return!e||"x"===e.toLowerCase()||"*"===e}function ae(e,t,r,n,i,o,s,a,c,u,d,l,p){return((t=se(r)?"":se(n)?">="+r+".0.0":se(i)?">="+r+"."+n+".0":">="+t)+" "+(a=se(c)?"":se(u)?"<"+(+c+1)+".0.0":se(d)?"<"+c+"."+(+u+1)+".0":l?"<="+c+"."+u+"."+d+"-"+l:"<="+a)).trim()}function ce(e,t,n){for(var i=0;i<e.length;i++)if(!e[i].test(t))return!1;if(t.prerelease.length&&!n.includePrerelease){for(i=0;i<e.length;i++)if(r(e[i].semver),e[i].semver!==ie&&e[i].semver.prerelease.length>0){var o=e[i].semver;if(o.major===t.major&&o.minor===t.minor&&o.patch===t.patch)return!0}return!1}return!0}function ue(e,t,r){try{t=new oe(t,r)}catch(e){return!1}return t.test(e)}function de(e,t,r,n){var i,o,s,a,c;switch(e=new G(e,n),t=new oe(t,n),r){case">":i=J,o=te,s=X,a=">",c=">=";break;case"<":i=X,o=ee,s=J,a="<",c="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(ue(e,t,n))return!1;for(var u=0;u<t.set.length;++u){var d=t.set[u],l=null,p=null;if(d.forEach((function(e){e.semver===ie&&(e=new ne(">=0.0.0")),l=l||e,p=p||e,i(e.semver,l.semver,n)?l=e:s(e.semver,p.semver,n)&&(p=e)})),l.operator===a||l.operator===c)return!1;if((!p.operator||p.operator===a)&&o(e,p.semver))return!1;if(p.operator===c&&s(e,p.semver))return!1}return!0}ne.prototype.parse=function(e){var t=this.options.loose?i[U]:i[V],r=e.match(t);if(!r)throw new TypeError("Invalid comparator: "+e);this.operator=r[1],"="===this.operator&&(this.operator=""),r[2]?this.semver=new G(r[2],this.options.loose):this.semver=ie},ne.prototype.toString=function(){return this.value},ne.prototype.test=function(e){return r("Comparator.test",e,this.options.loose),this.semver===ie||("string"==typeof e&&(e=new G(e,this.options)),re(e,this.operator,this.semver,this.options))},ne.prototype.intersects=function(e,t){if(!(e instanceof ne))throw new TypeError("a Comparator is required");var r;if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),""===this.operator)return r=new oe(e.value,t),ue(this.value,r,t);if(""===e.operator)return r=new oe(this.value,t),ue(e.semver,r,t);var n=!(">="!==this.operator&&">"!==this.operator||">="!==e.operator&&">"!==e.operator),i=!("<="!==this.operator&&"<"!==this.operator||"<="!==e.operator&&"<"!==e.operator),o=this.semver.version===e.semver.version,s=!(">="!==this.operator&&"<="!==this.operator||">="!==e.operator&&"<="!==e.operator),a=re(this.semver,"<",e.semver,t)&&(">="===this.operator||">"===this.operator)&&("<="===e.operator||"<"===e.operator),c=re(this.semver,">",e.semver,t)&&("<="===this.operator||"<"===this.operator)&&(">="===e.operator||">"===e.operator);return n||i||o&&s||a||c},t.Range=oe,oe.prototype.format=function(){return this.range=this.set.map((function(e){return e.join(" ").trim()})).join("||").trim(),this.range},oe.prototype.toString=function(){return this.range},oe.prototype.parseRange=function(e){var t=this.options.loose;e=e.trim();var n=t?i[$]:i[B];e=e.replace(n,ae),r("hyphen replace",e),e=e.replace(i[M],"$1$2$3"),r("comparator trim",e,i[M]),e=(e=(e=e.replace(i[j],"$1~")).replace(i[q],"$1^")).split(/\s+/).join(" ");var o=t?i[U]:i[V],s=e.split(" ").map((function(e){return function(e,t){return r("comp",e,t),e=function(e,t){return e.trim().split(/\s+/).map((function(e){return function(e,t){r("caret",e,t);var n=t.loose?i[L]:i[N];return e.replace(n,(function(t,n,i,o,s){var a;return r("caret",e,t,n,i,o,s),se(n)?a="":se(i)?a=">="+n+".0.0 <"+(+n+1)+".0.0":se(o)?a="0"===n?">="+n+"."+i+".0 <"+n+"."+(+i+1)+".0":">="+n+"."+i+".0 <"+(+n+1)+".0.0":s?(r("replaceCaret pr",s),a="0"===n?"0"===i?">="+n+"."+i+"."+o+"-"+s+" <"+n+"."+i+"."+(+o+1):">="+n+"."+i+"."+o+"-"+s+" <"+n+"."+(+i+1)+".0":">="+n+"."+i+"."+o+"-"+s+" <"+(+n+1)+".0.0"):(r("no pr"),a="0"===n?"0"===i?">="+n+"."+i+"."+o+" <"+n+"."+i+"."+(+o+1):">="+n+"."+i+"."+o+" <"+n+"."+(+i+1)+".0":">="+n+"."+i+"."+o+" <"+(+n+1)+".0.0"),r("caret return",a),a}))}(e,t)})).join(" ")}(e,t),r("caret",e),e=function(e,t){return e.trim().split(/\s+/).map((function(e){return function(e,t){var n=t.loose?i[P]:i[R];return e.replace(n,(function(t,n,i,o,s){var a;return r("tilde",e,t,n,i,o,s),se(n)?a="":se(i)?a=">="+n+".0.0 <"+(+n+1)+".0.0":se(o)?a=">="+n+"."+i+".0 <"+n+"."+(+i+1)+".0":s?(r("replaceTilde pr",s),a=">="+n+"."+i+"."+o+"-"+s+" <"+n+"."+(+i+1)+".0"):a=">="+n+"."+i+"."+o+" <"+n+"."+(+i+1)+".0",r("tilde return",a),a}))}(e,t)})).join(" ")}(e,t),r("tildes",e),e=function(e,t){return r("replaceXRanges",e,t),e.split(/\s+/).map((function(e){return function(e,t){e=e.trim();var n=t.loose?i[I]:i[S];return e.replace(n,(function(t,n,i,o,s,a){r("xRange",e,t,n,i,o,s,a);var c=se(i),u=c||se(o),d=u||se(s);return"="===n&&d&&(n=""),c?t=">"===n||"<"===n?"<0.0.0":"*":n&&d?(u&&(o=0),s=0,">"===n?(n=">=",u?(i=+i+1,o=0,s=0):(o=+o+1,s=0)):"<="===n&&(n="<",u?i=+i+1:o=+o+1),t=n+i+"."+o+"."+s):u?t=">="+i+".0.0 <"+(+i+1)+".0.0":d&&(t=">="+i+"."+o+".0 <"+i+"."+(+o+1)+".0"),r("xRange return",t),t}))}(e,t)})).join(" ")}(e,t),r("xrange",e),e=function(e,t){return r("replaceStars",e,t),e.trim().replace(i[F],"")}(e,t),r("stars",e),e}(e,this.options)}),this).join(" ").split(/\s+/);return this.options.loose&&(s=s.filter((function(e){return!!e.match(o)}))),s=s.map((function(e){return new ne(e,this.options)}),this)},oe.prototype.intersects=function(e,t){if(!(e instanceof oe))throw new TypeError("a Range is required");return this.set.some((function(r){return r.every((function(r){return e.set.some((function(e){return e.every((function(e){return r.intersects(e,t)}))}))}))}))},t.toComparators=function(e,t){return new oe(e,t).set.map((function(e){return e.map((function(e){return e.value})).join(" ").trim().split(" ")}))},oe.prototype.test=function(e){if(!e)return!1;"string"==typeof e&&(e=new G(e,this.options));for(var t=0;t<this.set.length;t++)if(ce(this.set[t],e,this.options))return!0;return!1},t.satisfies=ue,t.maxSatisfying=function(e,t,r){var n=null,i=null;try{var o=new oe(t,r)}catch(e){return null}return e.forEach((function(e){o.test(e)&&(n&&-1!==i.compare(e)||(i=new G(n=e,r)))})),n},t.minSatisfying=function(e,t,r){var n=null,i=null;try{var o=new oe(t,r)}catch(e){return null}return e.forEach((function(e){o.test(e)&&(n&&1!==i.compare(e)||(i=new G(n=e,r)))})),n},t.minVersion=function(e,t){e=new oe(e,t);var r=new G("0.0.0");if(e.test(r))return r;if(r=new G("0.0.0-0"),e.test(r))return r;r=null;for(var n=0;n<e.set.length;++n){e.set[n].forEach((function(e){var t=new G(e.semver.version);switch(e.operator){case">":0===t.prerelease.length?t.patch++:t.prerelease.push(0),t.raw=t.format();case"":case">=":r&&!J(r,t)||(r=t);break;case"<":case"<=":break;default:throw new Error("Unexpected operation: "+e.operator)}}))}if(r&&e.test(r))return r;return null},t.validRange=function(e,t){try{return new oe(e,t).range||"*"}catch(e){return null}},t.ltr=function(e,t,r){return de(e,t,"<",r)},t.gtr=function(e,t,r){return de(e,t,">",r)},t.outside=de,t.prerelease=function(e,t){var r=K(e,t);return r&&r.prerelease.length?r.prerelease:null},t.intersects=function(e,t,r){return e=new oe(e,r),t=new oe(t,r),e.intersects(t)},t.coerce=function(e){if(e instanceof G)return e;if("string"!=typeof e)return null;var t=e.match(i[O]);if(null==t)return null;return K(t[1]+"."+(t[2]||"0")+"."+(t[3]||"0"))}})),_t=(vt.SEMVER_SPEC_VERSION,vt.re,vt.src,vt.parse,vt.valid,vt.clean,vt.SemVer,vt.inc,vt.diff,vt.compareIdentifiers,vt.rcompareIdentifiers,vt.major,vt.minor,vt.patch,vt.compare,vt.compareLoose,vt.rcompare,vt.sort,vt.rsort,vt.gt,vt.lt,vt.eq,vt.neq,vt.gte,vt.lte,vt.cmp,vt.Comparator,vt.Range,vt.toComparators,vt.satisfies,vt.maxSatisfying,vt.minSatisfying,vt.minVersion,vt.validRange,vt.ltr,vt.gtr,vt.outside,vt.prerelease,vt.intersects,vt.coerce,vt.satisfies(process.version,"^6.12.0 || >=8.0.0")),bt=["RS256","RS384","RS512","ES256","ES384","ES512"],Et=["RS256","RS384","RS512"],Ct=["HS256","HS384","HS512"];_t&&(bt.splice(3,0,"PS256","PS384","PS512"),Et.splice(3,0,"PS256","PS384","PS512"));var Tt=/^\s+|\s+$/g,At=/^[-+]0x[0-9a-f]+$/i,xt=/^0b[01]+$/i,St=/^0o[0-7]+$/i,It=/^(?:0|[1-9]\d*)$/,Ot=parseInt;function kt(e){return e!=e}function jt(e,t){return function(e,t){for(var r=-1,n=e?e.length:0,i=Array(n);++r<n;)i[r]=t(e[r],r,e);return i}(t,(function(t){return e[t]}))}var Rt,Pt,Dt=Object.prototype,qt=Dt.hasOwnProperty,Nt=Dt.toString,Lt=Dt.propertyIsEnumerable,Ut=(Rt=Object.keys,Pt=Object,function(e){return Rt(Pt(e))}),Vt=Math.max;function Mt(e,t){var r=Ft(e)||function(e){return function(e){return Gt(e)&&Ht(e)}(e)&&qt.call(e,"callee")&&(!Lt.call(e,"callee")||"[object Arguments]"==Nt.call(e))}(e)?function(e,t){for(var r=-1,n=Array(e);++r<e;)n[r]=t(r);return n}(e.length,String):[],n=r.length,i=!!n;for(var o in e)!t&&!qt.call(e,o)||i&&("length"==o||$t(o,n))||r.push(o);return r}function Bt(e){if(r=(t=e)&&t.constructor,n="function"==typeof r&&r.prototype||Dt,t!==n)return Ut(e);var t,r,n,i=[];for(var o in Object(e))qt.call(e,o)&&"constructor"!=o&&i.push(o);return i}function $t(e,t){return!!(t=null==t?9007199254740991:t)&&("number"==typeof e||It.test(e))&&e>-1&&e%1==0&&e<t}var Ft=Array.isArray;function Ht(e){return null!=e&&function(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=9007199254740991}(e.length)&&!function(e){var t=Kt(e)?Nt.call(e):"";return"[object Function]"==t||"[object GeneratorFunction]"==t}(e)}function Kt(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function Gt(e){return!!e&&"object"==typeof e}var zt=function(e,t,r,n){var i;e=Ht(e)?e:(i=e)?jt(i,function(e){return Ht(e)?Mt(e):Bt(e)}(i)):[],r=r&&!n?function(e){var t=function(e){if(!e)return 0===e?e:0;if((e=function(e){if("number"==typeof e)return e;if(function(e){return"symbol"==typeof e||Gt(e)&&"[object Symbol]"==Nt.call(e)}(e))return NaN;if(Kt(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=Kt(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(Tt,"");var r=xt.test(e);return r||St.test(e)?Ot(e.slice(2),r?2:8):At.test(e)?NaN:+e}(e))===1/0||e===-1/0){return 17976931348623157e292*(e<0?-1:1)}return e==e?e:0}(e),r=t%1;return t==t?r?t-r:t:0}(r):0;var o=e.length;return r<0&&(r=Vt(o+r,0)),function(e){return"string"==typeof e||!Ft(e)&&Gt(e)&&"[object String]"==Nt.call(e)}(e)?r<=o&&e.indexOf(t,r)>-1:!!o&&function(e,t,r){if(t!=t)return function(e,t,r,n){for(var i=e.length,o=r+(n?1:-1);n?o--:++o<i;)if(t(e[o],o,e))return o;return-1}(e,kt,r);for(var n=r-1,i=e.length;++n<i;)if(e[n]===t)return n;return-1}(e,t,r)>-1},Qt=Object.prototype.toString;var Yt=function(e){return!0===e||!1===e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Boolean]"==Qt.call(e)},Jt=/^\s+|\s+$/g,Xt=/^[-+]0x[0-9a-f]+$/i,Wt=/^0b[01]+$/i,Zt=/^0o[0-7]+$/i,er=parseInt,tr=Object.prototype.toString;function rr(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}var nr=function(e){return"number"==typeof e&&e==function(e){var t=function(e){if(!e)return 0===e?e:0;if((e=function(e){if("number"==typeof e)return e;if(function(e){return"symbol"==typeof e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Symbol]"==tr.call(e)}(e))return NaN;if(rr(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=rr(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(Jt,"");var r=Wt.test(e);return r||Zt.test(e)?er(e.slice(2),r?2:8):Xt.test(e)?NaN:+e}(e))===1/0||e===-1/0){return 17976931348623157e292*(e<0?-1:1)}return e==e?e:0}(e),r=t%1;return t==t?r?t-r:t:0}(e)},ir=Object.prototype.toString;var or=function(e){return"number"==typeof e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Number]"==ir.call(e)};var sr=Function.prototype,ar=Object.prototype,cr=sr.toString,ur=ar.hasOwnProperty,dr=cr.call(Object),lr=ar.toString,pr=function(e,t){return function(r){return e(t(r))}}(Object.getPrototypeOf,Object);var fr=function(e){if(!function(e){return!!e&&"object"==typeof e}(e)||"[object Object]"!=lr.call(e)||function(e){var t=!1;if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}(e))return!1;var t=pr(e);if(null===t)return!0;var r=ur.call(t,"constructor")&&t.constructor;return"function"==typeof r&&r instanceof r&&cr.call(r)==dr},hr=Object.prototype.toString,mr=Array.isArray;var gr=function(e){return"string"==typeof e||!mr(e)&&function(e){return!!e&&"object"==typeof e}(e)&&"[object String]"==hr.call(e)},yr=/^\s+|\s+$/g,wr=/^[-+]0x[0-9a-f]+$/i,vr=/^0b[01]+$/i,_r=/^0o[0-7]+$/i,br=parseInt,Er=Object.prototype.toString;function Cr(e,t){var r;if("function"!=typeof t)throw new TypeError("Expected a function");return e=function(e){var t=function(e){if(!e)return 0===e?e:0;if((e=function(e){if("number"==typeof e)return e;if(function(e){return"symbol"==typeof e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Symbol]"==Er.call(e)}(e))return NaN;if(Tr(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=Tr(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(yr,"");var r=vr.test(e);return r||_r.test(e)?br(e.slice(2),r?2:8):wr.test(e)?NaN:+e}(e))===1/0||e===-1/0){return 17976931348623157e292*(e<0?-1:1)}return e==e?e:0}(e),r=t%1;return t==t?r?t-r:t:0}(e),function(){return--e>0&&(r=t.apply(this,arguments)),e<=1&&(t=void 0),r}}function Tr(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}var Ar=function(e){return Cr(2,e)},xr=["RS256","RS384","RS512","ES256","ES384","ES512","HS256","HS384","HS512","none"];_t&&xr.splice(3,0,"PS256","PS384","PS512");var Sr={expiresIn:{isValid:function(e){return nr(e)||gr(e)&&e},message:'"expiresIn" should be a number of seconds or string representing a timespan'},notBefore:{isValid:function(e){return nr(e)||gr(e)&&e},message:'"notBefore" should be a number of seconds or string representing a timespan'},audience:{isValid:function(e){return gr(e)||Array.isArray(e)},message:'"audience" must be a string or array'},algorithm:{isValid:zt.bind(null,xr),message:'"algorithm" must be a valid string enum value'},header:{isValid:fr,message:'"header" must be an object'},encoding:{isValid:gr,message:'"encoding" must be a string'},issuer:{isValid:gr,message:'"issuer" must be a string'},subject:{isValid:gr,message:'"subject" must be a string'},jwtid:{isValid:gr,message:'"jwtid" must be a string'},noTimestamp:{isValid:Yt,message:'"noTimestamp" must be a boolean'},keyid:{isValid:gr,message:'"keyid" must be a string'},mutatePayload:{isValid:Yt,message:'"mutatePayload" must be a boolean'}},Ir={iat:{isValid:or,message:'"iat" should be a number of seconds'},exp:{isValid:or,message:'"exp" should be a number of seconds'},nbf:{isValid:or,message:'"nbf" should be a number of seconds'}};function Or(e,t,r,n){if(!fr(r))throw new Error('Expected "'+n+'" to be a plain object.');Object.keys(r).forEach((function(i){var o=e[i];if(o){if(!o.isValid(r[i]))throw new Error(o.message)}else if(!t)throw new Error('"'+i+'" is not allowed in "'+n+'"')}))}var kr={audience:"aud",issuer:"iss",subject:"sub",jwtid:"jti"},jr=["expiresIn","notBefore","noTimestamp","audience","issuer","subject","jwtid"],Rr=function(e,t,r,n){var i;if("function"!=typeof r||n||(n=r,r={}),r||(r={}),r=Object.assign({},r),i=n||function(e,t){if(e)throw e;return t},r.clockTimestamp&&"number"!=typeof r.clockTimestamp)return i(new at("clockTimestamp must be a number"));if(void 0!==r.nonce&&("string"!=typeof r.nonce||""===r.nonce.trim()))return i(new at("nonce must be a non-empty string"));var o=r.clockTimestamp||Math.floor(Date.now()/1e3);if(!e)return i(new at("jwt must be provided"));if("string"!=typeof e)return i(new at("jwt must be a string"));var s,a=e.split(".");if(3!==a.length)return i(new at("jwt malformed"));try{s=ot(e,{complete:!0})}catch(e){return i(e)}if(!s)return i(new at("invalid token"));var c,u=s.header;if("function"==typeof t){if(!n)return i(new at("verify must be called asynchronous if secret or public key is provided as a callback"));c=t}else c=function(e,r){return r(null,t)};return c(u,(function(t,n){if(t)return i(new at("error in secret or public key callback: "+t.message));var c,d=""!==a[2].trim();if(!d&&n)return i(new at("jwt signature is required"));if(d&&!n)return i(new at("secret or public key must be provided"));if(d||r.algorithms||(r.algorithms=["none"]),r.algorithms||(r.algorithms=~n.toString().indexOf("BEGIN CERTIFICATE")||~n.toString().indexOf("BEGIN PUBLIC KEY")?bt:~n.toString().indexOf("BEGIN RSA PUBLIC KEY")?Et:Ct),!~r.algorithms.indexOf(s.header.alg))return i(new at("invalid algorithm"));try{c=it.verify(e,s.header.alg,n)}catch(e){return i(e)}if(!c)return i(new at("invalid signature"));var l=s.payload;if(void 0!==l.nbf&&!r.ignoreNotBefore){if("number"!=typeof l.nbf)return i(new at("invalid nbf value"));if(l.nbf>o+(r.clockTolerance||0))return i(new ut("jwt not active",new Date(1e3*l.nbf)))}if(void 0!==l.exp&&!r.ignoreExpiration){if("number"!=typeof l.exp)return i(new at("invalid exp value"));if(o>=l.exp+(r.clockTolerance||0))return i(new lt("jwt expired",new Date(1e3*l.exp)))}if(r.audience){var p=Array.isArray(r.audience)?r.audience:[r.audience];if(!(Array.isArray(l.aud)?l.aud:[l.aud]).some((function(e){return p.some((function(t){return t instanceof RegExp?t.test(e):t===e}))})))return i(new at("jwt audience invalid. expected: "+p.join(" or ")))}if(r.issuer&&("string"==typeof r.issuer&&l.iss!==r.issuer||Array.isArray(r.issuer)&&-1===r.issuer.indexOf(l.iss)))return i(new at("jwt issuer invalid. expected: "+r.issuer));if(r.subject&&l.sub!==r.subject)return i(new at("jwt subject invalid. expected: "+r.subject));if(r.jwtid&&l.jti!==r.jwtid)return i(new at("jwt jwtid invalid. expected: "+r.jwtid));if(r.nonce&&l.nonce!==r.nonce)return i(new at("jwt nonce invalid. expected: "+r.nonce));if(r.maxAge){if("number"!=typeof l.iat)return i(new at("iat required when maxAge is specified"));var f=wt(r.maxAge,l.iat);if(void 0===f)return i(new at('"maxAge" should be a number of seconds or string representing a timespan eg: "1d", "20h", 60'));if(o>=f+(r.clockTolerance||0))return i(new lt("maxAge exceeded",new Date(1e3*f)))}if(!0===r.complete){var h=s.signature;return i(null,{header:u,payload:l,signature:h})}return i(null,l)}))},Pr=function(e,t,r,n){"function"==typeof r?(n=r,r={}):r=r||{};var i="object"==typeof e&&!Buffer.isBuffer(e),o=Object.assign({alg:r.algorithm||"HS256",typ:i?"JWT":void 0,kid:r.keyid},r.header);function s(e){if(n)return n(e);throw e}if(!t&&"none"!==r.algorithm)return s(new Error("secretOrPrivateKey must have a value"));if(void 0===e)return s(new Error("payload is required"));if(i){try{!function(e){Or(Ir,!0,e,"payload")}(e)}catch(e){return s(e)}r.mutatePayload||(e=Object.assign({},e))}else{var a=jr.filter((function(e){return void 0!==r[e]}));if(a.length>0)return s(new Error("invalid "+a.join(",")+" option for "+typeof e+" payload"))}if(void 0!==e.exp&&void 0!==r.expiresIn)return s(new Error('Bad "options.expiresIn" option the payload already has an "exp" property.'));if(void 0!==e.nbf&&void 0!==r.notBefore)return s(new Error('Bad "options.notBefore" option the payload already has an "nbf" property.'));try{!function(e){Or(Sr,!1,e,"options")}(r)}catch(e){return s(e)}var c=e.iat||Math.floor(Date.now()/1e3);if(r.noTimestamp?delete e.iat:i&&(e.iat=c),void 0!==r.notBefore){try{e.nbf=wt(r.notBefore,c)}catch(e){return s(e)}if(void 0===e.nbf)return s(new Error('"notBefore" should be a number of seconds or string representing a timespan eg: "1d", "20h", 60'))}if(void 0!==r.expiresIn&&"object"==typeof e){try{e.exp=wt(r.expiresIn,c)}catch(e){return s(e)}if(void 0===e.exp)return s(new Error('"expiresIn" should be a number of seconds or string representing a timespan eg: "1d", "20h", 60'))}Object.keys(kr).forEach((function(t){var n=kr[t];if(void 0!==r[t]){if(void 0!==e[n])return s(new Error('Bad "options.'+t+'" option. The payload already has an "'+n+'" property.'));e[n]=r[t]}}));var u=r.encoding||"utf8";if("function"!=typeof n)return it.sign({header:o,payload:e,secret:t,encoding:u});n=n&&Ar(n),it.createSign({header:o,privateKey:t,payload:e,encoding:u}).once("error",n).once("done",(function(e){n(null,e)}))};let Dr=[];class qr{constructor(e){this.options=Object.assign({baseUrl:"https://appleid.apple.com",timeout:1e4},e)}async _fetch(e,t){const{baseUrl:r}=this.options;return uniCloud.httpclient.request(r+e,t)}async verifyIdentityToken(e){const t=e.split(".")[0],{kid:r}=JSON.parse(Buffer.from(t,"base64").toString());if(!Dr.length)try{Dr=await this.getAuthKeys()}catch(e){return{code:10705,msg:e.message}}const n=this.getUsedKey(Dr,r);if(!Object.keys(n).length&&!this.fetched)try{Dr=await this.getAuthKeys()}catch(e){return{code:10705,msg:e.message}}let i=null;try{i=Rr(e,function(e,t){var r=Buffer.from(e,"base64"),n=Buffer.from(t,"base64"),i=r.toString("hex"),o=n.toString("hex");i=W(i),o=W(o);var s=i.length/2,a=o.length/2,c=ee(s),u=ee(a),d="30"+ee(s+a+c.length/2+u.length/2+2)+"02"+c+i+"02"+u+o;return"-----BEGIN RSA PUBLIC KEY-----\n"+Buffer.from(d,"hex").toString("base64").match(/.{1,64}/g).join("\n")+"\n-----END RSA PUBLIC KEY-----\n"}(n.n,n.e),{algorithms:n.alg})}catch(e){return{code:10705,msg:e.message}}return{code:0,msg:i}}async getAuthKeys(){const{status:e,data:t}=await this._fetch("/auth/keys",{method:"GET",dataType:"json",timeout:this.options.timeout});if(200!==e)throw new Error("request https://appleid.apple.com/auth/keys fail");return t.keys}getUsedKey(e,t){let r={};for(let n=0;n<e.length;n++){const i=e[n];if(i.kid===t){r=i;break}}return r}}var Nr=function(e={}){return e.appId=e.appid,e.secret=e.appsecret,S(G,e)},Lr=function(e={}){return e.appId=e.appid,e.secret=e.appsecret,S(Q,e)},Ur=function(e={}){return e.appId=e.appid,S(X,e)},Vr=function(e={}){return S(qr,e)};function Mr(e=6){const t=["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 r="";for(let n=0;n<e;n++)r+=t[Math.floor(Math.random()*t.length)];return r}const Br=k.command;async function $r({uid:e,dcloudAppidList:t}={}){if(!e)return{code:N,messageValues:{param:this.t("user-id")}};if(!t||0===t.length||t.some(e=>void 0===e))return{code:N,messageValues:{param:this.t("dcloud-appid")}};const r=await j.doc(e).get(),n=r&&r.data&&r.data[0];if(!n)return{code:10002};const i=Object.keys(q).reduce((e,t)=>{const r=t,i=function(e,t){return t.split(".").reduce((e,t)=>e&&e[t],e)}(n,t);return i&&e.push({[r]:i}),e},[]);let o;const s={dcloud_appid:Br.in(t),_id:Br.neq(n._id)},a={dcloud_appid:Br.exists(!1),_id:Br.neq(n._id)};switch(i.length){case 0:return{code:10004};case 1:o=Br.or([Br.and([i[0],s]),Br.and([i[0],a])]);break;default:o=Br.or([Br.and([Br.or(i),s]),Br.and([Br.or(i),a])])}const c=await j.where(o).limit(1).get();return c&&c.data&&c.data[0]?{code:10005}:{code:0}}const Fr=uniCloud.database().command;const Hr=uniCloud.database();const Kr=uniCloud.database();const Gr=uniCloud.database();async function zr(e){const t=["apiKey","apiSecret"];for(let r=0,n=t.length;r<n;r++){const n=t[r];if(!e[n])throw new Error(this.t("config-param-requred",{param:"service.univerify."+n}))}if(!e.openid||!e.access_token)throw new Error(this.t("config-param-requred",{param:"openid, access_token"}));return function(e,t){const r={0:"",4e3:"缺失参数",4001:"apiKey不存在",4002:"sign校验不通过",4003:"appid不存在",4004:"应用未开通一键登录服务",4005:"应用开通的一键登录服务正在审核中",4006:"服务空间不在白名单中",4100:"账户余额不足",5e3:"获取手机号失败，请稍后重试(或其他未知错误)"};return{...e,msg:r[e.code]?"[getPhoneNumber] 获取手机号: "+r[e.code]:e.errMsg}}(await uniCloud.getPhoneNumber({provider:"univerify",...e}))}const Qr=uniCloud.database();const Yr=uniCloud.database();const Jr=uniCloud.database();const Xr=uniCloud.database().command;const Wr=uniCloud.database();const Zr=uniCloud.database();const en=uniCloud.database();const tn=uniCloud.database();const rn=uniCloud.database();const nn=uniCloud.database();const on=uniCloud.database();const sn=uniCloud.database().command;const an=uniCloud.database();var cn=Object.freeze({__proto__:null,getUserInfo:async function({uid:e,field:t}){if(!e)return{code:N,messageValues:{param:this.t("user-id")}};let r;if(t&&t.length){const n={};for(let e=0;e<t.length;e++)n[t[e]]=!0;r=await j.doc(e).field(n).get()}else r=await j.doc(e).get();return 0===r.data.length?{code:80301}:{code:0,msg:"",userInfo:r.data[0]}},getUserInfoByToken:async function(e){const t=this._verifyToken(e);return t.code||(delete t.iat,delete t.exp),t},resetPwd:async function({uid:e,password:t}){const{passwordHash:r,version:n}=this.encryptPwd(t),i={password:r,token:[]};return n&&(i.password_secret_version=n),C("upRes",await j.doc(e).update(i)),{code:0,msg:""}},setAvatar:async function(e){return await j.doc(e.uid).update({avatar:e.avatar}),{code:0,msg:""}},updatePwd:async function(e){const t=await j.doc(e.uid).get();if(t&&t.data&&t.data.length>0){if(0===this._checkPwd(t.data[0],e.oldPassword).code){const{passwordHash:r,version:n}=this.encryptPwd(e.newPassword),i={password:r,token:[]};n&&(i.password_secret_version=n);return C("upRes",await j.doc(t.data[0]._id).update(i)),{code:0,msg:""}}return{code:40202}}return{code:40201}},updateUser:async function(e){const t=e.uid;if(!t)return{code:N,messageValues:{param:this.t("user-id")}};delete e.uid;const{username:r,email:n}=e,{usernameToLowerCase:i,emailToLowerCase:o}=this._getConfig();let s=r&&r.trim(),a=n&&n.trim();return s&&(i&&(s=s.toLowerCase()),e.username=s),a&&(o&&(a=a.toLowerCase()),e.email=a),C("update -> upRes",await j.doc(t).update(e)),{code:0,msg:""}},banAccount:async function({uid:e}={}){return F.call(this,{uid:e,status:B})},unbanAccount:async function({uid:e}={}){return F.call(this,{uid:e,status:M})},closeAccount:async function({uid:e}={}){return F.call(this,{uid:e,status:$})},openAccount:async function({uid:e}={}){return F.call(this,{uid:e,status:M})},_getAlipayApi:function(){const e=this.context.PLATFORM,t=this._getConfig();if(!t.oauth||!t.oauth.alipay)throw new Error(this.t("config-param-require",{param:e+".alipay"}));return["appid","privateKey"].forEach(r=>{if(!t.oauth.alipay[r])throw new Error(this.t("config-param-require",{param:`${e}.alipay.${r}`}))}),Ur({...t.oauth.alipay})},_getValidInviteCode:async function({inviteCode:e}){let t,r=10;e?(r=1,t=e):t=Mr();let n=!1;try{for(;r>0&&!n;){r--;if(0===(await j.where({my_invite_code:t}).get()).data.length){n=!0;break}t=Mr()}t=Mr()}catch(e){}return n?{code:0,inviteCode:t}:e?{code:80401}:{code:80402}},_addUser:async function(e,{needPermission:t,autoSetDcloudAppid:r=!0}={}){const n=this._getConfig(),i={...e,dcloud_appid:r?[this.context.APPID]:[],register_date:Date.now(),register_ip:this.context.CLIENTIP},o=(await j.add(i)).id;let s;if(n.removePermissionAndRoleFromToken)s=await this.createToken({uid:o,needPermission:t});else{const t=e.role||[];let r;r=0===t.length||t.includes("admin")?[]:await this._getPermissionListByRoleList(t),s=await this.createToken({uid:o,role:t,permission:r})}const{token:a,tokenExpired:c}=s;return await j.doc(o).update({token:[a]}),{token:a,tokenExpired:c,uid:o,type:"register",userInfo:Object.assign({},i,{token:a})}},_loginExec:async function(e,t={}){if(e.status===B)return{code:10001};if(e.status===$)return{code:10006};const r=this._getConfig();let n=e.token||[];"string"==typeof n&&(n=[n]);const i=this._getExpiredToken(n);let o;if(n=n.filter(e=>-1===i.indexOf(e)),r.removePermissionAndRoleFromToken){const r=t.needPermission;o=await this.createToken({uid:e._id,needPermission:r})}else{const t=e.role||[];let r;r=0===t.length||t.includes("admin")?[]:await this._getPermissionListByRoleList(t),o=await this.createToken({uid:e._id,role:t,permission:r})}const{token:s,tokenExpired:a}=o;n.push(s),e.token=n;const c={last_login_date:Date.now(),last_login_ip:this.context.CLIENTIP,token:n,...t.extraData};await j.doc(e._id).update(c);const u=Object.assign({},e,c);return{code:0,msg:"",token:s,uid:u._id,username:u.username,type:"login",userInfo:u,tokenExpired:a}},_registerExec:async function(e,{needPermission:t,autoSetDcloudAppid:r=!0}={}){const{my_invite_code:n}=e;if(this._getConfig().autoSetInviteCode||n){const t=await this._getValidInviteCode({inviteCode:n});if(t.code)return t;e.my_invite_code=t.inviteCode}return{code:0,msg:"",...await this._addUser(e,{needPermission:t,autoSetDcloudAppid:r})}},_getWeixinApi:function({platform:e}={}){const t=this.context.PLATFORM,r=this._getConfig();if(!r.oauth||!r.oauth.weixin)throw new Error(this.t("config-param-require",{param:t+".weixin"}));return["appid","appsecret"].forEach(e=>{if(!r.oauth.weixin[e])throw new Error(this.t("config-param-require",{param:`${t}.weixin.${e}`}))}),Nr({...r.oauth.weixin})},_getQQApi:function(){const e=this.context.PLATFORM,t=this._getConfig();if(!t.oauth||!t.oauth.qq)throw new Error(this.t("config-param-require",{param:e+".qq"}));return["appid","appsecret"].forEach(r=>{if(!t.oauth.qq[r])throw new Error(this.t("config-param-require",{param:`${e}.qq.${r}`}))}),Lr({...t.oauth.qq})},_getMatchedUser:function(e,t){if(0===e.length)return{code:10002};let r;const n={},i={};for(let r=e.length-1;r>=0;r--){const o=e[r];for(let s=0;s<t.length;s++){const{field:a,value:c,fallbackValue:u}=t[s];c&&o[a]===c?(n[a]=o,e.splice(r,1)):u&&o[a]===u&&(n[a]||(n[a]=o),i[a]=!0,e.splice(r,1))}}const o=Object.keys(n);let s;switch(o.length){case 0:r=e[0],e.splice(0,1);break;case 1:s=o[0],r=n[s];break;default:return{code:10003,messageValues:{target:"用户"}}}return e.length>0?{code:10003,messageValues:{target:"用户"}}:{code:0,msg:"",userMatched:r,fieldMatched:s,isFallbackValueMatched:!!s&&i[s]}},_getCurrentAppUser:function(e){const t=this.context.APPID;return e.filter(e=>void 0===e.dcloud_appid||null===e.dcloud_appid||e.dcloud_appid.indexOf(t)>-1||e.dcloud_appid.indexOf(null)>-1)},_checkLoginUserList:function(e){if(e&&1!==e.length)return e[0].status===$?{code:10006}:{code:10005}},setAuthorizedAppLogin:async function({uid:e,dcloudAppidList:t}={}){if("array"!==h(t))return{code:L,messageValues:{param:"dcloudAppidList",reason:this.t("type-array-required",{param:this.t("dcloud-appid-list")})}};if(t&&0!==t.length){const r=await $r.bind(this)({uid:e,dcloudAppidList:t});if(r.code)return r}return await j.doc(e).update({dcloud_appid:Br.set(t)}),{code:0}},authorizeAppLogin:async function({uid:e,dcloudAppid:t}={}){const r=await $r.bind(this)({uid:e,dcloudAppidList:[t]});return r.code?r:(await j.doc(e).update({dcloud_appid:Br.push(t)}),{code:0})},forbidAppLogin:async function({uid:e,dcloudAppid:t}={}){return e?(await j.doc(e).update({dcloud_appid:Br.pull(t)}),{code:0}):{code:N,messageValues:{param:this.t("user-id")}}},acceptInvite:async function({uid:e,inviteCode:t}){const r=await j.where({_id:Fr.neq(e),inviter_uid:Fr.not(Fr.all([e])),my_invite_code:t}).get();if(1!==r.data.length)return{code:80501,msg:"邀请码无效"};const n=[r.data[0]._id].concat(r.data[0].inviter_uid||[]),i=await j.doc(e).field({my_invite_code:!0,inviter_uid:!0}).get();if(0===i.data.length)return{code:80502};if(i.data[0].inviter_uid&&i.data[0].inviter_uid.length>0)return{code:80503,msg:"邀请码不可修改"};const o=Date.now();return await j.doc(e).update({inviter_uid:n,invite_time:o}),await j.where({inviter_uid:e}).update({inviter_uid:Fr.push(n)}),{code:0,msg:""}},getInvitedUser:async function({uid:e,level:t=1,limit:r=20,offset:n=0,needTotal:i=!1}){const o={code:0,msg:"",invitedUser:(await j.where({["inviter_uid."+(t-1)]:e}).field({_id:!0,username:!0,mobile:!0,invite_time:!0}).orderBy("invite_time","desc").skip(n).limit(r).get()).data};if(i){const r=await j.where({["inviter_uid."+(t-1)]:e}).count();o.total=r.total}return o},setUserInviteCode:async function({uid:e,myInviteCode:t}){const r=await this._getValidInviteCode({inviteCode:t});return r.code?r:(await j.doc(e).update({my_invite_code:r.inviteCode}),{code:0,msg:"",myInviteCode:r.inviteCode})},loginByAlipay:async function(e){"string"==typeof e&&(e={code:e});const{needPermission:t,code:r,myInviteCode:n,role:i,type:o}=e,{openid:s}=await this._getAlipayApi().code2Session(r);if(!s)return{code:10501,messageValues:{account:this.t("alipay-account")}};let a=await j.where({ali_openid:s}).get();if(a=this._getCurrentAppUser(a.data),a&&a.length>0){if("register"===o)return{code:10502,messageValues:{type:this.t("alipay-account")}};if(1!==a.length)return{code:10005};const e=a[0],r=await this._loginExec(e,{needPermission:t});if(0!==r.code)return r;const{userInfo:n}=r;return{...r,openid:s,mobileConfirmed:1===n.mobile_confirmed,emailConfirmed:1===n.email_confirmed}}{if("login"===o)return{code:10503,messageValues:{type:this.t("alipay-account")}};const e={ali_openid:s};e.my_invite_code=n,e.role=i;const r=await this._registerExec(e,{needPermission:t});return 0!==r.code?r:{...r,openid:s,mobileConfirmed:!1,emailConfirmed:!1}}},loginByEmail:async function({email:e,code:t,password:r,myInviteCode:n,type:i,needPermission:o,role:s}){if(!(e=e&&e.trim()))return{code:N,messageValues:{param:"邮箱"}};const{emailToLowerCase:a}=this._getConfig();let c=e;a&&(c=e.toLowerCase());const u=await this.verifyCode({email:c,code:t,type:i||"login"});if(0!==u.code)return u;let d={email:e,email_confirmed:1};const l={field:"email",value:e},p=Hr.command;c!==e&&(d=p.or(d,{email:c,email_confirmed:1}),l.fallbackValue=c);let f=await j.where(d).get();if(f=this._getCurrentAppUser(f.data),f&&f.length>0){if("register"===i)return{code:10301,messageValues:{type:"邮箱"}};const e=this._getMatchedUser(f,[l]);if(e.code)return e;const{userMatched:t}=e,r=await this._loginExec(t,{needPermission:o});return 0!==r.code?r:{...r,email:c}}{if("login"===i)return{code:10302,messageValues:{type:"邮箱"}};const e={email:c,email_confirmed:1},t=r&&r.trim();if(t){const{passwordHash:r,version:n}=this.encryptPwd(t);e.password=r,n&&(e.password_secret_version=n)}e.my_invite_code=n,e.role=s;const a=await this._registerExec(e,{needPermission:o});return 0!==a.code?a:{...a,email:c}}},loginBySms:async function({mobile:e,code:t,password:r,inviteCode:n,myInviteCode:i,type:o,needPermission:s,role:a}){if(!(e=e&&e.trim()))return{code:N,messageValues:{param:this.t("mobile")}};const c=this._getConfig();if(c.forceInviteCode&&!o)throw new Error(this.t("login-with-invite-type-required"));const u=await this.verifyCode({mobile:e,code:t,type:o||"login"});if(0!==u.code)return u;const d={mobile:e,mobile_confirmed:1};let l=await j.where(d).get();if(l=this._getCurrentAppUser(l.data),l&&l.length>0){if("register"===o)return{code:10201,messageValues:{type:this.t("mobile")}};if(1!==l.length)return{code:10005};const t=l[0],r=await this._loginExec(t,{needPermission:s});return 0!==r.code?r:{...r,mobile:e}}{const t=Date.now();if("login"===o)return{code:10202,messageValues:{type:this.t("mobile")}};const u={mobile:e,mobile_confirmed:1,register_ip:this.context.CLIENTIP,register_date:t},d=r&&r.trim();if(d){const{passwordHash:e,version:t}=this.encryptPwd(d);u.password=e,t&&(u.password_secret_version=t)}if(n){const e=await j.where({my_invite_code:n}).get();if(1!==e.data.length)return{code:10203};u.inviter_uid=[e.data[0]._id].concat(e.data[0].inviter_uid||[]),u.invite_time=t}else if(c.forceInviteCode)return{code:10203};u.my_invite_code=i,u.role=a;const l=await this._registerExec(u,{needPermission:s});return 0!==l.code?l:{...l,mobile:e}}},loginByWeixin:async function(e){"string"==typeof e&&(e={code:e});const{needPermission:t,platform:r,code:n,myInviteCode:i,role:o,type:s}=e,a=r||this.context.PLATFORM,c="mp-weixin"===a,{openid:u,unionid:d,sessionKey:l,accessToken:p,refreshToken:f,expired:h}=await this._getWeixinApi()[c?"code2Session":"getOauthAccessToken"](n);if(!u)return{code:10401,messageValues:{account:"微信openid"}};let m;m=c?{sessionKey:l}:{accessToken:p,refreshToken:f,accessTokenExpired:h};const g=Kr.command,y=[{wx_openid:{[a]:u}}];d&&y.push({wx_unionid:d});let w=await j.where(g.or(...y)).get();if(w=this._getCurrentAppUser(w.data),w&&w.length>0){if("register"===s)return{code:10402,messageValues:{type:this.t("wechat-account")}};if(1!==w.length)return{code:10005};const e=w[0],r={wx_openid:{[a]:u}};d&&(r.wx_unionid=d);const n=await this._loginExec(e,{needPermission:t,extraData:r});if(0!==n.code)return n;const{userInfo:i}=n;return{...n,openid:u,unionid:d,...m,mobileConfirmed:1===i.mobile_confirmed,emailConfirmed:1===i.email_confirmed}}{if("login"===s)return{code:10403,messageValues:{type:this.t("wechat-account")}};const e={wx_openid:{[a]:u},wx_unionid:d};e.my_invite_code=i,e.role=o;const r=await this._registerExec(e,{needPermission:t});return 0!==r.code?r:{...r,openid:u,unionid:d,...m,mobileConfirmed:!1,emailConfirmed:!1}}},loginByQQ:async function({code:e,accessToken:t,myInviteCode:r,needPermission:n,role:i,type:o}={}){const s=this.context.PLATFORM,a="mp-qq"===s,{openid:c,unionid:u,sessionKey:d}=await this._getQQApi()[a?"code2Session":"getOpenidByToken"]({code:e,accessToken:t});if(!c)return{code:10801,messageValues:{account:"qq openid"}};const l={accessToken:t,sessionKey:d},p=Gr.command,f=[{qq_openid:{[s]:c}}];u&&f.push({qq_unionid:u});let h=await j.where(p.or(...f)).get();if(h=this._getCurrentAppUser(h.data),h&&h.length>0){if("register"===o)return{code:10802,messageValues:{type:this.t("qq-account")}};if(1!==h.length)return{code:10005};const e=h[0],t={qq_openid:{[s]:c}};u&&(t.qq_unionid=u);const r=await this._loginExec(e,{needPermission:n,extraData:t});if(0!==r.code)return r;const{userInfo:i}=r;return{...r,openid:c,unionid:u,...l,mobileConfirmed:1===i.mobile_confirmed,emailConfirmed:1===i.email_confirmed}}{if("login"===o)return{code:10803,messageValues:{type:this.t("qq-account")}};const e={qq_openid:{[s]:c},qq_unionid:u};e.my_invite_code=r,e.role=i;const t=await this._registerExec(e);return 0!==t.code?t:{...t,openid:c,unionid:u,...l,mobileConfirmed:!1,emailConfirmed:!1}}},loginByUniverify:async function({openid:e,access_token:t,password:r,inviteCode:n,myInviteCode:i,type:o,needPermission:s,role:a}){const c=this._getConfig(),u=c&&c.service&&c.service.univerify;if(!u)throw new Error(this.t("uni-verify-config-required"));if(c.forceInviteCode&&!o)throw new Error(this.t("login-with-invite-type-required"));const d=await zr.bind(this)({...u,openid:e,access_token:t});if(0!==d.code)return d;const l=String(d.phoneNumber);let p=await j.where({mobile:l,mobile_confirmed:1}).get();if(p=this._getCurrentAppUser(p.data),p&&p.length>0){if("register"===o)return{code:10601,messageValues:{type:this.t("mobile")}};if(1!==p.length)return{code:10005};const e=p[0],t=await this._loginExec(e,{needPermission:s});return 0!==t.code?t:{...t,mobile:l}}if("login"===o)return{code:10602,messageValues:{type:this.t("mobile")}};const f=Date.now(),h={mobile:l,my_invite_code:i,mobile_confirmed:1,role:a},m=r&&r.trim();if(m){const{passwordHash:e,version:t}=this.encryptPwd(m);h.password=e,t&&(h.password_secret_version=t)}if(n){let e=await j.where({my_invite_code:n}).get();if(1!==e.data.length)return{code:10203};e=e.data[0],h.inviter_uid=[e._id].concat(e.inviter_uid||[]),h.invite_time=f}else if(c.forceInviteCode)return{code:10203};h.my_invite_code=i;const g=await this._registerExec(h,{needPermission:s});return 0!==g.code?g:{...g,mobile:l}},loginByApple:async function({nickName:e,fullName:t,identityToken:r,myInviteCode:n,type:i,needPermission:o,platform:s,role:a}){const c=this._getConfig(),u=c&&c.oauth&&c.oauth.apple,d=u&&u.bundleId;if(!d)throw new Error(this.t("config-param-require",{param:"(app || app-plus).apple.bundleId"}));if(!r)return{code:N,messageValues:{param:"identityToken"}};t=e||(t&&Object.keys(t).length>0?t.familyName+t.givenName:"");const{code:l,msg:p}=await Vr().verifyIdentityToken(r);if(0!==l)return{code:l,msg:p,messageValues:{account:this.t("apple-account")}};const{iss:f,sub:h,aud:m,email:g}=p;if("https://appleid.apple.com"!==f)return{code:10706,messageValues:{account:this.t("apple-account")}};if(!h)return{code:10701,messageValues:{account:this.t("apple-account")}};if(d!==m)return{code:10702,messageValues:{account:this.t("apple-account")}};const y=t||"User-"+(g?g.split("@")[0]:Math.random().toString(32).slice(2));let w=await j.where({apple_openid:h}).get();if(w=this._getCurrentAppUser(w.data),w&&w.length>0){if("register"===i)return{code:10703,messageValues:{type:this.t("apple-account")}};if(1!==w.length)return{code:10005};const e=w[0],t=await this._loginExec(e,{needPermission:o});return 0!==t.code?t:{...t,openid:h}}if("login"===i)return{code:10704,messageValues:{type:this.t("apple-account")}};const v={nickname:y,apple_openid:h,my_invite_code:n,role:a},_=await this._registerExec(v,{needPermission:o});return 0!==_.code?_:{..._,openid:h}},login:async function({username:e,password:t,queryField:r=[],needPermission:n}){const i=Qr.command,o=[];r&&r.length||(r=["username"]),r.length>1&&console.warn(this.t("query-field-warning"));const{usernameToLowerCase:s,emailToLowerCase:a,passwordErrorLimit:c,passwordErrorRetryTime:u}=this._getConfig(),d={email:{email_confirmed:1},mobile:{mobile_confirmed:1}},l={},p=e&&e.trim();if(!p)return{code:N,messageValues:{param:this.t("username")}};s&&(l.username=p.toLowerCase()),a&&(l.email=p.toLowerCase());const f=[];r.forEach(t=>{o.push({[t]:e,...d[t]});const r={field:t,value:e};"username"===t&&l.username!==e?(o.push({[t]:l.username,...d[t]}),r.fallbackValue=l.username):"email"===t&&l.email!==e&&(o.push({[t]:l.email,...d[t]}),r.fallbackValue=l.email),f.push(r)});let h=await j.where(i.or(...o)).get();h=this._getCurrentAppUser(h.data);const m=this.context.CLIENTIP,g=this._getMatchedUser(h,f);if(g.code)return g;const{userMatched:y}=g;let w=y.login_ip_limit||[];w=w.filter(e=>e.last_error_time>Date.now()-1e3*u);let v=w.find(e=>e.ip===m);if(v&&v.error_times>=c)return{code:10103};const _=t&&t.trim();if(!_)return{code:N,messageValues:{param:"密码"}};const b=this._checkPwd(y,_);if(0===b.code){const e=w.indexOf(v);e>-1&&w.splice(e,1);const t={login_ip_limit:w},{passwordHash:r,passwordVersion:i}=b;r&&i&&(t.password=r,t.password_secret_version=i);const o=await this._loginExec(y,{needPermission:n,extraData:t});return o.code,o}return v?(v.error_times++,v.last_error_time=Date.now()):(v={ip:m,error_times:1,last_error_time:Date.now()},w.push(v)),await j.doc(y._id).update({login_ip_limit:w}),{code:10102,msg:"密码错误"}},register:async function(e){const t=[],r=[{name:"username",desc:this.t("username")},{name:"email",desc:this.t("email"),extraCond:{email_confirmed:1}},{name:"mobile",desc:this.t("mobile"),extraCond:{mobile_confirmed:1}}],{usernameToLowerCase:n,emailToLowerCase:i}=this._getConfig();r.forEach(r=>{const o=r.name;let s=e[o]&&e[o].trim();s?(("username"===r.name&&n||"email"===r.name&&i)&&(s=s.toLowerCase()),e[o]=s,t.push({[o]:s,...r.extraCond})):delete e[o]});const{username:o,email:s,mobile:a,myInviteCode:c,needPermission:u,autoSetDcloudAppid:d=!0}=e;if("needPermission"in e&&delete e.needPermission,"autoSetDcloudAppid"in e&&delete e.autoSetDcloudAppid,0===t.length)return{code:20101,messageValues:{param:this.t("user-unique-param")}};const l=Yr.command;let p=await j.where(l.or(...t)).get();if(p=this._getCurrentAppUser(p.data),p&&p.length>0){const t=p[0];if(t.status===$)return{code:10006};for(let n=0;n<r.length;n++){const i=r[n];let o=!0;if(i.extraCond&&(o=Object.keys(i.extraCond).every(e=>t[e]===i.extraCond[e])),t[i.name]===e[i.name]&&o)return{code:20102,messageValues:{type:i.desc}}}}const f=e.password&&e.password.trim();if(!f)return{code:N,messageValues:{param:this.t("password")}};const{passwordHash:h,version:m}=this.encryptPwd(f);e.password=h,m&&(e.password_secret_version=m),e.my_invite_code=c,delete e.myInviteCode;const g=await this._registerExec(e,{needPermission:u,autoSetDcloudAppid:d});return 0!==g.code?g:{...g,username:o,email:s,mobile:a}},logout:async function(e){const t=await this.checkToken(e);if(t.code)return t;const r=Jr.command;return await j.doc(t.uid).update({token:r.pull(e)}),{code:0,msg:""}},getRoleByUid:async function({uid:e}){if(!e)return{code:N,messageValues:{param:this.t("user-id")}};const t=await j.doc(e).get();return 0===t.data.length?{code:U}:{code:0,msg:"",role:t.data[0].role||[]}},getPermissionByRole:async function({roleID:e}){if(!e)return{code:N,messageValues:{param:"roleID"}};if("admin"===e){return{code:0,msg:"",permission:(await D.limit(1e3).get()).data.map(e=>e.permission_id)}}const t=await P.where({role_id:e}).get();return 0===t.data.length?{code:V}:{code:0,msg:"",permission:t.data[0].permission||[]}},getPermissionByUid:async function({uid:e}){const t=await j.aggregate().match({_id:e}).project({role:!0}).unwind("$role").lookup({from:"uni-id-roles",localField:"role",foreignField:"role_id",as:"roleDetail"}).unwind("$roleDetail").replaceRoot({newRoot:"$roleDetail"}).end(),r=[];return t.data.forEach(e=>{Array.prototype.push.apply(r,e.permission)}),{code:0,msg:"",permission:A(r)}},bindRole:async function({uid:e,roleList:t,reset:r=!1}){const n={};return"string"==typeof t&&(t=[t]),n.role=r?t:Xr.push(t),await j.doc(e).update(n),{code:0,msg:""}},bindPermission:async function({roleID:e,permissionList:t,reset:r=!1}){const n={};return"string"==typeof t&&(t=[t]),n.permission=r?t:Xr.push(t),await P.where({role_id:e}).update(n),{code:0,msg:""}},unbindRole:async function({uid:e,roleList:t}){return"string"==typeof t&&(t=[t]),await j.doc(e).update({role:Xr.pull(Xr.in(t))}),{code:0,msg:""}},unbindPermission:async function({roleID:e,permissionList:t}){return"string"==typeof t&&(t=[t]),await P.where({role_id:e}).update({permission:Xr.pull(Xr.in(t))}),{code:0,msg:""}},addRole:async function({roleID:e,roleName:t,comment:r,permission:n=[]}){return e?"admin"===e?{code:L,messageValues:{param:"roleID",reason:this.t("add-role-admin-is-not-allowed")}}:(await P.add({role_id:e,role_name:t,comment:r,permission:n,create_date:Date.now()}),{code:0,msg:""}):{code:N,messageValues:{param:this.t("role-id")}}},addPermission:async function({permissionID:e,permissionName:t,comment:r}){return e?(await D.add({permission_id:e,permission_name:t,comment:r,create_date:Date.now()}),{code:0,msg:""}):{code:N,messageValues:{param:this.t("permission-id")}}},getRoleList:async function({limit:e=20,offset:t=0,needTotal:r=!0}){const n={code:0,msg:"",roleList:(await P.skip(t).limit(e).get()).data};if(r){const{total:e}=await P.where({_id:Xr.exists(!0)}).count();n.total=e}return n},getRoleInfo:async function(e){const t=await P.where({role_id:e}).get();return 0===t.data.length?{code:V}:{code:0,...t.data[0]}},updateRole:async function({roleID:e,roleName:t,comment:r,permission:n}){return e?(await P.where({role_id:e}).update({role_name:t,comment:r,permission:n}),{code:0,msg:""}):{code:N,messageValues:{param:this.t("role-id")}}},deleteRole:async function({roleID:e}){const t=h(e);if("string"===t)e=[e];else if("array"!==t)throw new Error("typeof roleID must be array or string");return await P.where({role_id:Xr.in(e)}).remove(),await j.where({role:Xr.elemMatch(Xr.in(e))}).update({role:Xr.pullAll(e)}),{code:0,msg:""}},getPermissionList:async function({limit:e=20,offset:t=0,needTotal:r=!0}){const n={code:0,msg:"",permissionList:(await D.skip(t).limit(e).get()).data};if(r){const{total:e}=await D.where({_id:Xr.exists(!0)}).count();n.total=e}return n},getPermissionInfo:async function(e){const t=await D.where({permission_id:e}).get();return 0===t.data.length?{code:N,messageValues:{param:this.t("permission-id")}}:{code:0,...t.data[0]}},updatePermission:async function({permissionID:e,permissionName:t,comment:r}){return e?(await D.where({permission_id:e}).update({permission_name:t,comment:r}),{code:0,msg:""}):{code:N,messageValues:{param:this.t("permission-id")}}},deletePermission:async function({permissionID:e}){const t=h(e);if("string"===t)e=[e];else if("array"!==t)throw new Error("typeof permissionID must be array or string");return await D.where({permission_id:Xr.in(e)}).remove(),await P.where({permission:Xr.elemMatch(Xr.in(e))}).update({permission:Xr.pullAll(e)}),{code:0,msg:""}},bindAlipay:async function({uid:e,code:t,platform:r}){const n=r||this.context.PLATFORM,{openid:i}=await this._getAlipayApi({platform:n}).code2Session(t);if(!i)return{code:60401,messageValues:{account:this.t("alipay-account")}};let o=await j.where({ali_openid:i}).get();return o=this._getCurrentAppUser(o.data),o&&o.length>0?{code:60402,messageValues:{type:this.t("alipay-account")}}:(await j.doc(e).update({ali_openid:i}),{code:0,openid:i,msg:""})},bindEmail:async function({uid:e,email:t,code:r}){if(!(t=t&&t.trim()))return{code:N,messageValues:{param:"邮箱"}};if(!r)return{code:N,messageValues:{param:"验证码"}};const{emailToLowerCase:n}=this._getConfig();n&&(t=t.toLowerCase());let i=await j.where({email:t,email_confirmed:1}).get();if(i=this._getCurrentAppUser(i.data),i&&i.length>0)return{code:60201,messageValues:{type:"邮箱"}};if(r){const e=await this.verifyCode({email:t,code:r,type:"bind"});if(0!==e.code)return e}return await j.doc(e).update({email:t,email_confirmed:1}),{code:0,msg:"",email:t}},bindMobile:async function({uid:e,mobile:t,code:r,openid:n,access_token:i,type:o="sms"}){if("univerify"===o){const e=this._getConfig(),r=e&&e.service&&e.service.univerify;if(!r)throw new Error("请在config.json中配置service.univerify下一键登录相关参数");const o=await zr.bind(this)({...r,openid:n,access_token:i});if(0!==o.code)return o;t=""+o.phoneNumber}let s=await j.where({mobile:t,mobile_confirmed:1}).get();if(s=this._getCurrentAppUser(s.data),s&&s.length>0)return{code:60101,messageValues:{type:"手机号"}};if("sms"===o&&r){if(!t)return{code:N,messageValues:{param:this.t("mobile")}};if(!r)return{code:N,messageValues:{param:this.t("verify-code")}};const e=await this.verifyCode({mobile:t,code:r,type:"bind"});if(0!==e.code)return e}return await j.doc(e).update({mobile:t,mobile_confirmed:1}),{code:0,msg:"",mobile:t}},bindWeixin:async function({uid:e,code:t,platform:r}){const n=r||this.context.PLATFORM,i="mp-weixin"===n,{openid:o,unionid:s,sessionKey:a,accessToken:c,refreshToken:u,expired:d}=await this._getWeixinApi({platform:n})[i?"code2Session":"getOauthAccessToken"](t);if(!o)return{code:60301,messageValues:{account:"微信openid"}};const l=Wr.command,p=[{wx_openid:{[n]:o}}];s&&p.push({wx_unionid:s});let f=await j.where(l.or(...p)).get();if(f=this._getCurrentAppUser(f.data),f&&f.length>0)return{code:60302,messageValues:{type:this.t("wechat-account")}};const h={wx_openid:{[n]:o}};let m;return s&&(h.wx_unionid=s),await j.doc(e).update(h),m=i?{sessionKey:a}:{accessToken:c,refreshToken:u,accessTokenExpired:d},{code:0,msg:"",openid:o,unionid:s,...m}},bindQQ:async function({uid:e,code:t,accessToken:r,platform:n}={}){const i=n||this.context.PLATFORM,o="mp-qq"===i,{openid:s,unionid:a,sessionKey:c}=await this._getQQApi()[o?"code2Session":"getOpenidByToken"]({code:t,accessToken:r});if(!s)return{code:60501,messageValues:{account:"qq openid"}};const u=Zr.command,d=[{qq_openid:{[i]:s}}];a&&d.push({qq_unionid:a});let l=await j.where(u.or(...d)).get();if(l=this._getCurrentAppUser(l.data),l&&l.length>0)return{code:60502,messageValues:{type:this.t("qq-account")}};const p={qq_openid:{[i]:s}};return a&&(p.qq_unionid=a),await j.doc(e).update(p),{code:0,msg:"",openid:s,unionid:a,...{accessToken:r,sessionKey:c}}},unbindAlipay:async function(e){const t=en.command,r=await j.doc(e).update({ali_openid:t.remove()});return C("upRes:",r),1===r.updated?{code:0,msg:""}:{code:70401}},unbindEmail:async function({uid:e,email:t,code:r}){if(t=t&&t.trim(),!e||!t)return{code:N,messageValues:{param:e?this.t("email"):this.t("user-id")}};const{emailToLowerCase:n}=this._getConfig();if(r){const e=await this.verifyCode({email:t,code:r,type:"unbind"});if(0!==e.code)return e}const i=tn.command;let o={_id:e,email:t};if(n){const r=t.toLowerCase();r!==t&&(o=i.or(o,{_id:e,email:r}))}return 1===(await j.where(o).update({email:i.remove(),email_confirmed:i.remove()})).updated?{code:0,msg:""}:{code:70201}},unbindMobile:async function({uid:e,mobile:t,code:r}){if(r){const e=await this.verifyCode({mobile:t,code:r,type:"unbind"});if(0!==e.code)return e}const n=rn.command;return 1===(await j.where({_id:e,mobile:t}).update({mobile:n.remove(),mobile_confirmed:n.remove()})).updated?{code:0,msg:""}:{code:70101}},unbindWeixin:async function(e){const t=nn.command,r=await j.doc(e).update({wx_openid:t.remove(),wx_unionid:t.remove()});return C("upRes:",r),1===r.updated?{code:0,msg:""}:{code:70301}},unbindQQ:async function(e){const t=on.command,r=await j.doc(e).update({qq_openid:t.remove(),qq_unionid:t.remove()});return C("upRes:",r),1===r.updated?{code:0,msg:""}:{code:70501}},code2SessionAlipay:async function(e){let t=e;"string"==typeof e&&(t={code:e});try{const e=t.platform||this.context.PLATFORM,r=await this._getAlipayApi({platform:e}).code2Session(t.code);return r.openid?{code:0,msg:"",...r}:{code:80701,messageValues:{account:this.t("alipay-account")}}}catch(e){return{code:80702,messageValues:{account:this.t("alipay-account")}}}},code2SessionWeixin:async function(e){let t=e;"string"==typeof e&&(t={code:e});try{const e=t.platform||this.context.PLATFORM,r=await this._getWeixinApi({platform:e})["mp-weixin"===e?"code2Session":"getOauthAccessToken"](t.code);return r.openid?{code:0,msg:"",...r}:{code:80601,messageValues:{account:"微信openid"}}}catch(e){return{code:80602,messageValues:{account:"微信openid"}}}},verifyAppleIdentityToken:async function({identityToken:e,platform:t}){const r=t||this.context.PLATFORM,{code:n,msg:i}=await Vr({clientType:r}).verifyIdentityToken(e);return 0!==n?{code:n,msg:i}:{code:n,msg:"验证通过",...i}},wxBizDataCrypt:async function({code:e,sessionKey:r,encryptedData:n,iv:i}){if(!n)return{code:N,messageValues:{param:"encryptedData"}};if(!i)return{code:N,messageValues:{param:"iv"}};if(!e&&!r)return{code:N,messageValues:{param:"sessionKey"}};const o=this._getWeixinApi();if(!r){const t=await o.code2Session(e);if(!t.sessionKey)return{code:80801};r=t.sessionKey}r=Buffer.from(r,"base64"),n=Buffer.from(n,"base64"),i=Buffer.from(i,"base64");try{var s=t.createDecipheriv("aes-128-cbc",r,i);s.setAutoPadding(!0);var a=s.update(n,"binary","utf8");a+=s.final("utf8"),a=JSON.parse(a)}catch(e){return console.error(e),{code:80802}}return a.watermark.appid!==o.options.appId?{code:80803}:{code:0,msg:"",...a}},encryptPwd:function(e,{value:r,version:n}={}){if(!(e=e&&e.trim()))throw new Error(this.t("param-required",{param:this.t("password")}));if(!r){const e=this._getConfig(),{passwordSecret:t}=e;if("array"===h(t)){const e=t.sort((e,t)=>e.version-t.version);r=e[e.length-1].value,n=e[e.length-1].version}else r=t}if(!r)throw new Error(this.t("param-error",{param:"passwordSecret",reason:"invalid passwordSecret"}));const i=t.createHmac("sha1",r.toString("ascii"));return i.update(e),{passwordHash:i.digest("hex"),version:n}},checkToken:async function(e,{needPermission:t,needUserInfo:r=!0}={}){const n=this._getConfig(),i=this._verifyToken(e);if(i.code)return i;const{uid:o,needPermission:s,role:a,permission:c,exp:u,iat:d,...l}=i,p=a&&c;t=void 0===t?s:t;const f=n.removePermissionAndRoleFromToken||!p||r,h=!n.removePermissionAndRoleFromToken&&!p||n.removePermissionAndRoleFromToken&&p||n.tokenExpiresThreshold&&u-Date.now()/1e3<n.tokenExpiresThreshold;let m={};if(f||h){const t=await j.doc(o).get();if(!t.data||0===t.data.length||!t.data[0].token)return{code:30202};if(m=t.data[0],m.status===B)return{code:10001};if(m.status===$)return{code:10006};let r=m.token;if(r?"string"==typeof r&&(r=[r]):r=[],-1===r.indexOf(e))return{code:30202}}const g={code:0,uid:o,...l};let y,w;if(p&&(g.role=a,g.permission=c),r&&(g.userInfo=m),(!p&&t||h)&&(y=g.role=m.role||[],w=0===y.length||y.includes("admin")?g.permission=[]:g.permission=await this._getPermissionListByRoleList(g.role),t&&(g.role=y,g.permission=w)),h){let e;e=n.removePermissionAndRoleFromToken?await this.createToken({uid:o,needPermission:s}):await this.createToken({uid:o,role:y,permission:w});let t=m.token;t?"string"==typeof t&&(t=[t]):t=[];const r=this._getExpiredToken(t);return t=t.filter(e=>-1===r.indexOf(e)),t.push(e.token),await j.doc(o).update({token:t,last_login_date:Date.now(),last_login_ip:this.context.CLIENTIP}),{...g,...e}}return g},createToken:function({uid:e,needPermission:t,role:r,permission:n}){if(!e)return{code:30101,messageValues:{param:this.t("user-id")}};const i={uid:e,cid:this.context.CLIENTID||void 0,needPermission:t,role:r,permission:n},o=this._getConfig();if(!this.interceptorMap.has("customToken")){const e={...i};return this._createTokenInternal({signContent:e,config:o})}const s=this.interceptorMap.get("customToken");if("function"!=typeof s)throw new Error(this.t("type-function-required","customToken"));const a=s(i);return a instanceof Promise?a.then(e=>this._createTokenInternal({signContent:e,config:o})):this._createTokenInternal({signContent:a,config:o})},_checkPwd:function(e,t){if(!t)return{code:1};const{password:r,password_secret_version:n}=e,i=this._getConfig(),{passwordSecret:o}=i,s=h(o);if("string"===s){const{passwordHash:e}=this.encryptPwd(t,{value:o});return e===r?{code:0,message:""}:{code:2}}if("array"!==s)throw new Error(this.t("password-secret-type-error"));const a=o.sort((e,t)=>e.version-t.version);let c;if(c=n?a.find(e=>e.version===n):a[0],!c)return{code:3};const u=a[a.length-1],{passwordHash:d}=this.encryptPwd(t,c);if(d===r){const e={code:0};if(c!==u){const{passwordHash:r,version:n}=this.encryptPwd(t,u);e.passwordHash=r,e.passwordVersion=n}return e}return{code:4,message:""}},_verifyToken:function(e){const t=this._getConfig();let r;try{r=Rr(e,t.tokenSecret)}catch(e){return"TokenExpiredError"===e.name?{code:30203,err:e}:{code:30204,err:e}}return t.bindTokenToDevice&&r.clientId&&r.clientId!==this._getClientUaHash()?{code:30201}:{code:0,message:"",...r}},_getExpiredToken:function(e){const t=this._getConfig(),r=[];return e.forEach(e=>{try{Rr(e,t.tokenSecret)}catch(t){r.push(e)}}),r},_getPermissionListByRoleList:async function(e){if(!Array.isArray(e))return[];if(0===e.length)return[];if(e.includes("admin")){return(await D.limit(500).get()).data.map(e=>e.permission_id)}const t=await P.where({role_id:sn.in(e)}).get(),r=[];return t.data.forEach(e=>{Array.prototype.push.apply(r,e.permission)}),A(r)},_getClientUaHash:function(){const e=t.createHash("md5"),r=/MicroMessenger/i.test(this.context.CLIENTUA)?this.context.CLIENTUA.replace(/(MicroMessenger\S+).*/i,"$1"):this.context.CLIENTUA;return e.update(r),e.digest("hex")},_createTokenInternal:function({signContent:e,config:t}){if(t.tokenExpiresIn&&t.tokenExpiresThreshold&&t.tokenExpiresIn<=t.tokenExpiresThreshold)throw new Error(this.t("token-expires-config-warning"));return"object"===h(e)&&e.uid?(t.bindTokenToDevice&&(e.clientId=this._getClientUaHash()),{token:Pr(e,t.tokenSecret,{expiresIn:t.tokenExpiresIn}),tokenExpired:Date.now()+1e3*t.tokenExpiresIn}):{code:30101,messageValues:{param:this.t("user-id")}}},setVerifyCode:async function({mobile:e,email:t,code:r,expiresIn:n,type:i}){if(t=t&&t.trim(),e=e&&e.trim(),t){const{emailToLowerCase:e}=this._getConfig();e&&(t=t.toLowerCase())}if(!e&&!t)return{code:50101,messageValues:{param:"手机号或邮箱"}};if(e&&t)return{code:50102,messageValues:{param:"参数",reason:"手机号和邮箱不可同时存在"}};r||(r=T()),n||(n=180);const o=Date.now(),s={mobile:e,email:t,type:i,code:r,state:0,ip:this.context.CLIENTIP,created_at:o,expired_at:o+1e3*n};return C("addRes",await R.add(s)),{code:0,mobile:e,email:t}},verifyCode:async function({mobile:e,email:t,code:r,type:n}){if(t=t&&t.trim(),e=e&&e.trim(),t){const{emailToLowerCase:e}=this._getConfig();e&&(t=t.toLowerCase())}if(!e&&!t)return{code:50201,messageValues:{param:"手机号或邮箱"}};if(e&&t)return{code:50203,messageValues:{param:"参数",reason:"手机号和邮箱不可同时存在"}};const i=an.command,o=Date.now(),s={mobile:e,email:t,type:n,code:r,state:0,expired_at:i.gt(o)},a=await R.where(s).orderBy("created_at","desc").limit(1).get();if(C("verifyRecord:",a),a&&a.data&&a.data.length>0){const e=a.data[0];return C("upRes",await R.doc(e._id).update({state:1})),{code:0,msg:"验证通过"}}return{code:50202,msg:"验证码错误或已失效"}},sendSmsCode:async function({mobile:e,code:t,type:r,templateId:n}){if(!e)return{code:N,messageValues:{param:this.t("mobile")}};if(t||(t=T()),!r)return{code:N,messageValues:{param:this.t("verify-code-type")}};const i=this._getConfig();let o=i&&i.service&&i.service.sms;if(!o)throw new Error(this.t("config-param-required",{param:"service.sms"}));o=Object.assign({codeExpiresIn:300},o);const s=["smsKey","smsSecret"];for(let e=0,t=s.length;e<t;e++){const t=s[e];if(!o[t])throw new Error(this.t("config-param-required",{param:"service.sms."+t}))}const{name:a,smsKey:c,smsSecret:u,codeExpiresIn:d}=o;let l;switch(r){case"login":l=this.t("login");break;default:l=this.t("verify-mobile")}try{const i={name:a,code:t,action:l,expMinute:""+Math.round(d/60)};a&&(i.name=a),await uniCloud.sendSms({smsKey:c,smsSecret:u,phone:e,templateId:n||"uniID_code",data:i});const o=await this.setVerifyCode({mobile:e,code:t,expiresIn:d,type:r});return o.code>=0?o:{code:0,msg:""}}catch(e){return{code:50301}}}}),un=re((function(e,t){var r=/^\[object .+?Constructor\]$/,n=/^(?:0|[1-9]\d*)$/,i={};i["[object Float32Array]"]=i["[object Float64Array]"]=i["[object Int8Array]"]=i["[object Int16Array]"]=i["[object Int32Array]"]=i["[object Uint8Array]"]=i["[object Uint8ClampedArray]"]=i["[object Uint16Array]"]=i["[object Uint32Array]"]=!0,i["[object Arguments]"]=i["[object Array]"]=i["[object ArrayBuffer]"]=i["[object Boolean]"]=i["[object DataView]"]=i["[object Date]"]=i["[object Error]"]=i["[object Function]"]=i["[object Map]"]=i["[object Number]"]=i["[object Object]"]=i["[object RegExp]"]=i["[object Set]"]=i["[object String]"]=i["[object WeakMap]"]=!1;var o="object"==typeof te&&te&&te.Object===Object&&te,s="object"==typeof self&&self&&self.Object===Object&&self,a=o||s||Function("return this")(),c=t&&!t.nodeType&&t,u=c&&e&&!e.nodeType&&e,d=u&&u.exports===c,l=d&&o.process,p=function(){try{var e=u&&u.require&&u.require("util").types;return e||l&&l.binding&&l.binding("util")}catch(e){}}(),f=p&&p.isTypedArray;function h(e,t,r){switch(r.length){case 0:return e.call(t);case 1:return e.call(t,r[0]);case 2:return e.call(t,r[0],r[1]);case 3:return e.call(t,r[0],r[1],r[2])}return e.apply(t,r)}var m,g=Array.prototype,y=Function.prototype,w=Object.prototype,v=a["__core-js_shared__"],_=y.toString,b=w.hasOwnProperty,E=(m=/[^.]+$/.exec(v&&v.keys&&v.keys.IE_PROTO||""))?"Symbol(src)_1."+m:"",C=w.toString,T=_.call(Object),A=RegExp("^"+_.call(b).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),x=d?a.Buffer:void 0,S=a.Symbol,I=a.Uint8Array,O=x?x.allocUnsafe:void 0,k=function(e,t){return function(r){return e(t(r))}}(Object.getPrototypeOf,Object),j=Object.create,R=w.propertyIsEnumerable,P=g.splice,D=S?S.toStringTag:void 0,q=function(){try{var e=ae(Object,"defineProperty");return e({},"",{}),e}catch(e){}}(),N=x?x.isBuffer:void 0,L=Math.max,U=Date.now,V=ae(a,"Map"),M=ae(Object,"create"),B=function(){function e(){}return function(t){if(!ve(t))return{};if(j)return j(t);e.prototype=t;var r=new e;return e.prototype=void 0,r}}();function $(e){var t=-1,r=null==e?0:e.length;for(this.clear();++t<r;){var n=e[t];this.set(n[0],n[1])}}function F(e){var t=-1,r=null==e?0:e.length;for(this.clear();++t<r;){var n=e[t];this.set(n[0],n[1])}}function H(e){var t=-1,r=null==e?0:e.length;for(this.clear();++t<r;){var n=e[t];this.set(n[0],n[1])}}function K(e){var t=this.__data__=new F(e);this.size=t.size}function G(e,t){var r=he(e),n=!r&&fe(e),i=!r&&!n&&ge(e),o=!r&&!n&&!i&&be(e),s=r||n||i||o,a=s?function(e,t){for(var r=-1,n=Array(e);++r<e;)n[r]=t(r);return n}(e.length,String):[],c=a.length;for(var u in e)!t&&!b.call(e,u)||s&&("length"==u||i&&("offset"==u||"parent"==u)||o&&("buffer"==u||"byteLength"==u||"byteOffset"==u)||ce(u,c))||a.push(u);return a}function z(e,t,r){(void 0!==r&&!pe(e[t],r)||void 0===r&&!(t in e))&&J(e,t,r)}function Q(e,t,r){var n=e[t];b.call(e,t)&&pe(n,r)&&(void 0!==r||t in e)||J(e,t,r)}function Y(e,t){for(var r=e.length;r--;)if(pe(e[r][0],t))return r;return-1}function J(e,t,r){"__proto__"==t&&q?q(e,t,{configurable:!0,enumerable:!0,value:r,writable:!0}):e[t]=r}$.prototype.clear=function(){this.__data__=M?M(null):{},this.size=0},$.prototype.delete=function(e){var t=this.has(e)&&delete this.__data__[e];return this.size-=t?1:0,t},$.prototype.get=function(e){var t=this.__data__;if(M){var r=t[e];return"__lodash_hash_undefined__"===r?void 0:r}return b.call(t,e)?t[e]:void 0},$.prototype.has=function(e){var t=this.__data__;return M?void 0!==t[e]:b.call(t,e)},$.prototype.set=function(e,t){var r=this.__data__;return this.size+=this.has(e)?0:1,r[e]=M&&void 0===t?"__lodash_hash_undefined__":t,this},F.prototype.clear=function(){this.__data__=[],this.size=0},F.prototype.delete=function(e){var t=this.__data__,r=Y(t,e);return!(r<0)&&(r==t.length-1?t.pop():P.call(t,r,1),--this.size,!0)},F.prototype.get=function(e){var t=this.__data__,r=Y(t,e);return r<0?void 0:t[r][1]},F.prototype.has=function(e){return Y(this.__data__,e)>-1},F.prototype.set=function(e,t){var r=this.__data__,n=Y(r,e);return n<0?(++this.size,r.push([e,t])):r[n][1]=t,this},H.prototype.clear=function(){this.size=0,this.__data__={hash:new $,map:new(V||F),string:new $}},H.prototype.delete=function(e){var t=se(this,e).delete(e);return this.size-=t?1:0,t},H.prototype.get=function(e){return se(this,e).get(e)},H.prototype.has=function(e){return se(this,e).has(e)},H.prototype.set=function(e,t){var r=se(this,e),n=r.size;return r.set(e,t),this.size+=r.size==n?0:1,this},K.prototype.clear=function(){this.__data__=new F,this.size=0},K.prototype.delete=function(e){var t=this.__data__,r=t.delete(e);return this.size=t.size,r},K.prototype.get=function(e){return this.__data__.get(e)},K.prototype.has=function(e){return this.__data__.has(e)},K.prototype.set=function(e,t){var r=this.__data__;if(r instanceof F){var n=r.__data__;if(!V||n.length<199)return n.push([e,t]),this.size=++r.size,this;r=this.__data__=new H(n)}return r.set(e,t),this.size=r.size,this};var X,W=function(e,t,r){for(var n=-1,i=Object(e),o=r(e),s=o.length;s--;){var a=o[X?s:++n];if(!1===t(i[a],a,i))break}return e};function Z(e){return null==e?void 0===e?"[object Undefined]":"[object Null]":D&&D in Object(e)?function(e){var t=b.call(e,D),r=e[D];try{e[D]=void 0;var n=!0}catch(e){}var i=C.call(e);n&&(t?e[D]=r:delete e[D]);return i}(e):function(e){return C.call(e)}(e)}function ee(e){return _e(e)&&"[object Arguments]"==Z(e)}function re(e){return!(!ve(e)||function(e){return!!E&&E in e}(e))&&(ye(e)?A:r).test(function(e){if(null!=e){try{return _.call(e)}catch(e){}try{return e+""}catch(e){}}return""}(e))}function ne(e){if(!ve(e))return function(e){var t=[];if(null!=e)for(var r in Object(e))t.push(r);return t}(e);var t=ue(e),r=[];for(var n in e)("constructor"!=n||!t&&b.call(e,n))&&r.push(n);return r}function ie(e,t,r,n,i){e!==t&&W(t,(function(o,s){if(i||(i=new K),ve(o))!function(e,t,r,n,i,o,s){var a=de(e,r),c=de(t,r),u=s.get(c);if(u)return void z(e,r,u);var d=o?o(a,c,r+"",e,t,s):void 0,l=void 0===d;if(l){var p=he(c),f=!p&&ge(c),h=!p&&!f&&be(c);d=c,p||f||h?he(a)?d=a:_e(m=a)&&me(m)?d=function(e,t){var r=-1,n=e.length;t||(t=Array(n));for(;++r<n;)t[r]=e[r];return t}(a):f?(l=!1,d=function(e,t){if(t)return e.slice();var r=e.length,n=O?O(r):new e.constructor(r);return e.copy(n),n}(c,!0)):h?(l=!1,d=function(e,t){var r=t?(n=e.buffer,i=new n.constructor(n.byteLength),new I(i).set(new I(n)),i):e.buffer;var n,i;return new e.constructor(r,e.byteOffset,e.length)}(c,!0)):d=[]:function(e){if(!_e(e)||"[object Object]"!=Z(e))return!1;var t=k(e);if(null===t)return!0;var r=b.call(t,"constructor")&&t.constructor;return"function"==typeof r&&r instanceof r&&_.call(r)==T}(c)||fe(c)?(d=a,fe(a)?d=function(e){return function(e,t,r,n){var i=!r;r||(r={});var o=-1,s=t.length;for(;++o<s;){var a=t[o],c=n?n(r[a],e[a],a,r,e):void 0;void 0===c&&(c=e[a]),i?J(r,a,c):Q(r,a,c)}return r}(e,Ee(e))}(a):ve(a)&&!ye(a)||(d=function(e){return"function"!=typeof e.constructor||ue(e)?{}:B(k(e))}(c))):l=!1}var m;l&&(s.set(c,d),i(d,c,n,o,s),s.delete(c));z(e,r,d)}(e,t,s,r,ie,n,i);else{var a=n?n(de(e,s),o,s+"",e,t,i):void 0;void 0===a&&(a=o),z(e,s,a)}}),Ee)}function oe(e,t){return le(function(e,t,r){return t=L(void 0===t?e.length-1:t,0),function(){for(var n=arguments,i=-1,o=L(n.length-t,0),s=Array(o);++i<o;)s[i]=n[t+i];i=-1;for(var a=Array(t+1);++i<t;)a[i]=n[i];return a[t]=r(s),h(e,this,a)}}(e,t,Ae),e+"")}function se(e,t){var r,n,i=e.__data__;return("string"==(n=typeof(r=t))||"number"==n||"symbol"==n||"boolean"==n?"__proto__"!==r:null===r)?i["string"==typeof t?"string":"hash"]:i.map}function ae(e,t){var r=function(e,t){return null==e?void 0:e[t]}(e,t);return re(r)?r:void 0}function ce(e,t){var r=typeof e;return!!(t=null==t?9007199254740991:t)&&("number"==r||"symbol"!=r&&n.test(e))&&e>-1&&e%1==0&&e<t}function ue(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||w)}function de(e,t){if(("constructor"!==t||"function"!=typeof e[t])&&"__proto__"!=t)return e[t]}var le=function(e){var t=0,r=0;return function(){var n=U(),i=16-(n-r);if(r=n,i>0){if(++t>=800)return arguments[0]}else t=0;return e.apply(void 0,arguments)}}(q?function(e,t){return q(e,"toString",{configurable:!0,enumerable:!1,value:(r=t,function(){return r}),writable:!0});var r}:Ae);function pe(e,t){return e===t||e!=e&&t!=t}var fe=ee(function(){return arguments}())?ee:function(e){return _e(e)&&b.call(e,"callee")&&!R.call(e,"callee")},he=Array.isArray;function me(e){return null!=e&&we(e.length)&&!ye(e)}var ge=N||function(){return!1};function ye(e){if(!ve(e))return!1;var t=Z(e);return"[object Function]"==t||"[object GeneratorFunction]"==t||"[object AsyncFunction]"==t||"[object Proxy]"==t}function we(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=9007199254740991}function ve(e){var t=typeof e;return null!=e&&("object"==t||"function"==t)}function _e(e){return null!=e&&"object"==typeof e}var be=f?function(e){return function(t){return e(t)}}(f):function(e){return _e(e)&&we(e.length)&&!!i[Z(e)]};function Ee(e){return me(e)?G(e,!0):ne(e)}var Ce,Te=(Ce=function(e,t,r){ie(e,t,r)},oe((function(e,t){var r=-1,n=t.length,i=n>1?t[n-1]:void 0,o=n>2?t[2]:void 0;for(i=Ce.length>3&&"function"==typeof i?(n--,i):void 0,o&&function(e,t,r){if(!ve(r))return!1;var n=typeof t;return!!("number"==n?me(r)&&ce(t,r.length):"string"==n&&t in r)&&pe(r[t],e)}(t[0],t[1],o)&&(i=n<3?void 0:i,n=1),e=Object(e);++r<n;){var s=t[r];s&&Ce(e,s,r,i)}return e})));function Ae(e){return e}e.exports=Te}));let dn;try{dn=require("uni-config-center")}catch(e){throw new Error("Plugin[uni-config-center] was not found")}class ln{constructor({context:e,config:t}={}){const r=dn({pluginId:"uni-id"});this.pluginConfig=r,this.config=t||this._getConfigContent(),this._configCache={},Object.defineProperty(this,"context",{get(){const t=Object.assign({},e||global.__ctx__||{}),r=["CLIENTIP","PLATFORM","APPID","LOCALE"];for(let e=0;e<r.length;e++){const i=r[e];void 0===t[i]&&console.warn(n.t("context-required",{key:i}))}const i=t.APPID,o=t.PLATFORM;if("app"===o||"app-plus"===o){const e=this._getAppConfig(this.config,i);if(e.preferedAppPlatform){if("app"!==e.preferedAppPlatform&&"app-plus"!==e.preferedAppPlatform)throw new Error("invalid preferedAppPlatform value in config");t.PLATFORM=e.preferedAppPlatform}if("app"===t.PLATFORM&&e["app-plus"]||"app-plus"===t.PLATFORM&&e.app)throw new Error(`Client platform is ${t.PLATFORM}, but ${"app"===t.PLATFORM?"app-plus":"app"} was found in config. Please refer to: https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=prefered-app-platform`)}return t}}),this.interceptorMap=new Map,r&&r.hasFile("custom-token.js")&&this.setInterceptor("customToken",require(r.resolve("custom-token.js")));let n,i=O;if(r&&r.hasFile("lang/index.js")){const e=r.requireFile("lang/index.js");i=un(O,e)}if(!uniCloud.initI18n)throw new Error(n.t("hx-version-warning"));n=uniCloud.initI18n({locale:"en",fallbackLocale:"zh-Hans",messages:i}),Object.defineProperty(this,"t",{get(){return n.setLocale(this.context.LOCALE||"zh-Hans"),n.t.bind(n)}})}get dev(){return console.warn(this.t("dev-warning")),{getConfig:this._getConfig.bind(this)}}_getAppConfig(e,t){return Array.isArray(e)?e.find(e=>e.dcloudAppid===t)||e.find(e=>e.isDefaultConfig):e}_getConfigContent(){if(this.pluginConfig&&this.pluginConfig.hasFile("config.json")){let e;try{e=this.pluginConfig.config()}catch(e){throw new Error(this.t("config-file-invalid")+"\n"+e.messages)}return Array.isArray(e)?e:e[0]?Object.values(e):e}}init(){throw new Error("uniID.init has been deprecated, use uniID.createInstance instead")}setInterceptor(e,t){this.interceptorMap.set(e,t)}_getConfig({appid:e,platform:t}={}){const r=`${e=e||this.context.APPID}_${t=t||this.context.PLATFORM}`;if(this._configCache[r])return this._configCache[r];if(!(this.config&&0!==Object.keys(this.config).length))throw new Error(this.t("config-file-not-found"));const n=this._getAppConfig(this.config),i=Object.assign(n,n[t])||{},o=Object.assign({bindTokenToDevice:!1,tokenExpiresIn:7200,tokenExpiresThreshold:1200,passwordErrorLimit:6,passwordErrorRetryTime:3600,usernameToLowerCase:!0,emailToLowerCase:!0},i);return["passwordSecret","tokenSecret","tokenExpiresIn","passwordErrorLimit","passwordErrorRetryTime"].forEach(e=>{if(!o||!o[e])throw new Error(this.t("config-param-required",{param:e}))}),this._configCache[r]=o,o}}for(const e in cn)ln.prototype[e]=cn[e];function pn({context:e,config:t}={}){const r=new ln({context:e,config:t});return new Proxy(r,{get(e,t){if(t in e&&0!==t.indexOf("_")){if("function"==typeof e[t])return(r=e[t],function(){const e=r.apply(this,arguments);return f(e)?e.then(e=>(I.bind(this)(e),e)):(I.bind(this)(e),e)}).bind(e);if("context"!==t&&"config"!==t)return e[t]}var r}})}ln.prototype.createInstance=pn;var fn=pn();module.exports=fn;
+"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}var t=e(require("crypto")),r=e(require("buffer")),n=e(require("stream")),i=e(require("util"));const o={PARAM_ERROR:{errCode:"param-error"},PARAM_REQUIRED:{errCode:"param-required"},USER_NOT_EXIST:{errCode:"user-not-exist"},ROLE_NOT_EXIST:{errCode:"role-not-exist"},PERMISSION_NOT_EXIST:{errCode:"permission-not-exist"},MULTI_USER_MATCHED:{errCode:"multi-user-matched"},USER_INFO_ERROR:{errCode:"user-info-error"},USER_ACCOUNT_CONFLICT:{errCode:"user-account-conflict"},USER_ACCOUNT_CLOSED:{errCode:"user-account-closed"},ACCOUNT_EXISTS:{errCode:"account-exists"},ACCOUNT_NOT_EXISTS:{errCode:"account-not-exists"},ACCOUNT_BOUND:{errCode:"account-bound"},UNBIND_FAILED:{errCode:"unbind-failed"},INVALID_INVITE_CODE:{errCode:"invalid-invite-code"},SET_INVITE_CODE_FAILED:{errCode:"set-invite-code-failed"},GET_THIRD_PARTY_ACCOUNT_FAILED:{errCode:"get-third-party-account-failed"},GET_THIRD_PARTY_USER_INFO_FAILED:{errCode:"get-third-party-user-info-failed"}},s={0:{errCode:0,errMsg:""},10001:{errCode:"account-banned"},10002:o.USER_NOT_EXIST,10003:o.MULTI_USER_MATCHED,10004:o.USER_INFO_ERROR,10005:o.USER_ACCOUNT_CONFLICT,10006:o.USER_ACCOUNT_CLOSED,10102:{errCode:"password-error"},10103:{errCode:"password-error-exceed-limit"},10201:o.ACCOUNT_EXISTS,10202:o.ACCOUNT_NOT_EXISTS,10203:o.INVALID_INVITE_CODE,10301:o.ACCOUNT_EXISTS,10302:o.ACCOUNT_NOT_EXISTS,10401:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10402:o.ACCOUNT_EXISTS,10403:o.ACCOUNT_NOT_EXISTS,10501:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10502:o.ACCOUNT_EXISTS,10503:o.ACCOUNT_NOT_EXISTS,10601:o.ACCOUNT_EXISTS,10602:o.ACCOUNT_NOT_EXISTS,10701:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10702:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10703:o.ACCOUNT_EXISTS,10704:o.ACCOUNT_NOT_EXISTS,10705:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10706:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10801:o.GET_THIRD_PARTY_ACCOUNT_FAILED,10802:o.ACCOUNT_EXISTS,10803:o.ACCOUNT_NOT_EXISTS,20101:o.PARAM_REQUIRED,20102:o.ACCOUNT_EXISTS,30101:o.PARAM_REQUIRED,30201:{errCode:"check-device-feature-failed"},30202:{errCode:"token-not-exist"},30203:{errCode:"token-expired"},30204:{errCode:"check-token-failed"},40201:o.USER_NOT_EXIST,40202:{errCode:"invalid-old-password"},50101:o.PARAM_REQUIRED,50102:o.PARAM_ERROR,50201:o.PARAM_REQUIRED,50203:o.PARAM_ERROR,50202:{errCode:"invalid-verify-code"},50301:{errCode:"send-sms-code-failed"},60101:o.ACCOUNT_BOUND,60201:o.ACCOUNT_BOUND,60301:o.GET_THIRD_PARTY_ACCOUNT_FAILED,60302:o.ACCOUNT_BOUND,60401:o.GET_THIRD_PARTY_ACCOUNT_FAILED,60402:o.ACCOUNT_BOUND,60501:o.GET_THIRD_PARTY_ACCOUNT_FAILED,60502:o.ACCOUNT_BOUND,70101:o.UNBIND_FAILED,70201:o.UNBIND_FAILED,70301:o.UNBIND_FAILED,70401:o.UNBIND_FAILED,70501:o.UNBIND_FAILED,80301:o.USER_NOT_EXIST,80401:o.SET_INVITE_CODE_FAILED,80402:o.SET_INVITE_CODE_FAILED,80501:o.INVALID_INVITE_CODE,80502:o.USER_NOT_EXIST,80503:{errCode:"modify-invite-code-is-not-allowed"},80601:o.GET_THIRD_PARTY_ACCOUNT_FAILED,80602:o.GET_THIRD_PARTY_ACCOUNT_FAILED,80701:o.GET_THIRD_PARTY_ACCOUNT_FAILED,80702:o.GET_THIRD_PARTY_ACCOUNT_FAILED,80801:{errCode:"decrypt-weixin-data-failed"},80802:{errCode:"decrypt-weixin-data-failed"},80803:{errCode:"invalid-weixin-appid"},80804:o.PARAM_REQUIRED,80805:o.PARAM_REQUIRED,80806:o.PARAM_REQUIRED,80901:o.GET_THIRD_PARTY_USER_INFO_FAILED,90001:{errCode:"database-operation-failed"},90002:o.PARAM_REQUIRED,90003:o.PARAM_ERROR,90004:o.USER_NOT_EXIST,90005:o.ROLE_NOT_EXIST,90006:o.PERMISSION_NOT_EXIST};class a extends Error{constructor(e){super(e.message),this.errMsg=e.message||"",Object.defineProperties(this,{message:{get(){return`errCode: ${e.code||""} | errMsg: `+this.errMsg},set(e){this.errMsg=e}}})}}const c=Object.prototype.toString,u=Object.prototype.hasOwnProperty;function d(e,t){return u.call(e,t)}function p(e){return"[object Object]"===c.call(e)}function l(e){return"function"==typeof e}function f(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof e.then}function m(e){return Object.prototype.toString.call(e).slice(8,-1).toLowerCase()}const h=/_(\w)/g,g=/[A-Z]/g;function y(e){return e.replace(h,(e,t)=>t?t.toUpperCase():"")}function w(e){return e.replace(g,e=>"_"+e.toLowerCase())}function v(e,t){let r,n;switch(t){case"snake2camel":n=y,r=h;break;case"camel2snake":n=w,r=g}for(const i in e)if(d(e,i)&&r.test(i)){const r=n(i);e[r]=e[i],delete e[i],p(e[r])?e[r]=v(e[r],t):Array.isArray(e[r])&&(e[r]=e[r].map(e=>v(e,t)))}return e}function _(e){return v(e,"snake2camel")}function b(e){return v(e,"camel2snake")}function T(e){return function(e,t="-"){e=e||new Date;const r=[];return r.push(e.getFullYear()),r.push(("00"+(e.getMonth()+1)).substr(-2)),r.push(("00"+e.getDate()).substr(-2)),r.join(t)}(e=e||new Date)+" "+function(e,t=":"){e=e||new Date;const r=[];return r.push(("00"+e.getHours()).substr(-2)),r.push(("00"+e.getMinutes()).substr(-2)),r.push(("00"+e.getSeconds()).substr(-2)),r.join(t)}(e)}function E(){"development"===process.env.NODE_ENV&&console.log(...arguments)}function C(e=6){let t="";for(let r=0;r<e;r++)t+=Math.floor(10*Math.random());return t}function A(e){return Array.from(new Set(e))}function S(e={},t){if(!t||!e)return e;const r=["_pre","_purify","_post"];t._pre&&(e=t._pre(e));let n={shouldDelete:new Set([])};if(t._purify){const e=t._purify;for(const t in e)e[t]=new Set(e[t]);n=Object.assign(n,e)}if(p(t))for(const i in t){const o=t[i];l(o)&&-1===r.indexOf(i)?e[i]=o(e):"string"==typeof o&&-1===r.indexOf(i)&&(e[i]=e[o],n.shouldDelete.add(o))}else l(t)&&(e=t(e));if(n.shouldDelete)for(const t of n.shouldDelete)delete e[t];return t._post&&(e=t._post(e)),e}function I(e,t){const r=new e(t);return new Proxy(r,{get:function(e,t){if("function"==typeof e[t]&&0!==t.indexOf("_")&&e._protocols&&e._protocols[t]){const r=e._protocols[t];return async function(n){n=S(n,r.args);let i=await e[t](n);return i=S(i,r.returnValue),i}}return e[t]}})}function x(e){if(p(e))if(0===e.code)e.errCode=e.code,e.message=e.errMsg=e.msg,delete e.messageValues;else if(d(s,e.code)){const t=s[e.code];e.errCode="uni-id-"+t.errCode,e.errMsg=this.t(t.errCode,e.messageValues||{})||e.msg,e.message=e.msg=e.errMsg,delete e.messageValues}else e.code&&console.warn(`error code not found, error code: ${e.code}, please contact us`)}var k={"zh-Hans":{alipay:"支付宝",wechat:"微信",user:"用户","user-id":"用户ID","dcloud-appid":"应用Appid","dcloud-appid-list":"应用列表",account:"账号",username:"用户名",email:"邮箱",mobile:"手机号",sms:"短信","wechat-openid":"微信openid","wechat-account":"微信账号","alipay-account":"支付宝账号","qq-openid":"QQ openid","qq-account":"QQ账号","apple-account":"苹果账号",password:"密码","verify-code":"验证码","verify-code-type":"验证码类型","user-unique-param":"用户名、邮箱或手机号","role-id":"角色ID","permission-id":"权限ID",login:"登录","verify-mobile":"验证手机","context-param-required":"context内缺少{param}，请使用uniID.createInstance传入客户端信息","config-param-require":"uni-id的配置内缺少{param}","uni-verify-config-required":"请在config.json中配置service.univerify下一键登录相关参数","login-with-invite-type-required":"强制使用邀请码注册时，需指明type为register还是login","type-array-required":"{param}应为数组形式","query-field-warning":"检测到当前使用queryField匹配多字段进行登录操作，需要注意：uni-id并未限制用户名不能是手机号或邮箱，需要开发者自行限制。否则可能出现用户输入abc@xx.com会同时匹配到邮箱为此值的用户和用户名为此值的用户，导致登录失败","add-role-admin-is-not-allowed":"不可新增roleID为admin的角色","password-secret-type-error":"config内passwordSecret类型错误，只可设置string类型和array类型","token-expires-config-warning":"tokenExpiresIn不可小于或等于tokenExpiresThreshold","type-function-required":"{param}应为function类型","dev-warning":"当前正在使用uniID.dev属性，注意此属性仅可用于开发调试","config-file-invalid":"请确保公用模块uni-id对应的配置文件（common/uni-config-center/uni-id/config.json）格式正确（不可包含注释）","config-file-not-found":"请在common/uni-config-center/uni-id/config.json内添加uni-id相关配置信息","hx-version-warning":"当前使用的HBuilderX版本过低，请升级HBuilderX到最新版本","account-banned":"账号已禁用","user-not-exist":"用户不存在","multi-user-matched":"匹配到多个账号","user-info-error":"用户信息不正确","user-account-conflict":"用户账号冲突","user-account-closed":"此账号已注销","password-error":"密码错误","password-error-exceed-limit":"密码错误次数过多，请稍后再试","account-exists":"此账号已注册","account-not-exists":"此账号尚未注册","invalid-invite-code":"邀请码无效","get-third-party-account-failed":"获取{account}失败","get-third-party-user-info-failed":"获取用户信息失败","param-required":"{param}不可为空","check-device-feature-failed":"设备特征校验未通过","token-not-exist":"登录状态无效，云端已不包含此token","token-expired":"token已过期","check-token-failed":"token校验未通过","invalid-old-password":"旧密码错误","param-error":"{param}参数错误，{reason}","invalid-verify-code":"{type}验证码错误或已失效","send-sms-code-failed":"短信验证码发送失败","account-bound":"此账号已被绑定","unbind-failed":"解绑失败","set-invite-code-failed":"邀请码设置失败","modify-invite-code-is-not-allowed":"邀请码不可修改","decrypt-weixin-data-failed":"解密失败","invalid-weixin-appid":"appid不匹配","database-operation-failed":"数据库读写异常","role-not-exist":"角色不存在","permission-not-exist":"权限不存在","context-required":"uni-id无法获取context.{key}，请使用uniID.createInstance方法传入","limit-client-platform":"当前客户端平台不支持此接口"},en:{alipay:"alipay",wechat:"wechat",user:"user","user-id":"user id","dcloud-appid":"DCloud appid","dcloud-appid-list":"DCloud appid list",account:"account",username:"username",email:"email",mobile:"phone number",sms:"sms","wechat-openid":"wechat openid","wechat-account":"wechat account","alipay-account":"alipay account","qq-openid":"QQ openid","qq-account":"QQ account","apple-account":"apple account",password:"password","verify-code":"verify code","verify-code-type":"verify code type","user-unique-param":"username, email or mobile phone number","role-id":"role id","permission-id":"permission id",login:"login","verify-mobile":"verify mobile phone number","context-param-required":"You should pass {param} in context using uniID.createInstance","config-param-require":"{param} is required in uni-id's config","uni-verify-config-required":"Univerify config required: service.univerify","login-with-invite-type-required":"Parameter type is required when forceInviteCode set to true","type-array-required":"Type of {param} must be array","query-field-warning":"You are using multi query field to login, be aware that uni-id will not check username's fromat, eg: abc@xx.com is a valid username for uni-id. You should check username in your code.","add-role-admin-is-not-allowed":'Add role with an id of "admin" is not allowed',"password-secret-type-error":'"passwordSecret" in config must be string or array',"token-expires-config-warning":'"tokenExpiresIn" must be greater than "tokenExpiresThreshold"',"type-function-required":"{param} must be a function","dev-warning":"warning: uniID.dev is only for development","config-file-invalid":"Invalid config file (common/uni-config-center/uni-id/config.json), please note that comment is not allowed","config-file-not-found":"Config file (common/uni-config-center/uni-id/config.json) not found","hx-version-warning":"The HBuilderX you are using is too old, please upgrade to the latest version of HBuilderX","account-banned":"Account is banned","user-not-exist":"User does not exist","multi-user-matched":"Multiple users are matched","user-info-error":"User info error","user-account-conflict":"User account conflict","user-account-closed":"User account has been closed","password-error":"The password is incorrect","password-error-exceed-limit":"The number of password errors exceeded the limit","account-exists":"Account exists","account-not-exists":"Account does not exists","invalid-invite-code":"Invalid invite code","get-third-party-account-failed":"Get {account} failed","get-third-party-user-info-failed":"Get user info failed","param-required":"{param} is required","check-device-feature-failed":"Check device feature failed","token-not-exist":"The login status is invalid, token does not exist","token-expired":"The login status is invalid, token has expired","check-token-failed":"Check token failed","invalid-old-password":"Invalid old password","param-error":"{param} error, {reason}","invalid-verify-code":"Invalid {type} verify code","send-sms-code-failed":"Send sms code failed","account-bound":"Account has been bound","unbind-failed":"Unbind failed","set-invite-code-failed":"Set invite code failed","modify-invite-code-is-not-allowed":"Modifying the invitation code is prohibited","decrypt-weixin-data-failed":"Decrypt weixin data failed","invalid-weixin-appid":"Invalid weixin appid","database-operation-failed":"Database operation failed","role-not-exist":"Role does not exist","permission-not-exist":"Permission does not exist","context-required":'"context.{key}" is required, you should pass context using uniID.createInstance',"limit-client-platform":"Unsupported client platform"}};const O=uniCloud.database(),P=O.collection("uni-id-users"),R=O.collection("opendb-verify-codes"),j=O.collection("uni-id-roles"),D=O.collection("uni-id-permissions"),q={username:"username",mobile:"mobile",email:"email",wx_unionid:"wechat-account","wx_openid.app-plus":"wechat-account","wx_openid.app":"wechat-account","wx_openid.mp-weixin":"wechat-account",qq_unionid:"qq-account","qq_openid.app-plus":"qq-account","qq_openid.app":"qq-account","qq_openid.mp-weixin":"qq-account",ali_openid:"alipay-account",apple_openid:"alipay-account"},N=90002,U=90003,L=90004,V=90005,M=0,B=1,F=4;async function $({uid:e,status:t}={}){return e?(await P.doc(e).update({status:t,status_update_date:Date.now()}),{code:0}):{code:N,messageValues:{param:this.t("user-id")}}}async function H({name:e,url:t,data:r,options:n,defaultOptions:i}){let o={};const s=b(Object.assign({},r));s&&s.access_token&&delete s.access_token;try{n=Object.assign({},i,n,{data:s}),o=await uniCloud.httpclient.request(t,n)}catch(t){return function(e,t){throw new a({code:t.code||-2,message:t.message||e+" fail"})}(e,t)}let c=o.data;const u=o.headers["content-type"];if(!Buffer.isBuffer(c)||0!==u.indexOf("text/plain")&&0!==u.indexOf("application/json"))Buffer.isBuffer(c)&&(c={buffer:c,contentType:u});else try{c=JSON.parse(c.toString())}catch(e){c=c.toString()}return _(function(e,t){if(t.errcode)throw new a({code:t.errcode||-2,message:t.errmsg||e+" fail"});return delete t.errcode,delete t.errmsg,{...t,errMsg:e+" ok",errCode:0}}(e,c||{errCode:-2,errMsg:"Request failed"}))}function K(e,t){let r="";if(t&&t.accessToken){r=`${e.indexOf("?")>-1?"&":"?"}access_token=${t.accessToken}`}return`${e}${r}`}class G{constructor(e){this.options=Object.assign({baseUrl:"https://api.weixin.qq.com",timeout:5e3},e)}async _requestWxOpenapi({name:e,url:t,data:r,options:n}){const i={method:"GET",dataType:"json",dataAsQueryString:!0,timeout:this.options.timeout};return await H({name:"auth."+e,url:`${this.options.baseUrl}${K(t,r)}`,data:r,options:n,defaultOptions:i})}async code2Session(e){return await this._requestWxOpenapi({name:"code2Session",url:"/sns/jscode2session",data:{grant_type:"authorization_code",appid:this.options.appId,secret:this.options.secret,js_code:e}})}async getOauthAccessToken(e){const t=await this._requestWxOpenapi({name:"getOauthAccessToken",url:"/sns/oauth2/access_token",data:{grant_type:"authorization_code",appid:this.options.appId,secret:this.options.secret,code:e}});return t.expiresIn&&(t.expired=Date.now()+t.expiresIn),t}async getUserInfo({accessToken:e,openid:t}={}){const{nickname:r,headimgurl:n}=await this._requestWxOpenapi({name:"getUserInfo",url:"/sns/userinfo",data:{accessToken:e,openid:t,appid:this.options.appId,secret:this.options.secret,scope:"snsapi_userinfo"}});return{nickname:r,avatar:n}}}async function Q({name:e,url:t,data:r,options:n,defaultOptions:i}){let o;n=Object.assign({},i,n,{data:b(Object.assign({},r))});try{o=await uniCloud.httpclient.request(t,n)}catch(t){return function(e,t){throw new a({code:t.code||-2,message:t.message||e+" fail"})}(e,t)}let s=o.data;const c=o.headers["content-type"];if(!Buffer.isBuffer(s)||0!==c.indexOf("text/plain")&&0!==c.indexOf("application/json"))Buffer.isBuffer(s)&&(s={buffer:s,contentType:c});else try{s=JSON.parse(s.toString())}catch(e){s=s.toString()}return _(function(e,t){if(t.ret||t.error){const r=t.ret||t.error||t.errcode||-2,n=t.msg||t.error_description||t.errmsg||e+" fail";throw new a({code:r,message:n})}return delete t.ret,delete t.msg,delete t.error,delete t.error_description,delete t.errcode,delete t.errmsg,{...t,errMsg:e+" ok",errCode:0}}(e,s||{errCode:-2,errMsg:"Request failed"}))}class X{constructor(e){this.options=Object.assign({baseUrl:"https://graph.qq.com",timeout:5e3},e)}async _requestQQOpenapi({name:e,url:t,data:r,options:n}){const i={method:"GET",dataType:"json",dataAsQueryString:!0,timeout:this.options.timeout};var o,s;return await Q({name:"auth."+e,url:(o=this.options.baseUrl,s=t,/^https?:/.test(s)?s:o+s),data:r,options:n,defaultOptions:i})}async getOpenidByToken({accessToken:e}={}){const t=await this._requestQQOpenapi({name:"getOpenidByToken",url:"/oauth2.0/me",data:{accessToken:e,unionid:1,fmt:"json"}});if(t.clientId!==this.options.appId)throw new a({code:"APPID_NOT_MATCH",message:"appid not match"});return{openid:t.openid,unionid:t.unionid}}async code2Session({code:e}={}){return await this._requestQQOpenapi({name:"getOpenidByToken",url:"https://api.q.qq.com/sns/jscode2session",data:{grant_type:"authorization_code",appid:this.options.appId,secret:this.options.secret,js_code:e}})}}const Y={RSA:"RSA-SHA1",RSA2:"RSA-SHA256"};var z={code2Session:{returnValue:{openid:"userId"}}};class J extends class{constructor(e={}){if(!e.appId)throw new Error("appId required");if(!e.privateKey)throw new Error("privateKey required");const t={gateway:"https://openapi.alipay.com/gateway.do",timeout:5e3,charset:"utf-8",version:"1.0",signType:"RSA2",timeOffset:-(new Date).getTimezoneOffset()/60,keyType:"PKCS8"};e.sandbox&&(e.gateway="https://openapi.alipaydev.com/gateway.do"),this.options=Object.assign({},t,e);const r="PKCS8"===this.options.keyType?"PRIVATE KEY":"RSA PRIVATE KEY";this.options.privateKey=this._formatKey(this.options.privateKey,r),this.options.alipayPublicKey&&(this.options.alipayPublicKey=this._formatKey(this.options.alipayPublicKey,"PUBLIC KEY"))}_formatKey(e,t){return`-----BEGIN ${t}-----\n${e}\n-----END ${t}-----`}_formatUrl(e,t){let r=e;const n=["app_id","method","format","charset","sign_type","sign","timestamp","version","notify_url","return_url","auth_token","app_auth_token"];for(const e in t)if(n.indexOf(e)>-1){const n=encodeURIComponent(t[e]);r=`${r}${r.includes("?")?"&":"?"}${e}=${n}`,delete t[e]}return{execParams:t,url:r}}_getSign(e,r){const n=r.bizContent||null;delete r.bizContent;const i=Object.assign({method:e,appId:this.options.appId,charset:this.options.charset,version:this.options.version,signType:this.options.signType,timestamp:T((o=this.options.timeOffset,new Date(Date.now()+6e4*((new Date).getTimezoneOffset()+60*(o||0)))))},r);var o;n&&(i.bizContent=JSON.stringify(b(n)));const s=b(i),a=Object.keys(s).sort().map(e=>{let t=s[e];return"[object String]"!==Array.prototype.toString.call(t)&&(t=JSON.stringify(t)),`${e}=${t}`}).join("&"),c=t.createSign(Y[this.options.signType]).update(a,"utf8").sign(this.options.privateKey,"base64");return Object.assign(s,{sign:c})}async _exec(e,t={},r={}){const n=this._getSign(e,t),{url:i,execParams:o}=this._formatUrl(this.options.gateway,n),{status:s,data:a}=await uniCloud.httpclient.request(i,{method:"POST",data:o,dataType:"text",timeout:this.options.timeout});if(200!==s)throw new Error("request fail");const c=JSON.parse(a),u=e.replace(/\./g,"_")+"_response",d=c[u],p=c.error_response;if(d){if(!r.validateSign||this._checkResponseSign(a,u)){if(!d.code||"10000"===d.code){return{errCode:0,errMsg:d.msg||"",..._(d)}}const e=d.sub_code?`${d.sub_code} ${d.sub_msg}`:""+(d.msg||"unkonwn error");throw new Error(e)}throw new Error("check sign error")}if(p)throw new Error(p.sub_msg||p.msg||"request fail");throw new Error("request fail")}_checkResponseSign(e,r){if(!this.options.alipayPublicKey||""===this.options.alipayPublicKey)return console.warn("options.alipayPublicKey is empty"),!0;if(!e)return!1;const n=this._getSignStr(e,r),i=JSON.parse(e).sign,o=t.createVerify(Y[this.options.signType]);return o.update(n,"utf8"),o.verify(this.options.alipayPublicKey,i,"base64")}_getSignStr(e,t){let r=e.trim();const n=e.indexOf(t+'"'),i=e.lastIndexOf('"sign"');return r=r.substr(n+t.length+1),r=r.substr(0,i),r=r.replace(/^[^{]*{/g,"{"),r=r.replace(/\}([^}]*)$/g,"}"),r}}{constructor(e){super(e),this._protocols=z}async code2Session(e){return await this._exec("alipay.system.oauth.token",{grantType:"authorization_code",code:e})}}function W(e){var t=e[0];return t<"0"||t>"7"?"00"+e:e}function Z(e){var t=e.toString(16);return t.length%2?"0"+t:t}function ee(e){if(e<=127)return Z(e);var t=Z(e);return Z(128+t.length/2)+t}function te(e,t){return e(t={exports:{}},t.exports),t.exports}var re=te((function(e,t){var n=r.Buffer;function i(e,t){for(var r in e)t[r]=e[r]}function o(e,t,r){return n(e,t,r)}n.from&&n.alloc&&n.allocUnsafe&&n.allocUnsafeSlow?e.exports=r:(i(r,t),t.Buffer=o),o.prototype=Object.create(n.prototype),i(n,o),o.from=function(e,t,r){if("number"==typeof e)throw new TypeError("Argument must not be a number");return n(e,t,r)},o.alloc=function(e,t,r){if("number"!=typeof e)throw new TypeError("Argument must be a number");var i=n(e);return void 0!==t?"string"==typeof r?i.fill(t,r):i.fill(t):i.fill(0),i},o.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return n(e)},o.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return r.SlowBuffer(e)}})),ne=(re.Buffer,re.Buffer);function ie(e){if(this.buffer=null,this.writable=!0,this.readable=!0,!e)return this.buffer=ne.alloc(0),this;if("function"==typeof e.pipe)return this.buffer=ne.alloc(0),e.pipe(this),this;if(e.length||"object"==typeof e)return this.buffer=e,this.writable=!1,process.nextTick(function(){this.emit("end",e),this.readable=!1,this.emit("close")}.bind(this)),this;throw new TypeError("Unexpected data type ("+typeof e+")")}i.inherits(ie,n),ie.prototype.write=function(e){this.buffer=ne.concat([this.buffer,ne.from(e)]),this.emit("data",e)},ie.prototype.end=function(e){e&&this.write(e),this.emit("end",e),this.emit("close"),this.writable=!1,this.readable=!1};var oe=ie,se=r.Buffer,ae=r.SlowBuffer,ce=ue;function ue(e,t){if(!se.isBuffer(e)||!se.isBuffer(t))return!1;if(e.length!==t.length)return!1;for(var r=0,n=0;n<e.length;n++)r|=e[n]^t[n];return 0===r}ue.install=function(){se.prototype.equal=ae.prototype.equal=function(e){return ue(this,e)}};var de=se.prototype.equal,pe=ae.prototype.equal;function le(e){return(e/8|0)+(e%8==0?0:1)}ue.restore=function(){se.prototype.equal=de,ae.prototype.equal=pe};var fe={ES256:le(256),ES384:le(384),ES512:le(521)};var me=function(e){var t=fe[e];if(t)return t;throw new Error('Unknown algorithm "'+e+'"')},he=re.Buffer;function ge(e){if(he.isBuffer(e))return e;if("string"==typeof e)return he.from(e,"base64");throw new TypeError("ECDSA signature must be a Base64 string or a Buffer")}function ye(e,t,r){for(var n=0;t+n<r&&0===e[t+n];)++n;return e[t+n]>=128&&--n,n}var we={derToJose:function(e,t){e=ge(e);var r=me(t),n=r+1,i=e.length,o=0;if(48!==e[o++])throw new Error('Could not find expected "seq"');var s=e[o++];if(129===s&&(s=e[o++]),i-o<s)throw new Error('"seq" specified length of "'+s+'", only "'+(i-o)+'" remaining');if(2!==e[o++])throw new Error('Could not find expected "int" for "r"');var a=e[o++];if(i-o-2<a)throw new Error('"r" specified length of "'+a+'", only "'+(i-o-2)+'" available');if(n<a)throw new Error('"r" specified length of "'+a+'", max of "'+n+'" is acceptable');var c=o;if(o+=a,2!==e[o++])throw new Error('Could not find expected "int" for "s"');var u=e[o++];if(i-o!==u)throw new Error('"s" specified length of "'+u+'", expected "'+(i-o)+'"');if(n<u)throw new Error('"s" specified length of "'+u+'", max of "'+n+'" is acceptable');var d=o;if((o+=u)!==i)throw new Error('Expected to consume entire buffer, but "'+(i-o)+'" bytes remain');var p=r-a,l=r-u,f=he.allocUnsafe(p+a+l+u);for(o=0;o<p;++o)f[o]=0;e.copy(f,o,c+Math.max(-p,0),c+a);for(var m=o=r;o<m+l;++o)f[o]=0;return e.copy(f,o,d+Math.max(-l,0),d+u),f=(f=f.toString("base64")).replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")},joseToDer:function(e,t){e=ge(e);var r=me(t),n=e.length;if(n!==2*r)throw new TypeError('"'+t+'" signatures must be "'+2*r+'" bytes, saw "'+n+'"');var i=ye(e,0,r),o=ye(e,r,e.length),s=r-i,a=r-o,c=2+s+1+1+a,u=c<128,d=he.allocUnsafe((u?2:3)+c),p=0;return d[p++]=48,u?d[p++]=c:(d[p++]=129,d[p++]=255&c),d[p++]=2,d[p++]=s,i<0?(d[p++]=0,p+=e.copy(d,p,0,r)):p+=e.copy(d,p,i,r),d[p++]=2,d[p++]=a,o<0?(d[p++]=0,e.copy(d,p,r)):e.copy(d,p,r+o),d}},ve=re.Buffer,_e="secret must be a string or buffer",be="key must be a string or a buffer",Te="function"==typeof t.createPublicKey;function Ee(e){if(!ve.isBuffer(e)&&"string"!=typeof e){if(!Te)throw Ie(be);if("object"!=typeof e)throw Ie(be);if("string"!=typeof e.type)throw Ie(be);if("string"!=typeof e.asymmetricKeyType)throw Ie(be);if("function"!=typeof e.export)throw Ie(be)}}function Ce(e){if(!ve.isBuffer(e)&&"string"!=typeof e&&"object"!=typeof e)throw Ie("key must be a string, a buffer or an object")}function Ae(e){return e.replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")}function Se(e){var t=4-(e=e.toString()).length%4;if(4!==t)for(var r=0;r<t;++r)e+="=";return e.replace(/\-/g,"+").replace(/_/g,"/")}function Ie(e){var t=[].slice.call(arguments,1),r=i.format.bind(i,e).apply(null,t);return new TypeError(r)}function xe(e){var t;return t=e,ve.isBuffer(t)||"string"==typeof t||(e=JSON.stringify(e)),e}function ke(e){return function(r,n){!function(e){if(!ve.isBuffer(e)){if("string"==typeof e)return e;if(!Te)throw Ie(_e);if("object"!=typeof e)throw Ie(_e);if("secret"!==e.type)throw Ie(_e);if("function"!=typeof e.export)throw Ie(_e)}}(n),r=xe(r);var i=t.createHmac("sha"+e,n);return Ae((i.update(r),i.digest("base64")))}}function Oe(e){return function(t,r,n){var i=ke(e)(t,n);return ce(ve.from(r),ve.from(i))}}function Pe(e){return function(r,n){Ce(n),r=xe(r);var i=t.createSign("RSA-SHA"+e);return Ae((i.update(r),i.sign(n,"base64")))}}function Re(e){return function(r,n,i){Ee(i),r=xe(r),n=Se(n);var o=t.createVerify("RSA-SHA"+e);return o.update(r),o.verify(i,n,"base64")}}function je(e){return function(r,n){Ce(n),r=xe(r);var i=t.createSign("RSA-SHA"+e);return Ae((i.update(r),i.sign({key:n,padding:t.constants.RSA_PKCS1_PSS_PADDING,saltLength:t.constants.RSA_PSS_SALTLEN_DIGEST},"base64")))}}function De(e){return function(r,n,i){Ee(i),r=xe(r),n=Se(n);var o=t.createVerify("RSA-SHA"+e);return o.update(r),o.verify({key:i,padding:t.constants.RSA_PKCS1_PSS_PADDING,saltLength:t.constants.RSA_PSS_SALTLEN_DIGEST},n,"base64")}}function qe(e){var t=Pe(e);return function(){var r=t.apply(null,arguments);return r=we.derToJose(r,"ES"+e)}}function Ne(e){var t=Re(e);return function(r,n,i){return n=we.joseToDer(n,"ES"+e).toString("base64"),t(r,n,i)}}function Ue(){return function(){return""}}function Le(){return function(e,t){return""===t}}Te&&(be+=" or a KeyObject",_e+="or a KeyObject");var Ve=function(e){var t={hs:ke,rs:Pe,ps:je,es:qe,none:Ue},r={hs:Oe,rs:Re,ps:De,es:Ne,none:Le},n=e.match(/^(RS|PS|ES|HS)(256|384|512)$|^(none)$/i);if(!n)throw Ie('"%s" is not a valid algorithm.\n  Supported algorithms are:\n  "HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "PS256", "PS384", "PS512", "ES256", "ES384", "ES512" and "none".',e);var i=(n[1]||n[3]).toLowerCase(),o=n[2];return{sign:t[i](o),verify:r[i](o)}},Me=r.Buffer,Be=function(e){return"string"==typeof e?e:"number"==typeof e||Me.isBuffer(e)?e.toString():JSON.stringify(e)},Fe=re.Buffer;function $e(e,t){return Fe.from(e,t).toString("base64").replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")}function He(e){var t=e.header,r=e.payload,n=e.secret||e.privateKey,o=e.encoding,s=Ve(t.alg),a=function(e,t,r){r=r||"utf8";var n=$e(Be(e),"binary"),o=$e(Be(t),r);return i.format("%s.%s",n,o)}(t,r,o),c=s.sign(a,n);return i.format("%s.%s",a,c)}function Ke(e){var t=e.secret||e.privateKey||e.key,r=new oe(t);this.readable=!0,this.header=e.header,this.encoding=e.encoding,this.secret=this.privateKey=this.key=r,this.payload=new oe(e.payload),this.secret.once("close",function(){!this.payload.writable&&this.readable&&this.sign()}.bind(this)),this.payload.once("close",function(){!this.secret.writable&&this.readable&&this.sign()}.bind(this))}i.inherits(Ke,n),Ke.prototype.sign=function(){try{var e=He({header:this.header,payload:this.payload.buffer,secret:this.secret.buffer,encoding:this.encoding});return this.emit("done",e),this.emit("data",e),this.emit("end"),this.readable=!1,e}catch(e){this.readable=!1,this.emit("error",e),this.emit("close")}},Ke.sign=He;var Ge=Ke,Qe=re.Buffer,Xe=/^[a-zA-Z0-9\-_]+?\.[a-zA-Z0-9\-_]+?\.([a-zA-Z0-9\-_]+)?$/;function Ye(e){if(function(e){return"[object Object]"===Object.prototype.toString.call(e)}(e))return e;try{return JSON.parse(e)}catch(e){return}}function ze(e){var t=e.split(".",1)[0];return Ye(Qe.from(t,"base64").toString("binary"))}function Je(e){return e.split(".")[2]}function We(e){return Xe.test(e)&&!!ze(e)}function Ze(e,t,r){if(!t){var n=new Error("Missing algorithm parameter for jws.verify");throw n.code="MISSING_ALGORITHM",n}var i=Je(e=Be(e)),o=function(e){return e.split(".",2).join(".")}(e);return Ve(t).verify(o,i,r)}function et(e,t){if(t=t||{},!We(e=Be(e)))return null;var r=ze(e);if(!r)return null;var n=function(e,t){t=t||"utf8";var r=e.split(".")[1];return Qe.from(r,"base64").toString(t)}(e);return("JWT"===r.typ||t.json)&&(n=JSON.parse(n,t.encoding)),{header:r,payload:n,signature:Je(e)}}function tt(e){var t=(e=e||{}).secret||e.publicKey||e.key,r=new oe(t);this.readable=!0,this.algorithm=e.algorithm,this.encoding=e.encoding,this.secret=this.publicKey=this.key=r,this.signature=new oe(e.signature),this.secret.once("close",function(){!this.signature.writable&&this.readable&&this.verify()}.bind(this)),this.signature.once("close",function(){!this.secret.writable&&this.readable&&this.verify()}.bind(this))}i.inherits(tt,n),tt.prototype.verify=function(){try{var e=Ze(this.signature.buffer,this.algorithm,this.key.buffer),t=et(this.signature.buffer,this.encoding);return this.emit("done",e,t),this.emit("data",e),this.emit("end"),this.readable=!1,e}catch(e){this.readable=!1,this.emit("error",e),this.emit("close")}},tt.decode=et,tt.isValid=We,tt.verify=Ze;var rt=tt,nt={ALGORITHMS:["HS256","HS384","HS512","RS256","RS384","RS512","PS256","PS384","PS512","ES256","ES384","ES512"],sign:Ge.sign,verify:rt.verify,decode:rt.decode,isValid:rt.isValid,createSign:function(e){return new Ge(e)},createVerify:function(e){return new rt(e)}},it=function(e,t){t=t||{};var r=nt.decode(e,t);if(!r)return null;var n=r.payload;if("string"==typeof n)try{var i=JSON.parse(n);null!==i&&"object"==typeof i&&(n=i)}catch(e){}return!0===t.complete?{header:r.header,payload:n,signature:r.signature}:n},ot=function(e,t){Error.call(this,e),Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor),this.name="JsonWebTokenError",this.message=e,t&&(this.inner=t)};(ot.prototype=Object.create(Error.prototype)).constructor=ot;var st=ot,at=function(e,t){st.call(this,e),this.name="NotBeforeError",this.date=t};(at.prototype=Object.create(st.prototype)).constructor=at;var ct=at,ut=function(e,t){st.call(this,e),this.name="TokenExpiredError",this.expiredAt=t};(ut.prototype=Object.create(st.prototype)).constructor=ut;var dt=ut,pt=1e3,lt=60*pt,ft=60*lt,mt=24*ft,ht=function(e,t){t=t||{};var r=typeof e;if("string"===r&&e.length>0)return function(e){if((e=String(e)).length>100)return;var t=/^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(e);if(!t)return;var r=parseFloat(t[1]);switch((t[2]||"ms").toLowerCase()){case"years":case"year":case"yrs":case"yr":case"y":return 315576e5*r;case"weeks":case"week":case"w":return 6048e5*r;case"days":case"day":case"d":return r*mt;case"hours":case"hour":case"hrs":case"hr":case"h":return r*ft;case"minutes":case"minute":case"mins":case"min":case"m":return r*lt;case"seconds":case"second":case"secs":case"sec":case"s":return r*pt;case"milliseconds":case"millisecond":case"msecs":case"msec":case"ms":return r;default:return}}(e);if("number"===r&&isFinite(e))return t.long?function(e){var t=Math.abs(e);if(t>=mt)return gt(e,t,mt,"day");if(t>=ft)return gt(e,t,ft,"hour");if(t>=lt)return gt(e,t,lt,"minute");if(t>=pt)return gt(e,t,pt,"second");return e+" ms"}(e):function(e){var t=Math.abs(e);if(t>=mt)return Math.round(e/mt)+"d";if(t>=ft)return Math.round(e/ft)+"h";if(t>=lt)return Math.round(e/lt)+"m";if(t>=pt)return Math.round(e/pt)+"s";return e+"ms"}(e);throw new Error("val is not a non-empty string or a valid number. val="+JSON.stringify(e))};function gt(e,t,r,n){var i=t>=1.5*r;return Math.round(e/r)+" "+n+(i?"s":"")}var yt=function(e,t){var r=t||Math.floor(Date.now()/1e3);if("string"==typeof e){var n=ht(e);if(void 0===n)return;return Math.floor(r+n/1e3)}return"number"==typeof e?r+e:void 0},wt=te((function(e,t){var r;t=e.exports=G,r="object"==typeof process&&process.env&&process.env.NODE_DEBUG&&/\bsemver\b/i.test(process.env.NODE_DEBUG)?function(){var e=Array.prototype.slice.call(arguments,0);e.unshift("SEMVER"),console.log.apply(console,e)}:function(){},t.SEMVER_SPEC_VERSION="2.0.0";var n=Number.MAX_SAFE_INTEGER||9007199254740991,i=t.re=[],o=t.src=[],s=0,a=s++;o[a]="0|[1-9]\\d*";var c=s++;o[c]="[0-9]+";var u=s++;o[u]="\\d*[a-zA-Z-][a-zA-Z0-9-]*";var d=s++;o[d]="("+o[a]+")\\.("+o[a]+")\\.("+o[a]+")";var p=s++;o[p]="("+o[c]+")\\.("+o[c]+")\\.("+o[c]+")";var l=s++;o[l]="(?:"+o[a]+"|"+o[u]+")";var f=s++;o[f]="(?:"+o[c]+"|"+o[u]+")";var m=s++;o[m]="(?:-("+o[l]+"(?:\\."+o[l]+")*))";var h=s++;o[h]="(?:-?("+o[f]+"(?:\\."+o[f]+")*))";var g=s++;o[g]="[0-9A-Za-z-]+";var y=s++;o[y]="(?:\\+("+o[g]+"(?:\\."+o[g]+")*))";var w=s++,v="v?"+o[d]+o[m]+"?"+o[y]+"?";o[w]="^"+v+"$";var _="[v=\\s]*"+o[p]+o[h]+"?"+o[y]+"?",b=s++;o[b]="^"+_+"$";var T=s++;o[T]="((?:<|>)?=?)";var E=s++;o[E]=o[c]+"|x|X|\\*";var C=s++;o[C]=o[a]+"|x|X|\\*";var A=s++;o[A]="[v=\\s]*("+o[C]+")(?:\\.("+o[C]+")(?:\\.("+o[C]+")(?:"+o[m]+")?"+o[y]+"?)?)?";var S=s++;o[S]="[v=\\s]*("+o[E]+")(?:\\.("+o[E]+")(?:\\.("+o[E]+")(?:"+o[h]+")?"+o[y]+"?)?)?";var I=s++;o[I]="^"+o[T]+"\\s*"+o[A]+"$";var x=s++;o[x]="^"+o[T]+"\\s*"+o[S]+"$";var k=s++;o[k]="(?:^|[^\\d])(\\d{1,16})(?:\\.(\\d{1,16}))?(?:\\.(\\d{1,16}))?(?:$|[^\\d])";var O=s++;o[O]="(?:~>?)";var P=s++;o[P]="(\\s*)"+o[O]+"\\s+",i[P]=new RegExp(o[P],"g");var R=s++;o[R]="^"+o[O]+o[A]+"$";var j=s++;o[j]="^"+o[O]+o[S]+"$";var D=s++;o[D]="(?:\\^)";var q=s++;o[q]="(\\s*)"+o[D]+"\\s+",i[q]=new RegExp(o[q],"g");var N=s++;o[N]="^"+o[D]+o[A]+"$";var U=s++;o[U]="^"+o[D]+o[S]+"$";var L=s++;o[L]="^"+o[T]+"\\s*("+_+")$|^$";var V=s++;o[V]="^"+o[T]+"\\s*("+v+")$|^$";var M=s++;o[M]="(\\s*)"+o[T]+"\\s*("+_+"|"+o[A]+")",i[M]=new RegExp(o[M],"g");var B=s++;o[B]="^\\s*("+o[A]+")\\s+-\\s+("+o[A]+")\\s*$";var F=s++;o[F]="^\\s*("+o[S]+")\\s+-\\s+("+o[S]+")\\s*$";var $=s++;o[$]="(<|>)?=?\\s*\\*";for(var H=0;H<35;H++)r(H,o[H]),i[H]||(i[H]=new RegExp(o[H]));function K(e,t){if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),e instanceof G)return e;if("string"!=typeof e)return null;if(e.length>256)return null;if(!(t.loose?i[b]:i[w]).test(e))return null;try{return new G(e,t)}catch(e){return null}}function G(e,t){if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),e instanceof G){if(e.loose===t.loose)return e;e=e.version}else if("string"!=typeof e)throw new TypeError("Invalid Version: "+e);if(e.length>256)throw new TypeError("version is longer than 256 characters");if(!(this instanceof G))return new G(e,t);r("SemVer",e,t),this.options=t,this.loose=!!t.loose;var o=e.trim().match(t.loose?i[b]:i[w]);if(!o)throw new TypeError("Invalid Version: "+e);if(this.raw=e,this.major=+o[1],this.minor=+o[2],this.patch=+o[3],this.major>n||this.major<0)throw new TypeError("Invalid major version");if(this.minor>n||this.minor<0)throw new TypeError("Invalid minor version");if(this.patch>n||this.patch<0)throw new TypeError("Invalid patch version");o[4]?this.prerelease=o[4].split(".").map((function(e){if(/^[0-9]+$/.test(e)){var t=+e;if(t>=0&&t<n)return t}return e})):this.prerelease=[],this.build=o[5]?o[5].split("."):[],this.format()}t.parse=K,t.valid=function(e,t){var r=K(e,t);return r?r.version:null},t.clean=function(e,t){var r=K(e.trim().replace(/^[=v]+/,""),t);return r?r.version:null},t.SemVer=G,G.prototype.format=function(){return this.version=this.major+"."+this.minor+"."+this.patch,this.prerelease.length&&(this.version+="-"+this.prerelease.join(".")),this.version},G.prototype.toString=function(){return this.version},G.prototype.compare=function(e){return r("SemVer.compare",this.version,this.options,e),e instanceof G||(e=new G(e,this.options)),this.compareMain(e)||this.comparePre(e)},G.prototype.compareMain=function(e){return e instanceof G||(e=new G(e,this.options)),X(this.major,e.major)||X(this.minor,e.minor)||X(this.patch,e.patch)},G.prototype.comparePre=function(e){if(e instanceof G||(e=new G(e,this.options)),this.prerelease.length&&!e.prerelease.length)return-1;if(!this.prerelease.length&&e.prerelease.length)return 1;if(!this.prerelease.length&&!e.prerelease.length)return 0;var t=0;do{var n=this.prerelease[t],i=e.prerelease[t];if(r("prerelease compare",t,n,i),void 0===n&&void 0===i)return 0;if(void 0===i)return 1;if(void 0===n)return-1;if(n!==i)return X(n,i)}while(++t)},G.prototype.inc=function(e,t){switch(e){case"premajor":this.prerelease.length=0,this.patch=0,this.minor=0,this.major++,this.inc("pre",t);break;case"preminor":this.prerelease.length=0,this.patch=0,this.minor++,this.inc("pre",t);break;case"prepatch":this.prerelease.length=0,this.inc("patch",t),this.inc("pre",t);break;case"prerelease":0===this.prerelease.length&&this.inc("patch",t),this.inc("pre",t);break;case"major":0===this.minor&&0===this.patch&&0!==this.prerelease.length||this.major++,this.minor=0,this.patch=0,this.prerelease=[];break;case"minor":0===this.patch&&0!==this.prerelease.length||this.minor++,this.patch=0,this.prerelease=[];break;case"patch":0===this.prerelease.length&&this.patch++,this.prerelease=[];break;case"pre":if(0===this.prerelease.length)this.prerelease=[0];else{for(var r=this.prerelease.length;--r>=0;)"number"==typeof this.prerelease[r]&&(this.prerelease[r]++,r=-2);-1===r&&this.prerelease.push(0)}t&&(this.prerelease[0]===t?isNaN(this.prerelease[1])&&(this.prerelease=[t,0]):this.prerelease=[t,0]);break;default:throw new Error("invalid increment argument: "+e)}return this.format(),this.raw=this.version,this},t.inc=function(e,t,r,n){"string"==typeof r&&(n=r,r=void 0);try{return new G(e,r).inc(t,n).version}catch(e){return null}},t.diff=function(e,t){if(W(e,t))return null;var r=K(e),n=K(t),i="";if(r.prerelease.length||n.prerelease.length){i="pre";var o="prerelease"}for(var s in r)if(("major"===s||"minor"===s||"patch"===s)&&r[s]!==n[s])return i+s;return o},t.compareIdentifiers=X;var Q=/^[0-9]+$/;function X(e,t){var r=Q.test(e),n=Q.test(t);return r&&n&&(e=+e,t=+t),e===t?0:r&&!n?-1:n&&!r?1:e<t?-1:1}function Y(e,t,r){return new G(e,r).compare(new G(t,r))}function z(e,t,r){return Y(e,t,r)>0}function J(e,t,r){return Y(e,t,r)<0}function W(e,t,r){return 0===Y(e,t,r)}function Z(e,t,r){return 0!==Y(e,t,r)}function ee(e,t,r){return Y(e,t,r)>=0}function te(e,t,r){return Y(e,t,r)<=0}function re(e,t,r,n){switch(t){case"===":return"object"==typeof e&&(e=e.version),"object"==typeof r&&(r=r.version),e===r;case"!==":return"object"==typeof e&&(e=e.version),"object"==typeof r&&(r=r.version),e!==r;case"":case"=":case"==":return W(e,r,n);case"!=":return Z(e,r,n);case">":return z(e,r,n);case">=":return ee(e,r,n);case"<":return J(e,r,n);case"<=":return te(e,r,n);default:throw new TypeError("Invalid operator: "+t)}}function ne(e,t){if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),e instanceof ne){if(e.loose===!!t.loose)return e;e=e.value}if(!(this instanceof ne))return new ne(e,t);r("comparator",e,t),this.options=t,this.loose=!!t.loose,this.parse(e),this.semver===ie?this.value="":this.value=this.operator+this.semver.version,r("comp",this)}t.rcompareIdentifiers=function(e,t){return X(t,e)},t.major=function(e,t){return new G(e,t).major},t.minor=function(e,t){return new G(e,t).minor},t.patch=function(e,t){return new G(e,t).patch},t.compare=Y,t.compareLoose=function(e,t){return Y(e,t,!0)},t.rcompare=function(e,t,r){return Y(t,e,r)},t.sort=function(e,r){return e.sort((function(e,n){return t.compare(e,n,r)}))},t.rsort=function(e,r){return e.sort((function(e,n){return t.rcompare(e,n,r)}))},t.gt=z,t.lt=J,t.eq=W,t.neq=Z,t.gte=ee,t.lte=te,t.cmp=re,t.Comparator=ne;var ie={};function oe(e,t){if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),e instanceof oe)return e.loose===!!t.loose&&e.includePrerelease===!!t.includePrerelease?e:new oe(e.raw,t);if(e instanceof ne)return new oe(e.value,t);if(!(this instanceof oe))return new oe(e,t);if(this.options=t,this.loose=!!t.loose,this.includePrerelease=!!t.includePrerelease,this.raw=e,this.set=e.split(/\s*\|\|\s*/).map((function(e){return this.parseRange(e.trim())}),this).filter((function(e){return e.length})),!this.set.length)throw new TypeError("Invalid SemVer Range: "+e);this.format()}function se(e){return!e||"x"===e.toLowerCase()||"*"===e}function ae(e,t,r,n,i,o,s,a,c,u,d,p,l){return((t=se(r)?"":se(n)?">="+r+".0.0":se(i)?">="+r+"."+n+".0":">="+t)+" "+(a=se(c)?"":se(u)?"<"+(+c+1)+".0.0":se(d)?"<"+c+"."+(+u+1)+".0":p?"<="+c+"."+u+"."+d+"-"+p:"<="+a)).trim()}function ce(e,t,n){for(var i=0;i<e.length;i++)if(!e[i].test(t))return!1;if(t.prerelease.length&&!n.includePrerelease){for(i=0;i<e.length;i++)if(r(e[i].semver),e[i].semver!==ie&&e[i].semver.prerelease.length>0){var o=e[i].semver;if(o.major===t.major&&o.minor===t.minor&&o.patch===t.patch)return!0}return!1}return!0}function ue(e,t,r){try{t=new oe(t,r)}catch(e){return!1}return t.test(e)}function de(e,t,r,n){var i,o,s,a,c;switch(e=new G(e,n),t=new oe(t,n),r){case">":i=z,o=te,s=J,a=">",c=">=";break;case"<":i=J,o=ee,s=z,a="<",c="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(ue(e,t,n))return!1;for(var u=0;u<t.set.length;++u){var d=t.set[u],p=null,l=null;if(d.forEach((function(e){e.semver===ie&&(e=new ne(">=0.0.0")),p=p||e,l=l||e,i(e.semver,p.semver,n)?p=e:s(e.semver,l.semver,n)&&(l=e)})),p.operator===a||p.operator===c)return!1;if((!l.operator||l.operator===a)&&o(e,l.semver))return!1;if(l.operator===c&&s(e,l.semver))return!1}return!0}ne.prototype.parse=function(e){var t=this.options.loose?i[L]:i[V],r=e.match(t);if(!r)throw new TypeError("Invalid comparator: "+e);this.operator=r[1],"="===this.operator&&(this.operator=""),r[2]?this.semver=new G(r[2],this.options.loose):this.semver=ie},ne.prototype.toString=function(){return this.value},ne.prototype.test=function(e){return r("Comparator.test",e,this.options.loose),this.semver===ie||("string"==typeof e&&(e=new G(e,this.options)),re(e,this.operator,this.semver,this.options))},ne.prototype.intersects=function(e,t){if(!(e instanceof ne))throw new TypeError("a Comparator is required");var r;if(t&&"object"==typeof t||(t={loose:!!t,includePrerelease:!1}),""===this.operator)return r=new oe(e.value,t),ue(this.value,r,t);if(""===e.operator)return r=new oe(this.value,t),ue(e.semver,r,t);var n=!(">="!==this.operator&&">"!==this.operator||">="!==e.operator&&">"!==e.operator),i=!("<="!==this.operator&&"<"!==this.operator||"<="!==e.operator&&"<"!==e.operator),o=this.semver.version===e.semver.version,s=!(">="!==this.operator&&"<="!==this.operator||">="!==e.operator&&"<="!==e.operator),a=re(this.semver,"<",e.semver,t)&&(">="===this.operator||">"===this.operator)&&("<="===e.operator||"<"===e.operator),c=re(this.semver,">",e.semver,t)&&("<="===this.operator||"<"===this.operator)&&(">="===e.operator||">"===e.operator);return n||i||o&&s||a||c},t.Range=oe,oe.prototype.format=function(){return this.range=this.set.map((function(e){return e.join(" ").trim()})).join("||").trim(),this.range},oe.prototype.toString=function(){return this.range},oe.prototype.parseRange=function(e){var t=this.options.loose;e=e.trim();var n=t?i[F]:i[B];e=e.replace(n,ae),r("hyphen replace",e),e=e.replace(i[M],"$1$2$3"),r("comparator trim",e,i[M]),e=(e=(e=e.replace(i[P],"$1~")).replace(i[q],"$1^")).split(/\s+/).join(" ");var o=t?i[L]:i[V],s=e.split(" ").map((function(e){return function(e,t){return r("comp",e,t),e=function(e,t){return e.trim().split(/\s+/).map((function(e){return function(e,t){r("caret",e,t);var n=t.loose?i[U]:i[N];return e.replace(n,(function(t,n,i,o,s){var a;return r("caret",e,t,n,i,o,s),se(n)?a="":se(i)?a=">="+n+".0.0 <"+(+n+1)+".0.0":se(o)?a="0"===n?">="+n+"."+i+".0 <"+n+"."+(+i+1)+".0":">="+n+"."+i+".0 <"+(+n+1)+".0.0":s?(r("replaceCaret pr",s),a="0"===n?"0"===i?">="+n+"."+i+"."+o+"-"+s+" <"+n+"."+i+"."+(+o+1):">="+n+"."+i+"."+o+"-"+s+" <"+n+"."+(+i+1)+".0":">="+n+"."+i+"."+o+"-"+s+" <"+(+n+1)+".0.0"):(r("no pr"),a="0"===n?"0"===i?">="+n+"."+i+"."+o+" <"+n+"."+i+"."+(+o+1):">="+n+"."+i+"."+o+" <"+n+"."+(+i+1)+".0":">="+n+"."+i+"."+o+" <"+(+n+1)+".0.0"),r("caret return",a),a}))}(e,t)})).join(" ")}(e,t),r("caret",e),e=function(e,t){return e.trim().split(/\s+/).map((function(e){return function(e,t){var n=t.loose?i[j]:i[R];return e.replace(n,(function(t,n,i,o,s){var a;return r("tilde",e,t,n,i,o,s),se(n)?a="":se(i)?a=">="+n+".0.0 <"+(+n+1)+".0.0":se(o)?a=">="+n+"."+i+".0 <"+n+"."+(+i+1)+".0":s?(r("replaceTilde pr",s),a=">="+n+"."+i+"."+o+"-"+s+" <"+n+"."+(+i+1)+".0"):a=">="+n+"."+i+"."+o+" <"+n+"."+(+i+1)+".0",r("tilde return",a),a}))}(e,t)})).join(" ")}(e,t),r("tildes",e),e=function(e,t){return r("replaceXRanges",e,t),e.split(/\s+/).map((function(e){return function(e,t){e=e.trim();var n=t.loose?i[x]:i[I];return e.replace(n,(function(t,n,i,o,s,a){r("xRange",e,t,n,i,o,s,a);var c=se(i),u=c||se(o),d=u||se(s);return"="===n&&d&&(n=""),c?t=">"===n||"<"===n?"<0.0.0":"*":n&&d?(u&&(o=0),s=0,">"===n?(n=">=",u?(i=+i+1,o=0,s=0):(o=+o+1,s=0)):"<="===n&&(n="<",u?i=+i+1:o=+o+1),t=n+i+"."+o+"."+s):u?t=">="+i+".0.0 <"+(+i+1)+".0.0":d&&(t=">="+i+"."+o+".0 <"+i+"."+(+o+1)+".0"),r("xRange return",t),t}))}(e,t)})).join(" ")}(e,t),r("xrange",e),e=function(e,t){return r("replaceStars",e,t),e.trim().replace(i[$],"")}(e,t),r("stars",e),e}(e,this.options)}),this).join(" ").split(/\s+/);return this.options.loose&&(s=s.filter((function(e){return!!e.match(o)}))),s=s.map((function(e){return new ne(e,this.options)}),this)},oe.prototype.intersects=function(e,t){if(!(e instanceof oe))throw new TypeError("a Range is required");return this.set.some((function(r){return r.every((function(r){return e.set.some((function(e){return e.every((function(e){return r.intersects(e,t)}))}))}))}))},t.toComparators=function(e,t){return new oe(e,t).set.map((function(e){return e.map((function(e){return e.value})).join(" ").trim().split(" ")}))},oe.prototype.test=function(e){if(!e)return!1;"string"==typeof e&&(e=new G(e,this.options));for(var t=0;t<this.set.length;t++)if(ce(this.set[t],e,this.options))return!0;return!1},t.satisfies=ue,t.maxSatisfying=function(e,t,r){var n=null,i=null;try{var o=new oe(t,r)}catch(e){return null}return e.forEach((function(e){o.test(e)&&(n&&-1!==i.compare(e)||(i=new G(n=e,r)))})),n},t.minSatisfying=function(e,t,r){var n=null,i=null;try{var o=new oe(t,r)}catch(e){return null}return e.forEach((function(e){o.test(e)&&(n&&1!==i.compare(e)||(i=new G(n=e,r)))})),n},t.minVersion=function(e,t){e=new oe(e,t);var r=new G("0.0.0");if(e.test(r))return r;if(r=new G("0.0.0-0"),e.test(r))return r;r=null;for(var n=0;n<e.set.length;++n){e.set[n].forEach((function(e){var t=new G(e.semver.version);switch(e.operator){case">":0===t.prerelease.length?t.patch++:t.prerelease.push(0),t.raw=t.format();case"":case">=":r&&!z(r,t)||(r=t);break;case"<":case"<=":break;default:throw new Error("Unexpected operation: "+e.operator)}}))}if(r&&e.test(r))return r;return null},t.validRange=function(e,t){try{return new oe(e,t).range||"*"}catch(e){return null}},t.ltr=function(e,t,r){return de(e,t,"<",r)},t.gtr=function(e,t,r){return de(e,t,">",r)},t.outside=de,t.prerelease=function(e,t){var r=K(e,t);return r&&r.prerelease.length?r.prerelease:null},t.intersects=function(e,t,r){return e=new oe(e,r),t=new oe(t,r),e.intersects(t)},t.coerce=function(e){if(e instanceof G)return e;if("string"!=typeof e)return null;var t=e.match(i[k]);if(null==t)return null;return K(t[1]+"."+(t[2]||"0")+"."+(t[3]||"0"))}})),vt=(wt.SEMVER_SPEC_VERSION,wt.re,wt.src,wt.parse,wt.valid,wt.clean,wt.SemVer,wt.inc,wt.diff,wt.compareIdentifiers,wt.rcompareIdentifiers,wt.major,wt.minor,wt.patch,wt.compare,wt.compareLoose,wt.rcompare,wt.sort,wt.rsort,wt.gt,wt.lt,wt.eq,wt.neq,wt.gte,wt.lte,wt.cmp,wt.Comparator,wt.Range,wt.toComparators,wt.satisfies,wt.maxSatisfying,wt.minSatisfying,wt.minVersion,wt.validRange,wt.ltr,wt.gtr,wt.outside,wt.prerelease,wt.intersects,wt.coerce,wt.satisfies(process.version,"^6.12.0 || >=8.0.0")),_t=["RS256","RS384","RS512","ES256","ES384","ES512"],bt=["RS256","RS384","RS512"],Tt=["HS256","HS384","HS512"];vt&&(_t.splice(3,0,"PS256","PS384","PS512"),bt.splice(3,0,"PS256","PS384","PS512"));var Et=/^\s+|\s+$/g,Ct=/^[-+]0x[0-9a-f]+$/i,At=/^0b[01]+$/i,St=/^0o[0-7]+$/i,It=/^(?:0|[1-9]\d*)$/,xt=parseInt;function kt(e){return e!=e}function Ot(e,t){return function(e,t){for(var r=-1,n=e?e.length:0,i=Array(n);++r<n;)i[r]=t(e[r],r,e);return i}(t,(function(t){return e[t]}))}var Pt,Rt,jt=Object.prototype,Dt=jt.hasOwnProperty,qt=jt.toString,Nt=jt.propertyIsEnumerable,Ut=(Pt=Object.keys,Rt=Object,function(e){return Pt(Rt(e))}),Lt=Math.max;function Vt(e,t){var r=Ft(e)||function(e){return function(e){return Kt(e)&&$t(e)}(e)&&Dt.call(e,"callee")&&(!Nt.call(e,"callee")||"[object Arguments]"==qt.call(e))}(e)?function(e,t){for(var r=-1,n=Array(e);++r<e;)n[r]=t(r);return n}(e.length,String):[],n=r.length,i=!!n;for(var o in e)!t&&!Dt.call(e,o)||i&&("length"==o||Bt(o,n))||r.push(o);return r}function Mt(e){if(r=(t=e)&&t.constructor,n="function"==typeof r&&r.prototype||jt,t!==n)return Ut(e);var t,r,n,i=[];for(var o in Object(e))Dt.call(e,o)&&"constructor"!=o&&i.push(o);return i}function Bt(e,t){return!!(t=null==t?9007199254740991:t)&&("number"==typeof e||It.test(e))&&e>-1&&e%1==0&&e<t}var Ft=Array.isArray;function $t(e){return null!=e&&function(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=9007199254740991}(e.length)&&!function(e){var t=Ht(e)?qt.call(e):"";return"[object Function]"==t||"[object GeneratorFunction]"==t}(e)}function Ht(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function Kt(e){return!!e&&"object"==typeof e}var Gt=function(e,t,r,n){var i;e=$t(e)?e:(i=e)?Ot(i,function(e){return $t(e)?Vt(e):Mt(e)}(i)):[],r=r&&!n?function(e){var t=function(e){if(!e)return 0===e?e:0;if((e=function(e){if("number"==typeof e)return e;if(function(e){return"symbol"==typeof e||Kt(e)&&"[object Symbol]"==qt.call(e)}(e))return NaN;if(Ht(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=Ht(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(Et,"");var r=At.test(e);return r||St.test(e)?xt(e.slice(2),r?2:8):Ct.test(e)?NaN:+e}(e))===1/0||e===-1/0){return 17976931348623157e292*(e<0?-1:1)}return e==e?e:0}(e),r=t%1;return t==t?r?t-r:t:0}(r):0;var o=e.length;return r<0&&(r=Lt(o+r,0)),function(e){return"string"==typeof e||!Ft(e)&&Kt(e)&&"[object String]"==qt.call(e)}(e)?r<=o&&e.indexOf(t,r)>-1:!!o&&function(e,t,r){if(t!=t)return function(e,t,r,n){for(var i=e.length,o=r+(n?1:-1);n?o--:++o<i;)if(t(e[o],o,e))return o;return-1}(e,kt,r);for(var n=r-1,i=e.length;++n<i;)if(e[n]===t)return n;return-1}(e,t,r)>-1},Qt=Object.prototype.toString;var Xt=function(e){return!0===e||!1===e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Boolean]"==Qt.call(e)},Yt=/^\s+|\s+$/g,zt=/^[-+]0x[0-9a-f]+$/i,Jt=/^0b[01]+$/i,Wt=/^0o[0-7]+$/i,Zt=parseInt,er=Object.prototype.toString;function tr(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}var rr=function(e){return"number"==typeof e&&e==function(e){var t=function(e){if(!e)return 0===e?e:0;if((e=function(e){if("number"==typeof e)return e;if(function(e){return"symbol"==typeof e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Symbol]"==er.call(e)}(e))return NaN;if(tr(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=tr(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(Yt,"");var r=Jt.test(e);return r||Wt.test(e)?Zt(e.slice(2),r?2:8):zt.test(e)?NaN:+e}(e))===1/0||e===-1/0){return 17976931348623157e292*(e<0?-1:1)}return e==e?e:0}(e),r=t%1;return t==t?r?t-r:t:0}(e)},nr=Object.prototype.toString;var ir=function(e){return"number"==typeof e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Number]"==nr.call(e)};var or=Function.prototype,sr=Object.prototype,ar=or.toString,cr=sr.hasOwnProperty,ur=ar.call(Object),dr=sr.toString,pr=function(e,t){return function(r){return e(t(r))}}(Object.getPrototypeOf,Object);var lr=function(e){if(!function(e){return!!e&&"object"==typeof e}(e)||"[object Object]"!=dr.call(e)||function(e){var t=!1;if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}(e))return!1;var t=pr(e);if(null===t)return!0;var r=cr.call(t,"constructor")&&t.constructor;return"function"==typeof r&&r instanceof r&&ar.call(r)==ur},fr=Object.prototype.toString,mr=Array.isArray;var hr=function(e){return"string"==typeof e||!mr(e)&&function(e){return!!e&&"object"==typeof e}(e)&&"[object String]"==fr.call(e)},gr=/^\s+|\s+$/g,yr=/^[-+]0x[0-9a-f]+$/i,wr=/^0b[01]+$/i,vr=/^0o[0-7]+$/i,_r=parseInt,br=Object.prototype.toString;function Tr(e,t){var r;if("function"!=typeof t)throw new TypeError("Expected a function");return e=function(e){var t=function(e){if(!e)return 0===e?e:0;if((e=function(e){if("number"==typeof e)return e;if(function(e){return"symbol"==typeof e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Symbol]"==br.call(e)}(e))return NaN;if(Er(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=Er(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(gr,"");var r=wr.test(e);return r||vr.test(e)?_r(e.slice(2),r?2:8):yr.test(e)?NaN:+e}(e))===1/0||e===-1/0){return 17976931348623157e292*(e<0?-1:1)}return e==e?e:0}(e),r=t%1;return t==t?r?t-r:t:0}(e),function(){return--e>0&&(r=t.apply(this,arguments)),e<=1&&(t=void 0),r}}function Er(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}var Cr=function(e){return Tr(2,e)},Ar=["RS256","RS384","RS512","ES256","ES384","ES512","HS256","HS384","HS512","none"];vt&&Ar.splice(3,0,"PS256","PS384","PS512");var Sr={expiresIn:{isValid:function(e){return rr(e)||hr(e)&&e},message:'"expiresIn" should be a number of seconds or string representing a timespan'},notBefore:{isValid:function(e){return rr(e)||hr(e)&&e},message:'"notBefore" should be a number of seconds or string representing a timespan'},audience:{isValid:function(e){return hr(e)||Array.isArray(e)},message:'"audience" must be a string or array'},algorithm:{isValid:Gt.bind(null,Ar),message:'"algorithm" must be a valid string enum value'},header:{isValid:lr,message:'"header" must be an object'},encoding:{isValid:hr,message:'"encoding" must be a string'},issuer:{isValid:hr,message:'"issuer" must be a string'},subject:{isValid:hr,message:'"subject" must be a string'},jwtid:{isValid:hr,message:'"jwtid" must be a string'},noTimestamp:{isValid:Xt,message:'"noTimestamp" must be a boolean'},keyid:{isValid:hr,message:'"keyid" must be a string'},mutatePayload:{isValid:Xt,message:'"mutatePayload" must be a boolean'}},Ir={iat:{isValid:ir,message:'"iat" should be a number of seconds'},exp:{isValid:ir,message:'"exp" should be a number of seconds'},nbf:{isValid:ir,message:'"nbf" should be a number of seconds'}};function xr(e,t,r,n){if(!lr(r))throw new Error('Expected "'+n+'" to be a plain object.');Object.keys(r).forEach((function(i){var o=e[i];if(o){if(!o.isValid(r[i]))throw new Error(o.message)}else if(!t)throw new Error('"'+i+'" is not allowed in "'+n+'"')}))}var kr={audience:"aud",issuer:"iss",subject:"sub",jwtid:"jti"},Or=["expiresIn","notBefore","noTimestamp","audience","issuer","subject","jwtid"],Pr=function(e,t,r,n){var i;if("function"!=typeof r||n||(n=r,r={}),r||(r={}),r=Object.assign({},r),i=n||function(e,t){if(e)throw e;return t},r.clockTimestamp&&"number"!=typeof r.clockTimestamp)return i(new st("clockTimestamp must be a number"));if(void 0!==r.nonce&&("string"!=typeof r.nonce||""===r.nonce.trim()))return i(new st("nonce must be a non-empty string"));var o=r.clockTimestamp||Math.floor(Date.now()/1e3);if(!e)return i(new st("jwt must be provided"));if("string"!=typeof e)return i(new st("jwt must be a string"));var s,a=e.split(".");if(3!==a.length)return i(new st("jwt malformed"));try{s=it(e,{complete:!0})}catch(e){return i(e)}if(!s)return i(new st("invalid token"));var c,u=s.header;if("function"==typeof t){if(!n)return i(new st("verify must be called asynchronous if secret or public key is provided as a callback"));c=t}else c=function(e,r){return r(null,t)};return c(u,(function(t,n){if(t)return i(new st("error in secret or public key callback: "+t.message));var c,d=""!==a[2].trim();if(!d&&n)return i(new st("jwt signature is required"));if(d&&!n)return i(new st("secret or public key must be provided"));if(d||r.algorithms||(r.algorithms=["none"]),r.algorithms||(r.algorithms=~n.toString().indexOf("BEGIN CERTIFICATE")||~n.toString().indexOf("BEGIN PUBLIC KEY")?_t:~n.toString().indexOf("BEGIN RSA PUBLIC KEY")?bt:Tt),!~r.algorithms.indexOf(s.header.alg))return i(new st("invalid algorithm"));try{c=nt.verify(e,s.header.alg,n)}catch(e){return i(e)}if(!c)return i(new st("invalid signature"));var p=s.payload;if(void 0!==p.nbf&&!r.ignoreNotBefore){if("number"!=typeof p.nbf)return i(new st("invalid nbf value"));if(p.nbf>o+(r.clockTolerance||0))return i(new ct("jwt not active",new Date(1e3*p.nbf)))}if(void 0!==p.exp&&!r.ignoreExpiration){if("number"!=typeof p.exp)return i(new st("invalid exp value"));if(o>=p.exp+(r.clockTolerance||0))return i(new dt("jwt expired",new Date(1e3*p.exp)))}if(r.audience){var l=Array.isArray(r.audience)?r.audience:[r.audience];if(!(Array.isArray(p.aud)?p.aud:[p.aud]).some((function(e){return l.some((function(t){return t instanceof RegExp?t.test(e):t===e}))})))return i(new st("jwt audience invalid. expected: "+l.join(" or ")))}if(r.issuer&&("string"==typeof r.issuer&&p.iss!==r.issuer||Array.isArray(r.issuer)&&-1===r.issuer.indexOf(p.iss)))return i(new st("jwt issuer invalid. expected: "+r.issuer));if(r.subject&&p.sub!==r.subject)return i(new st("jwt subject invalid. expected: "+r.subject));if(r.jwtid&&p.jti!==r.jwtid)return i(new st("jwt jwtid invalid. expected: "+r.jwtid));if(r.nonce&&p.nonce!==r.nonce)return i(new st("jwt nonce invalid. expected: "+r.nonce));if(r.maxAge){if("number"!=typeof p.iat)return i(new st("iat required when maxAge is specified"));var f=yt(r.maxAge,p.iat);if(void 0===f)return i(new st('"maxAge" should be a number of seconds or string representing a timespan eg: "1d", "20h", 60'));if(o>=f+(r.clockTolerance||0))return i(new dt("maxAge exceeded",new Date(1e3*f)))}if(!0===r.complete){var m=s.signature;return i(null,{header:u,payload:p,signature:m})}return i(null,p)}))},Rr=function(e,t,r,n){"function"==typeof r?(n=r,r={}):r=r||{};var i="object"==typeof e&&!Buffer.isBuffer(e),o=Object.assign({alg:r.algorithm||"HS256",typ:i?"JWT":void 0,kid:r.keyid},r.header);function s(e){if(n)return n(e);throw e}if(!t&&"none"!==r.algorithm)return s(new Error("secretOrPrivateKey must have a value"));if(void 0===e)return s(new Error("payload is required"));if(i){try{!function(e){xr(Ir,!0,e,"payload")}(e)}catch(e){return s(e)}r.mutatePayload||(e=Object.assign({},e))}else{var a=Or.filter((function(e){return void 0!==r[e]}));if(a.length>0)return s(new Error("invalid "+a.join(",")+" option for "+typeof e+" payload"))}if(void 0!==e.exp&&void 0!==r.expiresIn)return s(new Error('Bad "options.expiresIn" option the payload already has an "exp" property.'));if(void 0!==e.nbf&&void 0!==r.notBefore)return s(new Error('Bad "options.notBefore" option the payload already has an "nbf" property.'));try{!function(e){xr(Sr,!1,e,"options")}(r)}catch(e){return s(e)}var c=e.iat||Math.floor(Date.now()/1e3);if(r.noTimestamp?delete e.iat:i&&(e.iat=c),void 0!==r.notBefore){try{e.nbf=yt(r.notBefore,c)}catch(e){return s(e)}if(void 0===e.nbf)return s(new Error('"notBefore" should be a number of seconds or string representing a timespan eg: "1d", "20h", 60'))}if(void 0!==r.expiresIn&&"object"==typeof e){try{e.exp=yt(r.expiresIn,c)}catch(e){return s(e)}if(void 0===e.exp)return s(new Error('"expiresIn" should be a number of seconds or string representing a timespan eg: "1d", "20h", 60'))}Object.keys(kr).forEach((function(t){var n=kr[t];if(void 0!==r[t]){if(void 0!==e[n])return s(new Error('Bad "options.'+t+'" option. The payload already has an "'+n+'" property.'));e[n]=r[t]}}));var u=r.encoding||"utf8";if("function"!=typeof n)return nt.sign({header:o,payload:e,secret:t,encoding:u});n=n&&Cr(n),nt.createSign({header:o,privateKey:t,payload:e,encoding:u}).once("error",n).once("done",(function(e){n(null,e)}))};let jr=[];class Dr{constructor(e){this.options=Object.assign({baseUrl:"https://appleid.apple.com",timeout:1e4},e)}async _fetch(e,t){const{baseUrl:r}=this.options;return uniCloud.httpclient.request(r+e,t)}async verifyIdentityToken(e){const t=e.split(".")[0],{kid:r}=JSON.parse(Buffer.from(t,"base64").toString());if(!jr.length)try{jr=await this.getAuthKeys()}catch(e){return{code:10705,msg:e.message}}const n=this.getUsedKey(jr,r);if(!Object.keys(n).length&&!this.fetched)try{jr=await this.getAuthKeys()}catch(e){return{code:10705,msg:e.message}}let i=null;try{i=Pr(e,function(e,t){var r=Buffer.from(e,"base64"),n=Buffer.from(t,"base64"),i=r.toString("hex"),o=n.toString("hex");i=W(i),o=W(o);var s=i.length/2,a=o.length/2,c=ee(s),u=ee(a),d="30"+ee(s+a+c.length/2+u.length/2+2)+"02"+c+i+"02"+u+o;return"-----BEGIN RSA PUBLIC KEY-----\n"+Buffer.from(d,"hex").toString("base64").match(/.{1,64}/g).join("\n")+"\n-----END RSA PUBLIC KEY-----\n"}(n.n,n.e),{algorithms:n.alg})}catch(e){return{code:10705,msg:e.message}}return{code:0,msg:i}}async getAuthKeys(){const{status:e,data:t}=await this._fetch("/auth/keys",{method:"GET",dataType:"json",timeout:this.options.timeout});if(200!==e)throw new Error("request https://appleid.apple.com/auth/keys fail");return t.keys}getUsedKey(e,t){let r={};for(let n=0;n<e.length;n++){const i=e[n];if(i.kid===t){r=i;break}}return r}}var qr=function(e={}){return e.appId=e.appid,e.secret=e.appsecret,I(G,e)},Nr=function(e={}){return e.appId=e.appid,e.secret=e.appsecret,I(X,e)},Ur=function(e={}){return e.appId=e.appid,I(J,e)},Lr=function(e={}){return I(Dr,e)};function Vr(e=6){const t=["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 r="";for(let n=0;n<e;n++)r+=t[Math.floor(Math.random()*t.length)];return r}const Mr=O.command;async function Br({uid:e,dcloudAppidList:t}={}){if(!e)return{code:N,messageValues:{param:this.t("user-id")}};if(!t||0===t.length||t.some(e=>void 0===e))return{code:N,messageValues:{param:this.t("dcloud-appid")}};const r=await P.doc(e).get(),n=r&&r.data&&r.data[0];if(!n)return{code:10002};const i=Object.keys(q).reduce((e,t)=>{const r=t,i=function(e,t){return t.split(".").reduce((e,t)=>e&&e[t],e)}(n,t);return i&&e.push({[r]:i}),e},[]);let o;const s={dcloud_appid:Mr.in(t),_id:Mr.neq(n._id)},a={dcloud_appid:Mr.exists(!1),_id:Mr.neq(n._id)};switch(i.length){case 0:return{code:10004};case 1:o=Mr.or([Mr.and([i[0],s]),Mr.and([i[0],a])]);break;default:o=Mr.or([Mr.and([Mr.or(i),s]),Mr.and([Mr.or(i),a])])}const c=await P.where(o).limit(1).get();return c&&c.data&&c.data[0]?{code:10005}:{code:0}}const Fr=uniCloud.database().command;const $r=uniCloud.database();const Hr=uniCloud.database();const Kr=uniCloud.database();async function Gr(e){const t=["apiKey","apiSecret"];for(let r=0,n=t.length;r<n;r++){const n=t[r];if(!e[n])throw new Error(this.t("config-param-requred",{param:"service.univerify."+n}))}if(!e.openid||!e.access_token)throw new Error(this.t("config-param-requred",{param:"openid, access_token"}));return function(e,t){const r={0:"",4e3:"缺失参数",4001:"apiKey不存在",4002:"sign校验不通过",4003:"appid不存在",4004:"应用未开通一键登录服务",4005:"应用开通的一键登录服务正在审核中",4006:"服务空间不在白名单中",4100:"账户余额不足",5e3:"获取手机号失败，请稍后重试(或其他未知错误)"};return{...e,msg:r[e.code]?"[getPhoneNumber] 获取手机号: "+r[e.code]:e.errMsg}}(await uniCloud.getPhoneNumber({provider:"univerify",...e}))}const Qr=uniCloud.database();const Xr=uniCloud.database();const Yr=uniCloud.database();const zr=uniCloud.database().command;const Jr=uniCloud.database();const Wr=uniCloud.database();const Zr=uniCloud.database();const en=uniCloud.database();const tn=uniCloud.database();const rn=uniCloud.database();const nn=uniCloud.database();const on={"mobile-code":function(e){return!!(e.service&&e.service.sms&&e.service.sms.smsKey)},univerify:function(e){return!!(e.service&&e.service.univerify&&e.service.univerify.apiKey)},weixin:function(e){return!!(e.oauth&&e.oauth.weixin&&e.oauth.weixin.appsecret)},qq:function(e){return!!(e.oauth&&e.oauth.qq&&e.oauth.qq.appsecret)},apple:function(e){return!!(e.oauth&&e.oauth.apple&&e.oauth.apple.bundleId)},alipay:function(e){return!!(e.oauth&&e.oauth.alipay&&e.oauth.alipay.privateKey)}};const sn=uniCloud.database().command;const an=uniCloud.database();var cn=Object.freeze({__proto__:null,addUser:async function({username:e,nickname:t,password:r,mobile:n,email:i,role:o=[],authorizedApp:s=[]}={}){const a=O.command,c=[];if(!e&&!n&&!i)throw new Error("username, mobile or email required");let u;if(e&&c.push({username:e}),n&&c.push({mobile:n,mobile_confirmed:1}),i&&c.push({email:i,email_confirmed:1}),s.length>0){u=a.and(a.or(c),a.or({dcloud_appid:a.in(s)},{dcloud_appid:a.exists(!1)}));if((await P.where(u).limit(1).get()).data.length>0)return{code:10201,messageValues:{type:this.t("username")}}}const d={role:o,nickname:t,dcloud_appid:s,register_date:Date.now()};if(e&&(d.username=e),r){const{passwordHash:e,version:t}=this.encryptPwd(r);d.password=e,t&&(d.password_secret_version=t)}return n&&(d.mobile=n,d.mobile_confirmed=1),i&&(d.email=i,d.email_confirmed=1),{code:0,uid:(await P.add(d)).id}},getUserInfo:async function({uid:e,field:t}){if(!e)return{code:N,messageValues:{param:this.t("user-id")}};let r;if(t&&t.length){const n={};for(let e=0;e<t.length;e++)n[t[e]]=!0;r=await P.doc(e).field(n).get()}else r=await P.doc(e).get();return 0===r.data.length?{code:80301}:{code:0,msg:"",userInfo:r.data[0]}},getUserInfoByToken:async function(e){const t=this._verifyToken(e);return t.code||(delete t.iat,delete t.exp),t},resetPwd:async function({uid:e,password:t}){const{passwordHash:r,version:n}=this.encryptPwd(t),i={password:r,token:[]};return n&&(i.password_secret_version=n),E("upRes",await P.doc(e).update(i)),{code:0,msg:""}},resetPwdBySms:async function({mobile:e,code:t,password:r}){const n=await this.verifyCode({mobile:e,code:t,type:"reset-pwd"});if(0!==n.code)return n;const i=(await P.where({mobile:e}).get()).data.filter(e=>void 0===e.dcloud_appid||e.dcloud_appid.includes(this.context.APPID));if(0===i.length)return{code:10002};if(i.length>1)return{code:10005};const o=i[0]._id;return this.resetPwd({uid:o,password:r})},setAvatar:async function(e){return await P.doc(e.uid).update({avatar:e.avatar}),{code:0,msg:""}},updatePwd:async function(e){const t=await P.doc(e.uid).get();if(t&&t.data&&t.data.length>0){if(0===this._checkPwd(t.data[0],e.oldPassword).code){const{passwordHash:r,version:n}=this.encryptPwd(e.newPassword),i={password:r,token:[]};n&&(i.password_secret_version=n);return E("upRes",await P.doc(t.data[0]._id).update(i)),{code:0,msg:""}}return{code:40202}}return{code:40201}},updateUser:async function(e){const t=e.uid;if(!t)return{code:N,messageValues:{param:this.t("user-id")}};delete e.uid;const{username:r,email:n}=e,{usernameToLowerCase:i,emailToLowerCase:o}=this._getConfig();let s=r&&r.trim(),a=n&&n.trim();return s&&(i&&(s=s.toLowerCase()),e.username=s),a&&(o&&(a=a.toLowerCase()),e.email=a),E("update -> upRes",await P.doc(t).update(e)),{code:0,msg:""}},banAccount:async function({uid:e}={}){return $.call(this,{uid:e,status:B})},unbanAccount:async function({uid:e}={}){return $.call(this,{uid:e,status:M})},closeAccount:async function({uid:e}={}){return $.call(this,{uid:e,status:F})},openAccount:async function({uid:e}={}){return $.call(this,{uid:e,status:M})},_getAlipayApi:function(){const e=this.context.PLATFORM,t=this._getConfig();if(!t.oauth||!t.oauth.alipay)throw new Error(this.t("config-param-require",{param:e+".alipay"}));return["appid","privateKey"].forEach(r=>{if(!t.oauth.alipay[r])throw new Error(this.t("config-param-require",{param:`${e}.alipay.${r}`}))}),Ur({...t.oauth.alipay})},_getValidInviteCode:async function({inviteCode:e}){let t,r=10;e?(r=1,t=e):t=Vr();let n=!1;try{for(;r>0&&!n;){r--;if(0===(await P.where({my_invite_code:t}).get()).data.length){n=!0;break}t=Vr()}t=Vr()}catch(e){}return n?{code:0,inviteCode:t}:e?{code:80401}:{code:80402}},_addUser:async function(e,{needPermission:t,autoSetDcloudAppid:r=!0}={}){const n=this._getConfig(),i={...e,dcloud_appid:r?[this.context.APPID]:[],register_date:Date.now()},o=(await P.add(i)).id;let s;if(n.removePermissionAndRoleFromToken)s=await this.createToken({uid:o,needPermission:t});else{const t=e.role||[];let r;r=0===t.length||t.includes("admin")?[]:await this._getPermissionListByRoleList(t),s=await this.createToken({uid:o,role:t,permission:r})}const{token:a,tokenExpired:c}=s;return await P.doc(o).update({token:[a]}),{token:a,tokenExpired:c,uid:o,type:"register",userInfo:Object.assign({},i,{token:[a]})}},_loginExec:async function(e,t={}){if(e.status===B)return{code:10001};if(e.status===F)return{code:10006};const r=this._getConfig();let n=e.token||[];"string"==typeof n&&(n=[n]);const i=this._getExpiredToken(n);let o;if(n=n.filter(e=>-1===i.indexOf(e)),r.removePermissionAndRoleFromToken){const r=t.needPermission;o=await this.createToken({uid:e._id,needPermission:r})}else{const t=e.role||[];let r;r=0===t.length||t.includes("admin")?[]:await this._getPermissionListByRoleList(t),o=await this.createToken({uid:e._id,role:t,permission:r})}const{token:s,tokenExpired:a}=o;n.push(s),e.token=n;const c={last_login_date:Date.now(),last_login_ip:this.context.CLIENTIP,token:n,...t.extraData};await P.doc(e._id).update(c);const u=Object.assign({},e,c);return{code:0,msg:"",token:s,uid:u._id,username:u.username,type:"login",userInfo:u,tokenExpired:a}},_registerExec:async function(e,{needPermission:t,autoSetDcloudAppid:r=!0}={}){const{my_invite_code:n}=e;if(this._getConfig().autoSetInviteCode||n){const t=await this._getValidInviteCode({inviteCode:n});if(t.code)return t;e.my_invite_code=t.inviteCode}const{PLATFORM:i,appId:o,appid:s,APPID:a,uniPlatform:c,appName:u,appVersion:d,appVersionCode:p,channel:l,clientIP:f,CLIENTIP:m,OS:h,osName:g}=this.context;return e.register_env={appid:o||s||a||"",uni_platform:c||i||"",os_name:g||h||"",app_name:u||"",app_version:d||"",app_version_code:p||"",channel:l?l+"":"",client_ip:f||m||""},{code:0,msg:"",...await this._addUser(e,{needPermission:t,autoSetDcloudAppid:r})}},_getWeixinApi:function(){const e=this.context.PLATFORM,t=this._getConfig();if(!t.oauth||!t.oauth.weixin)throw new Error(this.t("config-param-require",{param:e+".weixin"}));return["appid","appsecret"].forEach(r=>{if(!t.oauth.weixin[r])throw new Error(this.t("config-param-require",{param:`${e}.weixin.${r}`}))}),qr({...t.oauth.weixin})},_getQQApi:function(){const e=this.context.PLATFORM,t=this._getConfig();if(!t.oauth||!t.oauth.qq)throw new Error(this.t("config-param-require",{param:e+".qq"}));return["appid","appsecret"].forEach(r=>{if(!t.oauth.qq[r])throw new Error(this.t("config-param-require",{param:`${e}.qq.${r}`}))}),Nr({...t.oauth.qq})},_getMatchedUser:function(e,t){if(0===e.length)return{code:10002};let r;const n={},i={};for(let r=e.length-1;r>=0;r--){const o=e[r];for(let s=0;s<t.length;s++){const{field:a,value:c,fallbackValue:u}=t[s];c&&o[a]===c?(n[a]=o,e.splice(r,1)):u&&o[a]===u&&(n[a]||(n[a]=o),i[a]=!0,e.splice(r,1))}}const o=Object.keys(n);let s;switch(o.length){case 0:r=e[0],e.splice(0,1);break;case 1:s=o[0],r=n[s];break;default:return{code:10003,messageValues:{target:"用户"}}}return e.length>0?{code:10003,messageValues:{target:"用户"}}:{code:0,msg:"",userMatched:r,fieldMatched:s,isFallbackValueMatched:!!s&&i[s]}},_getCurrentAppUser:function(e){const t=this.context.APPID;return e.filter(e=>void 0===e.dcloud_appid||null===e.dcloud_appid||e.dcloud_appid.indexOf(t)>-1||e.dcloud_appid.indexOf(null)>-1)},_checkLoginUserList:function(e){if(e&&1!==e.length)return e[0].status===F?{code:10006}:{code:10005}},setAuthorizedAppLogin:async function({uid:e,dcloudAppidList:t}={}){if("array"!==m(t))return{code:U,messageValues:{param:"dcloudAppidList",reason:this.t("type-array-required",{param:this.t("dcloud-appid-list")})}};if(t&&0!==t.length){const r=await Br.bind(this)({uid:e,dcloudAppidList:t});if(r.code)return r}return await P.doc(e).update({dcloud_appid:Mr.set(t)}),{code:0}},authorizeAppLogin:async function({uid:e,dcloudAppid:t}={}){const r=await Br.bind(this)({uid:e,dcloudAppidList:[t]});return r.code?r:(await P.doc(e).update({dcloud_appid:Mr.push(t)}),{code:0})},forbidAppLogin:async function({uid:e,dcloudAppid:t}={}){return e?(await P.doc(e).update({dcloud_appid:Mr.pull(t)}),{code:0}):{code:N,messageValues:{param:this.t("user-id")}}},acceptInvite:async function({uid:e,inviteCode:t}){const r=await P.where({_id:Fr.neq(e),inviter_uid:Fr.not(Fr.all([e])),my_invite_code:t}).get();if(1!==r.data.length)return{code:80501,msg:"邀请码无效"};const n=[r.data[0]._id].concat(r.data[0].inviter_uid||[]),i=await P.doc(e).field({my_invite_code:!0,inviter_uid:!0}).get();if(0===i.data.length)return{code:80502};if(i.data[0].inviter_uid&&i.data[0].inviter_uid.length>0)return{code:80503,msg:"邀请码不可修改"};const o=Date.now();return await P.doc(e).update({inviter_uid:n,invite_time:o}),await P.where({inviter_uid:e}).update({inviter_uid:Fr.push(n)}),{code:0,msg:""}},getInvitedUser:async function({uid:e,level:t=1,limit:r=20,offset:n=0,needTotal:i=!1}){const o={code:0,msg:"",invitedUser:(await P.where({["inviter_uid."+(t-1)]:e}).field({_id:!0,username:!0,mobile:!0,invite_time:!0}).orderBy("invite_time","desc").skip(n).limit(r).get()).data};if(i){const r=await P.where({["inviter_uid."+(t-1)]:e}).count();o.total=r.total}return o},setUserInviteCode:async function({uid:e,myInviteCode:t}){const r=await this._getValidInviteCode({inviteCode:t});return r.code?r:(await P.doc(e).update({my_invite_code:r.inviteCode}),{code:0,msg:"",myInviteCode:r.inviteCode})},loginByAlipay:async function(e){"string"==typeof e&&(e={code:e});const{needPermission:t,code:r,myInviteCode:n,role:i,type:o}=e,{openid:s}=await this._getAlipayApi().code2Session(r);if(!s)return{code:10501,messageValues:{account:this.t("alipay-account")}};let a=await P.where({ali_openid:s}).get();if(a=this._getCurrentAppUser(a.data),a&&a.length>0){if("register"===o)return{code:10502,messageValues:{type:this.t("alipay-account")}};if(1!==a.length)return{code:10005};const e=a[0],r=await this._loginExec(e,{needPermission:t});if(0!==r.code)return r;const{userInfo:n}=r;return{...r,openid:s,mobileConfirmed:1===n.mobile_confirmed,emailConfirmed:1===n.email_confirmed}}{if("login"===o)return{code:10503,messageValues:{type:this.t("alipay-account")}};const e={ali_openid:s};e.my_invite_code=n,e.role=i;const r=await this._registerExec(e,{needPermission:t});return 0!==r.code?r:{...r,openid:s,mobileConfirmed:!1,emailConfirmed:!1}}},loginByEmail:async function(e){let{email:t,code:r,password:n,myInviteCode:i,type:o,needPermission:s,role:a}=e||{};if(t=t&&t.trim(),!t)return{code:N,messageValues:{param:"邮箱"}};const{emailToLowerCase:c}=this._getConfig();let u=t;c&&(u=t.toLowerCase());const d=await this.verifyCode({email:u,code:r,type:o||"login"});if(0!==d.code)return d;let p={email:t,email_confirmed:1};const l={field:"email",value:t},f=$r.command;u!==t&&(p=f.or(p,{email:u,email_confirmed:1}),l.fallbackValue=u);let m=await P.where(p).get();if(m=this._getCurrentAppUser(m.data),m&&m.length>0){if("register"===o)return{code:10301,messageValues:{type:"邮箱"}};const e=this._getMatchedUser(m,[l]);if(e.code)return e;const{userMatched:t}=e,r=await this._loginExec(t,{needPermission:s});return 0!==r.code?r:{...r,email:u}}{if("login"===o)return{code:10302,messageValues:{type:"邮箱"}};const e={email:u,email_confirmed:1},t=n&&n.trim();if(t){const{passwordHash:r,version:n}=this.encryptPwd(t);e.password=r,n&&(e.password_secret_version=n)}e.my_invite_code=i,e.role=a;const r=await this._registerExec(e,{needPermission:s});return 0!==r.code?r:{...r,email:u}}},loginBySms:async function({mobile:e,code:t,password:r,inviteCode:n,myInviteCode:i,type:o,needPermission:s,role:a}){if(!(e=e&&e.trim()))return{code:N,messageValues:{param:this.t("mobile")}};const c=this._getConfig();if(c.forceInviteCode&&!o)throw new Error(this.t("login-with-invite-type-required"));const u=await this.verifyCode({mobile:e,code:t,type:o||"login"});if(0!==u.code)return u;const d={mobile:e,mobile_confirmed:1};let p=await P.where(d).get();if(p=this._getCurrentAppUser(p.data),p&&p.length>0){if("register"===o)return{code:10201,messageValues:{type:this.t("mobile")}};if(1!==p.length)return{code:10005};const t=p[0],r=await this._loginExec(t,{needPermission:s});return 0!==r.code?r:{...r,mobile:e}}{const t=Date.now();if("login"===o)return{code:10202,messageValues:{type:this.t("mobile")}};const u={mobile:e,mobile_confirmed:1,register_ip:this.context.CLIENTIP,register_date:t},d=r&&r.trim();if(d){const{passwordHash:e,version:t}=this.encryptPwd(d);u.password=e,t&&(u.password_secret_version=t)}if(n){const e=await P.where({my_invite_code:n}).get();if(1!==e.data.length)return{code:10203};u.inviter_uid=[e.data[0]._id].concat(e.data[0].inviter_uid||[]),u.invite_time=t}else if(c.forceInviteCode)return{code:10203};u.my_invite_code=i,u.role=a;const p=await this._registerExec(u,{needPermission:s});return 0!==p.code?p:{...p,mobile:e}}},loginByWeixin:async function(e){"string"==typeof e&&(e={code:e});const{needPermission:t,platform:r,code:n,myInviteCode:i,role:o,type:s}=e,a=r||this.context.PLATFORM,c="mp-weixin"===a,{openid:u,unionid:d,sessionKey:p,accessToken:l,refreshToken:f,expired:m}=await this._getWeixinApi()[c?"code2Session":"getOauthAccessToken"](n);if(!u)return{code:10401,messageValues:{account:"微信openid"}};let h;h=c?{sessionKey:p}:{accessToken:l,refreshToken:f,accessTokenExpired:m};const g=Hr.command,y=[{wx_openid:{[a]:u}}];d&&y.push({wx_unionid:d});let w=await P.where(g.or(...y)).get();if(w=this._getCurrentAppUser(w.data),w&&w.length>0){if("register"===s)return{code:10402,messageValues:{type:this.t("wechat-account")}};if(1!==w.length)return{code:10005};const e=w[0],r={wx_openid:{[a]:u}};d&&(r.wx_unionid=d);const n=await this._loginExec(e,{needPermission:t,extraData:r});if(0!==n.code)return n;const{userInfo:i}=n;return{...n,openid:u,unionid:d,...h,mobileConfirmed:1===i.mobile_confirmed,emailConfirmed:1===i.email_confirmed}}{if("login"===s)return{code:10403,messageValues:{type:this.t("wechat-account")}};const e={wx_openid:{[a]:u},wx_unionid:d};e.my_invite_code=i,e.role=o;const r=await this._registerExec(e,{needPermission:t});return 0!==r.code?r:{...r,openid:u,unionid:d,...h,mobileConfirmed:!1,emailConfirmed:!1}}},loginByQQ:async function({code:e,accessToken:t,myInviteCode:r,needPermission:n,role:i,type:o}={}){const s=this.context.PLATFORM,a="mp-qq"===s,{openid:c,unionid:u,sessionKey:d}=await this._getQQApi()[a?"code2Session":"getOpenidByToken"]({code:e,accessToken:t});if(!c)return{code:10801,messageValues:{account:"qq openid"}};const p={accessToken:t,sessionKey:d},l=Kr.command,f=[{qq_openid:{[s]:c}}];u&&f.push({qq_unionid:u});let m=await P.where(l.or(...f)).get();if(m=this._getCurrentAppUser(m.data),m&&m.length>0){if("register"===o)return{code:10802,messageValues:{type:this.t("qq-account")}};if(1!==m.length)return{code:10005};const e=m[0],t={qq_openid:{[s]:c}};u&&(t.qq_unionid=u);const r=await this._loginExec(e,{needPermission:n,extraData:t});if(0!==r.code)return r;const{userInfo:i}=r;return{...r,openid:c,unionid:u,...p,mobileConfirmed:1===i.mobile_confirmed,emailConfirmed:1===i.email_confirmed}}{if("login"===o)return{code:10803,messageValues:{type:this.t("qq-account")}};const e={qq_openid:{[s]:c},qq_unionid:u};e.my_invite_code=r,e.role=i;const t=await this._registerExec(e);return 0!==t.code?t:{...t,openid:c,unionid:u,...p,mobileConfirmed:!1,emailConfirmed:!1}}},loginByUniverify:async function({openid:e,access_token:t,password:r,inviteCode:n,myInviteCode:i,type:o,needPermission:s,role:a}){const c=this._getConfig(),u=c&&c.service&&c.service.univerify;if(!u)throw new Error(this.t("uni-verify-config-required"));if(c.forceInviteCode&&!o)throw new Error(this.t("login-with-invite-type-required"));const d=await Gr.bind(this)({...u,openid:e,access_token:t});if(0!==d.code)return d;const p=String(d.phoneNumber);let l=await P.where({mobile:p,mobile_confirmed:1}).get();if(l=this._getCurrentAppUser(l.data),l&&l.length>0){if("register"===o)return{code:10601,messageValues:{type:this.t("mobile")}};if(1!==l.length)return{code:10005};const e=l[0],t=await this._loginExec(e,{needPermission:s});return 0!==t.code?t:{...t,mobile:p}}if("login"===o)return{code:10602,messageValues:{type:this.t("mobile")}};const f=Date.now(),m={mobile:p,my_invite_code:i,mobile_confirmed:1,role:a},h=r&&r.trim();if(h){const{passwordHash:e,version:t}=this.encryptPwd(h);m.password=e,t&&(m.password_secret_version=t)}if(n){let e=await P.where({my_invite_code:n}).get();if(1!==e.data.length)return{code:10203};e=e.data[0],m.inviter_uid=[e._id].concat(e.inviter_uid||[]),m.invite_time=f}else if(c.forceInviteCode)return{code:10203};m.my_invite_code=i;const g=await this._registerExec(m,{needPermission:s});return 0!==g.code?g:{...g,mobile:p}},loginByApple:async function({nickName:e,fullName:t,identityToken:r,myInviteCode:n,type:i,needPermission:o,role:s}){const a=this._getConfig(),c=a&&a.oauth&&a.oauth.apple,u=c&&c.bundleId;if(!u)throw new Error(this.t("config-param-require",{param:"(app || app-plus).apple.bundleId"}));if(!r)return{code:N,messageValues:{param:"identityToken"}};t=e||(t&&Object.keys(t).length>0?t.familyName+t.givenName:"");const{code:d,msg:p}=await Lr().verifyIdentityToken(r);if(0!==d)return{code:d,msg:p,messageValues:{account:this.t("apple-account")}};const{iss:l,sub:f,aud:m,email:h}=p;if("https://appleid.apple.com"!==l)return{code:10706,messageValues:{account:this.t("apple-account")}};if(!f)return{code:10701,messageValues:{account:this.t("apple-account")}};if(u!==m)return{code:10702,messageValues:{account:this.t("apple-account")}};const g=t||"User-"+(h?h.split("@")[0]:Math.random().toString(32).slice(2));let y=await P.where({apple_openid:f}).get();if(y=this._getCurrentAppUser(y.data),y&&y.length>0){if("register"===i)return{code:10703,messageValues:{type:this.t("apple-account")}};if(1!==y.length)return{code:10005};const e=y[0],t=await this._loginExec(e,{needPermission:o});return 0!==t.code?t:{...t,openid:f}}if("login"===i)return{code:10704,messageValues:{type:this.t("apple-account")}};const w={nickname:g,apple_openid:f,my_invite_code:n,role:s},v=await this._registerExec(w,{needPermission:o});return 0!==v.code?v:{...v,openid:f}},login:async function({username:e,password:t,queryField:r=[],needPermission:n}){const i=Qr.command,o=[];r&&r.length||(r=["username"]),r.length>1&&console.warn(this.t("query-field-warning"));const{usernameToLowerCase:s,emailToLowerCase:a,passwordErrorLimit:c,passwordErrorRetryTime:u}=this._getConfig(),d={email:{email_confirmed:1},mobile:{mobile_confirmed:1}},p={},l=e&&e.trim();if(!l)return{code:N,messageValues:{param:this.t("username")}};s&&(p.username=l.toLowerCase()),a&&(p.email=l.toLowerCase());const f=[];r.forEach(t=>{o.push({[t]:e,...d[t]});const r={field:t,value:e};"username"===t&&p.username!==e?(o.push({[t]:p.username,...d[t]}),r.fallbackValue=p.username):"email"===t&&p.email!==e&&(o.push({[t]:p.email,...d[t]}),r.fallbackValue=p.email),f.push(r)});let m=await P.where(i.or(...o)).get();m=this._getCurrentAppUser(m.data);const h=this.context.CLIENTIP,g=this._getMatchedUser(m,f);if(g.code)return g;const{userMatched:y}=g;let w=y.login_ip_limit||[];w=w.filter(e=>e.last_error_time>Date.now()-1e3*u);let v=w.find(e=>e.ip===h);if(v&&v.error_times>=c)return{code:10103};const _=t&&t.trim();if(!_)return{code:N,messageValues:{param:"密码"}};const b=this._checkPwd(y,_);if(0===b.code){const e=w.indexOf(v);e>-1&&w.splice(e,1);const t={login_ip_limit:w},{passwordHash:r,passwordVersion:i}=b;r&&i&&(t.password=r,t.password_secret_version=i);const o=await this._loginExec(y,{needPermission:n,extraData:t});return o.code,o}return v?(v.error_times++,v.last_error_time=Date.now()):(v={ip:h,error_times:1,last_error_time:Date.now()},w.push(v)),await P.doc(y._id).update({login_ip_limit:w}),{code:10102,msg:"密码错误"}},register:async function(e){const t=[],r=[{name:"username",desc:this.t("username")},{name:"email",desc:this.t("email"),extraCond:{email_confirmed:1}},{name:"mobile",desc:this.t("mobile"),extraCond:{mobile_confirmed:1}}],{usernameToLowerCase:n,emailToLowerCase:i}=this._getConfig();r.forEach(r=>{const o=r.name;let s=e[o]&&e[o].trim();s?(("username"===r.name&&n||"email"===r.name&&i)&&(s=s.toLowerCase()),e[o]=s,t.push({[o]:s,...r.extraCond})):delete e[o]});const{username:o,email:s,mobile:a,myInviteCode:c,needPermission:u,autoSetDcloudAppid:d=!0}=e;if("needPermission"in e&&delete e.needPermission,"autoSetDcloudAppid"in e&&delete e.autoSetDcloudAppid,0===t.length)return{code:20101,messageValues:{param:this.t("user-unique-param")}};const p=Xr.command;let l=await P.where(p.or(...t)).get();if(l=this._getCurrentAppUser(l.data),l&&l.length>0){const t=l[0];if(t.status===F)return{code:10006};for(let n=0;n<r.length;n++){const i=r[n];let o=!0;if(i.extraCond&&(o=Object.keys(i.extraCond).every(e=>t[e]===i.extraCond[e])),t[i.name]===e[i.name]&&o)return{code:20102,messageValues:{type:i.desc}}}}const f=e.password&&e.password.trim();if(!f)return{code:N,messageValues:{param:this.t("password")}};const{passwordHash:m,version:h}=this.encryptPwd(f);e.password=m,h&&(e.password_secret_version=h),e.my_invite_code=c,delete e.myInviteCode;const g=await this._registerExec(e,{needPermission:u,autoSetDcloudAppid:d});return 0!==g.code?g:{...g,username:o,email:s,mobile:a}},logout:async function(e){const t=await this.checkToken(e);if(t.code)return t;const r=Yr.command;return await P.doc(t.uid).update({token:r.pull(e)}),{code:0,msg:""}},getRoleByUid:async function({uid:e}){if(!e)return{code:N,messageValues:{param:this.t("user-id")}};const t=await P.doc(e).get();return 0===t.data.length?{code:L}:{code:0,msg:"",role:t.data[0].role||[]}},getPermissionByRole:async function({roleID:e}){if(!e)return{code:N,messageValues:{param:"roleID"}};if("admin"===e){return{code:0,msg:"",permission:(await D.limit(1e3).get()).data.map(e=>e.permission_id)}}const t=await j.where({role_id:e}).get();return 0===t.data.length?{code:V}:{code:0,msg:"",permission:t.data[0].permission||[]}},getPermissionByUid:async function({uid:e}={}){const t=await P.aggregate().match({_id:e}).project({role:!0}).unwind("$role").lookup({from:"uni-id-roles",localField:"role",foreignField:"role_id",as:"roleDetail"}).unwind("$roleDetail").replaceRoot({newRoot:"$roleDetail"}).end(),r=[],n=[];return t.data.forEach(e=>{n.push(e.role_id),r.push(...e.permission)}),{code:0,msg:"",role:n,permission:A(r)}},bindRole:async function({uid:e,roleList:t,reset:r=!1}){const n={};return"string"==typeof t&&(t=[t]),n.role=r?t:zr.push(t),await P.doc(e).update(n),{code:0,msg:""}},bindPermission:async function({roleID:e,permissionList:t,reset:r=!1}){const n={};return"string"==typeof t&&(t=[t]),n.permission=r?t:zr.push(t),await j.where({role_id:e}).update(n),{code:0,msg:""}},unbindRole:async function({uid:e,roleList:t}){return"string"==typeof t&&(t=[t]),await P.doc(e).update({role:zr.pull(zr.in(t))}),{code:0,msg:""}},unbindPermission:async function({roleID:e,permissionList:t}){return"string"==typeof t&&(t=[t]),await j.where({role_id:e}).update({permission:zr.pull(zr.in(t))}),{code:0,msg:""}},addRole:async function({roleID:e,roleName:t,comment:r,permission:n=[]}){return e?"admin"===e?{code:U,messageValues:{param:"roleID",reason:this.t("add-role-admin-is-not-allowed")}}:(await j.add({role_id:e,role_name:t,comment:r,permission:n,create_date:Date.now()}),{code:0,msg:""}):{code:N,messageValues:{param:this.t("role-id")}}},addPermission:async function({permissionID:e,permissionName:t,comment:r}){return e?(await D.add({permission_id:e,permission_name:t,comment:r,create_date:Date.now()}),{code:0,msg:""}):{code:N,messageValues:{param:this.t("permission-id")}}},getRoleList:async function({limit:e=20,offset:t=0,needTotal:r=!0}){const n={code:0,msg:"",roleList:(await j.skip(t).limit(e).get()).data};if(r){const{total:e}=await j.where({_id:zr.exists(!0)}).count();n.total=e}return n},getRoleInfo:async function(e){const t=await j.where({role_id:e}).get();return 0===t.data.length?{code:V}:{code:0,...t.data[0]}},updateRole:async function({roleID:e,roleName:t,comment:r,permission:n}){return e?(await j.where({role_id:e}).update({role_name:t,comment:r,permission:n}),{code:0,msg:""}):{code:N,messageValues:{param:this.t("role-id")}}},deleteRole:async function({roleID:e}){const t=m(e);if("string"===t)e=[e];else if("array"!==t)throw new Error("typeof roleID must be array or string");return await j.where({role_id:zr.in(e)}).remove(),await P.where({role:zr.elemMatch(zr.in(e))}).update({role:zr.pullAll(e)}),{code:0,msg:""}},getPermissionList:async function({limit:e=20,offset:t=0,needTotal:r=!0}){const n={code:0,msg:"",permissionList:(await D.skip(t).limit(e).get()).data};if(r){const{total:e}=await D.where({_id:zr.exists(!0)}).count();n.total=e}return n},getPermissionInfo:async function(e){const t=await D.where({permission_id:e}).get();return 0===t.data.length?{code:N,messageValues:{param:this.t("permission-id")}}:{code:0,...t.data[0]}},updatePermission:async function({permissionID:e,permissionName:t,comment:r}){return e?(await D.where({permission_id:e}).update({permission_name:t,comment:r}),{code:0,msg:""}):{code:N,messageValues:{param:this.t("permission-id")}}},deletePermission:async function({permissionID:e}){const t=m(e);if("string"===t)e=[e];else if("array"!==t)throw new Error("typeof permissionID must be array or string");return await D.where({permission_id:zr.in(e)}).remove(),await j.where({permission:zr.elemMatch(zr.in(e))}).update({permission:zr.pullAll(e)}),{code:0,msg:""}},bindAlipay:async function({uid:e,code:t,platform:r}){const n=r||this.context.PLATFORM,{openid:i}=await this._getAlipayApi({platform:n}).code2Session(t);if(!i)return{code:60401,messageValues:{account:this.t("alipay-account")}};let o=await P.where({ali_openid:i}).get();return o=this._getCurrentAppUser(o.data),o&&o.length>0?{code:60402,messageValues:{type:this.t("alipay-account")}}:(await P.doc(e).update({ali_openid:i}),{code:0,openid:i,msg:""})},bindEmail:async function(e){let{uid:t,email:r,code:n}=e||{};if(r=r&&r.trim(),!r)return{code:N,messageValues:{param:this.t("email")}};if(!n)return{code:N,messageValues:{param:this.t("verify-code")}};const{emailToLowerCase:i}=this._getConfig();i&&(r=r.toLowerCase());let o=await P.where({email:r,email_confirmed:1}).get();if(o=this._getCurrentAppUser(o.data),o&&o.length>0)return{code:60201,messageValues:{type:this.t("email")}};const s=await this.verifyCode({email:r,code:n,type:"bind"});return 0!==s.code?s:(await P.doc(t).update({email:r,email_confirmed:1}),{code:0,msg:"",email:r})},bindMobile:async function(e){let{uid:t,mobile:r,code:n,openid:i,access_token:o,type:s="sms"}=e||{};if("univerify"===s){const e=this._getConfig(),t=e&&e.service&&e.service.univerify;if(!t)throw new Error("请在config.json中配置service.univerify下一键登录相关参数");const n=await Gr.bind(this)({...t,openid:i,access_token:o});if(0!==n.code)return n;r=""+n.phoneNumber}let a=await P.where({mobile:r,mobile_confirmed:1}).get();if(a=this._getCurrentAppUser(a.data),a&&a.length>0)return{code:60101,messageValues:{type:"手机号"}};if("sms"===s&&"code"in e){if(!r)return{code:N,messageValues:{param:this.t("mobile")}};if(!n)return{code:N,messageValues:{param:this.t("verify-code")}};const e=await this.verifyCode({mobile:r,code:n,type:"bind"});if(0!==e.code)return e}return await P.doc(t).update({mobile:r,mobile_confirmed:1}),{code:0,msg:"",mobile:r}},bindWeixin:async function({uid:e,code:t,platform:r}){const n=r||this.context.PLATFORM,i="mp-weixin"===n,{openid:o,unionid:s,sessionKey:a,accessToken:c,refreshToken:u,expired:d}=await this._getWeixinApi({platform:n})[i?"code2Session":"getOauthAccessToken"](t);if(!o)return{code:60301,messageValues:{account:"微信openid"}};const p=Jr.command,l=[{wx_openid:{[n]:o}}];s&&l.push({wx_unionid:s});let f=await P.where(p.or(...l)).get();if(f=this._getCurrentAppUser(f.data),f&&f.length>0)return{code:60302,messageValues:{type:this.t("wechat-account")}};const m={wx_openid:{[n]:o}};let h;return s&&(m.wx_unionid=s),await P.doc(e).update(m),h=i?{sessionKey:a}:{accessToken:c,refreshToken:u,accessTokenExpired:d},{code:0,msg:"",openid:o,unionid:s,...h}},bindQQ:async function({uid:e,code:t,accessToken:r,platform:n}={}){const i=n||this.context.PLATFORM,o="mp-qq"===i,{openid:s,unionid:a,sessionKey:c}=await this._getQQApi()[o?"code2Session":"getOpenidByToken"]({code:t,accessToken:r});if(!s)return{code:60501,messageValues:{account:"qq openid"}};const u=Wr.command,d=[{qq_openid:{[i]:s}}];a&&d.push({qq_unionid:a});let p=await P.where(u.or(...d)).get();if(p=this._getCurrentAppUser(p.data),p&&p.length>0)return{code:60502,messageValues:{type:this.t("qq-account")}};const l={qq_openid:{[i]:s}};return a&&(l.qq_unionid=a),await P.doc(e).update(l),{code:0,msg:"",openid:s,unionid:a,...{accessToken:r,sessionKey:c}}},unbindAlipay:async function(e){const t=Zr.command,r=await P.doc(e).update({ali_openid:t.remove()});return E("upRes:",r),1===r.updated?{code:0,msg:""}:{code:70401}},unbindEmail:async function(e){let{uid:t,email:r,code:n}=e||{};if(r=r&&r.trim(),!t||!r)return{code:N,messageValues:{param:t?this.t("email"):this.t("user-id")}};const{emailToLowerCase:i}=this._getConfig();if("code"in e){const e=await this.verifyCode({email:r,code:n,type:"unbind"});if(0!==e.code)return e}const o=en.command;let s={_id:t,email:r};if(i){const e=r.toLowerCase();e!==r&&(s=o.or(s,{_id:t,email:e}))}return 1===(await P.where(s).update({email:o.remove(),email_confirmed:o.remove()})).updated?{code:0,msg:""}:{code:70201}},unbindMobile:async function(e){const{uid:t,mobile:r,code:n}=e||{};if("code"in e){const e=await this.verifyCode({mobile:r,code:n,type:"unbind"});if(0!==e.code)return e}const i=tn.command;return 1===(await P.where({_id:t,mobile:r}).update({mobile:i.remove(),mobile_confirmed:i.remove()})).updated?{code:0,msg:""}:{code:70101}},unbindWeixin:async function(e){const t=rn.command,r=await P.doc(e).update({wx_openid:t.remove(),wx_unionid:t.remove()});return E("upRes:",r),1===r.updated?{code:0,msg:""}:{code:70301}},unbindQQ:async function(e){const t=nn.command,r=await P.doc(e).update({qq_openid:t.remove(),qq_unionid:t.remove()});return E("upRes:",r),1===r.updated?{code:0,msg:""}:{code:70501}},getSupportedLoginType:function({appid:e,platform:t}={}){if(!e||!t)throw new Error("Parameter appid and platform is required");const r=this._getConfig({appid:e,platform:t}),n=["username-password","mobile-password","email-password"];for(const e in on)on[e](r)&&n.push(e);return{supportedLoginType:n}},code2SessionAlipay:async function(e){let t=e;"string"==typeof e&&(t={code:e});try{const e=t.platform||this.context.PLATFORM,r=await this._getAlipayApi({platform:e}).code2Session(t.code);return r.openid?{code:0,msg:"",...r}:{code:80701,messageValues:{account:this.t("alipay-account")}}}catch(e){return{code:80702,messageValues:{account:this.t("alipay-account")}}}},code2SessionWeixin:async function(e){let t=e;"string"==typeof e&&(t={code:e});try{const e=t.platform||this.context.PLATFORM,r=await this._getWeixinApi({platform:e})["mp-weixin"===e?"code2Session":"getOauthAccessToken"](t.code);return r.openid?{code:0,msg:"",...r}:{code:80601,messageValues:{account:"微信openid"}}}catch(e){return{code:80602,messageValues:{account:"微信openid"}}}},verifyAppleIdentityToken:async function({identityToken:e,platform:t}){const r=t||this.context.PLATFORM,{code:n,msg:i}=await Lr({clientType:r}).verifyIdentityToken(e);return 0!==n?{code:n,msg:i}:{code:n,msg:"验证通过",...i}},wxBizDataCrypt:async function({code:e,sessionKey:r,encryptedData:n,iv:i}){if(!n)return{code:N,messageValues:{param:"encryptedData"}};if(!i)return{code:N,messageValues:{param:"iv"}};if(!e&&!r)return{code:N,messageValues:{param:"sessionKey"}};const o=this._getWeixinApi();if(!r){const t=await o.code2Session(e);if(!t.sessionKey)return{code:80801};r=t.sessionKey}r=Buffer.from(r,"base64"),n=Buffer.from(n,"base64"),i=Buffer.from(i,"base64");try{var s=t.createDecipheriv("aes-128-cbc",r,i);s.setAutoPadding(!0);var a=s.update(n,"binary","utf8");a+=s.final("utf8"),a=JSON.parse(a)}catch(e){return console.error(e),{code:80802}}return a.watermark.appid!==o.options.appId?{code:80803}:{code:0,msg:"",...a}},getWeixinUserInfo:async function({accessToken:e,openid:t}={}){const r=this.context.PLATFORM;if("app"!==r&&"app-plus"!==r)throw new Error(this.t("limit-client-platform"));try{return{code:0,msg:"",...await this._getWeixinApi().getUserInfo({accessToken:e,openid:t})}}catch(e){return{code:80901}}},encryptPwd:function(e,{value:r,version:n}={}){if(!(e=e&&e.trim()))throw new Error(this.t("param-required",{param:this.t("password")}));if(!r){const e=this._getConfig(),{passwordSecret:t}=e;if("array"===m(t)){const e=t.sort((e,t)=>e.version-t.version);r=e[e.length-1].value,n=e[e.length-1].version}else r=t}if(!r)throw new Error(this.t("param-error",{param:"passwordSecret",reason:"invalid passwordSecret"}));const i=t.createHmac("sha1",r.toString("ascii"));return i.update(e),{passwordHash:i.digest("hex"),version:n}},checkToken:async function(e,{needPermission:t,needUserInfo:r=!0}={}){const n=this._getConfig(),i=this._verifyToken(e);if(i.code)return i;const{uid:o,needPermission:s,role:a,permission:c,exp:u,iat:d,...p}=i,l=a&&c;t=void 0===t?s:t;const f=n.removePermissionAndRoleFromToken||!l||r,m=!n.removePermissionAndRoleFromToken&&!l||n.removePermissionAndRoleFromToken&&l||n.tokenExpiresThreshold&&u-Date.now()/1e3<n.tokenExpiresThreshold;let h={};if(f||m){const t=await P.doc(o).get();if(!t.data||0===t.data.length||!t.data[0].token)return{code:30202};if(h=t.data[0],h.status===B)return{code:10001};if(h.status===F)return{code:10006};let r=h.token;if(r?"string"==typeof r&&(r=[r]):r=[],-1===r.indexOf(e))return{code:30202}}const g={code:0,uid:o,...p};let y,w;if(l&&(g.role=a,g.permission=c),r&&(g.userInfo=h),(!l&&t||m)&&(y=g.role=h.role||[],w=0===y.length||y.includes("admin")?g.permission=[]:g.permission=await this._getPermissionListByRoleList(g.role),t&&(g.role=y,g.permission=w)),m){let e;e=n.removePermissionAndRoleFromToken?await this.createToken({uid:o,needPermission:s}):await this.createToken({uid:o,role:y,permission:w});const t=h.token;return await this._updateToken({uid:o,tokenList:t,addToken:[e.token]}),{...g,...e}}return g},createToken:function({uid:e,needPermission:t,role:r,permission:n}){if(!e)return{code:30101,messageValues:{param:this.t("user-id")}};const i={uid:e,needPermission:t,role:r,permission:n},o=this._getConfig();if(!this.interceptorMap.has("customToken")){const e={...i};return this._createTokenInternal({signContent:e,config:o})}const s=this.interceptorMap.get("customToken");if("function"!=typeof s)throw new Error(this.t("type-function-required","customToken"));const a=s(i);return a instanceof Promise?a.then(e=>this._createTokenInternal({signContent:e,config:o})):this._createTokenInternal({signContent:a,config:o})},_updateToken:async function({uid:e,tokenList:t,removeToken:r=[],addToken:n=[]}={}){if(!t){const r=await P.doc(e).get(),n=r.data&&r.data[0];t=n&&n.token||[]}"string"==typeof t&&(t=[t]);const i=this._getExpiredToken(t);(t=t.filter(e=>-1===i.indexOf(e))).push(...n);for(let e=0;e<r.length;e++){const n=t.indexOf(r[e]);t.splice(n,1)}await P.doc(e).update({token:t,last_login_date:Date.now(),last_login_ip:this.context.CLIENTIP})},refreshToken:async function({token:e}={}){const t=this._getConfig(),r=this._verifyToken(e);if(r.code)return r;const{uid:n,needPermission:i}=r;let o;if(t.removePermissionAndRoleFromToken)o=await this.createToken({uid:n,needPermission:i});else{const{role:e,permission:t}=await this.getPermissionByUid({uid:n});o=await this.createToken({uid:n,role:e,permission:t})}return await this._updateToken({uid:n,addToken:[o.token],removeToken:[e]}),o},_checkPwd:function(e,t){if(!t)return{code:1};const{password:r,password_secret_version:n}=e,i=this._getConfig(),{passwordSecret:o}=i,s=m(o);if("string"===s){const{passwordHash:e}=this.encryptPwd(t,{value:o});return e===r?{code:0,message:""}:{code:2}}if("array"!==s)throw new Error(this.t("password-secret-type-error"));const a=o.sort((e,t)=>e.version-t.version);let c;if(c=n?a.find(e=>e.version===n):a[0],!c)return{code:3};const u=a[a.length-1],{passwordHash:d}=this.encryptPwd(t,c);if(d===r){const e={code:0};if(c!==u){const{passwordHash:r,version:n}=this.encryptPwd(t,u);e.passwordHash=r,e.passwordVersion=n}return e}return{code:4,message:""}},_verifyToken:function(e){const t=this._getConfig();let r;try{r=Pr(e,t.tokenSecret)}catch(e){return"TokenExpiredError"===e.name?{code:30203,err:e}:{code:30204,err:e}}return t.bindTokenToDevice&&r.clientId&&r.clientId!==this._getClientUaHash()?{code:30201}:{code:0,message:"",...r}},_getExpiredToken:function(e){const t=this._getConfig(),r=[];return e.forEach(e=>{try{Pr(e,t.tokenSecret)}catch(t){r.push(e)}}),r},_getPermissionListByRoleList:async function(e){if(!Array.isArray(e))return[];if(0===e.length)return[];if(e.includes("admin")){return(await D.limit(500).get()).data.map(e=>e.permission_id)}const t=await j.where({role_id:sn.in(e)}).get(),r=[];return t.data.forEach(e=>{Array.prototype.push.apply(r,e.permission)}),A(r)},_getClientUaHash:function(){const e=t.createHash("md5"),r=/MicroMessenger/i.test(this.context.CLIENTUA)?this.context.CLIENTUA.replace(/(MicroMessenger\S+).*/i,"$1"):this.context.CLIENTUA;return e.update(r),e.digest("hex")},_createTokenInternal:function({signContent:e,config:t}){if(t.tokenExpiresIn&&t.tokenExpiresThreshold&&t.tokenExpiresIn<=t.tokenExpiresThreshold)throw new Error(this.t("token-expires-config-warning"));return"object"===m(e)&&e.uid?(t.bindTokenToDevice&&(e.clientId=this._getClientUaHash()),{token:Rr(e,t.tokenSecret,{expiresIn:t.tokenExpiresIn}),tokenExpired:Date.now()+1e3*t.tokenExpiresIn}):{code:30101,messageValues:{param:this.t("user-id")}}},setVerifyCode:async function({mobile:e,email:t,code:r,expiresIn:n,type:i}){if(t=t&&t.trim(),e=e&&e.trim(),t){const{emailToLowerCase:e}=this._getConfig();e&&(t=t.toLowerCase())}if(!e&&!t)return{code:50101,messageValues:{param:"手机号或邮箱"}};if(e&&t)return{code:50102,messageValues:{param:"参数",reason:"手机号和邮箱不可同时存在"}};r||(r=C()),n||(n=180);const o=Date.now(),s={mobile:e,email:t,type:i,code:r,state:0,ip:this.context.CLIENTIP,created_at:o,expired_at:o+1e3*n};return await R.add(s),{code:0,mobile:e,email:t}},verifyCode:async function({mobile:e,email:t,code:r,type:n}){if(t=t&&t.trim(),e=e&&e.trim(),t){const{emailToLowerCase:e}=this._getConfig();e&&(t=t.toLowerCase())}if(!e&&!t)return{code:50201,messageValues:{param:"手机号或邮箱"}};if(e&&t)return{code:50203,messageValues:{param:"参数",reason:"手机号和邮箱不可同时存在"}};if(!r)return{code:50202,messageValues:{type:this.t(e?"sms":"email")}};const i=an.command,o=Date.now(),s={mobile:e,email:t,type:n,code:r,state:0,expired_at:i.gt(o)},a=await R.where(s).orderBy("created_at","desc").limit(1).get();if(a&&a.data&&a.data.length>0){const e=a.data[0];return await R.doc(e._id).update({state:1}),{code:0,msg:"验证通过"}}return{code:50202,messageValues:{type:this.t(e?"sms":"email")}}},sendSmsCode:async function({mobile:e,code:t,type:r,templateId:n}){if(!e)return{code:N,messageValues:{param:this.t("mobile")}};if(t||(t=C()),!r)return{code:N,messageValues:{param:this.t("verify-code-type")}};const i=this._getConfig();let o=i&&i.service&&i.service.sms;if(!o)throw new Error(this.t("config-param-required",{param:"service.sms"}));o=Object.assign({codeExpiresIn:300},o);const s=["smsKey","smsSecret"];for(let e=0,t=s.length;e<t;e++){const t=s[e];if(!o[t])throw new Error(this.t("config-param-required",{param:"service.sms."+t}))}const{name:a,smsKey:c,smsSecret:u,codeExpiresIn:d}=o;let p;switch(r){case"login":p=this.t("login");break;default:p=this.t("verify-mobile")}try{const i={name:a,code:t,action:p,expMinute:""+Math.round(d/60)};a&&(i.name=a),await uniCloud.sendSms({smsKey:c,smsSecret:u,phone:e,templateId:n||"uniID_code",data:i});const o=await this.setVerifyCode({mobile:e,code:t,expiresIn:d,type:r});return o.code>=0?o:{code:0,msg:""}}catch(e){return{code:50301}}}});let un;try{un=require("uni-config-center")}catch(e){throw new Error("Plugin[uni-config-center] was not found")}class dn{constructor({context:e,clientInfo:t,config:r}={}){const n=un({pluginId:"uni-id"});this.pluginConfig=n,this.config=r||this._getConfigContent(),this._configCache={},Object.defineProperty(this,"context",{get(){let r;r=t?{OS:t.os,CLIENTIP:t.clientIP,CLIENTUA:t.userAgent,PLATFORM:t.platform,APPID:t.appId,LOCALE:t.locale,DEVICEID:t.deviceId}:Object.assign({},e||global.__ctx__||{});const n=["CLIENTIP","PLATFORM","APPID","LOCALE"];for(let e=0;e<n.length;e++){const t=n[e];void 0===r[t]&&console.warn(i.t("context-required",{key:t}))}const o=r.APPID,s=r.PLATFORM,a=this._getAppConfig(this.config,o);if(a&&("app"===s||"app-plus"===s)){if(a.preferedAppPlatform){if("app"!==a.preferedAppPlatform&&"app-plus"!==a.preferedAppPlatform)throw new Error("invalid preferedAppPlatform value in config");r.PLATFORM=a.preferedAppPlatform}if("app"===r.PLATFORM&&a["app-plus"]||"app-plus"===r.PLATFORM&&a.app)throw new Error(`Client platform is ${r.PLATFORM}, but ${"app"===r.PLATFORM?"app-plus":"app"} was found in config. Please refer to: https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=prefered-app-platform`)}return r}}),this.interceptorMap=new Map,n&&n.hasFile("custom-token.js")&&this.setInterceptor("customToken",require(n.resolve("custom-token.js")));let i,o=k;if(n&&n.hasFile("lang/index.js")){const e=n.requireFile("lang/index.js");o=function(e,t){const r=Object.keys(e);r.push(...Object.keys(t));const n={};for(let i=0;i<r.length;i++){const o=r[i];n[o]=Object.assign({},e[o],t[o])}return n}(k,e)}if(!uniCloud.initI18n)throw new Error("The HBuilderX you are using is too old, please upgrade to the latest version of HBuilderX");i=uniCloud.initI18n({locale:"en",fallbackLocale:"zh-Hans",messages:o}),Object.defineProperty(this,"t",{get(){return i.setLocale(this.context.LOCALE||"zh-Hans"),i.t.bind(i)}})}get dev(){return console.warn(this.t("dev-warning")),{getConfig:this._getConfig.bind(this)}}_getAppConfig(e,t){return Array.isArray(e)?e.find(e=>e.dcloudAppid===t)||e.find(e=>e.isDefaultConfig):e}_getConfigContent(){if(this.pluginConfig&&this.pluginConfig.hasFile("config.json")){let e;try{e=this.pluginConfig.config()}catch(e){throw new Error("Invalid config file\n"+e.messages)}return Array.isArray(e)?e:e[0]?Object.values(e):e}}init(){throw new Error("uniID.init has been deprecated, use uniID.createInstance instead")}setInterceptor(e,t){this.interceptorMap.set(e,t)}_getConfig({appid:e,platform:t}={}){const r=`${e=e||this.context.APPID}_${t=t||this.context.PLATFORM}`;if(this._configCache[r])return this._configCache[r];if(!(this.config&&0!==Object.keys(this.config).length))throw new Error(this.t("config-file-not-found"));const n=this._getAppConfig(this.config);"app"!==t&&"app-plus"!==t||(t=n.preferedAppPlatform||t);const i=Object.assign(n,n[t])||{},o=Object.assign({bindTokenToDevice:!1,tokenExpiresIn:7200,tokenExpiresThreshold:1200,passwordErrorLimit:6,passwordErrorRetryTime:3600,usernameToLowerCase:!0,emailToLowerCase:!0},i);return["passwordSecret","tokenSecret","tokenExpiresIn","passwordErrorLimit","passwordErrorRetryTime"].forEach(e=>{if(!o||!o[e])throw new Error(this.t("config-param-required",{param:e}))}),this._configCache[r]=o,o}}for(const e in cn)dn.prototype[e]=cn[e];function pn(e){const t=new dn(e);return new Proxy(t,{get(e,t){if(t in e&&0!==t.indexOf("_")){if("function"==typeof e[t])return(r=e[t],function(){const e=r.apply(this,arguments);return f(e)?e.then(e=>(x.bind(this)(e),e)):(x.bind(this)(e),e)}).bind(e);if("context"!==t&&"config"!==t)return e[t]}var r}})}dn.prototype.createInstance=pn;var ln=pn();module.exports=ln;
diff --git a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package.json b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package.json
index 3a6380f075b2a4b9e29fe9445b21fdf159a744a6..cf54fb66878ad35fa7e8a62ec857b8420d1c4148 100644
--- a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package.json
+++ b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni-id",
-  "version": "3.3.12",
+  "version": "3.3.21",
   "description": "uni-id for uniCloud",
   "main": "index.js",
   "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id",
diff --git a/uni_modules/uni-indexed-list/changelog.md b/uni_modules/uni-indexed-list/changelog.md
index 66b20d790199502337f84a09025c6df0279b836a..2c86d5dd32a3862c2ef5656e4bc96cad49aecdae 100644
--- a/uni_modules/uni-indexed-list/changelog.md
+++ b/uni_modules/uni-indexed-list/changelog.md
@@ -1,5 +1,10 @@
-## 1.1.0（2021-07-30）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.2.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-indexed-list](https://uniapp.dcloud.io/component/uniui/uni-indexed-list)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.0.11（2021-05-12）
 - 新增 组件示例地址
 ## 1.0.10（2021-04-21）
diff --git a/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue b/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue
index afa50412ccdd9553aa7e9cfbba8476c4c0cf001c..56f6611dc11a5380c9b76ec8c6ce3036fdf54f9c 100644
--- a/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue
+++ b/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue
@@ -8,7 +8,7 @@
 				<view class="uni-indexed-list__item-container" @click="onClick(idx, index)">
 					<view class="uni-indexed-list__item-border" :class="{'uni-indexed-list__item-border--last':index===list.items.length-1}">
 						<view v-if="showSelect" style="margin-right: 20rpx;">
-							<uni-icons :type="item.checked ? 'checkbox-filled' : 'circle'" :color="item.checked ? '#007aff' : '#aaa'" size="24" />
+							<uni-icons :type="item.checked ? 'checkbox-filled' : 'circle'" :color="item.checked ? '#007aff' : '#C0C0C0'" size="24" />
 						</view>
 						<text class="uni-indexed-list__item-content">{{ item.name }}</text>
 					</view>
@@ -62,11 +62,11 @@
 		flex-direction: column;
 		border-top-style: solid;
 		border-top-width: 1px;
-		border-top-color: $uni-border-color;
+		border-top-color: #DEDEDE;
 	}
 
 	.uni-indexed-list__item {
-		font-size: $uni-font-size-lg;
+		font-size: 14px;
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
@@ -77,7 +77,7 @@
 	}
 
 	.uni-indexed-list__item-container {
-		padding-left: $uni-spacing-row-lg;
+		padding-left: 15px;
 		flex: 1;
 		position: relative;
 		/* #ifndef APP-NVUE */
@@ -103,11 +103,11 @@
 		justify-content: space-between;
 		align-items: center;
 		height: 50px;
-		padding: $uni-spacing-row-lg;
+		padding: 25px;
 		padding-left: 0;
 		border-bottom-style: solid;
 		border-bottom-width: 1px;
-		border-bottom-color: $uni-border-color;
+		border-bottom-color:  #DEDEDE;
 	}
 
 	.uni-indexed-list__item-border--last {
@@ -116,7 +116,8 @@
 
 	.uni-indexed-list__item-content {
 		flex: 1;
-		font-size: 14px;
+		font-size: 14px;
+		color: #191919;
 	}
 
 	.uni-indexed-list {
@@ -137,6 +138,7 @@
 	.uni-indexed-list__title {
 		padding: 6px 12px;
 		line-height: 24px;
-		font-size: $uni-font-size-sm;
+		font-size: 16px;
+		font-weight: 500;
 	}
 </style>
diff --git a/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue b/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue
index e507051b4c60330f754c99bc961b60c093b7e210..fab85a70b4bfaaee1540f1901e892fd15a2c547e 100644
--- a/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue
+++ b/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list.vue
@@ -8,7 +8,8 @@
 				<scroll-view :scroll-into-view="scrollViewId" class="uni-indexed-list__scroll" scroll-y>
 					<view v-for="(list, idx) in lists" :key="idx" :id="'uni-indexed-list-' + idx">
 						<!-- #endif -->
-						<indexed-list-item :list="list" :loaded="loaded" :idx="idx" :showSelect="showSelect" @itemClick="onClick"></indexed-list-item>
+						<indexed-list-item :list="list" :loaded="loaded" :idx="idx" :showSelect="showSelect"
+							@itemClick="onClick"></indexed-list-item>
 						<!-- #ifndef APP-NVUE -->
 					</view>
 				</scroll-view>
@@ -17,11 +18,13 @@
 			</cell>
 		</list>
 		<!-- #endif -->
-		<view class="uni-indexed-list__menu" :class="touchmove ? 'uni-indexed-list__menu--active' : ''" @touchstart="touchStart"
-		 @touchmove.stop.prevent="touchMove" @touchend="touchEnd" @mousedown.stop="mousedown" @mousemove.stop.prevent="mousemove"
-		 @mouseleave.stop="mouseleave">
-			<view v-for="(list, key) in lists" :key="key" class="uni-indexed-list__menu-item">
-				<text class="uni-indexed-list__menu-text" :class="touchmoveIndex == key ? 'uni-indexed-list__menu-text--active' : ''">{{ list.key }}</text>
+		<view class="uni-indexed-list__menu" @touchstart="touchStart" @touchmove.stop.prevent="touchMove"
+			@touchend="touchEnd" @mousedown.stop="mousedown" @mousemove.stop.prevent="mousemove"
+			@mouseleave.stop="mouseleave">
+			<view v-for="(list, key) in lists" :key="key" class="uni-indexed-list__menu-item"
+				:class="touchmoveIndex == key ? 'uni-indexed-list__menu--active' : ''">
+				<text class="uni-indexed-list__menu-text"
+					:class="touchmoveIndex == key ? 'uni-indexed-list__menu-text--active' : ''">{{ list.key }}</text>
 			</view>
 		</view>
 		<view v-if="touchmove" class="uni-indexed-list__alert-wrapper">
@@ -87,7 +90,7 @@
 		components: {
 			indexedListItem
 		},
-		emits:['click'],
+		emits: ['click'],
 		props: {
 			options: {
 				type: Array,
@@ -211,7 +214,7 @@
 			},
 			touchEnd() {
 				this.touchmove = false
-				this.touchmoveIndex = -1
+				// this.touchmoveIndex = -1
 			},
 
 			/**
@@ -298,7 +301,6 @@
 
 	.uni-indexed-list__menu {
 		width: 24px;
-		background-color: lightgrey;
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
@@ -318,18 +320,24 @@
 	}
 
 	.uni-indexed-list__menu-text {
-		line-height: 20px;
 		font-size: 12px;
 		text-align: center;
 		color: #aaa;
 	}
 
 	.uni-indexed-list__menu--active {
-		background-color: rgb(200, 200, 200);
+		// background-color: rgb(200, 200, 200);
 	}
 
+	.uni-indexed-list__menu--active {}
+
 	.uni-indexed-list__menu-text--active {
-		color: #007aff;
+		border-radius: 16px;
+		width: 16px;
+		height: 16px;
+		line-height: 16px;
+		background-color: #007aff;
+		color: #fff;
 	}
 
 	.uni-indexed-list__alert-wrapper {
diff --git a/uni_modules/uni-indexed-list/package.json b/uni_modules/uni-indexed-list/package.json
index 3f2c0cc6a15878aacda42502eb1c1e173b8381f9..a000b6ddec857db7153a285f23cab668f6cee1ab 100644
--- a/uni_modules/uni-indexed-list/package.json
+++ b/uni_modules/uni-indexed-list/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-indexed-list",
   "displayName": "uni-indexed-list 索引列表",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "索引列表组件，右侧带索引的列表，方便快速定位到具体内容，通常用于城市/机场选择等场景",
   "keywords": [
     "uni-ui",
@@ -40,7 +40,8 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [
+    "dependencies": [
+			"uni-scss",
 			"uni-icons"
 		],
     "encrypt": [],
@@ -77,6 +78,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-indexed-list/readme.md b/uni_modules/uni-indexed-list/readme.md
index 4fb6a0a73ebf75913498860b6f7ffd5d805cc4a1..44ad84b2832e557bea519900731bb50426efc725 100644
--- a/uni_modules/uni-indexed-list/readme.md
+++ b/uni_modules/uni-indexed-list/readme.md
@@ -7,61 +7,5 @@
 
 用于展示索引列表。
 
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<uni-indexed-list :options="list" :showSelect="false" @click="bindClick"></uni-indexed-list>
-```
-
-## API
-
-### IndexedList Props
-
-|属性名		|类型	|默认值	|说明														|
-|:-:		|:-:	|:-:	|:-:														|
-|options	|Object	|-		|索引列表需要的数据对象										|
-|showSelect	|Boolean|-		| 展示模式，true 为展示默认，false 为选择模式，默认为 false	|
-
-**options 数据格式说明**
-
-```json
-[{
-	"letter": "A",
-	"data": [
-		"阿克苏机场",
-		"阿拉山口机场",
-		"阿勒泰机场",
-		"阿里昆莎机场",
-		"安庆天柱山机场",
-		"澳门国际机场"
-	]
-}, {
-	"letter": "B",
-	"data": [
-		"保山机场",
-		"包头机场",
-		"北海福成机场",
-		"北京南苑机场",
-		"北京首都国际机场"
-	]
-}]
-```
-
-### IndexedList Events
-
-|事件名	|说明															|返回值	|
-|:-:		|:-:															|:-:	|
-|click	|点击列表事件 ，返回当前选择项的事件对象	|-		|
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/indexed-list/indexed-list](https://hellouniapp.dcloud.net.cn/pages/extUI/indexed-list/indexed-list)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-indexed-list)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-link/changelog.md b/uni_modules/uni-link/changelog.md
index 1d24c16c3dcc93a2dc74a88a5375a051cd1d072a..2cfbf5912ce31220bdd9c34dc1c5314e35abb069 100644
--- a/uni_modules/uni-link/changelog.md
+++ b/uni_modules/uni-link/changelog.md
@@ -1,5 +1,11 @@
+## 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-link](https://uniapp.dcloud.io/component/uniui/uni-link)
+## 1.1.7（2021-11-08）
+## 0.0.7（2021-09-03）
+- 修复 在 nvue 下不显示的 bug
 ## 0.0.6（2021-07-30）
-- 支持自定义插槽
+- 新增 支持自定义插槽
 ## 0.0.5（2021-06-21）
 - 新增 download 属性，H5平台下载文件名
 ## 0.0.4（2021-05-12）
diff --git a/uni_modules/uni-link/components/uni-link/uni-link.vue b/uni_modules/uni-link/components/uni-link/uni-link.vue
index d8aaaf8faf64eb1fc5d083a5dd9dc1c57a5b370e..27c5468e1a8ade9702f063e79a14c44c98a89ffa 100644
--- a/uni_modules/uni-link/components/uni-link/uni-link.vue
+++ b/uni_modules/uni-link/components/uni-link/uni-link.vue
@@ -4,10 +4,18 @@
 		:style="{color,fontSize:fontSize+'px'}" :download="download">
 		<slot>{{text}}</slot>
 	</a>
+	<!-- #ifndef APP-NVUE -->
 	<text v-else class="uni-link" :class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
 		:style="{color,fontSize:fontSize+'px'}" @click="openURL">
 		<slot>{{text}}</slot>
 	</text>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<text v-else class="uni-link" :class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
+		:style="{color,fontSize:fontSize+'px'}" @click="openURL">
+		{{text}}
+	</text>
+	<!-- #endif -->
 </template>
 
 <script>
diff --git a/uni_modules/uni-link/package.json b/uni_modules/uni-link/package.json
index 96f23445023e0ae325075658bf9f9c91c1fbab69..77b198652b7a4e78620aa017c841a6c23e6e79f2 100644
--- a/uni_modules/uni-link/package.json
+++ b/uni_modules/uni-link/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-link",
   "displayName": "uni-link 超链接",
-  "version": "0.0.6",
+  "version": "1.0.0",
   "description": "uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打",
   "keywords": [
     "uni-ui",
@@ -41,7 +41,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": ["uni-scss"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -76,6 +76,10 @@
         "快应用": {
           "华为": "y",
           "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-link/readme.md b/uni_modules/uni-link/readme.md
index 0735374c17ef048d6eb466a70545ad299adf42e9..7f09e941a51c6ad5abc26dec2b504541bc417228 100644
--- a/uni_modules/uni-link/readme.md
+++ b/uni_modules/uni-link/readme.md
@@ -7,42 +7,5 @@
 
 uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打开新网页。
 
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<uni-link href="https://uniapp.dcloud.io/" text="https://uniapp.dcloud.io/"></uni-link>
-```
-
-## API
-
-### Link Props
-
-|属性名				|类型		|默认值										|说明							|
-|:-:					|:-:		|:-:										|:-:							|
-|href					|String	|-											|链接地址						|
-|text					|String	|-											|显示文字						|
-|download     |String |-                      |H5平台下载文件名        |
-|showUnderLine|Boolean|true										|是否显示下划线					|
-|copyTips			|String	|已自动复制网址，请在手机浏览器里粘贴该网址	|在小程序端复制链接时的提示语	|
-|color				|String	|#999999								|链接文字颜色					|
-|fontSize			|String	|14											|链接文字大小，单位px			|
-
-
-### Link Slots
-
-|名称|说明|					
-|:-:|:-:|						
-|default|自定义内容，回覆盖原有的内容显示|
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/link/link](https://hellouniapp.dcloud.net.cn/pages/extUI/link/link)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-link)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-list/changelog.md b/uni_modules/uni-list/changelog.md
index 713e2698890b9d0778b54f57d59a68bb7bc9c31a..6aa6e4e0028e0a51f0b0ca9c29912fa70a8a1315 100644
--- a/uni_modules/uni-list/changelog.md
+++ b/uni_modules/uni-list/changelog.md
@@ -1,15 +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.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 9f8796f821dd17457e567ee2164f67b0bf46c4c6..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,7 +217,11 @@
 	};
 </script>
 
-<style lang="scss" scoped>
+<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;
 	$avatar-width: 45px;
@@ -531,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 71f16a4d77a5b5f0d2b8fa1521803f7b10d42acc..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,461 +1,454 @@
-<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],
-				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>
-
-<style lang="scss">
-	$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;
-		/* #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;
-		/* #endif */
-	}
+<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;
+	$uni-font-size-lg:16px;
+	$uni-spacing-col-lg: 12px;
+	$uni-spacing-row-lg: 15px;
+	$uni-img-size-sm:20px;
+	$uni-img-size-base:26px;
+	$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 */
+		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 */
+		lines: 2;
+		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 389178b2b09e45e936e20b7f3aea68b35f6ca5f9..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,7 +54,9 @@ export default {
 	}
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss" >
+$uni-bg-color:#ffffff;
+$uni-border-color:#e5e5e5;
 .uni-list {
 	/* #ifndef APP-NVUE */
 	display: flex;
@@ -103,4 +105,4 @@ export default {
 }
 
 /* #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 d9453a92d0c22bf345aaa95cab7fe404f5d2da0d..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.1.3",
-  "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": "u"
-        }
-      }
-    }
-  }
+{
+  "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 e4a5d73d81b4811aee609bc7ba37bdded964cd26..32c28654eb9654bfa833a5de6012f44c4fe854db 100644
--- a/uni_modules/uni-list/readme.md
+++ b/uni_modules/uni-list/readme.md
@@ -1,5 +1,3 @@
-
-
 ## List 列表
 > **组件名：uni-list**
 > 代码块： `uList`、`uListItem`
@@ -125,7 +123,7 @@ uni-list不包含下拉刷新和上拉翻页。上拉翻页另见组件：[uni-l
 		<!-- 显示圆形头像 -->
 		<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-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>
 		<!-- 头像显示角标 -->
@@ -204,7 +202,8 @@ 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)					
+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		|	是否显示箭头图标			
diff --git a/uni_modules/uni-load-more/changelog.md b/uni_modules/uni-load-more/changelog.md
index 5b60375335474b0dbc300db3765c0fa90ea61d36..8f03f1d57a158042a6c3f0ce254569f37447e845 100644
--- a/uni_modules/uni-load-more/changelog.md
+++ b/uni_modules/uni-load-more/changelog.md
@@ -1,3 +1,12 @@
+## 1.3.3（2022-01-20）
+- 新增 showText属性 ，是否显示文本
+## 1.3.2（2022-01-19）
+- 修复 nvue 平台下不显示文本的bug
+## 1.3.1（2022-01-19）
+- 修复 微信小程序平台样式选择器报警告的问题
+## 1.3.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-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
 ## 1.2.1（2021-08-24）
 - 新增 支持国际化
 ## 1.2.0（2021-07-30）
diff --git a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
index b20dea5e026bbd68c465d42e053ba367b09747cf..ededbc20d39978894c42cf4a62954c5f67ba6951 100644
--- a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
@@ -1,43 +1,52 @@
 <template>
 	<view class="uni-load-more" @click="onClick">
 		<!-- #ifdef APP-NVUE -->
-		<loading-indicator v-if="!webviewHide && status === 'loading' && showIcon" :style="{color: color,width:iconSize+'px',height:iconSize+'px'}" :animating="true" class="uni-load-more__img uni-load-more__img--nvue"></loading-indicator>
+		<loading-indicator v-if="!webviewHide && status === 'loading' && showIcon"
+			:style="{color: color,width:iconSize+'px',height:iconSize+'px'}" :animating="true"
+			class="uni-load-more__img uni-load-more__img--nvue"></loading-indicator>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->
-		<svg width="24" height="24" viewBox="25 25 50 50" v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
-		:style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--android-H5">
+		<svg width="24" height="24" viewBox="25 25 50 50"
+			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}"
+			class="uni-load-more__img uni-load-more__img--android-H5">
 			<circle cx="50" cy="50" r="20" fill="none" :style="{color:color}" :stroke-width="3"></circle>
 		</svg>
 		<!-- #endif -->
 		<!-- #ifndef APP-NVUE || H5 -->
-		<view v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
-		:style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--android-MP">
-			<view :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
-			<view :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
-			<view :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+		<view
+			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}"
+			class="uni-load-more__img uni-load-more__img--android-MP">
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
 		</view>
 		<!-- #endif -->
 		<!-- #ifndef APP-NVUE -->
-		<view v-else-if="!webviewHide && status === 'loading' && showIcon" :style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--ios-H5">
-			<image src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzlBMzU3OTlEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzlBMzU3OUFEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDOUEzNTc5N0Q5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDOUEzNTc5OEQ5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt+ALSwAAA6CSURBVHja1FsLkFZVHb98LM+F5bHL8khA1iSeiyQBCRM+YGqKUnnJTDLGI0BGZlKDIU2MMglUiDApEZvSsZnQtBRJtKwQNKQMFYeRDR10WOLd8ljYXdh+v8v5fR3Od+797t1dnOnO/Ofce77z+J//+b/P+ZqtXbs2sJ9MJhNUV1cHJ06cCJo3bx7EPc2aNcvpy7pWrVoF+/fvDyoqKoI2bdoE9fX1F7TjN8a+EXBn/fkfvw942Tf+wYMHg9mzZwfjxo0LDhw4EPa1x2MbFw/fOGfPng1qa2tzcCkILsLDydq2bRsunpOTMM7TD/W/tZDZhPdeKD+yGxHhdu3aBV27dg3OnDlzMVANMheLAO3btw8KCwuDmpoaX5OxbgUIMEq7K8IcPnw4KCsrC/r37x8cP378/4cAXAB3vqSkJMuiDhTkw+XcuXNhOWbMmKBly5YhUT8xArhyFvP0BfwRsAuwxJZJsm/nzp2DTp06he/OU+cZ64K6o0ePBkOHDg2GDx8e6gEbJ5Q/NHNuAJQ1hgBeHUDlR7nVTkY8rQAvAi4z34vR/mPs1FoRsaCgIJThI0eOBC1atEiFGGV+5MiRoS45efJkqFjJFXV1dQuA012m2WcwTw98fy6CqBdsaiIO4CScrGPHjvk4odhavPquRtFWXEC25VgkREKOCh/qDSq+vn37htzD/mZTOmOc5U7zKzBPEedygWshcDyWvs30igAbU+6oyMgJBCFhwQE0fccxN60Ay9iebbjoDh06hMowjQxT4fXq1SskArmHZpkArvixp/kWzHdMeArExSJEaiXIjjRjRJ4DaAGWpibLzXN3Fm1vA5teBgh3j1Rv3bp1YgKwPdmf2p9zcyNYYgPKMfY0T5f5nNYdw158nJ8QawW4CLKwiOBSEgO/hok2eBydR+3dYH+PLxA5J8Vv0KBBwenTp0P2JWAx6+yFEBfs8lMY+y0SWMBNI9E4ThKi58VKTg3FQZS1RQF1cz27eC0QHMu+3E0SkUowjhVt5VdaWhp07949ZHv2Qd1EjDXM2cla1M0nl3GxAs3J9yREzyTdFVKVFOaE9qRA8GM0WebRuo9JGZKA7Mv2SeS/Z8+eoQ9BArMfFrLGo6jvxbhHbJZnKX2Rzz1O7QhJJ9Cs2ZMaWIyq/zhdeqPNfIoHd58clIQD+JSXl4dKlyIAuBdVXZwFVWKspSSoxE++h8x4k3uCnEhE4I5KwRiFWGOU0QWKiCYLbdoRMRKAu2kQ9vkfLU6dOhX06NEjlH+yMRZSinnuyWnYosVcji8CEA/6Cg2JF+IIUBqnGKUTCNwtwBN4f89RiK1R96DEgO2o0NDmtEdvVFdVVYV+P3UAPUEs6GFwV3PHmXkD4vh74iDFJysVI/MlaQhwKeBNTLYX5VuA8T4/gZxA4MRGFxDB6R7OmYPfyykGRJbyie+XnGYnQIC/coH9+vULiYrxrkL9ZA9+0ykaHIfEpM7ge8TiJ2CsHYwyMfafAF1yCGBHYIbCVDjDjKt7BeB51D+LgQa6OkG7IDYEEtvQ7lnXLKLtLdLuJBpE4gPUXcW2+PkZwOex+4cGDhwYDBkyRL7/HFcEwUGPo/8uWRUpYnfxGHco8HkewLHLyYmAawAPuIFZxhOpDfJQ8gbUv41yORAptMWBNr6oqMhWird5+u+iHmBb2nhjDV7HWBNQTgK8y11l5NetWzc5ULscAtSj7nbNI0skhWeUZCc0W4nyH/jO4Vz0u1IeYhbk4AiwM6tjxIWByHsoZ9qcIBPJd/y+DwPfBESOmCa/QF3WiZHucLlEDpNxcNhmheEOPgdQNx6/VZFQzFZ5TN08AHXQt2Ii3EdyFuUsPtTcGPhW5iMiCNELvz+Gdn9huG4HUJaW/w3g0wxV0XaG7arG2WeKiUWYM4Y7GO5ezshTARbbWGw/DvXkpp/ivVvE0JVoMxN4rpGzJMhE5Pl+xlATsDIqikP9F9D2z3h9nOksEUFhK+qO4rcPkoalMQ/HqJLIyb3F3JdjrCcw1yZ8joyJLR5gCo54etlag7qIoeNh1N1BRYj3DTFJ0elotxPlVzkGuYAmL0VSJVGAJA41c4Z6A3BzTLfn0HYwYKEI6CUAMzZEWvLsIcQOo1AmmyyM72nHJCfYsogflGV6jEk9vyQZXSuq6w4c16NsGcGZbwOPr+H1RkOk2LEzjNepxQkihHSCQ4ynAYNRx2zMKV92CQMWqj8J0BRE8EShxRFN6YrfCRhC0x3r/Zm4IbQCcmJoV0kMamllccR6FjHqUC5F2R/wS2dcymOlfAKOS4KmzQb5cpNC2MC7JhVn5wjXoJ44rYhLh8n0eXOCorJxa7POjbSlCGVczr34/RsAmrcvo9s+wGp3tzVhntxiXiJ4nvEYb4FJkf0O8HocAePmLvCxnL0AORraVekJk6TYjDabRVXfRE2lCN1h6ZQRN1+InUbsCpKwoBZHh0dODN9JBCUffItXxEavTQkUtnfTVAplCWL3JISz29h4NjotnuSsQKJCk8dF+kJR6RARjrqFVmfPnj3ZbK8cIJ0msd6jgHPGtfVTQ8VLmlvh4mct9sobRmPic0DyDQQnx/NlfYUgyz59+oScsH379pAwXABD32nTpoUHIToESeI5mnbE/UqDdyLcafEBf2MCqgC7NwxIbMREJQ0g4D4sfJwnD+AmRrII05cfMWJE+L1169bQr+fip06dGp4oJ83lmYd5wj/EmMa4TaHivo4EeCguYZBnkB5g2aWA69OIEnUHOaGysjIYMGBAMGnSpODYsWPZwCpFmm4lNq+4gSLQA7jcX8DwtjEyRC8wjabnXEx9kfWnTJkSJkAo90xpJVV+FmcVNeYAF5zWngS4C4O91MBxmAv8blLEpbjI5sz9MTdAhcgkCT1RO8mZkAjfiYpTEvStAS53Uw1vAiUGgZ3GpuQEYvoiBqlIan7kSDHnTwJQFNiPu0+5VxCVYhcZIjNrdXUDdp+Eq5AZ3Gkg8QAyVZRZIk4Tl4QAbF9cXJxNYZMAtAokgs4BrNxEpCtteXg7DDTMDKYNSuQdKsnJBek7HxewvxaosWxLYXtw+cJp18217wql4aKCfBNoEu0O5VU+PhctJ0YeXD4C6JQpyrlpSLTojpGGGN5YwNziChdIZLk4lvLcFJ9jMX3QdiImY9bmGQU+TRUL5CHITTRlgF8D9ouD1MfmLoEPl5xokIumZ2cfgMpHt47IW9N64Hsh7wQYYjyIugWuF5fCqYncXRd5vPMWyizzvhi/32+nvG0dZc9vR6fZOu0md5e+uC408FvKSIOZwXlGvxPv95izA2Vtvg1xKFWARI+vMX66HUhpQQb643uW1bSjuTWyw2SBvDrBvjFic1eGGlz5esq3ko9uSIlBRqPuFcCv8F4WIcN12nVaBd0SaYwI6PDDImR11JkqgHcPmQssjxIn6bUshygDFJUTxPMpHk+jfjPgupgdnYV2R/g7xSjtpah8RJBewhwf0gGK6XI92u4wXFEU40afJ4DN4h5LcAd+40HI3JgJecuT0c062W0i2hQJUTcxan3/CMW1PF2K6bbA+Daz4xRs1D3Br1Cm0OihKCqizW78/nXAF/G5TXrEcVzaNMH6CyMswqsAHqDyDLEyou8lwOXnKF8DjI6KjV3KzMBiXkDH8ij/H214J5A596ekrZ3F0zXlWeL7+P5eUrNo3/QwC15uxthuzidy7DzKRwEDaAViiDgKbTbz7CJnzo0bN7pIfIiid8SuPwn25o3QCmpnyjlZkyxPP8EomCJzrGb7GJMx7tNsq4MT2xMUYaiErZOluTzKsnz3gwCeCZyVRZJfYplNEokEjwrPtxlxjeYAk+F1F74VAzPxQRNYYdtpOUvWs8J1sGhBJMNsb7igN8plJs1eSmLIhLKE4rvaCX27gOhLpLOsIzJ7qn/i+wZzcvSOZ23/du8TZjwV8zHIXoP4R3ifBxiFz1dcVpa3aPntPE+c6TmIWE9EtcMmAcPdWAhYhAXxcLOQi9L1WhD1Sc8p1d2oL7XGiRKp8F4A2i8K/nfI+y/gsTDJ/YC/8+AD5Uh04KHiGl+cIFPnBDDrPMjwRGkLXyxO4VGbfQWnDH2v0bVWE3C9QOXlepbgjEfIJQI6XDG3z5ahD9cw2pS78ipB85wyScNTvsVzlzzhL8/jRrnmVjfFJK/m3m4nj9vbgQTguT8XZTjsm672R5uJKEaQmBI/c58gyus8ZDagLpEVSJBIyHp4jn++xqPV71OgQgJYEWOtZ/haxRtKmWOBu8xdBLftWltsY84zE6WIEy/eIOWL+BaayMx+KHtL7EAkqdNDLiEXmEMUHniedtJqg9HmZtfvt26vNi0BdG3Ft3g8ZOf7PAu59TxtzivLNIekyi+wD1i8CuUiD9FXAa8C+/xS3JPmZnomyc7H+fb4/Se0bk41Fel621r4cgVxbq91V4jVqwB7HTe2M7jgB+QWHavZkDRPmZcASoZEmBx6i75bGjPcMdL4/VKGFAGWZkGzPG0XAbdL9A81G5LOmUnC9hHKJeO7dcUMjblSl12867ElFTtaGl20xvvLGPdVz/8TVuU7y0x1PG7vtNg24oz9Uo/Z412++VFWI7Fcog9tu9Lm6gvRmIPv9x1xmQAu6RDkXtbOtlGEmpgD5Nvnyc0dcv0EE6cfdi1HmhMf9wDF3k3gtRvEedhxjpgfqPb9PU9iEJHnyOUA7bQUXh6kq/D7l2iTjWv7XOD530BDr8jIrus+srXjt4MzumJMHuTsBa63YKE1+RR5lBjEikCCnWKWiHdzOgKO+nRIBAF88za/IFmJ3eMZov4CYxGBabcpGL8EYx+SeMXJeRwHNsV/h+vdxeuhEpN3ZyNY78Gm2fknJxVGhyjixPiQvVkNzT1elD9Py/aTAL64Hb9vcYmC9zfdXdT/C1LeGbg4rnBaAihDFJH12W5ulfNCNe/xTsP3bp8ikzJs5BF+5PNfAQYAPaseTdsEcaYAAAAASUVORK5CYII="
-						 mode="widthFix"></image>
+		<view v-else-if="!webviewHide && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--ios-H5">
+			<image :src="imgBase64" mode="widthFix"></image>
 		</view>
 		<!-- #endif -->
-		<text class="uni-load-more__text" :style="{color: color}">{{ status === 'more' ? contentdownText : status === 'loading' ? contentrefreshText : contentnomoreText }}</text>
+		<text v-if="showText" class="uni-load-more__text"
+			:style="{color: color}">{{ status === 'more' ? contentdownText : status === 'loading' ? contentrefreshText : contentnomoreText }}</text>
 	</view>
 </template>
 
 <script>
 	let platform
 	setTimeout(() => {
-			platform = uni.getSystemInfoSync().platform
+		platform = uni.getSystemInfoSync().platform
 	}, 16)
 
 	import {
-	initVueI18n
+		initVueI18n
 	} from '@dcloudio/uni-i18n'
 	import messages from './i18n/index.js'
-	const {	t	} = initVueI18n(messages)
+	const {
+		t
+	} = initVueI18n(messages)
 
 	/**
 	 * LoadMore 加载更多
@@ -59,7 +68,7 @@
 	 */
 	export default {
 		name: 'UniLoadMore',
-		emits:['clickLoadMore'],
+		emits: ['clickLoadMore'],
 		props: {
 			status: {
 				// 上拉的状态：more-loading前；loading-loading中；noMore-没有更多了
@@ -91,19 +100,23 @@
 						contentnomore: ''
 					}
 				}
+			},
+			showText: {
+				type: Boolean,
+				default: true
 			}
 		},
 		data() {
 			return {
-                webviewHide: false,
-				platform: platform
+				webviewHide: false,
+				platform: platform,
+				imgBase64: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzlBMzU3OTlEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzlBMzU3OUFEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDOUEzNTc5N0Q5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDOUEzNTc5OEQ5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt+ALSwAAA6CSURBVHja1FsLkFZVHb98LM+F5bHL8khA1iSeiyQBCRM+YGqKUnnJTDLGI0BGZlKDIU2MMglUiDApEZvSsZnQtBRJtKwQNKQMFYeRDR10WOLd8ljYXdh+v8v5fR3Od+797t1dnOnO/Ofce77z+J//+b/P+ZqtXbs2sJ9MJhNUV1cHJ06cCJo3bx7EPc2aNcvpy7pWrVoF+/fvDyoqKoI2bdoE9fX1F7TjN8a+EXBn/fkfvw942Tf+wYMHg9mzZwfjxo0LDhw4EPa1x2MbFw/fOGfPng1qa2tzcCkILsLDydq2bRsunpOTMM7TD/W/tZDZhPdeKD+yGxHhdu3aBV27dg3OnDlzMVANMheLAO3btw8KCwuDmpoaX5OxbgUIMEq7K8IcPnw4KCsrC/r37x8cP378/4cAXAB3vqSkJMuiDhTkw+XcuXNhOWbMmKBly5YhUT8xArhyFvP0BfwRsAuwxJZJsm/nzp2DTp06he/OU+cZ64K6o0ePBkOHDg2GDx8e6gEbJ5Q/NHNuAJQ1hgBeHUDlR7nVTkY8rQAvAi4z34vR/mPs1FoRsaCgIJThI0eOBC1atEiFGGV+5MiRoS45efJkqFjJFXV1dQuA012m2WcwTw98fy6CqBdsaiIO4CScrGPHjvk4odhavPquRtFWXEC25VgkREKOCh/qDSq+vn37htzD/mZTOmOc5U7zKzBPEedygWshcDyWvs30igAbU+6oyMgJBCFhwQE0fccxN60Ay9iebbjoDh06hMowjQxT4fXq1SskArmHZpkArvixp/kWzHdMeArExSJEaiXIjjRjRJ4DaAGWpibLzXN3Fm1vA5teBgh3j1Rv3bp1YgKwPdmf2p9zcyNYYgPKMfY0T5f5nNYdw158nJ8QawW4CLKwiOBSEgO/hok2eBydR+3dYH+PLxA5J8Vv0KBBwenTp0P2JWAx6+yFEBfs8lMY+y0SWMBNI9E4ThKi58VKTg3FQZS1RQF1cz27eC0QHMu+3E0SkUowjhVt5VdaWhp07949ZHv2Qd1EjDXM2cla1M0nl3GxAs3J9yREzyTdFVKVFOaE9qRA8GM0WebRuo9JGZKA7Mv2SeS/Z8+eoQ9BArMfFrLGo6jvxbhHbJZnKX2Rzz1O7QhJJ9Cs2ZMaWIyq/zhdeqPNfIoHd58clIQD+JSXl4dKlyIAuBdVXZwFVWKspSSoxE++h8x4k3uCnEhE4I5KwRiFWGOU0QWKiCYLbdoRMRKAu2kQ9vkfLU6dOhX06NEjlH+yMRZSinnuyWnYosVcji8CEA/6Cg2JF+IIUBqnGKUTCNwtwBN4f89RiK1R96DEgO2o0NDmtEdvVFdVVYV+P3UAPUEs6GFwV3PHmXkD4vh74iDFJysVI/MlaQhwKeBNTLYX5VuA8T4/gZxA4MRGFxDB6R7OmYPfyykGRJbyie+XnGYnQIC/coH9+vULiYrxrkL9ZA9+0ykaHIfEpM7ge8TiJ2CsHYwyMfafAF1yCGBHYIbCVDjDjKt7BeB51D+LgQa6OkG7IDYEEtvQ7lnXLKLtLdLuJBpE4gPUXcW2+PkZwOex+4cGDhwYDBkyRL7/HFcEwUGPo/8uWRUpYnfxGHco8HkewLHLyYmAawAPuIFZxhOpDfJQ8gbUv41yORAptMWBNr6oqMhWird5+u+iHmBb2nhjDV7HWBNQTgK8y11l5NetWzc5ULscAtSj7nbNI0skhWeUZCc0W4nyH/jO4Vz0u1IeYhbk4AiwM6tjxIWByHsoZ9qcIBPJd/y+DwPfBESOmCa/QF3WiZHucLlEDpNxcNhmheEOPgdQNx6/VZFQzFZ5TN08AHXQt2Ii3EdyFuUsPtTcGPhW5iMiCNELvz+Gdn9huG4HUJaW/w3g0wxV0XaG7arG2WeKiUWYM4Y7GO5ezshTARbbWGw/DvXkpp/ivVvE0JVoMxN4rpGzJMhE5Pl+xlATsDIqikP9F9D2z3h9nOksEUFhK+qO4rcPkoalMQ/HqJLIyb3F3JdjrCcw1yZ8joyJLR5gCo54etlag7qIoeNh1N1BRYj3DTFJ0elotxPlVzkGuYAmL0VSJVGAJA41c4Z6A3BzTLfn0HYwYKEI6CUAMzZEWvLsIcQOo1AmmyyM72nHJCfYsogflGV6jEk9vyQZXSuq6w4c16NsGcGZbwOPr+H1RkOk2LEzjNepxQkihHSCQ4ynAYNRx2zMKV92CQMWqj8J0BRE8EShxRFN6YrfCRhC0x3r/Zm4IbQCcmJoV0kMamllccR6FjHqUC5F2R/wS2dcymOlfAKOS4KmzQb5cpNC2MC7JhVn5wjXoJ44rYhLh8n0eXOCorJxa7POjbSlCGVczr34/RsAmrcvo9s+wGp3tzVhntxiXiJ4nvEYb4FJkf0O8HocAePmLvCxnL0AORraVekJk6TYjDabRVXfRE2lCN1h6ZQRN1+InUbsCpKwoBZHh0dODN9JBCUffItXxEavTQkUtnfTVAplCWL3JISz29h4NjotnuSsQKJCk8dF+kJR6RARjrqFVmfPnj3ZbK8cIJ0msd6jgHPGtfVTQ8VLmlvh4mct9sobRmPic0DyDQQnx/NlfYUgyz59+oScsH379pAwXABD32nTpoUHIToESeI5mnbE/UqDdyLcafEBf2MCqgC7NwxIbMREJQ0g4D4sfJwnD+AmRrII05cfMWJE+L1169bQr+fip06dGp4oJ83lmYd5wj/EmMa4TaHivo4EeCguYZBnkB5g2aWA69OIEnUHOaGysjIYMGBAMGnSpODYsWPZwCpFmm4lNq+4gSLQA7jcX8DwtjEyRC8wjabnXEx9kfWnTJkSJkAo90xpJVV+FmcVNeYAF5zWngS4C4O91MBxmAv8blLEpbjI5sz9MTdAhcgkCT1RO8mZkAjfiYpTEvStAS53Uw1vAiUGgZ3GpuQEYvoiBqlIan7kSDHnTwJQFNiPu0+5VxCVYhcZIjNrdXUDdp+Eq5AZ3Gkg8QAyVZRZIk4Tl4QAbF9cXJxNYZMAtAokgs4BrNxEpCtteXg7DDTMDKYNSuQdKsnJBek7HxewvxaosWxLYXtw+cJp18217wql4aKCfBNoEu0O5VU+PhctJ0YeXD4C6JQpyrlpSLTojpGGGN5YwNziChdIZLk4lvLcFJ9jMX3QdiImY9bmGQU+TRUL5CHITTRlgF8D9ouD1MfmLoEPl5xokIumZ2cfgMpHt47IW9N64Hsh7wQYYjyIugWuF5fCqYncXRd5vPMWyizzvhi/32+nvG0dZc9vR6fZOu0md5e+uC408FvKSIOZwXlGvxPv95izA2Vtvg1xKFWARI+vMX66HUhpQQb643uW1bSjuTWyw2SBvDrBvjFic1eGGlz5esq3ko9uSIlBRqPuFcCv8F4WIcN12nVaBd0SaYwI6PDDImR11JkqgHcPmQssjxIn6bUshygDFJUTxPMpHk+jfjPgupgdnYV2R/g7xSjtpah8RJBewhwf0gGK6XI92u4wXFEU40afJ4DN4h5LcAd+40HI3JgJecuT0c062W0i2hQJUTcxan3/CMW1PF2K6bbA+Daz4xRs1D3Br1Cm0OihKCqizW78/nXAF/G5TXrEcVzaNMH6CyMswqsAHqDyDLEyou8lwOXnKF8DjI6KjV3KzMBiXkDH8ij/H214J5A596ekrZ3F0zXlWeL7+P5eUrNo3/QwC15uxthuzidy7DzKRwEDaAViiDgKbTbz7CJnzo0bN7pIfIiid8SuPwn25o3QCmpnyjlZkyxPP8EomCJzrGb7GJMx7tNsq4MT2xMUYaiErZOluTzKsnz3gwCeCZyVRZJfYplNEokEjwrPtxlxjeYAk+F1F74VAzPxQRNYYdtpOUvWs8J1sGhBJMNsb7igN8plJs1eSmLIhLKE4rvaCX27gOhLpLOsIzJ7qn/i+wZzcvSOZ23/du8TZjwV8zHIXoP4R3ifBxiFz1dcVpa3aPntPE+c6TmIWE9EtcMmAcPdWAhYhAXxcLOQi9L1WhD1Sc8p1d2oL7XGiRKp8F4A2i8K/nfI+y/gsTDJ/YC/8+AD5Uh04KHiGl+cIFPnBDDrPMjwRGkLXyxO4VGbfQWnDH2v0bVWE3C9QOXlepbgjEfIJQI6XDG3z5ahD9cw2pS78ipB85wyScNTvsVzlzzhL8/jRrnmVjfFJK/m3m4nj9vbgQTguT8XZTjsm672R5uJKEaQmBI/c58gyus8ZDagLpEVSJBIyHp4jn++xqPV71OgQgJYEWOtZ/haxRtKmWOBu8xdBLftWltsY84zE6WIEy/eIOWL+BaayMx+KHtL7EAkqdNDLiEXmEMUHniedtJqg9HmZtfvt26vNi0BdG3Ft3g8ZOf7PAu59TxtzivLNIekyi+wD1i8CuUiD9FXAa8C+/xS3JPmZnomyc7H+fb4/Se0bk41Fel621r4cgVxbq91V4jVqwB7HTe2M7jgB+QWHavZkDRPmZcASoZEmBx6i75bGjPcMdL4/VKGFAGWZkGzPG0XAbdL9A81G5LOmUnC9hHKJeO7dcUMjblSl12867ElFTtaGl20xvvLGPdVz/8TVuU7y0x1PG7vtNg24oz9Uo/Z412++VFWI7Fcog9tu9Lm6gvRmIPv9x1xmQAu6RDkXtbOtlGEmpgD5Nvnyc0dcv0EE6cfdi1HmhMf9wDF3k3gtRvEedhxjpgfqPb9PU9iEJHnyOUA7bQUXh6kq/D7l2iTjWv7XOD530BDr8jIrus+srXjt4MzumJMHuTsBa63YKE1+RR5lBjEikCCnWKWiHdzOgKO+nRIBAF88za/IFmJ3eMZov4CYxGBabcpGL8EYx+SeMXJeRwHNsV/h+vdxeuhEpN3ZyNY78Gm2fknJxVGhyjixPiQvVkNzT1elD9Py/aTAL64Hb9vcYmC9zfdXdT/C1LeGbg4rnBaAihDFJH12W5ulfNCNe/xTsP3bp8ikzJs5BF+5PNfAQYAPaseTdsEcaYAAAAASUVORK5CYII='
 			}
 		},
-		// #ifndef APP-NVUE
-		computed:{
-			iconSnowWidth(){
-				return (Math.floor(this.iconSize/24)||1)*2
-			},
+		computed: {
+			iconSnowWidth() {
+				return (Math.floor(this.iconSize / 24) || 1) * 2
+			},
 			contentdownText() {
 				return this.contentText.contentdown || t("uni-load-more.contentdown")
 			},
@@ -114,7 +127,6 @@
 				return this.contentText.contentnomore || t("uni-load-more.contentnomore")
 			}
 		},
-		// #endif
 		mounted() {
 			// #ifdef APP-PLUS
 			var pages = getCurrentPages();
@@ -140,8 +152,7 @@
 	}
 </script>
 
-<style lang="scss" scoped>
-
+<style lang="scss" >
 	.uni-load-more {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -153,13 +164,14 @@
 	}
 
 	.uni-load-more__text {
-		font-size: 15px;
+		font-size: 14px;
+		margin-left: 8px;
 	}
 
 	.uni-load-more__img {
 		width: 24px;
 		height: 24px;
-		margin-right: 8px;
+		// margin-right: 8px;
 	}
 
 	.uni-load-more__img--nvue {
@@ -193,7 +205,7 @@
 		animation: loading-ios-H5 1s 0s step-end infinite;
 	}
 
-	.uni-load-more__img--ios-H5>image {
+	.uni-load-more__img--ios-H5 image {
 		position: absolute;
 		width: 100%;
 		height: 100%;
@@ -263,7 +275,7 @@
 		transform-origin: center center;
 	}
 
-	.uni-load-more__img--android-H5>circle {
+	.uni-load-more__img--android-H5 circle {
 		display: inline-block;
 		animation: loading-android-H5-dash 1.5s ease-in-out infinite;
 		stroke: currentColor;
@@ -308,7 +320,7 @@
 		animation: loading-ios 1s 0s ease infinite;
 	}
 
-	.uni-load-more__img--android-MP>view {
+	.uni-load-more__img--android-MP .uni-load-more__img-icon {
 		position: absolute;
 		box-sizing: border-box;
 		width: 100%;
@@ -319,15 +331,15 @@
 		transform-origin: center;
 	}
 
-	.uni-load-more__img--android-MP>view:nth-child(1){
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(1) {
 		animation: loading-android-MP-1 1s 0s linear infinite;
 	}
 
-	.uni-load-more__img--android-MP>view:nth-child(2){
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(2) {
 		animation: loading-android-MP-2 1s 0s linear infinite;
 	}
 
-	.uni-load-more__img--android-MP>view:nth-child(3){
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(3) {
 		animation: loading-android-MP-3 1s 0s linear infinite;
 	}
 
@@ -341,38 +353,47 @@
 		}
 	}
 
-	@keyframes loading-android-MP-1{
-		0%{
+	@keyframes loading-android-MP-1 {
+		0% {
 			transform: rotate(0deg);
 		}
-		50%{
+
+		50% {
 			transform: rotate(90deg);
 		}
-		100%{
+
+		100% {
 			transform: rotate(360deg);
 		}
 	}
-	@keyframes loading-android-MP-2{
-		0%{
+
+	@keyframes loading-android-MP-2 {
+		0% {
 			transform: rotate(0deg);
 		}
-		50%{
+
+		50% {
 			transform: rotate(180deg);
 		}
-		100%{
+
+		100% {
 			transform: rotate(360deg);
 		}
 	}
-	@keyframes loading-android-MP-3{
-		0%{
+
+	@keyframes loading-android-MP-3 {
+		0% {
 			transform: rotate(0deg);
 		}
-		50%{
+
+		50% {
 			transform: rotate(270deg);
 		}
-		100%{
+
+		100% {
 			transform: rotate(360deg);
 		}
 	}
+
 	/* #endif */
 </style>
diff --git a/uni_modules/uni-load-more/package.json b/uni_modules/uni-load-more/package.json
index 062ee5deb222929b361aecc31e2dc866ad659e77..2fa6f040a8952a8246f9dd9a875f6b95e21996f6 100644
--- a/uni_modules/uni-load-more/package.json
+++ b/uni_modules/uni-load-more/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-load-more",
   "displayName": "uni-load-more 加载更多",
-  "version": "1.2.1",
+  "version": "1.3.3",
   "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
   "keywords": [
     "uni-ui",
@@ -40,7 +40,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": ["uni-scss"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -78,7 +78,7 @@
         },
         "Vue": {
             "vue2": "y",
-            "vue3": "u"
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-load-more/readme.md b/uni_modules/uni-load-more/readme.md
index b781fafd5accab29b9b7cbfe8dfec66618e3594a..54dc1fad29ca3906f3498530878791679e63a7bf 100644
--- a/uni_modules/uni-load-more/readme.md
+++ b/uni_modules/uni-load-more/readme.md
@@ -7,64 +7,8 @@
 
 用于列表中，做滚动加载使用，展示 loading 的各种状态。
 
-### 安装方式
 
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
 
-### 使用方式
-
-在 ``template`` 中使用组件
-
-```html
-<uni-load-more :status="more"></uni-load-more>
-```
-
-## API
-
-### LoadMore Props
-
-|属性名			|类型		|	可选值											|默认值	|说明	|
-|:-:				|:-:		|:-:												|:-:		|:-:														|
-|iconSize		|Number	|-													|24			|指定图标大小			|
-|status			|String	|more/loading/noMore				|more		|loading 的状态		|
-|showIcon		|Boolean|-													|true		|是否显示 loading 图标				|
-|iconType		|String	|snow/circle/auto						|auto		|指定图标样式|
-|color			|String	|-													|#777777	|图标和文字颜色		|
-|contentText|Object|-	|{contentdown: "上拉显示更多",contentrefresh: "正在加载...",contentnomore: "没有更多数据了"}|各状态文字说明	|
-
-
-#### Status Options
-|参数名称	|说明				|
-|:-:		|:-:				|
-|more		|loading前		|
-|loading|loading前中	|
-|more		|没有更多数据	|
-
-#### IconType Options
-|参数名称	|说明									|
-|:-:		|:-:									|
-|snow		|ios雪花加载样式				|
-|circle	|安卓环形加载样式				|
-|auto		|根据平台自动选择加载样式	|
-
-
-
-
-> **说明**
-> `iconType`为`snow`时，在`APP-NVUE`平台不可设置大小，在非`APP-NVUE`平台不可设置颜色
-
-
-
-### 事件说明
-
-|事件名					|说明				|返回值						|
-|:-:						|:-:				|:-:						|
-|clickLoadMore	|点击加载更多时触发	|e.detail={status:'loading'}|
-
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/load-more/load-more](https://hellouniapp.dcloud.net.cn/pages/extUI/load-more/load-more)
\ No newline at end of file
diff --git a/uni_modules/uni-nav-bar/changelog.md b/uni_modules/uni-nav-bar/changelog.md
index 70b3c488026ca64c47a6d00000fa3d0d82fdcdee..c2d841b6b3ea2227ae534d0607af974c2bed6b16 100644
--- a/uni_modules/uni-nav-bar/changelog.md
+++ b/uni_modules/uni-nav-bar/changelog.md
@@ -1,19 +1,39 @@
+## 1.3.5（2022-05-24）
+- 新增 stat 属性 ，可开启统计title 上报 ，仅使用了title 属性且项目开启了uni统计生效
+## 1.3.4（2022-01-24）
+- 更新 组件示例
+## 1.3.3（2022-01-24）
+- 新增 left-width/right-width属性 ，可修改左右两侧的宽度
+## 1.3.2（2022-01-18）
+- 修复 在vue下，标题不垂直居中的bug
+## 1.3.1（2022-01-18）
+- 修复 height 属性类型错误
+## 1.3.0（2022-01-18）
+- 新增 height 属性,可修改组件高度
+- 新增 dark 属性可可开启暗黑模式
+- 优化 标题字数过多显示省略号
+- 优化 插槽，插入内容可完全覆盖
+## 1.2.1（2022-01-10）
+- 修复 color 属性不生效的bug
+## 1.2.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-nav-bar](https://uniapp.dcloud.io/component/uniui/uni-nav-bar)
 ## 1.1.0（2021-07-30）
 - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 1.0.11（2021-05-12）
-- 新增 组件示例地址
-## 1.0.10（2021-04-30）
-- 修复 在nvue下fixed为true，宽度不能撑满的Bug
-## 1.0.9（2021-04-21）
-- 优化 添加依赖 uni-icons, 导入后自动下载依赖
-## 1.0.8（2021-04-14）
-- uni-ui 修复 uni-nav-bar 当 fixed 属性为 true 时铺不满屏幕的 bug
-
-## 1.0.7（2021-02-25）
-- 修复 easycom 下，找不到 uni-status-bar 的bug
-
-## 1.0.6（2021-02-05）
-- 优化 组件引用关系，通过uni_modules引用组件
-
-## 1.0.5（2021-02-05）
-- 调整为uni_modules目录规范
+## 1.0.11（2021-05-12）
+- 新增 组件示例地址
+## 1.0.10（2021-04-30）
+- 修复 在nvue下fixed为true，宽度不能撑满的Bug
+## 1.0.9（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.8（2021-04-14）
+- uni-ui 修复 uni-nav-bar 当 fixed 属性为 true 时铺不满屏幕的 bug
+
+## 1.0.7（2021-02-25）
+- 修复 easycom 下，找不到 uni-status-bar 的bug
+
+## 1.0.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
index 0df773fecb496747b7996d60362f98405fa8194a..4a46b870554ef03d6be7b1c11bbddc4d3e187e0b 100644
--- a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
+++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
@@ -1,52 +1,59 @@
 <template>
-	<view class="uni-navbar">
-		<view :class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }" :style="{ 'background-color': backgroundColor }"
-		 class="uni-navbar__content">
+	<view class="uni-navbar" :class="{'uni-dark':dark}">
+		<view :class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
+			:style="{ 'background-color': themeBgColor }" class="uni-navbar__content">
 			<status-bar v-if="statusBar" />
-			<view :style="{ color: color,backgroundColor: backgroundColor }" class="uni-navbar__header uni-navbar__content_view">
-				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left uni-navbar__content_view">
-					<view class="uni-navbar__content_view" v-if="leftIcon.length">
-						<uni-icons :color="color" :type="leftIcon" size="24" />
-					</view>
-					<view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length }" class="uni-navbar-btn-text uni-navbar__content_view"
-					 v-if="leftText.length">
-						<text :style="{ color: color, fontSize: '14px' }">{{ leftText }}</text>
-					</view>
-					<slot name="left" />
+			<view :style="{ color: themeColor,backgroundColor: themeBgColor ,height:navbarHeight}"
+				class="uni-navbar__header">
+				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left"
+					:style="{width:leftIconWidth}">
+					<slot name="left">
+						<view class="uni-navbar__content_view" v-if="leftIcon.length > 0">
+							<uni-icons :color="themeColor" :type="leftIcon" size="20" />
+						</view>
+						<view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length > 0 }" class="uni-navbar-btn-text"
+							v-if="leftText.length">
+							<text :style="{ color: themeColor, fontSize: '12px' }">{{ leftText }}</text>
+						</view>
+					</slot>
 				</view>
-				<view class="uni-navbar__header-container uni-navbar__content_view" @tap="onClickTitle">
-					<view class="uni-navbar__header-container-inner uni-navbar__content_view" v-if="title.length">
-						<text class="uni-nav-bar-text" :style="{color: color }">{{ title }}</text>
-					</view>
-					<!-- 标题插槽 -->
-					<slot />
+				<view class="uni-navbar__header-container " @tap="onClickTitle">
+					<slot>
+						<view class="uni-navbar__header-container-inner" v-if="title.length>0">
+							<text class="uni-nav-bar-text uni-ellipsis-1"
+								:style="{color: themeColor }">{{ title }}</text>
+						</view>
+					</slot>
 				</view>
-				<view :class="title.length ? 'uni-navbar__header-btns-right' : ''" @tap="onClickRight" class="uni-navbar__header-btns uni-navbar__content_view">
-					<view class="uni-navbar__content_view" v-if="rightIcon.length">
-						<uni-icons :color="color" :type="rightIcon" size="24" />
-					</view>
-					<!-- 优先显示图标 -->
-					<view class="uni-navbar-btn-text uni-navbar__content_view" v-if="rightText.length && !rightIcon.length">
-						<text class="uni-nav-bar-right-text">{{ rightText }}</text>
-					</view>
-					<slot name="right" />
+				<view @click="onClickRight" class="uni-navbar__header-btns uni-navbar__header-btns-right"
+					:style="{width:rightIconWidth}">
+					<slot name="right">
+						<view v-if="rightIcon.length">
+							<uni-icons :color="themeColor" :type="rightIcon" size="22" />
+						</view>
+						<view class="uni-navbar-btn-text" v-if="rightText.length && !rightIcon.length">
+							<text class="uni-nav-bar-right-text" :style="{ color: themeColor}">{{ rightText }}</text>
+						</view>
+					</slot>
 				</view>
 			</view>
 		</view>
 		<view class="uni-navbar__placeholder" v-if="fixed">
 			<status-bar v-if="statusBar" />
-			<view class="uni-navbar__placeholder-view" />
+			<view class="uni-navbar__placeholder-view" :style="{ height:navbarHeight}" />
 		</view>
 	</view>
 </template>
 
 <script>
 	import statusBar from "./uni-status-bar.vue";
+	const getVal = (val) => typeof val === 'number' ? val + 'px' : val;
 
 	/**
 	 * NavBar 自定义导航栏
 	 * @description 导航栏组件，主要用于头部导航
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=52
+	 * @property {Boolean} dark 开启黑暗模式
 	 * @property {String} title 标题文字
 	 * @property {String} leftText 左侧按钮文本
 	 * @property {String} rightText 右侧按钮文本
@@ -57,6 +64,7 @@
 	 * @property {Boolean} fixed = [true|false] 是否固定顶部
 	 * @property {Boolean} statusBar = [true|false] 是否包含状态栏
 	 * @property {Boolean} shadow = [true|false] 导航栏下是否有阴影
+	 * @property {Boolean} stat 是否开启统计标题上报
 	 * @event {Function} clickLeft 左侧按钮点击时触发
 	 * @event {Function} clickRight 右侧按钮点击时触发
 	 * @event {Function} clickTitle 中间标题点击时触发
@@ -66,8 +74,12 @@
 		components: {
 			statusBar
 		},
-		emits:['clickLeft','clickRight','clickTitle'],
+		emits: ['clickLeft', 'clickRight', 'clickTitle'],
 		props: {
+			dark: {
+				type: Boolean,
+				default: false
+			},
 			title: {
 				type: String,
 				default: ""
@@ -94,11 +106,11 @@
 			},
 			color: {
 				type: String,
-				default: "#000000"
+				default: ""
 			},
 			backgroundColor: {
 				type: String,
-				default: "#FFFFFF"
+				default: ""
 			},
 			statusBar: {
 				type: [Boolean, String],
@@ -111,13 +123,62 @@
 			border: {
 				type: [Boolean, String],
 				default: true
+			},
+			height: {
+				type: [Number, String],
+				default: 44
+			},
+			leftWidth: {
+				type: [Number, String],
+				default: 60
+			},
+			rightWidth: {
+				type: [Number, String],
+				default: 60
+			},
+			stat: {
+				type: [Boolean, String],
+				default: ''
+			}
+		},
+		computed: {
+			themeBgColor() {
+				if (this.dark) {
+					// 默认值
+					if (this.backgroundColor) {
+						return this.backgroundColor
+					} else {
+						return this.dark ? '#333' : '#FFF'
+					}
+				}
+				return this.backgroundColor || '#FFF'
+			},
+			themeColor() {
+				if (this.dark) {
+					// 默认值
+					if (this.color) {
+						return this.color
+					} else {
+						return this.dark ? '#fff' : '#333'
+					}
+				}
+				return this.color || '#333'
+			},
+			navbarHeight() {
+				return getVal(this.height)
+			},
+			leftIconWidth() {
+				return getVal(this.leftWidth)
+			},
+			rightIconWidth() {
+				return getVal(this.rightWidth)
+			}
+		},
+		mounted() {
+			if (uni.report && this.stat && this.title !== '') {
+				uni.report('title', this.title)
 			}
 		},
-        mounted() {
-          if(uni.report && this.title !== '') {
-              uni.report('title', this.title)
-          }
-        },
 		methods: {
 			onClickLeft() {
 				this.$emit("clickLeft");
@@ -134,57 +195,68 @@
 
 <style lang="scss" scoped>
 	$nav-height: 44px;
+
+	.uni-navbar {
+		// box-sizing: border-box;
+	}
+
 	.uni-nav-bar-text {
 		/* #ifdef APP-PLUS */
 		font-size: 34rpx;
 		/* #endif */
 		/* #ifndef APP-PLUS */
-		font-size: $uni-font-size-lg;
+		font-size: 14px;
 		/* #endif */
 	}
 
 	.uni-nav-bar-right-text {
-		font-size: $uni-font-size-base;
+		font-size: 12px;
 	}
 
 	.uni-navbar__content {
 		position: relative;
-		background-color: $uni-bg-color;
-		overflow: hidden;
-		// width: 750rpx;
+		// background-color: #fff;
+		// box-sizing: border-box;
+		background-color: transparent;
 	}
 
 	.uni-navbar__content_view {
+		// box-sizing: border-box;
+	}
+
+	.uni-navbar-btn-text {
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
+		flex-direction: column;
+		justify-content: flex-start;
 		align-items: center;
-		flex-direction: row;
-		// background-color: #FFFFFF;
+		line-height: 12px;
 	}
 
 	.uni-navbar__header {
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
+		padding: 0 10px;
 		flex-direction: row;
 		height: $nav-height;
-		line-height: $nav-height;
-		font-size: 16px;
-		// background-color: #ffffff;
+		font-size: 12px;
 	}
 
 	.uni-navbar__header-btns {
 		/* #ifndef APP-NVUE */
+		overflow: hidden;
 		display: flex;
 		/* #endif */
 		flex-wrap: nowrap;
+		flex-direction: row;
 		width: 120rpx;
-		padding: 0 6px;
+		// padding: 0 6px;
 		justify-content: center;
-		align-items: center;
-		/* #ifdef H5 */
-		cursor: pointer;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
 		/* #endif */
 	}
 
@@ -192,21 +264,29 @@
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
-		width: 150rpx;
+		width: 120rpx;
 		justify-content: flex-start;
+		align-items: center;
 	}
 
 	.uni-navbar__header-btns-right {
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
-		width: 150rpx;
-		padding-right: 30rpx;
+		flex-direction: row;
+		// width: 150rpx;
+		// padding-right: 30rpx;
 		justify-content: flex-end;
+		align-items: center;
 	}
 
 	.uni-navbar__header-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
 		flex: 1;
+		padding: 0 10px;
+		overflow: hidden;
 	}
 
 	.uni-navbar__header-container-inner {
@@ -214,9 +294,12 @@
 		display: flex;
 		/* #endif */
 		flex: 1;
+		flex-direction: row;
 		align-items: center;
 		justify-content: center;
-		font-size: $uni-font-size-base;
+		font-size: 12px;
+		overflow: hidden;
+		// box-sizing: border-box;
 	}
 
 
@@ -226,27 +309,40 @@
 
 	.uni-navbar--fixed {
 		position: fixed;
-		z-index: 998;
-		/* #ifdef H5 */
-		left: var(--window-left);
-		right: var(--window-right);
-		/* #endif */
-		/* #ifndef H5 */
-		left:0;
-		right: 0;
-		/* #endif */
-
+		z-index: 998;
+		/* #ifdef H5 */
+		left: var(--window-left);
+		right: var(--window-right);
+		/* #endif */
+		/* #ifndef H5 */
+		left: 0;
+		right: 0;
+		/* #endif */
+
 	}
 
 	.uni-navbar--shadow {
-		/* #ifndef APP-NVUE */
 		box-shadow: 0 1px 6px #ccc;
-		/* #endif */
 	}
 
 	.uni-navbar--border {
 		border-bottom-width: 1rpx;
 		border-bottom-style: solid;
-		border-bottom-color: $uni-border-color;
+		border-bottom-color: #eee;
+	}
+
+	.uni-ellipsis-1 {
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		text-overflow: ellipsis;
+		/* #endif */
 	}
+
+	// 暗主题配置
+	.uni-dark {}
 </style>
diff --git a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
index c91e67752e7ec40a2b6f7f3f79bdf75793a69cb9..75ce541070303585bcf79475fe7e15f1a9c31390 100644
--- a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
+++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
@@ -11,17 +11,17 @@
 			return {
 				statusBarHeight: 20
 			}
-		},
-		mounted() {
-			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'
+		},
+		mounted() {
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'
 		}
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
 	.uni-status-bar {
 		// width: 750rpx;
 		height: 20px;
 		// height: var(--status-bar-height);
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-nav-bar/package.json b/uni_modules/uni-nav-bar/package.json
index caf0ed4b12e8d0a9b3ecd984f347d9a05a40700a..a69ed4f19095bfedcabae723c00c56ab2fbd340f 100644
--- a/uni_modules/uni-nav-bar/package.json
+++ b/uni_modules/uni-nav-bar/package.json
@@ -1,84 +1,89 @@
-{
-  "id": "uni-nav-bar",
-  "displayName": "uni-nav-bar 自定义导航栏",
-  "version": "1.1.0",
-  "description": "自定义导航栏组件，主要用于头部导航。",
-  "keywords": [
-    "uni-ui",
-    "导航",
-    "导航栏",
-    "自定义导航栏"
-],
-  "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-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"
-        }
-      }
-    }
-  }
+{
+  "id": "uni-nav-bar",
+  "displayName": "uni-nav-bar 自定义导航栏",
+  "version": "1.3.5",
+  "description": "自定义导航栏组件，主要用于头部导航。",
+  "keywords": [
+    "uni-ui",
+    "导航",
+    "导航栏",
+    "自定义导航栏"
+],
+  "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"
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/uni_modules/uni-nav-bar/readme.md b/uni_modules/uni-nav-bar/readme.md
index fa34c8e6357b1d4ef1e103e037c617a6cb895a8a..3934b3277583a4a8073d2b42a367d237f748157a 100644
--- a/uni_modules/uni-nav-bar/readme.md
+++ b/uni_modules/uni-nav-bar/readme.md
@@ -1,71 +1,15 @@
 
 
-### NavBar 导航栏
-*已经支持在nvue页面中使用*
+## NavBar 导航栏
+> **组件名：uni-nav-bar**
+> 代码块： `uNavBar`
 
-导航栏组件，主要用于头部导航，组件名：``uni-nav-bar``，代码块： uNavBar。
+导航栏组件，主要用于头部导航。
 
-### 使用方式
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-nav-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-在 ``script`` 中引用组件 
 
-```javascript
-import uniNavBar from '@/components/uni-nav-bar/uni-nav-bar.vue'
-export default {
-    components: {uniNavBar}
-}
-```
 
-在 ``template`` 中使用组件
 
-```html
-<uni-nav-bar left-icon="back" left-text="返回" right-text="菜单" title="导航栏组件"></uni-nav-bar>
-```
 
-### 属性说明
-
-|属性名				|类型	|默认值	|说明																						|
-|:-:				|:-:	|:-:	|:-:																						|
-|title				|String	|-		|标题文字																					|
-|leftText			|String	|-		|左侧按钮文本																				|
-|rightText			|String	|-		|右侧按钮文本																				|
-|leftIcon			|String	|-		|左侧按钮图标（图标类型参考 [Icon 图标](http://ext.dcloud.net.cn/plugin?id=28) type 属性）	|
-|rightIcon			|String	|-		|右侧按钮图标（图标类型参考 [Icon 图标](http://ext.dcloud.net.cn/plugin?id=28) type 属性）	|
-|color				|String	|#000000|图标和文字颜色																				|
-|backgroundColor	|String	|#FFFFFF|导航栏背景颜色																				|
-|fixed				|Boolean|false	|是否固定顶部																				|
-|statusBar			|Boolean|false	|是否包含状态栏																			|
-|shadow				|Boolean|false	|导航栏下是否有阴影																			|
-
-### 插槽说明
-
-开发者使用 NavBar 时，支持向 NavBar 里插入不同内容，以达到自定义的目的。
-
-|slot名	|说明				|
-|:-:	|:-:				|
-|left	|向导航栏左侧插入	|
-|right	|向导航栏右侧插入	|
-|default|向导航栏中间插入	|
-
-```html
-<uni-nav-bar>
-    <view>标题栏</view>
-    <view slot="left">left</view>
-    <view slot="right">right</view>
-</uni-nav-bar>
-```
-
-### 事件说明
-
-|事件名			|说明				|返回值	|
-|:-:			|:-:				|:-:	|
-|@clickLeft	|左侧按钮点击时触发	|-		|
-|@clickRight	|右侧按钮点击时触发	|-		|
-
-### 插件预览地址
-
-[https://uniapp.dcloud.io/h5/pages/extUI/nav-bar/nav-bar](https://uniapp.dcloud.io/h5/pages/extUI/nav-bar/nav-bar)
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/nav-bar/nav-bar](https://hellouniapp.dcloud.net.cn/pages/extUI/nav-bar/nav-bar)
\ No newline at end of file
diff --git a/uni_modules/uni-notice-bar/changelog.md b/uni_modules/uni-notice-bar/changelog.md
index 37d7319e1f7a1392f2b1fdbdabede28e3dca51b4..b5581226acb2e2a168189f1dc1b6aa587768c88d 100644
--- a/uni_modules/uni-notice-bar/changelog.md
+++ b/uni_modules/uni-notice-bar/changelog.md
@@ -1,5 +1,10 @@
-## 1.1.0（2021-07-30）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.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-notice-bar](https://uniapp.dcloud.io/component/uniui/uni-notice-bar)
+## 1.1.1（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.0.9（2021-05-12）
 - 新增 组件示例地址
 ## 1.0.8（2021-04-21）
diff --git a/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
index 914ebe2c6d0d6fe02cd121938badb3c842cc195e..0a50ce2578c7b625cc5bd0971589bedd1b0715d0 100644
--- a/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
+++ b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
@@ -1,28 +1,24 @@
 <template>
 	<view v-if="show" class="uni-noticebar" :style="{ backgroundColor: backgroundColor }" @click="onClick">
-		<!-- #ifdef MP-ALIPAY -->
-		<view v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close uni-cursor-point" @click="close">
-			<uni-icons type="closeempty" :color="color" size="12" />
-		</view>
-		<view v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon">
-			<uni-icons type="sound" :color="color" size="14" />
-		</view>
-		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY -->
-		<uni-icons v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close uni-cursor-point" type="closeempty" :color="color"
-		 size="12" @click="close" />
-		<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound" :color="color"
-		 size="14" />
-		<!-- #endif -->
-		<view ref="textBox" class="uni-noticebar__content-wrapper" :class="{'uni-noticebar__content-wrapper--scrollable':scrollable, 'uni-noticebar__content-wrapper--single':!scrollable && (single || moreText)}">
-			<view :id="elIdBox" class="uni-noticebar__content" :class="{'uni-noticebar__content--scrollable':scrollable, 'uni-noticebar__content--single':!scrollable && (single || moreText)}">
-				<text :id="elId" ref="animationEle" class="uni-noticebar__content-text" :class="{'uni-noticebar__content-text--scrollable':scrollable,'uni-noticebar__content-text--single':!scrollable && (single || moreText)}"
-				 :style="{color:color, width:wrapWidth+'px', 'animationDuration': animationDuration, '-webkit-animationDuration': animationDuration ,animationPlayState: webviewHide?'paused':animationPlayState,'-webkit-animationPlayState':webviewHide?'paused':animationPlayState, animationDelay: animationDelay, '-webkit-animationDelay':animationDelay}">{{text}}</text>
+		<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound"
+			:color="color" size="22" />
+		<view ref="textBox" class="uni-noticebar__content-wrapper"
+			:class="{'uni-noticebar__content-wrapper--scrollable':scrollable, 'uni-noticebar__content-wrapper--single':!scrollable && (single || moreText)}">
+			<view :id="elIdBox" class="uni-noticebar__content"
+				:class="{'uni-noticebar__content--scrollable':scrollable, 'uni-noticebar__content--single':!scrollable && (single || moreText)}">
+				<text :id="elId" ref="animationEle" class="uni-noticebar__content-text"
+					:class="{'uni-noticebar__content-text--scrollable':scrollable,'uni-noticebar__content-text--single':!scrollable && (single || showGetMore)}"
+					:style="{color:color, width:wrapWidth+'px', 'animationDuration': animationDuration, '-webkit-animationDuration': animationDuration ,animationPlayState: webviewHide?'paused':animationPlayState,'-webkit-animationPlayState':webviewHide?'paused':animationPlayState, animationDelay: animationDelay, '-webkit-animationDelay':animationDelay}">{{text}}</text>
 			</view>
 		</view>
-		<view v-if="showGetMore === true || showGetMore === 'true'" class="uni-noticebar__more uni-cursor-point" @click="clickMore">
-			<text v-if="moreText" :style="{ color: moreColor }" class="uni-noticebar__more-text">{{ moreText }}</text>
-			<uni-icons type="arrowright" :color="moreColor" size="14" />
+		<view v-if="showGetMore === true || showGetMore === 'true'" class="uni-noticebar__more uni-cursor-point"
+			@click="clickMore">
+			<text v-if="moreText.length > 0" :style="{ color: moreColor }" class="uni-noticebar__more-text">{{ moreText }}</text>
+			<uni-icons v-else type="right" :color="moreColor" size="16" />
+		</view>
+		<view class="uni-noticebar-close uni-cursor-point" v-if="(showClose === true || showClose === 'true') && (showGetMore === false || showGetMore === 'false')">
+			<uni-icons
+				type="closeempty" :color="color" size="16" @click="close" />
 		</view>
 	</view>
 </template>
@@ -31,31 +27,31 @@
 	// #ifdef APP-NVUE
 	const dom = weex.requireModule('dom');
 	const animation = weex.requireModule('animation');
-	// #endif
-
-	/**
-	 * NoticeBar 自定义导航栏
-	 * @description 通告栏组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=30
-	 * @property {Number} speed 文字滚动的速度，默认100px/秒
-	 * @property {String} text 显示文字
-	 * @property {String} backgroundColor 背景颜色
-	 * @property {String} color 文字颜色
-	 * @property {String} moreColor 查看更多文字的颜色
-	 * @property {String} moreText 设置“查看更多”的文本
-	 * @property {Boolean} single = [true|false] 是否单行
-	 * @property {Boolean} scrollable = [true|false] 是否滚动，为true时，NoticeBar为单行
-	 * @property {Boolean} showIcon = [true|false] 是否显示左侧喇叭图标
-	 * @property {Boolean} showClose = [true|false] 是否显示左侧关闭按钮
-	 * @property {Boolean} showGetMore = [true|false] 是否显示右侧查看更多图标，为true时，NoticeBar为单行
-	 * @event {Function} click 点击 NoticeBar 触发事件
-	 * @event {Function} close 关闭 NoticeBar 触发事件
-	 * @event {Function} getmore 点击”查看更多“时触发事件
-	 */
+	// #endif
+
+	/**
+	 * NoticeBar 自定义导航栏
+	 * @description 通告栏组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=30
+	 * @property {Number} speed 文字滚动的速度，默认100px/秒
+	 * @property {String} text 显示文字
+	 * @property {String} backgroundColor 背景颜色
+	 * @property {String} color 文字颜色
+	 * @property {String} moreColor 查看更多文字的颜色
+	 * @property {String} moreText 设置“查看更多”的文本
+	 * @property {Boolean} single = [true|false] 是否单行
+	 * @property {Boolean} scrollable = [true|false] 是否滚动，为true时，NoticeBar为单行
+	 * @property {Boolean} showIcon = [true|false] 是否显示左侧喇叭图标
+	 * @property {Boolean} showClose = [true|false] 是否显示左侧关闭按钮
+	 * @property {Boolean} showGetMore = [true|false] 是否显示右侧查看更多图标，为true时，NoticeBar为单行
+	 * @event {Function} click 点击 NoticeBar 触发事件
+	 * @event {Function} close 关闭 NoticeBar 触发事件
+	 * @event {Function} getmore 点击”查看更多“时触发事件
+	 */
 
 	export default {
 		name: 'UniNoticeBar',
-		emits:['click','getmore','close'],
+		emits: ['click', 'getmore', 'close'],
 		props: {
 			text: {
 				type: String,
@@ -67,7 +63,7 @@
 			},
 			backgroundColor: {
 				type: String,
-				default: '#fffbe8'
+				default: '#FFF9EA'
 			},
 			speed: {
 				// 默认1s滚动100px
@@ -76,11 +72,11 @@
 			},
 			color: {
 				type: String,
-				default: '#de8c17'
+				default: '#FF9A43'
 			},
 			moreColor: {
 				type: String,
-				default: '#999999'
+				default: '#FF9A43'
 			},
 			single: {
 				// 是否单行
@@ -132,10 +128,10 @@
 			var pages = getCurrentPages();
 			var page = pages[pages.length - 1];
 			var currentWebview = page.$getAppWebview();
-			currentWebview.addEventListener('hide',()=>{
+			currentWebview.addEventListener('hide', () => {
 				this.webviewHide = true
 			})
-			currentWebview.addEventListener('show',()=>{
+			currentWebview.addEventListener('show', () => {
 				this.webviewHide = false
 			})
 			// #endif
@@ -156,9 +152,9 @@
 						boxWidth = 0,
 						textWidth = 0;
 					let textQuery = new Promise((resolve, reject) => {
-						uni.createSelectorQuery()
+						uni.createSelectorQuery()
 							// #ifndef MP-ALIPAY
-							.in(this)
+							.in(this)
 							// #endif
 							.select(`#${this.elId}`)
 							.boundingClientRect()
@@ -168,9 +164,9 @@
 							})
 					})
 					let boxQuery = new Promise((resolve, reject) => {
-						uni.createSelectorQuery()
+						uni.createSelectorQuery()
 							// #ifndef MP-ALIPAY
-							.in(this)
+							.in(this)
 							// #endif
 							.select(`#${this.elIdBox}`)
 							.boundingClientRect()
@@ -267,7 +263,6 @@
 </script>
 
 <style lang="scss" scoped>
-
 	.uni-noticebar {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -276,17 +271,18 @@
 		/* #endif */
 		flex-direction: row;
 		align-items: center;
-		padding: 6px 12px;
+		padding: 10px 12px;
 		margin-bottom: 10px;
-	}
-
-	.uni-cursor-point {
-		/* #ifdef H5 */
-		cursor: pointer;
-		/* #endif */
+	}
+
+	.uni-cursor-point {
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
 	}
 
 	.uni-noticebar-close {
+		margin-left: 8px;
 		margin-right: 5px;
 	}
 
@@ -316,6 +312,7 @@
 		position: relative;
 		height: 18px;
 	}
+
 	/* #endif */
 
 	.uni-noticebar__content--scrollable {
@@ -395,4 +392,4 @@
 			transform: translate3d(-100%, 0, 0);
 		}
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-notice-bar/package.json b/uni_modules/uni-notice-bar/package.json
index e11a41793fd9944fc36873d338dfafc9c352ed3f..37c22302cad869171c45fa5881263953e2d6aa8b 100644
--- a/uni_modules/uni-notice-bar/package.json
+++ b/uni_modules/uni-notice-bar/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-notice-bar",
   "displayName": "uni-notice-bar 通告栏",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "NoticeBar 通告栏组件，常用于展示公告信息，可设为滚动公告",
   "keywords": [
     "uni-ui",
@@ -41,7 +41,8 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [
+    "dependencies": [
+			"uni-scss",
 			"uni-icons"
 		],
     "encrypt": [],
@@ -78,6 +79,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-notice-bar/readme.md b/uni_modules/uni-notice-bar/readme.md
index f65c5788b4d88ac33a0b887ad26b8e7caaa2a754..fb2ede244adc00c5f777b9f6580e7c0c7729252e 100644
--- a/uni_modules/uni-notice-bar/readme.md
+++ b/uni_modules/uni-notice-bar/readme.md
@@ -7,65 +7,7 @@
 
 通告栏组件 。
 
-### 安装方式
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-notice-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-本组件符合[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)
- 
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<!-- 基本用法 -->
-<uni-notice-bar single="true" text="[单行] 这是 NoticeBar 通告栏，这是 NoticeBar 通告栏，这是 NoticeBar 通告栏"></uni-notice-bar>
-<uni-notice-bar text="[多行] 这是 NoticeBar 通告栏，这是 NoticeBar 通告栏，这是 NoticeBar 通告栏，这是 NoticeBar 通告栏"></uni-notice-bar>
-
-<!-- 文字滚动 -->
-<uni-notice-bar scrollable="true" single="true" text="[单行] 这是 NoticeBar 通告栏，这是 NoticeBar 通告栏，这是 NoticeBar 通告栏"></uni-notice-bar>
-
-<!-- 显示图标 -->
-<uni-notice-bar showIcon="true" text="[多行] 这是 NoticeBar 通告栏，这是 NoticeBar 通告栏，这是 NoticeBar 通告栏这是 NoticeBar 通告栏，这是 NoticeBar 通告栏，这是 NoticeBar 通告栏"></uni-notice-bar>
-
-<!-- 显示关闭按钮 -->
-<uni-notice-bar showClose="true" showIcon="true" text="这是 NoticeBar 通告栏，这是 NoticeBar 通告栏，这是 NoticeBar 通告栏"></uni-notice-bar>
-
-<!-- 查看更多 -->
- <uni-notice-bar @getmore="getMore" :showGetMore="true" moreText="查看更多" single="true" text="[单行] 这是 NoticeBar 通告栏，这是 NoticeBar 通告栏，这是 NoticeBar 通告栏"></uni-notice-bar>
-```
-
-> **注意**
-> 如果需要异步获取内容后展示需要使用`v-if`进行控制，`<uni-notice-bar v-if="text" :text="text"></uni-notice-bar>`
-
-
-## NoticeBar API
-
-### NoticeBar Props
-
-|属性名				|类型	|默认值	|说明												|
-|:-:				|:-:	|:-:	|:-:												|
-|speed				|Number	|100	|文字滚动的速度，默认100px/秒						|
-|text				|String	|-		|显示文字											|
-|background-color	|String	|#fffbe8|背景颜色											|
-|color				|String	|#de8c17|文字颜色											|
-|moreColor			|String	|#999999|查看更多文字的颜色									|
-|moreText			|String	|-		|设置“查看更多”的文本								|
-|single				|Boolean|false	|是否单行											|
-|scrollable			|Boolean|false	|是否滚动，为true时，NoticeBar为单行				|
-|showIcon			|Boolean|false	|是否显示左侧喇叭图标								|
-|showClose			|Boolean|false	|是否显示左侧关闭按钮								|
-|showGetMore		|Boolean|false	|是否显示右侧查看更多图标，为true时，NoticeBar为单行|
-
-### NoticeBar Events
-
-|事件名称	|说明						|返回值	|
-|:-:		|:-:						|:-:	|
-|@click		|点击 NoticeBar 触发事件	|-		|
-|@close		|关闭 NoticeBar 触发事件	|-		|
-|@getmore	|点击”查看更多“时触发事件	|-		|
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/notice-bar/notice-bar](https://hellouniapp.dcloud.net.cn/pages/extUI/notice-bar/notice-bar)
\ No newline at end of file
diff --git a/uni_modules/uni-number-box/changelog.md b/uni_modules/uni-number-box/changelog.md
index 1b73c791692966abf8bba034bb7b6b7cdc93e633..82b8656f0b07014636ebbcde6bed0ad07c5b2089 100644
--- a/uni_modules/uni-number-box/changelog.md
+++ b/uni_modules/uni-number-box/changelog.md
@@ -1,5 +1,12 @@
-## 1.1.1（2021-07-30）
-- 优化 vue3下事件警告的问题
+## 1.2.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.2.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-number-box](https://uniapp.dcloud.io/component/uniui/uni-number-box)
+## 1.1.2（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.1.1（2021-07-30）
+- 优化 vue3下事件警告的问题
 ## 1.1.0（2021-07-13）
 - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.0.7（2021-05-12）
diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
index aee1742d8b532d6f5242deeb3a99b551113761b6..738fe3b7fdb1c8838ef365eb9294222f0393de53 100644
--- a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
+++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
@@ -1,11 +1,12 @@
 <template>
 	<view class="uni-numbox">
-		<view @click="_calcValue('minus')" class="uni-numbox__minus uni-cursor-point">
-			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= min || disabled }">-</text>
+		<view @click="_calcValue('minus')" class="uni-numbox__minus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= min || disabled }" :style="{color}">-</text>
 		</view>
-		<input :disabled="disabled" @focus="_onFocus" @blur="_onBlur" class="uni-numbox__value" type="number" v-model="inputValue"/>
-		<view @click="_calcValue('plus')" class="uni-numbox__plus uni-cursor-point">
-			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue >= max || disabled }">+</text>
+		<input :disabled="disabled" @focus="_onFocus" @blur="_onBlur" class="uni-numbox__value" type="number"
+			v-model="inputValue" :style="{background, color}" />
+		<view @click="_calcValue('plus')" class="uni-numbox__plus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue >= max || disabled }" :style="{color}">+</text>
 		</view>
 	</view>
 </template>
@@ -18,19 +19,23 @@
 	 * @property {Number} min 最小值
 	 * @property {Number} max 最大值
 	 * @property {Number} step 每次点击改变的间隔大小
+	 * @property {String} background 背景色
+	 * @property {String} color 字体颜色（前景色）
 	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
 	 * @event {Function} change 输入框值改变时触发的事件，参数为输入框当前的 value
+	 * @event {Function} focus 输入框聚焦时触发的事件，参数为 event 对象
+	 * @event {Function} blur 输入框失焦时触发的事件，参数为 event 对象
 	 */
 
 	export default {
 		name: "UniNumberBox",
-		emits:['change','input','update:modelValue','blur','focus'],
+		emits: ['change', 'input', 'update:modelValue', 'blur', 'focus'],
 		props: {
 			value: {
 				type: [Number, String],
 				default: 1
 			},
-			modelValue:{
+			modelValue: {
 				type: [Number, String],
 				default: 1
 			},
@@ -45,6 +50,14 @@
 			step: {
 				type: Number,
 				default: 1
+			},
+			background: {
+				type: String,
+				default: '#f5f5f5'
+			},
+			color: {
+				type: String,
+				default: '#333'
 			},
 			disabled: {
 				type: Boolean,
@@ -60,15 +73,15 @@
 			value(val) {
 				this.inputValue = +val;
 			},
-			modelValue(val){
+			modelValue(val) {
 				this.inputValue = +val;
-			}
+			}
 		},
 		created() {
-			if(this.value === 1){
+			if (this.value === 1) {
 				this.inputValue = +this.modelValue;
 			}
-			if(this.modelValue === 1){
+			if (this.modelValue === 1) {
 				this.inputValue = +this.value;
 			}
 		},
@@ -141,91 +154,67 @@
 	};
 </script>
 <style lang="scss" scoped>
-	$box-height: 35px;
-	/* #ifdef APP-NVUE */
-	$box-line-height: 35px;
-	/* #endif */
-	$box-line-height: 26px;
-	$box-width: 35px;
+	$box-height: 26px;
+	$bg: #f5f5f5;
+	$br: 2px;
+	$color: #333;
 
 	.uni-numbox {
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
 		flex-direction: row;
-		height: $box-height;
-		line-height: $box-height;
-		width: 120px;
 	}
 
-	.uni-cursor-point {
+	.uni-numbox-btns {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 8px;
+		background-color: $bg;
 		/* #ifdef H5 */
 		cursor: pointer;
 		/* #endif */
 	}
 
-	.uni-numbox__value {
-		background-color: $uni-bg-color;
-		width: 50px;
+	.uni-numbox__value {
+		margin: 0 2px;
+		background-color: $bg;
+		width: 40px;
 		height: $box-height;
 		text-align: center;
-		font-size: $uni-font-size-lg;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-border-color;
+		font-size: 14px;
 		border-left-width: 0;
-		border-right-width: 0;
+		border-right-width: 0;
+		color: $color;
 	}
 
 	.uni-numbox__minus {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		width: $box-width;
-		height: $box-height;
-		// line-height: $box-line-height;
-		// text-align: center;
-		font-size: 20px;
-		color: $uni-text-color;
-		background-color: $uni-bg-color-grey;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-border-color;
-		border-top-left-radius: $uni-border-radius-base;
-		border-bottom-left-radius: $uni-border-radius-base;
-		border-right-width: 0;
+		border-top-left-radius: $br;
+		border-bottom-left-radius: $br;
 	}
 
-	.uni-numbox__plus {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		width: $box-width;
-		height: $box-height;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-border-color;
-		border-top-right-radius: $uni-border-radius-base;
-		border-bottom-right-radius: $uni-border-radius-base;
-		background-color: $uni-bg-color-grey;
-		border-left-width: 0;
+	.uni-numbox__plus {
+		border-top-right-radius: $br;
+		border-bottom-right-radius: $br;
 	}
 
-	.uni-numbox--text {
-		font-size: 20px;
-		color: $uni-text-color;
+	.uni-numbox--text {
+		// fix nvue
+		line-height: 20px;
+
+		font-size: 20px;
+		font-weight: 300;
+		color: $color;
 	}
 
-	.uni-numbox--disabled {
-		color: $uni-text-color-disable;
+	.uni-numbox .uni-numbox--disabled {
+		color: #c0c0c0 !important;
 		/* #ifdef H5 */
 		cursor: not-allowed;
 		/* #endif */
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-number-box/package.json b/uni_modules/uni-number-box/package.json
index 940a29574b7a0dbe195036d64bb950e9c97f0360..e774c3f811a0909215c8ddd87a5ca047de2e2a78 100644
--- a/uni_modules/uni-number-box/package.json
+++ b/uni_modules/uni-number-box/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-number-box",
   "displayName": "uni-number-box 数字输入框",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "NumberBox 带加减按钮的数字输入框组件，用户可以控制每次点击增加的数值，支持小数。",
   "keywords": [
     "uni-ui",
@@ -39,7 +39,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": ["uni-scss"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -74,6 +74,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-number-box/readme.md b/uni_modules/uni-number-box/readme.md
index 9c951e4840d8caa16fde972bdf4fd61151672fa3..affc56fa7b79a879370d9ab915004a505f4fccea 100644
--- a/uni_modules/uni-number-box/readme.md
+++ b/uni_modules/uni-number-box/readme.md
@@ -7,44 +7,7 @@
 
 带加减按钮的数字输入框。
 
-### 安装方式
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-number-box)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<uni-number-box></uni-number-box>
-<uni-number-box v-model = "vModelValue" />
-<uni-number-box :min="0" :max="9"></uni-number-box>
-<uni-number-box @change="bindChange"></uni-number-box>
-```
-
-## API
-
-### NumberBox Props
-
-|属性名				|类型		|默认值	|说明										|
-|:-:					|:-:		|:-:		|:-:										|
-|value/v-model|Number	|0			|输入框当前值						|
-|min					|Number	|0			|最小值									|
-|max					|Number	|100		|最大值									|
-|step					|Number	|1			|每次点击改变的间隔大小	|
-|disabled			|Boolean|false	|是否为禁用状态					|
-
-### NumberBox Events
-
-|事件名称	|说明																				|返回值	|
-|:-:		|:-:																				|:-:		|
-|change	|输入框值改变时触发的事件，参数为输入框当前的 value	|-			|
-|focus	|输入框聚焦时触发的事件，参数为 event 对象	|-			|
-|blur	|输入框失焦时触发的事件，参数为 event 对象	|-			|
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/number-box/number-box](https://hellouniapp.dcloud.net.cn/pages/extUI/number-box/number-box)
\ No newline at end of file
diff --git a/uni_modules/uni-pagination/changelog.md b/uni_modules/uni-pagination/changelog.md
index 9c4fde2f2bef380063ee30ede424af8e34317175..5459dde48126a7cddcfa9cbdbf778c98a7af30a4 100644
--- a/uni_modules/uni-pagination/changelog.md
+++ b/uni_modules/uni-pagination/changelog.md
@@ -1,5 +1,14 @@
-## 1.1.0（2021-07-30）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.2.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-pagination](https://uniapp.dcloud.io/component/uniui/uni-pagination)
+## 1.1.2（2021-10-08）
+- 修复 current 、value 属性未监听，导致高亮样式失效的 bug
+## 1.1.1（2021-08-20）
+- 新增 支持国际化
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.0.7（2021-05-12）
 - 新增 组件示例地址
 ## 1.0.6（2021-04-12）
diff --git a/uni_modules/uni-pagination/components/uni-pagination/i18n/en.json b/uni_modules/uni-pagination/components/uni-pagination/i18n/en.json
new file mode 100644
index 0000000000000000000000000000000000000000..a57becdcd04f533578cb5e59cd779fbaf725acfb
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/en.json
@@ -0,0 +1,4 @@
+{
+	"uni-pagination.prevText": "prev",
+	"uni-pagination.nextText": "next"
+}
diff --git a/uni_modules/uni-pagination/components/uni-pagination/i18n/es.json b/uni_modules/uni-pagination/components/uni-pagination/i18n/es.json
new file mode 100644
index 0000000000000000000000000000000000000000..ccbba2f63e93690836d95b3b2f8474737cdd70f0
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/es.json
@@ -0,0 +1,4 @@
+{
+	"uni-pagination.prevText": "anterior",
+	"uni-pagination.nextText": "próxima"
+}
diff --git a/uni_modules/uni-pagination/components/uni-pagination/i18n/fr.json b/uni_modules/uni-pagination/components/uni-pagination/i18n/fr.json
new file mode 100644
index 0000000000000000000000000000000000000000..9b5f2d92d91a23eeaed47c17dbdbb8b79efab92f
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+	"uni-pagination.prevText": "précédente",
+	"uni-pagination.nextText": "suivante"
+}
diff --git a/uni_modules/uni-pagination/components/uni-pagination/i18n/index.js b/uni_modules/uni-pagination/components/uni-pagination/i18n/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..2469dd02b259a09267f4a6443b856670b9a26e4a
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/index.js
@@ -0,0 +1,12 @@
+import en from './en.json'
+import es from './es.json'
+import fr from './fr.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	es,
+	fr,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hans.json b/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hans.json
new file mode 100644
index 0000000000000000000000000000000000000000..fedbe82a935864f882525145746ad9a51948f43b
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hans.json
@@ -0,0 +1,4 @@
+{
+	"uni-pagination.prevText": "上一页",
+	"uni-pagination.nextText": "下一页"
+}
diff --git a/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hant.json b/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hant.json
new file mode 100644
index 0000000000000000000000000000000000000000..133b3404b081fe0942b18eff9a7268dd06ff1615
--- /dev/null
+++ b/uni_modules/uni-pagination/components/uni-pagination/i18n/zh-Hant.json
@@ -0,0 +1,4 @@
+{
+	"uni-pagination.prevText": "上一頁",
+	"uni-pagination.nextText": "下一頁"
+}
diff --git a/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue b/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
index 4f07c0eb359076805620022a05061c7452ee19a9..32fd4147a899f42188624d1d0c3fe9e64b9054ca 100644
--- a/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
+++ b/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
@@ -1,404 +1,409 @@
 <template>
-	<view class="uni-pagination">
-		<!-- #ifndef APP-NVUE -->
-		<view class="uni-pagination__total is-phone-hide">共 {{ total }} 条</view>
+	<view class="uni-pagination">
+		<!-- #ifndef APP-NVUE -->
+		<view class="uni-pagination__total is-phone-hide">共 {{ total }} 条</view>
 		<!-- #endif -->
-		<view
-			class="uni-pagination__btn"
+		<view class="uni-pagination__btn"
 			:class="currentIndex === 1 ? 'uni-pagination--disabled' : 'uni-pagination--enabled'"
-			:hover-class="currentIndex === 1 ? '' : 'uni-pagination--hover'"
-			:hover-start-time="20"
-			:hover-stay-time="70"
-			@click="clickLeft"
-		>
+			:hover-class="currentIndex === 1 ? '' : 'uni-pagination--hover'" :hover-start-time="20"
+			:hover-stay-time="70" @click="clickLeft">
 			<template v-if="showIcon === true || showIcon === 'true'">
-				<uni-icons color="#666" size="16" type="arrowleft" />
+				<uni-icons color="#666" size="16" type="left" />
 			</template>
 			<template v-else>
-				<text class="uni-pagination__child-btn">{{ prevText }}</text>
+				<text class="uni-pagination__child-btn">{{ prevPageText }}</text>
 			</template>
 		</view>
 		<view class="uni-pagination__num uni-pagination__num-flex-none">
 			<view class="uni-pagination__num-current">
-				<text class="uni-pagination__num-current-text is-pc-hide" style="color:#409EFF">{{ currentIndex }}</text>
+				<text class="uni-pagination__num-current-text is-pc-hide"
+					style="color:#409EFF">{{ currentIndex }}</text>
 				<text class="uni-pagination__num-current-text is-pc-hide">/{{ maxPage || 0 }}</text>
-				<!-- #ifndef APP-NVUE -->
-				<view
-					v-for="(item, index) in paper"
-					:key="index"
-					:class="{ 'page--active': item === currentIndex }"
-					class="uni-pagination__num-tag tag--active is-phone-hide"
-					@click.top="selectPage(item, index)"
-				>
-					<text>{{ item }}</text>
-				</view>
+				<!-- #ifndef APP-NVUE -->
+				<view v-for="(item, index) in paper" :key="index" :class="{ 'page--active': item === currentIndex }"
+					class="uni-pagination__num-tag tag--active is-phone-hide" @click.top="selectPage(item, index)">
+					<text>{{ item }}</text>
+				</view>
 				<!-- #endif -->
-				
+
 			</view>
 		</view>
-		<view
-			class="uni-pagination__btn"
+		<view class="uni-pagination__btn"
 			:class="currentIndex >= maxPage ? 'uni-pagination--disabled' : 'uni-pagination--enabled'"
-			:hover-class="currentIndex === maxPage ? '' : 'uni-pagination--hover'"
-			:hover-start-time="20"
-			:hover-stay-time="70"
-			@click="clickRight"
-		>
+			:hover-class="currentIndex === maxPage ? '' : 'uni-pagination--hover'" :hover-start-time="20"
+			:hover-stay-time="70" @click="clickRight">
 			<template v-if="showIcon === true || showIcon === 'true'">
-				<uni-icons color="#666" size="16" type="arrowright" />
+				<uni-icons color="#666" size="16" type="right" />
 			</template>
 			<template v-else>
-				<text class="uni-pagination__child-btn">{{ nextText }}</text>
+				<text class="uni-pagination__child-btn">{{ nextPageText }}</text>
 			</template>
 		</view>
 	</view>
 </template>
 
 <script>
-/**
- * Pagination 分页器
- * @description 分页器组件，用于展示页码、请求数据等
- * @tutorial https://ext.dcloud.net.cn/plugin?id=32
- * @property {String} prevText 左侧按钮文字
- * @property {String} nextText 右侧按钮文字
- * @property {Number} current 当前页
- * @property {Number} total 数据总量
- * @property {Number} pageSize 每页数据量
- * @property {Number} showIcon = [true|false] 是否以 icon 形式展示按钮
- * @event {Function} change 点击页码按钮时触发 ,e={type,current} current为当前页，type值为：next/prev，表示点击的是上一页还是下一个
- */
+	/**
+	 * Pagination 分页器
+	 * @description 分页器组件，用于展示页码、请求数据等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=32
+	 * @property {String} prevText 左侧按钮文字
+	 * @property {String} nextText 右侧按钮文字
+	 * @property {Number} current 当前页
+	 * @property {Number} total 数据总量
+	 * @property {Number} pageSize 每页数据量
+	 * @property {Number} showIcon = [true|false] 是否以 icon 形式展示按钮
+	 * @event {Function} change 点击页码按钮时触发 ,e={type,current} current为当前页，type值为：next/prev，表示点击的是上一页还是下一个
+	 */
 
-export default {
-	name: 'UniPagination',
-	emits:['update:modelValue','input','change'],
-	props: {
-		value: {
-			type: [Number, String],
-			default: 1
-		},
-		modelValue: {
-			type: [Number, String],
-			default: 1
-		},
-		prevText: {
-			type: String,
-			default: '上一页'
-		},
-		nextText: {
-			type: String,
-			default: '下一页'
-		},
-		current: {
-			type: [Number, String],
-			default: 1
-		},
-		total: {
-			// 数据总量
-			type: [Number, String],
-			default: 0
-		},
-		pageSize: {
-			// 每页数据量
-			type: [Number, String],
-			default: 10
-		},
-		showIcon: {
-			// 是否以 icon 形式展示按钮
-			type: [Boolean, String],
-			default: false
-		},
-		pagerCount: {
-			type: Number,
-			default: 7
-		}
-	},
-	data() {
-		return {
-			currentIndex: 1,
-			paperData: []
-		}
-	},
-	computed: {
-		maxPage() {
-			let maxPage = 1
-			let total = Number(this.total)
-			let pageSize = Number(this.pageSize)
-			if (total && pageSize) {
-				maxPage = Math.ceil(total / pageSize)
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	export default {
+		name: 'UniPagination',
+		emits: ['update:modelValue', 'input', 'change'],
+		props: {
+			value: {
+				type: [Number, String],
+				default: 1
+			},
+			modelValue: {
+				type: [Number, String],
+				default: 1
+			},
+			prevText: {
+				type: String,
+			},
+			nextText: {
+				type: String,
+			},
+			current: {
+				type: [Number, String],
+				default: 1
+			},
+			total: {
+				// 数据总量
+				type: [Number, String],
+				default: 0
+			},
+			pageSize: {
+				// 每页数据量
+				type: [Number, String],
+				default: 10
+			},
+			showIcon: {
+				// 是否以 icon 形式展示按钮
+				type: [Boolean, String],
+				default: false
+			},
+			pagerCount: {
+				type: Number,
+				default: 7
 			}
-			return maxPage
 		},
-		paper() {
-			const num = this.currentIndex
-			// TODO 最大页数
-			const pagerCount = this.pagerCount
-			// const total = 181
-			const total = this.total
-			const pageSize = this.pageSize
-			let totalArr = []
-			let showPagerArr = []
-			let pagerNum = Math.ceil(total / pageSize)
-			for (let i = 0; i < pagerNum; i++) {
-				totalArr.push(i + 1)
+		data() {
+			return {
+				currentIndex: 1,
+				paperData: []
 			}
-			showPagerArr.push(1)
-			const totalNum = totalArr[totalArr.length - (pagerCount + 1) / 2]
-			totalArr.forEach((item, index) => {
-				if ((pagerCount + 1) / 2 >= num) {
-					if (item < pagerCount + 1 && item > 1) {
-						showPagerArr.push(item)
+		},
+		computed: {
+			prevPageText() {
+				return this.prevText || t('uni-pagination.prevText')
+			},
+			nextPageText() {
+				return this.nextText || t('uni-pagination.nextText')
+			},
+			maxPage() {
+				let maxPage = 1
+				let total = Number(this.total)
+				let pageSize = Number(this.pageSize)
+				if (total && pageSize) {
+					maxPage = Math.ceil(total / pageSize)
+				}
+				return maxPage
+			},
+			paper() {
+				const num = this.currentIndex
+				// TODO 最大页数
+				const pagerCount = this.pagerCount
+				// const total = 181
+				const total = this.total
+				const pageSize = this.pageSize
+				let totalArr = []
+				let showPagerArr = []
+				let pagerNum = Math.ceil(total / pageSize)
+				for (let i = 0; i < pagerNum; i++) {
+					totalArr.push(i + 1)
+				}
+				showPagerArr.push(1)
+				const totalNum = totalArr[totalArr.length - (pagerCount + 1) / 2]
+				totalArr.forEach((item, index) => {
+					if ((pagerCount + 1) / 2 >= num) {
+						if (item < pagerCount + 1 && item > 1) {
+							showPagerArr.push(item)
+						}
+					} else if (num + 2 <= totalNum) {
+						if (item > num - (pagerCount + 1) / 2 && item < num + (pagerCount + 1) / 2) {
+							showPagerArr.push(item)
+						}
+					} else {
+						if ((item > num - (pagerCount + 1) / 2 || pagerNum - pagerCount < item) && item < totalArr[
+								totalArr.length - 1]) {
+							showPagerArr.push(item)
+						}
 					}
-				} else if (num + 2 <= totalNum) {
-					if (item > num - (pagerCount + 1) / 2 && item < num + (pagerCount + 1) / 2) {
-						showPagerArr.push(item)
+				})
+				if (pagerNum > pagerCount) {
+					if ((pagerCount + 1) / 2 >= num) {
+						showPagerArr[showPagerArr.length - 1] = '...'
+					} else if (num + 2 <= totalNum) {
+						showPagerArr[1] = '...'
+						showPagerArr[showPagerArr.length - 1] = '...'
+					} else {
+						showPagerArr[1] = '...'
 					}
+					showPagerArr.push(totalArr[totalArr.length - 1])
 				} else {
-					if ((item > num - (pagerCount + 1) / 2 || pagerNum - pagerCount < item) && item < totalArr[totalArr.length - 1]) {
-						showPagerArr.push(item)
+					if ((pagerCount + 1) / 2 >= num) {} else if (num + 2 <= totalNum) {} else {
+						showPagerArr.shift()
+						showPagerArr.push(totalArr[totalArr.length - 1])
 					}
 				}
-			})
-			if (pagerNum > pagerCount) {
-				if ((pagerCount + 1) / 2 >= num) {
-					showPagerArr[showPagerArr.length - 1] = '...'
-				} else if (num + 2 <= totalNum) {
-					showPagerArr[1] = '...'
-					showPagerArr[showPagerArr.length - 1] = '...'
-				} else {
-					showPagerArr[1] = '...'
-				}
-				showPagerArr.push(totalArr[totalArr.length - 1])
-			} else {
-				if ((pagerCount + 1) / 2 >= num) {
-				} else if (num + 2 <= totalNum) {
-				} else {
-					showPagerArr.shift()
-					showPagerArr.push(totalArr[totalArr.length - 1])
-				}
-			}
 
-			return showPagerArr
-		}
-	},
-	watch: {
-		current(val) {
-			this.currentIndex = val
-		},
-		value(val) {
-			if (val < 1) {
-				this.currentIndex = 1
-			} else {
-				this.currentIndex = val
+				return showPagerArr
 			}
 		},
-		modelValue(val) {
-			if (val < 1) {
-				this.currentIndex = 1
-			} else {
-				this.currentIndex = val
-			}
-		}
-	},
-	created() {
-		this.currentIndex = +this.value
-	},
-	methods: {
-		// 选择标签
-		selectPage(e, index) {
-			if (parseInt(e)) {
-				this.currentIndex = e
-				this.change('current')
-			} else {
-				let pagerNum = Math.ceil(this.total / this.pageSize)
-				// let pagerNum = Math.ceil(181 / this.pageSize)
-				// 上一页
-				if (index <= 1) {
-					if (this.currentIndex - 5 > 1) {
-						this.currentIndex -= 5
-					} else {
-						this.currentIndex = 1
+		watch: {
+			current: {
+				immediate: true,
+				handler(val, old) {
+					if (val < 1) {
+						this.currentIndex = 1
+					} else {
+						this.currentIndex = val
 					}
-					return
 				}
-				// 下一页
-				if (index >= 6) {
-					if (this.currentIndex + 5 > pagerNum) {
-						this.currentIndex = pagerNum
+			},
+			value: {
+				immediate: true,
+				handler(val) {
+					if (Number(this.current) !== 1) return
+					if (val < 1) {
+						this.currentIndex = 1
 					} else {
-						this.currentIndex += 5
+						this.currentIndex = val
 					}
-					return
 				}
 			}
 		},
-		clickLeft() {
-			if (Number(this.currentIndex) === 1) {
-				return
-			}
-			this.currentIndex -= 1
-			this.change('prev')
-		},
-		clickRight() {
-			if (Number(this.currentIndex) >= this.maxPage) {
-				return
+		methods: {
+			// 选择标签
+			selectPage(e, index) {
+				if (parseInt(e)) {
+					this.currentIndex = e
+					this.change('current')
+				} else {
+					let pagerNum = Math.ceil(this.total / this.pageSize)
+					// let pagerNum = Math.ceil(181 / this.pageSize)
+					// 上一页
+					if (index <= 1) {
+						if (this.currentIndex - 5 > 1) {
+							this.currentIndex -= 5
+						} else {
+							this.currentIndex = 1
+						}
+						return
+					}
+					// 下一页
+					if (index >= 6) {
+						if (this.currentIndex + 5 > pagerNum) {
+							this.currentIndex = pagerNum
+						} else {
+							this.currentIndex += 5
+						}
+						return
+					}
+				}
+			},
+			clickLeft() {
+				if (Number(this.currentIndex) === 1) {
+					return
+				}
+				this.currentIndex -= 1
+				this.change('prev')
+			},
+			clickRight() {
+				if (Number(this.currentIndex) >= this.maxPage) {
+					return
+				}
+				this.currentIndex += 1
+				this.change('next')
+			},
+			change(e) {
+				this.$emit('input', this.currentIndex)
+				this.$emit('update:modelValue', this.currentIndex)
+				this.$emit('change', {
+					type: e,
+					current: this.currentIndex
+				})
 			}
-			this.currentIndex += 1
-			this.change('next')
-		},
-		change(e) {
-			this.$emit('input', this.currentIndex)
-			this.$emit('update:modelValue', this.currentIndex)
-			this.$emit('change', {
-				type: e,
-				current: this.currentIndex
-			})
 		}
 	}
-}
 </script>
 
-<style lang="scss" scoped>
-.uni-pagination {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	position: relative;
-	overflow: hidden;
-	flex-direction: row;
-	justify-content: center;
-	align-items: center;
-}
-
-.uni-pagination__total {
-	font-size: 14px;
-	color: #999;
-	margin-right: 15px;
-}
-
-.uni-pagination__btn {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	cursor: pointer;
-	/* #endif */
-	padding: 0 8px;
-	line-height: 30px;
-	font-size: $uni-font-size-base;
-	position: relative;
-	background-color: #f4f4f5;
-	flex-direction: row;
-	justify-content: center;
-	align-items: center;
-	text-align: center;
-	// border-width: 1px;
-	// border-style: solid;
-	// border-color: $uni-border-color;
-}
+<style lang="scss" scoped>
+	$uni-primary: #2979ff;
+	.uni-pagination {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		position: relative;
+		overflow: hidden;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
 
-.uni-pagination__child-btn {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	font-size: $uni-font-size-base;
-	position: relative;
-	flex-direction: row;
-	justify-content: center;
-	align-items: center;
-	text-align: center;
-}
+	.uni-pagination__total {
+		font-size: 14px;
+		color: #999;
+		margin-right: 15px;
+	}
 
-.uni-pagination__num {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex: 1;
-	flex-direction: row;
-	justify-content: center;
-	align-items: center;
-	height: 30px;
-	line-height: 30px;
-	font-size: $uni-font-size-base;
-	color: $uni-text-color;
-	margin: 0 5px;
-}
+	.uni-pagination__btn {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		padding: 0 8px;
+		line-height: 30px;
+		font-size: 12px;
+		position: relative;
+		background-color: #F0F0F0;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		text-align: center;
+		border-radius: 5px;
+		// border-width: 1px;
+		// border-style: solid;
+		// border-color: $uni-border-color;
+	}
 
-.uni-pagination__num-tag {
-	/* #ifdef H5 */
-	cursor: pointer;
-	min-width: 30px;
-	/* #endif */
-	margin: 0 5px;
-	height: 30px;
-	text-align: center;
-	line-height: 30px;
-	// border: 1px red solid;
-	color: #666;
-	// border-width: 1px;
-	// border-style: solid;
-	// border-color: $uni-border-color;
-}
+	.uni-pagination__child-btn {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		font-size: 12px;
+		position: relative;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		text-align: center;
+		color: #666;
+		font-size: 12px;
+	}
 
-.uni-pagination__num-current {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-}
+	.uni-pagination__num {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 30px;
+		line-height: 30px;
+		font-size: 12px;
+		color: #666;
+		margin: 0 5px;
+	}
 
-.uni-pagination__num-current-text {
-	font-size: 15px;
-}
+	.uni-pagination__num-tag {
+		/* #ifdef H5 */
+		cursor: pointer;
+		min-width: 30px;
+		/* #endif */
+		margin: 0 5px;
+		height: 30px;
+		text-align: center;
+		line-height: 30px;
+		// border: 1px red solid;
+		color: #999;
+		border-radius: 4px;
+		// border-width: 1px;
+		// border-style: solid;
+		// border-color: $uni-border-color;
+	}
 
-.uni-pagination--enabled {
-	color: #333333;
-	opacity: 1;
-}
+	.uni-pagination__num-current {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
 
-.uni-pagination--disabled {
-	opacity: 0.5;
-	/* #ifdef H5 */
-	cursor: default;
-	/* #endif */
-}
+	.uni-pagination__num-current-text {
+		font-size: 15px;
+	}
 
-.uni-pagination--hover {
-	color: rgba(0, 0, 0, 0.6);
-	background-color: $uni-bg-color-hover;
-}
+	.uni-pagination--enabled {
+		color: #333333;
+		opacity: 1;
+	}
 
-.tag--active:hover {
-	color: $uni-color-primary;
-}
+	.uni-pagination--disabled {
+		opacity: 0.5;
+		/* #ifdef H5 */
+		cursor: default;
+		/* #endif */
+	}
 
-.page--active {
-	color: #fff;
-	background-color: $uni-color-primary;
-}
+	.uni-pagination--hover {
+		color: rgba(0, 0, 0, 0.6);
+		background-color: #eee;
+	}
 
-.page--active:hover {
-	color: #fff;
-}
+	.tag--active:hover {
+		color: $uni-primary;
+	}
 
-/* #ifndef APP-NVUE */
-.is-pc-hide {
-	display: block;
-}
+	.page--active {
+		color: #fff;
+		background-color: $uni-primary;
+	}
 
-.is-phone-hide {
-	display: none;
-}
+	.page--active:hover {
+		color: #fff;
+	}
 
-@media screen and (min-width: 450px) {
+	/* #ifndef APP-NVUE */
 	.is-pc-hide {
-		display: none;
+		display: block;
 	}
 
 	.is-phone-hide {
-		display: block;
+		display: none;
 	}
 
-	.uni-pagination__num-flex-none {
-		flex: none;
+	@media screen and (min-width: 450px) {
+		.is-pc-hide {
+			display: none;
+		}
+
+		.is-phone-hide {
+			display: block;
+		}
+
+		.uni-pagination__num-flex-none {
+			flex: none;
+		}
 	}
-}
-/* #endif */
+
+	/* #endif */
 </style>
diff --git a/uni_modules/uni-pagination/package.json b/uni_modules/uni-pagination/package.json
index b0e9501aa473e26a51e3e9c50d9f271338da5a2e..c24a2e86b0391e5364360ace06f5763e1fc58bfd 100644
--- a/uni_modules/uni-pagination/package.json
+++ b/uni_modules/uni-pagination/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-pagination",
   "displayName": "uni-pagination 分页器",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Pagination 分页器组件，用于展示页码、请求数据等。",
   "keywords": [
     "uni-ui",
@@ -40,7 +40,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": ["uni-icons"],
+    "dependencies": ["uni-scss","uni-icons"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -75,6 +75,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-pagination/readme.md b/uni_modules/uni-pagination/readme.md
index c8e47e3ebd4841a2fea259839349c647536c630c..eefa26348d901f39fa9d25ceec1b51908b5e8584 100644
--- a/uni_modules/uni-pagination/readme.md
+++ b/uni_modules/uni-pagination/readme.md
@@ -7,42 +7,7 @@
 
 分页器组件，用于展示页码、请求数据等。
 
-### 安装方式
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-pagination)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<uni-pagination title="标题文字" total="20"></uni-pagination>
-<uni-pagination title="标题文字" show-icon="true" total="50" current="2"></uni-pagination>
-```
-
-## API
-
-### Pagination Props
-
-|属性名		|类型	|默认值	|说明						|
-|:-:		|:-:	|:-:	|:-:						|
-|prevText	|String	|上一页	|左侧按钮文字				|
-|nextText	|String	|下一页	|右侧按钮文字				|
-|current	|Number	|1		|当前页						|
-|total		|Number	|0		|数据总量					|
-|pageSize	|Number	|10		|每页数据量					|
-|showIcon	|Boolean|false	|是否以 icon 形式展示按钮	|
-
-
-### Pagination Events
-
-|事件称名	|说明				|返回值																		|
-|:-:		|:-:				|:-:																				|
-|@change|点击页码按钮时触发	|e={type,current} current为当前页，type值为：next/prev，表示点击的是上一页还是下一个	|
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/pagination/pagination](https://hellouniapp.dcloud.net.cn/pages/extUI/pagination/pagination)
\ No newline at end of file
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
index a5d6a798e808aeec2251926d012e6ff9f13aeffb..a9e2d668244f888b84bbf7d881c25280e637c25f 100644
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
@@ -1,44 +1,60 @@
+## 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）
+- 修复 isMaskClick 失效的bug
+## 1.7.4（2022-01-19）
+- 新增 cancelText \ confirmText 属性 ，可自定义文本
+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+## 1.7.3（2022-01-13）
+- 修复 设置 safeArea 属性不生效的bug
 ## 1.7.2（2021-11-26）
 - 优化 组件示例
 ## 1.7.1（2021-11-26）
 - 修复 vuedoc 文字错误
-## 1.7.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-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
-## 1.6.2（2021-08-24）
-- 新增 支持国际化
-## 1.6.1（2021-07-30）
-- 优化 vue3下事件警告的问题
-## 1.6.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 1.5.0（2021-06-23）
-- 新增 mask-click 遮罩层点击事件
-## 1.4.5（2021-06-22）
-- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
-## 1.4.4（2021-06-18）
-- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
-## 1.4.3（2021-06-08）
-- 修复 错误的 watch 字段
-- 修复 safeArea 属性不生效的问题
-- 修复 点击内容，再点击遮罩无法关闭的Bug
-## 1.4.2（2021-05-12）
-- 新增 组件示例地址
-## 1.4.1（2021-04-29）
-- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
-## 1.4.0 （2021-04-29）
-- 新增 type 属性的 left\right 值，支持左右弹出
-- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
-- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
-- 新增 safeArea 属性，是否适配底部安全区
-- 修复 App\h5\微信小程序底部安全区占位不对的Bug
-- 修复 App 端弹出等待的Bug
-- 优化 提升低配设备性能，优化动画卡顿问题
-- 优化 更简单的组件自定义方式
-## 1.2.9（2021-02-05）
-- 优化 组件引用关系，通过uni_modules引用组件
-## 1.2.8（2021-02-05）
-- 调整为uni_modules目录规范
-## 1.2.7（2021-02-05）
-- 调整为uni_modules目录规范
-- 新增 支持 PC 端
-- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端
+## 1.7.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-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
+## 1.6.2（2021-08-24）
+- 新增 支持国际化
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.5.0（2021-06-23）
+- 新增 mask-click 遮罩层点击事件
+## 1.4.5（2021-06-22）
+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.4（2021-06-18）
+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.3（2021-06-08）
+- 修复 错误的 watch 字段
+- 修复 safeArea 属性不生效的问题
+- 修复 点击内容，再点击遮罩无法关闭的Bug
+## 1.4.2（2021-05-12）
+- 新增 组件示例地址
+## 1.4.1（2021-04-29）
+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
+## 1.4.0 （2021-04-29）
+- 新增 type 属性的 left\right 值，支持左右弹出
+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
+- 新增 safeArea 属性，是否适配底部安全区
+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
+- 修复 App 端弹出等待的Bug
+- 优化 提升低配设备性能，优化动画卡顿问题
+- 优化 更简单的组件自定义方式
+## 1.2.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.2.8（2021-02-05）
+- 调整为uni_modules目录规范
+## 1.2.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
index aeeb3efdcd69883c5ee73efc57660855897eb49a..c20df4a8e923d48804e7935af39baeb67e637a5f 100644
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -15,7 +15,7 @@
 		</view>
 		<view class="uni-dialog-button-group">
 			<view class="uni-dialog-button" @click="closeDialog">
-				<text class="uni-dialog-button-text">{{cancelText}}</text>
+				<text class="uni-dialog-button-text">{{closeText}}</text>
 			</view>
 			<view class="uni-dialog-button uni-border-left" @click="onOk">
 				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
@@ -31,7 +31,7 @@
 	initVueI18n
 	} from '@dcloudio/uni-i18n'
 	import messages from '../uni-popup/i18n/index.js'
-	const {	t	} = initVueI18n(messages)
+	const {	t } = initVueI18n(messages)
 	/**
 	 * PopUp 弹出层-对话框样式
 	 * @description 弹出层-对话框样式
@@ -84,6 +84,14 @@
 			beforeClose: {
 				type: Boolean,
 				default: false
+			},
+			cancelText:{
+				type: String,
+				default: ''
+			},
+			confirmText:{
+				type: String,
+				default: ''
 			}
 		},
 		data() {
@@ -95,10 +103,10 @@
 		},
 		computed: {
 			okText() {
-				return t("uni-popup.ok")
+				return this.confirmText || t("uni-popup.ok")
 			},
-			cancelText() {
-				return t("uni-popup.cancel")
+			closeText() {
+				return this.cancelText || t("uni-popup.cancel")
 			},
 			placeholderText() {
 				return this.placeholder || t("uni-popup.placeholder")
@@ -162,7 +170,7 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
 	.uni-popup-dialog {
 		width: 300px;
 		border-radius: 11px;
@@ -227,7 +235,7 @@
 	}
 
 	.uni-dialog-button-text {
-		font-size: 16px;
+		font-size: 16px;
 		color: #333;
 	}
 
diff --git a/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
index f6bbccd75584262dcac9bf7b8f4a09a8d01e17cd..7f27a1e14bb29fa8a770bc8a1a6870be67f7ad2f 100644
--- a/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
+++ b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
@@ -1,14 +1,14 @@
 <template>
 	<view class="uni-popup-message">
-		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
-			<slot>
-				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
+			<slot>
+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
 			</slot>
 		</view>
 	</view>
 </template>
 
-<script>
+<script>
 	import popup from '../uni-popup/popup.js'
 	/**
 	 * PopUp 弹出层-消息提示
@@ -21,10 +21,10 @@
 	 * 	@value error 错误
 	 * @property {String} message 消息提示文字
 	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
-	 */
+	 */
 
 	export default {
-		name: 'uniPopupMessage',
+		name: 'uniPopupMessage',
 		mixins:[popup],
 		props: {
 			/**
@@ -47,31 +47,31 @@
 			duration: {
 				type: Number,
 				default: 3000
-			},
-			maskShow:{
-				type:Boolean,
-				default:false
+			},
+			maskShow:{
+				type:Boolean,
+				default:false
 			}
 		},
 		data() {
 			return {}
-		},
-		created() {
-			this.popup.maskShow = this.maskShow
-			this.popup.messageChild = this
+		},
+		created() {
+			this.popup.maskShow = this.maskShow
+			this.popup.messageChild = this
 		},
 		methods: {
-			timerClose(){
-				if(this.duration === 0) return
-				clearTimeout(this.timer) 
-				this.timer = setTimeout(()=>{
-					this.popup.close()
-				},this.duration)
+			timerClose(){
+				if(this.duration === 0) return
+				clearTimeout(this.timer) 
+				this.timer = setTimeout(()=>{
+					this.popup.close()
+				},this.duration)
 			}
 		}
 	}
 </script>
-<style lang="scss" scoped>
+<style lang="scss" >
 	.uni-popup-message {
 		/* #ifndef APP-NVUE */
 		display: flex;
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
index f0660055cbf474400264957e3d8749aa124bb705..ab086564f42cbc00573b263f5ad43a71e1df8ab1 100644
--- a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -103,9 +103,9 @@
 		}
 	}
 </script>
-<style lang="scss" scoped>
+<style lang="scss" >
 	.uni-popup-share {
-		background-color: #fff;
+		background-color: #fff;
 		border-top-left-radius: 11px;
 		border-top-right-radius: 11px;
 	}
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 6c5dde1b24db6c28f1ce11c058c4bec3394e0bc4..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,10 +1,14 @@
 <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>
-			</uni-transition>
+	<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 -->
 		<keypress v-if="maskShow" @esc="onTap" />
@@ -13,391 +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 {String}  backgroundColor 					主窗口背景色
- * @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
-		maskClick: {
-			type: Boolean,
-			default: true
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
 		},
-		backgroundColor: {
-			type: String,
-			default: 'none'
-		},
-		safeArea:{
-			type: Boolean,
-			default: true
-		}
-	},
-
-	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
-		}
-	},
-	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'
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
 			},
-			maskClass: {
-				position: 'fixed',
-				bottom: 0,
-				top: 0,
-				left: 0,
-				right: 0,
-				backgroundColor: 'rgba(0, 0, 0, 0.4)'
+			backgroundColor: {
+				type: String,
+				default: 'none'
 			},
-			transClass: {
-				position: 'fixed',
-				left: 0,
-				right: 0
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			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, safeAreaInsets } = uni.getSystemInfoSync()
-			this.popupWidth = windowWidth
-			this.popupHeight = windowHeight + windowTop
-			// 是否适配底部安全区
-			if(this.safeArea){
-				this.safeAreaInsets = safeAreaInsets
-			}else{
-				this.safeAreaInsets = 0
-			}
-		}
-		fixSize()
-		// #ifdef H5
-		// window.addEventListener('resize', fixSize)
-		// this.$once('hook:beforeDestroy', () => {
-		// 	window.removeEventListener('resize', fixSize)
-		// })
-		// #endif
-	},
-	created() {
-		this.mkclick = this.maskClick
-		if (this.animation) {
-			this.duration = 300
-		} else {
-			this.duration = 0
-		}
-		// TODO 处理 message 组件生命周期异常的问题
-		this.messageChild = null
-		// TODO 解决头条冒泡的问题
-		this.clearPropagation = false
-	},
-	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
-			}
-			if (!this.config[direction]) {
-				console.error('缺少类型：', direction)
-				return
+		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
 			}
-			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
+		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'
 			}
-			// 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 && this.safeAreaInsets.bottom) || 0,
-				backgroundColor: this.bg
+		computed: {
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
 			}
-			// 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'
+		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
+				}
 			}
-			// TODO 兼容 type 属性 ，后续会废弃
-			if (type) return
-			this.showPopup = true
-			this.showTrans = true
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
 		},
-		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 */
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #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
 			}
-			// TODO 兼容 type 属性 ，后续会废弃
-			if (type) return
-			this.showPopup = true
-			this.showTrans = true
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// 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" scoped>
-.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 {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: relative;
-		/* iphonex 等安全区设置，底部安全区适配 */
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
 		/* #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 */
-			flex: 1;
+		}
+
+		.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 */
+			&.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;
-}
+	.fixforpc-top {
+		top: 0;
+	}
 </style>
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
index a214e474a8ce66bf702edd52a5db8bacab99ad20..069e9ce514c0772845417e9287ddb5cd44fb1e44 100644
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
@@ -1,90 +1,90 @@
-{
-	"id": "uni-popup",
-	"displayName": "uni-popup 弹出层",
-	"version": "1.7.2",
-	"description": " Popup 组件，提供常用的弹层",
-	"keywords": [
-        "uni-ui",
-        "弹出层",
-        "弹窗",
-        "popup",
-        "弹框"
-    ],
-	"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-transition"
-		],
-		"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-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.7.9",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"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-transition"
+		],
+		"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"
+                }
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-popup/readme.md b/uni_modules/uni-popup/readme.md
index fb661e7d0cda7dc4df2db62ef29b61df4887f36c..fdad4b3d7031e1165d6904d32b9f00e1ad011a51 100644
--- a/uni_modules/uni-popup/readme.md
+++ b/uni_modules/uni-popup/readme.md
@@ -1,17 +1,17 @@
-
-
-## Popup 弹出层
-> **组件名：uni-popup**
-> 代码块： `uPopup`
-> 关联组件：`uni-transition`
-
-
-弹出层组件，在应用中弹出一个消息提示窗口、提示框等
-
-### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
-#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
-
-
-
-
-
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
diff --git a/uni_modules/uni-rate/changelog.md b/uni_modules/uni-rate/changelog.md
index 9fe0e841fb2ccf3533a5621bb5f54144ee3ad96c..8a98a61274d4ce67bd653b16e16cb3a9bf2aa2f8 100644
--- a/uni_modules/uni-rate/changelog.md
+++ b/uni_modules/uni-rate/changelog.md
@@ -1,18 +1,25 @@
+## 1.3.1（2022-02-25）
+- 修复 条件判断 `NaN` 错误的 bug
+## 1.3.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-rate](https://uniapp.dcloud.io/component/uniui/uni-rate)
+## 1.2.2（2021-09-10）
+- 优化 默认值修改为 0 颗星
 ## 1.2.1（2021-07-30）
 - 优化 vue3下事件警告的问题
-## 1.2.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 1.1.2（2021-05-12）
-- 新增 组件示例地址
-## 1.1.1（2021-04-21）
-- 修复 布局变化后 uni-rate  星星计算不准确的 bug
-- 优化 添加依赖 uni-icons, 导入 uni-rate 自动下载依赖
-## 1.1.0（2021-04-16）
-- 修复 uni-rate 属性 margin 值为 string 组件失效的 bug
-
-## 1.0.9（2021-02-05）
-- 优化 组件引用关系，通过uni_modules引用组件
-
-## 1.0.8（2021-02-05）
-- 调整为uni_modules目录规范
-- 支持 pc 端
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.2（2021-05-12）
+- 新增 组件示例地址
+## 1.1.1（2021-04-21）
+- 修复 布局变化后 uni-rate  星星计算不准确的 bug
+- 优化 添加依赖 uni-icons, 导入 uni-rate 自动下载依赖
+## 1.1.0（2021-04-16）
+- 修复 uni-rate 属性 margin 值为 string 组件失效的 bug
+
+## 1.0.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.8（2021-02-05）
+- 调整为uni_modules目录规范
+- 支持 pc 端
diff --git a/uni_modules/uni-rate/components/uni-rate/uni-rate.vue b/uni_modules/uni-rate/components/uni-rate/uni-rate.vue
index 082f6767c793e141754f4b7a2876322a3392bb21..e53540620403da4e6672d3f5cd4b788c4fb9932b 100644
--- a/uni_modules/uni-rate/components/uni-rate/uni-rate.vue
+++ b/uni_modules/uni-rate/components/uni-rate/uni-rate.vue
@@ -1,49 +1,20 @@
 <template>
 	<view>
-		<view
-		    ref="uni-rate"
-		    class="uni-rate"
-		>
-			<view
-					class="uni-rate__icon"
-					:class="{'uni-cursor-not-allowed': disabled}"
-					:style="{ 'margin-right': marginNumber + 'px' }"
-					v-for="(star, index) in stars"
-					:key="index"
-					@touchstart.stop="touchstart"
-					@touchmove.stop="touchmove"
-					@mousedown.stop="mousedown"
-					@mousemove.stop="mousemove"
-					@mouseleave="mouseleave"
-			>
-				<uni-icons
-				    :color="color"
-				    :size="size"
-				    :type="isFill ? 'star-filled' : 'star'"
-				/>
+		<view ref="uni-rate" class="uni-rate">
+			<view class="uni-rate__icon" :class="{'uni-cursor-not-allowed': disabled}"
+				:style="{ 'margin-right': marginNumber + 'px' }" v-for="(star, index) in stars" :key="index"
+				@touchstart.stop="touchstart" @touchmove.stop="touchmove" @mousedown.stop="mousedown"
+				@mousemove.stop="mousemove" @mouseleave="mouseleave">
+				<uni-icons :color="color" :size="size" :type="isFill ? 'star-filled' : 'star'" />
 				<!-- #ifdef APP-NVUE -->
-				<view
-				    :style="{ width: star.activeWitch.replace('%','')*size/100+'px'}"
-				    class="uni-rate__icon-on"
-				>
-					<uni-icons
-					    style="text-align: left;"
-					    :color="disabled?'#ccc':activeColor"
-					    :size="size"
-					    type="star-filled"
-					/>
+				<view :style="{ width: star.activeWitch.replace('%','')*size/100+'px'}" class="uni-rate__icon-on">
+					<uni-icons style="text-align: left;" :color="disabled?'#ccc':activeColor" :size="size"
+						type="star-filled" />
 				</view>
 				<!-- #endif -->
 				<!-- #ifndef APP-NVUE -->
-				<view
-				    :style="{ width: star.activeWitch}"
-				    class="uni-rate__icon-on"
-				>
-					<uni-icons
-					    :color="disabled?disabledColor:activeColor"
-					    :size="size"
-					    type="star-filled"
-					/>
+				<view :style="{ width: star.activeWitch}" class="uni-rate__icon-on">
+					<uni-icons :color="disabled?disabledColor:activeColor" :size="size" type="star-filled" />
 				</view>
 				<!-- #endif -->
 			</view>
@@ -105,12 +76,12 @@
 			value: {
 				// 当前评分
 				type: [Number, String],
-				default: 1
+				default: 0
 			},
 			modelValue: {
 				// 当前评分
 				type: [Number, String],
-				default: 1
+				default: 0
 			},
 			max: {
 				// 最大评分
@@ -145,15 +116,15 @@
 		},
 		data() {
 			return {
-				valueSync: "",
-				userMouseFristMove: true,
-				userRated: false,
+				valueSync: "",
+				userMouseFristMove: true,
+				userRated: false,
 				userLastRate: 1
 			};
 		},
 		watch: {
 			value(newVal) {
-				this.valueSync = Number(newVal);
+				this.valueSync = Number(newVal);
 			},
 			modelValue(newVal) {
 				this.valueSync = Number(newVal);
@@ -181,30 +152,30 @@
 					}
 				}
 				return starList;
-			},
-
-			marginNumber() {
-				return Number(this.margin)
+			},
+
+			marginNumber() {
+				return Number(this.margin)
 			}
 		},
 		created() {
-			this.valueSync = Number(this.value||this.modelValue);
+			this.valueSync = Number(this.value || this.modelValue);
 			this._rateBoxLeft = 0
-			this._oldValue = null
+			this._oldValue = null
 		},
 		mounted() {
 			setTimeout(() => {
 				this._getSize()
-			}, 100)
-			// #ifdef H5
-			this.PC = this.IsPC()
-			// #endif
+			}, 100)
+			// #ifdef H5
+			this.PC = this.IsPC()
+			// #endif
 		},
 		methods: {
-			touchstart(e) {
-				// #ifdef H5
-				if( this.IsPC() ) return
-				// #endif
+			touchstart(e) {
+				// #ifdef H5
+				if (this.IsPC()) return
+				// #endif
 				if (this.readonly || this.disabled) return
 				const {
 					clientX,
@@ -213,92 +184,92 @@
 				// TODO 做一下兼容，只有 Nvue 下才有 screenX，其他平台式 clientX
 				this._getRateCount(clientX || screenX)
 			},
-			touchmove(e) {
-				// #ifdef H5
-				if( this.IsPC() ) return
-				// #endif
+			touchmove(e) {
+				// #ifdef H5
+				if (this.IsPC()) return
+				// #endif
 				if (this.readonly || this.disabled || !this.touchable) return
 				const {
 					clientX,
 					screenX
-				} = e.changedTouches[0]
+				} = e.changedTouches[0]
 				this._getRateCount(clientX || screenX)
-			},
-
-			/**
-			 * 兼容 PC @tian
-			 */
-
-			mousedown(e) {
-				// #ifdef H5
-				if( !this.IsPC() ) return
-				if (this.readonly || this.disabled) return
-				const {
-					clientX,
-				} = e
-				this.userLastRate = this.valueSync
-				this._getRateCount(clientX)
-				this.userRated = true
-				// #endif
-			},
-			mousemove(e) {
-				// #ifdef H5
-				if( !this.IsPC() ) return
-				if( this.userRated ) return
-				if( this.userMouseFristMove ) {
-					console.log('---mousemove----', this.valueSync);
-						this.userLastRate = this.valueSync
-						this.userMouseFristMove = false
-				}
-				if (this.readonly || this.disabled || !this.touchable) return
-				const {
-					clientX,
-				} = e
-				this._getRateCount(clientX)
-				// #endif
-			},
-			mouseleave(e) {
-				// #ifdef H5
-				if( !this.IsPC() ) return
-				if (this.readonly || this.disabled || !this.touchable) return
-				if( this.userRated ) {
-					this.userRated = false
-					return
-				}
-					this.valueSync = this.userLastRate
-				// #endif
-			},
-			// #ifdef H5
-			IsPC() {
-				var userAgentInfo = navigator.userAgent;
-				var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
-				var flag = true;
-				for (let v = 0; v < Agents.length - 1; v++) {
-					if (userAgentInfo.indexOf(Agents[v]) > 0) {
-						flag = false;
-						break;
-					}
-				}
-				return flag;
-			},
-			// #endif
+			},
+
+			/**
+			 * 兼容 PC @tian
+			 */
+
+			mousedown(e) {
+				// #ifdef H5
+				if (!this.IsPC()) return
+				if (this.readonly || this.disabled) return
+				const {
+					clientX,
+				} = e
+				this.userLastRate = this.valueSync
+				this._getRateCount(clientX)
+				this.userRated = true
+				// #endif
+			},
+			mousemove(e) {
+				// #ifdef H5
+				if (!this.IsPC()) return
+				if (this.userRated) return
+				if (this.userMouseFristMove) {
+					console.log('---mousemove----', this.valueSync);
+					this.userLastRate = this.valueSync
+					this.userMouseFristMove = false
+				}
+				if (this.readonly || this.disabled || !this.touchable) return
+				const {
+					clientX,
+				} = e
+				this._getRateCount(clientX)
+				// #endif
+			},
+			mouseleave(e) {
+				// #ifdef H5
+				if (!this.IsPC()) return
+				if (this.readonly || this.disabled || !this.touchable) return
+				if (this.userRated) {
+					this.userRated = false
+					return
+				}
+				this.valueSync = this.userLastRate
+				// #endif
+			},
+			// #ifdef H5
+			IsPC() {
+				var userAgentInfo = navigator.userAgent;
+				var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+				var flag = true;
+				for (let v = 0; v < Agents.length - 1; v++) {
+					if (userAgentInfo.indexOf(Agents[v]) > 0) {
+						flag = false;
+						break;
+					}
+				}
+				return flag;
+			},
+			// #endif
 
 			/**
 			 * 获取星星个数
 			 */
-			_getRateCount(clientX) {
-				this._getSize()
-				const size = Number(this.size)
-				if(size === NaN){
-					return new Error('size 属性只能设置为数字')
+			_getRateCount(clientX) {
+				this._getSize()
+				const size = Number(this.size)
+				if (isNaN(size)) {
+					return new Error('size 属性只能设置为数字')
 				}
 				const rateMoveRange = clientX - this._rateBoxLeft
 				let index = parseInt(rateMoveRange / (size + this.marginNumber))
-				index = index < 0 ? 0 : index;
-				index = index > this.max ? this.max : index;
-				const range = parseInt(rateMoveRange - (size + this.marginNumber) * index);
-				let value = 0;
-				if (this._oldValue === index && !this.PC) return;
+				index = index < 0 ? 0 : index;
+				index = index > this.max ? this.max : index;
+				const range = parseInt(rateMoveRange - (size + this.marginNumber) * index);
+				let value = 0;
+				if (this._oldValue === index && !this.PC) return;
 				this._oldValue = index;
 				if (this.allowHalf) {
 					if (range > (size / 2)) {
@@ -309,9 +280,9 @@
 				} else {
 					value = index + 1
 				}
-
+
 				value = Math.max(0.5, Math.min(value, this.max))
-				this.valueSync = value
+				this.valueSync = value
 				this._onChange()
 			},
 
@@ -354,19 +325,16 @@
 	};
 </script>
 
-<style
-    lang="scss"
-    scoped
->
+<style lang="scss">
 	.uni-rate {
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
 		line-height: 1;
 		font-size: 0;
-		flex-direction: row;
-		/* #ifdef H5 */
-		cursor: pointer;
+		flex-direction: row;
+		/* #ifdef H5 */
+		cursor: pointer;
 		/* #endif */
 	}
 
@@ -383,11 +351,11 @@
 		left: 0;
 		line-height: 1;
 		text-align: left;
-	}
-
-	.uni-cursor-not-allowed {
-		/* #ifdef H5 */
-		cursor: not-allowed !important;
-		/* #endif */
+	}
+
+	.uni-cursor-not-allowed {
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
 	}
 </style>
diff --git a/uni_modules/uni-rate/package.json b/uni_modules/uni-rate/package.json
index 1cb4669a93548e7bccbe99845b457703ba27c8fb..64e8e33200813e7d88ee1a18bb1874088873ad7c 100644
--- a/uni_modules/uni-rate/package.json
+++ b/uni_modules/uni-rate/package.json
@@ -1,83 +1,88 @@
-{
-  "id": "uni-rate",
-  "displayName": "uni-rate 评分",
-  "version": "1.2.1",
-  "description": "Rate 评分组件，可自定义评分星星图标的大小、间隔、评分数。",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "评分"
-],
-  "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-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"
-        }
-      }
-    }
-  }
-}
+{
+  "id": "uni-rate",
+  "displayName": "uni-rate 评分",
+  "version": "1.3.1",
+  "description": "Rate 评分组件，可自定义评分星星图标的大小、间隔、评分数。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "评分"
+],
+  "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"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-rate/readme.md b/uni_modules/uni-rate/readme.md
index bb088001d559eb61651f9764e1b197af32aa5767..eae7b5ced6c89da18d754240890c3ab06d9497da 100644
--- a/uni_modules/uni-rate/readme.md
+++ b/uni_modules/uni-rate/readme.md
@@ -8,100 +8,5 @@
 
 评分组件，多用于购买商品后，对商品进行评价等场景
 
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的使用说明，可以帮你避免一些错误。
-> - 暂时不支持零星选择
-> - 当前版本暂不支持修改图标，后续版本会继续优化
-> - 绑定值推荐使用 `v-model` 的方式
-> - 如需设置一个星星表示多分，如：显示5个星星，最高分10分。这种情况请在 change 事件监听中自行处理，获取到的值乘以你的基数就可以，默认组件是一星一分
-
-
-### 安装方式
-
-本组件符合[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)
-
-
-## 基本用法 
-
-```html
-<!-- 基本用法 -->
-<!-- 需要在 script 中绑定 value 变量 -->
-<uni-rate v-model="value" @change="onChange"/>
-
-<!-- 不支持滑动手势选择评分 -->
-<uni-rate :touchable="false" :value="5"/>
-<!-- 设置尺寸大小 -->
-<uni-rate :size="18" :value="5"/>
-
-<!-- 设置评分数 -->
-<uni-rate :max="10" :value="5" />
-	
-<!-- 设置星星间隔 -->
-<uni-rate :value="4" :margin="20" />	
-
-<!-- 设置颜色 -->
-<uni-rate :value="3" color="#bbb" active-color="red" />
-
-<!-- 选择半星 -->
-<uni-rate allow-half :value="3.5" />
-
-<!-- 只读状态 -->
-<uni-rate :readonly="true" :value="2" />
-
-<!-- 禁用状态 -->
-<uni-rate :disabled="true" disabledColor="#ccc" :value="3" />
-
-<!-- 未选中的星星为镂空状态 -->
-<uni-rate :value="3" :is-fill="false" />
-
-			 
-```
-
-```javascript
-
-export default {
-	components: {},
-	data() {
-		return {
-			value: 2
-		}
-	},
-	methods: {
-		onChange(e) {
-			console.log('rate发生改变:' + JSON.stringify(e))
-		}
-	}
-}
-
-```
-
-## API
-### Rate Props
-
-属性名			|	类型			|	默认值	|	说明																									
-:-:				|	:-:		|	:-:		|	:-:	
-value/v-model	|	Number 	 	| 1			|	当前评分
-color 			|	String 	 	| #ececec	|	未选中状态的星星颜色
-activeColor 	|	String 	 	| #ffca3e	|	选中状态的星星颜色
-disabledColor 	|	String 	 	| #c0c0c0	|	禁用状态的星星颜色
-size 			|	Number 	 	| 24		|	星星的大小
-max 			|	Number 	 	| 5			|	最大评分评分数量，目前一分一颗星
-margin 			|	Number 	 	| 0			|	星星的间距，单位 px
-isFill 			| 	Boolean 	| true		|	星星的类型，是否为实心类型
-disabled 		|	Boolean 	| false		|	是否为禁用状态 (之前版本为已读状态，现更正为禁用状态)
-readonly 		|	Boolean 	| false		| 	是否为只读状态
-allowHalf		| 	Boolean 	| false		|	是否展示半星
-touchable		|	Boolean 	| true		|	是否支持滑动手势
-
-### Rate Events
-
-事件称名			|	说明						|	返回参数			
-:-:				|	:-:						|	:-:	
-@change			|	改变 value 的值返回		|	e = { value:number }		
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/rate/rate](https://hellouniapp.dcloud.net.cn/pages/extUI/rate/rate)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-rate)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-row/changelog.md b/uni_modules/uni-row/changelog.md
index 2327912317fc340c8440647f4c9e03995c8023ec..a97d89309f1a9909c96634fe43c99155cb565d85 100644
--- a/uni_modules/uni-row/changelog.md
+++ b/uni_modules/uni-row/changelog.md
@@ -1,5 +1,8 @@
-## 0.1.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 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-row](https://uniapp.dcloud.io/component/uniui/uni-row)
+## 0.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 0.0.4（2021-05-12）
 - 新增 组件示例地址
 ## 0.0.3（2021-02-05）
diff --git a/uni_modules/uni-row/package.json b/uni_modules/uni-row/package.json
index 0f93391e962457b04006c0fa10051a9571f2135a..b09a8d03554ececd3fea68094a1a72ee333395d5 100644
--- a/uni_modules/uni-row/package.json
+++ b/uni_modules/uni-row/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-row",
   "displayName": "uni-row 布局-行",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "流式栅格系统，随着屏幕或视口分为 24 份，可以迅速简便地创建布局。",
   "keywords": [
     "uni-ui",
@@ -41,7 +41,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": ["uni-scss"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -76,6 +76,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
         }
       }
     }
diff --git a/uni_modules/uni-row/readme.md b/uni_modules/uni-row/readme.md
index 8013a9e47210e2166e2438e6ffd919df45443646..3c9c8b99e762e472706fdfbd8208b74dffe8bc93 100644
--- a/uni_modules/uni-row/readme.md
+++ b/uni_modules/uni-row/readme.md
@@ -6,178 +6,5 @@
 
 流式栅格系统，随着屏幕或视口分为 24 份，可以迅速简便地创建布局。
 
-### 安装方式
-
-本组件符合[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-ui 有一些好的建议，欢迎加入 uni-ui 交流群：871950839
->   
-
-
-### 基本用法
-
-###### 使用单一分栏创建基础的栅格布局
-
-```html
-<uni-row class="demo-uni-row">
-	<uni-col>
-		<view class="demo-uni-col dark_deep"></view>
-	</uni-col>
-</uni-row>
-
-<uni-row class="demo-uni-row">
-	<uni-col :span="12">
-		<view class="demo-uni-col dark"></view>
-	</uni-col>
-	<uni-col :span="12">
-		<view class="demo-uni-col light"></view>
-	</uni-col>
-</uni-row>
-```
-
-### 分栏偏移
-
-###### 支持偏移指定的栏数
-
-```html
-<uni-row class="demo-uni-row">
-	<uni-col :span="8">
-		<view class="demo-uni-col dark"></view>
-	</uni-col>
-	<uni-col :span="8" :offset="6">
-		<view class="demo-uni-col dark"></view>
-	</uni-col>
-</uni-row>
-
-<uni-row class="demo-uni-row">
-	<uni-col :span="12" :pull="6">
-		<view class="demo-uni-col dark"></view>
-	</uni-col>
-</uni-row>
-
-<uni-row class="demo-uni-row">
-	<uni-col :span="12" :push="6">
-		<view class="demo-uni-col dark"></view>
-	</uni-col>
-</uni-row>
-```
-
-### 响应式布局
-
-###### 共五个响应尺寸：xs、sm、md、lg 和 xl
-
-```html
-<uni-row class="demo-uni-row">
-	<uni-col :xs="8" :sm="6" :md="4" :lg="3" :xl="1">
-		<view class="demo-uni-col dark"></view>
-	</uni-col>
-	<uni-col :xs="4" :sm="6" :md="8" :lg="9" :xl="11">
-		<view class="demo-uni-col light"></view>
-	</uni-col>
-	<uni-col :xs="4" :sm="6" :md="8" :lg="9" :xl="11">
-		<view class="demo-uni-col dark"></view>
-	</uni-col>
-	<uni-col :xs="8" :sm="6" :md="4" :lg="3" :xl="1">
-		<view class="demo-uni-col light"></view>
-	</uni-col>
-</uni-row>
-```
-
-###### 使用到的 CSS
-
-```css
-.demo-uni-row {
-	margin-bottom: 10px;
-	/* QQ、字节小程序文档写有 :host，但实测不生效 */
-	/* 百度小程序没有 :host，需要设置block */
-	/* #ifdef MP-TOUTIAO || MP-QQ || MP-BAIDU */
-	display: block;
-	/* #endif */
-}
-
-/* 支付宝小程序没有 demo-uni-row 层级 */
-/* 微信小程序使用了虚拟化节点，没有 demo-uni-row 层级 */
-/* #ifdef MP-ALIPAY || MP-WEIXIN */
-/deep/ .uni-row {
-	margin-bottom: 10px;
-}
-/* #endif */
-
-.demo-uni-col {
-	height: 36px;
-	border-radius: 4px;
-}
-
-.dark_deep {
-	background-color: #99a9bf;
-}
-
-.dark {
-	background-color: #d3dce6;
-}
-
-.light {
-	background-color: #e5e9f2;
-}
-```
-
-### 平台差异说明
-
-### `uni-row`
-| 属性名 | App(nvue) | App(vue) | H5  | 微信小程序 | 支付宝小程序 | 百度小程序 | 字节跳动小程序 | QQ 小程序 |
-| :-: | :-: | :-: | :-: | :-: | :-: | :-: | :-: | :-: |
-| gutter |     -     |    √     |  √  |     √      |      √       |     √      |       √        |     √     |
-
-### `uni-col`
-
-| 属性名 | App(nvue) | App(vue) | H5  | 微信小程序 | 支付宝小程序 | 百度小程序 | 字节跳动小程序 | QQ 小程序 |
-| :-: | :-: | :-: | :-: | :-: | :-: | :-: | :-: | :-: |
-|  span  |     √     |    √     |  √  |     √      |      √       |     √      |       √        |     √     |
-| offset |     √     |    √     |  √  |     √      |      √       |     √      |       √        |     √     |
-|  push  |     √     |    √     |  √  |     √      |      √       |     √      |       √        |     √     |
-|  pull  |     √     |    √     |  √  |     √      |      √       |     √      |       √        |     √     |
-|   xs   |     -     |    √     |  √  |     √      |      √       |     √      |       √        |     √     |
-|   sm   |     -     |    √     |  √  |     √      |      √       |     √      |       √        |     √     |
-|   md   |     -     |    √     |  √  |     √      |      √       |     √      |       √        |     √     |
-|   lg   |     -     |    √     |  √  |     √      |      √       |     √      |       √        |     √     |
-|   xl   |     -     |    √     |  √  |     √      |      √       |     √      |       √        |     √     |
-
-## API
-
-### Row Props
-
-`其他平台`
-
-| 属性名 |  类型  | 可选值 | 默认值 | 必填 |   说明   |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| gutter | Number |   -    |   0    |  否  | 栅格间隔 |
-
-`nvue平台`
-
-| 属性名 |     类型      | 可选值 |  默认值  | 必填 |                                            说明                                            |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| width  | Number/String |   -    | `750rpx` |  否  | nvue 中无百分比 width，使用 span 等属性时，需配置此项`rpx值`。此项不会影响其他平台展示效果 |
-
-### Col Props
-
-| 属性名 |     类型      | 可选值 | 默认值 | 必填 |                                      说明                                       |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-|  span  |    Number     |   -    |   24   |  否  |                                 栅格占据的列数                                  |
-| offset |    Number     |   -    |   -    |  否  |                                栅格左侧间隔格数                                 |
-|  push  |    Number     |   -    |   -    |  否  |                                栅格向右偏移格数                                 |
-|  pull  |    Number     |   -    |   -    |  否  |                                栅格向左偏移格数                                 |
-|   xs   | Number/object |   -    |   -    |  否  | 屏幕宽度`<768px`时，要显示的栅格规则，如：`:xs="8"`或`:xs="{span: 8, pull: 4}"` |
-|   sm   | Number/object |   -    |   -    |  否  |                      屏幕宽度`≥768px`时，要显示的栅格规则                       |
-|   md   | Number/object |   -    |   -    |  否  |                      屏幕宽度`≥992px`时，要显示的栅格规则                       |
-|   lg   | Number/object |   -    |   -    |  否  |                      屏幕宽度`≥1200px`时，要显示的栅格规则                      |
-|   xl   | Number/object |   -    |   -    |  否  |                      屏幕宽度`≥1920px`时，要显示的栅格规则                      |
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/row/row](https://hellouniapp.dcloud.net.cn/pages/extUI/row/row)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-row)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-scss/changelog.md b/uni_modules/uni-scss/changelog.md
index 7e3d75533e09461379b381c4a7fc748ff86511cb..b863bb0f5b0fb7b6cc18c498471f8cfd55538d07 100644
--- a/uni_modules/uni-scss/changelog.md
+++ b/uni_modules/uni-scss/changelog.md
@@ -1,6 +1,8 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
 ## 1.0.2（2021-11-22）
 - 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
-## 1.0.1（2021-11-22）
-- 修复 vue3中scss语法兼容问题
-## 1.0.0（2021-11-18）
-- init
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init
diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/uni-scss/index.scss
index 5d43f7fa4ed9a8cc71357ccf71c2e3769b9f1343..1744a5f9845f6e3399263d7136e7e195e1e44957 100644
--- a/uni_modules/uni-scss/index.scss
+++ b/uni_modules/uni-scss/index.scss
@@ -1 +1 @@
-@import './styles/index.scss';
+@import './styles/index.scss';
diff --git a/uni_modules/uni-scss/package.json b/uni_modules/uni-scss/package.json
index ee71935972328539f94b3fd15b8f054515049e5e..7cc0ccb73f8f1b87cb9f1719551b94a05896e335 100644
--- a/uni_modules/uni-scss/package.json
+++ b/uni_modules/uni-scss/package.json
@@ -1,82 +1,82 @@
-{
-  "id": "uni-scss",
-  "displayName": "uni-scss 辅助样式",
-  "version": "1.0.2",
-  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
-  "keywords": [
-    "uni-scss",
-    "uni-ui",
-    "辅助样式"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": "^3.1.0"
-  },
-  "dcloudext": {
-    "category": [
-        "uni-app前端模板",
-        "前端页面模板"
-    ],
-    "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": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "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": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "n",
-          "联盟": "n"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "y"
-        }
-      }
-    }
-  }
-}
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "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": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "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": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/uni-scss/styles/index.scss
index 2106dd1a5e8cbf46cd14848d922644397ca2ff2a..ffac4fecdf294152885eb82aac1e9d69e13ace8b 100644
--- a/uni_modules/uni-scss/styles/index.scss
+++ b/uni_modules/uni-scss/styles/index.scss
@@ -1,7 +1,7 @@
-@import './setting/_variables.scss';
-@import './setting/_border.scss';
-@import './setting/_color.scss';
-@import './setting/_space.scss';
-@import './setting/_radius.scss';
-@import './setting/_text.scss';
-@import './setting/_styles.scss';
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/uni-scss/styles/setting/_border.scss
index 781df64896bbff9dfc4887da5aa861a560615351..12a11c3227c180d36c7ae8b19da0395c8a37edf2 100644
--- a/uni_modules/uni-scss/styles/setting/_border.scss
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -1,3 +1,3 @@
-.uni-border {
-	border: 1px $uni-border-1 solid;
+.uni-border {
+	border: 1px $uni-border-1 solid;
 }
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_color.scss b/uni_modules/uni-scss/styles/setting/_color.scss
index 595f5edea827a2970b7c65aa1bcd2912437b99eb..1ededd94d929eb8043c0f0f50e4b6eaef19d5056 100644
--- a/uni_modules/uni-scss/styles/setting/_color.scss
+++ b/uni_modules/uni-scss/styles/setting/_color.scss
@@ -1,66 +1,66 @@
-
-// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
-// @mixin get-styles($k,$c) {
-// 	@if $k == size or $k == weight{
-// 		font-#{$k}:#{$c}
-// 	}@else{
-// 		#{$k}:#{$c}
-// 	}
-// }
-$uni-ui-color:(
-	// 主色
-	primary: $uni-primary,
-	primary-disable: $uni-primary-disable,
-	primary-light: $uni-primary-light,
-	// 辅助色
-	success: $uni-success,
-	success-disable: $uni-success-disable,
-	success-light: $uni-success-light,
-	warning: $uni-warning,
-	warning-disable: $uni-warning-disable,
-	warning-light: $uni-warning-light,
-	error: $uni-error,
-	error-disable: $uni-error-disable,
-	error-light: $uni-error-light,
-	info: $uni-info,
-	info-disable: $uni-info-disable,
-	info-light: $uni-info-light,
-	// 中性色
-	main-color: $uni-main-color,
-	base-color: $uni-base-color,
-	secondary-color: $uni-secondary-color,
-	extra-color: $uni-extra-color,
-	// 背景色
-	bg-color: $uni-bg-color,
-	// 边框颜色
-	border-1: $uni-border-1,
-	border-2: $uni-border-2,
-	border-3: $uni-border-3,
-	border-4: $uni-border-4,
-	// 黑色
-	black:$uni-black,
-	// 白色
-	white:$uni-white,
-	// 透明
-	transparent:$uni-transparent
-) !default;
-@each $key, $child in $uni-ui-color {
-	.uni-#{"" + $key} {
-		color: $child;
-	}
-	.uni-#{"" + $key}-bg {
-		background-color: $child;
-	}
-}
-.uni-shadow-sm {
-	box-shadow: $uni-shadow-sm;
-}
-.uni-shadow-base {
-	box-shadow: $uni-shadow-base;
-}
-.uni-shadow-lg {
-	box-shadow: $uni-shadow-lg;
-}
-.uni-mask {
-	background-color:$uni-mask;
-}
+
+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}
diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/uni-scss/styles/setting/_radius.scss
index 8672a693ac99e5cc5873b8c2f3561da4f8427b16..9a0428bb87c90b48771945ac6dd1e96d0004b159 100644
--- a/uni_modules/uni-scss/styles/setting/_radius.scss
+++ b/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -1,55 +1,55 @@
-@mixin radius($r,$d:null ,$important: false){
-  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
-  // Key exists within the $uni-radius variable
-  @if (map-has-key($uni-radius, $r) and  $d){
-		@if $d == t {
-				border-top-left-radius:$radius-value;
-				border-top-right-radius:$radius-value;
-		}@else if $d == r {
-				border-top-right-radius:$radius-value;
-				border-bottom-right-radius:$radius-value;
-		}@else if $d == b {
-				border-bottom-left-radius:$radius-value;
-				border-bottom-right-radius:$radius-value;
-		}@else if $d == l {
-				border-top-left-radius:$radius-value;
-				border-bottom-left-radius:$radius-value;
-		}@else if $d == tl {
-				border-top-left-radius:$radius-value;
-		}@else if $d == tr {
-				border-top-right-radius:$radius-value;
-		}@else if $d == br {
-				border-bottom-right-radius:$radius-value;
-		}@else if $d == bl {
-				border-bottom-left-radius:$radius-value;
-		}
-  }@else{
-		border-radius:$radius-value;
-  }
-}
-
-@each $key, $child in $uni-radius {
-	@if($key){
-		.uni-radius-#{"" + $key} {
-				@include radius($key)
-		}
-	}@else{
-		.uni-radius {
-				@include radius($key)
-		}
-	}
-}
-
-@each $direction in t, r, b, l,tl, tr, br, bl {
-	@each $key, $child in $uni-radius {
-		@if($key){
-			.uni-radius-#{"" + $direction}-#{"" + $key} {
-				@include radius($key,$direction,false)
-			}
-		}@else{
-			.uni-radius-#{$direction} {
-				@include radius($key,$direction,false)
-			}
-		}
-	}
-}
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/uni-scss/styles/setting/_space.scss
index 9c3b17bd6292d81371d74891f79de59ddcb41478..3c895289782aec33e3b8cc7f7f302bdc86131174 100644
--- a/uni_modules/uni-scss/styles/setting/_space.scss
+++ b/uni_modules/uni-scss/styles/setting/_space.scss
@@ -1,56 +1,56 @@
-
-@mixin fn($space,$direction,$size,$n) {
-	@if $n {
-		#{$space}-#{$direction}: #{$size*$uni-space-root}px
-	} @else {
-		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
-	}
-}
-@mixin get-styles($direction,$i,$space,$n){
-	@if $direction == t {
-		@include fn($space, top,$i,$n);
-	} 
-	@if $direction == r {
-		@include fn($space, right,$i,$n);
-	} 
-	@if $direction == b {
-		@include fn($space, bottom,$i,$n);
-	} 
-	@if $direction == l {
-	 @include fn($space, left,$i,$n);
-	} 
-	@if $direction == x {
-		@include fn($space, left,$i,$n);
-		@include fn($space, right,$i,$n);
-	} 
-	@if $direction == y {
-		@include fn($space, top,$i,$n);
-		@include fn($space, bottom,$i,$n);
-	} 
-	@if $direction == a {
-		@if $n {
-			#{$space}:#{$i*$uni-space-root}px;
-		} @else {
-			#{$space}:#{-$i*$uni-space-root}px;
-		}
-	} 
-}
-
-@each $orientation in m,p {
-	$space: margin;
-	@if $orientation == m {
-		$space: margin;
-	} @else {
-		$space: padding;
-	}
-	@for $i from 0 through 16 {
-		@each $direction in t, r, b, l, x, y, a {
-			.uni-#{$orientation}#{$direction}-#{$i} { 
-				@include  get-styles($direction,$i,$space,true);
-			} 
-			.uni-#{$orientation}#{$direction}-n#{$i} { 
-				@include  get-styles($direction,$i,$space,false);
-			}
-		}
-	}
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_styles.scss b/uni_modules/uni-scss/styles/setting/_styles.scss
index 6f882c855ac2ce0a24feaa57b8d93caa954ffcb3..689afec661c6e7212b41437ad3f1fdf26659606c 100644
--- a/uni_modules/uni-scss/styles/setting/_styles.scss
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -1,167 +1,167 @@
-/* #ifndef APP-NVUE */
-
-$-color-white:#fff;
-$-color-black:#000;
-@mixin base-style($color) {
-	color: #fff;
-	background-color: $color;
-	border-color: mix($-color-black, $color, 8%);
-	&:not([hover-class]):active {
-		background: mix($-color-black, $color, 10%);
-		border-color: mix($-color-black, $color, 20%);
-		color: $-color-white;
-		outline: none;
-	}
-}
-@mixin is-color($color) {
-	@include base-style($color);
-	&[loading] {
-		@include base-style($color);
-		&::before {
-			margin-right:5px;
-		}
-	}
-	&[disabled] {
-	  &,
-		&[loading],
-	  &:not([hover-class]):active {
-	    color: $-color-white;
-			border-color: mix(darken($color,10%), $-color-white);
-	    background-color: mix($color, $-color-white);
-	  }
-	}
-
-}
-@mixin base-plain-style($color) {
-	color:$color;
-	background-color: mix($-color-white, $color, 90%);
-	border-color: mix($-color-white, $color, 70%);
-	&:not([hover-class]):active {
-	  background: mix($-color-white, $color, 80%);
-	  color: $color;
-	  outline: none;
-		border-color: mix($-color-white, $color, 50%);
-	}
-}
-@mixin is-plain($color){
-	&[plain] {
-		@include base-plain-style($color);
-		&[loading] {
-			@include base-plain-style($color);
-			&::before {
-				margin-right:5px;
-			}
-		}
-		&[disabled] {
-		  &,
-		  &:active {
-		    color: mix($-color-white, $color, 40%);
-		    background-color: mix($-color-white, $color, 90%);
-				border-color: mix($-color-white, $color, 80%);
-		  }
-		}
-	}
-}
-
-
-.uni-btn {
-	margin: 5px;
-	color: #393939;
-	border:1px solid #ccc;
-	font-size: 16px;
-	font-weight: 200;
-	background-color: #F9F9F9;
-	// TODO 暂时处理边框隐藏一边的问题
-	overflow: visible;
-	&::after{
-		border: none;
-	}
-
-	&:not([type]),&[type=default] {
-		color: #999;
-		&[loading] {
-			background: none;
-			&::before {
-				margin-right:5px;
-			}
-		}
-
-
-
-		&[disabled]{
-			color: mix($-color-white, #999, 60%);
-		  &,
-			&[loading],
-		  &:active {
-				color: mix($-color-white, #999, 60%);
-		    background-color: mix($-color-white,$-color-black , 98%);
-				border-color: mix($-color-white,  #999, 85%);
-		  }
-		}
-
-		&[plain] {
-			color: #999;
-			background: none;
-			border-color: $uni-border-1;
-			&:not([hover-class]):active {
-				background: none;
-			  color: mix($-color-white, $-color-black, 80%);
-				border-color: mix($-color-white, $-color-black, 90%);
-			  outline: none;
-			}
-			&[disabled]{
-			  &,
-				&[loading],
-			  &:active {
-			    background: none;
-					color: mix($-color-white, #999, 60%);
-					border-color: mix($-color-white,  #999, 85%);
-			  }
-			}
-		}
-	}
-
-	&:not([hover-class]):active {
-	  color: mix($-color-white, $-color-black, 50%);
-	}
-
-	&[size=mini] {
-		font-size: 16px;
-		font-weight: 200;
-		border-radius: 8px;
-	}
-
-
-
-	&.uni-btn-small {
-		font-size: 14px;
-	}
-	&.uni-btn-mini {
-		font-size: 12px;
-	}
-
-	&.uni-btn-radius {
-		border-radius: 999px;
-	}
-	&[type=primary] {
-		@include is-color($uni-primary);
-		@include is-plain($uni-primary)
-	}
-	&[type=success] {
-		@include is-color($uni-success);
-		@include is-plain($uni-success)
-	}
-	&[type=error] {
-		@include is-color($uni-error);
-		@include is-plain($uni-error)
-	}
-	&[type=warning] {
-		@include is-color($uni-warning);
-		@include is-plain($uni-warning)
-	}
-	&[type=info] {
-		@include is-color($uni-info);
-		@include is-plain($uni-info)
-	}
-}
-/* #endif */
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */
diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/uni-scss/styles/setting/_text.scss
index 0a89590bd2aff5ff58da57626168711304123969..a34d08f3f70b83d36f019e6e268f8e62ba9d932d 100644
--- a/uni_modules/uni-scss/styles/setting/_text.scss
+++ b/uni_modules/uni-scss/styles/setting/_text.scss
@@ -1,24 +1,24 @@
-@mixin get-styles($k,$c) {
-	@if $k == size or $k == weight{
-		font-#{$k}:#{$c}
-	}@else{
-		#{$k}:#{$c}
-	}
-}
-
-@each $key, $child in $uni-headings {
-	/* #ifndef APP-NVUE */
-	.uni-#{$key} {
-		@each $k, $c in $child {
-			@include get-styles($k,$c)
-		}
-	}
-	/* #endif */
-	/* #ifdef APP-NVUE */
-	.container .uni-#{$key} {
-		@each $k, $c in $child {
-			@include get-styles($k,$c)
-		}
-	}
-	/* #endif */
-}
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}
diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/uni-scss/styles/setting/_variables.scss
index 651e9be7a0a907402e7b0d35153a72a9b86175e5..557d3d7c9cfcf8b1d1ce94d23c75333886749841 100644
--- a/uni_modules/uni-scss/styles/setting/_variables.scss
+++ b/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -1,146 +1,146 @@
-// @use "sass:math";
-@import  '../tools/functions.scss';
-// 间距基础倍数
-$uni-space-root: 2 !default;
-// 边框半径默认值
-$uni-radius-root:5px !default;
-$uni-radius: () !default;
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
 // 边框半径断点
-$uni-radius: map-deep-merge(
-  (
+$uni-radius: map-deep-merge(
+  (
     0: 0,
-		// TODO 当前版本暂时不支持 sm 属性
-    // 'sm': math.div($uni-radius-root, 2),
-    null: $uni-radius-root,
-    'lg': $uni-radius-root * 2,
-    'xl': $uni-radius-root * 6,
-    'pill': 9999px,
-    'circle': 50%
-  ),
-  $uni-radius
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
 );
-// 字体家族
-$body-font-family: 'Roboto', sans-serif !default;
-// 文本
-$heading-font-family: $body-font-family !default;
-$uni-headings: () !default;
-$letterSpacing: -0.01562em;
-$uni-headings: map-deep-merge(
-  (
-    'h1': (
-      size: 32px,
-			weight: 300,
-			line-height: 50px,
-			// letter-spacing:-0.01562em
-    ),
-    'h2': (
-      size: 28px,
-      weight: 300,
-      line-height: 40px,
-      // letter-spacing: -0.00833em
-    ),
-    'h3': (
-      size: 24px,
-      weight: 400,
-      line-height: 32px,
-      // letter-spacing: normal
-    ),
-    'h4': (
-      size: 20px,
-      weight: 400,
-      line-height: 30px,
-      // letter-spacing: 0.00735em
-    ),
-    'h5': (
-      size: 16px,
-      weight: 400,
-      line-height: 24px,
-      // letter-spacing: normal
-    ),
-    'h6': (
-      size: 14px,
-      weight: 500,
-      line-height: 18px,
-      // letter-spacing: 0.0125em
-    ),
-    'subtitle': (
-      size: 12px,
-      weight: 400,
-      line-height: 20px,
-      // letter-spacing: 0.00937em
-    ),
-    'body': (
-      font-size: 14px,
-			font-weight: 400,
-			line-height: 22px,
-			// letter-spacing: 0.03125em
-    ),
-    'caption': (
-      'size': 12px,
-      'weight': 400,
-      'line-height': 20px,
-      // 'letter-spacing': 0.03333em,
-      // 'text-transform': false
-    )
-  ),
-  $uni-headings
-);
-
-
-
-// 主色
-$uni-primary: #2979ff !default;
-$uni-primary-disable:lighten($uni-primary,20%) !default;
-$uni-primary-light: lighten($uni-primary,25%) !default;
-
-// 辅助色
-// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
-$uni-success: #18bc37 !default;
-$uni-success-disable:lighten($uni-success,20%) !default;
-$uni-success-light: lighten($uni-success,25%) !default;
-
-$uni-warning: #f3a73f !default;
-$uni-warning-disable:lighten($uni-warning,20%) !default;
-$uni-warning-light: lighten($uni-warning,25%) !default;
-
-$uni-error: #e43d33 !default;
-$uni-error-disable:lighten($uni-error,20%) !default;
-$uni-error-light: lighten($uni-error,25%) !default;
-
-$uni-info: #8f939c !default;
-$uni-info-disable:lighten($uni-info,20%) !default;
-$uni-info-light: lighten($uni-info,25%) !default;
-
-// 中性色
-// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
-$uni-main-color: #3a3a3a !default; 			// 主要文字
-$uni-base-color: #6a6a6a !default;			// 常规文字
-$uni-secondary-color: #909399 !default;	// 次要文字
-$uni-extra-color: #c7c7c7 !default;			// 辅助说明
-
-// 边框颜色
-$uni-border-1: #F0F0F0 !default;
-$uni-border-2: #EDEDED !default;
-$uni-border-3: #DCDCDC !default;
-$uni-border-4: #B9B9B9 !default;
-
-// 常规色
-$uni-black: #000000 !default;
-$uni-white: #ffffff !default;
-$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
-
-// 背景色
-$uni-bg-color: #f7f7f7 !default;
-
-/* 水平间距 */
-$uni-spacing-sm: 8px !default;
-$uni-spacing-base: 15px !default;
-$uni-spacing-lg: 30px !default;
-
-// 阴影
-$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
-$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
-$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
-
-// 蒙版
-$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/uni-scss/styles/tools/functions.scss
index a71beeb2c8fa7334a27f647ea02cec21191993a1..ac6f63e53a9342840367582982b1f6a465928e48 100644
--- a/uni_modules/uni-scss/styles/tools/functions.scss
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -1,19 +1,19 @@
-// 合并 map
-@function map-deep-merge($parent-map, $child-map){
-	$result: $parent-map;
-	@each $key, $child in $child-map {
-		$parent-has-key: map-has-key($result, $key);
-		$parent-value: map-get($result, $key);
-		$parent-type: type-of($parent-value);
-		$child-type: type-of($child);
-		$parent-is-map: $parent-type == map;
-		$child-is-map: $child-type == map;
-			
-		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
-			$result: map-merge($result, ( $key: $child ));
-		}@else {
-			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
-		}
-	}
-	@return $result;
-};
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};
diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss
index 20cdf5ebd2b7756ad9d3bb1aec307371c66cac08..80ee62f7d82dd550f11e643f55b66353a48b2b55 100644
--- a/uni_modules/uni-scss/theme.scss
+++ b/uni_modules/uni-scss/theme.scss
@@ -1,31 +1,31 @@
-// 间距基础倍数
-$uni-space-root: 2;
-// 边框半径默认值
-$uni-radius-root:5px;
-// 主色
-$uni-primary: #2979ff;
-// 辅助色
-$uni-success: #4cd964;
-// 警告色
-$uni-warning: #f0ad4e;
-// 错误色
-$uni-error: #dd524d;
-// 描述色
-$uni-info: #909399;
-// 中性色
-$uni-main-color: #303133;
-$uni-base-color: #606266;
-$uni-secondary-color: #909399;
-$uni-extra-color: #C0C4CC;
-// 背景色
-$uni-bg-color: #f5f5f5;
-// 边框颜色
-$uni-border-1: #DCDFE6;
-$uni-border-2: #E4E7ED;
-$uni-border-3: #EBEEF5;
-$uni-border-4: #F2F6FC;
-
-// 常规色
-$uni-black: #000000;
-$uni-white: #ffffff;
-$uni-transparent: rgba($color: #000000, $alpha: 0);
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss
index 49a89b6ffcfdc98b89c087182b15deccce011681..1c062d42b29f02edc623834720ef88437b6a3277 100644
--- a/uni_modules/uni-scss/variables.scss
+++ b/uni_modules/uni-scss/variables.scss
@@ -1,62 +1,62 @@
-@import './styles/setting/_variables.scss';
-// 间距基础倍数
-$uni-space-root: 2;
-// 边框半径默认值
-$uni-radius-root:5px;
-
-// 主色
-$uni-primary: #2979ff;
-$uni-primary-disable:mix(#fff,$uni-primary,50%);
-$uni-primary-light: mix(#fff,$uni-primary,80%);
-
-// 辅助色
-// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
-$uni-success: #18bc37;
-$uni-success-disable:mix(#fff,$uni-success,50%);
-$uni-success-light: mix(#fff,$uni-success,80%);
-
-$uni-warning: #f3a73f;
-$uni-warning-disable:mix(#fff,$uni-warning,50%);
-$uni-warning-light: mix(#fff,$uni-warning,80%);
-
-$uni-error: #e43d33;
-$uni-error-disable:mix(#fff,$uni-error,50%);
-$uni-error-light: mix(#fff,$uni-error,80%);
-
-$uni-info: #8f939c;
-$uni-info-disable:mix(#fff,$uni-info,50%);
-$uni-info-light: mix(#fff,$uni-info,80%);
-
-// 中性色
-// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
-$uni-main-color: #3a3a3a; 			// 主要文字
-$uni-base-color: #6a6a6a;			// 常规文字
-$uni-secondary-color: #909399;	// 次要文字
-$uni-extra-color: #c7c7c7;			// 辅助说明
-
-// 边框颜色
-$uni-border-1: #F0F0F0;
-$uni-border-2: #EDEDED;
-$uni-border-3: #DCDCDC;
-$uni-border-4: #B9B9B9;
-
-// 常规色
-$uni-black: #000000;
-$uni-white: #ffffff;
-$uni-transparent: rgba($color: #000000, $alpha: 0);
-
-// 背景色
-$uni-bg-color: #f7f7f7;
-
-/* 水平间距 */
-$uni-spacing-sm: 8px;
-$uni-spacing-base: 15px;
-$uni-spacing-lg: 30px;
-
-// 阴影
-$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
-$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
-$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
-
-// 蒙版
-$uni-mask: rgba($color: #000000, $alpha: 0.4);
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);
diff --git a/uni_modules/uni-search-bar/changelog.md b/uni_modules/uni-search-bar/changelog.md
index b71a10d02a28ac130fe6a24f12f41adc35c22310..b41fdd3baff453befb41124804bb363ae034a9b1 100644
--- a/uni_modules/uni-search-bar/changelog.md
+++ b/uni_modules/uni-search-bar/changelog.md
@@ -1,3 +1,14 @@
+## 1.2.3（2022-05-24）
+- 新增 readonly 属性，组件只读
+## 1.2.2（2022-05-06）
+- 修复  vue3 input 事件不生效的bug
+## 1.2.1（2022-05-06）
+- 修复 多余代码导致的bug
+## 1.2.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-search-bar](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
+## 1.1.2（2021-08-30）
+- 修复 value 属性与 modelValue 属性不兼容的Bug
 ## 1.1.1（2021-08-24）
 - 新增 支持国际化
 ## 1.1.0（2021-07-30）
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
index f26be5075ea0698963f9b7d94209181ff5732764..02e87e013813ad617528311822bee38dec54981d 100644
--- a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
@@ -1,35 +1,40 @@
 <template>
 	<view class="uni-searchbar">
-		<view :style="{borderRadius:radius+'px',backgroundColor: bgColor}" class="uni-searchbar__box" @click="searchClick">
+		<view :style="{borderRadius:radius+'px',backgroundColor: bgColor}" class="uni-searchbar__box"
+			@click="searchClick">
 			<view class="uni-searchbar__box-icon-search">
 				<slot name="searchIcon">
-					<uni-icons color="#999999" size="18" type="search" />
+					<uni-icons color="#c0c4cc" size="18" type="search" />
 				</slot>
 			</view>
-			<input v-if="show || searchVal" :focus="showSync" :placeholder="placeholderText" :maxlength="maxlength" class="uni-searchbar__box-search-input"
-			 confirm-type="search" type="text" v-model="searchVal" @confirm="confirm" @blur="blur" @focus="emitFocus" />
+			<input v-if="show || searchVal" :focus="showSync" :disabled="readonly" :placeholder="placeholderText" :maxlength="maxlength"
+				class="uni-searchbar__box-search-input" confirm-type="search" type="text" v-model="searchVal"
+				@confirm="confirm" @blur="blur" @focus="emitFocus" />
 			<text v-else class="uni-searchbar__text-placeholder">{{ placeholder }}</text>
-			<view v-if="show && (clearButton==='always'||clearButton==='auto'&&searchVal!=='')" class="uni-searchbar__box-icon-clear"
-			 @click="clear">
+			<view v-if="show && (clearButton==='always'||clearButton==='auto'&&searchVal!=='') &&!readonly"
+				class="uni-searchbar__box-icon-clear" @click="clear">
 				<slot name="clearIcon">
-					<uni-icons color="#c0c4cc" size="15" type="clear" />
+					<uni-icons color="#c0c4cc" size="20" type="clear" />
 				</slot>
 			</view>
 		</view>
-		<text @click="cancel" class="uni-searchbar__cancel" v-if="cancelButton ==='always' || show && cancelButton ==='auto'">{{cancelTextI18n}}</text>
+		<text @click="cancel" class="uni-searchbar__cancel"
+			v-if="cancelButton ==='always' || show && cancelButton ==='auto'">{{cancelTextI18n}}</text>
 	</view>
 </template>
 
 <script>
 	import {
-	initVueI18n
+		initVueI18n
 	} from '@dcloudio/uni-i18n'
 	import messages from './i18n/index.js'
-	const {	t	} = initVueI18n(messages)
+	const {
+		t
+	} = initVueI18n(messages)
 
 	/**
 	 * SearchBar 搜索栏
-	 * @description 评分组件
+	 * @description 搜索栏组件，通常用于搜索商品、文章等
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=866
 	 * @property {Number} radius 搜索栏圆角
 	 * @property {Number} maxlength 输入最大长度
@@ -45,6 +50,7 @@
 	 * @property {String} cancelText 取消按钮的文字
 	 * @property {String} bgColor 输入框背景颜色
 	 * @property {Boolean} focus 是否自动聚焦
+	 * @property {Boolean} readonly 组件只读，不能有任何操作，只做展示
 	 * @event {Function} confirm uniSearchBar 的输入框 confirm 事件，返回参数为uniSearchBar的value，e={value:Number}
 	 * @event {Function} input uniSearchBar 的 value 改变时触发事件，返回参数为uniSearchBar的value，e=value
 	 * @event {Function} cancel 点击取消按钮时触发事件，返回参数为uniSearchBar的value，e={value:Number}
@@ -54,7 +60,7 @@
 
 	export default {
 		name: "UniSearchBar",
-		emits:['input','update:modelValue','clear','cancel','confirm','blur','focus'],
+		emits: ['input', 'update:modelValue', 'clear', 'cancel', 'confirm', 'blur', 'focus'],
 		props: {
 			placeholder: {
 				type: String,
@@ -95,6 +101,10 @@
 			focus: {
 				type: Boolean,
 				default: false
+			},
+			readonly: {
+				type: Boolean,
+				default: false
 			}
 		},
 		data() {
@@ -104,7 +114,7 @@
 				searchVal: ''
 			}
 		},
-		computed:{
+		computed: {
 			cancelTextI18n() {
 				return this.cancelText || t("uni-search-bar.cancel")
 			},
@@ -113,6 +123,7 @@
 			}
 		},
 		watch: {
+			// #ifndef VUE3
 			value: {
 				immediate: true,
 				handler(newVal) {
@@ -122,6 +133,8 @@
 					}
 				}
 			},
+			// #endif
+			// #ifdef VUE3
 			modelValue: {
 				immediate: true,
 				handler(newVal) {
@@ -131,10 +144,12 @@
 					}
 				}
 			},
+			// #endif
 			focus: {
 				immediate: true,
 				handler(newVal) {
-					if (newVal) {
+					if (newVal) {
+						if(this.readonly) return
 						this.show = true;
 						this.$nextTick(() => {
 							this.showSync = true
@@ -144,11 +159,14 @@
 			},
 			searchVal(newVal, oldVal) {
 				this.$emit("input", newVal)
+				// #ifdef VUE3
 				this.$emit("update:modelValue", newVal)
+				// #endif
 			}
 		},
 		methods: {
-			searchClick() {
+			searchClick() {
+				if(this.readonly) return
 				if (this.show) {
 					return
 				}
@@ -163,7 +181,8 @@
 				})
 				this.searchVal = ""
 			},
-			cancel() {
+			cancel() {
+				if(this.readonly) return
 				this.$emit("cancel", {
 					value: this.searchVal
 				});
@@ -206,7 +225,7 @@
 	};
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 	$uni-searchbar-height: 36px;
 
 	.uni-searchbar {
@@ -215,8 +234,8 @@
 		/* #endif */
 		flex-direction: row;
 		position: relative;
-		padding: $uni-spacing-col-base;
-		// background-color: $uni-bg-color;
+		padding: 10px;
+		// background-color: #fff;
 	}
 
 	.uni-searchbar__box {
@@ -232,9 +251,6 @@
 		align-items: center;
 		height: $uni-searchbar-height;
 		padding: 5px 8px 5px 0px;
-		border-width: 0.5px;
-		border-style: solid;
-		border-color: $uni-border-color;
 	}
 
 	.uni-searchbar__box-icon-search {
@@ -246,13 +262,13 @@
 		padding: 0 8px;
 		justify-content: center;
 		align-items: center;
-		color: $uni-text-color-placeholder;
+		color: #B3B3B3;
 	}
 
 	.uni-searchbar__box-search-input {
 		flex: 1;
-		font-size: $uni-font-size-base;
-		color: $uni-text-color;
+		font-size: 14px;
+		color: #333;
 	}
 
 	.uni-searchbar__box-icon-clear {
@@ -265,8 +281,8 @@
 	}
 
 	.uni-searchbar__text-placeholder {
-		font-size: $uni-font-size-base;
-		color: $uni-text-color-placeholder;
+		font-size: 14px;
+		color: #B3B3B3;
 		margin-left: 5px;
 	}
 
@@ -274,9 +290,9 @@
 		padding-left: 10px;
 		line-height: $uni-searchbar-height;
 		font-size: 14px;
-		color: $uni-text-color;
+		color: #333333;
 		/* #ifdef H5 */
 		cursor: pointer;
 		/* #endif */
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-search-bar/package.json b/uni_modules/uni-search-bar/package.json
index f9b9bad26627a40a84589f2ce39d8037115f6b7e..9352c574fcc9a96cb44ce37deaa5349a1187ec25 100644
--- a/uni_modules/uni-search-bar/package.json
+++ b/uni_modules/uni-search-bar/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-search-bar",
   "displayName": "uni-search-bar 搜索栏",
-  "version": "1.1.1",
+  "version": "1.2.3",
   "description": "搜索栏组件，通常用于搜索商品、文章等",
   "keywords": [
     "uni-ui",
@@ -41,6 +41,7 @@
   },
   "uni_modules": {
     "dependencies": [
+			"uni-scss",
 			"uni-icons"
 		],
     "encrypt": [],
@@ -80,7 +81,7 @@
         },
         "Vue": {
             "vue2": "y",
-            "vue3": "u"
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-search-bar/readme.md b/uni_modules/uni-search-bar/readme.md
index b39d6cfca4c2c188cab00086129e6a3039bdc938..253092f0bfad35d9d411494ec4d57f6b46c01fab 100644
--- a/uni_modules/uni-search-bar/readme.md
+++ b/uni_modules/uni-search-bar/readme.md
@@ -6,81 +6,9 @@
 > 代码块： `uSearchBar`
 
 
-评分组件
+搜索栏组件
 
-### 安装方式
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<!-- 基本用法 -->
-<uni-search-bar @confirm="search" @input="input" ></uni-search-bar>
-
-<!-- v-model 用法 -->
-<uni-search-bar @confirm="search" :focus="true" v-model="searchValue" @blur="blur" @focus="focus" @input="input" @cancel="cancel" @change="change" @clear="clear">
-
-<!-- 自定义Placeholder -->
-<uni-search-bar placeholder="自定placeholder" @confirm="search"></uni-search-bar>
-
-<!-- 设置圆角 -->
-<uni-search-bar :radius="100" @confirm="search"></uni-search-bar>
-```
-
-
-## API
-### SearchBar Props
-
-|属性名			|类型	|默认值	|说明																					|
-|:-:			|:-:	|:-:	|:-:																					|
-|value/v-model	|StringNumber	|	|搜索栏绑定值																		|
-|placeholder	|String	|搜索	|搜索栏Placeholder																		|
-|radius			|Number	|10		|搜索栏圆角，单位px																	|
-|clearButton	|String	|auto	|是否显示清除按钮，可选值`always`-一直显示、`auto`-输入框不为空时显示、`none`-一直不显示	|
-|cancelButton	|String	|auto	|是否显示取消按钮，可选值`always`-一直显示、`auto`-输入框不为空时显示、`none`-一直不显示	|
-|cancelText		|String	|取消	|取消按钮的文字																			|
-|bgColor		|String	|#F8F8F8|输入框背景颜色																			|
-|maxlength		|Number	|100	|输入最大长度																			|
-|focus		|Boolean	|false	|																	|
-
-
-### SearchBar Events
-
-|事件称名	|说明																|返回参数			|
-|:-:		|:-:																|:-:				|
-|@confirm	|uniSearchBar 的输入框 confirm 事件，返回参数为uniSearchBar的value	|e={value:Number}	|
-|@input		|uniSearchBar 的 value 改变时触发事件，返回参数为uniSearchBar的value|e=value	|
-|@cancel		|点击取消按钮时触发事件，返回参数为uniSearchBar的value				|e={value:Number}	|
-|@clear		|点击清除按钮时触发事件，返回参数为uniSearchBar的value				|e={value:Number}	|
-|@focus			|input 获取焦点时触发事件，返回参数为uniSearchBar的value				|e={value:Number}	|
-|@blur			|input 失去焦点时触发事件，返回参数为uniSearchBar的value				|e={value:Number}	|
-
-### 替换 icon 的 slot 插槽
-
-|插槽称名	|说明																|
-|:-:		|:-:																|
-|searchIcon	|替换组件的搜索图标|
-|clearIcon	|替换组件的清除图标|
-
-```html
-<!-- 替换组件的搜索图标 -->
-<uni-search-bar placeholder="自定义searchIcon" @confirm="search" @cancel="cancel" cancel-text="cancel">
-	<uni-icons slot="searchIcon" color="#999999" size="18" type="home" />
-</uni-search-bar>
-
-<!-- 替换组件的清除图标 -->
-<uni-search-bar placeholder="自定义clearIcon" @confirm="search" @cancel="cancel" cancel-text="cancel">
-	<view slot="clearIcon" style="color: #999999" >X</view>
-</uni-search-bar>
-
-```
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/search-bar/search-bar](https://hellouniapp.dcloud.net.cn/pages/extUI/search-bar/search-bar)
\ No newline at end of file
diff --git a/uni_modules/uni-segmented-control/changelog.md b/uni_modules/uni-segmented-control/changelog.md
index b3eacdcac1b446e4b432e8ff04561433b7f96e1a..9564e5ab7dac29c4c0d9201a9054984c1492923d 100644
--- a/uni_modules/uni-segmented-control/changelog.md
+++ b/uni_modules/uni-segmented-control/changelog.md
@@ -1,5 +1,8 @@
-## 1.1.0（2021-07-30）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.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-segmented-control](https://uniapp.dcloud.io/component/uniui/uni-segmented-control)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.0.5（2021-05-12）
 - 新增 项目示例地址
 ## 1.0.4（2021-02-05）
diff --git a/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
index e3f6e5ecc917e0de387ac95018fb74f52cdc5bd3..cdccc8b9ab218cfb9070ff6364643e3138a69cc3 100644
--- a/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
+++ b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
@@ -1,20 +1,23 @@
 <template>
-	<view :class="[styleType === 'text'?'segmented-control--text' : 'segmented-control--button' ]" :style="{ borderColor: styleType === 'text' ? '' : activeColor }"
-	 class="segmented-control">
-		<view v-for="(item, index) in values" :class="[ styleType === 'text'?'segmented-control__item--text': 'segmented-control__item--button' , index === currentIndex&&styleType === 'button'?'segmented-control__item--button--active': '' , index === 0&&styleType === 'button'?'segmented-control__item--button--first': '',index === values.length - 1&&styleType === 'button'?'segmented-control__item--button--last': '' ]"
-		 :key="index" :style="{
-        backgroundColor: index === currentIndex && styleType === 'button' ? activeColor : '',borderColor: index === currentIndex&&styleType === 'text'||styleType === 'button'?activeColor:'transparent'
-      }"
-		 class="segmented-control__item" @click="_onClick(index)">
-			<text :style="{color:
-          index === currentIndex
-            ? styleType === 'text'
-              ? activeColor
-              : '#fff'
-            : styleType === 'text'
-              ? '#000'
-              : activeColor}"
-			 class="segmented-control__text">{{ item }}</text>
+	<view :class="[styleType === 'text'?'segmented-control--text' : 'segmented-control--button' ]"
+		:style="{ borderColor: styleType === 'text' ? '' : activeColor }" class="segmented-control">
+		<view v-for="(item, index) in values" :class="[ styleType === 'text' ? '': 'segmented-control__item--button',
+		index === currentIndex&&styleType === 'button' ? 'segmented-control__item--button--active': '',
+		index === 0&&styleType === 'button' ? 'segmented-control__item--button--first': '',
+			index === values.length - 1&&styleType === 'button' ? 'segmented-control__item--button--last': '' ]" :key="index"
+			:style="{ backgroundColor: index === currentIndex && styleType === 'button' ? activeColor : '',borderColor: index === currentIndex&&styleType === 'text'||styleType === 'button'?activeColor:'transparent' }"
+			class="segmented-control__item" @click="_onClick(index)">
+			<view>
+				<text :style="{color:
+				    index === currentIndex
+				      ? styleType === 'text'
+				        ? activeColor
+				        : '#fff'
+				      : styleType === 'text'
+				        ? '#000'
+				        : activeColor}" class="segmented-control__text" :class="styleType === 'text' && index === currentIndex ? 'segmented-control__item--text': ''">{{ item }}</text>
+			</view>
+
 		</view>
 	</view>
 </template>
@@ -27,7 +30,7 @@
 	 * @property {Number} current 当前选中的tab索引值，从0计数
 	 * @property {String} styleType = [button|text] 分段器样式类型
 	 * 	@value button 按钮类型
-	 * 	@value text 文字类型
+	 * 	@value text 文字类型
 	 * @property {String} activeColor 选中的标签背景色与边框颜色
 	 * @property {Array} values 选项数组
 	 * @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
@@ -35,7 +38,7 @@
 
 	export default {
 		name: 'UniSegmentedControl',
-		emits:['clickItem'],
+		emits: ['clickItem'],
 		props: {
 			current: {
 				type: Number,
@@ -49,7 +52,7 @@
 			},
 			activeColor: {
 				type: String,
-				default: '#007aff'
+				default: '#2979FF'
 			},
 			styleType: {
 				type: String,
@@ -85,7 +88,6 @@
 </script>
 
 <style lang="scss" scoped>
-
 	.segmented-control {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -93,9 +95,9 @@
 		/* #endif */
 		flex-direction: row;
 		height: 36px;
-		overflow: hidden;
-		/* #ifdef H5 */
-		cursor: pointer;
+		overflow: hidden;
+		/* #ifdef H5 */
+		cursor: pointer;
 		/* #endif */
 	}
 
@@ -131,11 +133,12 @@
 
 	.segmented-control__item--text {
 		border-bottom-style: solid;
-		border-bottom-width: 3px;
+		border-bottom-width: 2px;
+		padding: 6px 0;
 	}
 
 	.segmented-control__text {
-		font-size: 16px;
+		font-size: 14px;
 		line-height: 20px;
 		text-align: center;
 	}
diff --git a/uni_modules/uni-segmented-control/package.json b/uni_modules/uni-segmented-control/package.json
index 5680713184d68c4ae221984ec82e5037f0c651b7..a40732daca76f481345beeb2e742b56c29e2b6df 100644
--- a/uni_modules/uni-segmented-control/package.json
+++ b/uni_modules/uni-segmented-control/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-segmented-control",
   "displayName": "uni-segmented-control 分段器",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "分段器由至少 2 个分段控件组成，用作不同视图的显示",
   "keywords": [
     "uni-ui",
@@ -41,7 +41,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": ["uni-scss"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -76,6 +76,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-segmented-control/readme.md b/uni_modules/uni-segmented-control/readme.md
index 477901695e7bd74a349f128f6703a944c1a98215..3527b03f61fbe9f338dad1b6f1af8d2f5d004dc4 100644
--- a/uni_modules/uni-segmented-control/readme.md
+++ b/uni_modules/uni-segmented-control/readme.md
@@ -7,54 +7,7 @@
 
 用作不同视图的显示
 
-### 安装方式
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-segmented-control)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中的使用
-
-```html
-<template>
-    <view>
-        <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="button" activeColor="#4cd964"></uni-segmented-control>
-        <view class="content">
-            <view v-show="current === 0">
-                选项卡1的内容
-            </view>
-            <view v-show="current === 1">
-                选项卡2的内容
-            </view>
-            <view v-show="current === 2">
-                选项卡3的内容
-            </view>
-        </view>
-    </view>
-</template>
-```
-
-## API
-
-### SegmentedControl Props
-
-|属性名				|类型				|默认值	|说明															|
-|:-:					|:-:				|:-:	|:-:															|
-|current			|Number			|0		|当前选中的tab索引值，从0计数									|
-|styleType		|String			|button	|分段器样式类型，可选值：button（按钮类型），text（文字类型）	|
-|activeColor	|String			|#007aff|选中的标签背景色与边框颜色										|
-|values				|Array			|-		|选项数组														|
-
-### SegmentedControl Events
-
-|事件名		|说明					|返回值				|
-|:-:		|:-:					|:-:				|
-|@clickItem	|组件触发点击事件时触发	|e={currentIndex}	|
-
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/segmented-control/segmented-control](https://hellouniapp.dcloud.net.cn/pages/extUI/segmented-control/segmented-control)
\ No newline at end of file
diff --git a/uni_modules/uni-steps/changelog.md b/uni_modules/uni-steps/changelog.md
index b0c0260bcf032570004b86fb5d1daf3e14efcc46..1eb663a5f8d2e765edf7c79339f9db24e1d94bc4 100644
--- a/uni_modules/uni-steps/changelog.md
+++ b/uni_modules/uni-steps/changelog.md
@@ -1,5 +1,10 @@
-## 1.0.8（2021-05-12）
-- 新增 项目示例地址
+## 1.1.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.1.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-steps](https://uniapp.dcloud.io/component/uniui/uni-steps)
+## 1.0.8（2021-05-12）
+- 新增 项目示例地址
 ## 1.0.7（2021-05-06）
 - 修复 uni-steps 横向布局时，多行文字高度不合理的 bug
 ## 1.0.6（2021-04-21）
diff --git a/uni_modules/uni-steps/components/uni-steps/uni-steps.vue b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
index 928f662089c43376c73a76046048ecb58b7360ca..284233ab78ccb77f339a297988cc22322b454576 100644
--- a/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
+++ b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
@@ -2,22 +2,31 @@
 	<view class="uni-steps">
 		<view :class="[direction==='column'?'uni-steps__column':'uni-steps__row']">
 			<view :class="[direction==='column'?'uni-steps__column-text-container':'uni-steps__row-text-container']">
-				<view v-for="(item,index) in options" :key="index" :class="[direction==='column'?'uni-steps__column-text':'uni-steps__row-text']">
-					<text :style="{color:index<=active?activeColor:deactiveColor}" :class="[direction==='column'?'uni-steps__column-title':'uni-steps__row-title']">{{item.title}}</text>
-					<text :style="{color:index<=active?activeColor:deactiveColor}" :class="[direction==='column'?'uni-steps__column-desc':'uni-steps__row-desc']">{{item.desc}}</text>
+				<view v-for="(item,index) in options" :key="index"
+					:class="[direction==='column'?'uni-steps__column-text':'uni-steps__row-text']">
+					<text :style="{color:index === active?activeColor:deactiveColor}"
+						:class="[direction==='column'?'uni-steps__column-title':'uni-steps__row-title']">{{item.title}}</text>
+					<text :style="{color: deactiveColor}"
+						:class="[direction==='column'?'uni-steps__column-desc':'uni-steps__row-desc']">{{item.desc}}</text>
 				</view>
 			</view>
 			<view :class="[direction==='column'?'uni-steps__column-container':'uni-steps__row-container']">
-				<view :class="[direction==='column'?'uni-steps__column-line-item':'uni-steps__row-line-item']" v-for="(item,index) in options"
-				 :key="index">
-					<view :class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--before':'uni-steps__row-line--before']"
-					 :style="{backgroundColor:index<=active&&index!==0?activeColor:index===0?'transparent':deactiveColor}"></view>
-					<view :class="[direction==='column'?'uni-steps__column-check':'uni-steps__row-check']" v-if="index === active">
-						<uni-icons :color="activeColor" type="checkbox-filled" size="14"></uni-icons>
+				<view :class="[direction==='column'?'uni-steps__column-line-item':'uni-steps__row-line-item']"
+					v-for="(item,index) in options" :key="index">
+					<view
+						:class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--before':'uni-steps__row-line--before']"
+						:style="{backgroundColor:index<=active&&index!==0?activeColor:index===0?'transparent':deactiveColor}">
+					</view>
+					<view :class="[direction==='column'?'uni-steps__column-check':'uni-steps__row-check']"
+						v-if="index === active">
+						<uni-icons :color="activeColor" :type="activeIcon" size="14"></uni-icons>
+					</view>
+					<view v-else :class="[direction==='column'?'uni-steps__column-circle':'uni-steps__row-circle']"
+						:style="{backgroundColor:index<active?activeColor:deactiveColor}"></view>
+					<view
+						:class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--after':'uni-steps__row-line--after']"
+						:style="{backgroundColor:index<active&&index!==options.length-1?activeColor:index===options.length-1?'transparent':deactiveColor}">
 					</view>
-					<view :class="[direction==='column'?'uni-steps__column-circle':'uni-steps__row-circle']" v-else :style="{backgroundColor:index<active?activeColor:deactiveColor}"></view>
-					<view :class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--after':'uni-steps__row-line--after']"
-					 :style="{backgroundColor:index<active&&index!==options.length-1?activeColor:index===options.length-1?'transparent':deactiveColor}"></view>
 				</view>
 			</view>
 		</view>
@@ -25,18 +34,17 @@
 </template>
 
 <script>
-
-	/**
-	 * Steps 步骤条
-	 * @description 评分组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=34
-	 * @property {Number} active 当前步骤
-	 * @property {String} direction = [row|column] 当前步骤
-	 * 	@value row 横向
-	 * 	@value column 纵向
-	 * @property {String} activeColor 选中状态的颜色
-	 * @property {Array} options 数据源，格式为：[{title:'xxx',desc:'xxx'},{title:'xxx',desc:'xxx'}]
-	 */
+	/**
+	 * Steps 步骤条
+	 * @description 评分组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=34
+	 * @property {Number} active 当前步骤
+	 * @property {String} direction = [row|column] 当前步骤
+	 * 	@value row 横向
+	 * 	@value column 纵向
+	 * @property {String} activeColor 选中状态的颜色
+	 * @property {Array} options 数据源，格式为：[{title:'xxx',desc:'xxx'},{title:'xxx',desc:'xxx'}]
+	 */
 
 	export default {
 		name: 'UniSteps',
@@ -49,18 +57,23 @@
 			activeColor: {
 				// 激活状态颜色
 				type: String,
-				default: '#1aad19'
+				default: '#2979FF'
 			},
 			deactiveColor: {
 				// 未激活状态颜色
 				type: String,
-				default: '#999999'
+				default: '#B7BDC6'
 			},
 			active: {
 				// 当前步骤
 				type: Number,
 				default: 0
 			},
+			activeIcon: {
+				// 当前步骤
+				type: String,
+				default: 'checkbox-filled'
+			},
 			options: {
 				type: Array,
 				default () {
@@ -74,7 +87,9 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
+	$uni-primary: #2979ff !default;
+	$uni-border-color:#EDEDED;
 	.uni-steps {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -104,8 +119,8 @@
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
-		flex-direction: row;
-		align-items: flex-end;
+		flex-direction: row;
+		align-items: flex-end;
 		margin-bottom: 8px;
 	}
 
@@ -137,13 +152,13 @@
 	}
 
 	.uni-steps__row-title {
-		font-size: $uni-font-size-base;
+		font-size: 14px;
 		line-height: 16px;
 		text-align: center;
 	}
 
 	.uni-steps__column-title {
-		font-size: $uni-font-size-base;
+		font-size: 14px;
 		text-align: left;
 		line-height: 18px;
 	}
@@ -155,7 +170,7 @@
 	}
 
 	.uni-steps__column-desc {
-		font-size: $uni-font-size-sm;
+		font-size: 12px;
 		text-align: left;
 		line-height: 18px;
 	}
@@ -200,12 +215,12 @@
 	.uni-steps__row-line {
 		flex: 1;
 		height: 1px;
-		background-color: $uni-text-color-grey;
+		background-color: #B7BDC6;
 	}
 
 	.uni-steps__column-line {
 		width: 1px;
-		background-color: $uni-text-color-grey;
+		background-color: #B7BDC6;
 	}
 
 	.uni-steps__row-line--after {
@@ -223,22 +238,22 @@
 
 	.uni-steps__column-line--before {
 		height: 6px;
-		transform: translate(0px, -1px);
+		transform: translate(0px, -13px);
 	}
 
 	.uni-steps__row-circle {
 		width: 5px;
 		height: 5px;
-		border-radius: 100px;
-		background-color: $uni-text-color-grey;
+		border-radius: 50%;
+		background-color: #B7BDC6;
 		margin: 0px 3px;
 	}
 
 	.uni-steps__column-circle {
 		width: 5px;
 		height: 5px;
-		border-radius: 100px;
-		background-color: $uni-text-color-grey;
+		border-radius: 50%;
+		background-color: #B7BDC6;
 		margin: 4px 0px 5px 0px;
 	}
 
@@ -251,4 +266,4 @@
 		line-height: 14px;
 		margin: 2px 0px;
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-steps/package.json b/uni_modules/uni-steps/package.json
index a9714fec20ae7a050f9cabeb2f685b9ff1772b31..1870e44ce41ac3afd238c3a4bd9c0695e5d5e5d2 100644
--- a/uni_modules/uni-steps/package.json
+++ b/uni_modules/uni-steps/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-steps",
   "displayName": "uni-steps 步骤条",
-  "version": "1.0.8",
+  "version": "1.1.1",
   "description": "步骤条组件，提供横向和纵向两种布局格式。",
   "keywords": [
     "uni-ui",
@@ -40,7 +40,8 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [
+    "dependencies": [
+			"uni-scss",
 			"uni-icons"
 		],
     "encrypt": [],
@@ -77,6 +78,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-steps/readme.md b/uni_modules/uni-steps/readme.md
index d262e30421a7dc9fec93461b3f2bbfb4495305e6..da7a4bfaae214edadc4f5a03dfb97ac1fa3b7628 100644
--- a/uni_modules/uni-steps/readme.md
+++ b/uni_modules/uni-steps/readme.md
@@ -7,43 +7,7 @@
 
 步骤条，常用于显示进度
 
-### 安装方式
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-steps)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中的使用
-
-```html
-<!-- 基本用法 -->
-<uni-steps :options="[{title: '事件一'}, {title: '事件二'}, {title: '事件三'}, {title: '事件四'}]" :active="1"></uni-steps>
-
-<!-- 纵向排列 -->
-<uni-steps :options="[{title:'买家下单',desc:'2018-11-11'},{title:'卖家发货',desc:'2018-11-12'},{title:'买家签收',desc:'2018-11-13'},{title:'交易完成',desc:'2018-11-14'}]" direction="column" :active="2"></uni-steps>
-```
-
-
-## API
-
-### Steps Props
-
-|属性名					|类型		|	可选值				|默认值	|说明																|
-|:-:						|:-:		|	:-:					|:-:		|:-:																|
-|active					|Number	|	-						|0			|当前步骤															|
-|**direction**	|String	|	row/column	|row		|排列方向|
-|active-color		|String	|	-						|#1aad19|选中状态的颜色														|
-|options				|Array	|	-						| - 		|数据源，格式为：[{title:'xxx',desc:'xxx'},{title:'xxx',desc:'xxx'}]|
-
-#### Direction Options
-| 属性名		| 说明		|
-| :-:			| :-:		|
-| row			| 横向		|
-| column	| 纵向		|
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/steps/steps](https://hellouniapp.dcloud.net.cn/pages/extUI/steps/steps)
\ No newline at end of file
diff --git a/uni_modules/uni-swipe-action/changelog.md b/uni_modules/uni-swipe-action/changelog.md
index b3bc0bec6a91f37c96980d044b73ff2f4f9771b3..c16ddeb31b666256b2786ee243e6070b8a29cafa 100644
--- a/uni_modules/uni-swipe-action/changelog.md
+++ b/uni_modules/uni-swipe-action/changelog.md
@@ -1,7 +1,24 @@
-## 1.2.4（2021-08-20）
-- 优化 close-all 方法
-## 1.2.3（2021-08-20）
-- 新增 close-all 方法，关闭所有已打开的组件
+## 1.3.7（2022-06-06）
+- 修复 vue3 下使用组件不能正常运行的Bug
+## 1.3.6（2022-05-31）
+- 修复 h5端点击click触发两次的Bug
+## 1.3.5（2022-05-23）
+- 修复 isPC 找不到的Bug
+## 1.3.4（2022-05-19）
+-  修复 在 nvue 下 disabled 失效的bug
+## 1.3.3（2022-03-31）
+- 修复 按钮字体大小不能设置的bug
+## 1.3.2（2022-03-16）
+- 修复 h5和app端下报el错误的bug
+## 1.3.1（2022-03-07）
+- 修复 HBuilderX 1.4.X 版本中，h5和app端下报错的bug
+## 1.3.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-swipe-action](https://uniapp.dcloud.io/component/uniui/uni-swipe-action)
+## 1.2.4（2021-08-20）
+- 优化 close-all 方法
+## 1.2.3（2021-08-20）
+- 新增 close-all 方法，关闭所有已打开的组件
 ## 1.2.2（2021-08-17）
 - 新增 resize() 方法，在非微信小程序、h5、app-vue端出现不能滑动的问题的时候，重置组件
 - 修复 app 端偶尔出现类似 Page[x][-x,xx;-x,xx,x,x-x] 的问题 
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
index 7fcf9ea3891558a893c951d08f69efcd93a02344..c74f5286f29d47b2376a3e21ccf97ea6421ca4b3 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js
@@ -1,9 +1,11 @@
+let bindIngXMixins = {}
+
 // #ifdef APP-NVUE
 const BindingX = uni.requireNativePlugin('bindingx');
 const dom = uni.requireNativePlugin('dom');
 const animation = uni.requireNativePlugin('animation');
 
-export default {
+bindIngXMixins = {
 	data() {
 		return {}
 	},
@@ -11,7 +13,7 @@ export default {
 	watch: {
 		show(newVal) {
 			if (this.autoClose) return
-			if (this.stop) return
+			if (this.stop) return
 			this.stop = true
 			if (newVal) {
 				this.open(newVal)
@@ -67,13 +69,15 @@ export default {
 			})
 		},
 		touchstart(e) {
+			// fix by mehaotian 禁止滑动
+			if (this.disabled) return
 			// 每次只触发一次，避免多次监听造成闪烁
 			if (this.stop) return
 			this.stop = true
-			if (this.autoClose) {
-				this.swipeaction.closeOther(this)
-			}
-				
+			if (this.autoClose) {
+				this.swipeaction.closeOther(this)
+			}
+
 			const leftWidth = this.button.left.width
 			const rightWidth = this.button.right.width
 			let expression = this.range(this.x, -rightWidth, leftWidth)
@@ -291,10 +295,8 @@ export default {
 			})
 		}
 	}
-}
+}
 
 // #endif
 
-// #ifndef APP-NVUE
-export default {}
-// #endif
\ No newline at end of file
+export default bindIngXMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js
index 7f549f65c1746f75b4037844c44411dfd280e1f5..e7ea2845106d82a6100b22a6cf77d1fedf728561 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/isPC.js
@@ -9,4 +9,4 @@ export function isPC() {
 		}
 	}
 	return flag;
-}
\ No newline at end of file
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
index ad737ce508dd163c37baeae9a5d16c3d5c54bedc..bb4d5d8c76ce2411433a518c6eb09ac1de01fcde 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpalipay.js
@@ -5,13 +5,13 @@ export default {
 			transition: false,
 			width: 0,
 			viewWidth: 0,
-			swipeShow: 0
+			swipeShow: 0
 		}
 	},
 	watch: {
 		show(newVal) {
-			if (this.autoClose) return
-			if (newVal && newVal !== 'none' ) {
+			if (this.autoClose) return
+			if (newVal && newVal !== 'none') {
 				this.transition = true
 				this.open(newVal)
 			} else {
@@ -23,7 +23,7 @@ export default {
 		this.swipeaction = this.getSwipeAction()
 		if (this.swipeaction.children !== undefined) {
 			this.swipeaction.children.push(this)
-		}
+		}
 	},
 	mounted() {
 		this.isopen = false
@@ -31,29 +31,29 @@ export default {
 			this.getQuerySelect()
 		}, 50)
 	},
-	methods: {
-		appTouchStart(e) {
-			const {
-				clientX
-			} = e.changedTouches[0]
-			this.clientX = clientX
-			this.timestamp = new Date().getTime()
-		},
-		appTouchEnd(e, index, item, position) {
-			const {
-				clientX
-			} = e.changedTouches[0]
-			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
-			let diff = Math.abs(this.clientX - clientX)
-			let time = (new Date().getTime()) - this.timestamp
-			if (diff < 40 && time < 300) {
-				this.$emit('click', {
-					content: item,
-					index,
-					position
-				})
-			}
-		},
+	methods: {
+		appTouchStart(e) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			this.clientX = clientX
+			this.timestamp = new Date().getTime()
+		},
+		appTouchEnd(e, index, item, position) {
+			const {
+				clientX
+			} = e.changedTouches[0]
+			// fixed by xxxx 模拟点击事件，解决 ios 13 点击区域错位的问题
+			let diff = Math.abs(this.clientX - clientX)
+			let time = (new Date().getTime()) - this.timestamp
+			if (diff < 40 && time < 300) {
+				this.$emit('click', {
+					content: item,
+					index,
+					position
+				})
+			}
+		},
 		/**
 		 * 移动触发
 		 * @param {Object} e
@@ -68,7 +68,7 @@ export default {
 			this.autoClose && this.swipeaction.closeOther(this)
 		},
 		touchmove(e) {},
-		touchend(e) {
+		touchend(e) {
 			// 0的位置什么都不执行
 			if (this.isclose && this.isopen === 'none') return
 			if (this.isclose && this.isopen !== 'none') {
@@ -127,13 +127,13 @@ export default {
 		/**
 		 * 关闭
 		 */
-		close() {
-			this.x = this.moveX
+		close() {
+			this.x = this.moveX
 			// TODO 解决 x 值不更新的问题，所以会多触发一次 nextTick ，待优化
 			this.$nextTick(() => {
-				this.x = -this.leftWidth
-				if(this.isopen!=='none'){
-					this.$emit('change', 'none')
+				this.x = -this.leftWidth
+				if (this.isopen !== 'none') {
+					this.$emit('change', 'none')
 				}
 				this.isopen = 'none'
 			})
@@ -149,11 +149,11 @@ export default {
 					this.x = 0
 				} else {
 					this.x = -this.rightWidth - this.leftWidth
-				}
-				
-				if(this.isopen!==type){
-					this.$emit('change', type)
-				}
+				}
+
+				if (this.isopen !== type) {
+					this.$emit('change', type)
+				}
 				this.isopen = type
 			})
 
@@ -163,7 +163,7 @@ export default {
 			const query = uni.createSelectorQuery().in(this);
 			query.selectAll('.movable-view--hock').boundingClientRect(data => {
 				this.leftWidth = data[1].width
-				this.rightWidth = data[2].width
+				this.rightWidth = data[2].width
 				this.width = data[0].width
 				this.viewWidth = this.width + this.rightWidth + this.leftWidth
 				if (this.leftWidth === 0) {
@@ -171,7 +171,7 @@ export default {
 					this.x = -0.1
 				} else {
 					this.x = -this.leftWidth
-				}
+				}
 				this.moveX = this.x
 				this.$nextTick(() => {
 					this.swipeShow = 1
@@ -182,7 +182,7 @@ export default {
 				}
 
 				if (this.autoClose) return
-				if (this.show !== 'none') {
+				if (this.show !== 'none') {
 					this.transition = true
 					this.open(this.shows)
 				}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
index eef22330dcf80d199e3c854f77aad38b9cf76aff..696bbab88922636a05bd7b6a29d481edae4e580d 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js
@@ -1,7 +1,8 @@
-// #ifndef APP-PLUS|| MP-WEIXIN  ||  H5
+let otherMixins = {}
 
+// #ifndef APP-PLUS|| MP-WEIXIN  ||  H5
 const MIN_DISTANCE = 10;
-export default {
+otherMixins = {
 	data() {
 		// TODO 随机生生元素ID，解决百度小程序获取同一个元素位置信息的bug
 		const elClass = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
@@ -9,8 +10,8 @@ export default {
 			uniShow: false,
 			left: 0,
 			buttonShow: 'none',
-			ani: false,
-			moveLeft:'',
+			ani: false,
+			moveLeft: '',
 			elClass
 		}
 	},
@@ -19,18 +20,18 @@ export default {
 			if (this.autoClose) return
 			this.openState(newVal)
 		},
-		left(){
-			this.moveLeft = `translateX(${this.left}px)`
-		},
-		buttonShow(newVal){
-			if (this.autoClose) return
-			this.openState(newVal)
-		},
-		leftOptions() {
-			this.init()
-		},
-		rightOptions() {
-			this.init()
+		left() {
+			this.moveLeft = `translateX(${this.left}px)`
+		},
+		buttonShow(newVal) {
+			if (this.autoClose) return
+			this.openState(newVal)
+		},
+		leftOptions() {
+			this.init()
+		},
+		rightOptions() {
+			this.init()
 		}
 	},
 	mounted() {
@@ -40,17 +41,17 @@ export default {
 		}
 		this.init()
 	},
-	methods: {
-		init(){
-			clearTimeout(this.timer)
-			this.timer = setTimeout(() => {
-				this.getSelectorQuery()
-			}, 100)
-			// 移动距离
-			this.left = 0
-			this.x = 0
+	methods: {
+		init() {
+			clearTimeout(this.timer)
+			this.timer = setTimeout(() => {
+				this.getSelectorQuery()
+			}, 100)
+			// 移动距离
+			this.left = 0
+			this.x = 0
 		},
-		
+
 		closeSwipe(e) {
 			if (!this.autoClose) return
 			this.swipeaction.closeOther(this)
@@ -76,12 +77,12 @@ export default {
 					position
 				})
 			}
-		},
+		},
 		touchstart(e) {
 			if (this.disabled) return
 			this.ani = false
 			this.x = this.left || 0
-			this.stopTouchStart(e)
+			this.stopTouchStart(e)
 			this.autoClose && this.closeSwipe()
 		},
 		touchmove(e) {
@@ -102,12 +103,12 @@ export default {
 		 * 设置移动距离
 		 * @param {Object} value
 		 */
-		move(value) {
+		move(value) {
 			value = value || 0
 			const leftWidth = this.leftWidth
-			const rightWidth = this.rightWidth
+			const rightWidth = this.rightWidth
 			// 获取可滑动范围
-			this.left = this.range(value, -rightWidth, leftWidth);
+			this.left = this.range(value, -rightWidth, leftWidth);
 		},
 
 		/**
@@ -128,16 +129,18 @@ export default {
 			const threshold = this.threshold
 			const isopen = this.isopen || 'none'
 			const leftWidth = this.leftWidth
-			const rightWidth = this.rightWidth
+			const rightWidth = this.rightWidth
 			if (this.deltaX === 0) {
 				this.openState('none')
 				return
 			}
-			if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth > 0 && rightWidth +
+			if ((isopen === 'none' && rightWidth > 0 && -left > threshold) || (isopen !== 'none' && rightWidth >
+					0 && rightWidth +
 					left < threshold)) {
 				// right
 				this.openState('right')
-			} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth > 0 &&
+			} else if ((isopen === 'none' && leftWidth > 0 && left > threshold) || (isopen !== 'none' && leftWidth >
+					0 &&
 					leftWidth - left < threshold)) {
 				// left
 				this.openState('left')
@@ -233,15 +236,15 @@ export default {
 		getSelectorQuery() {
 			const views = uni.createSelectorQuery().in(this)
 			views
-				.selectAll('.'+this.elClass)
+				.selectAll('.' + this.elClass)
 				.boundingClientRect(data => {
-					if(data.length === 0) return
+					if (data.length === 0) return
 					let show = 'none'
 					if (this.autoClose) {
 						show = 'none'
 					} else {
 						show = this.show
-					}
+					}
 					this.leftWidth = data[0].width || 0
 					this.rightWidth = data[1].width || 0
 					this.buttonShow = show
@@ -249,10 +252,8 @@ export default {
 				.exec()
 		}
 	}
-}
+}
 
 // #endif
 
-// #ifdef APP-PLUS|| MP-WEIXIN  ||  H5
-export default { }
-// #endif
\ No newline at end of file
+export default otherMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
index 1e36fd546026a4aa3a46eb17ae1859ea8a59f5d2..46d1e320e442b4de411961fce0307e0833347478 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js
@@ -1,13 +1,21 @@
+let mpMixins = {}
+let is_pc = null
+// #ifdef H5
+import {
+	isPC
+} from "./isPC"
+is_pc = isPC()
+// #endif
 // #ifdef APP-VUE|| MP-WEIXIN || H5
-import { isPC } from "./isPC"
-export default {
+
+mpMixins = {
 	data() {
 		return {
-			is_show:'none'
+			is_show: 'none'
 		}
 	},
 	watch: {
-		show(newVal){
+		show(newVal) {
 			this.is_show = this.show
 		}
 	},
@@ -17,7 +25,7 @@ export default {
 			this.swipeaction.children.push(this)
 		}
 	},
-	mounted(){
+	mounted() {
 		this.is_show = this.show
 	},
 	methods: {
@@ -34,20 +42,16 @@ export default {
 			}
 		},
 
-		appTouchStart(e) {
-			// #ifdef H5
-			if(isPC()) return
-			// #endif
+		appTouchStart(e) {
+			if (is_pc) return
 			const {
 				clientX
 			} = e.changedTouches[0]
 			this.clientX = clientX
 			this.timestamp = new Date().getTime()
 		},
-		appTouchEnd(e, index, item, position) {
-			// #ifdef H5
-			if(isPC()) return
-			// #endif
+		appTouchEnd(e, index, item, position) {
+			if (is_pc) return
 			const {
 				clientX
 			} = e.changedTouches[0]
@@ -60,22 +64,20 @@ export default {
 					index,
 					position
 				})
-			}
-		},
-		onClickForPC(index, item, position) {
-			// #ifdef H5
-			if(!isPC()) return
+			}
+		},
+		onClickForPC(index, item, position) {
+			if (!is_pc) return
+			// #ifdef H5
 			this.$emit('click', {
 				content: item,
 				index,
 				position
 			})
 			// #endif
-		}
+		}
 	}
 }
 
-// #endif
-// #ifndef APP-VUE|| MP-WEIXIN || H5
-export default {}
-// #endif
\ No newline at end of file
+// #endif
+export default mpMixins
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js
index ac50d759cdea36b2f15ebb2e4263458a6bc2ef1b..5b3fe17676a33d0c9e578a5e5c828679b59fc308 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/render.js
@@ -1,17 +1,19 @@
 const MIN_DISTANCE = 10;
 export default {
-	showWatch(newVal, oldVal, ownerInstance, instance,self) {
-		let state = self.state
-		this.getDom(instance, ownerInstance,self)
+	showWatch(newVal, oldVal, ownerInstance, instance, self) {
+		var state = self.state
+		var $el = ownerInstance.$el || ownerInstance.$vm && ownerInstance.$vm.$el
+		if (!$el) return
+		this.getDom(instance, ownerInstance, self)
 		if (newVal && newVal !== 'none') {
-			this.openState(newVal, instance, ownerInstance,self)
+			this.openState(newVal, instance, ownerInstance, self)
 			return
 		}
 
 		if (state.left) {
-			this.openState('none', instance, ownerInstance,self)
+			this.openState('none', instance, ownerInstance, self)
 		}
-		this.resetTouchStatus(instance,self)
+		this.resetTouchStatus(instance, self)
 	},
 
 	/**
@@ -46,6 +48,8 @@ export default {
 	 */
 	touchmove(e, ownerInstance, self) {
 		let instance = e.instance;
+		// 删除之后已经那不到实例了
+		if (!instance) return;
 		let disabled = instance.getDataset().disabled
 		let state = self.state
 		// fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复
@@ -111,9 +115,10 @@ export default {
 	 * @param {Object} ownerInstance
 	 */
 	getDom(instance, ownerInstance, self) {
-		let state = self.state
-		var leftDom = ownerInstance.$el.querySelector('.button-group--left')
-		var rightDom = ownerInstance.$el.querySelector('.button-group--right')
+		var state = self.state
+		var $el = ownerInstance.$el || ownerInstance.$vm && ownerInstance.$vm.$el
+		var leftDom = $el.querySelector('.button-group--left')
+		var rightDom = $el.querySelector('.button-group--right')
 
 		state.leftWidth = leftDom.offsetWidth || 0
 		state.rightWidth = rightDom.offsetWidth || 0
@@ -204,7 +209,7 @@ export default {
 
 		state.isopen = type
 		// 添加动画类
-		ins.requestAnimationFrame(()=> {
+		ins.requestAnimationFrame(() => {
 			ins.addClass('ani');
 			this.move(left, ins, ownerInstance, self)
 		})
@@ -262,4 +267,4 @@ export default {
 		state.offsetX = Math.abs(state.deltaX);
 		state.direction = state.direction || this.getDirection(state.offsetX, state.offsetY);
 	}
-}
+}
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
index 310c5e7626b4fd6cb353ec398f4ec57bb90dc337..f7ad467a869ed5502b1980172a0535c73e54f30a 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
@@ -3,127 +3,126 @@
 	<!-- #ifdef APP-VUE || MP-WEIXIN || H5 -->
 	<view class="uni-swipe">
 		<!--  #ifdef MP-WEIXIN || VUE3 -->
-		<view class="uni-swipe_box" :change:prop="wxsswipe.showWatch"
-			:prop="is_show" :data-threshold="threshold" :data-disabled="disabled" @touchstart="wxsswipe.touchstart" @touchmove="wxsswipe.touchmove" @touchend="wxsswipe.touchend">
-		<!-- #endif -->
-		<!--  #ifndef MP-WEIXIN || VUE3 -->
-		<view class="uni-swipe_box" :change:prop="renderswipe.showWatch"
-			:prop="is_show" :data-threshold="threshold" :data-disabled="disabled+''" @touchstart="renderswipe.touchstart" @touchmove="renderswipe.touchmove" @touchend="renderswipe.touchend">
+		<view class="uni-swipe_box" :change:prop="wxsswipe.showWatch" :prop="is_show" :data-threshold="threshold"
+			:data-disabled="disabled" @touchstart="wxsswipe.touchstart" @touchmove="wxsswipe.touchmove"
+			@touchend="wxsswipe.touchend">
+			<!-- #endif -->
+			<!--  #ifndef MP-WEIXIN || VUE3 -->
+			<view class="uni-swipe_box" :change:prop="renderswipe.showWatch" :prop="is_show" :data-threshold="threshold"
+				:data-disabled="disabled+''" @touchstart="renderswipe.touchstart" @touchmove="renderswipe.touchmove"
+				@touchend="renderswipe.touchend">
+				<!-- #endif -->
+				<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
+				<view class="uni-swipe_button-group button-group--left">
+					<slot name="left">
+						<view v-for="(item,index) in leftOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+							@touchend="appTouchEnd($event,index,item,'left')"
+							@click.stop="onClickForPC(index,item,'left')">
+							<text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+				<view class="uni-swipe_text--center">
+					<slot></slot>
+				</view>
+				<view class="uni-swipe_button-group button-group--right">
+					<slot name="right">
+						<view v-for="(item,index) in rightOptions" :key="index" :style="{
+					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+							@touchend="appTouchEnd($event,index,item,'right')"
+							@click.stop="onClickForPC(index,item,'right')"><text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
 		<!-- #endif -->
-			<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
-			<view class="uni-swipe_button-group button-group--left">
+		<!-- app nvue端 使用 bindingx -->
+		<!-- #ifdef APP-NVUE -->
+		<view ref="selector-box--hock" class="uni-swipe" @horizontalpan="touchstart" @touchend="touchend">
+			<view ref='selector-left-button--hock' class="uni-swipe_button-group button-group--left">
 				<slot name="left">
-					<view v-for="(item,index) in leftOptions"  :key="index" :style="{
-					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
-					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
-					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
-						@touchend="appTouchEnd($event,index,item,'left')" @click.stop="onClickForPC(index,item,'left')">
-						<text class="uni-swipe_button-text"
-							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+					<view v-for="(item,index) in leftOptions" :key="index" :style="{
+				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'left')"><text
+							class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF', fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
 					</view>
 				</slot>
 			</view>
-			<view class="uni-swipe_text--center">
-				<slot></slot>
-			</view>
-			<view class="uni-swipe_button-group button-group--right">
+			<view ref='selector-right-button--hock' class="uni-swipe_button-group button-group--right">
 				<slot name="right">
-					<view v-for="(item,index) in rightOptions"  :key="index" :style="{
-					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
-					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
-					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
-						@touchend="appTouchEnd($event,index,item,'right')"
-						@click.stop="onClickForPC(index,item,'right')"><text class="uni-swipe_button-text"
-							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+					<view v-for="(item,index) in rightOptions" :key="index" :style="{
+				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'right')"><text
+							class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
 					</view>
 				</slot>
 			</view>
+			<view ref='selector-content--hock' class="uni-swipe_box">
+				<slot></slot>
+			</view>
 		</view>
-	</view>
-	<!-- #endif -->
-	<!-- app nvue端 使用 bindingx -->
-	<!-- #ifdef APP-NVUE -->
-	<view ref="selector-box--hock" class="uni-swipe" @horizontalpan="touchstart" @touchend="touchend">
-		<view ref='selector-left-button--hock' class="uni-swipe_button-group button-group--left">
-			<slot name="left">
-				<view v-for="(item,index) in leftOptions" :data-button="btn" :key="index" :style="{
-				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
-				  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
-				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'left')"><text
-						class="uni-swipe_button-text"
-						:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
-				</view>
-			</slot>
-		</view>
-		<view ref='selector-right-button--hock' class="uni-swipe_button-group button-group--right">
-			<slot name="right">
-				<view v-for="(item,index) in rightOptions" :data-button="btn" :key="index" :style="{
-				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
-				  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
-				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'right')"><text
-						class="uni-swipe_button-text"
-						:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
-				</view>
-			</slot>
-		</view>
-		<view ref='selector-content--hock' class="uni-swipe_box">
-			<slot></slot>
-		</view>
-	</view>
-	<!-- #endif -->
-	<!-- 其他平台使用 js ，长列表性能可能会有影响-->
-	<!-- #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || MP-QQ -->
-	<view class="uni-swipe"> 
-		<view class="uni-swipe_box" @touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"
-			:style="{transform:moveLeft}" :class="{ani:ani}">
-			<view class="uni-swipe_button-group button-group--left" :class="[elClass]">
-				<slot name="left">
-					<view v-for="(item,index) in leftOptions" :data-button="btn" :key="index" :style="{
+		<!-- #endif -->
+		<!-- 其他平台使用 js ，长列表性能可能会有影响-->
+		<!-- #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || MP-QQ -->
+		<view class="uni-swipe">
+			<view class="uni-swipe_box" @touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"
+				:style="{transform:moveLeft}" :class="{ani:ani}">
+				<view class="uni-swipe_button-group button-group--left" :class="[elClass]">
+					<slot name="left">
+						<view v-for="(item,index) in leftOptions" :key="index" :style="{
 					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
 					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
 					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
-						@touchend="appTouchEnd($event,index,item,'left')"><text class="uni-swipe_button-text"
-							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
-					</view>
-				</slot>
-			</view>
-			<slot></slot>
-			<view class="uni-swipe_button-group button-group--right" :class="[elClass]">
-				<slot name="right">
-					<view v-for="(item,index) in rightOptions" :data-button="btn" :key="index" :style="{
+							@touchend="appTouchEnd($event,index,item,'left')"><text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
+				<slot></slot>
+				<view class="uni-swipe_button-group button-group--right" :class="[elClass]">
+					<slot name="right">
+						<view v-for="(item,index) in rightOptions" :key="index" :style="{
 					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
 					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
 					}" @touchstart="appTouchStart" @touchend="appTouchEnd($event,index,item,'right')"
-						class="uni-swipe_button button-hock"><text class="uni-swipe_button-text"
-							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
-					</view>
-				</slot>
+							class="uni-swipe_button button-hock"><text class="uni-swipe_button-text"
+								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
+						</view>
+					</slot>
+				</view>
 			</view>
 		</view>
-	</view>
-	<!-- #endif -->
- 
+		<!-- #endif -->
+
 </template>
 <script src="./wx.wxs" module="wxsswipe" lang="wxs"></script>
 
 <script module="renderswipe" lang="renderjs">
 	import render from './render.js'
 	export default {
-		mounted(e,ins,owner) {
+		mounted(e, ins, owner) {
 			this.state = {}
 		},
-		methods:{
-			showWatch(newVal, oldVal, ownerInstance, instance){
-				render.showWatch(newVal, oldVal, ownerInstance, instance,this)
+		methods: {
+			showWatch(newVal, oldVal, ownerInstance, instance) {
+				render.showWatch(newVal, oldVal, ownerInstance, instance, this)
 			},
-			touchstart(e,ownerInstance){
-				render.touchstart(e,ownerInstance,this)
+			touchstart(e, ownerInstance) {
+				render.touchstart(e, ownerInstance, this)
 			},
-			touchmove(e, ownerInstance){
-				render.touchmove(e,ownerInstance,this)
+			touchmove(e, ownerInstance) {
+				render.touchmove(e, ownerInstance, this)
 			},
-			touchend(e,ownerInstance){
-				render.touchend(e,ownerInstance,this)
+			touchend(e, ownerInstance) {
+				render.touchend(e, ownerInstance, this)
 			}
 		}
 	}
@@ -148,8 +147,8 @@
 	 */
 
 	export default {
-		mixins: [mpwxs,bindingx,mpother],
-		emits:['click','change'],
+		mixins: [mpwxs, bindingx, mpother],
+		emits: ['click', 'change'],
 		props: {
 			// 控制开关
 			show: {
@@ -206,7 +205,7 @@
 			this.uninstall()
 		},
 		// #endif
-		
+
 		methods: {
 			uninstall() {
 				if (this.swipeaction) {
@@ -233,7 +232,7 @@
 		}
 	}
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 	.uni-swipe {
 		position: relative;
 		/* #ifndef APP-NVUE */
diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs
index 68060321c4a8d6d77837fe2247db3c8fbe94ec24..3968d370752be30505669c4e986dac3189ec9192 100644
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/wx.wxs
@@ -338,4 +338,4 @@ module.exports = {
 	mousemove: mousemove,
 	mouseup: mouseup,
 	mouseleave: mouseleave
-}
+}
diff --git a/uni_modules/uni-swipe-action/package.json b/uni_modules/uni-swipe-action/package.json
index a69be520599bf9abbf7c9ee132aee92776ca64ce..8f4cf49ea9ef7738190153117c2a2221b0e532f1 100644
--- a/uni_modules/uni-swipe-action/package.json
+++ b/uni_modules/uni-swipe-action/package.json
@@ -1,87 +1,87 @@
 {
-  "id": "uni-swipe-action",
-  "displayName": "uni-swipe-action 滑动操作",
-  "version": "1.2.4",
-  "description": "SwipeAction 滑动操作操作组件",
-  "keywords": [
-    "",
-    "uni-ui",
-    "uniui",
-    "滑动删除",
-    "侧滑删除"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
+	"id": "uni-swipe-action",
+	"displayName": "uni-swipe-action 滑动操作",
+	"version": "1.3.7",
+	"description": "SwipeAction 滑动操作操作组件",
+	"keywords": [
+        "",
+        "uni-ui",
+        "uniui",
+        "滑动删除",
+        "侧滑删除"
     ],
-    "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": [],
-    "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"
-        },
-        "快应用": {
-          "华为": "y",
-          "联盟": "u"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "u"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
+	"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"],
+		"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"
+				},
+				"快应用": {
+					"华为": "y",
+					"联盟": "u"
+				},
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				}
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-swipe-action/readme.md b/uni_modules/uni-swipe-action/readme.md
index 3afcd26cc6efa65e40a69eb064a55a611a593f2d..93a5cac6e50bf6937b03fb82d801cea17d57d972 100644
--- a/uni_modules/uni-swipe-action/readme.md
+++ b/uni_modules/uni-swipe-action/readme.md
@@ -7,187 +7,5 @@
 
 通过滑动触发选项的容器
 
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - swipeAction的跟手联动是非常考验性能的。为了提高交互体验，本组件在 app 端 vue 页面、h5、微信小程序使用了wxs 技术，nvue 页面使用 bindingx 技术，可以达到流畅的体验。在其他小程序平台由于底层不支持优化技术，只能使用使用普通 js ，此时性能一般。
-> - `uni-swipe-action` 和 `uni-swipe-action-item` 需要同时使用
-> - `uni-swipe-action` 不能嵌套在 `swiper` 中使用 
-> - 长列表不建议使用 autoClose属性，会影响组件性能，造成卡顿，原因是打开之后要通知其他已经打开的组件关闭，会导致多个组件重新渲染
-> - 事件中传入 `$event` 获取额外参数
-> - 向下兼容，需要将 `options` 属性替换成 `right-options`
-> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-
-
-### 安装方式
-
-本组件符合[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)
-
-
-## 基本用法
-
-在 ``template`` 中的使用
-
-```html
-<uni-swipe-action>
-	<!-- 基础用法 -->
-	<uni-swipe-action-item :right-options="options" :left-options="options" @click="onClick" @change="change">
-		<view>SwipeAction 基础使用场景</view>
-	</uni-swipe-action-item>
-	<!-- 使用插槽 （请自行给定插槽内容宽度）-->
-	<uni-swipe-action-item>
-		<template v-slot:left>
-			<view><text>置顶</text></view>
-		</template>
-		<view>
-			<text >使用插槽</text>
-		</view>
-		<template v-slot:right>
-			<view><text>删除</text></view>
-		</template>
-	</uni-swipe-action-item>
-	<!-- 混合用法 -->
-	<uni-swipe-action-item :right-options="options">
-		<template v-slot:left>
-			<view><text>置顶</text></view>
-		</template>
-		<view><text>混合使用</text></view>
-	</uni-swipe-action-item>
-</uni-swipe-action>
-
-<!-- 禁止滑动 -->
-<uni-swipe-action>
-	<uni-swipe-action-item :disabled="true" :right-options="options">
-		<view>SwipeAction 基础使用场景</view>
-	</uni-swipe-action-item>
-</uni-swipe-action>
-
-<!-- 按组使用 -->
-<uni-swipe-action>
-    <uni-swipe-action-item :right-options="options"  @click="bindClick" @change="swipeChange($event, index)">
-		<view >item1</view>
-    </uni-swipe-action-item>
-    <uni-swipe-action-item :right-options="options"  @click="bindClick" @change="swipeChange($event, index)">
-		<view>item2</view>
-    </uni-swipe-action-item>
-    <uni-swipe-action-item :right-options="options"  @click="bindClick" @change="swipeChange($event, index)">
-		<view>item3</view>
-    </uni-swipe-action-item>
-</uni-swipe-action>
-
-```
-
-
-```javascript
-export default {
-  data(){
-    return {
-      options:[
-        {
-            text: '取消',
-            style: {
-                backgroundColor: '#007aff'
-            }
-        }, {
-            text: '确认',
-            style: {
-                backgroundColor: '#dd524d'
-            }
-        }
-      ]
-    }
-  },
-  methods:{
-    onClick(e){
-      console.log('点击了'+(e.position === 'left' ? '左侧' : '右侧') + e.content.text + '按钮')
-    },
-    swipeChange(e,index){
-      console.log('当前状态：'+ e +'，下标：' + index)
-    }
-  }
-}
-
-```
-
-## API
-
-### SwipeAciton Props
-
-|属性名|类型|可选值|默认值|是否必填|说明|
-|:-:|:-:|:-:|:-:|:-:|:-:|
-|show|String|left/right/none|none	|否|开启关闭组件，auto-close = false 时生效|
-|threshold|Number|-|20|否|滑动阙值|
-|disabled|Boolean|-|false|否|是否禁止滑动|
-|autoClose|Boolean|-|true|否|其他组件开启的时候，当前组件是否自动关闭，**注意：长列表使用会有性能问题**|
-|left-options|Array/Object	|-|-|否|左侧选项内容及样式|
-|right-options|Array/Object	|-|-|否|右侧选项内容及样式|
-
-#### LeftOptions & RightOptions Options
-
-|参数|类型|是否必填	|说明|
-|:-:|:-:|:-:|:-:|
-|text|String|是|按钮的文字	|
-|style|Object|否|按钮样式{backgroundColor,color,fontSize}，backgroundColor默认为：#C7C6CD，color默认为：#FFFFFF，fontSize默认为：14px	|
-
-
-
-### SwipeAction Events
-
-|事件称名	|说明|返回值|
-|:-:|:-:|:-:|
-|@click|点击选项按钮时触发事件|e = {content,index} ，content（点击内容）、index（下标）、position (位置信息)	|
-|@change|组件打开或关闭时触发|left:左侧 ，right：右侧，none：关闭|
-
-### SwipeAction Methods
-
-方法通过 ref 调用 
-
-|方法称名	|说明|
-|:-:|:-:|
-|resize()|动态添加数据后，如不能正常滑动，需要主动调用此方法，微信小程序、h5、app-vue 不生效|
-|close-all()|关闭所有已经打开的组件|
-### SwipeAction Slots
-
-|名称|说明|
-|:-:|:-:|
-|-|默认插槽自定义显示内容|
-|default|默认内容插槽|
-|left|左侧滑动内容	，会覆盖	leftOptions 内容|
-|right|右侧滑动内容	，会覆盖	rightOptions 内容|
-
-> **提示**
-> - iOS 端由于存在bounce效果，滑动体验略差，建议禁止bounce效果，禁止方式如下：
-> ```javascript
-> {
-> 	"path": "swipe-action/swipe-action",
-> 	"style": {
-> 		"navigationBarTitleText": "SwipeAction 滑动操作",
-> 		"disableScroll":true,
-> 		"app-plus":{
-> 			"bounce":"none"
-> 		}
-> 	}
-> }
-> ```
-
-
-### Q&A
-1. Q：动态加载数据，组件滑动失效是怎么回事
-- A：是因为组件会在加载的时候获取相应的节点信息数据 ，获取需要滑动的距离，所以有时候动态加载数据之后，可能是时机的问题，导致节点信息获取失败 ，那么组件就不能正常滑动。
-- A：如果是在其他页面通过 vuex 或者uni.$emit 等手段来更新其他页面 uni-swipe-action 数据 ，同样会发生不能滑动的现象，原因是页面隐藏后是不能获取到页面信息的，所以回到 uni-swipe-action 页面后，新增的组件节点信息获取肯定是错误的，所以不能滑动。
-- A：值的高兴的是在 1.2.2 版本中重构了组件滑动逻辑 ，在微信小程序、h5、app-vue 中使用了 wxs 优化滑动性能，并且不需要担心动态新增组件导致组件无法滑动的问题，节点信息在滑动时实时获取。
-- A：因为其他平台无法使用 wxs ，所以还是会出现无法滑动的问题怎么处理？1.2.2 版本提供了 resize() 方法，无法滑动时调用 resize() 方法重新渲染组件即可，调用方法时要保证节点已经渲染完毕。
-
-2. Q：运行到 nvue 下没有样式
-- A：因为 nvue 下样式默认不能使用复杂的css选择器，所以需要在 manifest.json 中配置  "nvueStyleCompiler" 属性
-	```json
-	// manifest.json
-	{
-		 "nvueStyleCompiler" : "uni-app",
-	}
-	```
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/swipe-action/swipe-action](https://hellouniapp.dcloud.net.cn/pages/extUI/swipe-action/swipe-action)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swipe-action)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-swiper-dot/changelog.md b/uni_modules/uni-swiper-dot/changelog.md
index dd6e4449a616ba85f3606991e1fcc47dd9a4aac6..ca5ef1c8e159d3a8fbeb4b0ed23bbec40d2d1b0e 100644
--- a/uni_modules/uni-swiper-dot/changelog.md
+++ b/uni_modules/uni-swiper-dot/changelog.md
@@ -1,5 +1,8 @@
-## 1.1.0（2021-07-30）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.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-swiper-dot](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.0.6（2021-05-12）
 - 新增 示例地址
 - 修复 示例项目缺少组件的Bug
diff --git a/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
index 79c0816fc46db201e8253016db77a25f25ba04d3..c0725a4ae7b38fe30584e0523f7a394142205b44 100644
--- a/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
+++ b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
@@ -3,7 +3,7 @@
 		<slot />
 		<view v-if="mode === 'default'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='default'>
 			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
-        'width': (index === current? dots.width*2:dots.width ) + 'px','height':dots.width/3 +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border-radius':'0px'}"
+        'width': (index === current? dots.width*2:dots.width ) + 'px','height':dots.width/2 +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border-radius':'0px'}"
 			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-bar" />
 		</view>
 		<view v-if="mode === 'dot'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='dot'>
@@ -79,8 +79,8 @@
 		data() {
 			return {
 				dots: {
-					width: 8,
-					height: 8,
+					width: 6,
+					height: 6,
 					bottom: 10,
 					color: '#fff',
 					backgroundColor: 'rgba(0, 0, 0, .3)',
@@ -96,19 +96,19 @@
 			},
 			mode(newVal) {
 				if (newVal === 'indexes') {
-					this.dots.width = 20
-					this.dots.height = 20
+					this.dots.width = 14
+					this.dots.height = 14
 				} else {
-					this.dots.width = 8
-					this.dots.height = 8
+					this.dots.width = 6
+					this.dots.height = 6
 				}
 			}
 
 		},
 		created() {
 			if (this.mode === 'indexes') {
-				this.dots.width = 20
-				this.dots.height = 20
+				this.dots.width = 12
+				this.dots.height = 12
 			}
 			this.dots = Object.assign(this.dots, this.dotsStyles)
 		},
@@ -149,7 +149,7 @@
 		width: 8px;
 		border-radius: 100px;
 		margin-left: 6px;
-		background-color: $uni-bg-color-mask;
+		background-color: rgba(0, 0, 0, 0.4);
 		/* #ifndef APP-NVUE */
 		cursor: pointer;
 		/* #endif */
@@ -180,7 +180,8 @@
 
 	.uni-swiper__dots-nav {
 		bottom: 0px;
-		height: 40px;
+		// height: 26px;
+		padding: 8px 0;
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
@@ -195,7 +196,7 @@
 		/* overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap; */
-		font-size: $uni-font-size-base;
+		font-size: 14px;
 		color: #fff;
 		margin: 0 15px;
 	}
@@ -211,6 +212,7 @@
 
 	.uni-swiper__dots-indexes-text {
 		color: #fff;
-		font-size: $uni-font-size-sm;
+		font-size: 12px;
+		line-height: 14px;
 	}
 </style>
diff --git a/uni_modules/uni-swiper-dot/package.json b/uni_modules/uni-swiper-dot/package.json
index 31393d778ce2e3ca2c4db5f4d08f257964d07dc4..b9b126a57d1b16a92399be8770c13787fdb3af06 100644
--- a/uni_modules/uni-swiper-dot/package.json
+++ b/uni_modules/uni-swiper-dot/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-swiper-dot",
   "displayName": "uni-swiper-dot 轮播图指示点",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "自定义轮播图指示点组件",
   "keywords": [
     "uni-ui",
@@ -41,7 +41,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": ["uni-scss"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -76,6 +76,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-swiper-dot/readme.md b/uni_modules/uni-swiper-dot/readme.md
index 5ccfab8f9a24b98e22b439e4027230216e90ea6d..7d397e2cc6b0c6cfecd1250ea8c08611885f6846 100644
--- a/uni_modules/uni-swiper-dot/readme.md
+++ b/uni_modules/uni-swiper-dot/readme.md
@@ -7,85 +7,5 @@
 
 自定义轮播图指示点
 
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 本组件依赖 `swiper` 组件,请与`swiper`组件配合使用
-> - `width` 与 `height` 如非必要，请勿设置过大，或者过小
-> - `swiper-item` 尽量控制在一定数量之内，否则指示点可能会超出屏幕
-> - 暂不支持垂直方向的指示点
-
-
-### 安装方式
-
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中的使用
-
-```html
-<uni-swiper-dot :info="info" :current="current" field="content" :mode="mode">
-	<swiper class="swiper-box" @change="change">
-		<swiper-item v-for="(item ,index) in info" :key="index">
-			<view class="swiper-item">
-				{{item.content}}
-			</view>
-		</swiper-item>
-	</swiper>
-</uni-swiper-dot>
-```
-
-```javascript
-export default {
-	data() {
-		return {
-			info: [{
-				content: '内容 A'
-			}, {
-				content: '内容 B'
-			}, {
-				content: '内容 C'
-			}],
-			current: 0,
-			mode: 'round',
-		}
-	},
-	methods: {
-		change(e) {
-			this.current = e.detail.current;
-		}
-	}
-}
-```
-
-## API
-
-### SwiperDod Props
-
-|属性名		|类型	|默认值	|说明																			|
-|:-:		|:-:	|:-:	|:-:																			|
-|current	|Number	|0		|当前指示点索引，必须是通过 `swiper` 的 `change` 事件获取到的 `e.detail.current`|
-|mode		|String	|default|指示点的类型，可选值：default 、round 、nav	 、 indexes 						|
-|field		|String	|-		| mode 为 nav 时，显示的内容字段（mode = nav 时必填）							|
-|info		|Array	|-		|轮播图的数据，通过数组长度决定指示点个数										|
-|dotsStyles	|Object	|-		|指示点样式																	|
-
-#### dotsStyles Options
-
-|属性名					|类型	|默认值							|说明														|
-|:-:					|:-:	|:-:							|:-:														|
-|width					|Number	| 8								|指示点宽度 **在 mode = nav、mode = indexes 时不生效**		|
-|bottom					|Number	| 10							|指示点距 `swiper` 底部的高度								|
-|color					|Color	| '#fff'						|指示点前景色，**只在 mode = nav ，mode = indexes 时生效**	|
-|backgroundColor		|Color	| 'rgba(0, 0, 0, .3)'			|未选择指示点背景色											|
-|border					|Border	| '1px rgba(0, 0, 0, .3) solid'	|未选择指示点边框样式										|
-|selectedBackgroundColor|Color	| '#333'						|已选择指示点背景色，**在 mode = nav 时不生效**				|
-|selectedBorder			|Border	| '1px rgba(0, 0, 0, .9) solid'	|已选择指示点边框样式，**在 mode = nav 时不生效**			|
-
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/swiper-dot/swiper-dot](https://hellouniapp.dcloud.net.cn/pages/extUI/swiper-dot/swiper-dot)
\ No newline at end of file
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-table/changelog.md b/uni_modules/uni-table/changelog.md
index d8743f25565da79362ba0fc9342c80e176f760f6..8233b20f171fdc8f069b3be8b99a7ad55d45388a 100644
--- a/uni_modules/uni-table/changelog.md
+++ b/uni_modules/uni-table/changelog.md
@@ -1,18 +1,23 @@
+## 1.2.1（2022-06-06）
+- 修复 微信小程序存在无使用组件的问题
+## 1.2.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-table](https://uniapp.dcloud.io/component/uniui/uni-table)
 ## 1.1.0（2021-07-30）
 - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 1.0.7（2021-07-08）
-- 新增 uni-th 支持 date 日期筛选范围
-## 1.0.6（2021-07-05）
-- 新增 uni-th 支持 range 筛选范围
-## 1.0.5（2021-06-28）
-- 新增 uni-th 筛选功能
-## 1.0.4（2021-05-12）
-- 新增 示例地址
-- 修复 示例项目缺少组件的Bug
-## 1.0.3（2021-04-16）
-- 新增 sortable 属性，是否开启单列排序
-- 优化 表格多选逻辑
-## 1.0.2（2021-03-22）
-- uni-tr 添加 disabled 属性，用于 type=selection 时，设置某行是否可由全选按钮控制
-## 1.0.1（2021-02-05）
-- 调整为uni_modules目录规范
+## 1.0.7（2021-07-08）
+- 新增 uni-th 支持 date 日期筛选范围
+## 1.0.6（2021-07-05）
+- 新增 uni-th 支持 range 筛选范围
+## 1.0.5（2021-06-28）
+- 新增 uni-th 筛选功能
+## 1.0.4（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
+## 1.0.3（2021-04-16）
+- 新增 sortable 属性，是否开启单列排序
+- 优化 表格多选逻辑
+## 1.0.2（2021-03-22）
+- uni-tr 添加 disabled 属性，用于 type=selection 时，设置某行是否可由全选按钮控制
+## 1.0.1（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-table/components/uni-th/filter-dropdown.vue b/uni_modules/uni-table/components/uni-th/filter-dropdown.vue
index 0045f965e444412dc7b80809efa332c05da6b157..bc9a0e3b0b9ed23e7299115b678b2a69c23c0ec8 100644
--- a/uni_modules/uni-table/components/uni-th/filter-dropdown.vue
+++ b/uni_modules/uni-table/components/uni-th/filter-dropdown.vue
@@ -1,503 +1,503 @@
-<template>
-	<view class="uni-filter-dropdown">
-		<view class="dropdown-btn" @click="onDropdown">
-			<view class="icon-select" :class="{active: canReset}" v-if="isSelect || isRange"></view>
-			<view class="icon-search" :class="{active: canReset}" v-if="isSearch">
-				<view class="icon-search-0"></view>
-				<view class="icon-search-1"></view>
-			</view>
-			<view class="icon-calendar" :class="{active: canReset}" v-if="isDate">
-				<view class="icon-calendar-0"></view>
-				<view class="icon-calendar-1"></view>
-			</view>
-		</view>
-		<view class="uni-dropdown-cover" v-if="isOpened" @click="handleClose"></view>
-		<view class="dropdown-popup dropdown-popup-right" v-if="isOpened" @click.stop>
-			<!-- select-->
-			<view v-if="isSelect" class="list">
-				<label class="flex-r a-i-c list-item" v-for="(item,index) in dataList" :key="index"
-					@click="onItemClick($event, index)">
-					<check-box class="check" :checked="item.checked" />
-					<view class="checklist-content">
-						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
-					</view>
-				</label>
-			</view>
-			<view v-if="isSelect" class="flex-r opera-area">
-				<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleSelectReset">
-					{{resource.reset}}</view>
-				<view class="flex-f btn btn-submit" @click="handleSelectSubmit">{{resource.submit}}</view>
-			</view>
-			<!-- search -->
-			<view v-if="isSearch" class="search-area">
-				<input class="search-input" v-model="filterValue" />
-			</view>
-			<view v-if="isSearch" class="flex-r opera-area">
-				<view class="flex-f btn btn-submit" @click="handleSearchSubmit">{{resource.search}}</view>
-				<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleSearchReset">
-					{{resource.reset}}</view>
-			</view>
-			<!-- range -->
-			<view v-if="isRange">
-				<view class="input-label">{{resource.gt}}</view>
-				<input class="input" v-model="gtValue" />
-				<view class="input-label">{{resource.lt}}</view>
-				<input class="input" v-model="ltValue" />
-			</view>
-			<view v-if="isRange" class="flex-r opera-area">
-				<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleRangeReset">
-					{{resource.reset}}</view>
-				<view class="flex-f btn btn-submit" @click="handleRangeSubmit">{{resource.submit}}</view>
-			</view>
-			<!-- date -->
-			<view v-if="isDate">
-				<uni-datetime-picker ref="datetimepicker" :value="dateRange" type="datetimerange" return-type="timestamp" @change="datetimechange" @maskClick="timepickerclose">
-					<view></view>
-				</uni-datetime-picker>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import checkBox from '../uni-tr/table-checkbox.vue'
-
-	const resource = {
-		"reset": "重置",
-		"search": "搜索",
-		"submit": "确定",
-		"filter": "筛选",
-		"gt": "大于等于",
-		"lt": "小于等于",
-		"date": "日期范围"
-	}
-
-	const DropdownType = {
-		Select: "select",
-		Search: "search",
-		Range: "range",
-		Date: "date",
-		Timestamp: "timestamp"
-	}
-
-	export default {
-		name: 'FilterDropdown',
-		emits:['change'],
-		components: {
-			checkBox
-		},
-		options: {
-			virtualHost: true
-		},
-		props: {
-			filterType: {
-				type: String,
-				default: DropdownType.Select
-			},
-			filterData: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			mode: {
-				type: String,
-				default: 'default'
-			},
-			map: {
-				type: Object,
-				default () {
-					return {
-						text: 'text',
-						value: 'value'
-					}
-				}
-			}
-		},
-		computed: {
-			canReset() {
-				if (this.isSearch) {
-					return this.filterValue.length > 0
-				}
-				if (this.isSelect) {
-					return this.checkedValues.length > 0
-				}
-				if (this.isRange) {
-					return (this.gtValue.length > 0 && this.ltValue.length > 0)
-				}
-				if (this.isDate) {
-					return this.dateSelect.length > 0
-				}
-				return false
-			},
-			isSelect() {
-				return this.filterType === DropdownType.Select
-			},
-			isSearch() {
-				return this.filterType === DropdownType.Search
-			},
-			isRange() {
-				return this.filterType === DropdownType.Range
-			},
-			isDate() {
-				return (this.filterType === DropdownType.Date || this.filterType === DropdownType.Timestamp)
-			}
-		},
-		watch: {
-			filters(newVal) {
-				this._copyFilters()
-			},
-			indeterminate(newVal) {
-				this.isIndeterminate = newVal
-			}
-		},
-		data() {
-			return {
-				resource,
-				enabled: true,
-				isOpened: false,
-				dataList: [],
-				filterValue: '',
-				checkedValues: [],
-				gtValue: '',
-				ltValue: '',
-				dateRange: [],
-				dateSelect: []
-			};
-		},
-		created() {
-			this._copyFilters()
-		},
-		methods: {
-			_copyFilters() {
-				let dl = JSON.parse(JSON.stringify(this.filterData))
-				for (let i = 0; i < dl.length; i++) {
-					if (dl[i].checked === undefined) {
-						dl[i].checked = false
-					}
-				}
-				this.dataList = dl
-			},
-			openPopup() {
-				this.isOpened = true
-				if (this.isDate) {
-					this.$nextTick(() => {
-						if (!this.dateRange.length) {
-							this.resetDate()
-						}
-						this.$refs.datetimepicker.show()
-					})
-				}
-			},
-			closePopup() {
-				this.isOpened = false
-			},
-			handleClose(e) {
-				this.closePopup()
-			},
-			resetDate() {
-				let date = new Date()
-				let dateText = date.toISOString().split('T')[0]
-				this.dateRange = [dateText + ' 0:00:00', dateText + ' 23:59:59']
-			},
-			onDropdown(e) {
-				this.openPopup()
-			},
-			onItemClick(e, index) {
-				let items = this.dataList
-				let listItem = items[index]
-				if (listItem.checked === undefined) {
-					items[index].checked = true
-				} else {
-					items[index].checked = !listItem.checked
-				}
-
-				let checkvalues = []
-				for (let i = 0; i < items.length; i++) {
-					const item = items[i]
-					if (item.checked) {
-						checkvalues.push(item.value)
-					}
-				}
-				this.checkedValues = checkvalues
-			},
-			datetimechange(e) {
-				this.closePopup()
-				this.dateRange = e
-				this.dateSelect = e
-				this.$emit('change', {
-					filterType: this.filterType,
-					filter: e
-				})
-			},
-			timepickerclose(e) {
-				this.closePopup()
-			},
-			handleSelectSubmit() {
-				this.closePopup()
-				this.$emit('change', {
-					filterType: this.filterType,
-					filter: this.checkedValues
-				})
-			},
-			handleSelectReset() {
-				if (!this.canReset) {
-					return;
-				}
-				var items = this.dataList
-				for (let i = 0; i < items.length; i++) {
-					let item = items[i]
-					this.$set(item, 'checked', false)
-				}
-				this.checkedValues = []
-				this.handleSelectSubmit()
-			},
-			handleSearchSubmit() {
-				this.closePopup()
-				this.$emit('change', {
-					filterType: this.filterType,
-					filter: this.filterValue
-				})
-			},
-			handleSearchReset() {
-				if (!this.canReset) {
-					return;
-				}
-				this.filterValue = ''
-				this.handleSearchSubmit()
-			},
-			handleRangeSubmit(isReset) {
-				this.closePopup()
-				this.$emit('change', {
-					filterType: this.filterType,
-					filter: isReset === true ? [] : [parseInt(this.gtValue), parseInt(this.ltValue)]
-				})
-			},
-			handleRangeReset() {
-				if (!this.canReset) {
-					return;
-				}
-				this.gtValue = ''
-				this.ltValue = ''
-				this.handleRangeSubmit(true)
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.flex-r {
-		display: flex;
-		flex-direction: row;
-	}
-
-	.flex-f {
-		flex: 1;
-	}
-
-	.a-i-c {
-		align-items: center;
-	}
-
-	.j-c-c {
-		justify-content: center;
-	}
-
-	.icon-select {
-		width: 14px;
-		height: 16px;
-		border: solid 6px transparent;
-		border-top: solid 6px #ddd;
-		border-bottom: none;
-		background-color: #ddd;
-		background-clip: content-box;
-		box-sizing: border-box;
-	}
-
-	.icon-select.active {
-		background-color: #1890ff;
-		border-top-color: #1890ff;
-	}
-
-	.icon-search {
-		width: 12px;
-		height: 16px;
-		position: relative;
-	}
-
-	.icon-search-0 {
-		border: 2px solid #ddd;
-		border-radius: 8px;
-		width: 7px;
-		height: 7px;
-	}
-
-	.icon-search-1 {
-		position: absolute;
-		top: 8px;
-		right: 0;
-		width: 1px;
-		height: 7px;
-		background-color: #ddd;
-		transform: rotate(-45deg);
-	}
-
-	.icon-search.active .icon-search-0 {
-		border-color: #1890ff;
-	}
-
-	.icon-search.active .icon-search-1 {
-		background-color: #1890ff;
-	}
-
-	.icon-calendar {
-		color: #ddd;
-		width: 14px;
-		height: 16px;
-	}
-
-	.icon-calendar-0 {
-		height: 4px;
-		margin-top: 3px;
-		margin-bottom: 1px;
-		background-color: #ddd;
-		border-radius: 2px 2px 1px 1px;
-		position: relative;
-	}
-	.icon-calendar-0:before, .icon-calendar-0:after {
-		content: '';
-		position: absolute;
-		top: -3px;
-		width: 4px;
-		height: 3px;
-		border-radius: 1px;
-		background-color: #ddd;
-	}
-	.icon-calendar-0:before {
-		left: 2px;
-	}
-	.icon-calendar-0:after {
-		right: 2px;
-	}
-
-	.icon-calendar-1 {
-		height: 9px;
-		background-color: #ddd;
-		border-radius: 1px 1px 2px 2px;
-	}
-
-	.icon-calendar.active {
-		color: #1890ff;
-	}
-
-	.icon-calendar.active .icon-calendar-0,
-	.icon-calendar.active .icon-calendar-1,
-	.icon-calendar.active .icon-calendar-0:before,
-	.icon-calendar.active .icon-calendar-0:after {
-		background-color: #1890ff;
-	}
-
-	.uni-filter-dropdown {
-		position: relative;
-		font-weight: normal;
-	}
-
-	.dropdown-popup {
-		position: absolute;
-		top: 100%;
-		background-color: #fff;
-		box-shadow: 0 3px 6px -4px #0000001f, 0 6px 16px #00000014, 0 9px 28px 8px #0000000d;
-		min-width: 150px;
-		z-index: 1000;
-	}
-
-	.dropdown-popup-left {
-		left: 0;
-	}
-
-	.dropdown-popup-right {
-		right: 0;
-	}
-
-	.uni-dropdown-cover {
-		position: fixed;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		background-color: transparent;
-		z-index: 100;
-	}
-
-	.list {
-		margin-top: 5px;
-		margin-bottom: 5px;
-	}
-
-	.list-item {
-		padding: 5px 10px;
-		text-align: left;
-	}
-
-	.list-item:hover {
-		background-color: #f0f0f0;
-	}
-
-	.check {
-		margin-right: 5px;
-	}
-
-	.search-area {
-		padding: 10px;
-	}
-
-	.search-input {
-		font-size: 12px;
-		border: 1px solid #f0f0f0;
-		border-radius: 3px;
-		padding: 2px 5px;
-		min-width: 150px;
-		text-align: left;
-	}
-
-	.input-label {
-		margin: 10px 10px 5px 10px;
-		text-align: left;
-	}
-
-	.input {
-		font-size: 12px;
-		border: 1px solid #f0f0f0;
-		border-radius: 3px;
-		margin: 10px;
-		padding: 2px 5px;
-		min-width: 150px;
-		text-align: left;
-	}
-
-	.opera-area {
-		cursor: default;
-		border-top: 1px solid #ddd;
-		padding: 5px;
-	}
-
-	.opera-area .btn {
-		font-size: 12px;
-		border-radius: 3px;
-		margin: 5px;
-		padding: 4px 4px;
-	}
-
-	.btn-default {
-		border: 1px solid #ddd;
-	}
-
-	.btn-default.disable {
-		border-color: transparent;
-	}
-
-	.btn-submit {
-		background-color: #1890ff;
-		color: #ffffff;
-	}
-</style>
+<template>
+	<view class="uni-filter-dropdown">
+		<view class="dropdown-btn" @click="onDropdown">
+			<view class="icon-select" :class="{active: canReset}" v-if="isSelect || isRange"></view>
+			<view class="icon-search" :class="{active: canReset}" v-if="isSearch">
+				<view class="icon-search-0"></view>
+				<view class="icon-search-1"></view>
+			</view>
+			<view class="icon-calendar" :class="{active: canReset}" v-if="isDate">
+				<view class="icon-calendar-0"></view>
+				<view class="icon-calendar-1"></view>
+			</view>
+		</view>
+		<view class="uni-dropdown-cover" v-if="isOpened" @click="handleClose"></view>
+		<view class="dropdown-popup dropdown-popup-right" v-if="isOpened" @click.stop>
+			<!-- select-->
+			<view v-if="isSelect" class="list">
+				<label class="flex-r a-i-c list-item" v-for="(item,index) in dataList" :key="index"
+					@click="onItemClick($event, index)">
+					<check-box class="check" :checked="item.checked" />
+					<view class="checklist-content">
+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
+					</view>
+				</label>
+			</view>
+			<view v-if="isSelect" class="flex-r opera-area">
+				<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleSelectReset">
+					{{resource.reset}}</view>
+				<view class="flex-f btn btn-submit" @click="handleSelectSubmit">{{resource.submit}}</view>
+			</view>
+			<!-- search -->
+			<view v-if="isSearch" class="search-area">
+				<input class="search-input" v-model="filterValue" />
+			</view>
+			<view v-if="isSearch" class="flex-r opera-area">
+				<view class="flex-f btn btn-submit" @click="handleSearchSubmit">{{resource.search}}</view>
+				<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleSearchReset">
+					{{resource.reset}}</view>
+			</view>
+			<!-- range -->
+			<view v-if="isRange">
+				<view class="input-label">{{resource.gt}}</view>
+				<input class="input" v-model="gtValue" />
+				<view class="input-label">{{resource.lt}}</view>
+				<input class="input" v-model="ltValue" />
+			</view>
+			<view v-if="isRange" class="flex-r opera-area">
+				<view class="flex-f btn btn-default" :class="{disable: !canReset}" @click="handleRangeReset">
+					{{resource.reset}}</view>
+				<view class="flex-f btn btn-submit" @click="handleRangeSubmit">{{resource.submit}}</view>
+			</view>
+			<!-- date -->
+			<view v-if="isDate">
+				<uni-datetime-picker ref="datetimepicker" :value="dateRange" type="datetimerange" return-type="timestamp" @change="datetimechange" @maskClick="timepickerclose">
+					<view></view>
+				</uni-datetime-picker>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import checkBox from '../uni-tr/table-checkbox.vue'
+
+	const resource = {
+		"reset": "重置",
+		"search": "搜索",
+		"submit": "确定",
+		"filter": "筛选",
+		"gt": "大于等于",
+		"lt": "小于等于",
+		"date": "日期范围"
+	}
+
+	const DropdownType = {
+		Select: "select",
+		Search: "search",
+		Range: "range",
+		Date: "date",
+		Timestamp: "timestamp"
+	}
+
+	export default {
+		name: 'FilterDropdown',
+		emits:['change'],
+		components: {
+			checkBox
+		},
+		options: {
+			virtualHost: true
+		},
+		props: {
+			filterType: {
+				type: String,
+				default: DropdownType.Select
+			},
+			filterData: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			mode: {
+				type: String,
+				default: 'default'
+			},
+			map: {
+				type: Object,
+				default () {
+					return {
+						text: 'text',
+						value: 'value'
+					}
+				}
+			}
+		},
+		computed: {
+			canReset() {
+				if (this.isSearch) {
+					return this.filterValue.length > 0
+				}
+				if (this.isSelect) {
+					return this.checkedValues.length > 0
+				}
+				if (this.isRange) {
+					return (this.gtValue.length > 0 && this.ltValue.length > 0)
+				}
+				if (this.isDate) {
+					return this.dateSelect.length > 0
+				}
+				return false
+			},
+			isSelect() {
+				return this.filterType === DropdownType.Select
+			},
+			isSearch() {
+				return this.filterType === DropdownType.Search
+			},
+			isRange() {
+				return this.filterType === DropdownType.Range
+			},
+			isDate() {
+				return (this.filterType === DropdownType.Date || this.filterType === DropdownType.Timestamp)
+			}
+		},
+		watch: {
+			filterData(newVal) {
+				this._copyFilters()
+			},
+			indeterminate(newVal) {
+				this.isIndeterminate = newVal
+			}
+		},
+		data() {
+			return {
+				resource,
+				enabled: true,
+				isOpened: false,
+				dataList: [],
+				filterValue: '',
+				checkedValues: [],
+				gtValue: '',
+				ltValue: '',
+				dateRange: [],
+				dateSelect: []
+			};
+		},
+		created() {
+			this._copyFilters()
+		},
+		methods: {
+			_copyFilters() {
+				let dl = JSON.parse(JSON.stringify(this.filterData))
+				for (let i = 0; i < dl.length; i++) {
+					if (dl[i].checked === undefined) {
+						dl[i].checked = false
+					}
+				}
+				this.dataList = dl
+			},
+			openPopup() {
+				this.isOpened = true
+				if (this.isDate) {
+					this.$nextTick(() => {
+						if (!this.dateRange.length) {
+							this.resetDate()
+						}
+						this.$refs.datetimepicker.show()
+					})
+				}
+			},
+			closePopup() {
+				this.isOpened = false
+			},
+			handleClose(e) {
+				this.closePopup()
+			},
+			resetDate() {
+				let date = new Date()
+				let dateText = date.toISOString().split('T')[0]
+				this.dateRange = [dateText + ' 0:00:00', dateText + ' 23:59:59']
+			},
+			onDropdown(e) {
+				this.openPopup()
+			},
+			onItemClick(e, index) {
+				let items = this.dataList
+				let listItem = items[index]
+				if (listItem.checked === undefined) {
+					items[index].checked = true
+				} else {
+					items[index].checked = !listItem.checked
+				}
+
+				let checkvalues = []
+				for (let i = 0; i < items.length; i++) {
+					const item = items[i]
+					if (item.checked) {
+						checkvalues.push(item.value)
+					}
+				}
+				this.checkedValues = checkvalues
+			},
+			datetimechange(e) {
+				this.closePopup()
+				this.dateRange = e
+				this.dateSelect = e
+				this.$emit('change', {
+					filterType: this.filterType,
+					filter: e
+				})
+			},
+			timepickerclose(e) {
+				this.closePopup()
+			},
+			handleSelectSubmit() {
+				this.closePopup()
+				this.$emit('change', {
+					filterType: this.filterType,
+					filter: this.checkedValues
+				})
+			},
+			handleSelectReset() {
+				if (!this.canReset) {
+					return;
+				}
+				var items = this.dataList
+				for (let i = 0; i < items.length; i++) {
+					let item = items[i]
+					this.$set(item, 'checked', false)
+				}
+				this.checkedValues = []
+				this.handleSelectSubmit()
+			},
+			handleSearchSubmit() {
+				this.closePopup()
+				this.$emit('change', {
+					filterType: this.filterType,
+					filter: this.filterValue
+				})
+			},
+			handleSearchReset() {
+				if (!this.canReset) {
+					return;
+				}
+				this.filterValue = ''
+				this.handleSearchSubmit()
+			},
+			handleRangeSubmit(isReset) {
+				this.closePopup()
+				this.$emit('change', {
+					filterType: this.filterType,
+					filter: isReset === true ? [] : [parseInt(this.gtValue), parseInt(this.ltValue)]
+				})
+			},
+			handleRangeReset() {
+				if (!this.canReset) {
+					return;
+				}
+				this.gtValue = ''
+				this.ltValue = ''
+				this.handleRangeSubmit(true)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.flex-r {
+		display: flex;
+		flex-direction: row;
+	}
+
+	.flex-f {
+		flex: 1;
+	}
+
+	.a-i-c {
+		align-items: center;
+	}
+
+	.j-c-c {
+		justify-content: center;
+	}
+
+	.icon-select {
+		width: 14px;
+		height: 16px;
+		border: solid 6px transparent;
+		border-top: solid 6px #ddd;
+		border-bottom: none;
+		background-color: #ddd;
+		background-clip: content-box;
+		box-sizing: border-box;
+	}
+
+	.icon-select.active {
+		background-color: #1890ff;
+		border-top-color: #1890ff;
+	}
+
+	.icon-search {
+		width: 12px;
+		height: 16px;
+		position: relative;
+	}
+
+	.icon-search-0 {
+		border: 2px solid #ddd;
+		border-radius: 8px;
+		width: 7px;
+		height: 7px;
+	}
+
+	.icon-search-1 {
+		position: absolute;
+		top: 8px;
+		right: 0;
+		width: 1px;
+		height: 7px;
+		background-color: #ddd;
+		transform: rotate(-45deg);
+	}
+
+	.icon-search.active .icon-search-0 {
+		border-color: #1890ff;
+	}
+
+	.icon-search.active .icon-search-1 {
+		background-color: #1890ff;
+	}
+
+	.icon-calendar {
+		color: #ddd;
+		width: 14px;
+		height: 16px;
+	}
+
+	.icon-calendar-0 {
+		height: 4px;
+		margin-top: 3px;
+		margin-bottom: 1px;
+		background-color: #ddd;
+		border-radius: 2px 2px 1px 1px;
+		position: relative;
+	}
+	.icon-calendar-0:before, .icon-calendar-0:after {
+		content: '';
+		position: absolute;
+		top: -3px;
+		width: 4px;
+		height: 3px;
+		border-radius: 1px;
+		background-color: #ddd;
+	}
+	.icon-calendar-0:before {
+		left: 2px;
+	}
+	.icon-calendar-0:after {
+		right: 2px;
+	}
+
+	.icon-calendar-1 {
+		height: 9px;
+		background-color: #ddd;
+		border-radius: 1px 1px 2px 2px;
+	}
+
+	.icon-calendar.active {
+		color: #1890ff;
+	}
+
+	.icon-calendar.active .icon-calendar-0,
+	.icon-calendar.active .icon-calendar-1,
+	.icon-calendar.active .icon-calendar-0:before,
+	.icon-calendar.active .icon-calendar-0:after {
+		background-color: #1890ff;
+	}
+
+	.uni-filter-dropdown {
+		position: relative;
+		font-weight: normal;
+	}
+
+	.dropdown-popup {
+		position: absolute;
+		top: 100%;
+		background-color: #fff;
+		box-shadow: 0 3px 6px -4px #0000001f, 0 6px 16px #00000014, 0 9px 28px 8px #0000000d;
+		min-width: 150px;
+		z-index: 1000;
+	}
+
+	.dropdown-popup-left {
+		left: 0;
+	}
+
+	.dropdown-popup-right {
+		right: 0;
+	}
+
+	.uni-dropdown-cover {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: transparent;
+		z-index: 100;
+	}
+
+	.list {
+		margin-top: 5px;
+		margin-bottom: 5px;
+	}
+
+	.list-item {
+		padding: 5px 10px;
+		text-align: left;
+	}
+
+	.list-item:hover {
+		background-color: #f0f0f0;
+	}
+
+	.check {
+		margin-right: 5px;
+	}
+
+	.search-area {
+		padding: 10px;
+	}
+
+	.search-input {
+		font-size: 12px;
+		border: 1px solid #f0f0f0;
+		border-radius: 3px;
+		padding: 2px 5px;
+		min-width: 150px;
+		text-align: left;
+	}
+
+	.input-label {
+		margin: 10px 10px 5px 10px;
+		text-align: left;
+	}
+
+	.input {
+		font-size: 12px;
+		border: 1px solid #f0f0f0;
+		border-radius: 3px;
+		margin: 10px;
+		padding: 2px 5px;
+		min-width: 150px;
+		text-align: left;
+	}
+
+	.opera-area {
+		cursor: default;
+		border-top: 1px solid #ddd;
+		padding: 5px;
+	}
+
+	.opera-area .btn {
+		font-size: 12px;
+		border-radius: 3px;
+		margin: 5px;
+		padding: 4px 4px;
+	}
+
+	.btn-default {
+		border: 1px solid #ddd;
+	}
+
+	.btn-default.disable {
+		border-color: transparent;
+	}
+
+	.btn-submit {
+		background-color: #1890ff;
+		color: #ffffff;
+	}
+</style>
diff --git a/uni_modules/uni-table/components/uni-th/uni-th.vue b/uni_modules/uni-table/components/uni-th/uni-th.vue
index d87f1e821ae34e945ec7e2064959cfae3f60613a..121e13cb3abed2652b6c28cb7e402e3fbca06c3d 100644
--- a/uni_modules/uni-table/components/uni-th/uni-th.vue
+++ b/uni_modules/uni-table/components/uni-th/uni-th.vue
@@ -1,6 +1,6 @@
 <template>
 	<!-- #ifdef H5 -->
-	<th :rowspan="rowspan" :colspan="colspan" class="uni-table-th" :class="{ 'table--border': border }" :style="{ width: width + 'px', 'text-align': align }">
+	<th :rowspan="rowspan" :colspan="colspan" class="uni-table-th" :class="{ 'table--border': border }" :style="{ width: customWidth + 'px', 'text-align': align }">
 		<view class="uni-table-th-row">
 			<view class="uni-table-th-content" :style="{ 'justify-content': contentAlign }" @click="sort">
 				<slot></slot>
@@ -14,17 +14,19 @@
 	</th>
 	<!-- #endif -->
 	<!-- #ifndef H5 -->
-	<view class="uni-table-th" :class="{ 'table--border': border }" :style="{ width: width + 'px', 'text-align': align }"><slot></slot></view>
+	<view class="uni-table-th" :class="{ 'table--border': border }" :style="{ width: customWidth + 'px', 'text-align': align }"><slot></slot></view>
 	<!-- #endif -->
 </template>
 
 <script>
-	import dropdown from './filter-dropdown.vue'
+	// #ifdef H5
+	import dropdown from './filter-dropdown.vue'
+	// #endif
 /**
  * Th 表头
  * @description 表格内的表头单元格组件
  * @tutorial https://ext.dcloud.net.cn/plugin?id=3270
- * @property {Number} 	width 						单元格宽度
+ * @property {Number | String} 	width 	单元格宽度（支持纯数字、携带单位px或rpx）
  * @property {Boolean} 	sortable 					是否启用排序
  * @property {Number} 	align = [left|center|right]	单元格对齐方式
  * @value left   	单元格文字左侧对齐
@@ -42,7 +44,9 @@ export default {
 		virtualHost: true
 	},
 	components: {
+		// #ifdef H5
 		dropdown
+		// #endif
 	},
 	emits:['sort-change','filter-change'],
 	props: {
@@ -84,7 +88,30 @@ export default {
 			descending: false
 		}
 	},
-	computed: {
+	computed: {
+		// 根据props中的width属性 自动匹配当前th的宽度(px)
+		customWidth(){
+			if(typeof this.width === 'number'){
+				return this.width
+			} else if(typeof this.width === 'string') {
+				let regexHaveUnitPx = new RegExp(/^[1-9][0-9]*px$/g)
+				let regexHaveUnitRpx = new RegExp(/^[1-9][0-9]*rpx$/g)
+				let regexHaveNotUnit = new RegExp(/^[1-9][0-9]*$/g)
+				if (this.width.match(regexHaveUnitPx) !== null) { // 携带了 px
+					return this.width.replace('px', '')
+				} else if (this.width.match(regexHaveUnitRpx) !== null) { // 携带了 rpx
+					let numberRpx = Number(this.width.replace('rpx', ''))
+					let widthCoe = uni.getSystemInfoSync().screenWidth / 750
+					return Math.round(numberRpx * widthCoe)
+				} else if (this.width.match(regexHaveNotUnit) !== null) { // 未携带 rpx或px 的纯数字 String
+					return this.width
+				} else { // 不符合格式
+					return ''
+				}
+			} else {
+				return ''
+			}
+		},
 		contentAlign() {
 			let align = 'left'
 			switch (this.align) {
@@ -104,7 +131,7 @@ export default {
 	created() {
 		this.root = this.getTable('uniTable')
 		this.rootTr = this.getTable('uniTr')
-		this.rootTr.minWidthUpdate(this.width ? this.width : 140)
+		this.rootTr.minWidthUpdate(this.customWidth ? this.customWidth : 140)
 		this.border = this.root.border
 		this.root.thChildren.push(this)
 	},
diff --git a/uni_modules/uni-table/components/uni-tr/uni-tr.vue b/uni_modules/uni-table/components/uni-tr/uni-tr.vue
index 3eb62e110f1431c2aa1cfdf8c3ffb1710781f578..d5cdee64454ee753138140fd61df1e6928e6b56e 100644
--- a/uni_modules/uni-table/components/uni-tr/uni-tr.vue
+++ b/uni_modules/uni-table/components/uni-tr/uni-tr.vue
@@ -74,11 +74,20 @@ export default {
 			this.root.minWidth = this.widthThArr.reduce((a, b) => Number(a) + Number(b)) + selectionWidth
 		}
 	},
+	// #ifndef VUE3
 	destroyed() {
 		const index = this.root.trChildren.findIndex(i => i === this)
 		this.root.trChildren.splice(index, 1)
 		this.root.isNodata()
-	},
+	},
+	// #endif
+	// #ifdef VUE3
+	unmounted() {
+		const index = this.root.trChildren.findIndex(i => i === this)
+		this.root.trChildren.splice(index, 1)
+		this.root.isNodata()
+	},
+	// #endif
 	methods: {
 		minWidthUpdate(width) {
 			this.widthThArr.push(width)
diff --git a/uni_modules/uni-table/i18n/en.json b/uni_modules/uni-table/i18n/en.json
new file mode 100644
index 0000000000000000000000000000000000000000..e32023cc1b2fe099d7f56bd6d05e59dab03bc781
--- /dev/null
+++ b/uni_modules/uni-table/i18n/en.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "Reset",
+	"filter-dropdown.search": "Search",
+	"filter-dropdown.submit": "Submit",
+	"filter-dropdown.filter": "Filter",
+	"filter-dropdown.gt": "Greater or equal to",
+	"filter-dropdown.lt": "Less than or equal to",
+	"filter-dropdown.date": "Date"
+}
diff --git a/uni_modules/uni-table/i18n/es.json b/uni_modules/uni-table/i18n/es.json
new file mode 100644
index 0000000000000000000000000000000000000000..9afd04bb6604739d98d4235f458aa91ae440964a
--- /dev/null
+++ b/uni_modules/uni-table/i18n/es.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "Reiniciar",
+	"filter-dropdown.search": "Búsqueda",
+	"filter-dropdown.submit": "Entregar",
+	"filter-dropdown.filter": "Filtrar",
+	"filter-dropdown.gt": "Mayor o igual a",
+	"filter-dropdown.lt": "Menos que o igual a",
+	"filter-dropdown.date": "Fecha"
+}
diff --git a/uni_modules/uni-table/i18n/fr.json b/uni_modules/uni-table/i18n/fr.json
new file mode 100644
index 0000000000000000000000000000000000000000..b0062371d4c3b1e6a8367e1f2b7f250e023005e1
--- /dev/null
+++ b/uni_modules/uni-table/i18n/fr.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "Réinitialiser",
+	"filter-dropdown.search": "Chercher",
+	"filter-dropdown.submit": "Soumettre",
+	"filter-dropdown.filter": "Filtre",
+	"filter-dropdown.gt": "Supérieur ou égal à",
+	"filter-dropdown.lt": "Inférieur ou égal à",
+	"filter-dropdown.date": "Date"
+}
diff --git a/uni_modules/uni-table/i18n/index.js b/uni_modules/uni-table/i18n/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..2469dd02b259a09267f4a6443b856670b9a26e4a
--- /dev/null
+++ b/uni_modules/uni-table/i18n/index.js
@@ -0,0 +1,12 @@
+import en from './en.json'
+import es from './es.json'
+import fr from './fr.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	es,
+	fr,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-table/i18n/zh-Hans.json b/uni_modules/uni-table/i18n/zh-Hans.json
new file mode 100644
index 0000000000000000000000000000000000000000..862af1794cb0d2d2731bbd46cc576c689abe24f4
--- /dev/null
+++ b/uni_modules/uni-table/i18n/zh-Hans.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "重置",
+	"filter-dropdown.search": "搜索",
+	"filter-dropdown.submit": "确定",
+	"filter-dropdown.filter": "筛选",
+	"filter-dropdown.gt": "大于等于",
+	"filter-dropdown.lt": "小于等于",
+	"filter-dropdown.date": "日期范围"
+}
diff --git a/uni_modules/uni-table/i18n/zh-Hant.json b/uni_modules/uni-table/i18n/zh-Hant.json
new file mode 100644
index 0000000000000000000000000000000000000000..64f80615bff153f5ce4f5bca028e5c3d7e9ecfa7
--- /dev/null
+++ b/uni_modules/uni-table/i18n/zh-Hant.json
@@ -0,0 +1,9 @@
+{
+	"filter-dropdown.reset": "重置",
+	"filter-dropdown.search": "搜索",
+	"filter-dropdown.submit": "確定",
+	"filter-dropdown.filter": "篩選",
+	"filter-dropdown.gt": "大於等於",
+	"filter-dropdown.lt": "小於等於",
+	"filter-dropdown.date": "日期範圍"
+}
diff --git a/uni_modules/uni-table/package.json b/uni_modules/uni-table/package.json
index ad55cc3c9dd742af16c10b1edb234fb3780f6d48..f224ab72aa46cf50943d5074019aeca341bda10c 100644
--- a/uni_modules/uni-table/package.json
+++ b/uni_modules/uni-table/package.json
@@ -1,82 +1,86 @@
-{
-  "id": "uni-table",
-  "displayName": "uni-table 表格",
-  "version": "1.1.0",
-  "description": "表格组件，多用于展示多条结构类似的数据，如",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "table",
-    "表格"
-],
-  "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-datetime-picker"],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "n"
-        },
-        "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",
-          "字节跳动": "n",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "n",
-          "联盟": "n"
-        }
-      }
-    }
-  }
+{
+  "id": "uni-table",
+  "displayName": "uni-table 表格",
+  "version": "1.2.1",
+  "description": "表格组件，多用于展示多条结构类似的数据，如",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "table",
+    "表格"
+],
+  "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-datetime-picker"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "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",
+          "字节跳动": "n",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/uni_modules/uni-table/readme.md b/uni_modules/uni-table/readme.md
index fc8c7b076a65a15d468f15c4a6562ffcb58d36ca..bb08c79189e9a794a229fae07cb84ef1bcbdef32 100644
--- a/uni_modules/uni-table/readme.md
+++ b/uni_modules/uni-table/readme.md
@@ -5,144 +5,9 @@
 
 用于展示多条结构类似的数据
 
-### 平台差异说明
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-table)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-目前仅支持pc端
 
-### 组件使用注意事项
 
-为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
 
-- 组件需要依赖 `sass` 插件 ，请自行手动安装
-- 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-
-### 安装方式
-
-本组件符合[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)
-
-
-### 基本用法 
-表格是由4个组件： `uni-table`表格组件、`uni-tr`表格行 、`uni-th` 表格头、`uni-td` 单元格组成
-
-需要注意的是：
-- `uni-table` 的根节点一定是 `uni-tr`
-- `uni-tr` 的根节点一定是 `uni-th` 或者 `uni-td`
-- 一个表格内理论上只能包含表头行
-- 目前只能在 `uni-th` 中设置 width 属性，`uni-td` 的宽度跟随 `uni-th` 宽度变化
-
-
-```html
-<uni-table border stripe emptyText="暂无更多数据" >
-	<!-- 表头行 -->
-	<uni-tr>
-		<uni-th align="center">日期</uni-th>
-		<uni-th align="center">姓名</uni-th>
-		<uni-th align="left">地址</uni-th>
-	</uni-tr>
-	<!-- 表格数据行 -->
-	<uni-tr>
-		<uni-td>2020-10-20</uni-td>
-		<uni-td>Jeson</uni-td>
-		<uni-td>北京市海淀区</uni-td>
-	</uni-tr>
-	<uni-tr>
-		<uni-td>2020-10-21</uni-td>
-		<uni-td>HanMeiMei</uni-td>
-		<uni-td>北京市海淀区</uni-td>
-	</uni-tr>
-	<uni-tr>
-		<uni-td>2020-10-22</uni-td>
-		<uni-td>LiLei</uni-td>
-		<uni-td>北京市海淀区</uni-td>
-	</uni-tr>
-	<uni-tr>
-		<uni-td>2020-10-23</uni-td>
-		<uni-td>Danner</uni-td>
-		<uni-td>北京市海淀区</uni-td>
-	</uni-tr>
-
-</uni-table>
-</script>
-			 
-```
-
-
-
-
-## API
-
-### Table Props
-
-|属性名		| 类型			|默认值	 		| 可选值	| 说明|
-|:-:			| :-:			|:-:			| :-:	| :-:	|
-|border		| Boolean		| false			| -		| 是否带有纵向边框	|
-|stripe		| Boolean		| false			| -		| 是否显示斑马线样式	|
-|type			| String		| ''			| -			| 值为type="selection" 时开启多选|
-|emptyText	| String		| 没有更多数据	| -		| 空数据时显示的文本内容	|
-|loading		| Boolean		| false			| -		| 显示加载中|	
-
-### Table Events
-
-事件称名				|说明									| 返回参数			
-:-:					|:-:									| :-:				
-selection-change	| 开启多选时，当选择项发生变化时会触发该事件	| Function(Object)
-
-### Table Methods
-**Tips: 因微信小程序框架问题，暂不支持如下方法**
-
-|方法称名							|说明				|参数|
-|:-:								|:-:				|:-:|
-|selectionAll				|选中全部行	|-	|
-|toggleRowSelection	|用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）	| Function(Array:[行索引],Boolean:selected)	|
-|clearSelection	|用于多选表格，清空用户的选择	|-	|
-|toggleAllSelection	|用于多选表格，切换所有行的选中状态	|-	|
-
-
-
-### Th Props
-
-|属性名		|类型		|默认值	 	|可选值				|说明|
-|:-:			|:-:		|:-:			|	:-:				|:-:|
-|width		|String	| -				|-					| 单元格宽度|
-|align		|String	| left		|left/center/right	| 表头对齐方式|
-|filter-type		|String	| 	|search/select/range/date	| 筛选类型，search关键字搜索，select类别选择|
-|filter-data		|Array	| 	|| 筛选数据|
-|sortable |Boolean| false		|- 	| 是否启用排序|
-
-filter-data 示例
-```json
-[{
-	text: "", //显示
-	value: "" // 值
-}]
-```
-
-
-### Th Events
-
-|事件称名				|说明									| 返回参数			|
-|:-:					|:-:									| :-:				|
-||sort-change	| 点击排序时会触发该事件	| Function(Object)|
-||filter-change	| 筛选数据时会触发该事件	| Function(Object)|
-
-filter-change(e) 说明
-```json
-e = {
-	filterType: "", //筛选类型 search/select/range 和传入的相同
-	filter: "" // 值, filterType=search字符串类型，filterType=select数组类型，filterType=range数组类型，[0]开始值， [1]结束值
-}
-```
-
-
-### Td Props
-
-|属性名	|类型	|默认值	 	|可选值				|说明|
-|:-:		|:-:		|:-:			|:-:				|:-:|
-|align	|Boolean| left		|left/center/right	| 单元格对齐方式|
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/table/table](https://hellouniapp.dcloud.net.cn/pages/extUI/table/table)
\ No newline at end of file
diff --git a/uni_modules/uni-tag/changelog.md b/uni_modules/uni-tag/changelog.md
index 591ec197ae4b494b1c7ef9fa723f315dbb0e34b7..c0c5839b1e76d820591b44d22e60740b15bdf51b 100644
--- a/uni_modules/uni-tag/changelog.md
+++ b/uni_modules/uni-tag/changelog.md
@@ -1,3 +1,10 @@
+## 2.1.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-tag](https://uniapp.dcloud.io/component/uniui/uni-tag)
+## 2.0.0（2021-11-09）
+- 新增 提供组件设计资源，组件样式调整
+- 移除 插槽
+- 移除 type 属性的 royal 选项
 ## 1.1.1（2021-08-11）
 - type 不是 default 时，size 为 small 字体大小显示不正确
 ## 1.1.0（2021-07-30）
diff --git a/uni_modules/uni-tag/components/uni-tag/uni-tag.vue b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
index 917492417183f5d353e870a33cbb3ac45c82d6f4..6c744551e489929eaf497e84cc706d4ba94ff51e 100644
--- a/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
+++ b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
@@ -1,5 +1,5 @@
 <template>
-	<text class="uni-tag" v-if="text" :class="classes" :style="customStyle" @click="onClick" ><slot/>{{text}}<slot name="right" /></text>
+	<text class="uni-tag" v-if="text" :class="classes" :style="customStyle" @click="onClick">{{text}}</text>
 </template>
 
 <script>
@@ -8,16 +8,16 @@
 	 * @description 用于展示1个或多个文字标签，可点击切换选中、不选中的状态
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=35
 	 * @property {String} text 标签内容
-	 * @property {String} size = [normal|small] 大小尺寸
-	 * 	@value normal 正常
+	 * @property {String} size = [default|small|mini] 大小尺寸
+	 * 	@value default 正常
 	 * 	@value small 小尺寸
-	 * @property {String} type = [default|primary|success｜warning｜error｜royal]  颜色类型
+	 * 	@value mini 迷你尺寸
+	 * @property {String} type = [default|primary|success｜warning｜error]  颜色类型
 	 * 	@value default 灰色
 	 * 	@value primary 蓝色
 	 * 	@value success 绿色
 	 * 	@value warning 黄色
 	 * 	@value error 红色
-	 * 	@value royal 紫色
 	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
 	 * @property {Boolean} inverted = [true|false] 是否无需背景颜色（空心标签）
 	 * @property {Boolean} circle = [true|false] 是否为圆角
@@ -26,7 +26,7 @@
 
 	export default {
 		name: "UniTag",
-		emits:['click'],
+		emits: ['click'],
 		props: {
 			type: {
 				// 标签类型default、primary、success、warning、error、royal
@@ -62,32 +62,41 @@
 				// 是否为标记样式
 				type: [Boolean, String],
 				default: false
-			},
-			customStyle: {
-				type: String,
-				default: ''
+			},
+			customStyle: {
+				type: String,
+				default: ''
 			}
 		},
 		computed: {
-			classes() {
-				const { type, disabled, inverted, circle, mark, size, isTrue } = this
-				const classArr = [
+			classes() {
+				const {
+					type,
+					disabled,
+					inverted,
+					circle,
+					mark,
+					size,
+					isTrue
+				} = this
+				const classArr = [
 					'uni-tag--' + type,
+					'uni-tag--' + size,
 					isTrue(disabled) ? 'uni-tag--disabled' : '',
-					isTrue(inverted) ? type + '-uni-tag--inverted' : '',
+					isTrue(inverted) ? 'uni-tag--' + type + '--inverted' : '',
 					isTrue(circle) ? 'uni-tag--circle' : '',
 					isTrue(mark) ? 'uni-tag--mark' : '',
-					'uni-tag--' + size,
 					// type === 'default' ? 'uni-tag--default' : 'uni-tag-text',
-					isTrue(inverted) ? 'uni-tag-text--' + type : '',
+					isTrue(inverted) ? 'uni-tag--inverted uni-tag-text--' + type : '',
 					size === 'small' ? 'uni-tag-text--small' : ''
-				]
+				]
+				// 返回类的字符串，兼容字节小程序
 				return classArr.join(' ')
 			}
 		},
-		methods: {
-			isTrue(value) {
-				return value === true || value === 'true'
+		methods: {
+			isTrue(value) {
+				return value === true || value === 'true'
 			},
 			onClick() {
 				if (this.isTrue(this.disabled)) return
@@ -98,182 +107,146 @@
 </script>
 
 <style lang="scss" scoped>
-	$tag-pd: 0px 16px;
-	$tag-small-pd: 0px 8px;
-	$uni-color-royal: #4335d6;
+	$uni-primary: #2979ff !default;
+	$uni-success: #18bc37 !default;
+	$uni-warning: #f3a73f !default;
+	$uni-error: #e43d33 !default;
+	$uni-info: #8f939c !default;
+
 
+	$tag-default-pd: 4px 7px;
+	$tag-small-pd: 2px 5px;
+	$tag-mini-pd: 1px 3px;
 
 	.uni-tag {
-		/* #ifndef APP-NVUE */
-		display: inline-block;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		align-self: flex-start;
-		/* #endif */
-		padding: $tag-pd;
-		line-height: 30px;
-		color: $uni-text-color;
-		border-radius: $uni-border-radius-base;
-		background-color: $uni-bg-color-grey;
+		line-height: 14px;
+		font-size: 12px;
+		font-weight: 200;
+		padding: $tag-default-pd;
+		color: #fff;
+		border-radius: 3px;
+		background-color: $uni-info;
 		border-width: 1rpx;
 		border-style: solid;
-		border-color: $uni-bg-color-grey;
+		border-color: $uni-info;
 		/* #ifdef H5 */
 		cursor: pointer;
 		/* #endif */
-	}
-
-	.uni-tag--circle {
-		border-radius: 15px;
-	}
-
-	.uni-tag--mark {
-		border-top-left-radius: 0;
-		border-bottom-left-radius: 0;
-		border-top-right-radius: 15px;
-		border-bottom-right-radius: 15px;
-	}
-
-	.uni-tag--disabled {
-		opacity: 0.5;
-		/* #ifdef H5 */
-		cursor: not-allowed;
-		/* #endif */
-
-	}
-
-	.uni-tag--small {
-		height: 20px;
-		padding: $tag-small-pd;
-		line-height: 20px;
-		font-size: $uni-font-size-sm;
-	}
-
-	.uni-tag--default {
-		color: $uni-text-color;
-		font-size: $uni-font-size-base;
-	}
 
-	.uni-tag--royal {
-		color: $uni-text-color;
-		font-size: $uni-font-size-base;
-	}
-
-	.uni-tag-text--small {
-		font-size: $uni-font-size-sm;
-	}
+		// size attr
+		&--default {
+			font-size: 12px;
+		}
+
+		&--default--inverted {
+			color: $uni-info;
+			border-color: $uni-info;
+		}
+
+		&--small {
+			padding: $tag-small-pd;
+			font-size: 12px;
+			border-radius: 2px;
+		}
 
-	.uni-tag-text {
-		color: $uni-text-color-inverse;
-		font-size: $uni-font-size-base;
-	}
+		&--mini {
+			padding: $tag-mini-pd;
+			font-size: 12px;
+			border-radius: 2px;
+		}
 
-	.uni-tag-text--primary {
-		color: $uni-color-primary;
-	}
+		// type attr
+		&--primary {
+			background-color: $uni-primary;
+			border-color: $uni-primary;
+			color: #fff;
+		}
 
-	.uni-tag-text--success {
-		color: $uni-color-success;
-	}
+		&--success {
+			color: #fff;
+			background-color: $uni-success;
+			border-color: $uni-success;
+		}
 
-	.uni-tag-text--warning {
-		color: $uni-color-warning;
-	}
+		&--warning {
+			color: #fff;
+			background-color: $uni-warning;
+			border-color: $uni-warning;
+		}
 
-	.uni-tag-text--error {
-		color: $uni-color-error;
-	}
+		&--error {
+			color: #fff;
+			background-color: $uni-error;
+			border-color: $uni-error;
+		}
+
+		&--primary--inverted {
+			color: $uni-primary;
+			border-color: $uni-primary;
+		}
 
-	.uni-tag-text--royal {
-		color: $uni-color-royal;
-	}
+		&--success--inverted {
+			color: $uni-success;
+			border-color: $uni-success;
+		}
 
+		&--warning--inverted {
+			color: $uni-warning;
+			border-color: $uni-warning;
+		}
 
-	.uni-tag--primary {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-primary;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-primary;
-	}
+		&--error--inverted {
+			color: $uni-error;
+			border-color: $uni-error;
+		}
+
+		&--inverted {
+			background-color: #fff;
+		}
 
-	.primary-uni-tag--inverted {
-		color: $uni-color-primary;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-primary;
-	}
+		// other attr
+		&--circle {
+			border-radius: 15px !important;
+		}
 
-	.uni-tag--success {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-success;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-success;
-	}
+		&--mark {
+			border-top-left-radius: 0 !important;
+			border-bottom-left-radius: 0 !important;
+			border-top-right-radius: 15px !important;
+			border-bottom-right-radius: 15px !important;
+		}
 
-	.success-uni-tag--inverted {
-		color: $uni-color-success;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-success;
+		&--disabled {
+			opacity: 0.5;
+			/* #ifdef H5 */
+			cursor: not-allowed;
+			/* #endif */
+		}
 	}
 
-	.uni-tag--warning {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-warning;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-warning;
-	}
 
-	.warning-uni-tag--inverted {
-		color: $uni-color-warning;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-warning;
-	}
+	.uni-tag-text {
+		color: #fff;
+		font-size: 14px;
 
-	.uni-tag--error {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-error;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-error;
-	}
+		&--primary {
+			color: $uni-primary;
+		}
 
-	.error-uni-tag--inverted {
-		color: $uni-color-error;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-error;
-	}
+		&--success {
+			color: $uni-success;
+		}
 
-	.uni-tag--royal {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-royal;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-royal;
-	}
+		&--warning {
+			color: $uni-warning;
+		}
 
-	.royal-uni-tag--inverted {
-		color: $uni-color-royal;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-royal;
-	}
+		&--error {
+			color: $uni-error;
+		}
 
-	.uni-tag--inverted {
-		color: $uni-text-color;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-bg-color-grey;
+		&--small {
+			font-size: 12px;
+		}
 	}
 </style>
diff --git a/uni_modules/uni-tag/package.json b/uni_modules/uni-tag/package.json
index cf3475164fe76cdd5df059f41e10faeb91504aec..187808863418f22552c1048346b6ec93577cecb2 100644
--- a/uni_modules/uni-tag/package.json
+++ b/uni_modules/uni-tag/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-tag",
   "displayName": "uni-tag 标签",
-  "version": "1.1.1",
+  "version": "2.1.0",
   "description": "Tag 组件，用于展示1个或多个文字标签，可点击切换选中、不选中的状态。",
   "keywords": [
     "uni-ui",
@@ -41,7 +41,7 @@
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": ["uni-scss"],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -79,7 +79,7 @@
         },
         "Vue": {
             "vue2": "y",
-            "vue3": "u"
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-tag/readme.md b/uni_modules/uni-tag/readme.md
index b8c1938e5f4fed63557ddc4f9bbac80ccfb742f2..6e78ff5e42ad09f4fc05e3898b16531f2372c781 100644
--- a/uni_modules/uni-tag/readme.md
+++ b/uni_modules/uni-tag/readme.md
@@ -7,43 +7,7 @@
 
 用于展示1个或多个文字标签，可点击切换选中、不选中的状态 。
 
-### 安装方式
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-tag)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-本组件符合[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)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-```html
-<uni-tag text="标签"></uni-tag>
-<uni-tag text="标签" type="error" :circle="true"></uni-tag>
-<uni-tag text="标签" @click="bindClick"></uni-tag>
-```
-
-## API
-
-### Tag Props
-
-|属性名		|类型		|默认值	|说明																											|
-|:-:			|:-:		|:-:		|:-:																											|
-|text			|String	|-			|标签内容																										|
-|size			|String	|normal	|大小尺寸，可选值：normal、small																				|
-|type			|String	|default|颜色类型，可选值：default（灰色）、primary（蓝色）、success（绿色）、warning(黄色)、error(红色)、royal(紫色)	|
-|disabled	|Boolean|false	|是否为禁用状态																									|
-|inverted	|Boolean|false	|是否无需背景颜色（空心标签）																					|
-|circle		|Boolean|false	|是否为圆角																										|
-
-
-### Tag Events
-
-|事件称名		|说明							|返回值	|
-|:-:			|:-:							|:-:	|
-|@click		|点击 Tag 触发事件	|-		|
-
-
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/tag/tag](https://hellouniapp.dcloud.net.cn/pages/extUI/tag/tag)
\ No newline at end of file
diff --git a/uni_modules/uni-title/changelog.md b/uni_modules/uni-title/changelog.md
index 588ea1a74dec884d1dd6a000ba5038ab5292d80b..76262165345ff7aeb8bd34b1f5ff83aa5b88259f 100644
--- a/uni_modules/uni-title/changelog.md
+++ b/uni_modules/uni-title/changelog.md
@@ -1,5 +1,10 @@
+## 1.1.1（2022-05-19）
+- 修改组件描述
+## 1.1.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-title](https://uniapp.dcloud.io/component/uniui/uni-title)
 ## 1.0.2（2021-05-12）
 - 新增 示例地址
 - 修复 示例项目缺少组件的Bug
-## 1.0.1（2021-02-05）
-- 调整为uni_modules目录规范
+## 1.0.1（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-title/components/uni-title/uni-title.vue b/uni_modules/uni-title/components/uni-title/uni-title.vue
index f428f037b05e72fe8eb7cabbefdc418126431653..0d5b8480dc7243d190514304b46a78914708eb57 100644
--- a/uni_modules/uni-title/components/uni-title/uni-title.vue
+++ b/uni_modules/uni-title/components/uni-title/uni-title.vue
@@ -6,8 +6,8 @@
 
 <script>
 	/**
-	 * Title 章节标题
-	 * @description 章节标题，通常用于记录页面标题，使用当前组件，uni-app 如果开启统计，将会自动统计页面标题
+	 * Title 标题
+	 * @description 标题，通常用于记录页面标题，使用当前组件，uni-app 如果开启统计，将会自动统计页面标题
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=1066
 	 * @property {String} type = [h1|h2|h3|h4|h5] 标题类型
 	 * 	@value h1 一级标题
@@ -15,7 +15,7 @@
 	 * 	@value h3 三级标题
 	 * 	@value h4 四级标题
 	 * 	@value h5 五级标题
-	 * @property {String} title 章节标题内容
+	 * @property {String} title 标题内容
 	 * @property {String} align = [left|center|right] 对齐方式
 	 * 	@value left 做对齐
 	 * 	@value center 居中对齐
@@ -115,7 +115,7 @@
 	}
 </script>
 
-<style scoped>
+<style>
 	/* .uni-title {
 
 	} */
diff --git a/uni_modules/uni-title/package.json b/uni_modules/uni-title/package.json
index fa2ddd432680f36ad9f434154cbb4056212255aa..2249f5a1cb2d4a784e77e6df903c197e4cd7dcc5 100644
--- a/uni_modules/uni-title/package.json
+++ b/uni_modules/uni-title/package.json
@@ -1,84 +1,88 @@
-{
-  "id": "uni-title",
-  "displayName": "uni-title 章节标题",
-  "version": "1.0.2",
-  "description": "章节标题，通常用于记录页面标题，使用当前组件，uni-app 如果开启统计，将会自动统计页面标题",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "标题",
-    "章节",
-    "章节标题",
-    ""
-],
-  "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": [],
-    "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"
-        }
-      }
-    }
-  }
+{
+  "id": "uni-title",
+  "displayName": "uni-title 章节标题",
+  "version": "1.1.1",
+  "description": "章节标题，通常用于记录页面标题，使用当前组件，uni-app 如果开启统计，将会自动统计页面标题",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "标题",
+    "章节",
+    "章节标题",
+    ""
+],
+  "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"],
+    "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-title/readme.md b/uni_modules/uni-title/readme.md
index 268360238d8c9a4f4610b7ba2570ad9e62cfd1a2..0e60b1b9514adff49d97be8ebd177b53a0f9e995 100644
--- a/uni_modules/uni-title/readme.md
+++ b/uni_modules/uni-title/readme.md
@@ -1,71 +1,14 @@
 
 
-## Title 章节标题
+## Title 标题
 > **组件名：uni-title**
 > 代码块： `uTitle`
 
 
 章节标题，通常用于记录页面标题，使用当前组件，uni-app 如果开启统计，将会自动统计页面标题 。
 
-### 安装方式
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-title)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
 
-本组件符合[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)
 
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<uni-title title="上报统计数据"></uni-title>
-<uni-title type="h1" title="h1 一级标题 "></uni-title>
-<uni-title type="h1" title="h1 一级标题" color="#027fff"></uni-title>
-<uni-title type="h2" title="h2 居中" align="center"></uni-title>
-```
-
-
-
-
-### 标题统计
-title 组件可以与 uni统计集合使用，只要开启uni统计，即可自动采集标题
-
-- 如果不写 type 属性， 为上报标题。这是标题统计的默认用法，页面会优先上报组件传入的title值为统计上报数据 
-- 页面统计上报只会上报一次，如多个组件开启，则只上报最后一个组件的内容，所以如非必要请不要多个组件同时开启统计，避免上报错误标题统计
-- 为避免上报错误标题统计， uni.report() API 与章节标题组件请勿一起使用
-
-> **注意事项**
-> - 在使用 align 属性时，在非 nvue 页面下不生效，或者组件宽度不对，请在组件外层设置一个元素的 display为block 即可解决问题。
-> 	
-> 	**示例：**
-> 	
-> 	```html
-> 	<template>
-> 		<view class="box">
-> 			<uni-title type="h1" title="h1 一级标题 "></uni-title>
-> 		</view>
-> 	</template>
-> 	<style>
-> 		.box {
-> 			/* #ifndef APP-NVUE */
-> 			display: block;
-> 			/* #endif */
-> 		}
-> 	</style>
-> 	```
-
-
-## API
-### Title Props
-
-|属性名	|类型	|默认值	|说明																									|
-|:-:	|:-:	|:-:	|:-:																									|
-|type	|String	|-		|标题类型，可选值 h1、h2、h3、h4、h5 ，章节标题字体会比正常字长字体粗，不指定 type 值，默认为上报统计数据	|
-|title	|String	|-		|章节标题内容																								|
-|align	|String	|-		|对齐方式，可选值 left:左对齐；center:居中；right:右对齐；												|
-|color	|String	|-		|字体颜色																								|
-|stat	|Boolean|-		|是否开启统计功能呢，如不填写type值，默认为开启，填写 type 属性，默认为关闭														|
-
-## 组件示例
-
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/title/title](https://hellouniapp.dcloud.net.cn/pages/extUI/title/title)
\ No newline at end of file
diff --git a/uni_modules/uni-ui/changelog.md b/uni_modules/uni-ui/changelog.md
index 4e47272267a95e4a4b60aa67b6eceae839665c2c..4eabdd71a1a3dc04d781aed7057164a62e086359 100644
--- a/uni_modules/uni-ui/changelog.md
+++ b/uni_modules/uni-ui/changelog.md
@@ -1,4 +1,158 @@
-## 1.4.1（2021-08-20）
+## 1.4.16（2022-06-06）
+- uni-breadcrumb 新增 支持 uni.scss 修改颜色
+- uni-data-select 修复 localdata 赋值不生效的 bug
+- uni-data-select 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+- uni-data-select 修复 当 value 为 0 时选择不生效的 bug
+- uni-easyinput 修复 关闭图标某些情况下无法取消的bug
+- uni-fav 新增 stat 属性 ，是否开启uni统计功能
+- uni-goods-nav 新增 stat属性，是否开启uni统计功能
+- uni-group 新增 stat属性，是否开启uni统计功能
+- uni-nav-bar 新增 stat 属性 ，可开启统计 title 上报 ，仅使用了title 属性且项目开启了uni统计生效
+- uni-search-bar 新增 readonly 属性，组件只读
+- uni-swipe-action 修复 isPC 找不到的Bug
+- uni-swipe-action  修复 在 nvue 下 disabled 失效的bug
+- uni-tooltip 修复 content 为空时仍然弹出的bug
+## 1.4.15（2022-05-07）
+- uni-data-picker 修复 字节小程序 本地数据无法选择下一级的Bug
+- uni-data-select 新增 记住上次的选项（仅 collection 存在时有效）
+- uni-search-bar 修复  vue3 input 事件不生效的bug
+- uni-search-bar 修复 多余代码导致的bug
+- uni-tooltip 更新 text 属性变更为 content
+- uni-tooltip 更新 移除 width 属性
+- uni-tooltip 修复 组件根 text 嵌套组件 warning
+## 1.4.14（2022-04-18）
+- uni-datetime-picker 修复 Vue3 下动态赋值,单选类型未响应的 bug
+- uni-easyinput 修复 默认值不生效的bug
+## 1.4.13（2022-04-02）
+- uni-calendar 修复 条件编译 nvue 不支持的 css 样式
+- uni-calendar 修复 startDate、 endDate 属性失效的 bug
+- uni-data-picker 修复 nvue 不支持的 v-show 的 bug
+- uni-data-picker 修复 条件编译 nvue 不支持的 css 样式
+- uni-datetime-picker 修复 Vue3 下动态赋值未响应的 bug
+- uni-easyinput 修复 value不能为0的bug
+- uni-popup 修复 弹出层内部无法滚动的bug
+- uni-popup 修复 小程序中高度错误的bug
+- uni-popup 修复 快速调用open出现问题的Bug
+- uni-rate 修复 条件判断 `NaN` 错误的 bug
+- uni-swipe-action 修复 按钮字体大小不能设置的bug
+- uni-swipe-action 修复 h5和app端下报el错误的bug
+- uni-swipe-action 修复 HBuilderX 1.4.X 版本中，h5和app端下报错的bug
+## 1.4.12（2022-02-19）
+- uni-collapse 修复 初始化的时候 ，open 属性失效的bug
+- uni-data-checkbox 修复 multiple 为 true 时，v-model 的值为 null 报错的 bug
+- uni-icons 优化 size 属性可以传入不带单位的字符串数值
+- uni-icons 优化 size 支持其他单位
+- uni-nav-bar 新增 left-width/right-width属性 ，可修改左右两侧的宽度
+- uni-popup 修复 safeArea 属性不能设置为false的bug
+## 1.4.11（2022-01-21）
+- uni-collapse 修复 微信小程序resize后组件收起的bug
+- uni-countdown 修复 在微信小程序中样式不生效的bug
+- uni-countdown 新增 update 方法 ，在动态更新时间后，刷新组件
+- uni-load-more 新增 showText属性 ，是否显示文本
+- uni-load-more 修复 nvue 平台下不显示文本的bug
+- uni-load-more 修复 微信小程序平台样式选择器报警告的问题
+- uni-nav-bar 修复 在vue下，标题不垂直居中的bug
+- uni-nav-bar 修复 height 属性类型错误
+- uni-nav-bar 新增 height 属性,可修改组件高度
+- uni-nav-bar 新增 dark 属性可可开启暗黑模式
+- uni-nav-bar 优化 标题字数过多显示省略号
+- uni-nav-bar 优化 插槽，插入内容可完全覆盖
+- uni-popup 修复 isMaskClick 失效的bug
+- uni-popup 新增 cancelText \ confirmText 属性 ，可自定义文本
+- uni-popup 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- uni-popup 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+
+## 1.4.10（2022-01-17）
+- uni-card 修复 在vue页面下略缩图显示不正常的bug
+- uni-datetime-picker 修复 clear-icon 属性在小程序平台不生效的 bug
+- uni-datetime-picker 修复 日期范围选在小程序平台，必须多点击一次才能取消选中状态的 bug
+- uni-fab 更新 组件依赖
+-
+- uni-icons 修复 nvue 有些图标不显示的bug，兼容老版本图标
+- uni-icons 优化 示例可复制图标名称
+- uni-nav-bar 修复 color 属性不生效的bug
+- uni-popup 修复 设置 safeArea 属性不生效的bug
+- uni-popup 优化 组件示例
+- uni-popup 修复 vuedoc 文字错误
+## 1.4.9（2021-11-23）
+- uni-ui 修复 vue3中某些scss变量无法找到的问题
+- uni-combox 优化 label、label-width 属性
+- uni-data-picker 修复 由上个版本引发的map、v-model等属性不生效的bug
+- uni-file-picker 修复 参数为对象的情况下，url在某些情况显示错误的bug
+- uni-icons 优化 兼容旧组件 type 值
+- uni-list 修复 在vue3中to属性在发行应用的时候报错的bug
+- uni-scss 修复 vue3中scss语法兼容问题
+- uni-transition 修复 init 方法初始化问题
+## 1.4.8（2021-11-19）
+- uni-fab 修复 阴影颜色不正确的bug
+## 1.4.7（2021-11-19）
+- uni-ui 新增 支持国际化
+- uni-ui 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- uni-ui 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-ui](https://uniapp.dcloud.io/component/uniui/uni-ui)
+- uni-badge 修改 size 属性默认值调整为 small
+- uni-badge 修改 type 属性，默认值调整为 error，info 替换 default
+- uni-badge 修复 在字节小程序上样式不生效的 bug
+- uni-calendar 修复 弹出层被 tabbar 遮盖 bug
+- uni-card 重构插槽的用法 ，header 替换为 title 
+- uni-card 新增 actions 插槽
+- uni-card 新增 cover 封面图属性和插槽
+- uni-card 新增 padding 内容默认内边距离
+- uni-card 新增 margin 卡片默认外边距离
+- uni-card 新增 spacing 卡片默认内边距
+- uni-card 新增 shadow 卡片阴影属性
+- uni-card 取消 mode 属性，可使用组合插槽代替
+- uni-card 取消 note 属性 ，使用actions插槽代替
+- uni-collapse 优化 show-arrow 属性默认为true
+- uni-collapse 新增 show-arrow 属性，控制是否显示右侧箭头
+- uni-countdown 新增 font-size 支持自定义字体大小
+- uni-data-checkbox 修复 在uni-forms中 modelValue 中不存在当前字段，当前字段必填写也不参与校验的问题
+- uni-data-checkbox 修复 单选 list 模式下 ，icon 为 left 时，选中图标不显示的问题
+- uni-data-checkbox 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+- uni-dateformat 优化 默认时间不再是当前时间，而是显示'-'字符
+- uni-datetime-picker 修复 hide-second 在移动端的 bug
+- uni-datetime-picker 修复 单选赋默认值时，赋值日期未高亮的 bug
+- uni-datetime-picker 修复 赋默认值时，移动端未正确显示时间的 bug
+- uni-datetime-picker 新增 hide-second 属性，支持只使用时分，隐藏秒
+- uni-datetime-picker 优化 取消选中时（范围选）直接开始下一次选择, 避免多点一次
+- uni-datetime-picker 优化 移动端支持清除按钮，同时支持通过 ref 调用组件的 clear 方法
+- uni-datetime-picker 优化 调整字号大小，美化日历界面
+- uni-datetime-picker 优化 范围选择器在 pc 端过宽的问题
+- uni-datetime-picker 新增 支持作为 uni-forms 子组件相关功能
+- uni-datetime-picker 修复 在 uni-forms 中使用时，选择时间报 NAN 错误的 bug
+- uni-datetime-picker 修复 type 属性动态赋值无效的 bug
+- uni-datetime-picker 修复 ‘确认’按钮被 tabbar 遮盖 bug
+- uni-datetime-picker 修复 组件未赋值时范围选左、右日历相同的 bug
+- uni-datetime-picker 修复 范围选未正确显示当前值的 bug
+- uni-datetime-picker 修复 h5 平台（移动端）报错 'cale' of undefined 的 bug
+- uni-easyinput 修复 在 uni-forms 的动态表单中默认值校验不通过的 bug
+- uni-easyinput 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+- uni-file-picker 新增 参数中返回 fileID 字段
+- uni-file-picker 修复 腾讯云传入fileID 不能回显的bug
+- uni-file-picker 修复 选择图片后，不能放大的问题
+- uni-file-picker 修复 由于 0.2.11 版本引起的不能回显图片的Bug
+- uni-file-picker 新增 clearFiles(index) 方法，可以手动删除指定文件
+- uni-file-picker 修复 v-model 值设为 null 报错的Bug
+- uni-file-picker 修复 return-type="object" 时，无法删除文件的Bug
+- uni-file-picker 修复 auto-upload 属性失效的Bug
+- uni-forms 修复 label 插槽不生效的bug
+- uni-forms 修复 没有添加校验规则的字段依然报错的Bug
+- uni-forms 修复 重置表单错误信息无法清除的问题
+- uni-forms 修复 表单验证只生效一次的问题
+- uni-icons 新增 更多图标
+- uni-icons 优化 自定义图标使用方式
+- uni-link 修复 在 nvue 下不显示的 bug
+- uni-pagination 修复 current 、value 属性未监听，导致高亮样式失效的 bug
+- uni-rate 优化 默认值修改为 0 颗星
+- uni-search-bar 修复 value 属性与 modelValue 属性不兼容的Bug
+- uni-swipe-action 新增 close-all 方法，关闭所有已打开的组件
+- uni-swipe-action 新增 resize() 方法，在非微信小程序、h5、app-vue端出现不能滑动的问题的时候，重置组件
+- uni-swipe-action 修复 app 端偶尔出现类似 Page[x][-x,xx;-x,xx,x,x-x] 的问题 
+- uni-swipe-action 优化 微信小程序、h5、app-vue 滑动逻辑，避免出现动态新增组件后不能滑动的问题
+- uni-tag 新增 提供组件设计资源，组件样式调整
+- uni-tag 移除 插槽
+- uni-tag 移除 type 属性的 royal 选项
+- uni-tag type 不是 default 时，size 为 small 字体大小显示不正确
+## 1.4.2（2021-08-20）
 - 新增 uni-ui 组件支持国际化 i18n
 - uni-collapse 优化 show-arrow 属性默认为true
 - uni-collapse 新增 show-arrow 属性，控制是否显示右侧箭头
diff --git a/uni_modules/uni-ui/package.json b/uni_modules/uni-ui/package.json
index 3fc8714b439ab48ef201fdfa405ac9d7a2fd3235..de80aad61ca23bd2c10969b2b44fc8a93ca96f85 100644
--- a/uni_modules/uni-ui/package.json
+++ b/uni_modules/uni-ui/package.json
@@ -1,8 +1,8 @@
 {
   "id": "uni-ui",
   "displayName": "uni-ui",
-  "version": "1.4.1",
-  "description": "uni-ui 是一个基于uni-app全端兼容的高性能UI框架",
+  "version": "1.4.16",
+  "description": "uni-ui 是基于uni-app的、全端兼容的、高性能UI框架",
   "keywords": [
     "uni-ui",
     "uniui",
@@ -12,7 +12,7 @@
 ],
   "repository": "https://github.com/dcloudio/uni-ui",
   "engines": {
-    "HBuilderX": ""
+    "HBuilderX": "^3.2.10"
   },
   "directories": {
     "example": "../../temps/example_temps"
@@ -120,7 +120,7 @@
         },
         "Vue": {
           "vue2": "y",
-          "vue3": "u"
+          "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-ui/readme.md b/uni_modules/uni-ui/readme.md
index 35315e568c29e1e1555fe6d81de8fe0f97ad9dc6..23f8456872f45ab29ae0ebf87d1c9baada1ac181 100644
--- a/uni_modules/uni-ui/readme.md
+++ b/uni_modules/uni-ui/readme.md
@@ -1,3 +1,11 @@
+> 当前插件不包含示例页面 ,如需示例请在 HBuiderX 中新建 `hello uni-app > 扩展组件` 中查看
+> 
+> 代码示例地址 ：[https://ext.dcloud.net.cn/plugin?id=4941](https://ext.dcloud.net.cn/plugin?id=4941)
+> 
+> 组件演示地址：[https://hellouniapp.dcloud.net.cn](https://hellouniapp.dcloud.net.cn/pages/extUI/badge/badge)
+> 
+> 组件文档地址：[https://uniapp.dcloud.io/component/uniui/uni-ui](https://uniapp.dcloud.io/component/uniui/uni-ui)
+
 # uni-ui 介绍
 
 ## uni-ui产品特点
@@ -50,9 +58,67 @@ ui是一种需求非常发散的产品，DCloud官方也无意用 `uni-ui` 压
 我们欢迎更多优秀的ui组件出现，也欢迎更多人贡献 `uni-ui` 的主题风格，满足更多用户的需求。
 
 
-# 快速开始
+## 快速开始
+
+uni-ui支持 HBuilderX直接新建项目模板、npm安装和单独导入个别组件等多种使用方式
+
+### 在HBuilderX 新建uni-app项目的模板中，选择uni-ui模板
+![HBuilderX内创建uni-ui项目](https://img.cdn.aliyun.dcloud.net.cn/uni-app/doc/create-uni-ui-project.jpg)
+
+由于uni-app独特的[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)技术，可以免引用、注册，直接使用各种符合规则的vue组件。
+
+在代码区键入`u`，拉出各种内置或uni-ui的组件列表，选择其中一个，即可使用该组件。
+
+光标放在组件名称上，按F1，可以查阅组件的文档。
+
+![uni-ui代码块](https://img.cdn.aliyun.dcloud.net.cn/uni-app/doc/uni-ui-snippet.jpg)
+
+### 通过 uni_modules 单独安装组件
+如果你没有创建uni-ui项目模板，也可以在你的工程里，通过 uni_modules 单独安装需要的某个组件。下表为uni-ui的扩展组件清单，点击每个组件在详情页面可以导入组件到项目下，导入后直接使用即可，无需import和注册。
+
+|组件名|组件说明|
+|---|---|
+|uni-badge|[数字角标](https://ext.dcloud.net.cn/plugin?name=uni-badge)|
+|uni-calendar|[日历](https://ext.dcloud.net.cn/plugin?name=uni-calendar)|
+|uni-card|[卡片](https://ext.dcloud.net.cn/plugin?name=uni-card)|
+|uni-collapse|[折叠面板](https://ext.dcloud.net.cn/plugin?name=uni-collapse)|
+|uni-combox|[组合框](https://ext.dcloud.net.cn/plugin?name=uni-combox)|
+|uni-countdown|[倒计时](https://ext.dcloud.net.cn/plugin?name=uni-countdown)|
+|uni-data-checkbox|[数据选择器](https://ext.dcloud.net.cn/plugin?name=uni-data-checkbox)|
+|uni-data-picker|[数据驱动的picker选择器](https://ext.dcloud.net.cn/plugin?name=uni-data-picker)|
+|uni-dateformat|[日期格式化](https://ext.dcloud.net.cn/plugin?name=uni-dateformat)|
+|uni-datetime-picker|[日期选择器](https://ext.dcloud.net.cn/plugin?name=uni-datetime-picker)|
+|uni-drawer|[抽屉](https://ext.dcloud.net.cn/plugin?name=uni-drawer)|
+|uni-easyinput|[增强输入框](https://ext.dcloud.net.cn/plugin?name=uni-easyinput)|
+|uni-fab|[悬浮按钮](https://ext.dcloud.net.cn/plugin?name=uni-fab)|
+|uni-fav|[收藏按钮](https://ext.dcloud.net.cn/plugin?name=uni-fav)|
+|uni-file-picker|[文件选择上传](https://ext.dcloud.net.cn/plugin?name=uni-file-picker)|
+|uni-forms|[表单](https://ext.dcloud.net.cn/plugin?name=uni-forms)|
+|uni-goods-nav|[商品导航](https://ext.dcloud.net.cn/plugin?name=uni-goods-nav)|
+|uni-grid|[宫格](https://ext.dcloud.net.cn/plugin?name=uni-grid)|
+|uni-group|[分组](https://ext.dcloud.net.cn/plugin?name=uni-group)|
+|uni-icons|[图标](https://ext.dcloud.net.cn/plugin?name=uni-icons)|
+|uni-indexed-list|[索引列表](https://ext.dcloud.net.cn/plugin?name=uni-indexed-list)|
+|uni-link|[超链接](https://ext.dcloud.net.cn/plugin?name=uni-link)|
+|uni-list|[列表](https://ext.dcloud.net.cn/plugin?name=uni-list)|
+|uni-load-more|[加载更多](https://ext.dcloud.net.cn/plugin?name=uni-load-more)|
+|uni-nav-bar|[自定义导航栏](https://ext.dcloud.net.cn/plugin?name=uni-nav-bar)|
+|uni-notice-bar|[通告栏](https://ext.dcloud.net.cn/plugin?name=uni-notice-bar)|
+|uni-number-box|[数字输入框](https://ext.dcloud.net.cn/plugin?name=uni-number-box)|
+|uni-pagination|[分页器](https://ext.dcloud.net.cn/plugin?name=uni-pagination)|
+|uni-popup|[弹出层](https://ext.dcloud.net.cn/plugin?name=uni-popup)|
+|uni-rate|[评分](https://ext.dcloud.net.cn/plugin?name=uni-rate)|
+|uni-row|[布局-行](https://ext.dcloud.net.cn/plugin?name=uni-row)|
+|uni-search-bar|[搜索栏](https://ext.dcloud.net.cn/plugin?name=uni-search-bar)|
+|uni-segmented-control|[分段器](https://ext.dcloud.net.cn/plugin?name=uni-segmented-control)|
+|uni-steps|[步骤条](https://ext.dcloud.net.cn/plugin?name=uni-steps)|
+|uni-swipe-action|[滑动操作](https://ext.dcloud.net.cn/plugin?name=uni-swipe-action)|
+|uni-swiper-dot|[轮播图指示点](https://ext.dcloud.net.cn/plugin?name=uni-swiper-dot)|
+|uni-table|[表格](https://ext.dcloud.net.cn/plugin?name=uni-table)|
+|uni-tag|[标签](https://ext.dcloud.net.cn/plugin?name=uni-tag)|
+|uni-title|[章节标题](https://ext.dcloud.net.cn/plugin?name=uni-title)|
+|uni-transition|[过渡动画](https://ext.dcloud.net.cn/plugin?name=uni-transition)|
 
-## 方式一：使用 uni_modules 安装（推荐）
 
 使用 `uni_modules` 方式安装组件库，可以直接通过插件市场导入，通过右键菜单快速更新组件，不需要引用、注册，直接在页面中使用 `uni-ui` 组件。[点击安装 uni-ui 组件库](https://ext.dcloud.net.cn/plugin?id=55)
 
@@ -62,8 +128,10 @@ ui是一种需求非常发散的产品，DCloud官方也无意用 `uni-ui` 压
 
 例如需更新 `uni-list`和`uni-badge` ,将 `uni_modules>uni-list>components`和`uni_modules>uni-badege>components`下所有目录拷贝到如下目录即可：
 
+
 **目录示例**
-```json {2,3,4,5,6,7}
+
+```json
 ┌─components              组件目录
 │  ├─uni-list             list 列表目录
 │  │  └─uni-list.vue      list 组件文件
@@ -82,10 +150,15 @@ ui是一种需求非常发散的产品，DCloud官方也无意用 `uni-ui` 压
 
 ```
 
+### 通过  `uni_modules` 导入全部组件
+如果想一次把所有uni-ui组件导入到项目中，只需要导入一个 `uni-ui` 组件即可 [点击去导入](https://ext.dcloud.net.cn/plugin?id=55)。
+
+如果没有自动导入其他组件，可以在 uni-ui 组件目录上右键选择 `安装三方插件依赖` 即可。
 
-## 方式二：使用 npm 安装
 
-在 `vue-cli` 项目中可以使用 `npm` 安装 `uni-ui` 库 ，或者直接在 `HBuilderX` 项目中使用 `npm` 。（不推荐后一种方式）
+
+### npm安装 
+在 `vue-cli` 项目中可以使用 `npm` 安装 `uni-ui` 库 ，或者直接在 `HBuilderX` 项目中使用 `npm` 。
 
 > **注意**
 > cli 项目默认是不编译 `node_modules` 下的组件的，导致条件编译等功能失效 ，导致组件异常
@@ -113,8 +186,8 @@ ui是一种需求非常发散的产品，DCloud官方也无意用 `uni-ui` 压
 npm i sass-loader@10.1.1 -D   或   yarn add sass-loader@10.1.1 -D
 ```
 
-> sass-loader 请使用低于 @11.0.0 的版本，[sass-loader@11.0.0 不支持 vue@2.6.12 ](https://stackoverflow.com/questions/66082397/typeerror-this-getoptions-is-not-a-function)
-
+> 如果 `node` 版本小于 16 ，sass-loader 请使用低于 @11.0.0 的版本，[sass-loader@11.0.0 不支持 vue@2.6.12 ](https://stackoverflow.com/questions/66082397/typeerror-this-getoptions-is-not-a-function)
+> 如果 `node` 版本大于 16 ， `sass-loader` 建议使用 `v8.x` 版本
 
 **安装 uni-ui**
 
@@ -124,44 +197,14 @@ npm i @dcloudio/uni-ui   或   yarn add @dcloudio/uni-ui
 
 
 
-在 ``script`` 中引用组件：
-
-```javascript
-import {uniBadge} from '@dcloudio/uni-ui'
-//import uniBadge from '@dcloudio/uni-ui/lib/uni-badge/uni-badge.vue' //也可使用此方式引入组件
-export default {
-    components: {uniBadge}
-}
-```
-
-
-在 ``template`` 中使用组件： 
-
-```html
-<uni-badge text="1"></uni-badge>
-<uni-badge text="2" type="success" @click="bindClick"></uni-badge>
-<uni-badge text="3" type="primary" :inverted="true"></uni-badge>
-```
-> **注意**
-> - `CLI` 引用方式， `H5` 端不支持在 `main.js` 中全局注册组件，如有需求请使用（[easyCom](https://uniapp.dcloud.io/collocation/pages?id=easycom)） 的方式引用组件
-> - 使用 npm 安装的组件，默认情况下 babel-loader 会忽略所有 node_modules 中的文件 ，导致条件编译失效，需要通过配置 `vue.config.js` 解决：
-> ```javascript
-> // 在根目录创建 vue.config.js 文件，并配置如下
-> module.exports = {
-> 	transpileDependencies: ['@dcloudio/uni-ui']
-> }
-> ```
-
-
-## 使用 npm + easycom 
+**配置easycom**
 
 使用 `npm` 安装好 `uni-ui` 之后，需要配置 `easycom` 规则，让 `npm` 安装的组件支持  `easycom`
 
 打开项目根目录下的 `pages.json` 并添加 `easycom` 节点：
 
-```javascript {8}
+```javascript
 // pages.json
-
 {
 	"easycom": {
 		"autoscan": true,
@@ -179,61 +222,25 @@ export default {
 
 ```
 
-### uni-ui 已支持的组件列表
-|组件名|组件说明|
-|---|---|
-|uni-badge|[数字角标](https://ext.dcloud.net.cn/plugin?name=uni-badge)|
-|uni-calendar|[日历](https://ext.dcloud.net.cn/plugin?name=uni-calendar)|
-|uni-card|[卡片](https://ext.dcloud.net.cn/plugin?name=uni-card)|
-|uni-collapse|[折叠面板](https://ext.dcloud.net.cn/plugin?name=uni-collapse)|
-|uni-combox|[组合框](https://ext.dcloud.net.cn/plugin?name=uni-combox)|
-|uni-countdown|[倒计时](https://ext.dcloud.net.cn/plugin?name=uni-countdown)|
-|uni-data-checkbox|[数据选择器](https://ext.dcloud.net.cn/plugin?name=uni-data-checkbox)|
-|uni-data-picker|[数据驱动的picker选择器](https://ext.dcloud.net.cn/plugin?name=uni-data-picker)|
-|uni-dateformat|[日期格式化](https://ext.dcloud.net.cn/plugin?name=uni-dateformat)|
-|uni-datetime-picker|[日期选择器](https://ext.dcloud.net.cn/plugin?name=uni-datetime-picker)|
-|uni-drawer|[抽屉](https://ext.dcloud.net.cn/plugin?name=uni-drawer)|
-|uni-easyinput|[增强输入框](https://ext.dcloud.net.cn/plugin?name=uni-easyinput)|
-|uni-fab|[悬浮按钮](https://ext.dcloud.net.cn/plugin?name=uni-fab)|
-|uni-fav|[收藏按钮](https://ext.dcloud.net.cn/plugin?name=uni-fav)|
-|uni-file-picker|[文件选择上传](https://ext.dcloud.net.cn/plugin?name=uni-file-picker)|
-|uni-forms|[表单](https://ext.dcloud.net.cn/plugin?name=uni-forms)|
-|uni-goods-nav|[商品导航](https://ext.dcloud.net.cn/plugin?name=uni-goods-nav)|
-|uni-grid|[宫格](https://ext.dcloud.net.cn/plugin?name=uni-grid)|
-|uni-group|[分组](https://ext.dcloud.net.cn/plugin?name=uni-group)|
-|uni-icons|[图标](https://ext.dcloud.net.cn/plugin?name=uni-icons)|
-|uni-indexed-list|[索引列表](https://ext.dcloud.net.cn/plugin?name=uni-indexed-list)|
-|uni-link|[超链接](https://ext.dcloud.net.cn/plugin?name=uni-link)|
-|uni-list|[列表](https://ext.dcloud.net.cn/plugin?name=uni-list)|
-|uni-load-more|[加载更多](https://ext.dcloud.net.cn/plugin?name=uni-load-more)|
-|uni-nav-bar|[自定义导航栏](https://ext.dcloud.net.cn/plugin?name=uni-nav-bar)|
-|uni-notice-bar|[通告栏](https://ext.dcloud.net.cn/plugin?name=uni-notice-bar)|
-|uni-number-box|[数字输入框](https://ext.dcloud.net.cn/plugin?name=uni-number-box)|
-|uni-pagination|[分页器](https://ext.dcloud.net.cn/plugin?name=uni-pagination)|
-|uni-popup|[弹出层](https://ext.dcloud.net.cn/plugin?name=uni-popup)|
-|uni-rate|[评分](https://ext.dcloud.net.cn/plugin?name=uni-rate)|
-|uni-row|[布局-行](https://ext.dcloud.net.cn/plugin?name=uni-row)|
-|uni-search-bar|[搜索栏](https://ext.dcloud.net.cn/plugin?name=uni-search-bar)|
-|Section|[标题栏](https://ext.dcloud.net.cn/plugin?name=uni-section)|
-|uni-segmented-control|[分段器](https://ext.dcloud.net.cn/plugin?name=uni-segmented-control)|
-|uni-steps|[步骤条](https://ext.dcloud.net.cn/plugin?name=uni-steps)|
-|uni-swipe-action|[滑动操作](https://ext.dcloud.net.cn/plugin?name=uni-swipe-action)|
-|uni-swiper-dot|[轮播图指示点](https://ext.dcloud.net.cn/plugin?name=uni-swiper-dot)|
-|uni-table|[表格](https://ext.dcloud.net.cn/plugin?name=uni-table)|
-|uni-tag|[标签](https://ext.dcloud.net.cn/plugin?name=uni-tag)|
-|uni-title|[章节标题](https://ext.dcloud.net.cn/plugin?name=uni-title)|
-|uni-transition|[过渡动画](https://ext.dcloud.net.cn/plugin?name=uni-transition)|
-
-
-### 其他
-
-- uni-ui 是全端兼容的基于flex布局的、无dom的ui库
-- uni-ui 是uni-app内置组件的扩展。注意与web开发不同，uni-ui不包括基础组件，它是基础组件的补充。web开发中有的开发者习惯用一个ui库完成所有开发，但在uni-app体系中，推荐开发者首先使用性能更高的基础组件，然后按需引入必要的扩展组件。
-
+在 ``template`` 中使用组件： 
 
-> **注意**
-> - `uni-ui` 不支持使用 `Vue.use()` 的方式安装
+```html
+<uni-badge text="1"></uni-badge>
+<uni-badge text="2" type="success" @click="bindClick"></uni-badge>
+<uni-badge text="3" type="primary" :inverted="true"></uni-badge>
+```
 
+ **注意**
+ - uni-ui 现在只推荐使用 `easycom` ，如自己引用组件，可能会出现组件找不到的问题
+ - 使用 npm 安装的组件，默认情况下 babel-loader 会忽略所有 node_modules 中的文件 ，导致条件编译失效，需要通过配置 `vue.config.js` 解决：
+	 ```javascript
+	 // 在根目录创建 vue.config.js 文件，并配置如下
+	 module.exports = {
+		transpileDependencies: ['@dcloudio/uni-ui']
+	 }
+	 ```
+ - uni-ui 是uni-app内置组件的扩展。注意与web开发不同，uni-ui不包括基础组件，它是基础组件的补充。web开发中有的开发者习惯用一个ui库完成所有开发，但在uni-app体系中，推荐开发者首先使用性能更高的基础组件，然后按需引入必要的扩展组件。
+ - `uni-ui` 不支持使用 `Vue.use()` 的方式安装
 
 
 ### 贡献代码
diff --git a/uni_modules/uni-upgrade-center-app/changelog.md b/uni_modules/uni-upgrade-center-app/changelog.md
index fff3c115c159dd941f9a58044ce8e130f5c44afc..ed4ecf35613d8557b69fec35d772442facc14d28 100644
--- a/uni_modules/uni-upgrade-center-app/changelog.md
+++ b/uni_modules/uni-upgrade-center-app/changelog.md
@@ -1,3 +1,20 @@
+## 0.4.2（2022-06-02）
+- 修复  wgt 包更新时错误处理的 bug
+## 0.4.1（2022-05-27）
+- 修复 上版引出的报错问题
+## 0.4.0（2022-05-27）
+- 新增 Android 支持跳转手机自带商店，填写升级包地址时请填写跳转商店链接
+- 新增 改为云对象调用方式，使用更直观
+## 0.3.3（2022-04-14）
+- 修复  调用 check-update，当 code 为 0 时没有回调
+## 0.3.2（2022-01-12）
+- 优化显示逻辑
+## 0.3.1（2021-11-24）
+- 修复 vue3 上图片不显示的Bug
+## 0.3.0（2021-11-18）
+- 移除 wgt 安装成功后提示，防止重启过快弹框不消失
+## 0.2.2（2021-08-25）
+- 兼容vue3.0
 ## 0.2.1（2021-07-26）
 - 修复  使用腾讯云并手动填写地址时，导致下载链接失效的bug
 ## 0.2.0（2021-07-13）
diff --git a/uni_modules/uni-upgrade-center-app/images/app_update_close.png b/uni_modules/uni-upgrade-center-app/images/app_update_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b2ffe62cba2466f184ea9f8ee4f9395ed8cf37a
Binary files /dev/null and b/uni_modules/uni-upgrade-center-app/images/app_update_close.png differ
diff --git a/uni_modules/uni-upgrade-center-app/images/bg_top.png b/uni_modules/uni-upgrade-center-app/images/bg_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..015f698cdd8c8caa63486a2bd87f5a96f17df630
Binary files /dev/null and b/uni_modules/uni-upgrade-center-app/images/bg_top.png differ
diff --git a/uni_modules/uni-upgrade-center-app/package.json b/uni_modules/uni-upgrade-center-app/package.json
index e6b8bff8064290dfbd5df9c7da61fb40694767e1..ae194bd556a5e7e0a5d6aa1178e1bd5f80ec0de3 100644
--- a/uni_modules/uni-upgrade-center-app/package.json
+++ b/uni_modules/uni-upgrade-center-app/package.json
@@ -1,11 +1,10 @@
 {
   "id": "uni-upgrade-center-app",
   "displayName": "升级中心 uni-upgrade-center - App",
-  "version": "0.2.1",
-  "description": "升级中心前台检查更新",
+  "version": "0.4.2",
+  "description": "uni升级中心 - 客户端检查更新",
   "keywords": [
     "uniCloud",
-    "admin",
     "update",
     "升级",
     "wgt"
@@ -47,21 +46,21 @@
       },
       "client": {
         "App": {
-          "app-vue": "u",
+          "app-vue": "y",
           "app-nvue": "u"
         },
         "H5-mobile": {
-          "Safari": "u",
-          "Android Browser": "u",
-          "微信浏览器(Android)": "u",
-          "QQ浏览器(Android)": "u"
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
         },
         "H5-pc": {
-          "Chrome": "u",
-          "IE": "u",
-          "Edge": "u",
-          "Firefox": "u",
-          "Safari": "u"
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
         },
         "小程序": {
           "微信": "u",
@@ -73,6 +72,10 @@
         "快应用": {
           "华为": "u",
           "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
         }
       }
     }
diff --git a/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue b/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
index 21ab39086821e72c9d0f099122131d84029cf215..ba6babdc24976089659660388f7bbb1ec0bc9689 100644
--- a/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
+++ b/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
@@ -3,7 +3,7 @@
 		<view class="content botton-radius">
 			<view class="content-top">
 				<text class="content-top-text">{{title}}</text>
-				<image class="content-top" style="top: 0;" width="100%" height="100%" src="../static/bg_top.png">
+				<image class="content-top" style="top: 0;" width="100%" height="100%" src="../images/bg_top.png">
 				</image>
 			</view>
 			<view class="content-header"></view>
@@ -20,7 +20,7 @@
 					</scroll-view>
 				</view>
 				<view class="footer flex-center">
-					<template v-if="isiOS">
+					<template v-if="isAppStore">
 						<button class="content-button" style="border: none;color: #fff;" plain @click="jumpToAppStore">
 							{{downLoadBtnTextiOS}}
 						</button>
@@ -55,7 +55,7 @@
 				</view>
 			</view>
 
-			<image v-if="!is_mandatory" class="close-img" src="../static/app_update_close.png"
+			<image v-if="!is_mandatory" class="close-img" src="../images/app_update_close.png"
 				@click.stop="closeUpdate"></image>
 		</view>
 	</view>
@@ -88,7 +88,7 @@
 			if (curV1 > curV2) {
 				result = 1
 				break;
-			} else if(curV1 < curV2) {
+			} else if (curV1 < curV2) {
 				result = -1
 				break;
 			}
@@ -183,6 +183,9 @@
 			},
 			isiOS() {
 				return !this.isWGT ? this.platform.includes(platform_iOS) : false;
+			},
+			isAppStore() {
+				return this.isiOS || (!this.isiOS && !this.isWGT && this.url.indexOf('.apk') === -1)
 			}
 		},
 		methods: {
@@ -192,10 +195,10 @@
 				if (localFilePathRecord) {
 					const {
 						version,
-						savedFilePath,
+						savedFilePath,
 						installed
-					} = localFilePathRecord
-					
+					} = localFilePathRecord
+
 					// 比对版本
 					if (!installed && compare(version, this.version) === 0) {
 						this.downloadSuccess = true;
@@ -299,19 +302,13 @@
 								uni.hideLoading()
 								this.restart();
 							}, 1000)
-						} else {
-							uni.showLoading({
-								icon: 'none',
-								title: '安装成功，重启应用体验新版',
-								duration: 1000
-							})
 						}
-					} else {
-						const localFilePathRecord = uni.getStorageSync(localFilePathKey)
-						uni.setStorageSync(localFilePathKey, {
-							...localFilePathRecord,
-							installed: true
-						})
+					} else {
+						const localFilePathRecord = uni.getStorageSync(localFilePathKey)
+						uni.setStorageSync(localFilePathKey, {
+							...localFilePathRecord,
+							installed: true
+						})
 					}
 				}, async err => {
 					// 如果是安装之前的包，安装失败后删除之前的包
@@ -503,4 +500,4 @@
 		flex-direction: column;
 		align-items: center;
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-upgrade-center-app/readme.md b/uni_modules/uni-upgrade-center-app/readme.md
index c39a57301f3b476edd9b8850f837abde034d0037..5bd4d5a7e203e4698b556e7678209d9d9011ec3c 100644
--- a/uni_modules/uni-upgrade-center-app/readme.md
+++ b/uni_modules/uni-upgrade-center-app/readme.md
@@ -4,19 +4,21 @@
 
 > 统一管理App及App在`Android`、`iOS`平台上`App安装包`和`wgt资源包`的发布升级
 
-> 本插件为升级中心前台检查更新，后台Admin管理系统请点击查看 [uni-upgrade-center](https://ext.dcloud.net.cn/plugin?id=4470)
+> uni升级中心分为业务插件和后台管理插件。本插件为业务插件，包括uni升级中心客户端检查更新的前后端逻辑。后台管理系统另见 [uni-upgrade-center - Admin](https://ext.dcloud.net.cn/plugin?id=4470)
 
-### 基于uni-upgrade-center的App前台检查升级插件
-  - 一键式检查更新，统一整包与wgt资源包更新
-  - 好看、实用、可自定义、可拓展的前台更新弹框
+### uni升级中心 - 客户端检查更新插件
+  - 一键式检查更新，同时支持整包升级与wgt资源包更新
+  - 好看、实用、可自定义的客户端提示框
 
 ## 安装指引
 
-0. 依赖数据库`opendb-app-versions`，如果没有此库，请在云服务空间中创建。
+1. 依赖数据库`opendb-app-versions`，如果没有此库，请在云服务空间中创建。
 
-1. 使用`HBuilderX 3.1.0+`，因为要使用到`uni_modules`
+2. 使用`HBuilderX 3.1.0+`，因为要使用到`uni_modules`
 
 3. 在插件市场打开本插件页面，在右侧点击`使用 HBuilderX 导入插件`，选择要导入的项目点击确定
+
+4. 绑定一个服务空间
 
 5. 找到`/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/check-version`，右键上传部署
 
@@ -43,7 +45,8 @@
 ]
 ```
 
-7. 将`@/uni_modules/uni-upgrade-center-app/utils/check-update`import到需要用到的地方，调用一下即可
+7. 将`@/uni_modules/uni-upgrade-center-app/utils/check-update`import到需要用到的地方，调用一下即可
+	1. 默认使用当前绑定的服务空间，如果要请求其他服务空间，可以使用其他服务空间的 `callFunction`。[详情](https://uniapp.dcloud.io/uniCloud/cf-functions.html#call-by-function-cross-space)
 
 8. 升级弹框可自行编写，也可以使用`uni.showModal`，或使用现有的升级弹框样式，如果不满足UI需求请自行替换资源文件。在`utils/check-update.js`中都有实例。
 
diff --git a/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/checkVersion.param.json b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/checkVersion.param.json
new file mode 100644
index 0000000000000000000000000000000000000000..f5e089070f900f6e9b64ae70990fba16adc4f79c
--- /dev/null
+++ b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/checkVersion.param.json
@@ -0,0 +1,14 @@
+// 本文件中的json内容将在云对象【运行】时作为参数传给云对象。
+// 配置教程参考：https://uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam
+{
+    // 调用云对象的方法名称
+    "method": "checkVersion",
+    // 传递给调用方法的参数列表
+    "params": [
+		{
+			"appid": "__UNI__HelloUNIApp",
+			"appVersion": "1.0.0",
+			"wgtVersion": "1.0.0"
+		}
+    ]
+}
diff --git a/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/index.obj.js b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/index.obj.js
new file mode 100644
index 0000000000000000000000000000000000000000..fe3549e3960af36d9c6b92edcfe4deffd99b8aab
--- /dev/null
+++ b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/index.obj.js
@@ -0,0 +1,148 @@
+// 开发文档: https://uniapp.dcloud.net.cn/uniCloud/cloud-obj
+module.exports = {
+	checkVersion: async function(event) {
+		/**
+		 * 检测升级 使用说明
+		 * 上传包：
+		 * 1. 根据传参，先检测传参是否完整，appid appVersion wgtVersion 必传
+		 * 2. 先从数据库取出所有该平台（从上下文读取平台信息，默认 Andriod）的所有线上发行更新
+		 * 3. 再从所有线上发行更新中取出版本最大的一版。如果可以，尽量先检测wgt的线上发行版更新
+		 * 4. 使用上步取出的版本包的版本号 和传参 appVersion、wgtVersion 来检测是否有更新，必须同时大于这两项，否则返回暂无更新
+		 * 5. 如果库中 wgt包 版本大于传参 appVersion，但是不满足 min_uni_version < appVersion，则不会使用wgt更新，会接着判断库中 app包version 是否大于 appVersion
+		 */
+
+		const clientInfo = this.getClientInfo()
+
+		let {
+			appid,
+			appVersion,
+			wgtVersion,
+		} = event;
+
+		const platform_Android = 'Android';
+		const platform_iOS = 'iOS';
+		const package_app = 'native_app';
+		const package_wgt = 'wgt';
+		const app_version_db_name = 'opendb-app-versions'
+
+		let platform = platform_Android;
+
+		platform = clientInfo.OS === 'android' ?
+			platform_Android :
+			clientInfo.OS === 'ios' ?
+			platform_iOS :
+			platform_Android;
+
+		if (appid && appVersion && wgtVersion && platform) {
+			const collection = uniCloud.database().collection(app_version_db_name);
+
+			const record = await collection.where({
+					appid,
+					platform,
+					stable_publish: true
+				})
+				.orderBy('create_date', 'desc')
+				.get();
+
+			if (record && record.data && record.data.length > 0) {
+				const appVersionInDb = record.data.find(item => item.type === package_app) || {};
+				const wgtVersionInDb = record.data.find(item => item.type === package_wgt) || {};
+				const hasAppPackage = !!Object.keys(appVersionInDb).length;
+				const hasWgtPackage = !!Object.keys(wgtVersionInDb).length;
+
+				// 取两个版本中版本号最大的包，版本一样，使用wgt包
+				let stablePublishDb = hasAppPackage ?
+					hasWgtPackage ?
+					compare(wgtVersionInDb.version, appVersionInDb.version) >= 0 ?
+					wgtVersionInDb :
+					appVersionInDb :
+					appVersionInDb :
+					wgtVersionInDb;
+
+				const {
+					version,
+					min_uni_version
+				} = stablePublishDb;
+
+				// 库中的version必须满足同时大于appVersion和wgtVersion才行，因为上次更新可能是wgt更新
+				const appUpdate = compare(version, appVersion) === 1; // app包可用更新
+				const wgtUpdate = compare(version, wgtVersion) === 1; // wgt包可用更新
+
+				if (Object.keys(stablePublishDb).length && appUpdate && wgtUpdate) {
+					// 判断是否可用wgt更新
+					if (min_uni_version && compare(min_uni_version, appVersion) < 1) {
+						return {
+							code: 101,
+							message: 'wgt更新',
+							...stablePublishDb
+						};
+					} else if (hasAppPackage && compare(appVersionInDb.version, appVersion) === 1) {
+						return {
+							code: 102,
+							message: '整包更新',
+							...appVersionInDb
+						};
+					}
+				}
+
+				return {
+					code: 0,
+					message: '当前版本已经是最新的，不需要更新'
+				};
+			}
+
+			return {
+				code: -101,
+				message: '暂无更新或检查appid是否填写正确'
+			};
+		}
+
+		return {
+			code: -102,
+			message: '请检查传参是否填写正确'
+		};
+	}
+}
+
+/**
+ * 对比版本号，如需要，请自行修改判断规则
+ * 支持比对	("3.0.0.0.0.1.0.1", "3.0.0.0.0.1")	("3.0.0.1", "3.0")	("3.1.1", "3.1.1.1") 之类的
+ * @param {Object} v1
+ * @param {Object} v2
+ * v1 > v2 return 1
+ * v1 < v2 return -1
+ * v1 == v2 return 0
+ */
+function compare(v1 = '0', v2 = '0') {
+	v1 = String(v1).split('.')
+	v2 = String(v2).split('.')
+	const minVersionLens = Math.min(v1.length, v2.length);
+
+	let result = 0;
+	for (let i = 0; i < minVersionLens; i++) {
+		const curV1 = Number(v1[i])
+		const curV2 = Number(v2[i])
+
+		if (curV1 > curV2) {
+			result = 1
+			break;
+		} else if (curV1 < curV2) {
+			result = -1
+			break;
+		}
+	}
+
+	if (result === 0 && (v1.length !== v2.length)) {
+		const v1BiggerThenv2 = v1.length > v2.length;
+		const maxLensVersion = v1BiggerThenv2 ? v1 : v2;
+		for (let i = minVersionLens; i < maxLensVersion.length; i++) {
+			const curVersion = Number(maxLensVersion[i])
+			if (curVersion > 0) {
+				v1BiggerThenv2 ? result = 1 : result = -1
+				break;
+			}
+		}
+	}
+
+	return result;
+}
diff --git a/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/package.json b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..e36bef9eef59aabe12b2bfc4b2af19ac3bfe53d9
--- /dev/null
+++ b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "checkVersion",
+  "dependencies": {},
+  "extensions": {
+    "uni-cloud-jql": {}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-upgrade-center-app/utils/call-check-version.js b/uni_modules/uni-upgrade-center-app/utils/call-check-version.js
index a2ed34ce8bb685794cdb39d98e1780a345edb5ab..f7f476d49e25a5fcaf38f010a6af045c86d91a34 100644
--- a/uni_modules/uni-upgrade-center-app/utils/call-check-version.js
+++ b/uni_modules/uni-upgrade-center-app/utils/call-check-version.js
@@ -1,20 +1,21 @@
+const {
+	checkVersion
+} = uniCloud.importObject('checkVersion')
+
 export default function() {
 	// #ifdef APP-PLUS
 	return new Promise((resolve, reject) => {
 		plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
-			uniCloud.callFunction({
-				name: 'check-version',
-				data: {
-					appid: plus.runtime.appid,
-					appVersion: plus.runtime.version,
-					wgtVersion: widgetInfo.version
-				},
-				success: (e) => {
-					resolve(e)
-				},
-				fail: (error) => {
-					reject(error)
-				}
+			checkVersion({
+				appid: plus.runtime.appid,
+				appVersion: plus.runtime.version,
+				wgtVersion: widgetInfo.version
+			}).then(result => {
+				resolve({
+					result
+				})
+			}).catch(err => {
+				reject(err)
 			})
 		})
 	})
@@ -26,4 +27,4 @@ export default function() {
 		})
 	})
 	// #endif
-}
+}
diff --git a/uni_modules/uni-upgrade-center-app/utils/check-update.js b/uni_modules/uni-upgrade-center-app/utils/check-update.js
index cd5bcb6d607af9aba40a94e6656c52b5fa238210..2da41d20d50f17771f165f92a5f58a76107f8f02 100644
--- a/uni_modules/uni-upgrade-center-app/utils/check-update.js
+++ b/uni_modules/uni-upgrade-center-app/utils/check-update.js
@@ -63,12 +63,15 @@ export default function() {
 						console.error('更新弹框跳转失败', err)
 						uni.removeStorageSync(PACKAGE_INFO_KEY)
 					}
-				})
+				})
+				
+				return
 			} else if (code < 0) {
 				// TODO 云函数报错处理
-				console.error(message)
-				reject(e)
+				console.error(message)
+				return reject(e)
 			}
+			return resolve(e)
 		}).catch(err => {
 			// TODO 云函数报错处理
 			console.error(err.message)
