commit a432b7059c0dbc054b47b51d36202b54b831f084
Author: caill <815519168@qq.com>
Date:   Wed Jun 18 10:48:40 2025 +0800

    恒森类似项目

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8c45c81
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+node_modules/
+.project
+unpackage/
+.DS_Store
\ No newline at end of file
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..a97fd25
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,20 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}
diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..58b029a
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,24 @@
+<script>
+	export default {
+		onLaunch: function() {
+			// #ifdef APP-PLUS
+			plus.screen.lockOrientation('portrait-primary');
+			// plus.navigator.setFullscreen(true);
+			// #endif
+		},
+		onHide: function() {
+			console.log('App Hide')
+		},
+		onUnload() {
+			// #ifdef APP-PLUS
+			plus.screen.lockOrientation('portrait-primary');
+			// #endif
+		}
+	}
+</script>
+
+<style lang="stylus">
+	/*每个页面公共css */
+	@import '@/common/style/reset.css';
+	@import '@/common/style/layout.styl';
+</style>
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..98e1947
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+# 注意事项
++ 原生APP云打包使用自有证书
++ 证书别名：testalias
++ 接口在线地址：(https://apifox.com/apidoc/shared-e9d4798e-2db1-493d-a0cb-7a0e881c4bd6/api-160097540)
++ app图标为lms
++ 接口在线地址：http://47.98.105.245:8001/project/21/interface/api/cat_122
\ No newline at end of file
diff --git a/common/style/layout.styl b/common/style/layout.styl
new file mode 100644
index 0000000..c5961d5
--- /dev/null
+++ b/common/style/layout.styl
@@ -0,0 +1,535 @@
+@import './mixin.styl';
+page {
+    background-color: #f2f5fa !important;
+    min-height: 100% !important;
+    height: 100% !important;
+}
+uni-page-body {
+	min-height: 100% !important;
+	height: 100% !important;
+}
+uni-button:after {
+	border: none;
+}
+
+/** 内容 */
+.zd_container {
+	width: 100%;
+	height: 100%;
+}
+.zd_content {
+	position: relative;
+	top: calc(var(--status-bar-height) + 72rpx);
+	width: 100%;
+	height: auto;
+	padding: 20rpx 14rpx 140rpx 14rpx;
+}
+.zd_content_1 {
+	top: calc(var(--status-bar-height) + 136rpx);
+}
+.zd_wrapper {
+	width: 100%;
+	height: auto;
+	background-color: #fff;
+	border-radius: 10rpx;
+	padding: 22rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
+}
+.filter_wrapper {
+	position relative
+	left -14rpx
+	width: calc(100% + 28rpx);
+	height: auto;
+	background-color: #fff;
+	padding: 22rpx 22rpx 0 22rpx;
+	margin-bottom: 20rpx;
+}
+.filter_label {
+	display: block;
+	line-height: 80rpx;
+	font-size: 28rpx;
+	color: #323232;
+	font-weight: bold;
+	letter-spacing: 4rpx;
+	padding-left: 10rpx;
+	/* text-align:justify;
+	text-align-last: justify;
+	text-justify: inter-ideograph; */
+}
+/** 筛选选择器样式 */
+.filter_picker .uni-input {
+	width: 100%;
+	line-height: 80rpx;
+	height: 80rpx;
+	font-size: 28rpx;
+	color: #606266;
+}
+/** 筛选下拉框带搜索过滤功能样式 */
+.filter_select .uni-select {
+	line-height: 80rpx !important;
+	height: 80rpx !important;
+	font-size: 28rpx !important;
+	color: #606266;
+	padding: 0 !important;
+	border: 0 !important;
+}
+.filter_input {
+	width: 100%;
+	height: 80rpx;
+	line-height: 28rpx;
+	border: 0;
+	background-color: transparent;
+	font-size: 28rpx;
+	color: #606266;
+	white-space: pre-wrap;
+	overflow-wrap: break-word;
+}
+.filter_input_disabled {
+	background-color: #eee;
+}
+.filter_input_wraper {
+	/* flex: 1; */
+	width: calc(100% - 170rpx);
+	height: 80rpx;
+	padding: 5rpx 0;
+	margin-left: 30rpx;
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+}
+.tab-line {
+	_wh(32rpx, 10rpx)
+	background-color #fff
+	border-radius 10rpx
+	margin 20rpx auto 0
+}
+.tab-line_active {
+	background-color #4e6ef2
+}
+.font-style-1 {
+	_font(32rpx, 32rpx, #c1c1c3,,center)
+}
+.font-style-2 {
+	_font(32rpx, 32rpx, #000,bold,center)
+}
+.grid-wraper {
+	width: 100%;
+	padding: 10rpx;
+}
+.slide_new {
+	width: 100%;
+	height: 100%;
+	overflow-y: auto;
+}
+.slide_new table {
+	table-layout: fixed;
+	min-width: 100%;
+	border-collapse: separate;
+	-webkit-border-horizontal-spacing: 0px;
+	-webkit-border-vertical-spacing: 10rpx;
+	padding-bottom: 8rpx;
+	background-color: #f5f5f5;
+}
+.slide_new table th {
+	position: sticky;
+	top: 0;
+	left: 0;
+	z-index: 120;
+	font-size: 26rpx;
+	line-height: 98rpx;
+	color: #696969;
+	font-weight: bold;
+	text-align: center;
+	box-sizing: border-box;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	padding: 0 20rpx;
+	background: #d7d7d7;
+}
+.slide_new table th:first-child{
+	left: 0;
+	z-index: 121;
+	color: #4e6ef2;
+	font-weight: bold;
+	box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
+}
+.slide_new table th.th_2 {
+	left: 86rpx;
+	z-index: 122;
+	box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
+}
+.slide_new table td {
+	font-size: 28rpx;
+	line-height: 98rpx;
+	color: #323232;
+	text-align: center;
+	box-sizing: border-box;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	padding: 0 20rpx;
+	background: #fff;
+}
+.slide_new table td:first-child{
+	position: sticky;
+	left: 0;
+	z-index: 100;
+	color: #4e6ef2;
+	font-weight: bold;
+	box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
+}
+.slide_new table td.td_2 {
+	position: sticky;
+	left: 86rpx;
+	z-index: 101;
+	box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
+}
+.slide_new table th .td_3, .slide_new table td.td_3 {
+	width: 100px;
+	line-height: 28rpx;
+	white-space: unset;
+}
+.slide_new table th.fontcol1,.slide_new table td.fontcol1 {
+	color: #4e6ef2;
+	font-weight: bold;
+}
+.slide_new table th.fontcol2,.slide_new table td.fontcol2 {
+	color: #d7592f;
+	font-weight: bold;
+}
+.slide_new table tr.checked {
+	// background-image: linear-gradient(to top,#c2cde3,#f6f7fb);
+	background-color: #6190e8;
+}
+.slide_new table tr.checked td {
+	background-color: transparent;
+	color: #fff;
+}
+.slide_new table tr.checked td:first-child {
+	// background-image: linear-gradient(to top,#c2cde3,#f6f7fb);
+	background-color: #6190e8;
+}
+.slide_new table tr.checked td:nth-child(2) {
+	// background-image: linear-gradient(to top,#c2cde3,#f6f7fb);
+	background-color: #6190e8;
+}
+.slide_new table tr.checked td:first-child {
+	border-left: 1rpx solid #6798ef;
+}
+.slide_new table tr.checked td:last-child {
+	border-right: 1rpx solid #6798ef;
+}
+
+.item-wrapper {
+	width: 100%;
+	height: auto;
+}
+.item-wrap {
+	background-color: #fff;
+	border-radius: 24rpx;
+	padding: 22rpx 14rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
+}
+.item-font-1
+	_font(30rpx,52rpx,#000,,)
+.item-font-2
+	_font(26rpx,52rpx,$red,,)
+.item-font-3
+	_font(26rpx,38rpx,#333,,)
+	text-align:justify;
+	text-align-last: justify;
+	text-justify: inter-ideograph;
+.item-font-4
+	_font(26rpx,38rpx,#999,,)
+.item-font-5
+	_font(44rpx,60rpx,$green,,center)
+	background-color #f6f6f6
+.item-font-6
+	height 52rpx
+	_font(26rpx,52rpx,#666,,center)
+	background-color #e5e5e5
+	border-radius 10rpx
+.item-font-7
+	_font(24rpx,52rpx,#666,,center)
+.item-font-8
+	_font(24rpx,52rpx,#666,,center)
+.isChecked
+	box-shadow inset 2px 2px 4px 0px rgba(120, 141, 250, 0.7), inset -2px -2px 4px 0px rgba(120, 141, 250, 0.7)
+/** 提交栏 **/
+.submit-bar {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	z-index: 200;
+	background-color: #fff;
+	padding: 14rpx;
+	box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
+}
+.button-default {
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #ff6a00;
+	text-align: center;
+	letter-spacing: 4rpx;
+	padding: 0;
+	background-color: #fff;
+	border: 2rpx solid #ff6a00;
+	border-radius: 10rpx;
+}
+.button-primary {
+	display: grid;
+	place-items: center; /* 垂直和水平居中 */
+	font-size: 34rpx;
+	line-height: 34rpx;
+	height: 88rpx;
+	color: #fff;
+	text-align: center;
+	letter-spacing: 4rpx;
+	padding: 0;
+	background-color: #ff6a00;
+	border: 2rpx solid #ff6a00;
+	border-radius: 10rpx;
+}
+.button-info, .submit-button[disabled] {
+	background-color: #c9c9c9;
+	border: 2rpx solid #c9c9c9;
+	color: #fff;
+}
+uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
+	border: 2rpx solid #c9c9c9;
+}
+.submit-more {
+	width: 20%;
+	font-size: 34rpx;
+	line-height: 34rpx;
+	padding: 27rpx 10rpx;
+	color: #000;
+	text-align: center;
+	background-color: #fff
+}
+.more_btns_wraper {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	z-index: 201;
+	padding: 0 20rpx 20rpx;
+	transition: all .3s;
+}
+.more-button {
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #ff6a00;
+	text-align: center;
+	border-radius: 0;
+	background-color: transparent;
+}
+.more_btns_items .btn-disabled, .more_btns_items .submit-button_new[disabled] {
+	color: #c9c9c9;
+	border: none;
+}
+.more-button:last-child {
+	border-bottom: none;
+}
+.more_btns_cancle {
+	margin-top: 20rpx;
+	width: 100%;
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #000;
+	text-align: center;
+	background-color: #fff;
+	border-radius: 20rpx;
+}
+.more_btns_items{
+	width: 100%;
+	border-radius: 20rpx;
+	background-color: #fff;
+}
+
+/** 下拉框 */
+.uni-select__selector {
+	z-index: 300 !important;
+}
+  
+/** 弹窗 */
+.popshow {
+	transform: translateY(0);
+}
+.pophide {
+	transform: translateY(100%);
+}
+.msg_wrapper {
+	position: fixed;
+	top: auto;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	// height: calc(100% - var(--status-bar-height) - 72rpx);
+	height auto;
+	min-height 30%;
+	max-height: calc(100% - var(--status-bar-height) - 72rpx);
+	background-color: #f6f6f6;
+	box-shadow: 0 -8px 16px 0 rgba(28,31,33,.1);
+	border-top-left-radius: 20rpx;
+	border-top-right-radius: 20rpx;
+	z-index: 301;
+	transition: all .3s;
+}
+.pop-line {
+	width: 10%;
+	height: 8rpx;
+	margin: 0 auto 14rpx auto;
+	background-color: #d4d4d4;
+	border-radius: 8rpx;
+}
+.msg_content {
+	width: 100%;
+	height: 100%;
+	overflow-y: scroll;
+}
+.msg_box {
+	width: 100%;
+}
+.msg_mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	opacity: .7;
+	background: #000;
+	z-index: 300;
+}
+.msg_btns {
+	width: 100%;
+	margin: 40rpx auto 0;
+}
+.msg_btn {
+	font-size: 34rpx;
+	line-height: 78rpx;
+	color: #fff;
+	background-color: #ff6a00;
+	border: 1rpx solid #ff6a00;
+	border-radius: 44rpx;
+	box-shadow: 0 8rpx 18rpx 0 rgba(0,0,0,.2);
+}
+.msg_btn_cancle {
+	background-color: #fff;
+	border: 1rpx solid #ff6a00;
+	font-size: 34rpx;
+	line-height: 78rpx;
+	border-radius: 44rpx;
+	color: #000;
+	box-shadow: 0 8rpx 18rpx 0 rgba(0,0,0,.2);
+}
+.msg_btn:disabled {
+	background-color: #c9c9c9;
+}
+.uni-select__input-placeholder,.uni-select__selector-empty, .uni-select__selector-item {
+	font-size: 28rpx !important
+}
+.sin_input {
+	width: 150rpx;
+	font-size: 28rpx;
+	line-height: 150rpx;
+	height: 68rpx;
+	color: #323232;
+	padding: 0 .1rem;
+	border: 1px solid #a1a1a1;
+	border-radius: 3px;
+}
+.layout-t tr.checked td .sin_input {
+	color: #8a8a8a;
+	border: 1px solid #ffffff;
+}
+
+.flow_wrapper {
+	width: 100%;
+	background-color: #fff;
+	border-radius: 24rpx;
+	padding: 22rpx 20rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
+}
+.font-size-1 {
+	font-size: 30rpx;
+	line-height: 30rpx;
+	color: #ff6a00;
+	word-break: break-all;
+}
+.font-size-2 {
+	font-size: 30rpx;
+	line-height: 54rpx;
+	color: #000;
+}
+.flow_start_item {
+	position: relative;
+	background-color: #f3f3f3;
+	border: 1rpx solid #f3f3f3;
+	border-radius: 10rpx;
+}
+.flow_start_item_checked {
+	position: relative;
+	background-color: #fff;
+	border: 1rpx solid #ff6a00;
+}
+.flow_icon_item_1 {
+	width: 46rpx;
+	height: 56rpx;
+}
+.flow_icon_item_2 {
+	width: 46rpx;
+	height: 26rpx;
+}
+// 日历
+.uni-calendar__mask, .uni-calendar--fixed {
+	z-index: 300 !important
+}
+.uni-date-x--border {
+	border-width: 0 !important
+}
+.uni-date-x {
+	background-color: transparent !important
+}
+// 标签页
+.tab-item-wraper {
+	position: fixed;
+	top: calc(var(--status-bar-height) + 72rpx);
+	z-index 200
+	background-color: $red
+	box-shadow: 0 6rpx 10rpx 0 rgba(255, 106, 0, .25)
+}
+.tab-item {
+	position relative
+	font-size: 28rpx
+	line-height: 60rpx
+	color: #fbd5d5
+	text-align: center
+	margin: 0 30rpx 0 30rpx
+}
+.tab-item_active {
+	color: #fff
+	font-weight 700
+}
+.tab-item_active::after {
+	position absolute
+	bottom 0
+	left 15%
+	content ''
+	width 70%
+	height 4rpx
+	background-color #fff
+}
+.del-icon {
+	right 32px
+}
+.mini-btn {
+	margin-right: 0;
+}
\ No newline at end of file
diff --git a/common/style/mixin.styl b/common/style/mixin.styl
new file mode 100644
index 0000000..f564d40
--- /dev/null
+++ b/common/style/mixin.styl
@@ -0,0 +1,51 @@
+$red = #ff6a00
+$green = #6CBE8B
+$yellow = #E9B451
+$blue = #6798ef
+$gray = #c9c9c9
+$fc1 = #323232
+
+.bgred
+  background-color: $red !important
+.bggreen
+  background-color: $green !important
+.bgyellow
+  background-color: $yellow !important
+.bgblue
+  background-color: $blue !important
+.bggray
+  background-color: $gray !important
+
+//宽高
+_wh(w, h)
+  width: w
+  height: h
+
+//字体大小、行高、颜色
+_font(size,height,color=$fc1,weight=normal,align=left)
+  font-size: size
+  line-height: height
+  color: color
+  font-weight: weight
+  text-align: align
+
+//flex 布局和 子元素 对其方式
+_fj(x=space-between,y=center,r=row,n=nowrap)
+  display: flex
+  justify-content: x
+  align-items: y
+  flex-direction: r
+  flex-wrap: n
+
+// 背景图片地址和大小
+_bis(url,w,h=auto,x=center,y=center)
+  background-position: x y
+  background-size: w h
+  background-image: url(url)
+  background-repeat: no-repeat
+
+// 定位上下居中
+_ct()
+  position: absolute
+  top: 50%
+  transform: translateY(-50%)
\ No newline at end of file
diff --git a/common/style/reset.css b/common/style/reset.css
new file mode 100644
index 0000000..680bafb
--- /dev/null
+++ b/common/style/reset.css
@@ -0,0 +1,158 @@
+* {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+	font-style: normal;
+	text-decoration: none;
+	border: none;
+	outline: none;
+	font-family: Arial, "Microsoft Yahei", "Helvetica Neue", Helvetica, sans-serif;
+	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-webkit-tap-highlight-color:transparent;
+	-webkit-font-smoothing: antialiased;
+}
+
+body, html {
+	-webkit-user-select: auto;
+	-ms-user-select: auto;
+	user-select: auto; 
+}
+
+input[type="button"], input[type="submit"], input[type="search"], input[type="reset"], textarea, select{
+	-webkit-appearance: none;
+	appearance: none;
+}
+
+.relative {
+	position: relative;
+}
+.absolute {
+	position: absolute;
+}
+.hide {
+	display: none;
+}
+.vhide {
+	visibility:hidden;
+}
+.show {
+	display: block;
+}
+.ellipsis{
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.flexcol {
+	flex-direction: column;
+}
+.flexstart {
+	align-items: flex-start !important;
+}
+.jcflexstart {
+	justify-content: flex-start !important;
+}
+.jcflexend {
+	justify-content: flex-end !important;
+}
+.jccenter {
+	justify-content: center !important;
+}
+
+.zd-row {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.zd-col-24 {
+	width: 100%;
+}
+.zd-col-23 {
+    width: 95.83333%
+}
+.zd-col-22 {
+    width: 91.66667%
+}
+.zd-col-21 {
+    width: 87.5%
+}
+.zd-col-20 {
+    width: 83.33333%
+}
+.zd-col-19 {
+    width: 79.16667%
+}
+.zd-col-18 {
+    width: 75%
+}
+.zd-col-17 {
+    width: 70.83333%
+}
+.zd-col-16 {
+    width: 66.66667%
+}
+.zd-col-15 {
+    width: 62.5%
+}
+.zd-col-14 {
+    width: 58.33333%
+}
+.zd-col-13 {
+    width: 54.16667%
+}
+.zd-col-12 {
+	width: 50%;
+}
+.zd-col-11 {
+    width: 45.83333%
+}
+.zd-col-10 {
+    width: 41.66667%
+}
+.zd-col-9 {
+    width: 37.5%
+}
+.zd-col-8 {
+    width: 33.33333%
+}
+.zd-col-7 {
+    width: 29.16667%
+}
+.zd-col-6 {
+    width: 25%
+}
+.zd-col-5 {
+    width: 20.83333%
+}
+.zd-col-4 {
+    width: 16.66667%
+}
+.zd-col-3 {
+    width: 12.5%
+}
+.zd-col-2 {
+    width: 8.33333%
+}
+.zd-col-1 {
+    width: 4.16667%
+}
+.border-bottom {
+	border-bottom: 1rpx solid #e5e5e5;
+}
+.mgb10 {
+	margin-bottom: 10rpx;
+}
+.pdl20 {
+	padding-left: 20rpx;
+}
+.pdr20 {
+	padding-right: 20rpx;
+}
+.pdr10 {
+	padding-right: 10rpx;
+}
+.pdt0 {
+	padding-top: 0 !important
+}
\ No newline at end of file
diff --git a/components/LinkScan.vue b/components/LinkScan.vue
new file mode 100644
index 0000000..6cda7e8
--- /dev/null
+++ b/components/LinkScan.vue
@@ -0,0 +1,87 @@
+<template>
+	<view class="search_wraper">
+		<input 
+		type="text" 
+		class="filter_input pdr120" 
+		confirm-type="go"
+		:value="value"
+		:focus="focusState"
+		@focus="handleFocus"
+		@blur="handleBlur"
+		@confirm="handleSend">
+		<view class="filter_num">{{editValue.toString()}}</view>
+		<view class="zd-row buttons_wraper">
+			<uni-icons v-show="editValue.length > 0" class="pdr10"  type="clear" size="24" color="#666" @tap="linkDel"></uni-icons>
+			<uni-icons v-show="value !== '' && value !== null && value !== undefined" class="pdr10" type="clear" size="24" color="#666" @tap="toDel"></uni-icons>
+			<uni-icons type="scan" size="22" :color="focusState ? '#ff6a00' : '#4e6ef2'" @tap="focusState=true"></uni-icons>
+		</view>
+	</view>
+</template>
+
+<script>
+	import permision from "@/utils/permission.js"
+	export default {
+		data() {
+			return {
+				focusState: false
+			};
+		},
+		model: {
+			prop: 'value',
+			event: 'input'
+		},
+		props: {
+			value: String,
+			editValue: Array
+		},
+		methods: {
+			handleFocus () {
+				this.focusState = true
+			},
+			handleBlur (e) {
+				this.$emit('input', e.target.value)
+				// if (e.target.value.length) {
+				// 	this.$emit('handleChange', e.target.value)
+				// }
+				this.focusState = false
+			},
+			toDel () {
+				this.$emit('input', '')
+				this.$emit('handleDel')
+			},
+			linkDel () {
+				this.$emit('linkDel')
+			},
+			handleSend (e) {
+				this.$emit('input', e.target.value)
+				if (e.target.value.length) {
+					this.$emit('handleChange', e.target.value)
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../common/style/mixin.styl';
+.search_wraper
+	position relative
+	_wh(100%, 80rpx)
+.pdr120
+	padding-right: 50%;
+.buttons_wraper
+	position absolute
+	top 0
+	right 10rpx
+	_wh(auto, 80rpx)
+.pdr10
+	padding-right 10rpx
+.filter_num
+	position absolute
+	top 0
+	right 50px
+	width calc(50% - 50px)
+	overflow hidden
+	text-overflow ellipsis
+	line-height 80rpx
+</style>
diff --git a/components/NavBar.vue b/components/NavBar.vue
new file mode 100644
index 0000000..eeb59d1
--- /dev/null
+++ b/components/NavBar.vue
@@ -0,0 +1,64 @@
+<template>
+	<view class="zd-row jcflexstart header">
+		<view class="zd-col-4">
+			<uni-icons @tap="goBack" type="back" size="26" color="#fff"></uni-icons>
+		</view>
+		<view class="zd-col-16 page_name">{{title}}</view>
+		<view v-if="searchActive" class="zd-col-4" style="text-align: right">
+			<uni-icons @tap="toSearch" type="search" size="26" color="#fff"></uni-icons>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+			};
+		},
+		props: {
+			title: String,
+			inner: {
+				type: Boolean,
+				default: false
+			},
+			inner2: {
+				type: Boolean,
+				default: false
+			},
+			searchActive: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			goBack () {
+				if (this.inner) {
+					uni.navigateBack()
+				} else if (this.inner2) {
+					this.$emit('goIn')
+				} else {
+					uni.redirectTo({
+						url: '/pages/home/home'
+					})
+				}
+			},
+			toSearch () {
+				this.$emit('toSearch')
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '@/common/style/mixin.styl';
+.header
+	position fixed
+	_wh(100%, calc(var(--status-bar-height) + 72rpx))
+	// background: linear-gradient(to bottom, #ff6800 0%, #ff6400 100%)
+	background-color $red
+	z-index 200
+	padding var(--status-bar-height) 20rpx 0 
+.page_name
+	_font(32rpx, 32rpx, #fff,700,center)
+</style>
diff --git a/components/NumberInput.vue b/components/NumberInput.vue
new file mode 100644
index 0000000..5a3e3f5
--- /dev/null
+++ b/components/NumberInput.vue
@@ -0,0 +1,34 @@
+<template>
+  <input
+    class="filter_input"
+    type="number"
+    :value="value"
+    :placeholder="placeholder"
+    @input="onInput"
+	@confirm="onInput"
+  />
+</template>
+
+<script>
+export default {
+  props: {
+    value: {
+      type: [Number, String],
+      default: '',
+    },
+	placeholder: String
+  },
+  methods: {
+    onInput(event) {
+      // 获取输入值
+      const value = event.detail ? event.detail.value : event.target.value;
+      // 格式化输入值
+      let formattedValue = value.replace(/[^0-9.]/g, '')
+	  formattedValue = parseFloat(formattedValue)
+	  formattedValue = formattedValue > 0 ? formattedValue : ''
+      this.$emit('input', formattedValue);
+	  event.target.value = formattedValue
+    }
+  },
+};
+</script>
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
new file mode 100644
index 0000000..29ac87e
--- /dev/null
+++ b/components/SearchBox.vue
@@ -0,0 +1,73 @@
+<template>
+	<view class="search_wraper">
+		<input 
+		type="text" 
+		class="filter_input pdr120" 
+		confirm-type="go"
+		:value="value"
+		:focus="focusState"
+		@focus="handleFocus"
+		@blur="handleBlur"
+		@confirm="handleSend">
+		<view class="zd-row buttons_wraper">
+			<uni-icons v-show="value !== '' && value !== null && value !== undefined" class="pdr10" type="clear" size="24" color="#666" @tap="toDel"></uni-icons>
+			<uni-icons type="scan" size="22" :color="focusState ? '#ff6a00' : '#4e6ef2'" @tap="focusState=true"></uni-icons>
+		</view>
+	</view>
+</template>
+
+<script>
+	import permision from "@/utils/permission.js"
+	export default {
+		data() {
+			return {
+				focusState: false
+			};
+		},
+		model: {
+			prop: 'value',
+			event: 'input'
+		},
+		props: {
+			value: String
+		},
+		methods: {
+			handleFocus () {
+				this.focusState = true
+			},
+			handleBlur (e) {
+				this.$emit('input', e.target.value)
+				// if (e.target.value.length) {
+				// 	this.$emit('handleChange', e.target.value)
+				// }
+				this.focusState = false
+			},
+			toDel () {
+				this.$emit('input', '')
+				this.$emit('handleDel')
+			},
+			handleSend (e) {
+				this.$emit('input', e.target.value)
+				if (e.target.value.length) {
+					this.$emit('handleChange', e.target.value)
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../common/style/mixin.styl';
+.search_wraper
+	position relative
+	_wh(100%, 80rpx)
+.pdr120
+	padding-right: 120rpx;
+.buttons_wraper
+	position absolute
+	top 0
+	right 10rpx
+	_wh(auto, 80rpx)
+.pdr10
+	padding-right 10rpx
+</style>
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..c3ff205
--- /dev/null
+++ b/index.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title></title>
+    <!--preload-links-->
+    <!--app-context-->
+  </head>
+  <body>
+    <div id="app"><!--app-html--></div>
+    <script type="module" src="/main.js"></script>
+  </body>
+</html>
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..dd5f2e7
--- /dev/null
+++ b/main.js
@@ -0,0 +1,40 @@
+import App from './App'
+import Vue from 'vue'
+
+Vue.config.productionTip = false
+App.mpType = 'app'
+
+Vue.directive('enterNumber', {
+	inserted: function (el) {
+		el.addEventListener("keypress",function(e){
+		e = e || window.event;
+        let charcode = typeof e.charCode == 'number' ? e.charCode : e.keyCode;
+        // if (parseInt(e.target.value) == 0) {
+        //     e.preventDefault();
+        // }
+        parseInt(e.target.value) == 0 && e.preventDefault();
+        let re = /\d/;
+		if(!re.test(String.fromCharCode(charcode)) && charcode > 9 && !e.ctrlKey){
+			if(e.preventDefault){
+				e.preventDefault();
+			}else{
+				e.returnValue = false;
+			}                            
+		}
+		});
+    }
+});
+
+Vue.prototype.$getStatusText = function(statusMap, status) {
+  return statusMap[status] || '';
+};
+
+import store from '@/vuex/store.js'
+
+const app = new Vue({
+    ...App,
+	store
+})
+
+
+app.$mount()
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..4ddf7bc
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,120 @@
+{
+    "name" : "欧伦",
+    "appid" : "__UNI__DE2F207",
+    "description" : "欧伦WMS手持系统",
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "compatible" : {
+            "ignoreVersion" : true
+        },
+        /* 模块配置 */
+        "modules" : {
+            "Barcode" : {},
+            "Camera" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "router" : {
+            "base" : "./"
+        }
+    }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..7542a27
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "jsencrypt": "^3.2.1"
+  }
+}
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..4d9bc4e
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,334 @@
+{
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path" : "pages/login/login",
+		    "style": {
+				"navigationStyle": "custom"
+		    }
+		}
+		,{
+		    "path" : "pages/home/home",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }   
+		}
+        ,{
+		    "path" : "pages/login/setup",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }  
+		}
+		,{
+		    "path" : "pages/login/upgrade",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }  
+		}
+        ,{
+            "path" : "pages/manage/cbj-carry",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/press-carry",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/mater-scrap",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/man-sort",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/task-manage",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/inst-manage",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/yzhnml-carry",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/vehicle-unbind",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/group-task",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/entry/group-to-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/entry/empty-tray-to-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/outbound/tray-out-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/outbound/out-store-confirm",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/in/store-info",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/pick/pick-task",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/task-manage",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": true,
+                "onReachBottomDistance": 50
+            }
+            
+        }
+        ,{
+            "path" : "pages/entry/document",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": true,
+                "onReachBottomDistance": 50
+            }
+            
+        }
+        ,{
+            "path" : "pages/pick/pick-list",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/check/check-task",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/entry/mater-group-to-store",
+            "style" :                                                                                    
+            {
+               "navigationStyle": "custom" 
+            }
+            
+        }
+        ,{
+            "path" : "pages/mode/switch-in-out",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/common/mater-list",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": true,
+                "onReachBottomDistance": 50
+            }
+            
+        }
+        ,{
+            "path" : "pages/mode/pick",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/mode/command",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/outbound/bill-out-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/outbound/bill-list",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": true,
+                "onReachBottomDistance": 50
+            }
+            
+        }
+        ,{
+            "path" : "pages/entry/qualified-to-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/transfer/tray-transfer",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/outbound/stock-out-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/outbound/stock-list",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": true,
+                "onReachBottomDistance": 50
+            }
+            
+        }
+        ,{
+            "path" : "pages/outbound/produce-out-store-2nd",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/outbound/pick-confirm-2nd",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/outbound/shelf-bind-2nd",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/entry/bill-to-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/entry/check-to-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/carry/call-carry",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+    ],
+	"globalStyle": {
+		// "pageOrientation": "landscape",
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#d7592f",
+		"backgroundColor": "#ffffff"
+	},
+	"uniIdRouter": {}
+}
diff --git a/pages/carry/call-carry.vue b/pages/carry/call-carry.vue
new file mode 100644
index 0000000..bbbbcf6
--- /dev/null
+++ b/pages/carry/call-carry.vue
@@ -0,0 +1,110 @@
+<template>
+	<view class="zd_container">
+		<!-- 托盘转运 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">起点</span>
+					</view>
+					<view class="zd-col-24">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">终点</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index || !val2}" :disabled="disabled" @tap="_transfConfirm">转运确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {deviceManageTransf, transfConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [],
+				index: '',
+				val2: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._deviceManageTransf(e)
+				}
+			},
+			async _deviceManageTransf (e) {
+				let res = await deviceManageTransf(e)
+				this.options = [...res]
+			},
+			async _transfConfirm () {
+				this.disabled = true
+				if (!this.val1 || !this.index || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await transfConfirm(this.val1, this.index, this.val2)
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.button-primary, .button-default
+	_fj(center)
+	font-size 26rpx
+	height 88rpx
+	line-height 30rpx
+</style>
diff --git a/pages/check/check-task.vue b/pages/check/check-task.vue
new file mode 100644
index 0000000..b8721a4
--- /dev/null
+++ b/pages/check/check-task.vue
@@ -0,0 +1,172 @@
+<template>
+	<view class="zd_container">
+		<!-- 盘点作业 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">托盘码</span>
+					</view>
+					<view class="zd-col-24">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">盘点单</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="data.code">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">盘点仓库</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="data.form_data.stor_code">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">创建时间</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="data.create_time">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">作业数量</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="data.dtl">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">已盘作业数量</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="data.finish_dtl">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">物料名称</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="data.material_name">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="data.material_code">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">物料批次</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="data.material_spec">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">盘点货位</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="data.children_form_Data.end_struct_code">
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-10">
+						<span class="filter_label">盘点数量</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="data.check_qty">
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(data) === JSON.stringify({form_data: {}, children_form_Data: {}})}" :disabled="disabled" @tap="_checkSaveCheckTask">盘点确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {checkByVehicle, checkSaveCheckTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				data: {form_data: {}, children_form_Data: {}},
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			console.log(JSON.stringify(this.data))
+		},
+		methods: {
+			handleChange (e) {
+				this._checkByVehicle(e)
+			},
+			async _checkByVehicle (e) {
+				let res = await checkByVehicle(e)
+				this.data = res.data
+			},
+			clearUp () {
+				this.val1 = ''
+				this.data = {form_data: {}, children_form_Data: {}}
+			},
+			async _checkSaveCheckTask () {
+				this.disabled = true
+				if (JSON.stringify(this.data) === JSON.stringify({form_data: {}, children_form_Data: {}})) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await checkSaveCheckTask(this.data.children_id, this.data.children_vehicle_code, this.data.check_qty, this.data.children_qty)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue
new file mode 100644
index 0000000..0c2e4b7
--- /dev/null
+++ b/pages/common/mater-list.vue
@@ -0,0 +1,141 @@
+<template>
+	<view class="zd_container">
+		<!-- 查询物料 -->
+		<nav-bar :title="title" :inner="true"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>物料规格</th>
+								<th>单位</th>
+								<th>物料单重</th>
+								<th>物料批次</th>
+								<th>物料数量</th>
+								<th>载具编码</th>
+								<th>仓库编码</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)">
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.unit_id}}</td>
+								<td>{{e.single_weight}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.stor_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-8 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" @tap="toSure">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {groupMaterList} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._groupMaterList()
+			},
+			async _groupMaterList () {
+				let res = await groupMaterList(this.pageNum + '', this.pageSize + '', this.val1)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._groupMaterList()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+				this.pkObj = this.pkId === e.material_id ? e : {}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.dataList = []
+				this.pageNum = 1
+				this.pkId = ''
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/entry/bill-to-store.vue b/pages/entry/bill-to-store.vue
new file mode 100644
index 0000000..2a75801
--- /dev/null
+++ b/pages/entry/bill-to-store.vue
@@ -0,0 +1,343 @@
+<template>
+	<view class="zd_container">
+		<!-- 单据入库 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-9">
+						<span class="filter_label">入库单类型</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">单据编码</span>
+					</view>
+					<view class="zd-col-12">
+						<search-box v-model="code" @handleChange="handleChange1" @handleDel="handleDel1" />
+					</view>
+					<button class="mini-btn" type="primary" size="mini" @tap="toSearch">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label filter_input_disabled">物料名称</span>
+					</view>
+					<view class="zd-col-18">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label filter_input_disabled">物料规格</span>
+					</view>
+					<view class="zd-col-18">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label filter_input_disabled">单位</span>
+					</view>
+					<view class="zd-col-18">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料批次</span>
+					</view>
+					<view class="zd-col-18">
+						<input type="text" class="filter_input" v-model="currentData.pcsn">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料数量</span>
+					</view>
+					<view class="zd-col-18">
+						<input type="number" class="filter_input" v-model="val1">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-18">
+						<search-box v-model="val2" @handleChange="handleChange2" @handleDel="handleDel2" />
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">仓库编码</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<!-- <search-box v-model="currentData.stor_code"/> -->
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view class="filter_label">当前库位可用数：</view>
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">高库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.g}}个</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">中库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.z}}个</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">低库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.d}}个</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val1 || !index || !index1}" :disabled="disabled" @tap="_inStorageConfirm">组盘确认</button>
+		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd_wrapper grid-wraper">
+					<view class="slide_new">
+						<table>
+							<thead>
+								<tr>
+									<th>序号</th>
+									<th>物料编码</th>
+									<th>物料名称</th>
+									<th>物料数量</th>
+									<th>单位</th>
+									<th>单据状态</th>
+									<th>物料批次</th>
+									
+								</tr>
+							</thead>
+							<tbody>
+								<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_code === pkId}" @tap="toCheck(e)">
+									<td>{{i+1}}</td>
+									<td>{{e.material_code}}</td>
+									<td>{{e.material_name}}</td>
+									<td>{{e.qty}}</td>
+									<td>{{e.unit_name}}</td>
+									<td>{{e.bill_status}}</td>
+									<td>{{e.pcsn}}</td>
+									
+								</tr>
+							</tbody>
+						</table>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="confirmModal">确定</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStructCount, inStorageOrder, getBillNoInfo, storList, inStorageConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				code: '',
+				show: false,
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				currentData: {},
+				val1: null,
+				val2: null,
+				options: [],
+				index: '',
+				disabled: false,
+				options1: [],
+				index1: '',
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._inStorageOrder()
+			this._storList()
+		},
+		methods: {
+			/** 下拉框*/
+			async _inStorageOrder () {
+				let res = await inStorageOrder()
+				this.options1 = [...res]
+			},
+			selectChange1 (e) {
+				this.index1 = e
+			},
+			handleChange1 (e) {
+				if (e) {
+					this._getBillNoInfo(e)
+				}
+			},
+			handleDel1 () {
+				this.pkId = ''
+				this.currentData = {}
+				this.index = ''
+				this.val1 = ''
+				this.val2 = ''
+			},
+			toSearch () {
+				if (this.code) {
+					this._getBillNoInfo(this.code)
+				} else {
+					uni.showToast({
+						title: '请扫码',
+						icon: 'none'
+					})
+				}
+			},
+			async _getBillNoInfo (e) {
+				try {
+					let res = await getBillNoInfo(e, this.index1)
+					if (res && res.length) {
+						this.dataList = [...res]
+						this.pkId = ''
+						this.pkObj = {}
+						this.currentData = {}
+						this.index = ''
+						this.val1 = null
+						this.val2 = null
+						this.show = true
+					}
+				} catch (e) {}
+			},
+			toCheck (e) {
+				if (e.status === '80') {
+					return
+				}
+				this.pkId = this.pkId === e.material_code ? '' : e.material_code
+				this.pkObj = this.pkId === e.material_code ? e : {}
+			},
+			confirmModal () {
+				if (!this.pkId) {
+					uni.showToast({
+						title: '请选择一行',
+						icon: 'none'
+					})
+					return
+				}
+				this.show = false
+				this.currentData = this.pkObj
+				this.val1 = this.currentData.qty
+				this.val2 = this.currentData.vehicle_code
+				if(this.currentData.stor_code !== '' && this.currentData.stor_code !== null && this.currentData.stor_code !== undefined) {
+					this.options.map(el => {
+						if (el.value === this.currentData.stor_code) {
+							this.index = el.value
+						}
+					})
+				} else {
+					if (this.val2.charAt(0).toUpperCase() === 'T') {
+						this.index ='FStockPallet'
+					} else {
+						this.index ='FStockId'
+					}
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			async _storList () {
+				let res = await storList()
+				if (res.code === '200') {
+					this.options = [...res.content]
+					this.options.map(el => {
+						this.$set(el, 'text', el.label)
+					})
+				}
+			},
+			handleChange2 (e) {
+				if (e) {
+					if (e.charAt(0).toUpperCase() === 'T') {
+						this.index ='FStockPallet'
+					} else {
+						this.index ='FStockId'
+					}
+					this._getStructCount(e)
+				}
+			},
+			async _getStructCount (e) {
+				try {
+					let res = await getStructCount(e)
+					if (res) {
+						this.kwData = res
+					} else {
+						this.kwData = {}
+					}
+				} catch (e) {
+					this.kwData = {}
+				}
+			},
+			handleDel2 () {
+				this.index = ''
+			},
+			toEmpty () {
+				this.code = ''
+				this.pkId = ''
+				this.currentData = {}
+				this.index = ''
+				this.val1 = null
+				this.val2 = null
+				this.index1 = ''
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _inStorageConfirm () {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.index || !this.index1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let obj = Object.assign(this.currentData, {qty: this.val1, vehicle_code: this.val2, stor_code: this.index, form_type: this.index1})
+					let res = await inStorageConfirm(obj)
+					if (res.code === '200') {
+						this.index = ''
+						this.val1 = null
+						this.val2 = null
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+.msg_wrapper
+	height: calc(100% - var(--status-bar-height) - 72rpx)
+</style>
diff --git a/pages/entry/check-to-store.vue b/pages/entry/check-to-store.vue
new file mode 100644
index 0000000..4fc47bf
--- /dev/null
+++ b/pages/entry/check-to-store.vue
@@ -0,0 +1,244 @@
+<template>
+	<view class="zd_container">
+		<!-- 盘点入库 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box v-model="vehicleCode" @handleChange="handleChange" @handleDel="toEmpty"/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="currentData.material_code" @tap="toJump">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料名称</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料规格</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">单位</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料单重</span>
+					</view>
+					<view class="zd-col-17">
+						<NumberInput v-model="sWeight" />
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料批次</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="pcsn">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料数量</span>
+					</view>
+					<view class="zd-col-17">
+						<NumberInput v-model="qty" />
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-7">
+						<span class="filter_label">仓库编码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<input type="text" class="filter_input" v-model="storCode" disabled>
+					</view>
+				</view>
+			</view>
+			<view class="filter_label">当前库位可用数：</view>
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">高库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.g}}个</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">中库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.z}}个</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">低库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.d}}个</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}' || !vehicleCode || !sWeight || !pcsn || !qty}" :disabled="disabled" @tap="_checkMaterConfirm">盘点确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import NumberInput from '@/components/NumberInput.vue'
+	import {getStructCount, storList, queryMaterByVehicleCode, checkMaterConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			NumberInput
+		},
+		data() {
+			return {
+				title: '',
+				vehicleCode: '',
+				currentData: {},
+				sWeight: null,
+				pcsn: null,
+				qty: null,
+				storCode: null,
+				options: [],
+				disabled: false,
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._storList()
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.currentData.material_id = this.$store.getters.publicObj.material_id
+				this.currentData.material_code = this.$store.getters.publicObj.material_code
+				this.currentData.material_name = this.$store.getters.publicObj.material_name
+				this.currentData.material_spec = this.$store.getters.publicObj.material_spec
+				this.currentData.unit_name = this.$store.getters.publicObj.unit_name
+				this.sWeight = null
+				this.pcsn = null
+				this.qty = null
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
+		methods: {
+			async _storList () {
+				let res = await storList()
+				if (res.code === '200') {
+					this.options = [...res.content]
+					this.options.map(el => {
+						this.$set(el, 'text', el.label)
+					})
+				}
+			},
+			toJump () {
+				if (!this.vehicleCode) {
+					uni.showToast({
+						title: '请先扫描载具编码',
+						icon: 'none'
+					})
+					return
+				}
+				uni.navigateTo({
+					url: '/pages/common/mater-list?title=查询物料'
+				})
+			},
+			handleChange (e) {
+				if (e) {
+					this._queryMaterByVehicleCode(e)
+					this._getStructCount(e)
+				}
+			},
+			async _getStructCount (e) {
+				try {
+					let res = await getStructCount(e)
+					if (res) {
+						this.kwData = res
+					} else {
+						this.kwData = {}
+					}
+				} catch (e) {
+					this.kwData = {}
+				}
+			},
+			async _queryMaterByVehicleCode (e) {
+				try {
+					let res = await queryMaterByVehicleCode(e)
+					if (res && res.code === '200') {
+						this.currentData = res.content[0]
+						this.sWeight = this.currentData.single_weight
+						this.pcsn = this.currentData.pcsn
+						this.qty = this.currentData.qty
+						this.options.map(el => {
+							if (el.value === this.currentData.stor_code) {
+								this.storCode = el.text
+							}
+						})
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toEmpty () {
+				this.currentData = {}
+				this.vehicleCode = ''
+				this.sWeight = null
+				this.pcsn = null
+				this.qty = null
+				this.storCode = null
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _checkMaterConfirm () {
+				this.disabled = true
+				if (JSON.stringify(this.currentData) === '{}' || !this.vehicleCode || !this.sWeight || !this.pcsn || !this.qty) {
+					this.disabled = false
+					return
+				}
+				try {
+					let obj = Object.assign(this.currentData, {single_weight: this.sWeight, pcsn: this.pcsn, qty: this.qty})
+					let res = await checkMaterConfirm(obj)
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/entry/document.vue b/pages/entry/document.vue
new file mode 100644
index 0000000..21ca2d3
--- /dev/null
+++ b/pages/entry/document.vue
@@ -0,0 +1,157 @@
+<template>
+	<view class="zd_container">
+		<!-- 关联单据 -->
+		<nav-bar :title="title" :inner="true"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">单据类型</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">单据编码</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>单据类型</th>
+								<th>单据编码</th>
+								<th>物料编码</th>
+								<th>物料规格</th>
+								<th>物料批次</th>
+								<th>计划数量</th>
+								<th>未入库数量</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{i+1}}</td>
+								<td>{{e.source_form_type}}</td>
+								<td>{{e.source_form_date}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.assign_qty}}</td>
+								<td>{{e.qty}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-8 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-8 button-primary" @tap="toSure">组盘确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {FormTypes, pmFormData} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._FormTypes()
+		},
+		methods: {
+			async _FormTypes () {
+				let res = await FormTypes()
+				this.options = [...res]
+				this.options.map(el => {
+					this.$set(el, 'text', el.lable)
+				})
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._pmFormData()
+			},
+			async _pmFormData () {
+				let res = await pmFormData(this.pageNum + '', this.pageSize + '', this.val1, this.index)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._pmFormData()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toEmpty () {
+				this.index = ''
+				this.val1 = ''
+				this.dataList = []
+				this.pageNum = 1
+			},
+			toSure () {
+				if (this.dataList.length) {
+					this.$store.dispatch('setPublicArr', this.dataList)
+					uni.navigateBack()
+				}
+			}
+		}
+	}
+</script>
diff --git a/pages/entry/empty-tray-to-store.vue b/pages/entry/empty-tray-to-store.vue
new file mode 100644
index 0000000..3250200
--- /dev/null
+++ b/pages/entry/empty-tray-to-store.vue
@@ -0,0 +1,140 @@
+<template>
+	<view class="zd_container">
+		<!-- 空托盘入库 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">托盘类型</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view class="filter_label">当前库位可用数：</view>
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">高库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.g}}个</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">中库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.z}}个</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">低库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.d}}个</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				index: '',
+				disabled: false,
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._getStructCount(e)
+				}
+			},
+			async _getStructCount (e) {
+				try {
+					let res = await getStructCount(e)
+					if (res) {
+						this.kwData = res
+					} else {
+						this.kwData = {}
+					}
+				} catch (e) {
+					this.kwData = {}
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _pdaPalletIostorinvIn () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/entry/group-to-store.vue b/pages/entry/group-to-store.vue
new file mode 100644
index 0000000..85b133b
--- /dev/null
+++ b/pages/entry/group-to-store.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="zd_container">
+		<!-- 单据入库 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">合格证编码</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-8">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">订单号</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.MONumber}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">组织</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.StockOrgId}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">货主</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.OwnerId_Id}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">物料编码</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.material_code}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">物料名称</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.material_name}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">物料规格</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.material_spec}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">单位</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.unit_name}}</span></view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8"><span class="filter_label">物料数量</span></view>
+					<view class="zd-col-16">
+						<input type="number" class="filter_input" v-model="val3">
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-8"><span class="filter_label">仓库编码</span></view>
+					<view class="zd-col-16 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val2 || !val3 || !index}" :disabled="disabled" @tap="_inStorageConfirm">组盘确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {storList, getCertificateInfo, inStorageConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				currentData: {},
+				options: [],
+				index: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._storList()
+		},
+		methods: {
+			async _storList () {
+				let res = await storList()
+				if (res.code === '200') {
+					this.options = [...res.content]
+					this.options.map(el => {
+						this.$set(el, 'text', el.label)
+					})
+				}
+			},
+			handleChange1 (e) {
+				this._getCertificateInfo(e)
+			},
+			async _getCertificateInfo (e) {
+				let res = await getCertificateInfo(e)
+				this.currentData = res
+				if (JSON.stringify(this.currentData) !== '{}') {
+					this.val3 = this.currentData.qty
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.currentData = {}
+				this.index = ''
+				this.disabled = false
+			},
+			async _inStorageConfirm () {
+				this.disabled = true
+				if (!this.val2 || !this.val3 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let obj = Object.assign(this.currentData, {vehicle_code: this.val2, stor_code: this.index, qty: this.val3})
+					let res = await inStorageConfirm(obj)
+					if (res.code === '200') {
+						this.toEmpty()
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/entry/mater-group-to-store.vue b/pages/entry/mater-group-to-store.vue
new file mode 100644
index 0000000..9d33921
--- /dev/null
+++ b/pages/entry/mater-group-to-store.vue
@@ -0,0 +1,233 @@
+<template>
+	<view class="zd_container">
+		<!-- 物料组盘入库 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="currentData.material_code" @tap="toJump">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料名称</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料规格</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">单位</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料单重</span>
+					</view>
+					<view class="zd-col-17">
+						<NumberInput v-model="currentData.single_weight" />
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料批次</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="currentData.pcsn">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料数量</span>
+					</view>
+					<view class="zd-col-17">
+						<NumberInput v-model="currentData.qty" />
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box v-model="currentData.vehicle_code" @handleChange="handleChange" @handleDel="handleDel" />
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">仓库编码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<!-- <search-box v-model="currentData.stor_code"/> -->
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view class="filter_label">当前库位可用数：</view>
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">高库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.g}}个</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">中库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.z}}个</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">低库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.d}}个</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_groupMaterIn">组盘确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import NumberInput from '@/components/NumberInput.vue'
+	import {storList, getStructCount, groupMaterIn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			NumberInput
+		},
+		data() {
+			return {
+				title: '',
+				currentData: {},
+				options: [],
+				index: '',
+				disabled: false,
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._storList()
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.currentData = this.$store.getters.publicObj
+				if(this.currentData.stor_code !== '' && this.currentData.stor_code !== null && this.currentData.stor_code !== undefined) {
+					this.options.map(el => {
+						if (el.value === this.currentData.stor_code) {
+							this.index = el.value
+						}
+					})
+				} else {
+					if (this.currentData.vehicle_code && this.currentData.vehicle_code.charAt(0).toUpperCase() === 'T') {
+						this.index ='FStockPallet'
+					} else {
+						this.index ='FStockId'
+					}
+				}
+				if (this.currentData.vehicle_code) {
+					this._getStructCount(this.currentData.vehicle_code)
+				} else {
+					this.kwData = {}
+				}
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
+		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			async _storList () {
+				let res = await storList()
+				if (res.code === '200') {
+					this.options = [...res.content]
+					this.options.map(el => {
+						this.$set(el, 'text', el.label)
+					})
+				}
+			},
+			toJump () {
+				uni.navigateTo({
+					url: '/pages/common/mater-list?title=查询物料'
+				})
+			},
+			handleChange (e) {
+				if (e) {
+					if (e.charAt(0).toUpperCase() === 'T') {
+						this.index ='FStockPallet'
+					} else {
+						this.index ='FStockId'
+					}
+					this._getStructCount(e)
+				}
+			},
+			async _getStructCount (e) {
+				try {
+					let res = await getStructCount(e)
+					if (res) {
+						this.kwData = res
+					} else {
+						this.kwData = {}
+					}
+				} catch (e) {
+					this.kwData = {}
+				}
+			},
+			handleDel () {
+				this.index = ''
+			},
+			toEmpty () {
+				this.currentData = {}
+				this.index = ''
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _groupMaterIn () {
+				this.disabled = true
+				if (JSON.stringify(this.currentData) === '{}') {
+					this.disabled = false
+					return
+				}
+				try {
+					this.currentData.stor_code = this.index
+					let res = await groupMaterIn(this.index, this.currentData)
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/entry/qualified-to-store.vue b/pages/entry/qualified-to-store.vue
new file mode 100644
index 0000000..b359c49
--- /dev/null
+++ b/pages/entry/qualified-to-store.vue
@@ -0,0 +1,218 @@
+<template>
+	<view class="zd_container">
+		<!-- 合格证入库 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">合格证编码</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-8">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val2"
+						 @handleChange="handleChange2"
+						 @handleDel="handleDel2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">订单号</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.moNumber}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">源单信息</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.srcBillNo}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">物料编码</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.material_code}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">物料名称</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.material_name}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">物料规格</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.material_spec}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">单位</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.unit_name}}</span></view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8"><span class="filter_label">单重</span></view>
+					<view class="zd-col-16">
+						<input type="number" class="filter_input" v-model="currentData.single_weight">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8"><span class="filter_label">批次</span></view>
+					<view class="zd-col-16">
+						<input type="text" class="filter_input" v-model="currentData.pcsn">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8"><span class="filter_label">物料数量</span></view>
+					<view class="zd-col-16">
+						<input type="number" class="filter_input" v-model="val3">
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-8"><span class="filter_label">仓库编码</span></view>
+					<view class="zd-col-16 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view class="filter_label">当前库位可用数：</view>
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">高库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.g}}个</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">中库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.z}}个</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label" style="font-size: 24rpx;">低库位</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.d}}个</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val2 || !val3 || !index}" :disabled="disabled" @tap="_inStorageConfirm">组盘确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStructCount, storList, getCertificateInfo, inStorageConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				currentData: {},
+				options: [],
+				index: '',
+				disabled: false,
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._storList()
+		},
+		methods: {
+			async _storList () {
+				let res = await storList()
+				if (res.code === '200') {
+					this.options = [...res.content]
+					this.options.map(el => {
+						this.$set(el, 'text', el.label)
+					})
+				}
+			},
+			handleChange1 (e) {
+				this._getCertificateInfo(e)
+			},
+			async _getCertificateInfo (e) {
+				let res = await getCertificateInfo(e)
+				this.currentData = res
+				if (JSON.stringify(this.currentData) !== '{}') {
+					this.val3 = this.currentData.qty
+				}
+			},
+			handleChange2 (e) {
+				if (e) {
+					if (e.charAt(0).toUpperCase() === 'T') {
+						this.index ='FStockPallet'
+					} else {
+						this.index ='FStockId'
+					}
+					this._getStructCount(e)
+				}
+			},
+			async _getStructCount (e) {
+				try {
+					let res = await getStructCount(e)
+					if (res) {
+						this.kwData = res
+					} else {
+						this.kwData = {}
+					}
+				} catch (e) {
+					this.kwData = {}
+				}
+			},
+			handleDel2 () {
+				this.index = ''
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.currentData = {}
+				this.index = ''
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _inStorageConfirm () {
+				this.disabled = true
+				if (!this.val2 || !this.val3 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let obj = Object.assign(this.currentData, {vehicle_code: this.val2, stor_code: this.index, qty: this.val3, bar_code: this.val1})
+					let res = await inStorageConfirm(obj)
+					if (res.code === '200') {
+						this.val3 = ''
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
new file mode 100644
index 0000000..a5a31d6
--- /dev/null
+++ b/pages/home/home.vue
@@ -0,0 +1,232 @@
+<template>
+	<view class="home_wraper">
+		<view class="zd_content">
+			<view class="header">首页</view>
+			<view class="userInfo-wrap">
+				<view class="userInfo">
+					<text v-if="userName !== ''" class="p1">{{userName}}</text>
+					<text class="p2">欢迎进入欧伦WMS手持系统！</text>
+				</view>
+				<view class="exit" @tap="Quit">
+					<view class="icon-exit"></view>
+					<view class="exit-text">退出</view>
+				</view>
+			</view>
+			<view class="zd_home_wrapper">
+				<view class="menus_wrap">
+					<view class="fir_menu_wrap">
+						<view class="fir_menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage1(e)">
+							<image class="menu-img" :src="require('../../static/image/menu/' + e.path + '.png')" alt="">
+							<view class="menu-name">{{e.title}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="sec_menu_wraper" :class="show ? 'popshow' : 'pophide'">
+			<view class="pop-title">{{title}}</view>
+			<view class="sec_menu_w">
+				<view class="sec_menu-item" :style="{'background-image': 'url(' + require('../../static/image/menu/' + icon + '.png') + ')'}" v-for="(e, i) in secM" :key="'sontree' + i" @click="toPage2(e)">
+					<view class="menu-name_inner">{{e.title}}</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="show" class="modal" @click.stop="show = false"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				userName: '',
+				menuList: [
+					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '单据入库', path: '/pages/entry/bill-to-store'}, {title: '盘点入库', path: '/pages/entry/check-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
+					{title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '盘点出库', path: '/pages/outbound/stock-out-store'}]},
+					{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
+					{title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]},
+					{title: '产线叫料', path: 'RF10', sonTree: [{title: '二楼生产出库', path: '/pages/outbound/produce-out-store-2nd'}, {title: '二楼取货确认', path: '/pages/outbound/pick-confirm-2nd'}, {title: '二楼货架绑定', path: '/pages/outbound/shelf-bind-2nd'}]},
+					{title: '转运管理', path: 'RF09', sonTree: [{title: '托盘转运', path: '/pages/transfer/tray-transfer'}]},
+					{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}
+				],
+				menu: [{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}],
+				show: false,
+				secM: [],
+				icon: '',
+				title: '',
+				pwd: '1'
+			};
+		},
+		onShow () {
+			if (this.$store.getters.userInfo) {
+				const info = JSON.parse(this.$store.getters.userInfo)
+				this.userName = info.username
+				if (info.pwd_reset_user_id === '0') {
+					this.menuList = [...this.menu]
+				}
+				
+			}
+		},
+		methods: {
+			toPage1 (e) {
+				if (e.sonTree.length > 0) {
+					this.show = true
+					this.secM = e.sonTree
+					
+					this.icon = e.path
+					this.title = e.title
+				}
+			},
+			toPage2 (e) {
+				let url = e.path + '?title=' + e.title
+				if (e.active === false) {
+					return
+				}
+				uni.redirectTo({
+					url: url
+				})	
+			},
+			Quit () {
+			  this.$store.dispatch('delUserInfo', '')
+			  uni.redirectTo({
+			  	url: '/pages/login/login'
+			  })
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.home_wraper
+	_wh(100%, 100%)
+	overflow hidden
+.zd_content
+	padding 0 24rpx
+	height 100%
+	top 0
+	padding-top calc(var(--status-bar-height) + 86rpx)
+	// background linear-gradient(to bottom, #fae2ca 0%, #fff5ea 20%, #fdfdfd 100%)
+	background linear-gradient(to bottom, #f5f6fb 0%, #fff 100%)
+.header
+	position fixed
+	left 0
+	top 0
+	padding-top var(--status-bar-height)
+	z-index 100
+	_wh(100%, calc(var(--status-bar-height) + 86rpx))
+	_font(36rpx,86rpx,#333,,center)
+.userInfo-wrap
+	_fj()
+	_wh(100%,190rpx)
+	padding 0 30rpx
+	background-color $red
+	_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
+	border-radius 12rpx
+	margin-bottom 24rpx
+.userInfo
+	_fj(,flex-start,column)
+.p1
+	_font(34rpx,1,#fff)
+	padding-bottom 18rpx
+.p2
+	_font(26rpx,1,#fff)
+.exit
+	_fj()
+	height 50rpx
+	padding 0 20rpx
+	border 1px solid #FF967C
+	border-radius 20rpx
+.icon-exit
+	_wh(22rpx, 22rpx)
+	_bis('../../static/image/exit.png',22rpx)
+.exit-text
+	_font(32rpx,50rpx,#fff,,right)
+	padding-left 10rpx
+.zd_home_wrapper
+	_wh(100%, calc(100% - 238rpx))
+	margin-bottom 24rpx
+	background-color #fff
+	border-radius: 12rpx;
+	padding: 14rpx;
+	margin-bottom 24rpx
+	box-shadow: 0 4rpx 10rpx 4rpx rgba(0,0,0,.1)
+	overflow-y scroll
+.menus_wrap
+	width 100%
+.fir_menu_wrap
+	_fj(flex-start,flex-start,,wrap)
+	align-content: flex-start
+.fir_menu-item
+	_fj()
+	flex-direction column
+	_wh(30%, auto)
+	margin-bottom 40rpx
+	_font(26rpx, 60rpx,#e74f1a,,center)
+	&:nth-child(3n+2)
+		margin-left 5%
+		margin-right 5%
+::v-deep .menu-img 
+	_wh(100%, auto)
+	img
+		position relative
+		opacity 1
+		_wh(55%, auto)
+		margin 0 auto 0.2rpx
+.menu-name
+	_font(28rpx, 38rpx, #444,,center)
+	padding 0 20rpx
+.sec_menu_wraper
+	position fixed
+	bottom 0
+	left 0
+	width 100%
+	background-color #f4f5f5
+	box-shadow 0 -8px 16px 0 rgba(28,31,33,.1)
+	border-top-left-radius 20rpx
+	border-top-right-radius 20rpx
+	z-index 2017
+	transition all .3s
+.modal
+	position fixed
+	bottom 0
+	left 0
+	_wh(100%, 100%)
+	background-color rgba(0,0,0,0.8)
+	z-index 2010
+.sec_menu_w
+	width calc(100% - 76rpx)
+	margin 30rpx auto 60rpx auto
+	_fj(flex-start)
+	flex-wrap wrap
+.sec_menu-item
+	_wh(30%, 120rpx)
+	margin-bottom 20rpx
+	border-radius 10rpx
+	background-size 40% auto
+	background-position right 90%
+	background-repeat no-repeat
+	&:nth-child(3n+2)
+		margin-left 5%
+		margin-right 5%
+	&:nth-child(5n+1) .menu-name_inner
+		background linear-gradient(to right, rgba(73,102,255,0.8) 0%, rgba(117,142,255,0.8) 100%)
+	&:nth-child(5n+2) .menu-name_inner
+		background linear-gradient(to right, rgba(254, 168, 20,0.8) 0%, rgba(255, 177, 1,0.8) 100%)
+	&:nth-child(5n+3) .menu-name_inner
+		background linear-gradient(to right, rgba(0, 228, 153,0.8) 0%, rgba(0, 241, 197,0.8) 100%)
+	&:nth-child(5n+4) .menu-name_inner
+		background linear-gradient(to right, rgba(196, 5, 219,0.8) 0%, rgba(183,120,190,0.8) 100%)
+	&:nth-child(5n+5) .menu-name_inner
+		background linear-gradient(to right, rgba(146, 94, 52,0.8) 0%, rgba(162, 116, 79,0.8) 100%)
+.menu-name_inner
+	_wh(100%, 100%)
+	_fj(center)
+	_font(28rpx, 30rpx, #fff, 700, center)
+	border-radius 10rpx
+	padding 10rpx
+	overflow hidden
+.pop-title
+	margin 60rpx 38rpx 0 38rpx
+	_font(30rpx, 60rpx, #000,700,center)
+</style>
diff --git a/pages/in/store-info.vue b/pages/in/store-info.vue
new file mode 100644
index 0000000..239d03a
--- /dev/null
+++ b/pages/in/store-info.vue
@@ -0,0 +1,19 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
new file mode 100644
index 0000000..0ece712
--- /dev/null
+++ b/pages/login/login.vue
@@ -0,0 +1,187 @@
+<template>
+	<view class="zd_content bg">
+		<view class="p1">欢迎来到</view>
+		<view class="p2">欧伦WMS手持系统！</view>
+		<view class="input-box">
+			<input class="large-input" type="text" placeholder="请输入用户名" v-model="user">
+		</view>
+		<div class="input-box">
+			<input class="large-input" :password="!showPassword" placeholder="请输入密码" v-model="password" autocomplete=“off”>
+			<uni-icons :type="showPassword ? 'eye-filled' : 'eye'" size="20" :color="showPassword ? '#ff6a00' : '#999'" @tap="showPassword = !showPassword"></uni-icons>
+	    </div>
+		<view class="zd-row radio-box">
+			<view class="zd-col-2 zd-row jccenter radio-icon-wrap" :class="{'radio-icon-wrap_checked': saveUser}" @tap="toSaveUser">
+				<uni-icons type="checkmarkempty" size="14" :color="saveUser ? '#ff6a00' : '#fff'"></uni-icons>
+			</view>
+			<view class="zd-col-13 radio-label">记住用户名</view>
+			<view class="zd-col-4 setup-text" @tap="setup">设置</view>
+			<view class="zd-col-5 setup-text" @tap="isUpdate">升级版本</view>
+		</view>
+		<button class="login-btn" :disabled="disabled" @tap="toLogin">确认登录</button>
+		<view v-if="version !== ''" class="version-name">v{{version}}</view>
+		<Up-grade v-if="grade === true" @closeUpdate="closeUpdate" :androidUrl="androidUrl"></up-grade>
+	</view>
+</template>
+
+<script>
+	import { RSAencrypt } from '@/utils/jsencrypt.js'
+	import {handLogin, pdaUpdate} from '@/utils/getData2.js'
+	import UpGrade from './upgrade.vue'
+	export default {
+		components: {
+			UpGrade
+		},
+		data() {
+			return {
+				user: this.$store.getters.loginName ? this.$store.getters.loginName : '',
+				password: '',
+				showPassword: false,
+				saveUser: this.$store.getters.loginName ? true : false,
+				disabled: false,
+				version: '',
+				versionCode: '',
+				grade: false,
+				androidUrl: ''
+			}
+		},
+		created () {
+			//#ifdef APP-PLUS
+				// 获取本地应用资源版本号
+				plus.runtime.getProperty(plus.runtime.appid, (info) => {
+					// console.log(JSON.stringify(info));
+					this.version = info.version;
+					this.versionCode = info.versionCode ;
+				}) 
+			//#endif
+		},
+		methods: {
+			isUpdate () {
+				this._pdaUpdate()
+			},
+			toSaveUser() {
+				this.saveUser = !this.saveUser
+			},
+			setup () {
+				uni.redirectTo({
+					url: '/pages/login/setup'
+				})
+			},
+			async toLogin() {
+				// uni.redirectTo({
+				// 	url: '/pages/home/home'
+				// })
+				this.disabled = true
+				if (this.user === '') {
+					uni.showToast({
+						title: '用户名不能为空',
+						icon: 'none'
+					})
+					this.disabled = false
+					return
+				}
+				if (this.password === '') {
+					uni.showToast({
+						title: '密码不能为空',
+						icon: 'none'
+					})
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await handLogin(this.user, RSAencrypt(this.password))
+					if (res.code === '200') {
+						if (this.saveUser) {
+							this.$store.dispatch('saveLoginName', this.user)
+						} else {
+							this.$store.dispatch('delLoginName', '')
+						}
+						this.$store.dispatch('saveUserInfo', JSON.stringify(res.data.user))
+						this.$store.dispatch('saveToken', res.token)
+						uni.redirectTo({
+							url: '/pages/home/home'
+						})
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _pdaUpdate () {
+				let res = await pdaUpdate()
+				// if (res.versionName === this.version) {
+				// 	uni.showToast({
+				// 		title: '当前为最新版本',
+				// 		icon: 'none'
+				// 	})
+				// } else {
+				// 	this.grade = true
+				// 	this.androidUrl = res.url
+				// }
+				this.grade = true
+				this.androidUrl = res.url
+			},
+			closeUpdate () {
+				this.grade = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.p1
+  _font(40rpx,75rpx,#444,666)
+  padding-top: 190rpx
+.p2
+  _font(44rpx,1,#444,600)
+  padding: 10rpx 0 55rpx 0
+.input-box
+  _fj()
+  margin-top 68rpx
+  height 75rpx
+  border-bottom 1rpx solid #e2e2e2
+.large-input
+	_wh(calc(100% - 100rpx), 74rpx)
+	_font(32rpx,74rpx,#999)
+	padding-left 10rpx
+.radio-box
+	margin 25rpx 0 70rpx 0
+.radio-icon-wrap
+	_wh(34rpx, 34rpx)
+	border 1rpx solid #999
+	border-radius 4rpx
+	text-align center
+	line-height 40rpx
+.radio-icon-wrap_checked
+	border-color $red
+.radio-label
+	_font(28rpx, 28rpx,#333)
+.setup-text
+	_font(28rpx, 28rpx,$red,,right)
+.bg
+	background-color: #fff;
+	_bis('../../static/image/login_bg.png', 100%,,bottom)
+.login-btn
+  width 100%
+  border-radius 46rpx
+  _font(36rpx,92rpx,#fff,,center)
+  background-color $red
+.zd_content
+	position: relative
+	top 0
+	height: 100%
+	padding-left 40rpx
+	padding-right 40rpx
+	background-color: #fff
+	overflow: hidden
+.version-name
+	width 100%
+	position: absolute
+	bottom: 30rpx
+	_font(30rpx, 60rpx, #999,,center)
+</style>
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
new file mode 100644
index 0000000..4f08d14
--- /dev/null
+++ b/pages/login/setup.vue
@@ -0,0 +1,92 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="设置" :inner2="true" @goIn="goIn"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="setup-item">
+					<view class="setup-label">服务器地址</view>
+					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
+				</view>
+				<!-- <view class="setup-item">
+					<view class="setup-label">打印地址</view>
+					<input type="text" class="setup-input" placeholder="请输入打印地址" v-model="printip">
+				</view> -->
+				<!-- <view class="setup-item">
+					<view class="setup-label">刷新时间(s)</view>
+					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
+				</view> -->
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+		  <button class="zd-col-24 button-primary" @click="_submit">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				addrip: this.$store.getters.baseUrl,
+				acsip: this.$store.getters.acsUrl,
+				printip: this.$store.getters.printUrl,
+				setTime: this.$store.getters.setTime / 1000
+			};
+		},
+		methods: {
+			goIn () {
+				uni.redirectTo({
+					url: '/pages/login/login'
+				})
+			},
+			_submit () {
+				if (this.addrip === '') {
+					uni.showToast({
+						title: '请填写LMS地址',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.printip === '') {
+					uni.showToast({
+						title: '请填写打印地址',
+						icon: 'none'
+					})
+					return
+				}
+				// if (this.setTime === '') {
+				// 	uni.showToast({
+				// 		title: '请填写刷新时间',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
+				// 存值
+				this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, printUrl: this.printip, setTime: this.setTime * 1000})
+				uni.redirectTo({
+					url: '/pages/login/login'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.setup-item
+	width 100%
+	margin-bottom 40rpx
+.setup-label
+	_font(24rpx,40rpx,#000)
+.setup-input
+	_wh(100%, 80rpx)
+	background #fff
+	_font(28rpx,80rpx,#323232)
+	padding 0 28rpx
+	border 2px solid #e9ecf3
+	border-radius 12rpx
+</style>
diff --git a/pages/login/upgrade.vue b/pages/login/upgrade.vue
new file mode 100644
index 0000000..b3b82b0
--- /dev/null
+++ b/pages/login/upgrade.vue
@@ -0,0 +1,229 @@
+<template>
+	<view class="mask flex-center">
+		<view class="content botton-radius">
+			<view class="content-top">
+				<text class="content-top-text">发现新版本</text>
+				<image class="content-top" style="top: 0;" width="100%" height="100%" src="../../static/image/bg_top.png">
+				</image>
+			</view>
+			<view class="content-header"></view>
+			<view class="content-body">
+				<view class="title">
+					<text>欧伦WMS手持系统又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！</text>
+				</view>
+				<view class="footer flex-center">
+					<template>
+						<template v-if="!downloadSuccess">
+							<view class="progress-box flex-column" v-if="downloading">
+								<progress class="progress" border-radius="35" :percent="downLoadPercent" activeColor="#3DA7FF" show-info stroke-width="10" />
+								<view style="width:100%;font-size: 28rpx;display: flex;justify-content: space-around;">
+									<text>安装包下载中，请稍后</text>
+									<text>({{downloadedSize}}/{{packageFileSize}}M)</text>
+								</view>
+							</view>
+							<button v-else class="content-button" style="border: none;color: #fff;" plain @click="updateApp">立即升级</button>
+						</template>
+					</template>
+				</view>
+			</view>
+			<image v-if="is_mandatory" class="close-img" src="../../static/image/app_update_close.png" @click.stop="closeUpdate"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data () {
+			return {
+				downloadSuccess: false,
+				downloading: false,
+				downLoadPercent: 0,
+				downloadedSize: 0,
+				packageFileSize: 0,
+				is_mandatory: true
+			}
+		},
+		props: {
+			androidUrl: String
+		},
+		methods: {
+			updateApp() {
+				this.is_mandatory = false
+				this.downloading = true
+				this.doUpData(this.androidUrl);
+			},
+			doUpData(Url) {
+				const downloadTask = uni.downloadFile({
+					url: Url,
+					success: downloadResult => {
+						if (downloadResult.statusCode == 200) {
+							this.downloadSuccess = true;
+							plus.runtime.install(
+								//安装软件
+								downloadResult.tempFilePath,
+								{
+									force: true
+								},
+								function(res) {
+									plus.runtime.restart();
+								}
+							);
+						}
+					},
+					complete: () => {
+						this.downloading = false;
+						this.downLoadPercent = 0
+						this.downloadedSize = 0
+						this.packageFileSize = 0
+					}
+				});
+				// 下载进度
+				downloadTask.onProgressUpdate(res => {
+					this.downLoadPercent = res.progress;
+					this.downloadedSize = (res.totalBytesWritten / Math.pow(1024, 2)).toFixed(2);
+					this.packageFileSize = (res.totalBytesExpectedToWrite / Math.pow(1024, 2)).toFixed(2);
+				});
+			},
+			closeUpdate () {
+				this.$emit('closeUpdate')
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background: transparent;
+	}
+
+	.flex-center {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+
+	.mask {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, .65);
+	}
+
+	.botton-radius {
+		border-bottom-left-radius: 30rpx;
+		border-bottom-right-radius: 30rpx;
+	}
+
+	.content {
+		position: relative;
+		top: 0;
+		width: 600rpx;
+		background-color: #fff;
+		box-sizing: border-box;
+		padding: 0 50rpx;
+		font-family: Source Han Sans CN;
+	}
+
+	.text {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		line-height: 200px;
+		text-align: center;
+		color: #FFFFFF;
+	}
+
+	.content-top {
+		position: absolute;
+		top: -195rpx;
+		left: 0;
+		width: 600rpx;
+		height: 270rpx;
+	}
+
+	.content-top-text {
+		font-size: 45rpx;
+		font-weight: bold;
+		color: #F8F8FA;
+		position: absolute;
+		top: 120rpx;
+		left: 50rpx;
+		z-index: 1;
+	}
+
+	.content-header {
+		height: 80rpx;
+	}
+
+	.title {
+		font-size: 33rpx;
+		font-weight: bold;
+		color: #3DA7FF;
+		line-height: 38rpx;
+		color: #333;
+	}
+
+	.footer {
+		height: 150rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+	}
+
+	.box-des-scroll {
+		box-sizing: border-box;
+		padding: 0 40rpx;
+		height: 50rpx;
+		text-align: left;
+	}
+
+	.box-des {
+		font-size: 26rpx;
+		color: #000000;
+		line-height: 50rpx;
+	}
+
+	.progress-box {
+		width: 100%;
+	}
+
+	.progress {
+		width: 90%;
+		height: 40rpx;
+		border-radius: 35px;
+	}
+
+	.close-img {
+		width: 70rpx;
+		height: 70rpx;
+		z-index: 1000;
+		position: absolute;
+		bottom: -120rpx;
+		left: calc(50% - 70rpx / 2);
+	}
+
+	.content-button {
+		text-align: center;
+		flex: 1;
+		font-size: 30rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		border-radius: 40rpx;
+		margin: 0 18rpx;
+
+		height: 80rpx;
+		line-height: 80rpx;
+
+		background: linear-gradient(to right, #1785ff, #3DA7FF);
+	}
+
+	.flex-column {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+</style>
diff --git a/pages/manage/cbj-carry.vue b/pages/manage/cbj-carry.vue
new file mode 100644
index 0000000..e22f3fc
--- /dev/null
+++ b/pages/manage/cbj-carry.vue
@@ -0,0 +1,267 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd-row jccenter tab-item-wraper">
+			<view class="zd-col-16 zd-row">
+				<view class="tab-item" :class="{'tab-item_active': tab === 1}" @tap="tab=1">叫料</view>
+				<view class="tab-item" :class="{'tab-item_active': tab === 2}" @tap="tab=2">满料</view>
+				<view class="tab-item" :class="{'tab-item_active': tab === 3}" @tap="tab=3">送空盅</view>
+			</view>
+		</view>
+		<view class="zd_content zd_content_1">
+			<view class="zd_wrapper">
+				<view v-show="tab === 2" class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view v-show="tab === 3" class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">下个点位类型</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view v-show="tab === 1" class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>点位编码</th>
+								<th>产品牌号</th>
+								<th>入库时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList1" :key="e.pointCode" @click="toChose1(e)" :class="{'checked': e.pointCode === pkId1}">
+								<td>{{e.pointCode}}</td>
+								<td>{{e.materialCode}}</td>
+								<td>{{e.instorageTime}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<view v-show="tab === 2" class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>工单编号</th>
+								<th>计划数量</th>
+								<th>实际数量</th>
+								<th>计划重量</th>
+								<th>实际重量</th>
+								<th>物料标识</th>
+								<th>泥料编码</th>
+								<th>批次号</th>
+								<th>生产日期</th>
+								<th>载具类型</th>
+								<th>点位编码</th>
+								<th>点位名称</th>
+								<th>区域编码</th>
+								<th>区域名称</th>
+								<th>工单状态</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList2" :key="i" @click="toChose2(e)" :class="{'checked': e.workorder_code === pkId2}">
+								<td>{{e.workorder_code}}</td>
+								<td>{{e.plan_qty}}</td>
+								<td>{{e.real_qty}}</td>
+								<td>{{e.plan_weight}}</td>
+								<td>{{e.real_weight}}</td>
+								<td>{{e.material_ratio}}</td>
+								<td>{{e.raw_material_code}}</td>
+								<td>{{e.produce_order}}</td>
+								<td>{{e.produce_date}}</td>
+								<td>{{e.vehicle_type}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.point_name}}</td>
+								<td>{{e.region_code}}</td>
+								<td>{{e.region_name}}</td>
+								<td>{{['未生产', '已下发', '生产中', '暂停', '完成', '暂存中'][Number(e.workorder_status) - 1]}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view v-show="tab === 1" class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="index1 = ''">清空</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId1 || !index1}" :disabled="disabled1" @tap="_cbjqlTask">拆包机叫料</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !index1}" @tap="show = true">呼叫空盅</button>
+		</view>
+		<view v-show="tab === 2" class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="index1 = '', val1 = ''">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !pkId2 || !val1 || !index1}" :disabled="disabled2" @tap="_cbjmlTask">满料入库</button>
+		</view>
+		<view v-show="tab === 3" class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="index2 = '', index1 = ''">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index1 || !index2}" :disabled="disabled4" @tap="_cbjskTask">空料位送空蛊</button>
+		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd-row">
+					<view class="zd-col-24">
+						<span class="filter_label">确定是否呼叫空蛊？</span>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled3" @tap="_cbjqkTask">确定</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {unpackShelfInfo, getCbjPoint, cbjqlTask, hnWorkOrder,cbjmlTask,cbjqkTask, cbjskTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				tab: 1,
+				title: '',
+				options1: [],
+				index1: '',
+				dataList1: [],
+				pkId1: '',
+				val1: '',
+				dataList2: [],
+				pkId2: '',
+				disabled1: false,
+				disabled2: false,
+				disabled3: false,
+				show: false,
+				options2: [{value: 'CBJXLW', text: '拆包机下料位'},{value: 'KLHW', text: '困料货架'}],
+				index2: '',
+				val2: '',
+				disabled4: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._unpackShelfInfo()
+			this._getCbjPoint()
+			this._hnWorkOrder()
+		},
+		methods: {
+			/**货架上未拆包料盅信息 */
+			async _unpackShelfInfo () {
+				let res = await unpackShelfInfo()
+				this.dataList1 = [...res]
+			},
+			/** 拆包机点位下拉框*/
+			async _getCbjPoint () {
+				let res = await getCbjPoint()
+				this.options1 = [...res]
+			},
+			toChose1 (e) {
+				this.pkId1 = this.pkId1 === e.pointCode ? '' : e.pointCode
+			},
+			/** 拆包机叫料 */
+			async _cbjqlTask () {
+				this.disabled1 = true
+				if (!this.pkId1 || !this.index1) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await cbjqlTask(this.pkId1, this.index1)
+					this.pkId1 = ''
+					this.disabled1 = false
+					this._unpackShelfInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			/** 查询混碾工单 */
+			async _hnWorkOrder () {
+				let res = await hnWorkOrder()
+				this.dataList2 = [...res]
+			},
+			toChose2 (e) {
+				this.pkId2 = this.pkId2 === e.workorder_code ? '' : e.workorder_code
+			},
+			/** 满料入库 */
+			async _cbjmlTask () {
+				this.disabled2 = true
+				if (!this.pkId2 || !this.val1 || !this.index1) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await cbjmlTask(this.pkId2, this.val1, this.index1)
+					this.pkId2 = ''
+					this.disabled2 = false
+					this._hnWorkOrder()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+			/** 呼叫空盅 */
+			async _cbjqkTask () {
+				this.disabled3 = true
+				try {
+					let res = await cbjqkTask(this.index1)
+					this.show = false
+					this.disabled3 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled3 = false
+				}
+			},
+			/** 拆包机空料位送空蛊 */
+			async _cbjskTask () {
+				this.disabled4 = true
+				try {
+					let res = await cbjskTask(this.index2, this.index1)
+					this.disabled4 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled4 = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/manage/group-task.vue b/pages/manage/group-task.vue
new file mode 100644
index 0000000..3b008c4
--- /dev/null
+++ b/pages/manage/group-task.vue
@@ -0,0 +1,102 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">条码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+			<view v-if="JSON.stringify(obj) !== '{}'" class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">重量</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<input type="number" class="filter_input" v-model="obj.material_weight" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">数量</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<input type="number" class="filter_input" v-model="obj.material_qty" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">牌号</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<input type="text" class="filter_input" v-model="obj.material_code" disabled>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_zpxxTask">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {zpxxTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				obj: {},
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+		},
+		methods: {
+			clearUp () {
+				this.val1 = ''
+				this.obj = {}
+			},
+			async _zpxxTask () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await zpxxTask(this.val1)
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.obj = res
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/manage/inst-manage.vue b/pages/manage/inst-manage.vue
new file mode 100644
index 0000000..1d4028b
--- /dev/null
+++ b/pages/manage/inst-manage.vue
@@ -0,0 +1,152 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content pdt0">
+			<view class="filter_wrapper">
+				<view class="zd-row">
+					<view class="zd-col-8 font-style-1" v-for="e in state" :key="e.id" @tap="changeTab(e)">
+						<view class="font-style-1" :class="{'font-style-2': e.id === tab}">{{e.text}}</view>
+						<view class="tab-line" :class="{'tab-line_active': e.id === tab}"></view>
+					</view>
+				</view>
+			</view>
+			<view class="item-wrapper">
+				<view class="item-wrap" v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{isChecked: pkId === e.inst_uuid}">
+					<view class="zd-row">
+						<view class="zd-col-15 item-font-1">{{e.task_no}}&nbsp;&#124;&nbsp;{{e.inst_status_name}}</view>
+						<view class="zd-col-9 item-font-2" style="text-align:right">{{e.create_time}}</view>
+					</view>
+					<view class="zd-row">
+						<view class="zd-col-16">
+							<view class="zd-row">
+								<view class="zd-col-6 item-font-3">指令号：</view>
+								<view class="zd-col-18 item-font-4">{{e.inst_no}}</view>
+							</view>
+							<view class="zd-row">
+								<view class="zd-col-10 item-font-3">指令执行步骤：</view>
+								<view class="zd-col-14 item-font-4">{{e.inst_step}}</view>
+							</view>
+							<view class="zd-row">
+								<view class="zd-col-6 item-font-3">载具号：</view>
+								<view class="zd-col-18 item-font-4">{{e.carrier}}</view>
+							</view>
+							<view class="zd-row">
+								<view class="zd-col-6 item-font-3">车号：</view>
+								<view class="zd-col-18 item-font-4">{{e.carno}}</view>
+							</view>
+						</view>
+						<view class="zd-col-8">
+							<view class="item-font-5">{{e.priority}}</view>
+							<view class="item-font-7">优先级</view>
+						</view>
+					</view>
+					<view class="zd-row">
+						<view class="zd-col-10 item-font-6">起始设备：{{e.start_devicecode}}</view>
+						<view class="zd-col-2 item-font-7">&ndash;&ndash;</view>
+						<view class="zd-col-10 item-font-6">目标设备：{{e.next_devicecode}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handInst('1')">指令撤销</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handInst('2')">重新下发</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handInst('3')">强制完成</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {handInsts, handInst} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				state: [{id:'-1', text: '全部'}, {id:'0', text: '就绪'}, {id:'1', text: '执行中'}],
+				tab: '-1',
+				title: '',
+				data: [],
+				dataList: [],
+				pkId: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._handInsts()
+		},
+		methods: {
+			toSearch () {
+				this.show = true
+				this.tab = '-1'
+			},
+			async _handInsts () {
+				try {
+					let res = await handInsts(this.val1, this.val2, this.val3)
+					if (res.code === '1') {
+						this.data = [...res.result]
+						this.dataList = [...this.data]
+					} else {
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					}
+					
+				} catch (e) {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+			},
+			changeTab (e) {
+				this.tab = e.id
+				if (e.id !== '-1') {
+					let arr = this.data.filter(el => {return el.inst_status === e.id})
+					this.dataList = [...arr]
+				} else {
+					this.dataList = [...this.data]
+				}
+			},
+			async _handInst (type) {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await handInst(type, this.pkId)
+					if (res.code === '1') {
+						this.disabled = false
+						this.tab = '-1'
+						this._handInsts()
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					}  else {
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.inst_uuid ? '' : e.inst_uuid
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+.item-font-1
+	font-size 28rpx
+</style>
diff --git a/pages/manage/man-sort.vue b/pages/manage/man-sort.vue
new file mode 100644
index 0000000..659ca41
--- /dev/null
+++ b/pages/manage/man-sort.vue
@@ -0,0 +1,115 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">人工分拣点位</span>
+					</view>
+					<view class="zd-col-15 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">缓存货架点位</span>
+					</view>
+					<view class="zd-col-15 filter_select">
+						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-default" @tap.stop="clearUp">清空</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !index1 || !index2}" :disabled="disabled1" @tap="_rgfjqlTask">叫料</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !index1}" :disabled="disabled2" @tap="_rgfjskTask">送空盘</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {rgfjPoint,hchjPoint,rgfjqlTask,rgfjskTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				disabled1: false,
+				disabled2: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._rgfjPoint()
+			this._hchjPoint()
+		},
+		methods: {
+			/** 下拉框*/
+			async _rgfjPoint () {
+				let res = await rgfjPoint()
+				this.options1 = [...res]
+			},
+			async _hchjPoint () {
+				let res = await hchjPoint()
+				this.options2 = [...res]
+			},
+			clearUp () {
+				this.index1 = ''
+				this.index2 = ''
+				this.disabled1 = false
+				this.disabled2 = false
+			},
+			async _rgfjqlTask () {
+				this.disabled1 = true
+				if (!this.index1 || !this.index2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await rgfjqlTask(this.index2, this.index1)
+					this.disabled1 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			async _rgfjskTask () {
+				this.disabled2 = true
+				if (!this.index1) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await rgfjskTask(this.index1)
+					this.disabled2 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+</style>
diff --git a/pages/manage/mater-scrap.vue b/pages/manage/mater-scrap.vue
new file mode 100644
index 0000000..858a92e
--- /dev/null
+++ b/pages/manage/mater-scrap.vue
@@ -0,0 +1,82 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-22 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toPop">物料报废</button>
+		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd-row">
+					<view class="zd-col-24">
+						<span class="filter_label">确定是否执行物料报废？</span>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_materialScrap">确定</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {materialScrap} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				show: false,
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toPop () {
+				if (this.val1) {
+					this.show = true
+				}
+			},
+			async _materialScrap () {
+				this.disabled = true
+				try {
+					let res = await materialScrap(this.val1)
+					this.show = false
+					this.disabled = false
+					this.val1 = ''
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
diff --git a/pages/manage/press-carry.vue b/pages/manage/press-carry.vue
new file mode 100644
index 0000000..8899deb
--- /dev/null
+++ b/pages/manage/press-carry.vue
@@ -0,0 +1,149 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd-row jccenter tab-item-wraper">
+			<view class="zd-col-16 zd-row">
+				<view class="tab-item" :class="{'tab-item_active': tab === 1}" @tap="tab=1">回库</view>
+				<view class="tab-item" :class="{'tab-item_active': tab === 2}" @tap="tab=2">点对点</view>
+			</view>
+		</view>
+		<view class="zd_content zd_content_1">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">上料位</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view v-show="tab === 2" class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>点位编码</th>
+								<th>产品牌号</th>
+								<th>入库时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="e.pointCode" @click="toChose(e)" :class="{'checked': e.pointCode === pkId}">
+								<td>{{e.pointCode}}</td>
+								<td>{{e.materialCode}}</td>
+								<td>{{e.instorageTime}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view v-show="tab === 1" class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="index1 = ''">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index1}" :disabled="disabled" @tap="toPop">强制回货架</button>
+		</view>
+		<view v-show="tab === 2" class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="index1 = ''">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index1 || !pkId}" :disabled="disabled" @tap="_yzqlTask">请求上料位</button>
+		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd-row">
+					<view class="zd-col-24">
+						<span class="filter_label">确定是否强制回货架？</span>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_qzhhjTask">确定</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {yjslwPointList, qzhhjTask,packShelfInfo,yzqlTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				tab: 1,
+				title: '',
+				options1: [],
+				index1: '',
+				show: false,
+				disabled: false,
+				dataList: [],
+				pkId: ''
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._yjslwPointList()
+			this._packShelfInfo()
+		},
+		methods: {
+			/** 下拉框*/
+			async _yjslwPointList () {
+				let res = await yjslwPointList()
+				this.options1 = [...res]
+			},
+			toPop () {
+				if (this.index1) {
+					this.show = true
+				}
+			},
+			/** 强制回货架 */
+			async _qzhhjTask () {
+				this.disabled = true
+				try {
+					let res = await qzhhjTask(this.index1)
+					this.show = false
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			/** 查询货架上已拆包料盅信息 */
+			async _packShelfInfo () {
+				let res = await packShelfInfo()
+				this.dataList = [...res]
+			},
+			toChose (e) {
+				this.pkId = this.pkId === e.pointCode ? '' : e.pointCode
+			},
+			/** 困料货架点对点到布料机上料位 */
+			async _yzqlTask () {
+				this.disabled = true
+				try {
+					let res = await yzqlTask(this.pkId, this.index1)
+					this.disabled = false
+					this.pkId = ''
+					this._packShelfInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/manage/task-manage.vue b/pages/manage/task-manage.vue
new file mode 100644
index 0000000..2ed12d6
--- /dev/null
+++ b/pages/manage/task-manage.vue
@@ -0,0 +1,136 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content pdt0">
+			<view class="filter_wrapper">
+				<view class="zd-row">
+					<view class="zd-col-8 font-style-1" v-for="e in state" :key="e.id" @tap="changeTab(e)">
+						<view class="font-style-1" :class="{'font-style-2': e.id === tab}">{{e.text}}</view>
+						<view class="tab-line" :class="{'tab-line_active': e.id === tab}"></view>
+					</view>
+				</view>
+			</view>
+			<view class="item-wrapper">
+				<view class="item-wrap" v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{isChecked: pkId === e.task_uuid}">
+					<view class="zd-row">
+						<view class="zd-col-10 item-font-1">{{e.task_no}}</view>
+						<view class="zd-col-10 item-font-2" style="text-align:right">{{e.create_time}}</view>
+					</view>
+					<view class="zd-row">
+						<view class="zd-col-16">
+							<view class="zd-row">
+								<view class="zd-col-7 item-font-3">任务状态：</view>
+								<view class="zd-col-17 item-font-4">{{e.task_status_name}}</view>
+							</view>
+							<view class="zd-row">
+								<view class="zd-col-7 item-font-3">载具号：</view>
+								<view class="zd-col-17 item-font-4">{{e.carrier}}</view>
+							</view>
+						</view>
+						<view class="zd-col-8">
+							<view class="item-font-5">{{e.priority}}</view>
+							<view class="item-font-7">优先级</view>
+						</view>
+					</view>
+					<view class="zd-row">
+						<view class="zd-col-10 item-font-6">起始设备：{{e.start_devicecode}}</view>
+						<view class="zd-col-2 item-font-7">&ndash;&ndash;</view>
+						<view class="zd-col-10 item-font-6">目标设备：{{e.next_devicecode}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-11 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handTaskoperation('1')">重新生成</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handTaskoperation('2')">强制完成</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {handTasks, handTaskoperation} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				state: [{id:'-1', text: '全部'}, {id:'0', text: '就绪'}, {id:'1', text: '执行中'}],
+				tab: '-1',
+				title: '',
+				data: [],
+				dataList: [],
+				pkId: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._handTasks()
+		},
+		methods: {
+			async _handTasks () {
+				try {
+					let res = await handTasks()
+					if (res.code === '1') {
+						this.data = [...res.result]
+						this.dataList = [...this.data]
+					} else {
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					}					
+				} catch (e) {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+			},
+			changeTab (e) {
+				this.tab = e.id
+				if (e.id !== '-1') {
+					let arr = this.data.filter(el => {return el.task_status === e.id})
+					this.dataList = [...arr]
+				} else {
+					this.dataList = [...this.data]
+				}
+			},
+			async _handTaskoperation (type) {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await handTaskoperation(type, this.pkId)
+					if (res.code === '1') {
+						this.disabled = false
+						this.tab = '-1'
+						this._handTasks()
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					} else {
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.task_uuid ? '' : e.task_uuid
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/manage/vehicle-unbind.vue b/pages/manage/vehicle-unbind.vue
new file mode 100644
index 0000000..c738ab3
--- /dev/null
+++ b/pages/manage/vehicle-unbind.vue
@@ -0,0 +1,108 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">区域</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<uni-data-select v-model="index1" :localdata="options1" @change="change"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<uni-data-select v-model="index2" :localdata="options2"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index2}" :disabled="disabled" @tap="_vehicleUnbind">解绑</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {vehicleUnbind} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [{value: 0, text: '困料区域', point: []}, {value: 1, text: '缓存货架区域', point: []}],
+				index1: '',
+				options2: [],
+				index2: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			let point1 = []
+			for (let i = 0; i < 56; i++) {
+				if (i >= 9) {
+					point1.push({value: `KLHW${i+1}`, text: `困料货位${i+1}`})
+				}	else {
+					point1.push({value: `KLHW0${i+1}`, text: `困料货位0${i+1}`})
+				}
+			}
+			let point2 = []
+			for (let i = 0; i < 44; i++) {
+				if (i >= 9) {
+					point2.push({value: `HCHJ${i+1}`, text: `缓存货架${i+1}`})
+				} else {
+					point2.push({value: `HCHJ0${i+1}`, text: `缓存货架0${i+1}`})
+				}
+			}
+			this.options1[0].point = point1
+			this.options1[1].point = point2
+		},
+		methods: {
+			change (e) {
+				this.options1.map((el, i) => {
+					if (e === i) {
+						this.options2 = el.point
+					}
+				})
+			},
+			clearUp () {
+				this.index1 = ''
+				this.index2 = ''
+			},
+			async _vehicleUnbind () {
+				this.disabled = true
+				if (!this.index2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await vehicleUnbind(this.index2)
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/manage/yzhnml-carry.vue b/pages/manage/yzhnml-carry.vue
new file mode 100644
index 0000000..9d8a10b
--- /dev/null
+++ b/pages/manage/yzhnml-carry.vue
@@ -0,0 +1,133 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">区域</span>
+					</view>
+					<view class="zd-col-15 filter_select">
+						<uni-data-select v-model="index1" :localdata="options1" @change="change"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="zd-col-15 filter_select">
+						<uni-data-select v-model="index2" :localdata="options2"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">条码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">重量</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<input type="number" class="filter_input" v-model="val2">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">数量</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<input type="number" class="filter_input" v-model="val3">
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index2 || !val1 || !val2 || !val3}" :disabled="disabled" @tap="_mlTask">满料搬运</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {mlTask} from '@/utils/getData2.js'
+	
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [{value: 0, text: '混碾区域', point: []}, {value: 1, text: '压制区域', point: []}],
+				index1: '',
+				options2: [],
+				index2: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			let point1 = []
+			for (let i = 0; i < 8; i++) {
+				point1.push({value: `HNJ0${i+1}DJW`, text: `混碾机对接位0${i+1}`})
+			}
+			let point2 = []
+			for (let i = 0; i < 10; i++) {
+				if (i >= 9) {
+					point2.push({value: `YJ${i+1}XLW01`, text: `压制机${i+1}下料位01`}, {value: `YJ${i+1}XLW02`, text: `压制机${i+1}下料位02`})
+				} else {
+					point2.push({value: `YJ0${i+1}XLW01`, text: `压制机0${i+1}下料位01`}, {value: `YJ0${i+1}XLW02`, text: `压制机0${i+1}下料位02`})
+				}
+			}
+			this.options1[0].point = point1
+			this.options1[1].point = point2
+		},
+		methods: {
+			change (e) {
+				this.options1.map((el, i) => {
+					if (e === i) {
+						this.options2 = el.point
+					}
+				})
+			},
+			clearUp () {
+				this.index1 = ''
+				this.index2 = ''
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+			},
+			async _mlTask () {
+				this.disabled = true
+				if (!this.index2 || !this.val1 || !this.val2 || !this.val3) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await mlTask(this.index2, this.val1, this.val2, this.val3)
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/mode/command.vue b/pages/mode/command.vue
new file mode 100644
index 0000000..911033a
--- /dev/null
+++ b/pages/mode/command.vue
@@ -0,0 +1,105 @@
+<template>
+	<view class="zd_container">
+		<!-- 设备操控 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">扫码点位</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">库存校验</span>
+					</view>
+					<view class="relative zd-col-16">
+						<switch :checked="isChecked" color="#4e6ef2" style="transform:scale(0.8); transform-origin: left;"/>
+						<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_toCommandTP">下发输送线运动命令</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {toCommandTP} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				disabled: false,
+				isChecked: true
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async _toCommandTP () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let check = this.isChecked ? '1' : '0'
+					let res = await toCommandTP(this.val1, '1', this.val2, check)
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.disabled = false
+				this.isChecked = true
+			},
+			setWStatus () {
+				this.isChecked = !this.isChecked
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.button-primary, .button-default
+	_fj(center)
+	font-size 26rpx
+	height 88rpx
+	line-height 30rpx
+</style>
diff --git a/pages/mode/pick.vue b/pages/mode/pick.vue
new file mode 100644
index 0000000..79875e4
--- /dev/null
+++ b/pages/mode/pick.vue
@@ -0,0 +1,92 @@
+<template>
+	<view class="zd_container">
+		<!-- 设备操控 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">扫码点位</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">操作命令</span>
+					</view>
+					<view class="zd-col-16 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pinkStartStop">拣选工位启停模式</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {pinkStartStop} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [{value: '0', text: '停用'}, {value: '1', text: '启用'}],
+				index: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			async _pinkStartStop () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pinkStartStop(this.val1, this.index)
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.button-primary, .button-default
+	_fj(center)
+	font-size 26rpx
+	height 88rpx
+	line-height 30rpx
+</style>
diff --git a/pages/mode/switch-in-out.vue b/pages/mode/switch-in-out.vue
new file mode 100644
index 0000000..18a2165
--- /dev/null
+++ b/pages/mode/switch-in-out.vue
@@ -0,0 +1,92 @@
+<template>
+	<view class="zd_container">
+		<!-- 设备操控 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">扫码点位</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">操作命令</span>
+					</view>
+					<view class="zd-col-16 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_switchInOut">切换出入库模式</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {switchInOut} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [{value: '0', text: '入库模式'}, {value: '1', text: '出库模式'}],
+				index: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			async _switchInOut () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await switchInOut(this.val1, this.index)
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.button-primary, .button-default
+	_fj(center)
+	font-size 26rpx
+	height 88rpx
+	line-height 30rpx
+</style>
diff --git a/pages/outbound/bill-list.vue b/pages/outbound/bill-list.vue
new file mode 100644
index 0000000..59830d9
--- /dev/null
+++ b/pages/outbound/bill-list.vue
@@ -0,0 +1,182 @@
+<template>
+	<view class="zd_container">
+		<!-- 单据列表 -->
+		<nav-bar title="单据列表"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-9">
+						<span class="filter_label">出库单类型</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-7">
+						<span class="filter_label">单据编码</span>
+					</view>
+					<view class="zd-col-24">
+						<search-box
+						v-model="code"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>单据编码</th>
+								<th>单据类型</th>
+								<th>备注</th>
+								<th>创建时间</th>
+								<th>创建人</th>
+								<th>物料编码</th>
+								<th>申请数量</th>
+								<th>计划数量</th>
+								<th>已分配数量</th>
+								<th>批次号</th>
+								<th>单位</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toChek(e)" :class="{'checked': pkId === e.code}">
+								<td>{{e.code}}</td>
+								<td>{{e.form_type}}</td>
+								<td>{{e.remark}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_name}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.plan_qty}}</td>
+								<td>{{e.assign_qty}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.unit_name}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-primary" @tap="seachList">查询</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" @tap="toSure">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {outStorageOrder, outStorageOrderList} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				id: '',
+				code: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false,
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 100
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this.id = options.id
+		},
+		created () {
+			this._outStorageOrder()
+		},
+		methods: {
+			/** 下拉框*/
+			async _outStorageOrder () {
+				let res = await outStorageOrder()
+				this.options = [...res]
+			},
+			selectChange (e) {
+				this.index = e
+				if (e) {
+					this.dataList = []
+					this.pageNum = 1
+					this.pkId = ''
+					this._outStorageOrderList(e, this.code)
+				}
+			},
+			handleChange (e) {
+				if (e) {
+					this.dataList = []
+					this.pageNum = 1
+					this.pkId = ''
+					this._outStorageOrderList(this.index, e)
+				}
+			},
+			seachList () {
+				this.dataList = []
+				this.pageNum = 1
+				this.pkId = ''
+				this._outStorageOrderList(this.index, this.code)
+			},
+			async _outStorageOrderList (index, e) {
+				let res = await outStorageOrderList(this.pageNum + '', this.pageSize + '', index, e)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._outStorageOrderList(this.index, this.code)
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toChek (e) {
+				this.pkId = this.pkId === e.code ? '' : e.code
+				this.pkObj = this.pkId === e.code ? e : {}
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateTo({
+						url: '/pages/outbound/bill-out-store?title=单据出库'
+					})
+				}
+			}
+		}
+	}
+</script>
diff --git a/pages/outbound/bill-out-store.vue b/pages/outbound/bill-out-store.vue
new file mode 100644
index 0000000..89741db
--- /dev/null
+++ b/pages/outbound/bill-out-store.vue
@@ -0,0 +1,243 @@
+<template>
+	<view class="zd_container">
+		<!-- 单据出库 -->
+		<nav-bar :title="title" :inner="true"></nav-bar>
+		<view class="zd_content">
+			<view v-if="JSON.stringify(currentData) !== '{}'" class="zd_wrapper">
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6"><span class="filter_label">单据编码</span></view>
+					<view class="zd-col-6"><span class="filter_input">{{currentData.code}}</span></view>
+					<view class="zd-col-6"><span class="filter_label">单据类型</span></view>
+					<view class="zd-col-6"><span class="filter_input">{{formTypeName}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6"><span class="filter_label">创建时间</span></view>
+					<view class="zd-col-6"><span class="filter_input">{{currentData.create_time}}</span></view>
+					<view class="zd-col-6"><span class="filter_label">创建人</span></view>
+					<view class="zd-col-6"><span class="filter_input">{{currentData.create_name}}</span></view>
+				</view>
+				<!-- <view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6"><span class="filter_label">物料编码</span></view>
+					<view class="zd-col-6"><span class="filter_input">{{currentData.material_code}}</span></view>
+					<view class="zd-col-6"><span class="filter_label">单位</span></view>
+					<view class="zd-col-6"><span class="filter_input">{{currentData.unit_name}}</span></view>
+				</view> -->
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6"><span class="filter_label">仓库</span></view>
+					<view class="zd-col-6 filter_select">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+					<view class="zd-col-6"><span class="filter_label">车间</span></view>
+					<view class="zd-col-6 filter_select">
+						<uni-data-select v-model="currentData.product_area" :localdata="options2"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row jcflexstart">
+					<view class="zd-col-6">
+						<span class="filter_label">加急单据</span>
+					</view>
+					<view class="relative zd-col-6">
+						<switch :checked="isChecked" color="#4e6ef2" style="transform:scale(0.8); transform-origin: left;"/>
+						<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
+					</view>
+				</view>
+			</view>
+			<view v-if="JSON.stringify(currentData) !== '{}'" class="grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th>
+								<th class="td_3">
+									<view class="td_3">
+										物料名称
+									</view>
+								</th>
+								<th>物料编码</th>
+								<th>计划数量</th>
+								<th>申请数量</th>
+								<th>库存数量</th>
+								<th>出库数量</th>
+								<th>已分配数量</th>
+								<th>已领数量</th>
+								<th>批次号</th>
+								<th>单位</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
+								<td class="td_3">{{e.material_name}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.plan_qty}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.sto_qty}}</td>
+								<td><input type="number" class="sin_input" v-model="e.now_assign_qty" @blur="handleBlur(e)"></td>
+								<td>{{e.assign_qty}}</td>
+								<td>{{e.actual_qty}}</td>
+								<td><input type="text" class="sin_input" v-model="e.pcsn"></td>
+								<td>{{e.unit_name}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-primary" @tap="toEmpty">返回</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_outStorageConfirm">出库确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {outStorageOrder, outStorageConfirm, outStorageOrderConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				currentData: {},
+				dataList: [],
+				disabled: false,
+				options1: [{value: 'FStockPallet', text: '托盘库'}, {value: 'FStockId', text: '料箱库'}],
+				index1: '',
+				options2: [{value: 'A1', text: 'A1车间'}, {value: 'A2', text: 'A2车间'}, {value: 'A3', text: 'A3车间'}],
+				allCheck: false,
+				formTypeName: '',
+				isChecked: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.currentData = this.$store.getters.publicObj
+				this._outStorageOrder()
+				this.dataList = [...this.currentData.children]
+				this.dataList.map(el => {
+					this.$set(el, 'now_assign_qty', el.qty)
+					this.$set(el, 'checked', false)
+				})
+				this.index1 = this.currentData.stor_code
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
+		methods: {
+			setWStatus () {
+				this.isChecked = !this.isChecked
+			},
+			// 出库单类型
+			async _outStorageOrder () {
+				let res = await outStorageOrder()
+				res.map(el => {
+					if (el.value === this.currentData.form_type) {
+						this.formTypeName = el.text
+					}
+				})
+			},
+			selectChange1 (e) {
+				if (e) {
+					this._outStorageOrderConfirm(e)
+				}
+			},
+			async _outStorageOrderConfirm (e) {
+				try {
+					let res = await outStorageOrderConfirm(this.currentData.code, e)
+					if (res.code === '200') {
+						if (res.content.length > 0) {
+							this.currentData = res.content[0]
+							this.dataList = [...this.currentData.children]
+							this.dataList.map(el => {
+								this.$set(el, 'now_assign_qty', el.qty)
+								this.$set(el, 'checked', false)
+							})
+						}
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+					console.log(e)
+				}
+			},
+			handleBlur (e) {
+				if (e.now_assign_qty < 0 || e.now_assign_qty > e.qty) {
+					e.now_assign_qty = e.qty
+				}
+				if (parseFloat(e.sto_qty) < parseFloat(e.now_assign_qty) && e.checked) {
+					e.checked = false
+				}
+			},
+			toEmpty () {
+				uni.navigateBack()
+			},
+			toAllCheck () {
+				this.allCheck = !this.allCheck
+				this.dataList.map(el => {
+					el.checked = this.allCheck
+				})
+			},
+			toCheck (e) {
+				if (parseFloat(e.sto_qty) < parseFloat(e.now_assign_qty)) {
+					return
+				}
+				e.checked = !e.checked
+				let arr = this.dataList.filter(el => el.checked === true)
+				this.allCheck = arr.length === this.dataList.length
+			},
+			async _outStorageConfirm () {
+				this.disabled = true
+				if (JSON.stringify(this.currentData) === '{}') {
+					this.disabled = false
+					return
+				}
+				let arr = this.dataList.filter(el => el.checked === true)
+				let urgent = this.isChecked ? '1' : '0'
+				let obj = Object.assign(this.currentData, {children: arr, stor_code: this.index1, urgent: urgent})
+				try {
+					let res = await outStorageConfirm(obj)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.toEmpty()
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+.filter_input
+	font-size 26rpx
+.filter_label
+	font-size: 26rpx;
+.slide_new
+	// padding-bottom 110px
+.slide_new table td
+	overflow visible
+/deep/ .uni-select__input-text
+	width calc(100% - 25px)
+/deep/ .zd_icon_wraper
+	width 25px
+/deep/ .uni-icons
+	vertical-align: bottom;
+</style>
\ No newline at end of file
diff --git a/pages/outbound/out-store-confirm.vue b/pages/outbound/out-store-confirm.vue
new file mode 100644
index 0000000..d97c820
--- /dev/null
+++ b/pages/outbound/out-store-confirm.vue
@@ -0,0 +1,82 @@
+<template>
+	<view class="zd_container">
+		<!-- 出库确认 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-24">
+						<search-box
+						v-model="code"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_ioStorageOut">扫码出库确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {ioStorageOut} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				code: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+		},
+		methods: {
+			clearUp () {
+				this.code = ''
+				this.disabled = false
+			},
+			async _ioStorageOut () {
+				this.disabled = true
+				if (!this.code) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await ioStorageOut(this.code)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/outbound/pick-confirm-2nd.vue b/pages/outbound/pick-confirm-2nd.vue
new file mode 100644
index 0000000..56b996a
--- /dev/null
+++ b/pages/outbound/pick-confirm-2nd.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class="zd_container">
+		<!-- 二楼取货确认 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">产线站点编号</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">取货确认状态</span>
+					</view>
+					<view class="zd-col-16">
+						<span v-show="val1" class="filter_input" style="font-size: 34rpx; color: #ff6a00; font-weight: 700;">{{status === '1' ? '已确认取货' : '未确认取货'}}</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-primary" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_takeConfirm">扫码取货确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getPointStatus, takeConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				status: null,
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange1 (e) {
+				this._getPointStatus(e)
+			},
+			// 产线站点编码验证
+			async _getPointStatus (e) {
+				try {
+					let res = await getPointStatus(e)
+					if (res) {
+						this.val1 = res.code
+						this.status = res.point_location
+					}
+				} catch (e) {
+					this.val1 = ''
+					this.status = null
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.status = null
+				this.disabled = false
+			},
+			async _takeConfirm () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await takeConfirm(this.val1)
+					if (res.code === '200') {
+						this.toEmpty()
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
diff --git a/pages/outbound/produce-out-store-2nd.vue b/pages/outbound/produce-out-store-2nd.vue
new file mode 100644
index 0000000..ea1aea4
--- /dev/null
+++ b/pages/outbound/produce-out-store-2nd.vue
@@ -0,0 +1,234 @@
+<template>
+	<view class="zd_container">
+		<!-- 二楼生产出库 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">产线站点编号</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">出库单据编号</span>
+					</view>
+					<view class="zd-col-16 zd-row relative">
+						<link-scan
+						:editValue="editValue"
+						v-model="val2"
+						@handleChange="handleChange2"
+						@linkDel="toDel"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">已选物料数</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 34rpx; color: #ff6a00; font-weight: 700;">{{selectedNum}}</span>
+					</view>
+					<view class="zd-col-8">
+						<span class="filter_label">可选物料数</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input" style="font-size: 34rpx; color: #4e6ef2; font-weight: 700;">{{selectedNum !== null ? (9 - selectedNum) : null}}</span>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>选择</th>
+								<th class="td_3"><view class="td_3">物料名称</view></th>
+								<th>物料编码</th>
+								<th>物料状态</th>
+								<th>数量</th>
+								<th>单位</th>
+								<th>单据编码</th>
+								<th>载具号</th>
+								<th>批次号</th>
+								<th><view style="width: 150px;">出库进度</view></th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>
+									<uni-icons v-show="e.status === '1'" @tap="toCheck(e)" :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons>
+									<uni-icons v-show="e.status !== '1'" type="smallcircle-filled" size="24" color="#fff"></uni-icons>
+								</td>
+								<td class="td_3">{{e.material_name}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_status}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.unit_name}}</td>
+								<td>{{e.prd_ppbom_no}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.pcsn}}</td>
+								<td style="width: 150px;line-height: 28rpx;white-space: unset;">{{e.remark}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': checkData.length === 0}" :disabled="disabled" @tap="_ctuOutConfirm">出库物料提交</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import LinkScan from '@/components/LinkScan.vue'
+	import {queryTargetPoint, getCtuOrderList, ctuOutConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			LinkScan
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				editValue: [], // 出库单据编号集合
+				selectedNum: null, // 已选物料数
+				dataList: [],
+				disabled: false,
+				checkData: []
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange1 (e) {
+				this._queryTargetPoint(e)
+			},
+			// 产线站点编码验证
+			async _queryTargetPoint (e) {
+				try {
+					let res = await queryTargetPoint(e)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.val1 = res.site_code
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.val1 = ''
+					}
+				} catch (e) {
+					this.val1 = ''
+				}
+			},
+			handleChange2 (e) {
+				if (this.editValue.indexOf(e) === -1) {
+				  this._getCtuOrderList(e)
+				} else {
+					uni.showToast({
+						title: '出库单据编号已存在',
+						icon: 'none'
+					})
+				}
+				setTimeout(() => {
+					this.val2 = null
+				}, 300)
+			},
+			async _getCtuOrderList (e) {
+				try {
+					let res = await getCtuOrderList(this.val1, e)
+					if (res.code === '200') {
+						this.checkData = []
+						for (let i = 0; i < res.content.length; i++) {
+							if (this.selectedNum < 9 && res.content[i].status === '1') {
+								this.$set(res.content[i], 'checked', true)
+								this.selectedNum += 1
+							} else {
+								this.$set(res.content[i], 'checked', false)
+							}
+						}
+						this.dataList = [...this.dataList, ...res.content]
+						let arr = this.dataList.filter(el => el.checked === true)
+						this.checkData = arr
+						if (res.data !== null) {
+							this.editValue.push(res.data)
+						}
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+					console.log(e)
+				}
+			},
+			toCheck (e) {
+				if (!e.checked && this.selectedNum >= 9) {
+					return
+				} else if (!e.checked && this.selectedNum < 9) {
+					e.checked = true
+					this.selectedNum++
+				} else if (e.checked) {
+					e.checked = false
+					this.selectedNum--
+				}
+				let arr = this.dataList.filter(el => el.checked === true)
+				this.checkData = arr
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.selectedNum = null
+				this.dataList = []
+				this.disabled = false
+				this.checkData = []
+				this.editValue = []
+			},
+			async _ctuOutConfirm () {
+				this.disabled = true
+				if (this.checkData.length === 0) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await ctuOutConfirm(this.val1, this.editValue.toString(), this.checkData)
+					if (res.code === '200') {
+						this.clearUp()
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toDel () {
+				this.editValue = []
+				this.selectedNum = null
+				this.dataList = []
+				this.checkData = []
+			}
+		}
+	}
+</script>
diff --git a/pages/outbound/shelf-bind-2nd.vue b/pages/outbound/shelf-bind-2nd.vue
new file mode 100644
index 0000000..b0f386f
--- /dev/null
+++ b/pages/outbound/shelf-bind-2nd.vue
@@ -0,0 +1,152 @@
+<template>
+	<view class="zd_container">
+		<!-- 二楼货架绑定 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">地面站点编号</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-8">
+						<span class="filter_label">货架编号</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>站点编码</th>
+								<th>站点名称</th>
+								<th>绑定状态</th>
+								<th>任务锁定</th>
+								<th>绑定货架号</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{e.code}}</td>
+								<td>{{e.name}}</td>
+								<td>{{e.remark}}</td>
+								<td>{{$getStatusText({ '00': '未锁定', '10': '入库锁', '20': '出库锁' }, e.lock_type)}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-primary" @tap="toEmpty">清空</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_pointUnbind">CTU站点解绑</button>
+			<button v-if="dataList.length > 0 && dataList[0].lock_type === '00'" class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('1')">货架绑定</button>
+			<button v-if="dataList.length > 0 && dataList[0].lock_type !== '00'" class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('0')">货架解绑</button>
+			<button v-if="!dataList.length" class="zd-col-8 button-primary button-info">货架绑定/解绑</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getPointStatus, bindOrUnbind, pointUnbind} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				disabled: false,
+				dataList: []
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._getPointStatus(e)
+				}
+			},
+			async _getPointStatus (e) {
+				try {
+					let res = await getPointStatus(e)
+					this.dataList = []
+					this.dataList.push(res)
+					this.val2 = res.vehicle_code
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.disabled = false
+				this.dataList = []
+			},
+			toSure (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				this._bindOrUnbind(type)
+			},
+			async _bindOrUnbind (type) {
+				try {
+					let res = await bindOrUnbind(this.val1, this.val2, type)
+					if (res.code === '200') {
+						this._getPointStatus(this.val1)
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _pointUnbind () {
+				try {
+					this.disabled = true
+					if (!this.val1 || !this.val2) {
+						this.disabled = false
+						return
+					}
+					let res = await pointUnbind(this.val1, this.val2)
+					if (res.code === '200') {
+						this._getPointStatus(this.val1)
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
diff --git a/pages/outbound/stock-list.vue b/pages/outbound/stock-list.vue
new file mode 100644
index 0000000..2c2c6d4
--- /dev/null
+++ b/pages/outbound/stock-list.vue
@@ -0,0 +1,176 @@
+<template>
+	<view class="zd_container">
+		<!-- 库存出库 -->
+		<nav-bar :title="title" :inner="true"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">仓库</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<input type="text" class="filter_input" v-model="val3">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">仓位编码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<input type="text" class="filter_input" v-model="val4">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料批次</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<input type="text" class="filter_input" v-model="val2">
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>仓库编码</th>
+								<th>库位编码</th>
+								<th>载具编码</th>
+								<th>物料编码</th>
+								<th>物料批次</th>
+								<th>出库库存</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.id === pkId}" @tap="toCheck(e)">
+								<td>{{e.stor_code}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-8 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" @tap="toSure">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {structattrPage} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [{value: 'FStockPallet', text: '托盘库'}, {value: 'FStockId', text: '料箱库'}],
+				index: 'FStockId',
+				val2: '',
+				val3: '',
+				val4: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._structattrPage()
+			},
+			async _structattrPage () {
+				let res = await structattrPage(this.pageNum + '', this.pageSize + '', this.index, this.val1, true, this.val2, this.val3, this.val4)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._structattrPage()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.id ? '' : e.id
+				this.pkObj = this.pkId === e.id ? e : {}
+			},
+			toEmpty () {
+				this.index = ''
+				this.val1 = ''
+				this.dataList = []
+				this.pageNum = 1
+				this.pkId = ''
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+</style>
diff --git a/pages/outbound/stock-out-store.vue b/pages/outbound/stock-out-store.vue
new file mode 100644
index 0000000..b901cd1
--- /dev/null
+++ b/pages/outbound/stock-out-store.vue
@@ -0,0 +1,132 @@
+<template>
+	<view class="zd_container">
+		<!-- 盘点出库 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">仓库</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<input type="text" class="filter_input" v-model="val1" @tap="toJump">
+					</view>
+				</view>
+			</view>
+			<view v-if="JSON.stringify(currentData) !== '{}'" class="zd_wrapper">
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-7"><span class="filter_label">库位</span></view>
+					<view class="zd-col-17"><span class="filter_input">{{currentData.struct_code}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-7"><span class="filter_label">载具编码</span></view>
+					<view class="zd-col-17"><span class="filter_input">{{currentData.vehicle_code}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-7"><span class="filter_label">物料编码</span></view>
+					<view class="zd-col-17"><span class="filter_input">{{currentData.material_code}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-7"><span class="filter_label">批号</span></view>
+					<view class="zd-col-17"><span class="filter_input">{{currentData.pcsn}}</span></view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-7"><span class="filter_label">车间</span></view>
+					<view class="zd-col-17 filter_select">
+						<uni-data-select v-model="currentData.product_area" :localdata="options1"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-7"><span class="filter_label">出库库存</span></view>
+					<view class="zd-col-17">
+						<input type="number" v-model="currentData.qty" class="filter_input">
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_outStorageMaterConfirm">确认出库</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {outStorageMaterConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				currentData: {},
+				options1: [{value: 'A1', text: 'A1车间'}, {value: 'A2', text: 'A2车间'}, {value: 'A3', text: 'A3车间'}],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.currentData = this.$store.getters.publicObj
+				if (this.currentData.stor_code === 'FStockPallet') {
+					this.val1 = '托盘库'
+				} else if (this.currentData.stor_code === 'FStockId') {
+					this.val1 = '料箱库'
+				}
+				if (!this.currentData.product_area) {
+					this.currentData.product_area = 'A1'
+				}
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
+		methods: {
+			toJump () {
+				uni.navigateTo({
+					url: '/pages/outbound/stock-list?title=库存列表'
+				})
+			},
+			async _outStorageMaterConfirm () {
+				this.disabled = true
+				if (JSON.stringify(this.currentData) === '{}') {
+					this.disabled = false
+					return
+				}
+				let obj = Object.assign(this.currentData, {now_assign_qty: this.currentData.qty})
+				try {
+					let res = await outStorageMaterConfirm(obj)
+					if (res.code === '200') {
+						this.toEmpty()
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.currentData = {}
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.button-primary, .button-default
+	_fj(center)
+	font-size 26rpx
+	height 88rpx
+	line-height 30rpx
+</style>
diff --git a/pages/outbound/tray-out-store.vue b/pages/outbound/tray-out-store.vue
new file mode 100644
index 0000000..90dd57b
--- /dev/null
+++ b/pages/outbound/tray-out-store.vue
@@ -0,0 +1,115 @@
+<template>
+	<view class="zd_container">
+		<!-- 托盘出库 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">托盘类型</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">出库数量</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="number" class="filter_input" v-model="qty">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">出库点</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !qty || !index1 || !index2}" :disabled="disabled" @tap="_pdaPalletIostorinvOut">托盘库出库</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {targetPoint, pdaPalletIostorinvOut} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				index1: '',
+				qty: '',
+				options2: [],
+				index2: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._targetPoint()
+		},
+		methods: {
+			selectChange1 (e) {
+				this.index1 = e
+			},
+			selectChange2 (e) {
+				this.index2 = e
+			},
+			async _targetPoint () {
+				let res = await targetPoint()
+				this.options2 = [...res]
+				this.options2.map(el => {
+					this.$set(el, 'text', el.label)
+				})
+			},
+			clearUp () {
+				this.qty = ''
+				this.index1 = ''
+				this.index2 = ''
+				this.disabled = false
+			},
+			async _pdaPalletIostorinvOut () {
+				this.disabled = true
+				if (!this.qty || !this.index1 || !this.index2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pdaPalletIostorinvOut(this.index1, this.qty, this.index2)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/pick/pick-list.vue b/pages/pick/pick-list.vue
new file mode 100644
index 0000000..0e39c3c
--- /dev/null
+++ b/pages/pick/pick-list.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class="zd_container">
+		<!-- 拣选单列表 -->
+		<nav-bar :title="title" :inner="true"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">料箱码</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th class="th_2">拣选单编码</th>
+								<th>载具编码</th>
+								<th>状态</th>
+								<th>仓库</th>
+								<th>拣选站台</th>
+								<th>车间</th>
+								<th>创建时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toChek(e)" :class="{'checked': pkId === code}">
+								<td>{{i+1}}</td>
+								<td class="td_2">{{e.code}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.status}}</td>
+								<td>{{e.stor_code}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.product_area}}</td>
+								<td>{{e.create_time}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-6 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-10 button-primary" @tap="toSure">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {pmFormData2} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._pmFormData()
+			},
+			async _pmFormData () {
+				let res = await pmFormData2(this.pageNum + '', this.pageSize + '', 'Picking', '10', this.val1)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._pmFormData()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.dataList = []
+				this.pageNum = 1
+				this.pkId = ''
+				this.pkObj = {}
+			},
+			toChek (e) {
+				this.pkId = this.pkId === e.code ? '' : e.code
+				this.pkObj = this.pkId === e.code ? e : {}
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/pick/pick-task.vue b/pages/pick/pick-task.vue
new file mode 100644
index 0000000..f52786c
--- /dev/null
+++ b/pages/pick/pick-task.vue
@@ -0,0 +1,311 @@
+<template>
+	<view class="zd_container">
+		<!-- 拣选作业 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">料箱编码</span>
+					</view>
+					<view class="zd-col-14">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-10">
+						<span class="filter_label">拣选单据</span>
+					</view>
+					<view class="zd-col-14">
+						<input type="text" class="filter_input" v-model="data.code" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-10">
+						<span class="filter_label">车间</span>
+					</view>
+					<view class="zd-col-14">
+						<input type="text" class="filter_input" v-model="data.product_area" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-10">
+						<span class="filter_label">拣选仓库</span>
+					</view>
+					<view class="zd-col-14">
+						<input type="text" class="filter_input" v-model="data.stor_code" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-10">
+						<span class="filter_label">拣选站台</span>
+					</view>
+					<view class="zd-col-14">
+						<input type="text" class="filter_input" v-model="data.point_code" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-10">
+						<span class="filter_label">拣选数量</span>
+					</view>
+					<view class="zd-col-14">
+						<input type="number" class="filter_input" v-model="data.assign_qty" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">出库至二楼料箱</span>
+					</view>
+					<view class="zd-col-14">
+						<search-box
+						v-model="val2"
+						@handleChange="handleChange2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">是否机械搬运</span>
+					</view>
+					<view class="relative zd-col-14">
+						<switch :checked="isChecked" color="#4e6ef2" style="transform:scale(0.8); transform-origin: left;"/>
+						<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
+					</view>
+				</view>
+				<!-- <view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">是否机打印</span>
+					</view>
+					<view class="relative zd-col-14">
+						<switch :checked="isChecked1" color="#4e6ef2" style="transform:scale(0.8); transform-origin: left;"/>
+						<text @tap="setWStatus1" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
+					</view>
+				</view> -->
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">返回至立库料箱</span>
+					</view>
+					<view class="zd-col-14">
+						<search-box
+						v-model="val3"
+						@handleChange="handleChange3"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1|| !val2 || !val3 || (val2 === val3)}" :disabled="disabled" @tap="toSure">拣选确认</button>
+		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10 filter_label">出库二楼料箱号为：</view>
+					<view class="zd-col-14 font-size-1">{{val2}}</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10 filter_label">返回立库料箱号为：</view>
+					<view class="zd-col-14 font-size-1">{{val3}}</view>
+				</view>
+				<view class="filter_label">是否确认？</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show = false;disabled = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="toConfirm">确定</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	// import {getCLodop} from "@/utils/CLodopfuncs.js"
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryPick, savePickTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				val3: '',
+				isChecked: true,
+				isChecked1: false,
+				data: {},
+				disabled: false,
+				show: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onShow() {
+			if (this.$store.getters.publicObj !== '') {
+				this.data = this.$store.getters.publicObj
+			}
+		},
+		methods: {
+			handleChange (e) {
+				this._queryPick(e)
+			},
+			handleChange2 (e) {
+				if (this.val3 && e === this.val3) {
+					uni.showToast({
+						title: '出库和入库料箱不能相同',
+						icon: 'none'
+					})
+					this.val3 = ''
+				}
+			},
+			handleChange3 (e) {
+				if (this.val2 && e === this.val2) {
+					uni.showToast({
+						title: '出库和入库料箱不能相同',
+						icon: 'none'
+					})
+					this.val2 = ''
+				}
+			},
+			async _queryPick (e) {
+				let res = await queryPick('Picking', e)
+				this.data = res
+			},
+			setWStatus () {
+				this.isChecked = !this.isChecked
+			},
+			setWStatus1 () {
+				this.isChecked1 = !this.isChecked1
+			},
+			clearUp () {
+				this.data = {}
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.isChecked = true
+				this.isChecked1 = false
+				this.disabled = false
+				this.show = false
+			},
+			toSure () {
+				if (!this.val1|| !this.val2 || !this.val3) {
+					return
+				}
+				if (this.val2 === this.val3) {
+					uni.showToast({
+						title: '出库和入库料箱不能相同',
+						icon: 'none'
+					})
+					return
+				}
+				this.show = true
+			},
+			toConfirm () {
+				// if (this.isChecked1) {
+				// 	this.disabled = true
+				// 	let data = Object.assign({}, this.data, {lxCode: this.val2})
+				// 	this.toPrint(data)
+				// } else {
+				// 	this._savePickTask()
+				// }
+				this._savePickTask()
+			},
+			async _savePickTask () {
+				this.disabled = true
+				try {
+					let obj = Object.assign({}, this.data, {is_move: this.isChecked, pick_vehicle_23: this.val2, pick_vehicle_13: this.val3})
+					let res = await savePickTask(obj)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toPrint (data) {
+				let iparr = this.$store.getters.printUrl.split(":")
+				let printUrl = iparr[1].slice(2)
+				let LODOP = getCLodop();
+				if (!(LODOP.webskt && LODOP.webskt.readyState === 1)) {
+				    uni.showToast({
+						title: '当前配置ip：' + printUrl + '网络不通，请检查',
+						icon: 'none',
+						duration: 5000
+					})
+					this.disabled = false
+				    return
+				}
+				LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+				LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
+				// 更换为打印服务器ip 不需要加前缀
+				LODOP.PRINT_INIT(null, printUrl);
+				// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机 
+				LODOP.SET_PRINTER_INDEX(-1);
+				// 设置打印纸大小
+				LODOP.SET_PRINT_PAGESIZE(1, '80mm', '50mm', '');
+				// LODOP.SET_PRINT_MODE("POS_BASEON_PAPER",true);
+				LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '44mm', 0, 1);
+				LODOP.SET_PRINT_STYLE('FontSize', 10);
+				LODOP.SET_PRINT_STYLE('Bold', 1);
+				LODOP.ADD_PRINT_TEXT('5mm', '30mm', '32mm', '15mm', '物料信息卡');
+				let tableHtml = `
+								<div id="div1">
+									<style>table{border:none} td{border: 1px solid #000;height:18px;font-size: 10px;text-align: center}</style>
+									
+									<table border=0 cellSpacing=0 cellPadding=0  width="100%" bordercolor="#000000" style="border-collapse:collapse">
+										<tbody>
+											<tr>
+											    <td width="40%">用料单号</td>
+											    <td width="60%">${data.prd_ppbom_no}</td>
+											</tr>
+											<tr>
+											    <td width="40%">物料编码</td>
+											    <td width="60%">${data.material_code}</td>
+											</tr>
+											<tr>
+											    <td width="40%">物料名称</td>
+											    <td width="60%">${data.material_name}</td>
+											</tr>
+											<tr>
+											    <td width="40%">物料规格</td>
+											    <td width="60%">${data.material_spec}</td>
+											</tr>
+											<tr>
+											    <td width="40%">物料数量</td>
+											    <td width="60%">${data.assign_qty}</td>
+											</tr>
+											<tr>
+											    <td width="40%">料箱号</td>
+											    <td width="60%">${data.lxCode}</td>
+											</tr>
+										</tbody>
+									</table>
+								</div>`
+				LODOP.ADD_PRINT_TABLE("12mm",'5mm',"70mm","30mm",tableHtml);
+				LODOP.PRINT();
+				// LODOP.PREVIEW()
+				uni.showToast({
+					title: '打印成功',
+					icon: 'none'
+				})
+				if (this.isChecked1) {
+					this._savePickTask()
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/task/task-manage.vue b/pages/task/task-manage.vue
new file mode 100644
index 0000000..ffff41e
--- /dev/null
+++ b/pages/task/task-manage.vue
@@ -0,0 +1,176 @@
+<template>
+	<view class="zd_container">
+		<!-- 任务管理 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">任务类型</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>任务类型</th>
+								<th>任务编码</th>
+								<th>载具编码</th>
+								<th>状态</th>
+								<th>起点</th>
+								<th>终点</th>
+								<th>创建时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_code === pkId}">
+								<td>{{e.task_type}}</td>
+								<td>{{e.task_code}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.status}}</td>
+								<td>{{e.point_code1}}</td>
+								<td>{{e.point_code2}}</td>
+								<td>{{e.create_time}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">完成</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">强制完成</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('90')">取消</button>
+			<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStatusEnum, schBaseTask, saveCheckTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10,
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._getStatusEnum()
+		},
+		methods: {
+			async _getStatusEnum () {
+				let res = await getStatusEnum()
+				this.options = [...res]
+				this.options.map(el => {
+					this.$set(el, 'text', el.label)
+				})
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._schBaseTask()
+			},
+			async _schBaseTask () {
+				let res = await schBaseTask(this.pageNum + '', this.pageSize + '', this.index, this.val1)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._schBaseTask()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = e.e.task_code === this.pkId ? '' : e.task_code
+			},
+			async toSure (status) {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await saveCheckTask(this.pkId, status)
+					if (res.code === '200') {
+						this.index = ''
+						this.val1 = ''
+						this.dataList = []
+						this.pkId = ''
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					} else {
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					}
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/transfer/tray-transfer.vue b/pages/transfer/tray-transfer.vue
new file mode 100644
index 0000000..bbbbcf6
--- /dev/null
+++ b/pages/transfer/tray-transfer.vue
@@ -0,0 +1,110 @@
+<template>
+	<view class="zd_container">
+		<!-- 托盘转运 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">起点</span>
+					</view>
+					<view class="zd-col-24">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">终点</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index || !val2}" :disabled="disabled" @tap="_transfConfirm">转运确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {deviceManageTransf, transfConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [],
+				index: '',
+				val2: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._deviceManageTransf(e)
+				}
+			},
+			async _deviceManageTransf (e) {
+				let res = await deviceManageTransf(e)
+				this.options = [...res]
+			},
+			async _transfConfirm () {
+				this.disabled = true
+				if (!this.val1 || !this.index || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await transfConfirm(this.val1, this.index, this.val2)
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.button-primary, .button-default
+	_fj(center)
+	font-size 26rpx
+	height 88rpx
+	line-height 30rpx
+</style>
diff --git a/static/iconfont/iconfont.ttf b/static/iconfont/iconfont.ttf
new file mode 100644
index 0000000..b68f8e9
Binary files /dev/null and b/static/iconfont/iconfont.ttf differ
diff --git a/static/iconfont/iconfont.woff b/static/iconfont/iconfont.woff
new file mode 100644
index 0000000..655b9ec
Binary files /dev/null and b/static/iconfont/iconfont.woff differ
diff --git a/static/iconfont/iconfont.woff2 b/static/iconfont/iconfont.woff2
new file mode 100644
index 0000000..c634af4
Binary files /dev/null and b/static/iconfont/iconfont.woff2 differ
diff --git a/static/image/app_update_close.png b/static/image/app_update_close.png
new file mode 100644
index 0000000..8b2ffe6
Binary files /dev/null and b/static/image/app_update_close.png differ
diff --git a/static/image/bg_top.png b/static/image/bg_top.png
new file mode 100644
index 0000000..015f698
Binary files /dev/null and b/static/image/bg_top.png differ
diff --git a/static/image/exit.png b/static/image/exit.png
new file mode 100644
index 0000000..fefa052
Binary files /dev/null and b/static/image/exit.png differ
diff --git a/static/image/info_bg.png b/static/image/info_bg.png
new file mode 100644
index 0000000..8f7e000
Binary files /dev/null and b/static/image/info_bg.png differ
diff --git a/static/image/login_bg.png b/static/image/login_bg.png
new file mode 100644
index 0000000..680a940
Binary files /dev/null and b/static/image/login_bg.png differ
diff --git a/static/image/menu/RF01.png b/static/image/menu/RF01.png
new file mode 100644
index 0000000..6053e87
Binary files /dev/null and b/static/image/menu/RF01.png differ
diff --git a/static/image/menu/RF02.png b/static/image/menu/RF02.png
new file mode 100644
index 0000000..ee6ef08
Binary files /dev/null and b/static/image/menu/RF02.png differ
diff --git a/static/image/menu/RF03.png b/static/image/menu/RF03.png
new file mode 100644
index 0000000..f5ea753
Binary files /dev/null and b/static/image/menu/RF03.png differ
diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png
new file mode 100644
index 0000000..972a492
Binary files /dev/null and b/static/image/menu/RF04.png differ
diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png
new file mode 100644
index 0000000..d2b969b
Binary files /dev/null and b/static/image/menu/RF05.png differ
diff --git a/static/image/menu/RF06.png b/static/image/menu/RF06.png
new file mode 100644
index 0000000..4de6e93
Binary files /dev/null and b/static/image/menu/RF06.png differ
diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png
new file mode 100644
index 0000000..15c177a
Binary files /dev/null and b/static/image/menu/RF07.png differ
diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png
new file mode 100644
index 0000000..a65670b
Binary files /dev/null and b/static/image/menu/RF08.png differ
diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png
new file mode 100644
index 0000000..6417a79
Binary files /dev/null and b/static/image/menu/RF09.png differ
diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png
new file mode 100644
index 0000000..19d6dfd
Binary files /dev/null and b/static/image/menu/RF10.png differ
diff --git a/static/image/menu/RF11.png b/static/image/menu/RF11.png
new file mode 100644
index 0000000..30c871f
Binary files /dev/null and b/static/image/menu/RF11.png differ
diff --git a/static/uni.ttf b/static/uni.ttf
new file mode 100644
index 0000000..60a1968
Binary files /dev/null and b/static/uni.ttf differ
diff --git a/uni.scss b/uni.scss
new file mode 100644
index 0000000..a9a742d
--- /dev/null
+++ b/uni.scss
@@ -0,0 +1,76 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+
+/* 行为相关颜色 */
+$uni-color-primary: #007aff;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color:#333;//基本色
+$uni-text-color-inverse:#fff;//反色
+$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable:#c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color:#ffffff;
+$uni-bg-color-grey:#f8f8f8;
+$uni-bg-color-hover:#f1f1f1;//点击状态颜色
+$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color:#c8c7cc;
+
+/* 尺寸变量 */
+
+/* 文字尺寸 */
+$uni-font-size-sm:12px;
+$uni-font-size-base:14px;
+$uni-font-size-lg:16;
+
+/* 图片尺寸 */
+$uni-img-size-sm:20px;
+$uni-img-size-base:26px;
+$uni-img-size-lg:40px;
+
+/* Border Radius */
+$uni-border-radius-sm: 2px;
+$uni-border-radius-base: 3px;
+$uni-border-radius-lg: 6px;
+$uni-border-radius-circle: 50%;
+
+/* 水平间距 */
+$uni-spacing-row-sm: 5px;
+$uni-spacing-row-base: 10px;
+$uni-spacing-row-lg: 15px;
+
+/* 垂直间距 */
+$uni-spacing-col-sm: 4px;
+$uni-spacing-col-base: 8px;
+$uni-spacing-col-lg: 12px;
+
+/* 透明度 */
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
+/* 文章场景相关 */
+$uni-color-title: #2C405A; // 文章标题颜色
+$uni-font-size-title:20px;
+$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-font-size-subtitle:26px;
+$uni-color-paragraph: #3F536E; // 文章段落颜色
+$uni-font-size-paragraph:15px;
diff --git a/uniCloud-aliyun/database/JQL查询.jql b/uniCloud-aliyun/database/JQL查询.jql
new file mode 100644
index 0000000..35d21de
--- /dev/null
+++ b/uniCloud-aliyun/database/JQL查询.jql
@@ -0,0 +1,12 @@
+// 本文件用于，使用JQL语法操作项目关联的uniCloud空间的数据库，方便开发调试和远程数据库管理
+// 编写clientDB的js API（也支持常规js语法，比如var），可以对云数据库进行增删改查操作。不支持uniCloud-db组件写法
+// 可以全部运行，也可以选中部分代码运行。点击工具栏上的运行按钮或者按下【F5】键运行代码
+// 如果文档中存在多条JQL语句，只有最后一条语句生效
+// 如果混写了普通js，最后一条语句需是数据库操作语句
+// 此处代码运行不受DB Schema的权限控制，移植代码到实际业务中注意在schema中配好permission
+// 不支持clientDB的action
+// 数据库查询有最大返回条数限制，详见：https://uniapp.dcloud.net.cn/uniCloud/cf-database.html#limit
+// 详细JQL语法，请参考：https://uniapp.dcloud.net.cn/uniCloud/jql.html
+
+// 下面示例查询uni-id-users表的所有数据
+db.collection('uni-id-users').get();
diff --git a/uni_modules/uni-config-center/changelog.md b/uni_modules/uni-config-center/changelog.md
new file mode 100644
index 0000000..4d2eb92
--- /dev/null
+++ b/uni_modules/uni-config-center/changelog.md
@@ -0,0 +1,4 @@
+## 0.0.2（2021-04-16）
+- 修改插件package信息
+## 0.0.1（2021-03-15）
+- 初始化项目
diff --git a/uni_modules/uni-config-center/package.json b/uni_modules/uni-config-center/package.json
new file mode 100644
index 0000000..d97bd27
--- /dev/null
+++ b/uni_modules/uni-config-center/package.json
@@ -0,0 +1,80 @@
+{
+  "id": "uni-config-center",
+  "displayName": "uni-config-center",
+  "version": "0.0.2",
+  "description": "uniCloud 配置中心",
+  "keywords": [
+    "配置",
+    "配置中心"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+      "uniCloud",
+      "云函数模板"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "directories": {
+    "example": "../../../scripts/dist"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-config-center/readme.md b/uni_modules/uni-config-center/readme.md
new file mode 100644
index 0000000..0bd8ac4
--- /dev/null
+++ b/uni_modules/uni-config-center/readme.md
@@ -0,0 +1,93 @@
+# 为什么使用uni-config-center
+
+实际开发中很多插件需要配置文件才可以正常运行，如果每个插件都单独进行配置的话就会产生下面这样的目录结构
+
+```bash
+cloudfunctions
+└─────common 公共模块
+        ├─plugin-a // 插件A对应的目录
+        │  ├─index.js
+        │  ├─config.json // plugin-a对应的配置文件
+        │  └─other-file.cert  // plugin-a依赖的其他文件
+        └─plugin-b // plugin-b对应的目录
+           ├─index.js
+           └─config.json // plugin-b对应的配置文件
+```
+
+假设插件作者要发布一个项目模板，里面使用了很多需要配置的插件，无论是作者发布还是用户使用都是一个大麻烦。
+
+uni-config-center就是用了统一管理这些配置文件的，使用uni-config-center后的目录结构如下
+
+```bash
+cloudfunctions
+└─────common 公共模块
+        ├─plugin-a // 插件A对应的目录
+        │  └─index.js
+        ├─plugin-b // plugin-b对应的目录
+        │  └─index.js
+        └─uni-config-center
+           ├─index.js // config-center入口文件
+           ├─plugin-a
+           │  ├─config.json  // plugin-a对应的配置文件
+           │  └─other-file.cert  // plugin-a依赖的其他文件
+           └─plugin-b
+              └─config.json  // plugin-b对应的配置文件
+```
+
+使用uni-config-center后的优势
+
+- 配置文件统一管理，分离插件主体和配置信息，更新插件更方便
+- 支持对config.json设置schema，插件使用者在HBuilderX内编写config.json文件时会有更好的提示（后续HBuilderX会提供支持）
+
+# 用法
+
+在要使用uni-config-center的公共模块或云函数内引入uni-config-center依赖，请参考：[使用公共模块](https://uniapp.dcloud.net.cn/uniCloud/cf-common)
+
+```js
+const createConfig = require('uni-config-center')
+
+const uniIdConfig = createConfig({
+    pluginId: 'uni-id', // 插件id
+    defaultConfig: { // 默认配置
+        tokenExpiresIn: 7200,
+        tokenExpiresThreshold: 600,
+    },
+    customMerge: function(defaultConfig, userConfig) { // 自定义默认配置和用户配置的合并规则，不设置的情况侠会对默认配置和用户配置进行深度合并
+        // defaudltConfig 默认配置
+        // userConfig 用户配置
+        return Object.assign(defaultConfig, userConfig)
+    }
+})
+
+
+// 以如下配置为例
+// {
+//   "tokenExpiresIn": 7200,
+//   "passwordErrorLimit": 6,
+//   "bindTokenToDevice": false,
+//   "passwordErrorRetryTime": 3600,
+//   "app-plus": {
+//     "tokenExpiresIn": 2592000
+//   },
+//   "service": {
+//     "sms": {
+//       "codeExpiresIn": 300
+//     }
+//   }
+// }
+
+// 获取配置
+uniIdConfig.config() // 获取全部配置，注意：uni-config-center内不存在对应插件目录时会返回空对象
+uniIdConfig.config('tokenExpiresIn') // 指定键值获取配置，返回：7200
+uniIdConfig.config('service.sms.codeExpiresIn') // 指定键值获取配置，返回：300
+uniIdConfig.config('tokenExpiresThreshold', 600) // 指定键值获取配置，如果不存在则取传入的默认值，返回：600
+
+// 获取文件绝对路径
+uniIdConfig.resolve('custom-token.js') // 获取uni-config-center/uni-id/custom-token.js文件的路径
+
+// 引用文件（require）
+uniIDConfig.requireFile('custom-token.js') // 使用require方式引用uni-config-center/uni-id/custom-token.js文件。文件不存在时返回undefined，文件内有其他错误导致require失败时会抛出错误。
+
+// 判断是否包含某文件
+uniIDConfig.hasFile('custom-token.js') // 配置目录是否包含某文件，true: 文件存在，false: 文件不存在
+```
\ No newline at end of file
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js
new file mode 100644
index 0000000..e14fb3b
--- /dev/null
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/index.js
@@ -0,0 +1 @@
+"use strict";var t=require("fs"),r=require("path");function e(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=e(t),o=e(r),i="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};var u=function(t){var r={exports:{}};return t(r,r.exports),r.exports}((function(t,r){var e="__lodash_hash_undefined__",n=9007199254740991,o="[object Arguments]",u="[object Function]",c="[object Object]",a=/^\[object .+?Constructor\]$/,f=/^(?:0|[1-9]\d*)$/,s={};s["[object Float32Array]"]=s["[object Float64Array]"]=s["[object Int8Array]"]=s["[object Int16Array]"]=s["[object Int32Array]"]=s["[object Uint8Array]"]=s["[object Uint8ClampedArray]"]=s["[object Uint16Array]"]=s["[object Uint32Array]"]=!0,s[o]=s["[object Array]"]=s["[object ArrayBuffer]"]=s["[object Boolean]"]=s["[object DataView]"]=s["[object Date]"]=s["[object Error]"]=s[u]=s["[object Map]"]=s["[object Number]"]=s[c]=s["[object RegExp]"]=s["[object Set]"]=s["[object String]"]=s["[object WeakMap]"]=!1;var l="object"==typeof i&&i&&i.Object===Object&&i,h="object"==typeof self&&self&&self.Object===Object&&self,p=l||h||Function("return this")(),_=r&&!r.nodeType&&r,v=_&&t&&!t.nodeType&&t,d=v&&v.exports===_,y=d&&l.process,g=function(){try{var t=v&&v.require&&v.require("util").types;return t||y&&y.binding&&y.binding("util")}catch(t){}}(),b=g&&g.isTypedArray;function j(t,r,e){switch(e.length){case 0:return t.call(r);case 1:return t.call(r,e[0]);case 2:return t.call(r,e[0],e[1]);case 3:return t.call(r,e[0],e[1],e[2])}return t.apply(r,e)}var w,O,m,A=Array.prototype,z=Function.prototype,M=Object.prototype,x=p["__core-js_shared__"],C=z.toString,F=M.hasOwnProperty,U=(w=/[^.]+$/.exec(x&&x.keys&&x.keys.IE_PROTO||""))?"Symbol(src)_1."+w:"",S=M.toString,I=C.call(Object),P=RegExp("^"+C.call(F).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),T=d?p.Buffer:void 0,q=p.Symbol,E=p.Uint8Array,$=T?T.allocUnsafe:void 0,D=(O=Object.getPrototypeOf,m=Object,function(t){return O(m(t))}),k=Object.create,B=M.propertyIsEnumerable,N=A.splice,L=q?q.toStringTag:void 0,R=function(){try{var t=_t(Object,"defineProperty");return t({},"",{}),t}catch(t){}}(),G=T?T.isBuffer:void 0,V=Math.max,W=Date.now,H=_t(p,"Map"),J=_t(Object,"create"),K=function(){function t(){}return function(r){if(!Mt(r))return{};if(k)return k(r);t.prototype=r;var e=new t;return t.prototype=void 0,e}}();function Q(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r<e;){var n=t[r];this.set(n[0],n[1])}}function X(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r<e;){var n=t[r];this.set(n[0],n[1])}}function Y(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r<e;){var n=t[r];this.set(n[0],n[1])}}function Z(t){var r=this.__data__=new X(t);this.size=r.size}function tt(t,r){var e=wt(t),n=!e&&jt(t),o=!e&&!n&&mt(t),i=!e&&!n&&!o&&Ct(t),u=e||n||o||i,c=u?function(t,r){for(var e=-1,n=Array(t);++e<t;)n[e]=r(e);return n}(t.length,String):[],a=c.length;for(var f in t)!r&&!F.call(t,f)||u&&("length"==f||o&&("offset"==f||"parent"==f)||i&&("buffer"==f||"byteLength"==f||"byteOffset"==f)||vt(f,a))||c.push(f);return c}function rt(t,r,e){(void 0!==e&&!bt(t[r],e)||void 0===e&&!(r in t))&&ot(t,r,e)}function et(t,r,e){var n=t[r];F.call(t,r)&&bt(n,e)&&(void 0!==e||r in t)||ot(t,r,e)}function nt(t,r){for(var e=t.length;e--;)if(bt(t[e][0],r))return e;return-1}function ot(t,r,e){"__proto__"==r&&R?R(t,r,{configurable:!0,enumerable:!0,value:e,writable:!0}):t[r]=e}Q.prototype.clear=function(){this.__data__=J?J(null):{},this.size=0},Q.prototype.delete=function(t){var r=this.has(t)&&delete this.__data__[t];return this.size-=r?1:0,r},Q.prototype.get=function(t){var r=this.__data__;if(J){var n=r[t];return n===e?void 0:n}return F.call(r,t)?r[t]:void 0},Q.prototype.has=function(t){var r=this.__data__;return J?void 0!==r[t]:F.call(r,t)},Q.prototype.set=function(t,r){var n=this.__data__;return this.size+=this.has(t)?0:1,n[t]=J&&void 0===r?e:r,this},X.prototype.clear=function(){this.__data__=[],this.size=0},X.prototype.delete=function(t){var r=this.__data__,e=nt(r,t);return!(e<0)&&(e==r.length-1?r.pop():N.call(r,e,1),--this.size,!0)},X.prototype.get=function(t){var r=this.__data__,e=nt(r,t);return e<0?void 0:r[e][1]},X.prototype.has=function(t){return nt(this.__data__,t)>-1},X.prototype.set=function(t,r){var e=this.__data__,n=nt(e,t);return n<0?(++this.size,e.push([t,r])):e[n][1]=r,this},Y.prototype.clear=function(){this.size=0,this.__data__={hash:new Q,map:new(H||X),string:new Q}},Y.prototype.delete=function(t){var r=pt(this,t).delete(t);return this.size-=r?1:0,r},Y.prototype.get=function(t){return pt(this,t).get(t)},Y.prototype.has=function(t){return pt(this,t).has(t)},Y.prototype.set=function(t,r){var e=pt(this,t),n=e.size;return e.set(t,r),this.size+=e.size==n?0:1,this},Z.prototype.clear=function(){this.__data__=new X,this.size=0},Z.prototype.delete=function(t){var r=this.__data__,e=r.delete(t);return this.size=r.size,e},Z.prototype.get=function(t){return this.__data__.get(t)},Z.prototype.has=function(t){return this.__data__.has(t)},Z.prototype.set=function(t,r){var e=this.__data__;if(e instanceof X){var n=e.__data__;if(!H||n.length<199)return n.push([t,r]),this.size=++e.size,this;e=this.__data__=new Y(n)}return e.set(t,r),this.size=e.size,this};var it,ut=function(t,r,e){for(var n=-1,o=Object(t),i=e(t),u=i.length;u--;){var c=i[it?u:++n];if(!1===r(o[c],c,o))break}return t};function ct(t){return null==t?void 0===t?"[object Undefined]":"[object Null]":L&&L in Object(t)?function(t){var r=F.call(t,L),e=t[L];try{t[L]=void 0;var n=!0}catch(t){}var o=S.call(t);n&&(r?t[L]=e:delete t[L]);return o}(t):function(t){return S.call(t)}(t)}function at(t){return xt(t)&&ct(t)==o}function ft(t){return!(!Mt(t)||function(t){return!!U&&U in t}(t))&&(At(t)?P:a).test(function(t){if(null!=t){try{return C.call(t)}catch(t){}try{return t+""}catch(t){}}return""}(t))}function st(t){if(!Mt(t))return function(t){var r=[];if(null!=t)for(var e in Object(t))r.push(e);return r}(t);var r=dt(t),e=[];for(var n in t)("constructor"!=n||!r&&F.call(t,n))&&e.push(n);return e}function lt(t,r,e,n,o){t!==r&&ut(r,(function(i,u){if(o||(o=new Z),Mt(i))!function(t,r,e,n,o,i,u){var a=yt(t,e),f=yt(r,e),s=u.get(f);if(s)return void rt(t,e,s);var l=i?i(a,f,e+"",t,r,u):void 0,h=void 0===l;if(h){var p=wt(f),_=!p&&mt(f),v=!p&&!_&&Ct(f);l=f,p||_||v?wt(a)?l=a:xt(j=a)&&Ot(j)?l=function(t,r){var e=-1,n=t.length;r||(r=Array(n));for(;++e<n;)r[e]=t[e];return r}(a):_?(h=!1,l=function(t,r){if(r)return t.slice();var e=t.length,n=$?$(e):new t.constructor(e);return t.copy(n),n}(f,!0)):v?(h=!1,d=f,y=!0?(g=d.buffer,b=new g.constructor(g.byteLength),new E(b).set(new E(g)),b):d.buffer,l=new d.constructor(y,d.byteOffset,d.length)):l=[]:function(t){if(!xt(t)||ct(t)!=c)return!1;var r=D(t);if(null===r)return!0;var e=F.call(r,"constructor")&&r.constructor;return"function"==typeof e&&e instanceof e&&C.call(e)==I}(f)||jt(f)?(l=a,jt(a)?l=function(t){return function(t,r,e,n){var o=!e;e||(e={});var i=-1,u=r.length;for(;++i<u;){var c=r[i],a=n?n(e[c],t[c],c,e,t):void 0;void 0===a&&(a=t[c]),o?ot(e,c,a):et(e,c,a)}return e}(t,Ft(t))}(a):Mt(a)&&!At(a)||(l=function(t){return"function"!=typeof t.constructor||dt(t)?{}:K(D(t))}(f))):h=!1}var d,y,g,b;var j;h&&(u.set(f,l),o(l,f,n,i,u),u.delete(f));rt(t,e,l)}(t,r,u,e,lt,n,o);else{var a=n?n(yt(t,u),i,u+"",t,r,o):void 0;void 0===a&&(a=i),rt(t,u,a)}}),Ft)}function ht(t,r){return gt(function(t,r,e){return r=V(void 0===r?t.length-1:r,0),function(){for(var n=arguments,o=-1,i=V(n.length-r,0),u=Array(i);++o<i;)u[o]=n[r+o];o=-1;for(var c=Array(r+1);++o<r;)c[o]=n[o];return c[r]=e(u),j(t,this,c)}}(t,r,It),t+"")}function pt(t,r){var e,n,o=t.__data__;return("string"==(n=typeof(e=r))||"number"==n||"symbol"==n||"boolean"==n?"__proto__"!==e:null===e)?o["string"==typeof r?"string":"hash"]:o.map}function _t(t,r){var e=function(t,r){return null==t?void 0:t[r]}(t,r);return ft(e)?e:void 0}function vt(t,r){var e=typeof t;return!!(r=null==r?n:r)&&("number"==e||"symbol"!=e&&f.test(t))&&t>-1&&t%1==0&&t<r}function dt(t){var r=t&&t.constructor;return t===("function"==typeof r&&r.prototype||M)}function yt(t,r){if(("constructor"!==r||"function"!=typeof t[r])&&"__proto__"!=r)return t[r]}var gt=function(t){var r=0,e=0;return function(){var n=W(),o=16-(n-e);if(e=n,o>0){if(++r>=800)return arguments[0]}else r=0;return t.apply(void 0,arguments)}}(R?function(t,r){return R(t,"toString",{configurable:!0,enumerable:!1,value:(e=r,function(){return e}),writable:!0});var e}:It);function bt(t,r){return t===r||t!=t&&r!=r}var jt=at(function(){return arguments}())?at:function(t){return xt(t)&&F.call(t,"callee")&&!B.call(t,"callee")},wt=Array.isArray;function Ot(t){return null!=t&&zt(t.length)&&!At(t)}var mt=G||function(){return!1};function At(t){if(!Mt(t))return!1;var r=ct(t);return r==u||"[object GeneratorFunction]"==r||"[object AsyncFunction]"==r||"[object Proxy]"==r}function zt(t){return"number"==typeof t&&t>-1&&t%1==0&&t<=n}function Mt(t){var r=typeof t;return null!=t&&("object"==r||"function"==r)}function xt(t){return null!=t&&"object"==typeof t}var Ct=b?function(t){return function(r){return t(r)}}(b):function(t){return xt(t)&&zt(t.length)&&!!s[ct(t)]};function Ft(t){return Ot(t)?tt(t,!0):st(t)}var Ut,St=(Ut=function(t,r,e){lt(t,r,e)},ht((function(t,r){var e=-1,n=r.length,o=n>1?r[n-1]:void 0,i=n>2?r[2]:void 0;for(o=Ut.length>3&&"function"==typeof o?(n--,o):void 0,i&&function(t,r,e){if(!Mt(e))return!1;var n=typeof r;return!!("number"==n?Ot(e)&&vt(r,e.length):"string"==n&&r in e)&&bt(e[r],t)}(r[0],r[1],i)&&(o=n<3?void 0:o,n=1),t=Object(t);++e<n;){var u=r[e];u&&Ut(t,u,e,o)}return t})));function It(t){return t}t.exports=St}));const c=Object.prototype.hasOwnProperty,a=(t,r)=>c.call(t,r);class f{constructor({pluginId:t,defaultConfig:r={},customMerge:e,root:n}){this.pluginId=t,this.defaultConfig=r,this.pluginConfigPath=o.default.resolve(n||__dirname,t),this.customMerge=e,this._config=void 0}resolve(t){return o.default.resolve(this.pluginConfigPath,t)}hasFile(t){return n.default.existsSync(this.resolve(t))}requireFile(t){try{return require(this.resolve(t))}catch(t){if("MODULE_NOT_FOUND"===t.code)return;throw t}}_getUserConfig(){return this.requireFile("config.json")}config(t,r){this._config||(this._config=(this.customMerge||u)(this.defaultConfig,this._getUserConfig()));let e=this._config;return t?function(t,r,e){if("number"==typeof r)return t[r];if("symbol"==typeof r)return a(t,r)?t[r]:e;const n="string"!=typeof(o=r)?o:o.split(".").reduce(((t,r)=>(r.split(/\[([^}]+)\]/g).forEach((r=>r&&t.push(r))),t)),[]);var o;let i=t;for(let t=0;t<n.length;t++){const r=n[t];if(!a(i,r))return e;i=i[r]}return i}(e,t,r):e}}const s=new class{constructor(){this._configMap=new Map}plugin({pluginId:t,defaultConfig:r,customMerge:e,root:n=__dirname,cache:o=!0}){if(this._configMap.has(t)&&o)return this._configMap.get(t);const i=new f({pluginId:t,defaultConfig:r,customMerge:e,root:n});return o&&this._configMap.set(t,i),i}};var l=s.plugin.bind(s);module.exports=l;
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json
new file mode 100644
index 0000000..300e837
--- /dev/null
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "uni-config-center",
+  "version": "0.0.2",
+  "description": "配置中心",
+  "main": "index.js",
+  "keywords": [],
+  "author": "DCloud",
+  "license": "Apache-2.0"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-data-select/changelog.md b/uni_modules/uni-data-select/changelog.md
new file mode 100644
index 0000000..d5beaa3
--- /dev/null
+++ b/uni_modules/uni-data-select/changelog.md
@@ -0,0 +1,16 @@
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
new file mode 100644
index 0000000..3c31fcf
--- /dev/null
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -0,0 +1,453 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{current}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<uni-icons class="zd_icon_wraper" v-if="current && clear" type="clear" color="#c0c4cc" size="24" @click="clearVal" />
+					<uni-icons class="zd_icon_wraper" v-else :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" v-if="showSelector">
+					<view class="uni-popper__arrow"></view>
+					<input v-if="searchInput === true" type="text" class="filter_input filter_input_s" :value="svalue" @input="handleInput($event)">
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData"
+							:key="index" @click="change(item)">
+							<text
+								:class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-stat-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: []
+			};
+		},
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			searchInput: {
+				type: Boolean,
+				default: false
+			},
+			svalue: {
+				type: [String, Number],
+				default: ''
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			}
+		},
+		created() {
+			this.last = `${this.collection}_last_selected_option_value`
+			if (this.collection && !this.localdata.length) {
+				this.mixinDatacomEasyGet()
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			// #ifndef VUE3
+			value() {
+				this.initDefVal()
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue() {
+				this.initDefVal()
+			},
+			// #endif
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			}
+		},
+		methods: {
+			handleInput($event) {
+				this.$emit('input', $event.target.value)
+				this.$emit('handleChange', $event.target.value)
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.value || this.value === 0) && !this.isDisabled(this.value)) {
+					defValue = this.value
+				} else if ((this.modelValue || this.modelValue === 0) && !this.isDisabled(this.modelValue)) {
+					defValue = this.modelValue
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = uni.getStorageSync(this.last)
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem < this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+					this.emit(defValue)
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					uni.removeStorageSync(this.last)
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('change', val)
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				if (this.collection) {
+					uni.setStorageSync(this.last, val)
+				}
+			},
+
+			toggleSelector() {
+				this.showSelector = !this.showSelector
+				this.$emit('showSelector', this.showSelector)
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+				return this.collection.indexOf('app-list') > 0 ?
+					`${text}(${value})` :
+					(
+						text ?
+						text :
+						`未命名${channel_code}`
+					)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		cursor: pointer;
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+	
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+	
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		// height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		overflow: hidden;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 2;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		align-items: center;
+		cursor: pointer;
+		/* #endif */
+		line-height: 15px;
+		height: 35px;
+		font-size: 12px;
+		text-align: left;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* 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-select__input-text {
+		// width: 280px;
+		width: calc(100% - 50px);
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+	
+	.zd_icon_wraper {
+		width: 50px;
+		text-align: right;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+	.filter_input_s {
+		width: calc(100% - 30rpx);
+		margin:  0 20rpx 0 10rpx;
+	}
+</style>
diff --git a/uni_modules/uni-data-select/package.json b/uni_modules/uni-data-select/package.json
new file mode 100644
index 0000000..131c808
--- /dev/null
+++ b/uni_modules/uni-data-select/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "0.1.6",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "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": "u",
+          "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",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-data-select/readme.md b/uni_modules/uni-data-select/readme.md
new file mode 100644
index 0000000..eb58de3
--- /dev/null
+++ b/uni_modules/uni-data-select/readme.md
@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-datetime-picker/changelog.md b/uni_modules/uni-datetime-picker/changelog.md
new file mode 100644
index 0000000..e5ad7c1
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/changelog.md
@@ -0,0 +1,156 @@
+## 2.2.32（2024-02-20）
+- 修复 日历的close事件触发异常的bug [详情](https://github.com/dcloudio/uni-ui/issues/844)
+## 2.2.31（2024-02-20）
+- 修复 h5平台 右边日历的月份默认+1的bug [详情](https://github.com/dcloudio/uni-ui/issues/841)
+## 2.2.30（2024-01-31）
+- 修复 隐藏“秒”时，在IOS15及以下版本时出现 结束时间在开始时间之前 的bug [详情](https://github.com/dcloudio/uni-ui/issues/788)
+## 2.2.29（2024-01-20）
+- 新增 show事件，弹窗弹出时触发该事件 [详情](https://github.com/dcloudio/uni-app/issues/4694)
+## 2.2.28（2024-01-18）
+- 去除 noChange事件，当进行日期范围选择时，若只选了一天，则开始结束日期都为同一天 [详情](https://github.com/dcloudio/uni-ui/issues/815)
+## 2.2.27（2024-01-10）
+- 优化 增加noChange事件，当进行日期范围选择时，若有空值，则触发该事件 [详情](https://github.com/dcloudio/uni-ui/issues/815)
+## 2.2.26（2024-01-08）
+- 修复 字节小程序时间选择范围器失效问题 [详情](https://github.com/dcloudio/uni-ui/issues/834)
+## 2.2.25（2023-10-18）
+- 修复 PC端初次修改时间，开始时间未更新的Bug [详情](https://github.com/dcloudio/uni-ui/issues/737)
+## 2.2.24（2023-06-02）
+- 修复 部分情况修改时间，开始、结束时间显示异常的Bug [详情](https://ask.dcloud.net.cn/question/171146)
+- 优化 当前月可以选择上月、下月的日期的Bug
+## 2.2.23（2023-05-02）
+- 修复 部分情况修改时间，开始时间未更新的Bug [详情](https://github.com/dcloudio/uni-ui/issues/737)
+- 修复 部分平台及设备第一次点击无法显示弹框的Bug
+- 修复 ios 日期格式未补零显示及使用异常的Bug [详情](https://ask.dcloud.net.cn/question/162979)
+## 2.2.22（2023-03-30）
+- 修复 日历 picker 修改年月后，自动选中当月1日的Bug [详情](https://ask.dcloud.net.cn/question/165937)
+- 修复 小程序端 低版本 ios NaN的Bug [详情](https://ask.dcloud.net.cn/question/162979)
+## 2.2.21（2023-02-20）
+- 修复 firefox 浏览器显示区域点击无法拉起日历弹框的Bug [详情](https://ask.dcloud.net.cn/question/163362)
+## 2.2.20（2023-02-17）
+- 优化 值为空依然选中当天问题
+- 优化 提供 default-value 属性支持配置选择器打开时默认显示的时间
+- 优化 非范围选择未选择日期时间，点击确认按钮选中当前日期时间
+- 优化 字节小程序日期时间范围选择，底部日期换行的Bug
+## 2.2.19（2023-02-09）
+- 修复 2.2.18 引起范围选择配置 end 选择无效的Bug [详情](https://github.com/dcloudio/uni-ui/issues/686)
+## 2.2.18（2023-02-08）
+- 修复 移动端范围选择change事件触发异常的Bug [详情](https://github.com/dcloudio/uni-ui/issues/684)
+- 优化 PC端输入日期格式错误时返回当前日期时间
+- 优化 PC端输入日期时间超出 start、end 限制的Bug
+- 优化 移动端日期时间范围用法时间展示不完整问题
+## 2.2.17（2023-02-04）
+- 修复 小程序端绑定 Date 类型报错的Bug [详情](https://github.com/dcloudio/uni-ui/issues/679)
+- 修复 vue3 time-picker 无法显示绑定时分秒的Bug
+## 2.2.16（2023-02-02）
+- 修复 字节小程序报错的Bug
+## 2.2.15（2023-02-02）
+- 修复 某些情况切换月份错误的Bug
+## 2.2.14（2023-01-30）
+- 修复 某些情况切换月份错误的Bug [详情](https://ask.dcloud.net.cn/question/162033)
+## 2.2.13（2023-01-10）
+- 修复 多次加载组件造成内存占用的Bug
+## 2.2.12（2022-12-01）
+- 修复 vue3 下 i18n 国际化初始值不正确的Bug
+## 2.2.11（2022-09-19）
+- 修复 支付宝小程序样式错乱的Bug [详情](https://github.com/dcloudio/uni-app/issues/3861)
+## 2.2.10（2022-09-19）
+- 修复 反向选择日期范围，日期显示异常的Bug [详情](https://ask.dcloud.net.cn/question/153401?item_id=212892&rf=false)
+## 2.2.9（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 2.2.8（2022-09-08）
+- 修复 close事件无效的Bug
+## 2.2.7（2022-09-05）
+- 修复 移动端 maskClick 无效的Bug [详情](https://ask.dcloud.net.cn/question/140824)
+## 2.2.6（2022-06-30）
+- 优化 组件样式，调整了组件图标大小、高度、颜色等，与uni-ui风格保持一致
+## 2.2.5（2022-06-24）
+- 修复 日历顶部年月及底部确认未国际化的Bug
+## 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/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
+- 修复 赋默认值时，移动端未正确显示时间的Bug
+## 2.1.3（2021-09-09）
+- 新增 hide-second 属性，支持只使用时分，隐藏秒
+## 2.1.2（2021-09-03）
+- 优化 取消选中时（范围选）直接开始下一次选择, 避免多点一次
+- 优化 移动端支持清除按钮，同时支持通过 ref 调用组件的 clear 方法
+- 优化 调整字号大小，美化日历界面
+- 修复 因国际化导致的 placeholder 失效的Bug
+## 2.1.1（2021-08-24）
+- 新增 支持国际化
+- 优化 范围选择器在 pc 端过宽的问题
+## 2.1.0（2021-08-09）
+- 新增 适配 vue3
+## 2.0.19（2021-08-09）
+- 新增 支持作为 uni-forms 子组件相关功能
+- 修复 在 uni-forms 中使用时，选择时间报 NAN 错误的Bug
+## 2.0.18（2021-08-05）
+- 修复 type 属性动态赋值无效的Bug
+- 修复 ‘确认’按钮被 tabbar 遮盖 bug
+- 修复 组件未赋值时范围选左、右日历相同的Bug
+## 2.0.17（2021-08-04）
+- 修复 范围选未正确显示当前值的Bug
+- 修复 h5 平台（移动端）报错 'cale' of undefined 的Bug
+## 2.0.16（2021-07-21）
+- 新增 return-type 属性支持返回 date 日期对象
+## 2.0.15（2021-07-14）
+- 修复 单选日期类型，初始赋值后不在当前日历的Bug
+- 新增 clearIcon 属性，显示框的清空按钮可配置显示隐藏（仅 pc 有效）
+- 优化 移动端移除显示框的清空按钮，无实际用途
+## 2.0.14（2021-07-14）
+- 修复 组件赋值为空，界面未更新的Bug
+- 修复 start 和 end 不能动态赋值的Bug
+- 修复 范围选类型，用户选择后再次选择右侧日历（结束日期）显示不正确的Bug
+## 2.0.13（2021-07-08）
+- 修复 范围选择不能动态赋值的Bug
+## 2.0.12（2021-07-08）
+- 修复 范围选择的初始时间在一个月内时，造成无法选择的bug
+## 2.0.11（2021-07-08）
+- 优化 弹出层在超出视窗边缘定位不准确的问题
+## 2.0.10（2021-07-08）
+- 修复 范围起始点样式的背景色与今日样式的字体前景色融合，导致日期字体看不清的Bug
+- 优化 弹出层在超出视窗边缘被遮盖的问题
+## 2.0.9（2021-07-07）
+- 新增 maskClick 事件
+- 修复 特殊情况日历 rpx 布局错误的Bug，rpx -> px
+- 修复 范围选择时清空返回值不合理的bug，['', ''] -> []
+## 2.0.8（2021-07-07）
+- 新增 日期时间显示框支持插槽
+## 2.0.7（2021-07-01）
+- 优化 添加 uni-icons 依赖
+## 2.0.6（2021-05-22）
+- 修复 图标在小程序上不显示的Bug
+- 优化 重命名引用组件，避免潜在组件命名冲突
+## 2.0.5（2021-05-20）
+- 优化 代码目录扁平化
+## 2.0.4（2021-05-12）
+- 新增 组件示例地址
+## 2.0.3（2021-05-10）
+- 修复 ios 下不识别 '-' 日期格式的Bug
+- 优化 pc 下弹出层添加边框和阴影
+## 2.0.2（2021-05-08）
+- 修复 在 admin 中获取弹出层定位错误的bug
+## 2.0.1（2021-05-08）
+- 修复 type 属性向下兼容，默认值从 date 变更为 datetime
+## 2.0.0（2021-04-30）
+- 支持日历形式的日期+时间的范围选择
+ > 注意：此版本不向后兼容，不再支持单独时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）
+## 1.0.6（2021-03-18）
+- 新增 hide-second 属性，时间支持仅选择时、分
+- 修复 选择跟显示的日期不一样的Bug
+- 修复 chang事件触发2次的Bug
+- 修复 分、秒 end 范围错误的Bug
+- 优化 更好的 nvue 适配
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
new file mode 100644
index 0000000..8f3c461
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
@@ -0,0 +1,177 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--before-checked-x':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'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--checked':calendar.fullDate === weeks.fullDate && (calendar.userChecked || !checkHover),
+				'uni-calendar-item--checked-range-text': checkHover,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'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 uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
+		</view>
+		<view :class="{'uni-calendar-item--today': weeks.isToday}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			checkHover: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			},
+			handleMousemove(weeks) {
+				this.$emit('handleMouse', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	$uni-primary: #007aff !default;
+
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 1px 0;
+		position: relative;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: 14px;
+		// font-family: Lato-Bold, Lato;
+		font-weight: bold;
+		color: darken($color: $uni-primary, $amount: 40%);
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 40px;
+		height: 40px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: #dd524d;
+
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--disable {
+		cursor: default;
+	}
+
+	.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+		color: #D1D1D1;
+	}
+
+	.uni-calendar-item--today {
+		position: absolute;
+		top: 10px;
+		right: 17%;
+		background-color: #dd524d;
+		width:6px;
+		height: 6px;
+		border-radius: 50%;
+	}
+
+	.uni-calendar-item--extra {
+		color: #dd524d;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--checked {
+		background-color: $uni-primary;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #fff;
+	}
+
+	.uni-calendar-item--checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
+		color: #333;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color:  #F6F7FC;
+		// color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
+		background-color: $uni-primary;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #F6F7FC;
+	}
+
+	.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: 50px;
+		border-bottom-left-radius: 50px;
+		box-sizing: border-box;
+		background-color: #F6F7FC;
+	}
+
+	.uni-calendar-item--after-checked-x {
+		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
new file mode 100644
index 0000000..2e952dc
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -0,0 +1,928 @@
+<template>
+	<view class="uni-calendar" @mouseleave="leaveCale">
+
+		<view v-if="!insert && show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
+			@click="maskClick"></view>
+
+		<view v-if="insert || show" class="uni-calendar__content"
+			: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 class="uni-calendar__header-btn-box" @click.stop="changeMonth('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||'') + yearText + ( nowDate.month||'') + monthText}}</text>
+				</picker>
+
+				<view class="uni-calendar__header-btn-box" @click.stop="changeMonth('next')">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+
+				<view v-if="!insert" class="dialog-close" @click="maskClick">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+			</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" style="padding-bottom: 7px;">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{MONText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar"
+							:selected="selected" :checkHover="range" @change="choiceDate"
+							@handleMouse="handleMouse">
+						</calendar-item>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="!insert && !range && hasTime" class="uni-date-changed uni-calendar--fixed-top"
+				style="padding: 0 80px;">
+				<view class="uni-date-changed--time-date">{{tempSingleDate ? tempSingleDate : selectDateText}}</view>
+				<time-picker type="time" :start="timepickerStartTime" :end="timepickerEndTime" v-model="time"
+					:disabled="!tempSingleDate" :border="false" :hide-second="hideSecond" class="time-picker-style">
+				</time-picker>
+			</view>
+
+			<view v-if="!insert && range && hasTime" class="uni-date-changed uni-calendar--fixed-top">
+				<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="timepickerStartTime" v-model="timeRange.startTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
+					</time-picker>
+				</view>
+				<view style="line-height: 50px;">
+					<uni-icons type="arrowthinright" color="#999"></uni-icons>
+				</view>
+				<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="timepickerEndTime" 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-date-btn--ok">
+				<view class="uni-datetime-picker--btn" @click="confirm">{{confirmText}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { Calendar, getDate, getTime } from './util.js';
+	import calendarItem from './calendar-item.vue'
+	import timePicker from './time-picker.vue'
+
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const { t } = initVueI18n(i18nMessages)
+
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @property {[String} defaultValue 选择器打开时默认显示的时间
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem,
+			timePicker
+		},
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			defTime: {
+				type: [String, Object],
+				default: ''
+			},
+			selectableTimes: {
+				type: [Object],
+				default () {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+      startPlaceholder: {
+        type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			hasTime: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			},
+			checkHover: {
+				type: Boolean,
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			pleStatus: {
+				type: Object,
+				default () {
+					return {
+						before: '',
+						after: '',
+						data: [],
+						fulldate: ''
+					}
+				}
+			},
+      defaultValue: {
+        type: [String, Object, Array],
+        default: ''
+      }
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: {},
+				aniMaskShow: false,
+				firstEnter: true,
+				time: '',
+				timeRange: {
+					startTime: '',
+					endTime: ''
+				},
+				tempSingleDate: '',
+				tempRange: {
+					before: '',
+					after: ''
+				}
+			}
+		},
+		watch: {
+			date: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.tempSingleDate = newVal
+						setTimeout(() => {
+							this.init(newVal)
+						}, 100)
+					}
+				}
+			},
+			defTime: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.time = newVal
+					} else {
+						this.timeRange.startTime = newVal.start
+						this.timeRange.endTime = newVal.end
+					}
+				}
+			},
+			startDate(val) {
+				// 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setStartDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val) {
+				// 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				// 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			},
+			pleStatus: {
+				immediate: true,
+				handler(newVal) {
+					const {
+						before,
+						after,
+						fulldate,
+						which
+					} = newVal
+					this.tempRange.before = before
+					this.tempRange.after = after
+					setTimeout(() => {
+						if (fulldate) {
+							this.cale.setHoverMultiple(fulldate)
+							if (before && after) {
+								this.cale.lastHover = true
+								if (this.rangeWithinMonth(after, before)) return
+								this.setDate(before)
+							} else {
+								this.cale.setMultiple(fulldate)
+								this.setDate(this.nowDate.fullDate)
+								this.calendar.fullDate = ''
+								this.cale.lastHover = false
+							}
+						} else {
+              // 字节小程序 watch 早于 created
+              if(!this.cale){
+                return
+              }
+
+							this.cale.setDefaultMultiple(before, after)
+							if (which === 'left' && before) {
+								this.setDate(before)
+								this.weeks = this.cale.weeks
+							} else if(after) {
+								this.setDate(after)
+								this.weeks = this.cale.weeks
+							}
+							this.cale.lastHover = true
+						}
+					}, 16)
+				}
+			}
+		},
+		computed: {
+			timepickerStartTime() {
+				const activeDate = this.range ? this.tempRange.before : this.calendar.fullDate
+				return activeDate === this.startDate ? this.selectableTimes.start : ''
+			},
+			timepickerEndTime() {
+				const activeDate = this.range ? this.tempRange.after : this.calendar.fullDate
+				return activeDate === this.endDate ? this.selectableTimes.end : ''
+			},
+			/**
+			 * for i18n
+			 */
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			yearText() {
+				return t("uni-datetime-picker.year")
+			},
+			monthText() {
+				return t("uni-datetime-picker.month")
+			},
+			MONText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+			confirmText() {
+				return t("uni-calender.confirm")
+			},
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			// 选中某一天
+			this.init(this.date)
+		},
+		methods: {
+			leaveCale() {
+				this.firstEnter = true
+			},
+			handleMouse(weeks) {
+				if (weeks.disable) return
+				if (this.cale.lastHover) return
+				let {
+					before,
+					after
+				} = this.cale.multipleStatus
+				if (!before) return
+				this.calendar = weeks
+				// 设置范围选
+				this.cale.setHoverMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				// hover时，进入一个日历，更新另一个
+				if (this.firstEnter) {
+					this.$emit('firstEnterCale', this.cale.multipleStatus)
+					this.firstEnter = false
+				}
+			},
+			rangeWithinMonth(A, B) {
+				const [yearA, monthA] = A.split('-')
+				const [yearB, monthB] = B.split('-')
+				return yearA === yearB && monthA === monthB
+			},
+			// 蒙版点击事件
+			maskClick() {
+        this.close()
+				this.$emit('maskClose')
+			},
+
+			clearCalender() {
+				if (this.range) {
+					this.timeRange.startTime = ''
+					this.timeRange.endTime = ''
+					this.tempRange.before = ''
+					this.tempRange.after = ''
+					this.cale.multipleStatus.before = ''
+					this.cale.multipleStatus.after = ''
+					this.cale.multipleStatus.data = []
+					this.cale.lastHover = false
+				} else {
+					this.time = ''
+					this.tempSingleDate = ''
+				}
+				this.calendar.fullDate = ''
+				this.setDate(new Date())
+			},
+
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.setDate(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+        // 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setDate(date || new Date())
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+        this.calendar = {...this.nowDate}
+        if(!date){
+          // 优化date为空默认不选中今天
+          this.calendar.fullDate = ''
+          if(this.defaultValue && !this.range){
+            // 暂时只支持移动端非范围选择
+            const defaultDate = new Date(this.defaultValue)
+            const fullDate = getDate(defaultDate)
+            const year = defaultDate.getFullYear()
+            const month = defaultDate.getMonth()+1
+            const date = defaultDate.getDate()
+            const day = defaultDate.getDay()
+            this.calendar = {
+              fullDate,
+              year,
+              month,
+              date,
+              day
+            },
+            this.tempSingleDate = fullDate
+            this.time = getTime(defaultDate, this.hideSecond)
+          }
+        }
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+        if(!this.range){
+					if(!this.calendar.fullDate){
+					  this.calendar = this.cale.getInfo(new Date())
+					  this.tempSingleDate = this.calendar.fullDate
+					}
+					if(this.hasTime && !this.time) {
+					  this.time = getTime(new Date(), this.hideSecond)
+					}
+				}
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					time: this.time,
+					timeRange: this.timeRange,
+					fulldate: fullDate,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				this.calendar.userChecked = true
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate, true)
+				this.weeks = this.cale.weeks
+				this.tempSingleDate = this.calendar.fullDate
+				const beforeDate = new Date(this.cale.multipleStatus.before).getTime()
+				const afterDate = new Date(this.cale.multipleStatus.after).getTime()
+				if (beforeDate > afterDate && afterDate) {
+					this.tempRange.before = this.cale.multipleStatus.after
+					this.tempRange.after = this.cale.multipleStatus.before
+				} else {
+					this.tempRange.before = this.cale.multipleStatus.before
+					this.tempRange.after = this.cale.multipleStatus.after
+				}
+				this.change()
+			},
+      changeMonth(type) {
+        let newDate
+        if(type === 'pre') {
+          newDate = this.cale.getPreMonthObj(this.nowDate.fullDate).fullDate
+        } else if(type === 'next') {
+          newDate = this.cale.getNextMonthObj(this.nowDate.fullDate).fullDate
+        }
+
+        this.setDate(newDate)
+				this.monthSwitch()
+      },
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	$uni-primary: #007aff !default;
+
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		bottom: calc(var(--window-bottom));
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		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 */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+	}
+
+	.uni-calendar__header-mobile {
+		padding: 10px;
+		padding-bottom: 0;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: rgba(0, 0, 0, 0.4);
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: #fff;
+		background-color: #f1f1f1;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: 15px;
+		color: #666;
+	}
+
+	.uni-calendar__button-text {
+		text-align: center;
+		width: 100px;
+		font-size: 14px;
+		color: $uni-primary;
+		/* #ifndef APP-NVUE */
+		letter-spacing: 3px;
+		/* #endif */
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 9px;
+		height: 9px;
+		border-left-color: #808080;
+		border-left-style: solid;
+		border-left-width: 1px;
+		border-top-color: #555555;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 40px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.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 {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: #999;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+
+	.uni-date-changed {
+		padding: 0 10px;
+		// line-height: 50px;
+		text-align: center;
+		color: #333;
+		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;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-end {
+		/* #ifndef APP-NVUE */
+    display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-date {
+    color: #999;
+		line-height: 50px;
+    /* #ifdef MP-TOUTIAO */
+    font-size: 16px;
+    /* #endif */
+		margin-right: 5px;
+		// opacity: 0.6;
+	}
+
+	.time-picker-style {
+		// width: 62px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center
+	}
+
+	.mr-10 {
+		margin-right: 10px;
+	}
+
+	.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: $uni-primary;
+		color: #fff;
+		font-size: 16px;
+		letter-spacing: 2px;
+	}
+
+	/* #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/i18n/en.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
new file mode 100644
index 0000000..56cd0a6
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "select date",
+	"uni-datetime-picker.selectTime": "select time",
+	"uni-datetime-picker.selectDateTime": "select date and time",
+	"uni-datetime-picker.startDate": "start date",
+	"uni-datetime-picker.endDate": "end date",
+	"uni-datetime-picker.startTime": "start time",
+	"uni-datetime-picker.endTime": "end time",
+	"uni-datetime-picker.ok": "ok",
+	"uni-datetime-picker.clear": "clear",
+	"uni-datetime-picker.cancel": "cancel",
+	"uni-datetime-picker.year": "-",
+	"uni-datetime-picker.month": "",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN",
+	"uni-calender.confirm": "confirm"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
new file mode 100644
index 0000000..fa8f0f3
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
new file mode 100644
index 0000000..d2df5e7
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "选择日期",
+	"uni-datetime-picker.selectTime": "选择时间",
+	"uni-datetime-picker.selectDateTime": "选择日期时间",
+	"uni-datetime-picker.startDate": "开始日期",
+	"uni-datetime-picker.endDate": "结束日期",
+	"uni-datetime-picker.startTime": "开始时间",
+	"uni-datetime-picker.endTime": "结束时间",
+	"uni-datetime-picker.ok": "确定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-datetime-picker.year": "年",
+	"uni-datetime-picker.month": "月",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六",
+	"uni-calender.confirm": "确认"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
new file mode 100644
index 0000000..d23fa3c
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
@@ -0,0 +1,22 @@
+{
+  "uni-datetime-picker.selectDate": "選擇日期",
+  "uni-datetime-picker.selectTime": "選擇時間",
+  "uni-datetime-picker.selectDateTime": "選擇日期時間",
+  "uni-datetime-picker.startDate": "開始日期",
+  "uni-datetime-picker.endDate": "結束日期",
+  "uni-datetime-picker.startTime": "開始时间",
+  "uni-datetime-picker.endTime": "結束时间",
+  "uni-datetime-picker.ok": "確定",
+  "uni-datetime-picker.clear": "清除",
+  "uni-datetime-picker.cancel": "取消",
+  "uni-datetime-picker.year": "年",
+  "uni-datetime-picker.month": "月",
+  "uni-calender.SUN": "日",
+  "uni-calender.MON": "一",
+  "uni-calender.TUE": "二",
+  "uni-calender.WED": "三",
+  "uni-calender.THU": "四",
+  "uni-calender.FRI": "五",
+  "uni-calender.SAT": "六",
+  "uni-calender.confirm": "確認"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
new file mode 100644
index 0000000..82f469f
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -0,0 +1,926 @@
+<template>
+	<view class="uni-datetime-picker">
+		<view @click="initTimePicker">
+			<slot>
+				<view class="uni-datetime-picker-timebox-pointer"
+					:class="{'uni-datetime-picker-disabled': disabled, 'uni-datetime-picker-timebox': border}">
+					<text class="uni-datetime-picker-text">{{time}}</text>
+					<view v-if="!time" class="uni-datetime-picker-time">
+						<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view v-if="visible" id="mask" class="uni-datetime-picker-mask" @click="tiggerTimePicker"></view>
+		<view v-if="visible" class="uni-datetime-picker-popup" :class="[dateShow && timeShow ? '' : 'fix-nvue-height']"
+			:style="fixNvueBug">
+			<view class="uni-title">
+				<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+			</view>
+			<view v-if="dateShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :indicator-style="indicatorStyle" :value="ymd"
+					@change="bindDateChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in years" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in months" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in days" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign sign-left">-</text>
+				<text class="uni-datetime-picker-sign sign-right">-</text>
+			</view>
+			<view v-if="timeShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :class="[hideSecond ? 'time-hide-second' : '']"
+					:indicator-style="indicatorStyle" :value="hms" @change="bindTimeChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in hours" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in minutes" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!hideSecond">
+						<view class="uni-datetime-picker-item" v-for="(item,index) in seconds" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign" :class="[hideSecond ? 'sign-center' : 'sign-left']">:</text>
+				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
+			</view>
+			<view class="uni-datetime-picker-btn">
+				<view @click="clearTime">
+					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
+				</view>
+				<view class="uni-datetime-picker-btn-group">
+					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">
+						<text class="uni-datetime-picker-btn-text">{{cancelText}}</text>
+					</view>
+					<view @click="setTime">
+						<text class="uni-datetime-picker-btn-text">{{okText}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {	t	} = initVueI18n(i18nMessages)
+  import { fixIosDateFormat } from './util'
+
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 可以同时选择日期和时间的选择器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} type = [datetime | date | time] 显示模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {String|Number} value 默认值
+	 * @property {String|Number} start 起始日期或时间
+	 * @property {String|Number} end 起始日期或时间
+	 * @property {String} return-type = [timestamp | string]
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'UniDatetimePicker',
+		data() {
+			return {
+				indicatorStyle: `height: 50px;`,
+				visible: false,
+				fixNvueBug: {},
+				dateShow: true,
+				timeShow: true,
+				title: '日期和时间',
+				// 输入框当前时间
+				time: '',
+				// 当前的年月日时分秒
+				year: 1920,
+				month: 0,
+				day: 0,
+				hour: 0,
+				minute: 0,
+				second: 0,
+				// 起始时间
+				startYear: 1920,
+				startMonth: 1,
+				startDay: 1,
+				startHour: 0,
+				startMinute: 0,
+				startSecond: 0,
+				// 结束时间
+				endYear: 2120,
+				endMonth: 12,
+				endDay: 31,
+				endHour: 23,
+				endMinute: 59,
+				endSecond: 59,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				handler(newVal) {
+          if (newVal) {
+            this.parseValue(fixIosDateFormat(newVal))
+						this.initTime(false)
+					} else {
+            this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+        handler(newVal) {
+          if (newVal) {
+						this.parseValue(fixIosDateFormat(newVal))
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			type: {
+				handler(newValue) {
+					if (newValue === 'date') {
+						this.dateShow = true
+						this.timeShow = false
+						this.title = '日期'
+					} else if (newValue === 'time') {
+						this.dateShow = false
+						this.timeShow = true
+						this.title = '时间'
+					} else {
+						this.dateShow = true
+						this.timeShow = true
+						this.title = '日期和时间'
+					}
+				},
+				immediate: true
+			},
+			start: {
+				handler(newVal) {
+					this.parseDatetimeRange(fixIosDateFormat(newVal), 'start')
+				},
+				immediate: true
+			},
+			end: {
+				handler(newVal) {
+					this.parseDatetimeRange(fixIosDateFormat(newVal), 'end')
+				},
+				immediate: true
+			},
+
+			// 月、日、时、分、秒可选范围变化后，检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			months(newVal) {
+				this.checkValue('month', this.month, newVal)
+			},
+			days(newVal) {
+				this.checkValue('day', this.day, newVal)
+			},
+			hours(newVal) {
+				this.checkValue('hour', this.hour, newVal)
+			},
+			minutes(newVal) {
+				this.checkValue('minute', this.minute, newVal)
+			},
+			seconds(newVal) {
+				this.checkValue('second', this.second, newVal)
+			}
+		},
+		computed: {
+			// 当前年、月、日、时、分、秒选择范围
+			years() {
+				return this.getCurrentRange('year')
+			},
+
+			months() {
+				return this.getCurrentRange('month')
+			},
+
+			days() {
+				return this.getCurrentRange('day')
+			},
+
+			hours() {
+				return this.getCurrentRange('hour')
+			},
+
+			minutes() {
+				return this.getCurrentRange('minute')
+			},
+
+			seconds() {
+				return this.getCurrentRange('second')
+			},
+
+			// picker 当前值数组
+			ymd() {
+				return [this.year - this.minYear, this.month - this.minMonth, this.day - this.minDay]
+			},
+			hms() {
+				return [this.hour - this.minHour, this.minute - this.minMinute, this.second - this.minSecond]
+			},
+
+			// 当前 date 是 start
+			currentDateIsStart() {
+				return this.year === this.startYear && this.month === this.startMonth && this.day === this.startDay
+			},
+
+			// 当前 date 是 end
+			currentDateIsEnd() {
+				return this.year === this.endYear && this.month === this.endMonth && this.day === this.endDay
+			},
+
+			// 当前年、月、日、时、分、秒的最小值和最大值
+			minYear() {
+				return this.startYear
+			},
+			maxYear() {
+				return this.endYear
+			},
+			minMonth() {
+				if (this.year === this.startYear) {
+					return this.startMonth
+				} else {
+					return 1
+				}
+			},
+			maxMonth() {
+				if (this.year === this.endYear) {
+					return this.endMonth
+				} else {
+					return 12
+				}
+			},
+			minDay() {
+				if (this.year === this.startYear && this.month === this.startMonth) {
+					return this.startDay
+				} else {
+					return 1
+				}
+			},
+			maxDay() {
+				if (this.year === this.endYear && this.month === this.endMonth) {
+					return this.endDay
+				} else {
+					return this.daysInMonth(this.year, this.month)
+				}
+			},
+			minHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart) {
+						return this.startHour
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					return this.startHour
+				}
+			},
+			maxHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd) {
+						return this.endHour
+					} else {
+						return 23
+					}
+				}
+				if (this.type === 'time') {
+					return this.endHour
+				}
+			},
+			minMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+			},
+			maxMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+			},
+			minSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+			},
+			maxSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+			},
+
+			/**
+			 * for i18n
+			 */
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			cancelText() {
+				return t("uni-datetime-picker.cancel")
+			}
+		},
+
+		mounted() {
+			// #ifdef APP-NVUE
+			const res = uni.getSystemInfoSync();
+			this.fixNvueBug = {
+				top: res.windowHeight / 2,
+				left: res.windowWidth / 2
+			}
+			// #endif
+		},
+
+		methods: {
+			/**
+			 * @param {Object} item
+			 * 小于 10 在前面加个 0
+			 */
+
+			lessThanTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			/**
+			 * 解析时分秒字符串，例如：00:00:00
+			 * @param {String} timeString
+			 */
+			parseTimeType(timeString) {
+				if (timeString) {
+					let timeArr = timeString.split(':')
+					this.hour = Number(timeArr[0])
+					this.minute = Number(timeArr[1])
+					this.second = Number(timeArr[2])
+				}
+			},
+
+			/**
+			 * 解析选择器初始值，类型可以是字符串、时间戳，例如：2000-10-02、'08:30:00'、 1610695109000
+			 * @param {String | Number} datetime
+			 */
+			initPickerValue(datetime) {
+				let defaultValue = null
+				if (datetime) {
+					defaultValue = this.compareValueWithStartAndEnd(datetime, this.start, this.end)
+				} else {
+					defaultValue = Date.now()
+					defaultValue = this.compareValueWithStartAndEnd(defaultValue, this.start, this.end)
+				}
+				this.parseValue(defaultValue)
+			},
+
+			/**
+			 * 初始值规则：
+			 * - 用户设置初始值 value
+			 * 	- 设置了起始时间 start、终止时间 end，并 start < value < end，初始值为 value， 否则初始值为 start
+			 * 	- 只设置了起始时间 start，并 start < value，初始值为 value，否则初始值为 start
+			 * 	- 只设置了终止时间 end，并 value < end，初始值为 value，否则初始值为 end
+			 * 	- 无起始终止时间，则初始值为 value
+			 * - 无初始值 value，则初始值为当前本地时间 Date.now()
+			 * @param {Object} value
+			 * @param {Object} dateBase
+			 */
+			compareValueWithStartAndEnd(value, start, end) {
+				let winner = null
+				value = this.superTimeStamp(value)
+				start = this.superTimeStamp(start)
+				end = this.superTimeStamp(end)
+
+				if (start && end) {
+					if (value < start) {
+						winner = new Date(start)
+					} else if (value > end) {
+						winner = new Date(end)
+					} else {
+						winner = new Date(value)
+					}
+				} else if (start && !end) {
+					winner = start <= value ? new Date(value) : new Date(start)
+				} else if (!start && end) {
+					winner = value <= end ? new Date(value) : new Date(end)
+				} else {
+					winner = new Date(value)
+				}
+
+				return winner
+			},
+
+			/**
+			 * 转换为可比较的时间戳，接受日期、时分秒、时间戳
+			 * @param {Object} value
+			 */
+			superTimeStamp(value) {
+				let dateBase = ''
+				if (this.type === 'time' && value && typeof value === 'string') {
+					const now = new Date()
+					const year = now.getFullYear()
+					const month = now.getMonth() + 1
+					const day = now.getDate()
+					dateBase = year + '/' + month + '/' + day + ' '
+				}
+				if (Number(value)) {
+					value = parseInt(value)
+					dateBase = 0
+				}
+				return this.createTimeStamp(dateBase + value)
+			},
+
+			/**
+			 * 解析默认值 value，字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseValue(value) {
+				if (!value) {
+					return
+				}
+				if (this.type === 'time' && typeof value === "string") {
+					this.parseTimeType(value)
+				} else {
+					let defaultDate = null
+					defaultDate = new Date(value)
+					if (this.type !== 'time') {
+						this.year = defaultDate.getFullYear()
+						this.month = defaultDate.getMonth() + 1
+						this.day = defaultDate.getDate()
+					}
+					if (this.type !== 'date') {
+						this.hour = defaultDate.getHours()
+						this.minute = defaultDate.getMinutes()
+						this.second = defaultDate.getSeconds()
+					}
+				}
+				if (this.hideSecond) {
+					this.second = 0
+				}
+			},
+
+			/**
+			 * 解析可选择时间范围 start、end，年月日字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseDatetimeRange(point, pointType) {
+				// 时间为空，则重置为初始值
+				if (!point) {
+					if (pointType === 'start') {
+						this.startYear = 1920
+						this.startMonth = 1
+						this.startDay = 1
+						this.startHour = 0
+						this.startMinute = 0
+						this.startSecond = 0
+					}
+					if (pointType === 'end') {
+						this.endYear = 2120
+						this.endMonth = 12
+						this.endDay = 31
+						this.endHour = 23
+						this.endMinute = 59
+						this.endSecond = 59
+					}
+					return
+				}
+				if (this.type === 'time') {
+					const pointArr = point.split(':')
+					this[pointType + 'Hour'] = Number(pointArr[0])
+					this[pointType + 'Minute'] = Number(pointArr[1])
+					this[pointType + 'Second'] = Number(pointArr[2])
+				} else {
+					if (!point) {
+						pointType === 'start' ? this.startYear = this.year - 60 : this.endYear = this.year + 60
+						return
+					}
+					if (Number(point)) {
+						point = parseInt(point)
+					}
+					// datetime 的 end 没有时分秒, 则不限制
+					const hasTime = /[0-9]:[0-9]/
+					if (this.type === 'datetime' && pointType === 'end' && typeof point === 'string' && !hasTime.test(
+							point)) {
+						point = point + ' 23:59:59'
+					}
+					const pointDate = new Date(point)
+					this[pointType + 'Year'] = pointDate.getFullYear()
+					this[pointType + 'Month'] = pointDate.getMonth() + 1
+					this[pointType + 'Day'] = pointDate.getDate()
+					if (this.type === 'datetime') {
+						this[pointType + 'Hour'] = pointDate.getHours()
+						this[pointType + 'Minute'] = pointDate.getMinutes()
+						this[pointType + 'Second'] = pointDate.getSeconds()
+					}
+				}
+			},
+
+			// 获取 年、月、日、时、分、秒 当前可选范围
+			getCurrentRange(value) {
+				const range = []
+				for (let i = this['min' + this.capitalize(value)]; i <= this['max' + this.capitalize(value)]; i++) {
+					range.push(i)
+				}
+				return range
+			},
+
+			// 字符串首字母大写
+			capitalize(str) {
+				return str.charAt(0).toUpperCase() + str.slice(1)
+			},
+
+			// 检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			checkValue(name, value, values) {
+				if (values.indexOf(value) === -1) {
+					this[name] = values[0]
+				}
+			},
+
+			// 每个月的实际天数
+			daysInMonth(year, month) { // Use 1 for January, 2 for February, etc.
+				return new Date(year, month, 0).getDate();
+			},
+
+			/**
+			 * 生成时间戳
+			 * @param {Object} time
+			 */
+			createTimeStamp(time) {
+				if (!time) return
+				if (typeof time === "number") {
+					return time
+				} else {
+					time = time.replace(/-/g, '/')
+					if (this.type === 'date') {
+						time = time + ' ' + '00:00:00'
+					}
+					return Date.parse(time)
+				}
+			},
+
+			/**
+			 * 生成日期或时间的字符串
+			 */
+			createDomSting() {
+				const yymmdd = this.year +
+					'-' +
+					this.lessThanTen(this.month) +
+					'-' +
+					this.lessThanTen(this.day)
+
+				let hhmmss = this.lessThanTen(this.hour) +
+					':' +
+					this.lessThanTen(this.minute)
+
+				if (!this.hideSecond) {
+					hhmmss = hhmmss + ':' + this.lessThanTen(this.second)
+				}
+
+				if (this.type === 'date') {
+					return yymmdd
+				} else if (this.type === 'time') {
+					return hhmmss
+				} else {
+					return yymmdd + ' ' + hhmmss
+				}
+			},
+
+			/**
+			 * 初始化返回值，并抛出 change 事件
+			 */
+			initTime(emit = true) {
+				this.time = this.createDomSting()
+				if (!emit) return
+				if (this.returnType === 'timestamp' && this.type !== 'time') {
+					this.$emit('change', this.createTimeStamp(this.time))
+					this.$emit('input', this.createTimeStamp(this.time))
+					this.$emit('update:modelValue', this.createTimeStamp(this.time))
+				} else {
+					this.$emit('change', this.time)
+					this.$emit('input', this.time)
+					this.$emit('update:modelValue', this.time)
+				}
+			},
+
+			/**
+			 * 用户选择日期或时间更新 data
+			 * @param {Object} e
+			 */
+			bindDateChange(e) {
+				const val = e.detail.value
+				this.year = this.years[val[0]]
+				this.month = this.months[val[1]]
+				this.day = this.days[val[2]]
+			},
+			bindTimeChange(e) {
+				const val = e.detail.value
+				this.hour = this.hours[val[0]]
+				this.minute = this.minutes[val[1]]
+				this.second = this.seconds[val[2]]
+			},
+
+			/**
+			 * 初始化弹出层
+			 */
+			initTimePicker() {
+				if (this.disabled) return
+				const value = fixIosDateFormat(this.time)
+				this.initPickerValue(value)
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 触发或关闭弹框
+			 */
+			tiggerTimePicker(e) {
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 用户点击“清空”按钮，清空当前值
+			 */
+			clearTime() {
+				this.time = ''
+				this.$emit('change', this.time)
+				this.$emit('input', this.time)
+				this.$emit('update:modelValue', this.time)
+				this.tiggerTimePicker()
+			},
+
+			/**
+			 * 用户点击“确定”按钮
+			 */
+			setTime() {
+				this.initTime()
+				this.tiggerTimePicker()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-datetime-picker {
+		/* #ifndef APP-NVUE */
+		/* width: 100%; */
+		/* #endif */
+	}
+
+	.uni-datetime-picker-view {
+		height: 130px;
+		width: 270px;
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-item {
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-btn {
+		margin-top: 60px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-datetime-picker-btn-text {
+		font-size: 14px;
+		color: $uni-primary;
+	}
+
+	.uni-datetime-picker-btn-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-datetime-picker-cancel {
+		margin-right: 30px;
+	}
+
+	.uni-datetime-picker-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-duration: 0.3s;
+		z-index: 998;
+	}
+
+	.uni-datetime-picker-popup {
+		border-radius: 8px;
+		padding: 30px;
+		width: 270px;
+		/* #ifdef APP-NVUE */
+		height: 500px;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 330px;
+		/* #endif */
+		background-color: #fff;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		transition-duration: 0.3s;
+		z-index: 999;
+	}
+
+	.fix-nvue-height {
+		/* #ifdef APP-NVUE */
+		height: 330px;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-time {
+		color: grey;
+	}
+
+	.uni-datetime-picker-column {
+		height: 50px;
+	}
+
+	.uni-datetime-picker-timebox {
+
+		border: 1px solid #E5E5E5;
+		border-radius: 5px;
+		padding: 7px 10px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-timebox-pointer {
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-datetime-picker-disabled {
+		opacity: 0.4;
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-text {
+		font-size: 14px;
+		line-height: 50px
+	}
+
+	.uni-datetime-picker-sign {
+		position: absolute;
+		top: 53px;
+		/* 减掉 10px 的元素高度，兼容nvue */
+		color: #999;
+		/* #ifdef APP-NVUE */
+		font-size: 16px;
+		/* #endif */
+	}
+
+	.sign-left {
+		left: 86px;
+	}
+
+	.sign-right {
+		right: 86px;
+	}
+
+	.sign-center {
+		left: 135px;
+	}
+
+	.uni-datetime-picker__container-box {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 40px;
+	}
+
+	.time-hide-second {
+		width: 180px;
+	}
+</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
new file mode 100644
index 0000000..a03dcfd
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -0,0 +1,1045 @@
+<template>
+	<view class="uni-date">
+		<view class="uni-date-editor" @click="show">
+			<slot>
+				<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">
+						<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
+						<view class="uni-date__x-input">{{ displayValue || singlePlaceholderText }}</view>
+					</view>
+
+					<view v-else class="uni-date-x uni-date-range">
+						<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
+						<view class="uni-date__x-input text-center">{{ displayRangeValue.startDate || startPlaceholderText }}</view>
+
+						<view class="range-separator">{{rangeSeparator}}</view>
+
+						<view class="uni-date__x-input text-center">{{ displayRangeValue.endDate || endPlaceholderText }}</view>
+					</view>
+
+					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
+						<uni-icons type="clear" color="#c0c4cc" size="22"></uni-icons>
+					</view>
+				</view>
+			</slot>
+		</view>
+
+		<view v-show="pickerVisible" class="uni-date-mask--pc" @click="close"></view>
+
+		<view v-if="!isPhone" v-show="pickerVisible" ref="datePicker" class="uni-date-picker__container">
+			<view v-if="!isRange" class="uni-date-single--x" :style="pickerPositionStyle">
+				<view class="uni-popper__arrow"></view>
+
+				<view v-if="hasTime" class="uni-date-changed popup-x-header">
+					<input class="uni-date__input text-center" type="text" v-model="inputDate" :placeholder="selectDateText" />
+
+					<time-picker type="time" v-model="pickerTime" :border="false" :disabled="!inputDate"
+						:start="timepickerStartTime" :end="timepickerEndTime" :hideSecond="hideSecond" style="width: 100%;">
+						<input class="uni-date__input text-center" type="text" v-model="pickerTime" :placeholder="selectTimeText"
+							:disabled="!inputDate" />
+					</time-picker>
+				</view>
+
+				<Calendar ref="pcSingle" :showMonth="false" :start-date="calendarRange.startDate"
+					:end-date="calendarRange.endDate" :date="calendarDate" @change="singleChange" :default-value="defaultValue"
+					style="padding: 0 8px;" />
+
+				<view v-if="hasTime" class="popup-x-footer">
+					<text class="confirm-text" @click="confirmSingleChange">{{okText}}</text>
+				</view>
+			</view>
+
+			<view v-else class="uni-date-range--x" :style="pickerPositionStyle">
+				<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" />
+
+						<time-picker type="time" v-model="tempRange.startTime" :start="timepickerStartTime" :border="false"
+							:disabled="!tempRange.startDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startTime"
+								:placeholder="startTimeText" :disabled="!tempRange.startDate" />
+						</time-picker>
+					</view>
+
+					<uni-icons type="arrowthinright" color="#999" style="line-height: 40px;"></uni-icons>
+
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endDate"
+							:placeholder="endDateText" />
+
+						<time-picker type="time" v-model="tempRange.endTime" :end="timepickerEndTime" :border="false"
+							:disabled="!tempRange.endDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endTime"
+								:placeholder="endTimeText" :disabled="!tempRange.endDate" />
+						</time-picker>
+					</view>
+				</view>
+
+				<view class="popup-x-body">
+					<Calendar ref="left" :showMonth="false" :start-date="calendarRange.startDate"
+						:end-date="calendarRange.endDate" :range="true" :pleStatus="endMultipleStatus" @change="leftChange"
+						@firstEnterCale="updateRightCale" style="padding: 0 8px;" />
+					<Calendar ref="right" :showMonth="false" :start-date="calendarRange.startDate"
+						:end-date="calendarRange.endDate" :range="true" @change="rightChange" :pleStatus="startMultipleStatus"
+						@firstEnterCale="updateLeftCale" style="padding: 0 8px;border-left: 1px solid #F1F1F1;" />
+				</view>
+
+				<view v-if="hasTime" class="popup-x-footer">
+					<text @click="clear">{{clearText}}</text>
+					<text class="confirm-text" @click="confirmRangeChange">{{okText}}</text>
+				</view>
+			</view>
+		</view>
+
+		<Calendar v-if="isPhone" ref="mobile" :clearDate="false" :date="calendarDate" :defTime="mobileCalendarTime"
+			:start-date="calendarRange.startDate" :end-date="calendarRange.endDate" :selectableTimes="mobSelectableTime"
+			:startPlaceholder="startPlaceholder" :endPlaceholder="endPlaceholder" :default-value="defaultValue"
+			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :hasTime="hasTime" :insert="false"
+			:hideSecond="hideSecond" @confirm="mobileChange" @maskClose="close" />
+	</view>
+</template>
+<script>
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3962
+	 * @property {String} type 选择器类型
+	 * @property {String|Number|Array|Date} value 绑定值
+	 * @property {String} placeholder 单选择时的占位内容
+	 * @property {String} start 起始时间
+	 * @property {String} end 终止时间
+	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
+	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
+	 * @property {String} range-separator 选择范围时的分隔符
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} disabled = [true|false] 是否禁用
+	 * @property {Boolean} clearIcon = [true|false] 是否显示清除按钮（仅PC端适用）
+	 * @property {[String} defaultValue 选择器打开时默认显示的时间
+	 * @event {Function} change 确定日期时触发的事件
+	 * @event {Function} maskClick 点击遮罩层触发的事件
+	 * @event {Function} show 打开弹出层
+	 * @event {Function} close 关闭弹出层
+	 * @event {Function} clear 清除上次选中的状态和值
+	 **/
+	import Calendar from './calendar.vue'
+	import TimePicker from './time-picker.vue'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	import {
+		getDateTime,
+		getDate,
+		getTime,
+		getDefaultSecond,
+		dateCompare,
+		checkDate,
+		fixIosDateFormat
+	} from './util'
+
+	export default {
+		name: 'UniDatetimePicker',
+		options: {
+			virtualHost: true
+		},
+		components: {
+			Calendar,
+			TimePicker
+		},
+		data() {
+			return {
+				isRange: false,
+				hasTime: false,
+				displayValue: '',
+				inputDate: '',
+				calendarDate: '',
+				pickerTime: '',
+				calendarRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				displayRangeValue: {
+					startDate: '',
+					endDate: '',
+				},
+				tempRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				// 左右日历同步数据
+				startMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				endMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				pickerVisible: false,
+				pickerPositionStyle: null,
+				isEmitValue: false,
+				isPhone: false,
+				isFirstShow: true,
+				i18nT: () => {}
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			startPlaceholder: {
+				type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			rangeSeparator: {
+				type: String,
+				default: '-'
+			},
+			border: {
+				type: [Boolean],
+				default: true
+			},
+			disabled: {
+				type: [Boolean],
+				default: false
+			},
+			clearIcon: {
+				type: [Boolean],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			defaultValue: {
+				type: [String, Object, Array],
+				default: ''
+			}
+		},
+		watch: {
+			type: {
+				immediate: true,
+				handler(newVal) {
+					this.hasTime = newVal.indexOf('time') !== -1
+					this.isRange = newVal.indexOf('range') !== -1
+				}
+			},
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			start: {
+				immediate: true,
+				handler(newVal) {
+					if (!newVal) return
+					this.calendarRange.startDate = getDate(newVal)
+					if (this.hasTime) {
+						this.calendarRange.startTime = getTime(newVal)
+					}
+				}
+			},
+			end: {
+				immediate: true,
+				handler(newVal) {
+					if (!newVal) return
+					this.calendarRange.endDate = getDate(newVal)
+					if (this.hasTime) {
+						this.calendarRange.endTime = getTime(newVal, this.hideSecond)
+					}
+				}
+			},
+		},
+		computed: {
+			timepickerStartTime() {
+				const activeDate = this.isRange ? this.tempRange.startDate : this.inputDate
+				return activeDate === this.calendarRange.startDate ? this.calendarRange.startTime : ''
+			},
+			timepickerEndTime() {
+				const activeDate = this.isRange ? this.tempRange.endDate : this.inputDate
+				return activeDate === this.calendarRange.endDate ? this.calendarRange.endTime : ''
+			},
+			mobileCalendarTime() {
+				const timeRange = {
+					start: this.tempRange.startTime,
+					end: this.tempRange.endTime
+				}
+				return this.isRange ? timeRange : this.pickerTime
+			},
+			mobSelectableTime() {
+				return {
+					start: this.calendarRange.startTime,
+					end: this.calendarRange.endTime
+				}
+			},
+			datePopupWidth() {
+				// todo
+				return this.isRange ? 653 : 301
+			},
+
+			/**
+			 * for i18n
+			 */
+			singlePlaceholderText() {
+				return this.placeholder || (this.type === 'date' ? this.selectDateText : this.selectDateTimeText)
+			},
+			startPlaceholderText() {
+				return this.startPlaceholder || this.startDateText
+			},
+			endPlaceholderText() {
+				return this.endPlaceholder || this.endDateText
+			},
+			selectDateText() {
+				return this.i18nT("uni-datetime-picker.selectDate")
+			},
+			selectDateTimeText() {
+				return this.i18nT("uni-datetime-picker.selectDateTime")
+			},
+			selectTimeText() {
+				return this.i18nT("uni-datetime-picker.selectTime")
+			},
+			startDateText() {
+				return this.startPlaceholder || this.i18nT("uni-datetime-picker.startDate")
+			},
+			startTimeText() {
+				return this.i18nT("uni-datetime-picker.startTime")
+			},
+			endDateText() {
+				return this.endPlaceholder || this.i18nT("uni-datetime-picker.endDate")
+			},
+			endTimeText() {
+				return this.i18nT("uni-datetime-picker.endTime")
+			},
+			okText() {
+				return this.i18nT("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return this.i18nT("uni-datetime-picker.clear")
+			},
+			showClearIcon() {
+				return this.clearIcon && !this.disabled && (this.displayValue || (this.displayRangeValue.startDate && this
+					.displayRangeValue.endDate))
+			}
+		},
+		created() {
+			this.initI18nT()
+			this.platform()
+		},
+		methods: {
+			initI18nT() {
+				const vueI18n = initVueI18n(i18nMessages)
+				this.i18nT = vueI18n.t
+			},
+			initPicker(newVal) {
+				if ((!newVal && !this.defaultValue) || Array.isArray(newVal) && !newVal.length) {
+					this.$nextTick(() => {
+						this.clear(false)
+					})
+					return
+				}
+
+				if (!Array.isArray(newVal) && !this.isRange) {
+					if (newVal) {
+						this.displayValue = this.inputDate = this.calendarDate = getDate(newVal)
+						if (this.hasTime) {
+							this.pickerTime = getTime(newVal, this.hideSecond)
+							this.displayValue = `${this.displayValue} ${this.pickerTime}`
+						}
+					} else if (this.defaultValue) {
+						this.inputDate = this.calendarDate = getDate(this.defaultValue)
+						if (this.hasTime) {
+							this.pickerTime = getTime(this.defaultValue, this.hideSecond)
+						}
+					}
+				} else {
+					const [before, after] = newVal
+					if (!before && !after) return
+					const beforeDate = getDate(before)
+					const beforeTime = getTime(before, this.hideSecond)
+
+					const afterDate = getDate(after)
+					const afterTime = getTime(after, this.hideSecond)
+					const startDate = beforeDate
+					const endDate = afterDate
+					this.displayRangeValue.startDate = this.tempRange.startDate = startDate
+					this.displayRangeValue.endDate = this.tempRange.endDate = endDate
+
+					if (this.hasTime) {
+						this.displayRangeValue.startDate = `${beforeDate} ${beforeTime}`
+						this.displayRangeValue.endDate = `${afterDate} ${afterTime}`
+						this.tempRange.startTime = beforeTime
+						this.tempRange.endTime = afterTime
+					}
+					const defaultRange = {
+						before: beforeDate,
+						after: afterDate
+					}
+					this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, defaultRange, {
+						which: 'right'
+					})
+					this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, defaultRange, {
+						which: 'left'
+					})
+				}
+			},
+			updateLeftCale(e) {
+				const left = this.$refs.left
+				// 设置范围选
+				left.cale.setHoverMultiple(e.after)
+				left.setDate(this.$refs.left.nowDate.fullDate)
+			},
+			updateRightCale(e) {
+				const right = this.$refs.right
+				// 设置范围选
+				right.cale.setHoverMultiple(e.after)
+				right.setDate(this.$refs.right.nowDate.fullDate)
+			},
+			platform() {
+				if (typeof navigator !== "undefined") {
+					this.isPhone = navigator.userAgent.toLowerCase().indexOf('mobile') !== -1
+					return
+				}
+				const {
+					windowWidth
+				} = uni.getSystemInfoSync()
+				this.isPhone = windowWidth <= 500
+				this.windowWidth = windowWidth
+			},
+			show() {
+				this.$emit("show")
+				if (this.disabled) {
+					return
+				}
+				this.platform()
+				if (this.isPhone) {
+					setTimeout(() => {
+						this.$refs.mobile.open()
+					}, 0);
+					return
+				}
+				this.pickerPositionStyle = {
+					top: '10px'
+				}
+				const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor")
+				dateEditor.boundingClientRect(rect => {
+					if (this.windowWidth - rect.left < this.datePopupWidth) {
+						this.pickerPositionStyle.right = 0
+					}
+				}).exec()
+				setTimeout(() => {
+					this.pickerVisible = !this.pickerVisible
+					if (!this.isPhone && this.isRange && this.isFirstShow) {
+						this.isFirstShow = false
+						const {
+							startDate,
+							endDate
+						} = this.calendarRange
+						if (startDate && endDate) {
+							if (this.diffDate(startDate, endDate) < 30) {
+								this.$refs.right.changeMonth('pre')
+							}
+						} else {
+							// this.$refs.right.changeMonth('next')
+							if (this.isPhone) {
+								this.$refs.right.cale.lastHover = false;
+							}
+						}
+					}
+
+				}, 50)
+			},
+			close() {
+				setTimeout(() => {
+					this.pickerVisible = false
+					this.$emit('maskClick', this.value)
+					this.$refs.mobile && this.$refs.mobile.close()
+				}, 20)
+			},
+			setEmit(value) {
+				if (this.returnType === "timestamp" || this.returnType === "date") {
+					if (!Array.isArray(value)) {
+						if (!this.hasTime) {
+							value = value + ' ' + '00:00:00'
+						}
+						value = this.createTimestamp(value)
+						if (this.returnType === "date") {
+							value = new Date(value)
+						}
+					} else {
+						if (!this.hasTime) {
+							value[0] = value[0] + ' ' + '00:00:00'
+							value[1] = value[1] + ' ' + '00:00:00'
+						}
+						value[0] = this.createTimestamp(value[0])
+						value[1] = this.createTimestamp(value[1])
+						if (this.returnType === "date") {
+							value[0] = new Date(value[0])
+							value[1] = new Date(value[1])
+						}
+					}
+				}
+
+				this.$emit('update:modelValue', value)
+				this.$emit('input', value)
+				this.$emit('change', value)
+				this.isEmitValue = true
+			},
+			createTimestamp(date) {
+				date = fixIosDateFormat(date)
+				return Date.parse(new Date(date))
+			},
+			singleChange(e) {
+				this.calendarDate = this.inputDate = e.fulldate
+				if (this.hasTime) return
+				this.confirmSingleChange()
+			},
+			confirmSingleChange() {
+				if (!checkDate(this.inputDate)) {
+					const now = new Date()
+					this.calendarDate = this.inputDate = getDate(now)
+					this.pickerTime = getTime(now, this.hideSecond)
+				}
+
+				let startLaterInputDate = false
+				let startDate, startTime
+				if (this.start) {
+					let startString = this.start
+					if (typeof this.start === 'number') {
+						startString = getDateTime(this.start, this.hideSecond)
+					}
+					[startDate, startTime] = startString.split(' ')
+					if (this.start && !dateCompare(startDate, this.inputDate)) {
+						startLaterInputDate = true
+						this.inputDate = startDate
+					}
+				}
+
+				let endEarlierInputDate = false
+				let endDate, endTime
+				if (this.end) {
+					let endString = this.end
+					if (typeof this.end === 'number') {
+						endString = getDateTime(this.end, this.hideSecond)
+					}
+					[endDate, endTime] = endString.split(' ')
+					if (this.end && !dateCompare(this.inputDate, endDate)) {
+						endEarlierInputDate = true
+						this.inputDate = endDate
+					}
+				}
+				if (this.hasTime) {
+					if (startLaterInputDate) {
+						this.pickerTime = startTime || getDefaultSecond(this.hideSecond)
+					}
+					if (endEarlierInputDate) {
+						this.pickerTime = endTime || getDefaultSecond(this.hideSecond)
+					}
+					if (!this.pickerTime) {
+						this.pickerTime = getTime(Date.now(), this.hideSecond)
+					}
+					this.displayValue = `${this.inputDate} ${this.pickerTime}`
+				} else {
+					this.displayValue = this.inputDate
+				}
+				this.setEmit(this.displayValue)
+				this.pickerVisible = false
+			},
+			leftChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, obj)
+			},
+			rightChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, obj)
+			},
+			mobileChange(e) {
+				if (this.isRange) {
+					const {
+						before,
+						after
+					} = e.range
+					if (!before) {
+						return;
+					}
+
+					this.handleStartAndEnd(before, after, true)
+					if (this.hasTime) {
+						const {
+							startTime,
+							endTime
+						} = e.timeRange
+						this.tempRange.startTime = startTime
+						this.tempRange.endTime = endTime
+					}
+					this.confirmRangeChange()
+				} else {
+					if (this.hasTime) {
+						this.displayValue = e.fulldate + ' ' + e.time
+					} else {
+						this.displayValue = e.fulldate
+					}
+					this.setEmit(this.displayValue)
+				}
+				this.$refs.mobile.close()
+			},
+			rangeChange(before, after) {
+				if (!(before && after)) return
+				this.handleStartAndEnd(before, after, true)
+				if (this.hasTime) return
+				this.confirmRangeChange()
+			},
+			confirmRangeChange() {
+				if (!this.tempRange.startDate || !this.tempRange.endDate) {
+					this.pickerVisible = false
+					return
+				}
+				if (!checkDate(this.tempRange.startDate)) {
+					this.tempRange.startDate = getDate(Date.now())
+				}
+				if (!checkDate(this.tempRange.endDate)) {
+					this.tempRange.endDate = getDate(Date.now())
+				}
+
+				let start, end
+
+				let startDateLaterRangeStartDate = false
+				let startDateLaterRangeEndDate = false
+				let startDate, startTime
+				if (this.start) {
+					let startString = this.start
+					if (typeof this.start === 'number') {
+						startString = getDateTime(this.start, this.hideSecond)
+					}
+					[startDate, startTime] = startString.split(' ')
+					if (this.start && !dateCompare(this.start, this.tempRange.startDate)) {
+						startDateLaterRangeStartDate = true
+						this.tempRange.startDate = startDate
+					}
+					if (this.start && !dateCompare(this.start, this.tempRange.endDate)) {
+						startDateLaterRangeEndDate = true
+						this.tempRange.endDate = startDate
+					}
+				}
+				let endDateEarlierRangeStartDate = false
+				let endDateEarlierRangeEndDate = false
+				let endDate, endTime
+				if (this.end) {
+					let endString = this.end
+					if (typeof this.end === 'number') {
+						endString = getDateTime(this.end, this.hideSecond)
+					}
+					[endDate, endTime] = endString.split(' ')
+
+					if (this.end && !dateCompare(this.tempRange.startDate, this.end)) {
+						endDateEarlierRangeStartDate = true
+						this.tempRange.startDate = endDate
+					}
+					if (this.end && !dateCompare(this.tempRange.endDate, this.end)) {
+						endDateEarlierRangeEndDate = true
+						this.tempRange.endDate = endDate
+					}
+				}
+				if (!this.hasTime) {
+					start = this.displayRangeValue.startDate = this.tempRange.startDate
+					end = this.displayRangeValue.endDate = this.tempRange.endDate
+				} else {
+					if (startDateLaterRangeStartDate) {
+						this.tempRange.startTime = startTime || getDefaultSecond(this.hideSecond)
+					} else if (endDateEarlierRangeStartDate) {
+						this.tempRange.startTime = endTime || getDefaultSecond(this.hideSecond)
+					}
+					if (!this.tempRange.startTime) {
+						this.tempRange.startTime = getTime(Date.now(), this.hideSecond)
+					}
+
+					if (startDateLaterRangeEndDate) {
+						this.tempRange.endTime = startTime || getDefaultSecond(this.hideSecond)
+					} else if (endDateEarlierRangeEndDate) {
+						this.tempRange.endTime = endTime || getDefaultSecond(this.hideSecond)
+					}
+					if (!this.tempRange.endTime) {
+						this.tempRange.endTime = getTime(Date.now(), this.hideSecond)
+					}
+					start = this.displayRangeValue.startDate = `${this.tempRange.startDate} ${this.tempRange.startTime}`
+					end = this.displayRangeValue.endDate = `${this.tempRange.endDate} ${this.tempRange.endTime}`
+				}
+				if (!dateCompare(start, end)) {
+					[start, end] = [end, start]
+				}
+				this.displayRangeValue.startDate = start
+				this.displayRangeValue.endDate = end
+				const displayRange = [start, end]
+				this.setEmit(displayRange)
+				this.pickerVisible = false
+			},
+			handleStartAndEnd(before, after, temp = false) {
+				if (!before) return
+				if(!after)after = before;
+				const type = temp ? 'tempRange' : 'range'
+				const isStartEarlierEnd = dateCompare(before, after)
+				this[type].startDate = isStartEarlierEnd ? before : after
+				this[type].endDate = isStartEarlierEnd ? after : before
+			},
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				return startDate <= endDate
+			},
+
+			/**
+			 * 比较时间差
+			 */
+			diffDate(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				const diff = (endDate - startDate) / (24 * 60 * 60 * 1000)
+				return Math.abs(diff)
+			},
+
+			clear(needEmit = true) {
+				if (!this.isRange) {
+					this.displayValue = ''
+					this.inputDate = ''
+					this.pickerTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
+					}
+					if (needEmit) {
+						this.$emit('change', '')
+						this.$emit('input', '')
+						this.$emit('update:modelValue', '')
+					}
+				} else {
+					this.displayRangeValue.startDate = ''
+					this.displayRangeValue.endDate = ''
+					this.tempRange.startDate = ''
+					this.tempRange.startTime = ''
+					this.tempRange.endDate = ''
+					this.tempRange.endTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.left && this.$refs.left.clearCalender()
+						this.$refs.right && this.$refs.right.clearCalender()
+						this.$refs.right && this.$refs.right.changeMonth('next')
+					}
+					if (needEmit) {
+						this.$emit('change', [])
+						this.$emit('input', [])
+						this.$emit('update:modelValue', [])
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-date {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-date-x {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		border-radius: 4px;
+		background-color: #fff;
+		color: #666;
+		font-size: 14px;
+		flex: 1;
+
+		.icon-calendar {
+			padding-left: 3px;
+		}
+
+		.range-separator {
+			height: 35px;
+			/* #ifndef MP */
+			padding: 0 2px;
+			/* #endif */
+			line-height: 35px;
+		}
+	}
+
+	.uni-date-x--border {
+		box-sizing: border-box;
+		border-radius: 4px;
+		border: 1px solid #e5e5e5;
+	}
+
+	.uni-date-editor--x {
+		display: flex;
+		align-items: center;
+		position: relative;
+	}
+
+	.uni-date-editor--x .uni-date__icon-clear {
+		padding-right: 3px;
+		display: flex;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-date__x-input {
+		width: auto;
+		height: 35px;
+		/* #ifndef MP */
+		padding-left: 5px;
+		/* #endif */
+		position: relative;
+		flex: 1;
+		line-height: 35px;
+		font-size: 14px;
+		overflow: hidden;
+	}
+
+	.text-center {
+		text-align: center;
+	}
+
+	.uni-date__input {
+		height: 40px;
+		width: 100%;
+		line-height: 40px;
+		font-size: 14px;
+	}
+
+	.uni-date-range__input {
+		text-align: center;
+		max-width: 142px;
+	}
+
+	.uni-date-picker__container {
+		position: relative;
+	}
+
+	.uni-date-mask--pc {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0);
+		transition-duration: 0.3s;
+		z-index: 996;
+	}
+
+	.uni-date-single--x {
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-range--x {
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-editor--x__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	.uni-date-editor--logo {
+		width: 16px;
+		height: 16px;
+		vertical-align: middle;
+	}
+
+	/* 添加时间 */
+	.popup-x-header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.popup-x-header--datetime {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+	}
+
+	.popup-x-body {
+		display: flex;
+	}
+
+	.popup-x-footer {
+		padding: 0 15px;
+		border-top-color: #F1F1F1;
+		border-top-style: solid;
+		border-top-width: 1px;
+		line-height: 40px;
+		text-align: right;
+		color: #666;
+	}
+
+	.popup-x-footer text:hover {
+		color: $uni-primary;
+		cursor: pointer;
+		opacity: 0.8;
+	}
+
+	.popup-x-footer .confirm-text {
+		margin-left: 20px;
+		color: $uni-primary;
+	}
+
+	.uni-date-changed {
+		text-align: center;
+		color: #333;
+		border-bottom-color: #F1F1F1;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-date-changed--time text {
+		height: 50px;
+		line-height: 50px;
+	}
+
+	.uni-date-changed .uni-date-changed--time {
+		flex: 1;
+	}
+
+	.uni-date-changed--time-date {
+		color: #333;
+		opacity: 0.6;
+	}
+
+	.mr-50 {
+		margin-right: 50px;
+	}
+
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border: 6px solid transparent;
+		border-top-width: 0;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-bottom-color: #fff;
+	}
+</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
new file mode 100644
index 0000000..acf7e4b
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
@@ -0,0 +1,421 @@
+class Calendar {
+	constructor({
+		selected,
+		startDate,
+		endDate,
+		range,
+	} = {}) {
+		// 当前日期
+		this.date = this.getDateObj(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 起始时间
+		this.startDate = startDate
+		// 终止时间
+		this.endDate = endDate
+		// 是否范围选择
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		this.lastHover = false
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		const selectDate = this.getDateObj(date)
+		this.getWeeks(selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	setStartDate(startDate) {
+		this.startDate = startDate
+	}
+
+	setEndDate(endDate) {
+		this.endDate = endDate
+	}
+
+	getPreMonthObj(date) {
+		date = fixIosDateFormat(date)
+		date = new Date(date)
+
+		const oldMonth = date.getMonth()
+		date.setMonth(oldMonth - 1)
+		const newMonth = date.getMonth()
+		if (oldMonth !== 0 && newMonth - oldMonth === 0) {
+			date.setMonth(newMonth - 1)
+		}
+		return this.getDateObj(date)
+	}
+	getNextMonthObj(date) {
+		date = fixIosDateFormat(date)
+		date = new Date(date)
+
+		const oldMonth = date.getMonth()
+		date.setMonth(oldMonth + 1)
+		const newMonth = date.getMonth()
+		if (newMonth - oldMonth > 1) {
+			date.setMonth(newMonth - 1)
+		}
+		return this.getDateObj(date)
+	}
+
+	/**
+	 * 获取指定格式Date对象
+	 */
+	getDateObj(date) {
+		date = fixIosDateFormat(date)
+		date = new Date(date)
+
+		return {
+			fullDate: getDate(date),
+			year: date.getFullYear(),
+			month: addZero(date.getMonth() + 1),
+			date: addZero(date.getDate()),
+			day: date.getDay()
+		}
+	}
+
+	/**
+	 * 获取上一个月日期集合
+	 */
+	getPreMonthDays(amount, dateObj) {
+		const result = []
+		for (let i = amount - 1; i >= 0; i--) {
+			const month = dateObj.month - 1
+			result.push({
+				date: new Date(dateObj.year, month, -i).getDate(),
+				month,
+				disable: true
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取本月日期集合
+	 */
+	getCurrentMonthDays(amount, dateObj) {
+		const result = []
+		const fullDate = this.date.fullDate
+		for (let i = 1; i <= amount; i++) {
+			const currentDate = `${dateObj.year}-${dateObj.month}-${addZero(i)}`
+			const isToday = fullDate === currentDate
+			// 获取打点信息
+			const info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(currentDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				disableBefore = dateCompare(this.startDate, currentDate)
+			}
+
+			if (this.endDate) {
+				disableAfter = dateCompare(currentDate, this.endDate)
+			}
+
+			let multiples = this.multipleStatus.data
+			let multiplesStatus = -1
+			if (this.range && multiples) {
+				multiplesStatus = multiples.findIndex((item) => {
+					return this.dateEqual(item, currentDate)
+				})
+			}
+			const checked = multiplesStatus !== -1
+
+			result.push({
+				fullDate: currentDate,
+				year: dateObj.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(currentDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(currentDate, this.multipleStatus.before, this.multipleStatus.after),
+				month: dateObj.month,
+				disable: (this.startDate && !dateCompare(this.startDate, currentDate)) || (this.endDate && !dateCompare(
+					currentDate, this.endDate)),
+				isToday,
+				userChecked: false,
+				extraInfo: info
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取下一个月日期集合
+	 */
+	_getNextMonthDays(amount, dateObj) {
+		const result = []
+		const month = dateObj.month + 1
+		for (let i = 1; i <= amount; i++) {
+			result.push({
+				date: i,
+				month,
+				disable: true
+			})
+		}
+		return result
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+
+		return this.calendar.find(item => item.fullDate === this.getDateObj(date).fullDate)
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		before = new Date(fixIosDateFormat(before))
+		after = new Date(fixIosDateFormat(after))
+		return before.valueOf() === after.valueOf()
+	}
+
+	/**
+	 *  比较真实起始日期
+	 */
+
+	isLogicBefore(currentDate, before, after) {
+		let logicBefore = before
+		if (before && after) {
+			logicBefore = dateCompare(before, after) ? before : after
+		}
+		return this.dateEqual(logicBefore, currentDate)
+	}
+
+	isLogicAfter(currentDate, before, after) {
+		let logicAfter = after
+		if (before && after) {
+			logicAfter = dateCompare(before, after) ? after : before
+		}
+		return this.dateEqual(logicAfter, currentDate)
+	}
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDateObj(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		if (!this.range) return
+
+		let {
+			before,
+			after
+		} = this.multipleStatus
+		if (before && after) {
+			if (!this.lastHover) {
+				this.lastHover = true
+				return
+			}
+			this.multipleStatus.before = fullDate
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+			this.multipleStatus.fulldate = ''
+			this.lastHover = false
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+				this.multipleStatus.after = undefined;
+				this.lastHover = false
+			} else {
+				this.multipleStatus.after = fullDate
+				if (dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus
+						.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
+						.before);
+				}
+				this.lastHover = true
+			}
+		}
+		this.getWeeks(fullDate)
+	}
+
+	/**
+	 *  鼠标 hover 更新多选状态
+	 */
+	setHoverMultiple(fullDate) {
+		//抖音小程序点击会触发hover事件，需要避免一下
+		// #ifndef MP-TOUTIAO
+		if (!this.range || this.lastHover) return
+		const {
+			before
+		} = this.multipleStatus
+
+		if (!before) {
+			this.multipleStatus.before = fullDate
+		} else {
+			this.multipleStatus.after = fullDate
+			if (dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+			} else {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+			}
+		}
+		this.getWeeks(fullDate)
+		// #endif
+
+	}
+
+	/**
+	 * 更新默认值多选状态
+	 */
+	setDefaultMultiple(before, after) {
+		this.multipleStatus.before = before
+		this.multipleStatus.after = after
+		if (before && after) {
+			if (dateCompare(before, after)) {
+				this.multipleStatus.data = this.geDateAll(before, after);
+				this.getWeeks(after)
+			} else {
+				this.multipleStatus.data = this.geDateAll(after, before);
+				this.getWeeks(before)
+			}
+		}
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	getWeeks(dateData) {
+		const {
+			year,
+			month,
+		} = this.getDateObj(dateData)
+
+		const preMonthDayAmount = new Date(year, month - 1, 1).getDay()
+		const preMonthDays = this.getPreMonthDays(preMonthDayAmount, this.getDateObj(dateData))
+
+		const currentMonthDayAmount = new Date(year, month, 0).getDate()
+		const currentMonthDays = this.getCurrentMonthDays(currentMonthDayAmount, this.getDateObj(dateData))
+
+		const nextMonthDayAmount = 42 - preMonthDayAmount - currentMonthDayAmount
+		const nextMonthDays = this._getNextMonthDays(nextMonthDayAmount, this.getDateObj(dateData))
+
+		const calendarDays = [...preMonthDays, ...currentMonthDays, ...nextMonthDays]
+
+		const weeks = new Array(6)
+		for (let i = 0; i < calendarDays.length; i++) {
+			const index = Math.floor(i / 7)
+			if (!weeks[index]) {
+				weeks[index] = new Array(7)
+			}
+			weeks[index][i % 7] = calendarDays[i]
+		}
+
+		this.calendar = calendarDays
+		this.weeks = weeks
+	}
+}
+
+function getDateTime(date, hideSecond) {
+	return `${getDate(date)} ${getTime(date, hideSecond)}`
+}
+
+function getDate(date) {
+	date = fixIosDateFormat(date)
+	date = new Date(date)
+	const year = date.getFullYear()
+	const month = date.getMonth() + 1
+	const day = date.getDate()
+	return `${year}-${addZero(month)}-${addZero(day)}`
+}
+
+function getTime(date, hideSecond) {
+	date = fixIosDateFormat(date)
+	date = new Date(date)
+	const hour = date.getHours()
+	const minute = date.getMinutes()
+	const second = date.getSeconds()
+	return hideSecond ? `${addZero(hour)}:${addZero(minute)}` : `${addZero(hour)}:${addZero(minute)}:${addZero(second)}`
+}
+
+function addZero(num) {
+	if (num < 10) {
+		num = `0${num}`
+	}
+	return num
+}
+
+function getDefaultSecond(hideSecond) {
+	return hideSecond ? '00:00' : '00:00:00'
+}
+
+function dateCompare(startDate, endDate) {
+	startDate = new Date(fixIosDateFormat(startDate))
+	endDate = new Date(fixIosDateFormat(endDate))
+	return startDate <= endDate
+}
+
+function checkDate(date) {
+	const dateReg = /((19|20)\d{2})(-|\/)\d{1,2}(-|\/)\d{1,2}/g
+	return date.match(dateReg)
+}
+//ios低版本15及以下，无法匹配 没有 ’秒‘ 时的情况，所以需要在末尾 秒 加上 问号
+const dateTimeReg = /^\d{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])( [0-5]?[0-9]:[0-5]?[0-9](:[0-5]?[0-9])?)?$/;
+
+function fixIosDateFormat(value) {
+	if (typeof value === 'string' && dateTimeReg.test(value)) {
+		value = value.replace(/-/g, '/')
+	}
+	return value
+}
+
+export {
+	Calendar,
+	getDateTime,
+	getDate,
+	getTime,
+	addZero,
+	getDefaultSecond,
+	dateCompare,
+	checkDate,
+	fixIosDateFormat
+}
diff --git a/uni_modules/uni-datetime-picker/package.json b/uni_modules/uni-datetime-picker/package.json
new file mode 100644
index 0000000..2c86146
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.32",
+  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
+  "keywords": [
+    "uni-datetime-picker",
+    "uni-ui",
+    "uniui",
+    "日期时间选择器",
+    "日期时间"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "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",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-datetime-picker/readme.md b/uni_modules/uni-datetime-picker/readme.md
new file mode 100644
index 0000000..162fbef
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/readme.md
@@ -0,0 +1,21 @@
+
+
+> `重要通知：组件升级更新 2.0.0 后，支持日期+时间范围选择，组件 ui 将使用日历选择日期，ui 变化较大，同时支持 PC 和 移动端。此版本不向后兼容，不再支持单独的时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）。若仍需使用旧版本，可在插件市场下载*非uni_modules版本*，旧版本将不再维护`
+
+## DatetimePicker 时间选择器
+
+> **组件名：uni-datetime-picker**
+> 代码块： `uDatetimePicker`
+
+
+该组件的优势是，支持**时间戳**输入和输出（起始时间、终止时间也支持时间戳），可**同时选择**日期和时间。
+
+若只是需要单独选择日期和时间，不需要时间戳输入和输出，可使用原生的 picker 组件。
+
+**_点击 picker 默认值规则：_**
+
+- 若设置初始值 value, 会显示在 picker 显示框中
+- 若无初始值 value，则初始值 value 为当前本地时间 Date.now()， 但不会显示在 picker 显示框中
+
+### [查看文档](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-icons/changelog.md b/uni_modules/uni-icons/changelog.md
new file mode 100644
index 0000000..620ab02
--- /dev/null
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,40 @@
+## 2.0.9（2024-01-12）
+fix: 修复图标大小默认值错误的问题
+## 2.0.8（2023-12-14）
+- 修复 项目未使用 ts 情况下，打包报错的bug
+## 2.0.7（2023-12-14）
+- 修复 size 属性为 string 时，不加单位导致尺寸异常的bug
+## 2.0.6（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.5（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.4（2023-12-06）
+- 优化 uni-app x 下示例项目图标排序
+## 2.0.3（2023-12-06）
+- 修复 nvue下引入组件报错的bug
+## 2.0.2（2023-12-05）
+-优化 size 属性支持单位
+## 2.0.1（2023-12-05）
+- 新增 uni-app x 支持定义图标
+## 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）
+- 优化 兼容旧组件 type 值
+## 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-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-icons/components/uni-icons/icons.js b/uni_modules/uni-icons/components/uni-icons/icons.js
new file mode 100644
index 0000000..7889936
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/icons.js
@@ -0,0 +1,1169 @@
+export default {
+  "id": "2852637",
+  "name": "uniui图标库",
+  "font_family": "uniicons",
+  "css_prefix_text": "uniui-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "25027049",
+      "name": "yanse",
+      "font_class": "color",
+      "unicode": "e6cf",
+      "unicode_decimal": 59087
+    },
+    {
+      "icon_id": "25027048",
+      "name": "wallet",
+      "font_class": "wallet",
+      "unicode": "e6b1",
+      "unicode_decimal": 59057
+    },
+    {
+      "icon_id": "25015720",
+      "name": "settings-filled",
+      "font_class": "settings-filled",
+      "unicode": "e6ce",
+      "unicode_decimal": 59086
+    },
+    {
+      "icon_id": "25015434",
+      "name": "shimingrenzheng-filled",
+      "font_class": "auth-filled",
+      "unicode": "e6cc",
+      "unicode_decimal": 59084
+    },
+    {
+      "icon_id": "24934246",
+      "name": "shop-filled",
+      "font_class": "shop-filled",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
+      "icon_id": "24934159",
+      "name": "staff-filled-01",
+      "font_class": "staff-filled",
+      "unicode": "e6cb",
+      "unicode_decimal": 59083
+    },
+    {
+      "icon_id": "24932461",
+      "name": "VIP-filled",
+      "font_class": "vip-filled",
+      "unicode": "e6c6",
+      "unicode_decimal": 59078
+    },
+    {
+      "icon_id": "24932462",
+      "name": "plus_circle_fill",
+      "font_class": "plus-filled",
+      "unicode": "e6c7",
+      "unicode_decimal": 59079
+    },
+    {
+      "icon_id": "24932463",
+      "name": "folder_add-filled",
+      "font_class": "folder-add-filled",
+      "unicode": "e6c8",
+      "unicode_decimal": 59080
+    },
+    {
+      "icon_id": "24932464",
+      "name": "yanse-filled",
+      "font_class": "color-filled",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "24932465",
+      "name": "tune-filled",
+      "font_class": "tune-filled",
+      "unicode": "e6ca",
+      "unicode_decimal": 59082
+    },
+    {
+      "icon_id": "24932455",
+      "name": "a-rilidaka-filled",
+      "font_class": "calendar-filled",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "24932456",
+      "name": "notification-filled",
+      "font_class": "notification-filled",
+      "unicode": "e6c1",
+      "unicode_decimal": 59073
+    },
+    {
+      "icon_id": "24932457",
+      "name": "wallet-filled",
+      "font_class": "wallet-filled",
+      "unicode": "e6c2",
+      "unicode_decimal": 59074
+    },
+    {
+      "icon_id": "24932458",
+      "name": "paihangbang-filled",
+      "font_class": "medal-filled",
+      "unicode": "e6c3",
+      "unicode_decimal": 59075
+    },
+    {
+      "icon_id": "24932459",
+      "name": "gift-filled",
+      "font_class": "gift-filled",
+      "unicode": "e6c4",
+      "unicode_decimal": 59076
+    },
+    {
+      "icon_id": "24932460",
+      "name": "fire-filled",
+      "font_class": "fire-filled",
+      "unicode": "e6c5",
+      "unicode_decimal": 59077
+    },
+    {
+      "icon_id": "24928001",
+      "name": "refreshempty",
+      "font_class": "refreshempty",
+      "unicode": "e6bf",
+      "unicode_decimal": 59071
+    },
+    {
+      "icon_id": "24926853",
+      "name": "location-ellipse",
+      "font_class": "location-filled",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "24926735",
+      "name": "person-filled",
+      "font_class": "person-filled",
+      "unicode": "e69d",
+      "unicode_decimal": 59037
+    },
+    {
+      "icon_id": "24926703",
+      "name": "personadd-filled",
+      "font_class": "personadd-filled",
+      "unicode": "e698",
+      "unicode_decimal": 59032
+    },
+    {
+      "icon_id": "24923351",
+      "name": "back",
+      "font_class": "back",
+      "unicode": "e6b9",
+      "unicode_decimal": 59065
+    },
+    {
+      "icon_id": "24923352",
+      "name": "forward",
+      "font_class": "forward",
+      "unicode": "e6ba",
+      "unicode_decimal": 59066
+    },
+    {
+      "icon_id": "24923353",
+      "name": "arrowthinright",
+      "font_class": "arrow-right",
+      "unicode": "e6bb",
+      "unicode_decimal": 59067
+    },
+		{
+		  "icon_id": "24923353",
+		  "name": "arrowthinright",
+		  "font_class": "arrowthinright",
+		  "unicode": "e6bb",
+		  "unicode_decimal": 59067
+		},
+    {
+      "icon_id": "24923354",
+      "name": "arrowthinleft",
+      "font_class": "arrow-left",
+      "unicode": "e6bc",
+      "unicode_decimal": 59068
+    },
+		{
+		  "icon_id": "24923354",
+		  "name": "arrowthinleft",
+		  "font_class": "arrowthinleft",
+		  "unicode": "e6bc",
+		  "unicode_decimal": 59068
+		},
+    {
+      "icon_id": "24923355",
+      "name": "arrowthinup",
+      "font_class": "arrow-up",
+      "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",
+      "name": "arrowdown",
+      "font_class": "bottom",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },{
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "arrowdown",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },
+    {
+      "icon_id": "24923346",
+      "name": "arrowright",
+      "font_class": "right",
+      "unicode": "e6b5",
+      "unicode_decimal": 59061
+    },
+		{
+		  "icon_id": "24923346",
+		  "name": "arrowright",
+		  "font_class": "arrowright",
+		  "unicode": "e6b5",
+		  "unicode_decimal": 59061
+		},
+    {
+      "icon_id": "24923347",
+      "name": "arrowup",
+      "font_class": "top",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+		{
+		  "icon_id": "24923347",
+		  "name": "arrowup",
+		  "font_class": "arrowup",
+		  "unicode": "e6b6",
+		  "unicode_decimal": 59062
+		},
+    {
+      "icon_id": "24923348",
+      "name": "arrowleft",
+      "font_class": "left",
+      "unicode": "e6b7",
+      "unicode_decimal": 59063
+    },
+		{
+		  "icon_id": "24923348",
+		  "name": "arrowleft",
+		  "font_class": "arrowleft",
+		  "unicode": "e6b7",
+		  "unicode_decimal": 59063
+		},
+    {
+      "icon_id": "24923334",
+      "name": "eye",
+      "font_class": "eye",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "24923335",
+      "name": "eye-filled",
+      "font_class": "eye-filled",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "24923336",
+      "name": "eye-slash",
+      "font_class": "eye-slash",
+      "unicode": "e6b3",
+      "unicode_decimal": 59059
+    },
+    {
+      "icon_id": "24923337",
+      "name": "eye-slash-filled",
+      "font_class": "eye-slash-filled",
+      "unicode": "e6b4",
+      "unicode_decimal": 59060
+    },
+    {
+      "icon_id": "24923305",
+      "name": "info-filled",
+      "font_class": "info-filled",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "24923299",
+      "name": "reload-01",
+      "font_class": "reload",
+      "unicode": "e6b2",
+      "unicode_decimal": 59058
+    },
+    {
+      "icon_id": "24923195",
+      "name": "mic_slash_fill",
+      "font_class": "micoff-filled",
+      "unicode": "e6b0",
+      "unicode_decimal": 59056
+    },
+    {
+      "icon_id": "24923165",
+      "name": "map-pin-ellipse",
+      "font_class": "map-pin-ellipse",
+      "unicode": "e6ac",
+      "unicode_decimal": 59052
+    },
+    {
+      "icon_id": "24923166",
+      "name": "map-pin",
+      "font_class": "map-pin",
+      "unicode": "e6ad",
+      "unicode_decimal": 59053
+    },
+    {
+      "icon_id": "24923167",
+      "name": "location",
+      "font_class": "location",
+      "unicode": "e6ae",
+      "unicode_decimal": 59054
+    },
+    {
+      "icon_id": "24923064",
+      "name": "starhalf",
+      "font_class": "starhalf",
+      "unicode": "e683",
+      "unicode_decimal": 59011
+    },
+    {
+      "icon_id": "24923065",
+      "name": "star",
+      "font_class": "star",
+      "unicode": "e688",
+      "unicode_decimal": 59016
+    },
+    {
+      "icon_id": "24923066",
+      "name": "star-filled",
+      "font_class": "star-filled",
+      "unicode": "e68f",
+      "unicode_decimal": 59023
+    },
+    {
+      "icon_id": "24899646",
+      "name": "a-rilidaka",
+      "font_class": "calendar",
+      "unicode": "e6a0",
+      "unicode_decimal": 59040
+    },
+    {
+      "icon_id": "24899647",
+      "name": "fire",
+      "font_class": "fire",
+      "unicode": "e6a1",
+      "unicode_decimal": 59041
+    },
+    {
+      "icon_id": "24899648",
+      "name": "paihangbang",
+      "font_class": "medal",
+      "unicode": "e6a2",
+      "unicode_decimal": 59042
+    },
+    {
+      "icon_id": "24899649",
+      "name": "font",
+      "font_class": "font",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
+    {
+      "icon_id": "24899650",
+      "name": "gift",
+      "font_class": "gift",
+      "unicode": "e6a4",
+      "unicode_decimal": 59044
+    },
+    {
+      "icon_id": "24899651",
+      "name": "link",
+      "font_class": "link",
+      "unicode": "e6a5",
+      "unicode_decimal": 59045
+    },
+    {
+      "icon_id": "24899652",
+      "name": "notification",
+      "font_class": "notification",
+      "unicode": "e6a6",
+      "unicode_decimal": 59046
+    },
+    {
+      "icon_id": "24899653",
+      "name": "staff",
+      "font_class": "staff",
+      "unicode": "e6a7",
+      "unicode_decimal": 59047
+    },
+    {
+      "icon_id": "24899654",
+      "name": "VIP",
+      "font_class": "vip",
+      "unicode": "e6a8",
+      "unicode_decimal": 59048
+    },
+    {
+      "icon_id": "24899655",
+      "name": "folder_add",
+      "font_class": "folder-add",
+      "unicode": "e6a9",
+      "unicode_decimal": 59049
+    },
+    {
+      "icon_id": "24899656",
+      "name": "tune",
+      "font_class": "tune",
+      "unicode": "e6aa",
+      "unicode_decimal": 59050
+    },
+    {
+      "icon_id": "24899657",
+      "name": "shimingrenzheng",
+      "font_class": "auth",
+      "unicode": "e6ab",
+      "unicode_decimal": 59051
+    },
+    {
+      "icon_id": "24899565",
+      "name": "person",
+      "font_class": "person",
+      "unicode": "e699",
+      "unicode_decimal": 59033
+    },
+    {
+      "icon_id": "24899566",
+      "name": "email-filled",
+      "font_class": "email-filled",
+      "unicode": "e69a",
+      "unicode_decimal": 59034
+    },
+    {
+      "icon_id": "24899567",
+      "name": "phone-filled",
+      "font_class": "phone-filled",
+      "unicode": "e69b",
+      "unicode_decimal": 59035
+    },
+    {
+      "icon_id": "24899568",
+      "name": "phone",
+      "font_class": "phone",
+      "unicode": "e69c",
+      "unicode_decimal": 59036
+    },
+    {
+      "icon_id": "24899570",
+      "name": "email",
+      "font_class": "email",
+      "unicode": "e69e",
+      "unicode_decimal": 59038
+    },
+    {
+      "icon_id": "24899571",
+      "name": "personadd",
+      "font_class": "personadd",
+      "unicode": "e69f",
+      "unicode_decimal": 59039
+    },
+    {
+      "icon_id": "24899558",
+      "name": "chatboxes-filled",
+      "font_class": "chatboxes-filled",
+      "unicode": "e692",
+      "unicode_decimal": 59026
+    },
+    {
+      "icon_id": "24899559",
+      "name": "contact",
+      "font_class": "contact",
+      "unicode": "e693",
+      "unicode_decimal": 59027
+    },
+    {
+      "icon_id": "24899560",
+      "name": "chatbubble-filled",
+      "font_class": "chatbubble-filled",
+      "unicode": "e694",
+      "unicode_decimal": 59028
+    },
+    {
+      "icon_id": "24899561",
+      "name": "contact-filled",
+      "font_class": "contact-filled",
+      "unicode": "e695",
+      "unicode_decimal": 59029
+    },
+    {
+      "icon_id": "24899562",
+      "name": "chatboxes",
+      "font_class": "chatboxes",
+      "unicode": "e696",
+      "unicode_decimal": 59030
+    },
+    {
+      "icon_id": "24899563",
+      "name": "chatbubble",
+      "font_class": "chatbubble",
+      "unicode": "e697",
+      "unicode_decimal": 59031
+    },
+    {
+      "icon_id": "24881290",
+      "name": "upload-filled",
+      "font_class": "upload-filled",
+      "unicode": "e68e",
+      "unicode_decimal": 59022
+    },
+    {
+      "icon_id": "24881292",
+      "name": "upload",
+      "font_class": "upload",
+      "unicode": "e690",
+      "unicode_decimal": 59024
+    },
+    {
+      "icon_id": "24881293",
+      "name": "weixin",
+      "font_class": "weixin",
+      "unicode": "e691",
+      "unicode_decimal": 59025
+    },
+    {
+      "icon_id": "24881274",
+      "name": "compose",
+      "font_class": "compose",
+      "unicode": "e67f",
+      "unicode_decimal": 59007
+    },
+    {
+      "icon_id": "24881275",
+      "name": "qq",
+      "font_class": "qq",
+      "unicode": "e680",
+      "unicode_decimal": 59008
+    },
+    {
+      "icon_id": "24881276",
+      "name": "download-filled",
+      "font_class": "download-filled",
+      "unicode": "e681",
+      "unicode_decimal": 59009
+    },
+    {
+      "icon_id": "24881277",
+      "name": "pengyouquan",
+      "font_class": "pyq",
+      "unicode": "e682",
+      "unicode_decimal": 59010
+    },
+    {
+      "icon_id": "24881279",
+      "name": "sound",
+      "font_class": "sound",
+      "unicode": "e684",
+      "unicode_decimal": 59012
+    },
+    {
+      "icon_id": "24881280",
+      "name": "trash-filled",
+      "font_class": "trash-filled",
+      "unicode": "e685",
+      "unicode_decimal": 59013
+    },
+    {
+      "icon_id": "24881281",
+      "name": "sound-filled",
+      "font_class": "sound-filled",
+      "unicode": "e686",
+      "unicode_decimal": 59014
+    },
+    {
+      "icon_id": "24881282",
+      "name": "trash",
+      "font_class": "trash",
+      "unicode": "e687",
+      "unicode_decimal": 59015
+    },
+    {
+      "icon_id": "24881284",
+      "name": "videocam-filled",
+      "font_class": "videocam-filled",
+      "unicode": "e689",
+      "unicode_decimal": 59017
+    },
+    {
+      "icon_id": "24881285",
+      "name": "spinner-cycle",
+      "font_class": "spinner-cycle",
+      "unicode": "e68a",
+      "unicode_decimal": 59018
+    },
+    {
+      "icon_id": "24881286",
+      "name": "weibo",
+      "font_class": "weibo",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
+      "icon_id": "24881288",
+      "name": "videocam",
+      "font_class": "videocam",
+      "unicode": "e68c",
+      "unicode_decimal": 59020
+    },
+    {
+      "icon_id": "24881289",
+      "name": "download",
+      "font_class": "download",
+      "unicode": "e68d",
+      "unicode_decimal": 59021
+    },
+    {
+      "icon_id": "24879601",
+      "name": "help",
+      "font_class": "help",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "24879602",
+      "name": "navigate-filled",
+      "font_class": "navigate-filled",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "24879603",
+      "name": "plusempty",
+      "font_class": "plusempty",
+      "unicode": "e67b",
+      "unicode_decimal": 59003
+    },
+    {
+      "icon_id": "24879604",
+      "name": "smallcircle",
+      "font_class": "smallcircle",
+      "unicode": "e67c",
+      "unicode_decimal": 59004
+    },
+    {
+      "icon_id": "24879605",
+      "name": "minus-filled",
+      "font_class": "minus-filled",
+      "unicode": "e67d",
+      "unicode_decimal": 59005
+    },
+    {
+      "icon_id": "24879606",
+      "name": "micoff",
+      "font_class": "micoff",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
+    {
+      "icon_id": "24879588",
+      "name": "closeempty",
+      "font_class": "closeempty",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "24879589",
+      "name": "clear",
+      "font_class": "clear",
+      "unicode": "e66d",
+      "unicode_decimal": 58989
+    },
+    {
+      "icon_id": "24879590",
+      "name": "navigate",
+      "font_class": "navigate",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "24879591",
+      "name": "minus",
+      "font_class": "minus",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "24879592",
+      "name": "image",
+      "font_class": "image",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "24879593",
+      "name": "mic",
+      "font_class": "mic",
+      "unicode": "e671",
+      "unicode_decimal": 58993
+    },
+    {
+      "icon_id": "24879594",
+      "name": "paperplane",
+      "font_class": "paperplane",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "24879595",
+      "name": "close",
+      "font_class": "close",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
+      "icon_id": "24879596",
+      "name": "help-filled",
+      "font_class": "help-filled",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "24879597",
+      "name": "plus-filled",
+      "font_class": "paperplane-filled",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
+    {
+      "icon_id": "24879598",
+      "name": "plus",
+      "font_class": "plus",
+      "unicode": "e676",
+      "unicode_decimal": 58998
+    },
+    {
+      "icon_id": "24879599",
+      "name": "mic-filled",
+      "font_class": "mic-filled",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    },
+    {
+      "icon_id": "24879600",
+      "name": "image-filled",
+      "font_class": "image-filled",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "24855900",
+      "name": "locked-filled",
+      "font_class": "locked-filled",
+      "unicode": "e668",
+      "unicode_decimal": 58984
+    },
+    {
+      "icon_id": "24855901",
+      "name": "info",
+      "font_class": "info",
+      "unicode": "e669",
+      "unicode_decimal": 58985
+    },
+    {
+      "icon_id": "24855903",
+      "name": "locked",
+      "font_class": "locked",
+      "unicode": "e66b",
+      "unicode_decimal": 58987
+    },
+    {
+      "icon_id": "24855884",
+      "name": "camera-filled",
+      "font_class": "camera-filled",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "24855885",
+      "name": "chat-filled",
+      "font_class": "chat-filled",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "24855886",
+      "name": "camera",
+      "font_class": "camera",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "24855887",
+      "name": "circle",
+      "font_class": "circle",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "24855888",
+      "name": "checkmarkempty",
+      "font_class": "checkmarkempty",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "24855889",
+      "name": "chat",
+      "font_class": "chat",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "24855890",
+      "name": "circle-filled",
+      "font_class": "circle-filled",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "24855891",
+      "name": "flag",
+      "font_class": "flag",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "24855892",
+      "name": "flag-filled",
+      "font_class": "flag-filled",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "24855893",
+      "name": "gear-filled",
+      "font_class": "gear-filled",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "24855894",
+      "name": "home",
+      "font_class": "home",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "24855895",
+      "name": "home-filled",
+      "font_class": "home-filled",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "24855896",
+      "name": "gear",
+      "font_class": "gear",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "24855897",
+      "name": "smallcircle-filled",
+      "font_class": "smallcircle-filled",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "24855898",
+      "name": "map-filled",
+      "font_class": "map-filled",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "24855899",
+      "name": "map",
+      "font_class": "map",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "24855825",
+      "name": "refresh-filled",
+      "font_class": "refresh-filled",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "24855826",
+      "name": "refresh",
+      "font_class": "refresh",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "24855808",
+      "name": "cloud-upload",
+      "font_class": "cloud-upload",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "24855809",
+      "name": "cloud-download-filled",
+      "font_class": "cloud-download-filled",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "24855810",
+      "name": "cloud-download",
+      "font_class": "cloud-download",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "24855811",
+      "name": "cloud-upload-filled",
+      "font_class": "cloud-upload-filled",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "24855813",
+      "name": "redo",
+      "font_class": "redo",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "24855814",
+      "name": "images-filled",
+      "font_class": "images-filled",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "24855815",
+      "name": "undo-filled",
+      "font_class": "undo-filled",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "24855816",
+      "name": "more",
+      "font_class": "more",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "24855817",
+      "name": "more-filled",
+      "font_class": "more-filled",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "24855818",
+      "name": "undo",
+      "font_class": "undo",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "24855819",
+      "name": "images",
+      "font_class": "images",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "24855821",
+      "name": "paperclip",
+      "font_class": "paperclip",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "24855822",
+      "name": "settings",
+      "font_class": "settings",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "24855823",
+      "name": "search",
+      "font_class": "search",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "24855824",
+      "name": "redo-filled",
+      "font_class": "redo-filled",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "24841702",
+      "name": "list",
+      "font_class": "list",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "24841489",
+      "name": "mail-open-filled",
+      "font_class": "mail-open-filled",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "24841491",
+      "name": "hand-thumbsdown-filled",
+      "font_class": "hand-down-filled",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "24841492",
+      "name": "hand-thumbsdown",
+      "font_class": "hand-down",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "24841493",
+      "name": "hand-thumbsup-filled",
+      "font_class": "hand-up-filled",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "24841494",
+      "name": "hand-thumbsup",
+      "font_class": "hand-up",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "24841496",
+      "name": "heart-filled",
+      "font_class": "heart-filled",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "24841498",
+      "name": "mail-open",
+      "font_class": "mail-open",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "24841488",
+      "name": "heart",
+      "font_class": "heart",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "24839963",
+      "name": "loop",
+      "font_class": "loop",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "24839866",
+      "name": "pulldown",
+      "font_class": "pulldown",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "24813798",
+      "name": "scan",
+      "font_class": "scan",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "24813786",
+      "name": "bars",
+      "font_class": "bars",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "24813788",
+      "name": "cart-filled",
+      "font_class": "cart-filled",
+      "unicode": "e629",
+      "unicode_decimal": 58921
+    },
+    {
+      "icon_id": "24813790",
+      "name": "checkbox",
+      "font_class": "checkbox",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "24813791",
+      "name": "checkbox-filled",
+      "font_class": "checkbox-filled",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "24813794",
+      "name": "shop",
+      "font_class": "shop",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "24813795",
+      "name": "headphones",
+      "font_class": "headphones",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "24813796",
+      "name": "cart",
+      "font_class": "cart",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    }
+  ]
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
new file mode 100644
index 0000000..a975b4a
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
@@ -0,0 +1,91 @@
+<template>
+	<text class="uni-icons" :style="styleObj">
+		<slot>{{unicode}}</slot>
+	</text>
+</template>
+
+<script>
+	import { fontData, IconsDataItem } from './uniicons_file'
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icon 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: "uni-icons",
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: Object,
+				default: 16
+			},
+			fontFamily: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {};
+		},
+		computed: {
+			unicode() : string {
+				let codes = fontData.find((item : IconsDataItem) : boolean => { return item.font_class == this.type })
+				if (codes !== null) {
+					return codes.unicode
+				}
+				return ''
+			},
+			iconSize() : string {
+				const size = this.size
+				if (typeof size == 'string') {
+					const reg = /^[0-9]*$/g
+					return reg.test(size as string) ? '' + size + 'px' : '' + size;
+					// return '' + this.size
+				}
+				return this.getFontSize(size as number)
+			},
+			styleObj() : UTSJSONObject {
+				if (this.fontFamily !== '') {
+					return { color: this.color, fontSize: this.iconSize, fontFamily: this.fontFamily }
+				}
+				return { color: this.color, fontSize: this.iconSize }
+			}
+		},
+		created() { },
+		methods: {
+			/**
+			 * 字体大小
+			 */
+			getFontSize(size : number) : string {
+				return size + 'px';
+			},
+		},
+	}
+</script>
+
+<style scoped>
+	@font-face {
+		font-family: UniIconsFontFamily;
+		src: url('./uniicons.ttf');
+	}
+
+	.uni-icons {
+		font-family: UniIconsFontFamily;
+		font-size: 18px;
+		font-style: normal;
+		color: #333;
+	}
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
new file mode 100644
index 0000000..9634a9c
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,110 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="styleObj" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="styleObj" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick">
+		<slot></slot>
+	</text>
+	<!-- #endif -->
+</template>
+
+<script>
+	import { fontData } from './uniicons_file_vue.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'
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('" + iconUrl + "')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: 'UniIcons',
+		emits: ['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customPrefix: {
+				type: String,
+				default: ''
+			},
+			fontFamily: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: fontData
+			}
+		},
+		computed: {
+			unicode() {
+				let code = this.icons.find(v => v.font_class === this.type)
+				if (code) {
+					return code.unicode
+				}
+				return ''
+			},
+			iconSize() {
+				return getVal(this.size)
+			},
+			styleObj() {
+				if (this.fontFamily !== '') {
+					return `color: ${this.color}; font-size: ${this.iconSize}; font-family: ${this.fontFamily};`
+				}
+				return `color: ${this.color}; font-size: ${this.iconSize};`
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	@import './uniicons.css';
+
+	@font-face {
+		font-family: uniicons;
+		src: url('./uniicons.ttf');
+	}
+
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uni.ttf b/uni_modules/uni-icons/components/uni-icons/uni.ttf
new file mode 100644
index 0000000..60a1968
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uni.ttf differ
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
new file mode 100644
index 0000000..0a6b6fe
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -0,0 +1,664 @@
+
+.uniui-cart-filled:before {
+  content: "\e6d0";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
+.uniui-color:before {
+  content: "\e6cf";
+}
+
+.uniui-wallet:before {
+  content: "\e6b1";
+}
+
+.uniui-settings-filled:before {
+  content: "\e6ce";
+}
+
+.uniui-auth-filled:before {
+  content: "\e6cc";
+}
+
+.uniui-shop-filled:before {
+  content: "\e6cd";
+}
+
+.uniui-staff-filled:before {
+  content: "\e6cb";
+}
+
+.uniui-vip-filled:before {
+  content: "\e6c6";
+}
+
+.uniui-plus-filled:before {
+  content: "\e6c7";
+}
+
+.uniui-folder-add-filled:before {
+  content: "\e6c8";
+}
+
+.uniui-color-filled:before {
+  content: "\e6c9";
+}
+
+.uniui-tune-filled:before {
+  content: "\e6ca";
+}
+
+.uniui-calendar-filled:before {
+  content: "\e6c0";
+}
+
+.uniui-notification-filled:before {
+  content: "\e6c1";
+}
+
+.uniui-wallet-filled:before {
+  content: "\e6c2";
+}
+
+.uniui-medal-filled:before {
+  content: "\e6c3";
+}
+
+.uniui-fire-filled:before {
+  content: "\e6c5";
+}
+
+.uniui-refreshempty:before {
+  content: "\e6bf";
+}
+
+.uniui-location-filled:before {
+  content: "\e6af";
+}
+
+.uniui-person-filled:before {
+  content: "\e69d";
+}
+
+.uniui-personadd-filled:before {
+  content: "\e698";
+}
+
+.uniui-arrowthinleft:before {
+  content: "\e6d2";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6d3";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6d4";
+}
+
+.uniui-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  content: "\e6bb";
+}
+
+.uniui-arrow-left:before {
+  content: "\e6bc";
+}
+
+.uniui-arrow-up:before {
+  content: "\e6bd";
+}
+
+.uniui-arrow-down:before {
+  content: "\e6be";
+}
+
+.uniui-arrowthinright:before {
+  content: "\e6d1";
+}
+
+.uniui-down:before {
+  content: "\e6b8";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowright:before {
+  content: "\e6d5";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-up:before {
+  content: "\e6b6";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowup:before {
+  content: "\e6d6";
+}
+
+.uniui-eye:before {
+  content: "\e651";
+}
+
+.uniui-eye-filled:before {
+  content: "\e66a";
+}
+
+.uniui-eye-slash:before {
+  content: "\e6b3";
+}
+
+.uniui-eye-slash-filled:before {
+  content: "\e6b4";
+}
+
+.uniui-info-filled:before {
+  content: "\e649";
+}
+
+.uniui-reload:before {
+  content: "\e6b2";
+}
+
+.uniui-micoff-filled:before {
+  content: "\e6b0";
+}
+
+.uniui-map-pin-ellipse:before {
+  content: "\e6ac";
+}
+
+.uniui-map-pin:before {
+  content: "\e6ad";
+}
+
+.uniui-location:before {
+  content: "\e6ae";
+}
+
+.uniui-starhalf:before {
+  content: "\e683";
+}
+
+.uniui-star:before {
+  content: "\e688";
+}
+
+.uniui-star-filled:before {
+  content: "\e68f";
+}
+
+.uniui-calendar:before {
+  content: "\e6a0";
+}
+
+.uniui-fire:before {
+  content: "\e6a1";
+}
+
+.uniui-medal:before {
+  content: "\e6a2";
+}
+
+.uniui-font:before {
+  content: "\e6a3";
+}
+
+.uniui-gift:before {
+  content: "\e6a4";
+}
+
+.uniui-link:before {
+  content: "\e6a5";
+}
+
+.uniui-notification:before {
+  content: "\e6a6";
+}
+
+.uniui-staff:before {
+  content: "\e6a7";
+}
+
+.uniui-vip:before {
+  content: "\e6a8";
+}
+
+.uniui-folder-add:before {
+  content: "\e6a9";
+}
+
+.uniui-tune:before {
+  content: "\e6aa";
+}
+
+.uniui-auth:before {
+  content: "\e6ab";
+}
+
+.uniui-person:before {
+  content: "\e699";
+}
+
+.uniui-email-filled:before {
+  content: "\e69a";
+}
+
+.uniui-phone-filled:before {
+  content: "\e69b";
+}
+
+.uniui-phone:before {
+  content: "\e69c";
+}
+
+.uniui-email:before {
+  content: "\e69e";
+}
+
+.uniui-personadd:before {
+  content: "\e69f";
+}
+
+.uniui-chatboxes-filled:before {
+  content: "\e692";
+}
+
+.uniui-contact:before {
+  content: "\e693";
+}
+
+.uniui-chatbubble-filled:before {
+  content: "\e694";
+}
+
+.uniui-contact-filled:before {
+  content: "\e695";
+}
+
+.uniui-chatboxes:before {
+  content: "\e696";
+}
+
+.uniui-chatbubble:before {
+  content: "\e697";
+}
+
+.uniui-upload-filled:before {
+  content: "\e68e";
+}
+
+.uniui-upload:before {
+  content: "\e690";
+}
+
+.uniui-weixin:before {
+  content: "\e691";
+}
+
+.uniui-compose:before {
+  content: "\e67f";
+}
+
+.uniui-qq:before {
+  content: "\e680";
+}
+
+.uniui-download-filled:before {
+  content: "\e681";
+}
+
+.uniui-pyq:before {
+  content: "\e682";
+}
+
+.uniui-sound:before {
+  content: "\e684";
+}
+
+.uniui-trash-filled:before {
+  content: "\e685";
+}
+
+.uniui-sound-filled:before {
+  content: "\e686";
+}
+
+.uniui-trash:before {
+  content: "\e687";
+}
+
+.uniui-videocam-filled:before {
+  content: "\e689";
+}
+
+.uniui-spinner-cycle:before {
+  content: "\e68a";
+}
+
+.uniui-weibo:before {
+  content: "\e68b";
+}
+
+.uniui-videocam:before {
+  content: "\e68c";
+}
+
+.uniui-download:before {
+  content: "\e68d";
+}
+
+.uniui-help:before {
+  content: "\e679";
+}
+
+.uniui-navigate-filled:before {
+  content: "\e67a";
+}
+
+.uniui-plusempty:before {
+  content: "\e67b";
+}
+
+.uniui-smallcircle:before {
+  content: "\e67c";
+}
+
+.uniui-minus-filled:before {
+  content: "\e67d";
+}
+
+.uniui-micoff:before {
+  content: "\e67e";
+}
+
+.uniui-closeempty:before {
+  content: "\e66c";
+}
+
+.uniui-clear:before {
+  content: "\e66d";
+}
+
+.uniui-navigate:before {
+  content: "\e66e";
+}
+
+.uniui-minus:before {
+  content: "\e66f";
+}
+
+.uniui-image:before {
+  content: "\e670";
+}
+
+.uniui-mic:before {
+  content: "\e671";
+}
+
+.uniui-paperplane:before {
+  content: "\e672";
+}
+
+.uniui-close:before {
+  content: "\e673";
+}
+
+.uniui-help-filled:before {
+  content: "\e674";
+}
+
+.uniui-paperplane-filled:before {
+  content: "\e675";
+}
+
+.uniui-plus:before {
+  content: "\e676";
+}
+
+.uniui-mic-filled:before {
+  content: "\e677";
+}
+
+.uniui-image-filled:before {
+  content: "\e678";
+}
+
+.uniui-locked-filled:before {
+  content: "\e668";
+}
+
+.uniui-info:before {
+  content: "\e669";
+}
+
+.uniui-locked:before {
+  content: "\e66b";
+}
+
+.uniui-camera-filled:before {
+  content: "\e658";
+}
+
+.uniui-chat-filled:before {
+  content: "\e659";
+}
+
+.uniui-camera:before {
+  content: "\e65a";
+}
+
+.uniui-circle:before {
+  content: "\e65b";
+}
+
+.uniui-checkmarkempty:before {
+  content: "\e65c";
+}
+
+.uniui-chat:before {
+  content: "\e65d";
+}
+
+.uniui-circle-filled:before {
+  content: "\e65e";
+}
+
+.uniui-flag:before {
+  content: "\e65f";
+}
+
+.uniui-flag-filled:before {
+  content: "\e660";
+}
+
+.uniui-gear-filled:before {
+  content: "\e661";
+}
+
+.uniui-home:before {
+  content: "\e662";
+}
+
+.uniui-home-filled:before {
+  content: "\e663";
+}
+
+.uniui-gear:before {
+  content: "\e664";
+}
+
+.uniui-smallcircle-filled:before {
+  content: "\e665";
+}
+
+.uniui-map-filled:before {
+  content: "\e666";
+}
+
+.uniui-map:before {
+  content: "\e667";
+}
+
+.uniui-refresh-filled:before {
+  content: "\e656";
+}
+
+.uniui-refresh:before {
+  content: "\e657";
+}
+
+.uniui-cloud-upload:before {
+  content: "\e645";
+}
+
+.uniui-cloud-download-filled:before {
+  content: "\e646";
+}
+
+.uniui-cloud-download:before {
+  content: "\e647";
+}
+
+.uniui-cloud-upload-filled:before {
+  content: "\e648";
+}
+
+.uniui-redo:before {
+  content: "\e64a";
+}
+
+.uniui-images-filled:before {
+  content: "\e64b";
+}
+
+.uniui-undo-filled:before {
+  content: "\e64c";
+}
+
+.uniui-more:before {
+  content: "\e64d";
+}
+
+.uniui-more-filled:before {
+  content: "\e64e";
+}
+
+.uniui-undo:before {
+  content: "\e64f";
+}
+
+.uniui-images:before {
+  content: "\e650";
+}
+
+.uniui-paperclip:before {
+  content: "\e652";
+}
+
+.uniui-settings:before {
+  content: "\e653";
+}
+
+.uniui-search:before {
+  content: "\e654";
+}
+
+.uniui-redo-filled:before {
+  content: "\e655";
+}
+
+.uniui-list:before {
+  content: "\e644";
+}
+
+.uniui-mail-open-filled:before {
+  content: "\e63a";
+}
+
+.uniui-hand-down-filled:before {
+  content: "\e63c";
+}
+
+.uniui-hand-down:before {
+  content: "\e63d";
+}
+
+.uniui-hand-up-filled:before {
+  content: "\e63e";
+}
+
+.uniui-hand-up:before {
+  content: "\e63f";
+}
+
+.uniui-heart-filled:before {
+  content: "\e641";
+}
+
+.uniui-mail-open:before {
+  content: "\e643";
+}
+
+.uniui-heart:before {
+  content: "\e639";
+}
+
+.uniui-loop:before {
+  content: "\e633";
+}
+
+.uniui-pulldown:before {
+  content: "\e632";
+}
+
+.uniui-scan:before {
+  content: "\e62a";
+}
+
+.uniui-bars:before {
+  content: "\e627";
+}
+
+.uniui-checkbox:before {
+  content: "\e62b";
+}
+
+.uniui-checkbox-filled:before {
+  content: "\e62c";
+}
+
+.uniui-shop:before {
+  content: "\e62f";
+}
+
+.uniui-headphones:before {
+  content: "\e630";
+}
+
+.uniui-cart:before {
+  content: "\e631";
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
new file mode 100644
index 0000000..14696d0
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf differ
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
new file mode 100644
index 0000000..86318df
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
@@ -0,0 +1,664 @@
+
+export type IconsData = {
+	id : string
+	name : string
+	font_family : string
+	css_prefix_text : string
+	description : string
+	glyphs : Array<IconsDataItem>
+}
+
+export type IconsDataItem = {
+	font_class : string
+	unicode : string
+}
+
+
+export const fontData = [
+  {
+    "font_class": "arrow-down",
+    "unicode": "\ue6be"
+  },
+  {
+    "font_class": "arrow-left",
+    "unicode": "\ue6bc"
+  },
+  {
+    "font_class": "arrow-right",
+    "unicode": "\ue6bb"
+  },
+  {
+    "font_class": "arrow-up",
+    "unicode": "\ue6bd"
+  },
+  {
+    "font_class": "auth",
+    "unicode": "\ue6ab"
+  },
+  {
+    "font_class": "auth-filled",
+    "unicode": "\ue6cc"
+  },
+  {
+    "font_class": "back",
+    "unicode": "\ue6b9"
+  },
+  {
+    "font_class": "bars",
+    "unicode": "\ue627"
+  },
+  {
+    "font_class": "calendar",
+    "unicode": "\ue6a0"
+  },
+  {
+    "font_class": "calendar-filled",
+    "unicode": "\ue6c0"
+  },
+  {
+    "font_class": "camera",
+    "unicode": "\ue65a"
+  },
+  {
+    "font_class": "camera-filled",
+    "unicode": "\ue658"
+  },
+  {
+    "font_class": "cart",
+    "unicode": "\ue631"
+  },
+  {
+    "font_class": "cart-filled",
+    "unicode": "\ue6d0"
+  },
+  {
+    "font_class": "chat",
+    "unicode": "\ue65d"
+  },
+  {
+    "font_class": "chat-filled",
+    "unicode": "\ue659"
+  },
+  {
+    "font_class": "chatboxes",
+    "unicode": "\ue696"
+  },
+  {
+    "font_class": "chatboxes-filled",
+    "unicode": "\ue692"
+  },
+  {
+    "font_class": "chatbubble",
+    "unicode": "\ue697"
+  },
+  {
+    "font_class": "chatbubble-filled",
+    "unicode": "\ue694"
+  },
+  {
+    "font_class": "checkbox",
+    "unicode": "\ue62b"
+  },
+  {
+    "font_class": "checkbox-filled",
+    "unicode": "\ue62c"
+  },
+  {
+    "font_class": "checkmarkempty",
+    "unicode": "\ue65c"
+  },
+  {
+    "font_class": "circle",
+    "unicode": "\ue65b"
+  },
+  {
+    "font_class": "circle-filled",
+    "unicode": "\ue65e"
+  },
+  {
+    "font_class": "clear",
+    "unicode": "\ue66d"
+  },
+  {
+    "font_class": "close",
+    "unicode": "\ue673"
+  },
+  {
+    "font_class": "closeempty",
+    "unicode": "\ue66c"
+  },
+  {
+    "font_class": "cloud-download",
+    "unicode": "\ue647"
+  },
+  {
+    "font_class": "cloud-download-filled",
+    "unicode": "\ue646"
+  },
+  {
+    "font_class": "cloud-upload",
+    "unicode": "\ue645"
+  },
+  {
+    "font_class": "cloud-upload-filled",
+    "unicode": "\ue648"
+  },
+  {
+    "font_class": "color",
+    "unicode": "\ue6cf"
+  },
+  {
+    "font_class": "color-filled",
+    "unicode": "\ue6c9"
+  },
+  {
+    "font_class": "compose",
+    "unicode": "\ue67f"
+  },
+  {
+    "font_class": "contact",
+    "unicode": "\ue693"
+  },
+  {
+    "font_class": "contact-filled",
+    "unicode": "\ue695"
+  },
+  {
+    "font_class": "down",
+    "unicode": "\ue6b8"
+  },
+	{
+	  "font_class": "bottom",
+	  "unicode": "\ue6b8"
+	},
+  {
+    "font_class": "download",
+    "unicode": "\ue68d"
+  },
+  {
+    "font_class": "download-filled",
+    "unicode": "\ue681"
+  },
+  {
+    "font_class": "email",
+    "unicode": "\ue69e"
+  },
+  {
+    "font_class": "email-filled",
+    "unicode": "\ue69a"
+  },
+  {
+    "font_class": "eye",
+    "unicode": "\ue651"
+  },
+  {
+    "font_class": "eye-filled",
+    "unicode": "\ue66a"
+  },
+  {
+    "font_class": "eye-slash",
+    "unicode": "\ue6b3"
+  },
+  {
+    "font_class": "eye-slash-filled",
+    "unicode": "\ue6b4"
+  },
+  {
+    "font_class": "fire",
+    "unicode": "\ue6a1"
+  },
+  {
+    "font_class": "fire-filled",
+    "unicode": "\ue6c5"
+  },
+  {
+    "font_class": "flag",
+    "unicode": "\ue65f"
+  },
+  {
+    "font_class": "flag-filled",
+    "unicode": "\ue660"
+  },
+  {
+    "font_class": "folder-add",
+    "unicode": "\ue6a9"
+  },
+  {
+    "font_class": "folder-add-filled",
+    "unicode": "\ue6c8"
+  },
+  {
+    "font_class": "font",
+    "unicode": "\ue6a3"
+  },
+  {
+    "font_class": "forward",
+    "unicode": "\ue6ba"
+  },
+  {
+    "font_class": "gear",
+    "unicode": "\ue664"
+  },
+  {
+    "font_class": "gear-filled",
+    "unicode": "\ue661"
+  },
+  {
+    "font_class": "gift",
+    "unicode": "\ue6a4"
+  },
+  {
+    "font_class": "gift-filled",
+    "unicode": "\ue6c4"
+  },
+  {
+    "font_class": "hand-down",
+    "unicode": "\ue63d"
+  },
+  {
+    "font_class": "hand-down-filled",
+    "unicode": "\ue63c"
+  },
+  {
+    "font_class": "hand-up",
+    "unicode": "\ue63f"
+  },
+  {
+    "font_class": "hand-up-filled",
+    "unicode": "\ue63e"
+  },
+  {
+    "font_class": "headphones",
+    "unicode": "\ue630"
+  },
+  {
+    "font_class": "heart",
+    "unicode": "\ue639"
+  },
+  {
+    "font_class": "heart-filled",
+    "unicode": "\ue641"
+  },
+  {
+    "font_class": "help",
+    "unicode": "\ue679"
+  },
+  {
+    "font_class": "help-filled",
+    "unicode": "\ue674"
+  },
+  {
+    "font_class": "home",
+    "unicode": "\ue662"
+  },
+  {
+    "font_class": "home-filled",
+    "unicode": "\ue663"
+  },
+  {
+    "font_class": "image",
+    "unicode": "\ue670"
+  },
+  {
+    "font_class": "image-filled",
+    "unicode": "\ue678"
+  },
+  {
+    "font_class": "images",
+    "unicode": "\ue650"
+  },
+  {
+    "font_class": "images-filled",
+    "unicode": "\ue64b"
+  },
+  {
+    "font_class": "info",
+    "unicode": "\ue669"
+  },
+  {
+    "font_class": "info-filled",
+    "unicode": "\ue649"
+  },
+  {
+    "font_class": "left",
+    "unicode": "\ue6b7"
+  },
+  {
+    "font_class": "link",
+    "unicode": "\ue6a5"
+  },
+  {
+    "font_class": "list",
+    "unicode": "\ue644"
+  },
+  {
+    "font_class": "location",
+    "unicode": "\ue6ae"
+  },
+  {
+    "font_class": "location-filled",
+    "unicode": "\ue6af"
+  },
+  {
+    "font_class": "locked",
+    "unicode": "\ue66b"
+  },
+  {
+    "font_class": "locked-filled",
+    "unicode": "\ue668"
+  },
+  {
+    "font_class": "loop",
+    "unicode": "\ue633"
+  },
+  {
+    "font_class": "mail-open",
+    "unicode": "\ue643"
+  },
+  {
+    "font_class": "mail-open-filled",
+    "unicode": "\ue63a"
+  },
+  {
+    "font_class": "map",
+    "unicode": "\ue667"
+  },
+  {
+    "font_class": "map-filled",
+    "unicode": "\ue666"
+  },
+  {
+    "font_class": "map-pin",
+    "unicode": "\ue6ad"
+  },
+  {
+    "font_class": "map-pin-ellipse",
+    "unicode": "\ue6ac"
+  },
+  {
+    "font_class": "medal",
+    "unicode": "\ue6a2"
+  },
+  {
+    "font_class": "medal-filled",
+    "unicode": "\ue6c3"
+  },
+  {
+    "font_class": "mic",
+    "unicode": "\ue671"
+  },
+  {
+    "font_class": "mic-filled",
+    "unicode": "\ue677"
+  },
+  {
+    "font_class": "micoff",
+    "unicode": "\ue67e"
+  },
+  {
+    "font_class": "micoff-filled",
+    "unicode": "\ue6b0"
+  },
+  {
+    "font_class": "minus",
+    "unicode": "\ue66f"
+  },
+  {
+    "font_class": "minus-filled",
+    "unicode": "\ue67d"
+  },
+  {
+    "font_class": "more",
+    "unicode": "\ue64d"
+  },
+  {
+    "font_class": "more-filled",
+    "unicode": "\ue64e"
+  },
+  {
+    "font_class": "navigate",
+    "unicode": "\ue66e"
+  },
+  {
+    "font_class": "navigate-filled",
+    "unicode": "\ue67a"
+  },
+  {
+    "font_class": "notification",
+    "unicode": "\ue6a6"
+  },
+  {
+    "font_class": "notification-filled",
+    "unicode": "\ue6c1"
+  },
+  {
+    "font_class": "paperclip",
+    "unicode": "\ue652"
+  },
+  {
+    "font_class": "paperplane",
+    "unicode": "\ue672"
+  },
+  {
+    "font_class": "paperplane-filled",
+    "unicode": "\ue675"
+  },
+  {
+    "font_class": "person",
+    "unicode": "\ue699"
+  },
+  {
+    "font_class": "person-filled",
+    "unicode": "\ue69d"
+  },
+  {
+    "font_class": "personadd",
+    "unicode": "\ue69f"
+  },
+  {
+    "font_class": "personadd-filled",
+    "unicode": "\ue698"
+  },
+  {
+    "font_class": "personadd-filled-copy",
+    "unicode": "\ue6d1"
+  },
+  {
+    "font_class": "phone",
+    "unicode": "\ue69c"
+  },
+  {
+    "font_class": "phone-filled",
+    "unicode": "\ue69b"
+  },
+  {
+    "font_class": "plus",
+    "unicode": "\ue676"
+  },
+  {
+    "font_class": "plus-filled",
+    "unicode": "\ue6c7"
+  },
+  {
+    "font_class": "plusempty",
+    "unicode": "\ue67b"
+  },
+  {
+    "font_class": "pulldown",
+    "unicode": "\ue632"
+  },
+  {
+    "font_class": "pyq",
+    "unicode": "\ue682"
+  },
+  {
+    "font_class": "qq",
+    "unicode": "\ue680"
+  },
+  {
+    "font_class": "redo",
+    "unicode": "\ue64a"
+  },
+  {
+    "font_class": "redo-filled",
+    "unicode": "\ue655"
+  },
+  {
+    "font_class": "refresh",
+    "unicode": "\ue657"
+  },
+  {
+    "font_class": "refresh-filled",
+    "unicode": "\ue656"
+  },
+  {
+    "font_class": "refreshempty",
+    "unicode": "\ue6bf"
+  },
+  {
+    "font_class": "reload",
+    "unicode": "\ue6b2"
+  },
+  {
+    "font_class": "right",
+    "unicode": "\ue6b5"
+  },
+  {
+    "font_class": "scan",
+    "unicode": "\ue62a"
+  },
+  {
+    "font_class": "search",
+    "unicode": "\ue654"
+  },
+  {
+    "font_class": "settings",
+    "unicode": "\ue653"
+  },
+  {
+    "font_class": "settings-filled",
+    "unicode": "\ue6ce"
+  },
+  {
+    "font_class": "shop",
+    "unicode": "\ue62f"
+  },
+  {
+    "font_class": "shop-filled",
+    "unicode": "\ue6cd"
+  },
+  {
+    "font_class": "smallcircle",
+    "unicode": "\ue67c"
+  },
+  {
+    "font_class": "smallcircle-filled",
+    "unicode": "\ue665"
+  },
+  {
+    "font_class": "sound",
+    "unicode": "\ue684"
+  },
+  {
+    "font_class": "sound-filled",
+    "unicode": "\ue686"
+  },
+  {
+    "font_class": "spinner-cycle",
+    "unicode": "\ue68a"
+  },
+  {
+    "font_class": "staff",
+    "unicode": "\ue6a7"
+  },
+  {
+    "font_class": "staff-filled",
+    "unicode": "\ue6cb"
+  },
+  {
+    "font_class": "star",
+    "unicode": "\ue688"
+  },
+  {
+    "font_class": "star-filled",
+    "unicode": "\ue68f"
+  },
+  {
+    "font_class": "starhalf",
+    "unicode": "\ue683"
+  },
+  {
+    "font_class": "trash",
+    "unicode": "\ue687"
+  },
+  {
+    "font_class": "trash-filled",
+    "unicode": "\ue685"
+  },
+  {
+    "font_class": "tune",
+    "unicode": "\ue6aa"
+  },
+  {
+    "font_class": "tune-filled",
+    "unicode": "\ue6ca"
+  },
+  {
+    "font_class": "undo",
+    "unicode": "\ue64f"
+  },
+  {
+    "font_class": "undo-filled",
+    "unicode": "\ue64c"
+  },
+  {
+    "font_class": "up",
+    "unicode": "\ue6b6"
+  },
+	{
+	  "font_class": "top",
+	  "unicode": "\ue6b6"
+	},
+  {
+    "font_class": "upload",
+    "unicode": "\ue690"
+  },
+  {
+    "font_class": "upload-filled",
+    "unicode": "\ue68e"
+  },
+  {
+    "font_class": "videocam",
+    "unicode": "\ue68c"
+  },
+  {
+    "font_class": "videocam-filled",
+    "unicode": "\ue689"
+  },
+  {
+    "font_class": "vip",
+    "unicode": "\ue6a8"
+  },
+  {
+    "font_class": "vip-filled",
+    "unicode": "\ue6c6"
+  },
+  {
+    "font_class": "wallet",
+    "unicode": "\ue6b1"
+  },
+  {
+    "font_class": "wallet-filled",
+    "unicode": "\ue6c2"
+  },
+  {
+    "font_class": "weibo",
+    "unicode": "\ue68b"
+  },
+  {
+    "font_class": "weixin",
+    "unicode": "\ue691"
+  }
+] as IconsDataItem[]
+
+// export const fontData = JSON.parse<IconsDataItem>(fontDataJson)
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js b/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js
new file mode 100644
index 0000000..49e42cd
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js
@@ -0,0 +1,649 @@
+
+export const fontData = [
+  {
+    "font_class": "arrow-down",
+    "unicode": "\ue6be"
+  },
+  {
+    "font_class": "arrow-left",
+    "unicode": "\ue6bc"
+  },
+  {
+    "font_class": "arrow-right",
+    "unicode": "\ue6bb"
+  },
+  {
+    "font_class": "arrow-up",
+    "unicode": "\ue6bd"
+  },
+  {
+    "font_class": "auth",
+    "unicode": "\ue6ab"
+  },
+  {
+    "font_class": "auth-filled",
+    "unicode": "\ue6cc"
+  },
+  {
+    "font_class": "back",
+    "unicode": "\ue6b9"
+  },
+  {
+    "font_class": "bars",
+    "unicode": "\ue627"
+  },
+  {
+    "font_class": "calendar",
+    "unicode": "\ue6a0"
+  },
+  {
+    "font_class": "calendar-filled",
+    "unicode": "\ue6c0"
+  },
+  {
+    "font_class": "camera",
+    "unicode": "\ue65a"
+  },
+  {
+    "font_class": "camera-filled",
+    "unicode": "\ue658"
+  },
+  {
+    "font_class": "cart",
+    "unicode": "\ue631"
+  },
+  {
+    "font_class": "cart-filled",
+    "unicode": "\ue6d0"
+  },
+  {
+    "font_class": "chat",
+    "unicode": "\ue65d"
+  },
+  {
+    "font_class": "chat-filled",
+    "unicode": "\ue659"
+  },
+  {
+    "font_class": "chatboxes",
+    "unicode": "\ue696"
+  },
+  {
+    "font_class": "chatboxes-filled",
+    "unicode": "\ue692"
+  },
+  {
+    "font_class": "chatbubble",
+    "unicode": "\ue697"
+  },
+  {
+    "font_class": "chatbubble-filled",
+    "unicode": "\ue694"
+  },
+  {
+    "font_class": "checkbox",
+    "unicode": "\ue62b"
+  },
+  {
+    "font_class": "checkbox-filled",
+    "unicode": "\ue62c"
+  },
+  {
+    "font_class": "checkmarkempty",
+    "unicode": "\ue65c"
+  },
+  {
+    "font_class": "circle",
+    "unicode": "\ue65b"
+  },
+  {
+    "font_class": "circle-filled",
+    "unicode": "\ue65e"
+  },
+  {
+    "font_class": "clear",
+    "unicode": "\ue66d"
+  },
+  {
+    "font_class": "close",
+    "unicode": "\ue673"
+  },
+  {
+    "font_class": "closeempty",
+    "unicode": "\ue66c"
+  },
+  {
+    "font_class": "cloud-download",
+    "unicode": "\ue647"
+  },
+  {
+    "font_class": "cloud-download-filled",
+    "unicode": "\ue646"
+  },
+  {
+    "font_class": "cloud-upload",
+    "unicode": "\ue645"
+  },
+  {
+    "font_class": "cloud-upload-filled",
+    "unicode": "\ue648"
+  },
+  {
+    "font_class": "color",
+    "unicode": "\ue6cf"
+  },
+  {
+    "font_class": "color-filled",
+    "unicode": "\ue6c9"
+  },
+  {
+    "font_class": "compose",
+    "unicode": "\ue67f"
+  },
+  {
+    "font_class": "contact",
+    "unicode": "\ue693"
+  },
+  {
+    "font_class": "contact-filled",
+    "unicode": "\ue695"
+  },
+  {
+    "font_class": "down",
+    "unicode": "\ue6b8"
+  },
+	{
+	  "font_class": "bottom",
+	  "unicode": "\ue6b8"
+	},
+  {
+    "font_class": "download",
+    "unicode": "\ue68d"
+  },
+  {
+    "font_class": "download-filled",
+    "unicode": "\ue681"
+  },
+  {
+    "font_class": "email",
+    "unicode": "\ue69e"
+  },
+  {
+    "font_class": "email-filled",
+    "unicode": "\ue69a"
+  },
+  {
+    "font_class": "eye",
+    "unicode": "\ue651"
+  },
+  {
+    "font_class": "eye-filled",
+    "unicode": "\ue66a"
+  },
+  {
+    "font_class": "eye-slash",
+    "unicode": "\ue6b3"
+  },
+  {
+    "font_class": "eye-slash-filled",
+    "unicode": "\ue6b4"
+  },
+  {
+    "font_class": "fire",
+    "unicode": "\ue6a1"
+  },
+  {
+    "font_class": "fire-filled",
+    "unicode": "\ue6c5"
+  },
+  {
+    "font_class": "flag",
+    "unicode": "\ue65f"
+  },
+  {
+    "font_class": "flag-filled",
+    "unicode": "\ue660"
+  },
+  {
+    "font_class": "folder-add",
+    "unicode": "\ue6a9"
+  },
+  {
+    "font_class": "folder-add-filled",
+    "unicode": "\ue6c8"
+  },
+  {
+    "font_class": "font",
+    "unicode": "\ue6a3"
+  },
+  {
+    "font_class": "forward",
+    "unicode": "\ue6ba"
+  },
+  {
+    "font_class": "gear",
+    "unicode": "\ue664"
+  },
+  {
+    "font_class": "gear-filled",
+    "unicode": "\ue661"
+  },
+  {
+    "font_class": "gift",
+    "unicode": "\ue6a4"
+  },
+  {
+    "font_class": "gift-filled",
+    "unicode": "\ue6c4"
+  },
+  {
+    "font_class": "hand-down",
+    "unicode": "\ue63d"
+  },
+  {
+    "font_class": "hand-down-filled",
+    "unicode": "\ue63c"
+  },
+  {
+    "font_class": "hand-up",
+    "unicode": "\ue63f"
+  },
+  {
+    "font_class": "hand-up-filled",
+    "unicode": "\ue63e"
+  },
+  {
+    "font_class": "headphones",
+    "unicode": "\ue630"
+  },
+  {
+    "font_class": "heart",
+    "unicode": "\ue639"
+  },
+  {
+    "font_class": "heart-filled",
+    "unicode": "\ue641"
+  },
+  {
+    "font_class": "help",
+    "unicode": "\ue679"
+  },
+  {
+    "font_class": "help-filled",
+    "unicode": "\ue674"
+  },
+  {
+    "font_class": "home",
+    "unicode": "\ue662"
+  },
+  {
+    "font_class": "home-filled",
+    "unicode": "\ue663"
+  },
+  {
+    "font_class": "image",
+    "unicode": "\ue670"
+  },
+  {
+    "font_class": "image-filled",
+    "unicode": "\ue678"
+  },
+  {
+    "font_class": "images",
+    "unicode": "\ue650"
+  },
+  {
+    "font_class": "images-filled",
+    "unicode": "\ue64b"
+  },
+  {
+    "font_class": "info",
+    "unicode": "\ue669"
+  },
+  {
+    "font_class": "info-filled",
+    "unicode": "\ue649"
+  },
+  {
+    "font_class": "left",
+    "unicode": "\ue6b7"
+  },
+  {
+    "font_class": "link",
+    "unicode": "\ue6a5"
+  },
+  {
+    "font_class": "list",
+    "unicode": "\ue644"
+  },
+  {
+    "font_class": "location",
+    "unicode": "\ue6ae"
+  },
+  {
+    "font_class": "location-filled",
+    "unicode": "\ue6af"
+  },
+  {
+    "font_class": "locked",
+    "unicode": "\ue66b"
+  },
+  {
+    "font_class": "locked-filled",
+    "unicode": "\ue668"
+  },
+  {
+    "font_class": "loop",
+    "unicode": "\ue633"
+  },
+  {
+    "font_class": "mail-open",
+    "unicode": "\ue643"
+  },
+  {
+    "font_class": "mail-open-filled",
+    "unicode": "\ue63a"
+  },
+  {
+    "font_class": "map",
+    "unicode": "\ue667"
+  },
+  {
+    "font_class": "map-filled",
+    "unicode": "\ue666"
+  },
+  {
+    "font_class": "map-pin",
+    "unicode": "\ue6ad"
+  },
+  {
+    "font_class": "map-pin-ellipse",
+    "unicode": "\ue6ac"
+  },
+  {
+    "font_class": "medal",
+    "unicode": "\ue6a2"
+  },
+  {
+    "font_class": "medal-filled",
+    "unicode": "\ue6c3"
+  },
+  {
+    "font_class": "mic",
+    "unicode": "\ue671"
+  },
+  {
+    "font_class": "mic-filled",
+    "unicode": "\ue677"
+  },
+  {
+    "font_class": "micoff",
+    "unicode": "\ue67e"
+  },
+  {
+    "font_class": "micoff-filled",
+    "unicode": "\ue6b0"
+  },
+  {
+    "font_class": "minus",
+    "unicode": "\ue66f"
+  },
+  {
+    "font_class": "minus-filled",
+    "unicode": "\ue67d"
+  },
+  {
+    "font_class": "more",
+    "unicode": "\ue64d"
+  },
+  {
+    "font_class": "more-filled",
+    "unicode": "\ue64e"
+  },
+  {
+    "font_class": "navigate",
+    "unicode": "\ue66e"
+  },
+  {
+    "font_class": "navigate-filled",
+    "unicode": "\ue67a"
+  },
+  {
+    "font_class": "notification",
+    "unicode": "\ue6a6"
+  },
+  {
+    "font_class": "notification-filled",
+    "unicode": "\ue6c1"
+  },
+  {
+    "font_class": "paperclip",
+    "unicode": "\ue652"
+  },
+  {
+    "font_class": "paperplane",
+    "unicode": "\ue672"
+  },
+  {
+    "font_class": "paperplane-filled",
+    "unicode": "\ue675"
+  },
+  {
+    "font_class": "person",
+    "unicode": "\ue699"
+  },
+  {
+    "font_class": "person-filled",
+    "unicode": "\ue69d"
+  },
+  {
+    "font_class": "personadd",
+    "unicode": "\ue69f"
+  },
+  {
+    "font_class": "personadd-filled",
+    "unicode": "\ue698"
+  },
+  {
+    "font_class": "personadd-filled-copy",
+    "unicode": "\ue6d1"
+  },
+  {
+    "font_class": "phone",
+    "unicode": "\ue69c"
+  },
+  {
+    "font_class": "phone-filled",
+    "unicode": "\ue69b"
+  },
+  {
+    "font_class": "plus",
+    "unicode": "\ue676"
+  },
+  {
+    "font_class": "plus-filled",
+    "unicode": "\ue6c7"
+  },
+  {
+    "font_class": "plusempty",
+    "unicode": "\ue67b"
+  },
+  {
+    "font_class": "pulldown",
+    "unicode": "\ue632"
+  },
+  {
+    "font_class": "pyq",
+    "unicode": "\ue682"
+  },
+  {
+    "font_class": "qq",
+    "unicode": "\ue680"
+  },
+  {
+    "font_class": "redo",
+    "unicode": "\ue64a"
+  },
+  {
+    "font_class": "redo-filled",
+    "unicode": "\ue655"
+  },
+  {
+    "font_class": "refresh",
+    "unicode": "\ue657"
+  },
+  {
+    "font_class": "refresh-filled",
+    "unicode": "\ue656"
+  },
+  {
+    "font_class": "refreshempty",
+    "unicode": "\ue6bf"
+  },
+  {
+    "font_class": "reload",
+    "unicode": "\ue6b2"
+  },
+  {
+    "font_class": "right",
+    "unicode": "\ue6b5"
+  },
+  {
+    "font_class": "scan",
+    "unicode": "\ue62a"
+  },
+  {
+    "font_class": "search",
+    "unicode": "\ue654"
+  },
+  {
+    "font_class": "settings",
+    "unicode": "\ue653"
+  },
+  {
+    "font_class": "settings-filled",
+    "unicode": "\ue6ce"
+  },
+  {
+    "font_class": "shop",
+    "unicode": "\ue62f"
+  },
+  {
+    "font_class": "shop-filled",
+    "unicode": "\ue6cd"
+  },
+  {
+    "font_class": "smallcircle",
+    "unicode": "\ue67c"
+  },
+  {
+    "font_class": "smallcircle-filled",
+    "unicode": "\ue665"
+  },
+  {
+    "font_class": "sound",
+    "unicode": "\ue684"
+  },
+  {
+    "font_class": "sound-filled",
+    "unicode": "\ue686"
+  },
+  {
+    "font_class": "spinner-cycle",
+    "unicode": "\ue68a"
+  },
+  {
+    "font_class": "staff",
+    "unicode": "\ue6a7"
+  },
+  {
+    "font_class": "staff-filled",
+    "unicode": "\ue6cb"
+  },
+  {
+    "font_class": "star",
+    "unicode": "\ue688"
+  },
+  {
+    "font_class": "star-filled",
+    "unicode": "\ue68f"
+  },
+  {
+    "font_class": "starhalf",
+    "unicode": "\ue683"
+  },
+  {
+    "font_class": "trash",
+    "unicode": "\ue687"
+  },
+  {
+    "font_class": "trash-filled",
+    "unicode": "\ue685"
+  },
+  {
+    "font_class": "tune",
+    "unicode": "\ue6aa"
+  },
+  {
+    "font_class": "tune-filled",
+    "unicode": "\ue6ca"
+  },
+  {
+    "font_class": "undo",
+    "unicode": "\ue64f"
+  },
+  {
+    "font_class": "undo-filled",
+    "unicode": "\ue64c"
+  },
+  {
+    "font_class": "up",
+    "unicode": "\ue6b6"
+  },
+	{
+	  "font_class": "top",
+	  "unicode": "\ue6b6"
+	},
+  {
+    "font_class": "upload",
+    "unicode": "\ue690"
+  },
+  {
+    "font_class": "upload-filled",
+    "unicode": "\ue68e"
+  },
+  {
+    "font_class": "videocam",
+    "unicode": "\ue68c"
+  },
+  {
+    "font_class": "videocam-filled",
+    "unicode": "\ue689"
+  },
+  {
+    "font_class": "vip",
+    "unicode": "\ue6a8"
+  },
+  {
+    "font_class": "vip-filled",
+    "unicode": "\ue6c6"
+  },
+  {
+    "font_class": "wallet",
+    "unicode": "\ue6b1"
+  },
+  {
+    "font_class": "wallet-filled",
+    "unicode": "\ue6c2"
+  },
+  {
+    "font_class": "weibo",
+    "unicode": "\ue68b"
+  },
+  {
+    "font_class": "weixin",
+    "unicode": "\ue691"
+  }
+]
+
+// export const fontData = JSON.parse<IconsDataItem>(fontDataJson)
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
new file mode 100644
index 0000000..397be83
--- /dev/null
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "2.0.9",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y",
+          "app-uvue": "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",
+					"快手": "y",
+					"飞书": "y",
+					"京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-icons/readme.md b/uni_modules/uni-icons/readme.md
new file mode 100644
index 0000000..86234ba
--- /dev/null
+++ b/uni_modules/uni-icons/readme.md
@@ -0,0 +1,8 @@
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+用于展示 icons 图标 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-id/changelog.md b/uni_modules/uni-id/changelog.md
new file mode 100644
index 0000000..2f523bb
--- /dev/null
+++ b/uni_modules/uni-id/changelog.md
@@ -0,0 +1,111 @@
+## 3.3.28（2022-07-27）
+- 修复 app端微信登录返回的accessToken过期时间（expired）不正确的Bug
+## 3.3.27（2022-07-27）
+- 短信发送失败、微信登录失败等场景下输出原始错误方便排查错误
+## 3.3.26（2022-07-08）
+- 兼容配置放在uni-id下的逻辑，但是仍推荐使用uni-config-center
+## 3.3.25（2022-06-30）
+- 修复config文件不合法时未抛出具体错误的Bug
+## 3.3.24（2022-06-28）
+- 修复3.3.12引出的使用多应用配置时报错的Bug
+## 3.3.23（2022-06-13）
+- 修复上版本引出的部分依赖未找到的Bug
+## 3.3.22（2022-06-13）
+- 新增 preferedWebPlatform 配置用于解决HBuilderX 3.4.9版本起web端platform不一致的问题 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=prefered-web-platform)
+## 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
+## 3.3.11（2022-01-11）
+- 修复用户名密码登录时多个应用出现重复用户名登录报错的Bug
+## 3.3.10（2022-01-07）
+- 新增 自定义国际化语言支持 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=custom-i8n)
+- 修复 一键登录时未校验重复手机号是否已验证的Bug
+- 修复 Apple登录时用户邮箱为空时报错的Bug
+- 修复 登录接口未传username时错误提示不正确的Bug
+## 3.3.9（2021-11-09）
+- 去除重复的context.xxx未找到的提示语
+## 3.3.8（2021-10-28）
+- 新增 用户账户封禁接口 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=ban-account)
+- 新增 用户账户注销接口 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=close-account)
+- 修复 未传appid时用户重复注册的Bug
+## 3.3.7（2021-10-08）
+- 移除部分接口的废弃提示
+## 3.3.6（2021-09-08）
+- 修复 邀请码可能重复的Bug
+## 3.3.5（2021-08-10）
+- 修复版本号错误
+## 3.3.4（2021-08-10）
+- 微信、QQ、支付宝登录新增type参数用于指定当前是登录还是注册
+## 3.3.3（2021-08-04）
+- 修复使用数组形式的配置文件报错的Bug
+## 3.3.2（2021-08-03）
+- 修复上3.3.0版本引出的createInstance接口传入配置不生效的Bug 感谢[hmh](https://gitee.com/hmh)
+## 3.3.1（2021-07-30）
+- 修复 将设置用户允许登录的应用列表时传入空数组报错的Bug
+## 3.3.0（2021-07-30）
+- 新增 不同端应用配置隔离 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=isolate-config)
+- 新增 不同端用户隔离 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=isolate-user)
+  + 此版本升级需要开发者处理一下用户数据，请参考 [补齐用户dcloud_appid字段](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=makeup-dcloud-appid)
+- 新增 QQ登录、注册相关功能 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=qq)
+- 调整 不再支持绑定手机、邮箱时不填验证码直接绑定
+## 3.2.1（2021-07-09）
+- 撤销3.2.0版本所做的调整
+## 3.2.0（2021-07-09）
+- 【重要】支持不同端（管理端、用户端等）用户隔离 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=isolate-user)
+- 支持不同端（管理端、用户端等）配置文件隔离 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=isolate-config)
+## 3.1.3（2021-07-08）
+- 移除插件内误传的node_modules
+## 3.1.2（2021-07-08）
+- 修复 微信小程序绑定微信账号时报错的Bug
+## 3.1.1（2021-07-01）
+- 使用新的错误码规范，兼容旧版 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=errcode)
+- 修复微信登录、绑定时未返回用户accessToken的Bug
+## 3.1.0（2021-04-19）
+- 增加对用户名、邮箱、密码字段的两端去空格
+- 默认忽略用户名、邮箱的大小写 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=case-sensitive)
+- 修复 customToken导出async方法报错的Bug
+## 3.0.12（2021-04-13）
+- 调整bindTokenToDevice默认值为false
+## 3.0.11（2021-04-12）
+- 修复3.0.7版本引出的多个用户访问时可能出现30201报错的Bug
+## 3.0.10（2021-04-08）
+- 优化错误提示
+## 3.0.9（2021-04-08）
+- bindMobile接口支持通过一键登录的方式绑定
+- 优化错误提示
+## 3.0.8（2021-03-19）
+- 修复 3.0.7版本某些情况下生成token报错的Bug
+## 3.0.7（2021-03-19）
+- 新增 支持uni-config-center，更新uni-id无须再担心配置被覆盖 [详情](https://uniapp.dcloud.io/uniCloud/uni-id?id=uni-config-center)
+- 新增 自定义token内容，可以缓存角色权限之外的更多信息到客户端 [详情](https://uniapp.dcloud.io/uniCloud/uni-id?id=custom-token)
+- 新增 支持传入context获取uni-id实例，防止单实例多并发时全局context混乱 [详情](https://uniapp.dcloud.io/uniCloud/uni-id?id=create-instance)
+## 3.0.6（2021-03-05）
+- 新增[uniID.wxBizDataCrypt](https://uniapp.dcloud.io/uniCloud/uni-id?id=%e5%be%ae%e4%bf%a1%e6%95%b0%e6%8d%ae%e8%a7%a3%e5%af%86)方法
+- 优化loginByApple方法，提高接口响应速度
+## 3.0.5（2021-02-03）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-id/package.json b/uni_modules/uni-id/package.json
new file mode 100644
index 0000000..144a9f1
--- /dev/null
+++ b/uni_modules/uni-id/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-id",
+  "displayName": "uni-id",
+  "version": "3.3.28",
+  "description": "简单、统一、可扩展的用户中心",
+  "keywords": [
+    "uniid",
+    "uni-id",
+    "用户管理",
+    "用户中心",
+    "短信验证码"
+],
+  "repository": "https://gitee.com/dcloud/uni-id.git",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "unicloud-template-function"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-config-center"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "钉钉": "u",
+        "快手": "u",
+        "飞书": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-id/readme.md b/uni_modules/uni-id/readme.md
new file mode 100644
index 0000000..6890121
--- /dev/null
+++ b/uni_modules/uni-id/readme.md
@@ -0,0 +1,33 @@
+**文档已移至[uni-id文档](https://uniapp.dcloud.net.cn/uniCloud/uni-id)**
+
+> 一般uni-id升级大版本时为不兼容更新，从低版本迁移到高版本请参考：[uni-id迁移指南](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=migration)
+
+## 重要升级说明
+
+**uni-id 3.x版本，搭配的uniCloud admin版本需大于1.2.10。**
+
+### 缓存角色权限
+
+自`uni-id 3.0.0`起，支持在token内缓存用户的角色权限，默认开启此功能，各登录接口的needPermission参数不再生效。如需关闭请在config内配置`"removePermissionAndRoleFromToken": true`。
+
+为什么要缓存角色权限？要知道云数据库是按照读写次数来收取费用的，并且读写数据库会拖慢接口响应速度。未配置`"removePermissionAndRoleFromToken": true`的情况下，可以在调用checkToken接口时不查询数据库获取用户角色权限。
+
+详细checkToken流程如下：
+
+![](https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/ed45d350-5a4d-11eb-b997-9918a5dda011.jpg)
+
+可以看出，旧版token（removePermissionAndRoleFromToken为true时生成的）在checkToken时如需返回权限需要进行两次数据库查询。新版token不需要查库即可返回权限信息。
+
+**注意**
+
+- 由于角色权限缓存在token内，可能会存在权限已经更新但是用户token未过期之前依然是旧版角色权限的情况。可以调短一些token过期时间来减少这种情况的影响。
+- admin角色token内不包含permission，如需自行判断用户是否有某个权限，要注意admin角色需要额外判断一下，写法如下
+  ```js
+  const {
+    role,
+    permission
+  } = await uniID.checkToken(event.uniIdToken)
+  if(role.includes('admin') || permission.includes('your permission id')) {
+    // 当前角色拥有'your permission id'对应的权限
+  }
+  ```
\ No newline at end of file
diff --git a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/LICENSE.md b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/LICENSE.md
new file mode 100644
index 0000000..29f81d8
--- /dev/null
+++ b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/LICENSE.md
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
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
new file mode 100644
index 0000000..5003d30
--- /dev/null
+++ b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/index.js
@@ -0,0 +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_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 I(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 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=I(n,r.args);let i=await e[t](n);return i=I(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()+1e3*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 W 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 J(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 Se(be);if("object"!=typeof e)throw Se(be);if("string"!=typeof e.type)throw Se(be);if("string"!=typeof e.asymmetricKeyType)throw Se(be);if("function"!=typeof e.export)throw Se(be)}}function Ce(e){if(!ve.isBuffer(e)&&"string"!=typeof e&&"object"!=typeof e)throw Se("key must be a string, a buffer or an object")}function Ae(e){return e.replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")}function Ie(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 Se(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 Se(_e);if("object"!=typeof e)throw Se(_e);if("secret"!==e.type)throw Se(_e);if("function"!=typeof e.export)throw Se(_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=Ie(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=Ie(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 Se('"%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 We(e){return e.split(".")[2]}function Je(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=We(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||{},!Je(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:We(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=Je,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 I=s++;o[I]="[v=\\s]*("+o[E]+")(?:\\.("+o[E]+")(?:\\.("+o[E]+")(?:"+o[h]+")?"+o[y]+"?)?)?";var S=s++;o[S]="^"+o[T]+"\\s*"+o[A]+"$";var x=s++;o[x]="^"+o[T]+"\\s*"+o[I]+"$";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[I]+"$";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[I]+"$";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[I]+")\\s+-\\s+("+o[I]+")\\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(J(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 W(e,t,r){return Y(e,t,r)<0}function J(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 J(e,r,n);case"!=":return Z(e,r,n);case">":return z(e,r,n);case">=":return ee(e,r,n);case"<":return W(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=W,t.eq=J,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=W,a=">",c=">=";break;case"<":i=W,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[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[$],"")}(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,It=/^0o[0-7]+$/i,St=/^(?: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||St.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||It.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,Wt=/^0b[01]+$/i,Jt=/^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=Wt.test(e);return r||Jt.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 Ir={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'}},Sr={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(Sr,!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(Ir,!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=J(i),o=J(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,S(G,e)},Nr=function(e={}){return e.appId=e.appid,e.secret=e.appsecret,S(X,e)},Ur=function(e={}){return e.appId=e.appid,S(W,e)},Lr=function(e={}){return S(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 Wr=uniCloud.database();const Jr=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=Wr.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=Jr.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 console.error(e),{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 console.error(e),{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 console.error(e),{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 console.error(e),{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)throw new Error(`Config for current app (${o}) was not found, please check your config file or client appId`);if("app"===s||"app-plus"===s?r.PLATFORM=a.preferedAppPlatform||s:"web"!==s&&"h5"!==s||(r.PLATFORM=a.preferedWebPlatform||s),"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`);if("web"===r.PLATFORM&&a.h5||"h5"===r.PLATFORM&&a.web)throw new Error(`Client platform is ${r.PLATFORM}, but ${"web"===r.PLATFORM?"h5":"web"} was found in config. Please refer to: https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=prefered-web-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 version 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}_parseConfigContent(e){return Array.isArray(e)?e:e[0]?Object.values(e):e}_getConfigContent(){if(this.pluginConfig&&this.pluginConfig.hasFile("config.json")){let e;try{e=this.pluginConfig.config()}catch(e){throw new Error("Invalid uni-id config file\n"+e.message)}return this._parseConfigContent(e)}{let e;try{e=require("./config.json")}catch(e){if("MODULE_NOT_FOUND"===e.code||"ENOENT"===e.code)throw new Error("uni-id config file[uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json] not found");throw e}return this._parseConfigContent(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,e);"app"!==t&&"app-plus"!==t||(t=n.preferedAppPlatform||t),"web"!==t&&"h5"!==t||(t=n.preferedWebPlatform||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
new file mode 100644
index 0000000..93b2b8f
--- /dev/null
+++ b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "uni-id",
+  "version": "3.3.28",
+  "description": "uni-id for uniCloud",
+  "main": "index.js",
+  "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitee.com/dcloud/uni-id.git"
+  },
+  "author": "",
+  "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-load-more/changelog.md b/uni_modules/uni-load-more/changelog.md
new file mode 100644
index 0000000..8f03f1d
--- /dev/null
+++ b/uni_modules/uni-load-more/changelog.md
@@ -0,0 +1,19 @@
+## 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）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-05-12）
+- 新增 组件示例地址
+## 1.1.7（2021-03-30）
+- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug
+## 1.1.6（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
new file mode 100644
index 0000000..6f45b0e
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "Pull up to show more",
+	"uni-load-more.contentrefresh": "loading...",
+	"uni-load-more.contentnomore": "No more data"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
new file mode 100644
index 0000000..fa8f0f3
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
new file mode 100644
index 0000000..3a14ca0
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉显示更多",
+	"uni-load-more.contentrefresh": "正在加载...",
+	"uni-load-more.contentnomore": "没有更多数据了"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
new file mode 100644
index 0000000..ee99b06
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉顯示更多",
+	"uni-load-more.contentrefresh": "正在加載...",
+	"uni-load-more.contentnomore": "沒有更多數據了"
+}
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
new file mode 100644
index 0000000..ededbc2
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
@@ -0,0 +1,399 @@
+<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>
+		<!-- #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">
+			<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 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="imgBase64" mode="widthFix"></image>
+		</view>
+		<!-- #endif -->
+		<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
+	}, 16)
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	/**
+	 * LoadMore 加载更多
+	 * @description 用于列表中，做滚动加载使用，展示 loading 的各种状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=29
+	 * @property {String} status = [more|loading|noMore] loading 的状态
+	 * 	@value more loading前
+	 * 	@value loading loading中
+	 * 	@value noMore 没有更多了
+	 * @property {Number} iconSize 指定图标大小
+	 * @property {Boolean} iconSize = [true|false] 是否显示 loading 图标
+	 * @property {String} iconType = [snow|circle|auto] 指定图标样式
+	 * 	@value snow ios雪花加载样式
+	 * 	@value circle 安卓唤醒加载样式
+	 * 	@value auto 根据平台自动选择加载样式
+	 * @property {String} color 图标和文字颜色
+	 * @property {Object} contentText 各状态文字说明，值为：{contentdown: "上拉显示更多",contentrefresh: "正在加载...",contentnomore: "没有更多数据了"}
+	 * @event {Function} clickLoadMore 点击加载更多时触发
+	 */
+	export default {
+		name: 'UniLoadMore',
+		emits: ['clickLoadMore'],
+		props: {
+			status: {
+				// 上拉的状态：more-loading前；loading-loading中；noMore-没有更多了
+				type: String,
+				default: 'more'
+			},
+			showIcon: {
+				type: Boolean,
+				default: true
+			},
+			iconType: {
+				type: String,
+				default: 'auto'
+			},
+			iconSize: {
+				type: Number,
+				default: 24
+			},
+			color: {
+				type: String,
+				default: '#777777'
+			},
+			contentText: {
+				type: Object,
+				default () {
+					return {
+						contentdown: '',
+						contentrefresh: '',
+						contentnomore: ''
+					}
+				}
+			},
+			showText: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				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='
+			}
+		},
+		computed: {
+			iconSnowWidth() {
+				return (Math.floor(this.iconSize / 24) || 1) * 2
+			},
+			contentdownText() {
+				return this.contentText.contentdown || t("uni-load-more.contentdown")
+			},
+			contentrefreshText() {
+				return this.contentText.contentrefresh || t("uni-load-more.contentrefresh")
+			},
+			contentnomoreText() {
+				return this.contentText.contentnomore || t("uni-load-more.contentnomore")
+			}
+		},
+		mounted() {
+			// #ifdef APP-PLUS
+			var pages = getCurrentPages();
+			var page = pages[pages.length - 1];
+			var currentWebview = page.$getAppWebview();
+			currentWebview.addEventListener('hide', () => {
+				this.webviewHide = true
+			})
+			currentWebview.addEventListener('show', () => {
+				this.webviewHide = false
+			})
+			// #endif
+		},
+		methods: {
+			onClick() {
+				this.$emit('clickLoadMore', {
+					detail: {
+						status: this.status,
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-load-more {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		height: 40px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-load-more__text {
+		font-size: 14px;
+		margin-left: 8px;
+	}
+
+	.uni-load-more__img {
+		width: 24px;
+		height: 24px;
+		// margin-right: 8px;
+	}
+
+	.uni-load-more__img--nvue {
+		color: #666666;
+	}
+
+	.uni-load-more__img--android,
+	.uni-load-more__img--ios {
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-load-more__img--android {
+		animation: loading-ios 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	.uni-load-more__img--ios-H5 {
+		position: relative;
+		animation: loading-ios-H5 1s 0s step-end infinite;
+	}
+
+	.uni-load-more__img--ios-H5 image {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+	}
+
+	@keyframes loading-ios-H5 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		8% {
+			transform: rotate(30deg);
+		}
+
+		16% {
+			transform: rotate(60deg);
+		}
+
+		24% {
+			transform: rotate(90deg);
+		}
+
+		32% {
+			transform: rotate(120deg);
+		}
+
+		40% {
+			transform: rotate(150deg);
+		}
+
+		48% {
+			transform: rotate(180deg);
+		}
+
+		56% {
+			transform: rotate(210deg);
+		}
+
+		64% {
+			transform: rotate(240deg);
+		}
+
+		73% {
+			transform: rotate(270deg);
+		}
+
+		82% {
+			transform: rotate(300deg);
+		}
+
+		91% {
+			transform: rotate(330deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+
+	/* #ifdef H5 */
+	.uni-load-more__img--android-H5 {
+		animation: loading-android-H5-rotate 2s linear infinite;
+		transform-origin: center center;
+	}
+
+	.uni-load-more__img--android-H5 circle {
+		display: inline-block;
+		animation: loading-android-H5-dash 1.5s ease-in-out infinite;
+		stroke: currentColor;
+		stroke-linecap: round;
+	}
+
+	@keyframes loading-android-H5-rotate {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-H5-dash {
+		0% {
+			stroke-dasharray: 1, 200;
+			stroke-dashoffset: 0;
+		}
+
+		50% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -40;
+		}
+
+		100% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -120;
+		}
+	}
+
+	/* #endif */
+
+	/* #ifndef APP-NVUE || H5 */
+	.uni-load-more__img--android-MP {
+		position: relative;
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+		animation: loading-ios 1s 0s ease infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon {
+		position: absolute;
+		box-sizing: border-box;
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+		border: solid 2px transparent;
+		border-top: solid 2px #777777;
+		transform-origin: center;
+	}
+
+	.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 .uni-load-more__img-icon:nth-child(2) {
+		animation: loading-android-MP-2 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(3) {
+		animation: loading-android-MP-3 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-1 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(90deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-2 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(180deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-3 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(270deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-load-more/package.json b/uni_modules/uni-load-more/package.json
new file mode 100644
index 0000000..2fa6f04
--- /dev/null
+++ b/uni_modules/uni-load-more/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-load-more",
+  "displayName": "uni-load-more 加载更多",
+  "version": "1.3.3",
+  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "加载更多",
+    "load-more"
+],
+  "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-load-more/readme.md b/uni_modules/uni-load-more/readme.md
new file mode 100644
index 0000000..54dc1fa
--- /dev/null
+++ b/uni_modules/uni-load-more/readme.md
@@ -0,0 +1,14 @@
+
+
+### LoadMore 加载更多
+> **组件名：uni-load-more**
+> 代码块： `uLoadMore`
+
+
+用于列表中，做滚动加载使用，展示 loading 的各种状态。
+
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-scss/changelog.md b/uni_modules/uni-scss/changelog.md
new file mode 100644
index 0000000..b863bb0
--- /dev/null
+++ b/uni_modules/uni-scss/changelog.md
@@ -0,0 +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
diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/uni-scss/index.scss
new file mode 100644
index 0000000..1744a5f
--- /dev/null
+++ b/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/uni_modules/uni-scss/package.json b/uni_modules/uni-scss/package.json
new file mode 100644
index 0000000..7cc0ccb
--- /dev/null
+++ b/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+  "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/readme.md b/uni_modules/uni-scss/readme.md
new file mode 100644
index 0000000..b7d1c25
--- /dev/null
+++ b/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/uni-scss/styles/index.scss
new file mode 100644
index 0000000..ffac4fe
--- /dev/null
+++ b/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +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';
diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/uni-scss/styles/setting/_border.scss
new file mode 100644
index 0000000..12a11c3
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
+.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
new file mode 100644
index 0000000..1ededd9
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +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;
+}
diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/uni-scss/styles/setting/_radius.scss
new file mode 100644
index 0000000..9a0428b
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +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)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/uni-scss/styles/setting/_space.scss
new file mode 100644
index 0000000..3c89528
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +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);
+			}
+		}
+	}
+}
\ 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
new file mode 100644
index 0000000..689afec
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +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 */
diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/uni-scss/styles/setting/_text.scss
new file mode 100644
index 0000000..a34d08f
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +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 */
+}
diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/uni-scss/styles/setting/_variables.scss
new file mode 100644
index 0000000..557d3d7
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
+// @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(
+  (
+    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
+);
+// 字体家族
+$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
new file mode 100644
index 0000000..ac6f63e
--- /dev/null
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +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;
+};
diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss
new file mode 100644
index 0000000..80ee62f
--- /dev/null
+++ b/uni_modules/uni-scss/theme.scss
@@ -0,0 +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);
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss
new file mode 100644
index 0000000..1c062d4
--- /dev/null
+++ b/uni_modules/uni-scss/variables.scss
@@ -0,0 +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);
diff --git a/uni_modules/uni-upgrade-center-app/changelog.md b/uni_modules/uni-upgrade-center-app/changelog.md
new file mode 100644
index 0000000..6804a9a
--- /dev/null
+++ b/uni_modules/uni-upgrade-center-app/changelog.md
@@ -0,0 +1,64 @@
+## 0.6.1（2022-08-17）
+- 修复 后台添加应用市场，但都没有启用的情况下报错的Bug （需要 uni-admin 1.9.3+）
+## 0.6.0（2022-07-19）
+- 新增 支持多应用商店配置（需要 uni-admin 1.9.3+）
+## 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）
+- 更新文档  关于报错local_storage_key 为空，请不要将页面路径设置为pages.json中第一项
+## 0.1.9（2021-06-28）
+- 更新文档
+- 修复  wgt安装失败时，按钮状态不对
+## 0.1.8（2021-06-16）
+- 修复  跳转安装时，导致上次下载的apk还没安装就被删掉的bug
+## 0.1.7（2021-06-03）
+- 修改  移除static中的图片
+## 0.1.6（2021-06-03）
+- 修改  下载更新按钮使用CSS渐变色
+## 0.1.5（2021-04-22）
+- 更新check-update函数。现在返回一个Promise，有更新时成功回调，其他情况错误回调
+## 0.1.4（2021-04-13）
+- 更新文档。明确云函数调用结果
+## 0.1.3（2021-04-13）
+- 解耦云函数与弹框处理。utils中新增 call-check-version.js，可用于单独检测是否有更新
+## 0.1.2（2021-04-07）
+- 更新版本对比函数 compare
+## 0.1.1（2021-04-07）
+- 修复 腾讯云空间下载链接不能下载问题
+## 0.1.0（2021-04-07）
+- 新增使用uni.showModal提示升级示例
+- 修改iOS升级提示方式
+## 0.0.7（2021-04-02）
+- 修复在iOS上打开弹框报错
+## 0.0.6（2021-04-01）
+- 兼容旧版本安卓
+## 0.0.5（2021-04-01）
+- 修复低版本安卓上进度条错位
+## 0.0.4（2021-04-01）
+- 更新readme
+- 修复check-update语法错误
+## 0.0.3（2021-04-01）
+- 新增前台更新弹框，详见readme
+- 更新前台检查更新方法
+
+## 0.0.2（2021-03-29）
+- 更新文档
+- 移除 dependencies
+
+## 0.0.1（2021-03-25）
+- 升级中心前台检查更新
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 0000000..8b2ffe6
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 0000000..015f698
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
new file mode 100644
index 0000000..8ccd619
--- /dev/null
+++ b/uni_modules/uni-upgrade-center-app/package.json
@@ -0,0 +1,81 @@
+{
+  "id": "uni-upgrade-center-app",
+  "displayName": "升级中心 uni-upgrade-center - App",
+  "version": "0.6.1",
+  "description": "uni升级中心 - 客户端检查更新",
+  "keywords": [
+    "uniCloud",
+    "update",
+    "升级",
+    "wgt"
+],
+  "repository": "https://gitee.com/dcloud/uni-upgrade-center/tree/master/uni_modules/uni-upgrade-center-app",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "unicloud-template-page"
+  },
+  "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"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "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
new file mode 100644
index 0000000..cc33c1d
--- /dev/null
+++ b/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
@@ -0,0 +1,539 @@
+<template>
+	<view class="mask flex-center">
+		<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="../images/bg_top.png">
+				</image>
+			</view>
+			<view class="content-header"></view>
+			<view class="content-body">
+				<view class="title">
+					<text>{{subTitle}}</text>
+					<!-- <text style="padding-left:20rpx;font-size: 0.5em;color: #666;">v.{{version}}</text> -->
+				</view>
+				<view class="body">
+					<scroll-view class="box-des-scroll" scroll-y="true">
+						<text class="box-des">
+							{{contents}}
+						</text>
+					</scroll-view>
+				</view>
+				<view class="footer flex-center">
+					<template v-if="isAppStore">
+						<button class="content-button" style="border: none;color: #fff;" plain @click="jumpToAppStore">
+							{{downLoadBtnTextiOS}}
+						</button>
+					</template>
+					<template v-else>
+						<template v-if="!downloadSuccess">
+							<view class="progress-box flex-column" v-if="downloading">
+								<progress class="progress" border-radius="35" :percent="downLoadPercent"
+									activeColor="#3DA7FF" show-info stroke-width="10" />
+								<view style="width:100%;font-size: 28rpx;display: flex;justify-content: space-around;">
+									<text>{{downLoadingText}}</text>
+									<text>({{downloadedSize}}/{{packageFileSize}}M)</text>
+								</view>
+							</view>
+
+							<button v-else class="content-button" style="border: none;color: #fff;" plain
+								@click="updateApp">
+								{{downLoadBtnText}}
+							</button>
+						</template>
+						<button v-else-if="downloadSuccess && !installed" class="content-button"
+							style="border: none;color: #fff;" plain :loading="installing" :disabled="installing"
+							@click="installPackage">
+							{{installing ? '正在安装……' : '下载完成，立即安装'}}
+						</button>
+
+						<button v-if="installed && isWGT" class="content-button" style="border: none;color: #fff;" plain
+							@click="restart">
+							安装完毕，点击重启
+						</button>
+					</template>
+				</view>
+			</view>
+
+			<image v-if="!is_mandatory" class="close-img" src="../images/app_update_close.png"
+				@click.stop="closeUpdate"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	const localFilePathKey = 'UNI_ADMIN_UPGRADE_CENTER_LOCAL_FILE_PATH'
+	const platform_iOS = 'iOS';
+	let downloadTask = null;
+	let openSchemePromise
+
+	/**
+	 * 对比版本号，如需要，请自行修改判断规则
+	 * 支持比对	("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;
+	}
+
+	export default {
+		data() {
+			return {
+				// 从之前下载安装
+				installForBeforeFilePath: '',
+
+				// 安装
+				installed: false,
+				installing: false,
+
+				// 下载
+				downloadSuccess: false,
+				downloading: false,
+
+				downLoadPercent: 0,
+				downloadedSize: 0,
+				packageFileSize: 0,
+
+				tempFilePath: '', // 要安装的本地包地址
+
+				// 默认安装包信息
+				title: '更新日志',
+				contents: '',
+				is_mandatory: false,
+
+				// 可自定义属性
+				subTitle: '发现新版本',
+				downLoadBtnTextiOS: '立即跳转更新',
+				downLoadBtnText: '立即下载更新',
+				downLoadingText: '安装包下载中，请稍后'
+			}
+		},
+		onLoad({
+			local_storage_key
+		}) {
+			if (!local_storage_key) {
+				console.error('local_storage_key为空，请检查后重试')
+				uni.navigateBack()
+				return;
+			};
+
+			const localPackageInfo = uni.getStorageSync(local_storage_key);
+			if (!localPackageInfo) {
+				console.error('安装包信息为空，请检查后重试')
+				uni.navigateBack()
+				return;
+			};
+
+			const requiredKey = ['version', 'url', 'type']
+			for (let key in localPackageInfo) {
+				if (requiredKey.indexOf(key) !== -1 && !localPackageInfo[key]) {
+					console.error(`参数 ${key} 必填，请检查后重试`)
+					uni.navigateBack()
+					return;
+				}
+			}
+
+			Object.assign(this, localPackageInfo)
+			this.checkLocalStoragePackage()
+		},
+		onBackPress() {
+			// 强制更新不允许返回
+			if (this.is_mandatory) {
+				return true
+			}
+
+			downloadTask && downloadTask.abort()
+		},
+		onHide() {
+			openSchemePromise = null
+		},
+		computed: {
+			isWGT() {
+				return this.type === 'wgt'
+			},
+			isiOS() {
+				return !this.isWGT ? this.platform.includes(platform_iOS) : false;
+			},
+			isAppStore() {
+				return this.isiOS || (!this.isiOS && !this.isWGT && this.url.indexOf('.apk') === -1)
+			}
+		},
+		methods: {
+			checkLocalStoragePackage() {
+				// 如果已经有下载好的包，则直接提示安装
+				const localFilePathRecord = uni.getStorageSync(localFilePathKey)
+				if (localFilePathRecord) {
+					const {
+						version,
+						savedFilePath,
+						installed
+					} = localFilePathRecord
+
+					// 比对版本
+					if (!installed && compare(version, this.version) === 0) {
+						this.downloadSuccess = true;
+						this.installForBeforeFilePath = savedFilePath;
+						this.tempFilePath = savedFilePath
+					} else {
+						// 如果保存的包版本小 或 已安装过，则直接删除
+						this.deleteSavedFile(savedFilePath)
+					}
+				}
+			},
+			async closeUpdate() {
+				if (this.downloading) {
+					if (this.is_mandatory) {
+						return uni.showToast({
+							title: '下载中，请稍后……',
+							icon: 'none',
+							duration: 500
+						})
+					}
+					uni.showModal({
+						title: '是否取消下载？',
+						cancelText: '否',
+						confirmText: '是',
+						success: res => {
+							if (res.confirm) {
+								downloadTask && downloadTask.abort()
+								uni.navigateBack()
+							}
+						}
+					});
+					return;
+				}
+
+				if (this.downloadSuccess && this.tempFilePath) {
+					// 包已经下载完毕，稍后安装，将包保存在本地
+					await this.saveFile(this.tempFilePath, this.version)
+					uni.navigateBack()
+					return;
+				}
+
+				uni.navigateBack()
+			},
+			updateApp() {
+				this.checkStoreScheme().catch(() => {
+					this.downloadPackage()
+				})
+			},
+			// 跳转应用商店
+			checkStoreScheme() {
+				const storeList = (this.store_list || []).filter(item => item.enable)
+				if (storeList && storeList.length) {
+					storeList
+						.sort((cur, next) => next.priority - cur.priority)
+						.map(item => item.scheme)
+						.reduce((promise, cur, curIndex) => {
+							openSchemePromise = (promise || (promise = Promise.reject())).catch(() => {
+								return new Promise((resolve, reject) => {
+									plus.runtime.openURL(cur, (err) => {
+										reject(err)
+									})
+								})
+							})
+							return openSchemePromise
+						}, openSchemePromise)
+					return openSchemePromise
+				}
+
+				return Promise.reject()
+			},
+			downloadPackage() {
+				this.downloading = true;
+
+				//下载包
+				downloadTask = uni.downloadFile({
+					url: this.url,
+					success: res => {
+						if (res.statusCode == 200) {
+							this.downloadSuccess = true;
+							this.tempFilePath = res.tempFilePath
+
+							// 强制更新，直接安装
+							if (this.is_mandatory) {
+								this.installPackage();
+							}
+						}
+					},
+					complete: () => {
+						this.downloading = false;
+
+						this.downLoadPercent = 0
+						this.downloadedSize = 0
+						this.packageFileSize = 0
+
+						downloadTask = null;
+					}
+				});
+
+				downloadTask.onProgressUpdate(res => {
+					this.downLoadPercent = res.progress;
+					this.downloadedSize = (res.totalBytesWritten / Math.pow(1024, 2)).toFixed(2);
+					this.packageFileSize = (res.totalBytesExpectedToWrite / Math.pow(1024, 2)).toFixed(2);
+				});
+			},
+			installPackage() {
+				// #ifdef APP-PLUS
+				// wgt资源包安装
+				if (this.isWGT) {
+					this.installing = true;
+				}
+				plus.runtime.install(this.tempFilePath, {
+					force: false
+				}, async res => {
+					this.installing = false;
+					this.installed = true;
+
+					// wgt包，安装后会提示 安装成功，是否重启
+					if (this.isWGT) {
+						// 强制更新安装完成重启
+						if (this.is_mandatory) {
+							uni.showLoading({
+								icon: 'none',
+								title: '安装成功，正在重启……'
+							})
+
+							setTimeout(() => {
+								uni.hideLoading()
+								this.restart();
+							}, 1000)
+						}
+					} else {
+						const localFilePathRecord = uni.getStorageSync(localFilePathKey)
+						uni.setStorageSync(localFilePathKey, {
+							...localFilePathRecord,
+							installed: true
+						})
+					}
+				}, async err => {
+					// 如果是安装之前的包，安装失败后删除之前的包
+					if (this.installForBeforeFilePath) {
+						await this.deleteSavedFile(this.installForBeforeFilePath)
+						this.installForBeforeFilePath = '';
+					}
+
+					// 安装失败需要重新下载安装包
+					this.installing = false;
+					this.installed = false;
+
+					uni.showModal({
+						title: '更新失败，请重新下载',
+						content: err.message,
+						showCancel: false
+					});
+				});
+
+				// 非wgt包，安装跳出覆盖安装，此处直接返回上一页
+				if (!this.isWGT && !this.is_mandatory) {
+					uni.navigateBack()
+				}
+				// #endif
+			},
+			restart() {
+				this.installed = false;
+				// #ifdef APP-PLUS
+				//更新完重启app
+				plus.runtime.restart();
+				// #endif
+			},
+			saveFile(tempFilePath, version) {
+				return new Promise((resolve, reject) => {
+					uni.saveFile({
+						tempFilePath,
+						success({
+							savedFilePath
+						}) {
+							uni.setStorageSync(localFilePathKey, {
+								version,
+								savedFilePath
+							})
+						},
+						complete() {
+							resolve()
+						}
+					})
+				})
+			},
+			deleteSavedFile(filePath) {
+				uni.removeStorageSync(localFilePathKey)
+				return uni.removeSavedFile({
+					filePath
+				})
+			},
+			jumpToAppStore() {
+				plus.runtime.openURL(this.url);
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background: transparent;
+	}
+
+	.flex-center {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+
+	.mask {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, .65);
+	}
+
+	.botton-radius {
+		border-bottom-left-radius: 30rpx;
+		border-bottom-right-radius: 30rpx;
+	}
+
+	.content {
+		position: relative;
+		top: 0;
+		width: 600rpx;
+		background-color: #fff;
+		box-sizing: border-box;
+		padding: 0 50rpx;
+		font-family: Source Han Sans CN;
+	}
+
+	.text {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		line-height: 200px;
+		text-align: center;
+		color: #FFFFFF;
+	}
+
+	.content-top {
+		position: absolute;
+		top: -195rpx;
+		left: 0;
+		width: 600rpx;
+		height: 270rpx;
+	}
+
+	.content-top-text {
+		font-size: 45rpx;
+		font-weight: bold;
+		color: #F8F8FA;
+		position: absolute;
+		top: 120rpx;
+		left: 50rpx;
+		z-index: 1;
+	}
+
+	.content-header {
+		height: 70rpx;
+	}
+
+	.title {
+		font-size: 33rpx;
+		font-weight: bold;
+		color: #3DA7FF;
+		line-height: 38px;
+	}
+
+	.footer {
+		height: 150rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+	}
+
+	.box-des-scroll {
+		box-sizing: border-box;
+		padding: 0 40rpx;
+		height: 200rpx;
+		text-align: left;
+	}
+
+	.box-des {
+		font-size: 26rpx;
+		color: #000000;
+		line-height: 50rpx;
+	}
+
+	.progress-box {
+		width: 100%;
+	}
+
+	.progress {
+		width: 90%;
+		height: 40rpx;
+		border-radius: 35px;
+	}
+
+	.close-img {
+		width: 70rpx;
+		height: 70rpx;
+		z-index: 1000;
+		position: absolute;
+		bottom: -120rpx;
+		left: calc(50% - 70rpx / 2);
+	}
+
+	.content-button {
+		text-align: center;
+		flex: 1;
+		font-size: 30rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		border-radius: 40rpx;
+		margin: 0 18rpx;
+
+		height: 80rpx;
+		line-height: 80rpx;
+
+		background: linear-gradient(to right, #1785ff, #3DA7FF);
+	}
+
+	.flex-column {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+</style>
diff --git a/uni_modules/uni-upgrade-center-app/readme.md b/uni_modules/uni-upgrade-center-app/readme.md
new file mode 100644
index 0000000..1dad9cd
--- /dev/null
+++ b/uni_modules/uni-upgrade-center-app/readme.md
@@ -0,0 +1,126 @@
+## 升级中心 - app插件与 `uni-admin` 版本关系
+
+### `uni-admin >= 1.9.3`：云函数 `checkVersion` 废弃，使用 uni-admin 自带的 `uni-upgrade-center` 云函数。
+
+# uni-upgrade-center - App
+
+### 概述
+
+> 统一管理App及App在`Android`、`iOS`平台上`App安装包`和`wgt资源包`的发布升级
+
+> uni升级中心分为业务插件和后台管理插件。本插件为业务插件，包括uni升级中心客户端检查更新的前后端逻辑。后台管理系统另见 [uni-upgrade-center - Admin](https://ext.dcloud.net.cn/plugin?id=4470)
+
+### uni升级中心 - 客户端检查更新插件
+  - 一键式检查更新，同时支持整包升级与wgt资源包更新
+  - 好看、实用、可自定义的客户端提示框
+
+## 安装指引
+
+1. 依赖数据库`opendb-app-versions`，如果没有此库，请在云服务空间中创建。
+
+2. 使用`HBuilderX 3.1.0+`，因为要使用到`uni_modules`
+
+3. 在插件市场打开本插件页面，在右侧点击`使用 HBuilderX 导入插件`，选择要导入的项目点击确定
+
+4. 绑定一个服务空间。自 `0.6.0` 起，依赖 `uni-admin 1.9.3+` 的 `uni-upgrade-center 云函数`，请和 uni-admin 项目关联同一个服务空间
+
+5. 找到`/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/check-version`，右键上传部署。自 `0.6.0` 起，依赖 `uni-admin 1.9.3+` 的 `uni-upgrade-center 云函数`，插件不再单独提供云函数，这样可以省下一个云函数名额。
+
+6. 在`pages.json`中添加页面路径。**注：请不要设置为pages.json中第一项**
+```json
+"pages": [
+		// ……其他页面配置
+		{
+			"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
+			"style": {
+				"disableScroll": true,
+				"app-plus": {
+					"backgroundColorTop": "transparent",
+					"background": "transparent",
+					"titleNView": false,
+					"scrollIndicator": false,
+					"popGesture": "none",
+					"animationType": "fade-in",
+					"animationDuration": 200
+
+				}
+			}
+		}
+]
+```
+
+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`中都有实例。
+
+9. wgt更新时，打包前请务必将manifest.json中的版本修改为更高版本。
+
+### 更新下载安装`check-update.js`
+
+*该函数在utils目录下*
+
+1. 如果是静默更新，则不会打开更新弹框，会在后台下载后安装，下次启动应用生效
+
+2. 如果是 iOS，则会直接打开AppStore的链接
+
+3. 其他情况，会将`check-version`返回的结果保存在localStorage中，并跳转进入`upgrade-popup.vue`打开更新弹框
+
+### 检查更新函数`check-version`
+
+*该函数在uniCloud/cloudfunctions目录下*
+
+1. 使用检查更新需要传递三个参数 `appid`、`appVersion`、`wgtVersion`
+
+2. `appid` 使用 plus.runtime.appid 获取，*注：真机运行时为固定值HBuilder，在调试的时候请使用本地调试云函数*
+
+3. `appVersion` 使用 plus.runtime.version 获取
+
+4. `wgtVersion` 使用 plus.runtime.getProperty(plus.runtime.appid,(wgtInfo) => { wgtInfo.version }) 获取
+
+5. `check-version`云函数内部会自动获取 App 平台
+
+
+**Tips**
+
+1. `check-version`云函数内部有版本对比函数（compare）。
+	- 使用多段式版本格式（如："3.0.0.0.0.1.0.1", "3.0.0.0.0.1"）。如果不满足对比规则，请自行修改。
+	- 如果修改，请将*pages/upgrade-popup.vue*中*compare*函数一并修改
+
+## 项目代码说明
+
+### 更新弹框
+- `upgrade-popup.vue` - 更新应用：
+	- 如果云函数`check-version`返回的参数表明需要更新，则将参数保存在localStorage中，带着键值跳转该页面
+	- 进入时会先从localStorage中尝试取出之前存的安装包路径（此包不会是强制安装类型的包）
+	- 如果有已经保存的包，则和传进来的 `version` 进行比较，如果相等则安装。大于和小于都不进行安装，因为admin端可能会调整包的版本。不符合更新会将此包删除
+	- 如果本地没有包或者包不符合安装条件，则进行下载安装包
+	- 点击下载会有进度条、已下载大小和下载包的大小
+	- 下载完成会提示安装：
+		- 如果是 wgt 包，安装时则会提示 正在安装…… 和 安装完成。安装完成会提示是否重启
+		- 如果是 原生安装包，则直接跳出去覆盖安装
+	- 下载过程中，如果退出会提示是否取消下载。如果是强制更新，则只会提示正在下载请稍后，此时不可退出
+	- 如果是下载完成了没有安装就退出，则会将下载完成的包保存在本地。将包的本地路径和包version保存在localStorage中
+
+### 工具类 utils
+- `call-check-version`
+	- 请求云函数`check-version`拿取版本检测结果
+- `check-update`
+	- 调用`call-check-version`并根据结果判断是否显示更新弹框
+
+### 云函数
+- `check-version` - 检查应用更新：
+	- 根据传参，先检测传参是否完整，appid appVersion wgtVersion 必传
+	- 先从数据库取出所有该平台（会从上下文读取平台信息）的所有线上发行更新
+	- 再从所有线上发行更新中取出版本最大的一版。如果可以，尽量先检测wgt的线上发行版更新
+	- 使用上一步取出的版本包的版本号 和传参 appVersion、wgtVersion 来检测是否有更新。必须同时大于这两项，因为上一次可能是wgt热更新，否则返回暂无更新
+	- 如果库中 wgt包 版本大于传参 appVersion，但是不满足 min_uni_version < appVersion，则不会使用wgt更新，会接着判断库中 app包version 是否大于 appVersion
+	- 返回结果：
+
+		|code|message|
+		|:-:|:-:|
+		|0|当前版本已经是最新的，不需要更新|
+		|101|wgt更新|
+		|102|整包更新|
+		|-101|暂无更新或检查appid是否填写正确|
+		|-102|请检查传参是否填写正确|
\ No newline at end of file
diff --git a/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/temp.png b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/temp.png
new file mode 100644
index 0000000..8b2ffe6
Binary files /dev/null and b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/temp.png differ
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
new file mode 100644
index 0000000..1a28bd8
--- /dev/null
+++ b/uni_modules/uni-upgrade-center-app/utils/call-check-version.js
@@ -0,0 +1,33 @@
+export default function() {
+	// #ifdef APP-PLUS
+	return new Promise((resolve, reject) => {
+		plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
+			const data = {
+				action: 'checkVersion',
+				appid: plus.runtime.appid,
+				appVersion: plus.runtime.version,
+				wgtVersion: widgetInfo.version
+			}
+			console.log("data: ",data);
+			uniCloud.callFunction({
+				name: 'uni-upgrade-center',
+				data,
+				success: (e) => {
+					console.log("e: ", e);
+					resolve(e)
+				},
+				fail: (error) => {
+					reject(error)
+				}
+			})
+		})
+	})
+	// #endif
+	// #ifndef APP-PLUS
+	return new Promise((resolve, reject) => {
+		reject({
+			message: '请在App中使用'
+		})
+	})
+	// #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
new file mode 100644
index 0000000..f45e5fb
--- /dev/null
+++ b/uni_modules/uni-upgrade-center-app/utils/check-update.js
@@ -0,0 +1,158 @@
+import callCheckVersion from './call-check-version'
+
+// 推荐再App.vue中使用
+const PACKAGE_INFO_KEY = '__package_info__'
+
+export default function() {
+	// #ifdef APP-PLUS
+	return new Promise((resolve, reject) => {
+		callCheckVersion().then(async (e) => {
+			if (!e.result) return;
+			const {
+				code,
+				message,
+				is_silently, // 是否静默更新
+				url, // 安装包下载地址
+				platform, // 安装包平台
+				type // 安装包类型
+			} = e.result;
+
+			// 此处逻辑仅为实例，可自行编写
+			if (code > 0) {
+				// 腾讯云和阿里云下载链接不同，需要处理一下，阿里云会原样返回
+				const {
+					fileList
+				} = await uniCloud.getTempFileURL({
+					fileList: [url]
+				});
+				if (fileList[0].tempFileURL)
+					e.result.url = fileList[0].tempFileURL;
+
+				resolve(e)
+
+				// 静默更新，只有wgt有
+				if (is_silently) {
+					uni.downloadFile({
+						url: e.result.url,
+						success: res => {
+							if (res.statusCode == 200) {
+								// 下载好直接安装，下次启动生效
+								plus.runtime.install(res.tempFilePath, {
+									force: false
+								});
+							}
+						}
+					});
+					return;
+				}
+
+				/**
+				 * 提示升级一
+				 * 使用 uni.showModal
+				 */
+				// return updateUseModal(e.result)
+
+				/**
+				 * 提示升级二
+				 * 官方适配的升级弹窗，可自行替换资源适配UI风格
+				 */
+				uni.setStorageSync(PACKAGE_INFO_KEY, e.result)
+				uni.navigateTo({
+					url: `/uni_modules/uni-upgrade-center-app/pages/upgrade-popup?local_storage_key=${PACKAGE_INFO_KEY}`,
+					fail: (err) => {
+						console.error('更新弹框跳转失败', err)
+						uni.removeStorageSync(PACKAGE_INFO_KEY)
+					}
+				})
+				
+				return
+			} else if (code < 0) {
+				// TODO 云函数报错处理
+				console.error(message)
+				return reject(e)
+			}
+			return resolve(e)
+		}).catch(err => {
+			// TODO 云函数报错处理
+			console.error(err.message)
+			reject(err)
+		})
+	});
+	// #endif
+}
+
+/**
+ * 使用 uni.showModal 升级
+ */
+function updateUseModal(packageInfo) {
+	const {
+		title, // 标题
+		contents, // 升级内容
+		is_mandatory, // 是否强制更新
+		url, // 安装包下载地址
+		platform, // 安装包平台
+		type // 安装包类型
+	} = packageInfo;
+
+	let isWGT = type === 'wgt'
+	let isiOS = !isWGT ? platform.includes('iOS') : false;
+	let confirmText = isiOS ? '立即跳转更新' : '立即下载更新'
+
+	return uni.showModal({
+		title,
+		content: contents,
+		showCancel: !is_mandatory,
+		confirmText,
+		success: res => {
+			if (res.cancel) return;
+
+			// 安装包下载
+			if (isiOS) {
+				plus.runtime.openURL(url);
+				return;
+			}
+
+			uni.showToast({
+				title: '后台下载中……',
+				duration: 1000
+			});
+
+			// wgt 和 安卓下载更新
+			downloadTask = uni.downloadFile({
+				url,
+				success: res => {
+					if (res.statusCode !== 200) {
+						console.error('下载安装包失败', err);
+						return;
+					}
+					// 下载好直接安装，下次启动生效
+					plus.runtime.install(res.tempFilePath, {
+						force: false
+					}, () => {
+						if (is_mandatory) {
+							//更新完重启app
+							plus.runtime.restart();
+							return;
+						}
+						uni.showModal({
+							title: '安装成功是否重启？',
+							success: res => {
+								if (res.confirm) {
+									//更新完重启app
+									plus.runtime.restart();
+								}
+							}
+						});
+					}, err => {
+						uni.showModal({
+							title: '更新失败',
+							content: err
+								.message,
+							showCancel: false
+						});
+					});
+				}
+			});
+		}
+	});
+}
diff --git a/uni_modules/zxz-uni-data-select/changelog.md b/uni_modules/zxz-uni-data-select/changelog.md
new file mode 100644
index 0000000..92b7a5b
--- /dev/null
+++ b/uni_modules/zxz-uni-data-select/changelog.md
@@ -0,0 +1,37 @@
+## 1.0.13（2023-10-12）
+优化mixinDatacomResData报错和defValue报错
+## 1.0.12（2023-09-27）
+修复搜索输入内容的时候下拉框的箭头会跑到文本框前面去
+优化当有选中项时不显示清除按钮
+## 1.0.11（2023-09-05）
+更换change事件执行顺序
+修复多选更改值时未即时更改下拉框选项
+修复单选搜索框选中了
+修复多选筛选输入时点击其他未清空筛选值
+## 1.0.10（2023-08-29）
+修复单选搜索回显问题
+## 1.0.9（2023-08-28）
+更新文档
+## 1.0.8（2023-08-28）
+更新文档
+## 1.0.7（2023-08-16）
+修复组件禁用bug
+修复数据回显问题
+添加多选搜索功能
+## 1.0.6（2023-08-05）
+修复清空值多选下拉列表还是被选中bug
+## 1.0.5（2023-07-10）
+修复多选初始化异步数据不显示问题
+## 1.0.4（2023-07-07）
+修复微信小程序多选显示兼容问题
+## 1.0.3（2023-07-06）
+修复bug
+多选情况下   初始化之后重新选择第一个不显示
+## 1.0.2（2023-07-06）
+更新VUE3兼容
+## 1.0.1（2023-06-30）
+添加多选合并功能
+## 1.0.0（2023-06-16）
+添加下拉框检索，多选功能，自定义数据
+## 1.0.4（2023-06-16）
+ 添加下拉框检索，多选功能，自定义数据
diff --git a/uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue b/uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue
new file mode 100644
index 0000000..746f96c
--- /dev/null
+++ b/uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue
@@ -0,0 +1,760 @@
+<template>
+	<view class="uni-stat__select">
+		<!-- hide-on-phone -->
+		<span v-if="label" class="uni-label-text">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :style="{height:multiple?'100%':' 35px;'}"
+				:class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" :style="{height:multiple?'100%':'35px;'}" @click="toggleSelector">
+					<view class="" style="display: flex;flex-wrap: wrap;width: 100%;" v-if="multiple&&current.length>0">
+						<view class="tag-calss"
+							v-for="(item,index) in collapseTags?current.slice(0,collapseTagsNum):current"
+							:key="item[dataValue]">
+							<span class="text">{{item[dataKey]}}</span>
+							<view class="" @click.stop="delItem(item)">
+								<uni-icons type="clear" style="margin-left: 4px;" color="#c0c4cc" />
+							</view>
+						</view>
+						<view v-if="current.length>collapseTagsNum&&collapseTags" class="tag-calss">
+							<span class="text">+{{current.length-collapseTagsNum}}</span>
+						</view>
+						<input v-if="filterable&&!disabled" @input="inputChange" class="uni-select__input-text"
+							type="text" style="font-size: 12px;height: 52rpx;margin-left: 6px;width: auto;"
+							placeholder="请输入" v-model="filterInput">
+					</view>
+					<view v-else-if="current&&current.length>0&&!showSelector" class="uni-select__input-text">
+						{{current}}
+					</view>
+					<input v-else-if="filterable&&showSelector" :focus="isFocus" @input="inputChange"
+						:disabled="disabled" @click.stop="" class="uni-select__input-text" type="text"
+						style="font-size: 12px;position: absolute;z-index: 1;" :placeholder="placeholderOld"
+						v-model="filterInput">
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<uni-icons v-if="(current.length>0 && clear&&!disabled)||(currentArr.length>0&&clear&&!disabled)" type="clear" color="#c0c4cc" size="24"
+						style="position: absolute;right: 0;" @click="clearVal" />
+					<uni-icons style="right: 0;position: absolute;" v-else :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" v-if="showSelector">
+					<view class="uni-popper__arrow"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="filterMixinDatacomResData.length === 0">
+							<span>{{emptyTips}}</span>
+						</view>
+						<view v-else class="uni-select__selector-item"
+							style="display: flex;justify-content: space-between;align-items: center;"
+							v-for="(item,index) in filterMixinDatacomResData" :key="index" @click="change(item)">
+							<span
+								:class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</span>
+							<uni-icons v-if="multiple&&currentArr.includes(item[dataValue])" type="checkmarkempty"
+								color="#007aff" />
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-stat-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			collapseTagsNum: {
+				type: Number,
+				default: 1
+			},
+			collapseTags: {
+				type: Boolean,
+				default: false
+			},
+			dataKey: {
+				type: [String],
+				default: 'text'
+			},
+			dataValue: {
+				type: [String],
+				default: 'value'
+			},
+			multiple: {
+				type: Boolean,
+				default: false
+			},
+			filterable: {
+				type: Boolean,
+				default: false
+			},
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// #ifndef VUE3
+			value: {
+				type: [String, Number, Array],
+				default: ''
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [String, Number, Array],
+				default: ''
+			},
+			// #endif
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: [],
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+				placeholderOld: "",
+				currentArr: [],
+				filterInput: "",
+				isFocus: false
+			};
+		},
+		created() {
+			if (this.multiple) {
+				// #ifndef VUE3
+				this.currentArr = this.value || []
+				// #endif
+				// #ifdef VUE3
+				this.currentArr = this.modelValue || []
+				// #endif
+				if (this.current.length > 0) {
+					this.current = []
+				}
+				// #ifndef VUE3
+				if (this.value && this.value.length > 0 && this.filterMixinDatacomResData.length > 0) {
+					this.current = this.value.map(item => {
+						let current = this.mixinDatacomResData.find(e =>
+							e[this.dataValue] == item
+						)
+						return {
+							...current
+						}
+					})
+				}
+				// #endif
+				// #ifdef VUE3
+				if (this.modelValue && this.modelValue.length > 0 && this.filterMixinDatacomResData.length > 0) {
+					this.current = this.modelValue.map(item => {
+						let current = this.mixinDatacomResData.find(e =>
+							e[this.dataValue] == item
+						)
+						return {
+							...current
+						}
+					})
+				}
+				// #endif
+
+			} else {
+
+				// #ifndef VUE3
+				if (this.value || this.value == 0) {
+					this.current = this.formatItemName(this.filterMixinDatacomResData.find(e =>
+						e[this.dataValue] == this.value
+					))
+				}
+				// #endif
+				// #ifdef VUE3
+				if (this.modelValue || this.value == 0) {
+					this.current = this.formatItemName(this.filterMixinDatacomResData.find(e =>
+						e[this.dataValue] == this.modelValue
+					))
+				}
+				// #endif
+			}
+			this.placeholderOld = this.placeholder
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			filterMixinDatacomResData() {
+				if (this.filterable && this.filterInput) {
+					return this.mixinDatacomResData.filter(e => e[this.dataKey].includes(this.filterInput))
+				} else {
+					return this.mixinDatacomResData
+				}
+			},
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom() {
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val||[]
+					}
+
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			},
+		},
+		methods: {
+			debounce(fn, time = 100) {
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query() {
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange() {
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1][this.dataValue]
+						}
+						defValue = defItem
+					}
+					if (defValue || defValue === 0) {
+						this.emit(defValue)
+					}
+				}
+				if (this.multiple) {
+					const mixinDatacomResData = this.mixinDatacomResData
+					if(!defValue) defValue=[]
+					this.current = defValue.map(item => {
+						const current = mixinDatacomResData.find(e => {
+							return e[this.dataValue] == item
+						})
+						return {
+							...current
+						}
+					})
+					this.currentArr = this.current.map(e => e[this.dataValue])
+					if (this.valueCom.length < 1) {
+						this.currentArr = []
+					}
+				} else {
+					const def = this.mixinDatacomResData.find(item => item[this.dataValue] === defValue)
+					this.current = def ? this.formatItemName(def) : ''
+				}
+			},
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item[this.dataValue] === value) {
+						isDisabled = item.disable
+					}
+				})
+				return isDisabled;
+			},
+			inputChange(e) {
+				this.$emit('inputChange', e.detail.value)
+			},
+			clearVal() {
+				if (this.disabled) {
+					return
+				}
+				if (this.multiple) {
+					this.current = []
+					this.currentArr = []
+					this.emit([])
+				} else {
+					this.current = ""
+					this.currentArr = []
+					this.emit('')
+				}
+				if (this.collection) {
+					this.removeCache()
+				}
+				this.placeholderOld = this.placeholder
+				this.filterInput = ""
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					if (this.multiple) {
+						if (!this.current) {
+							this.current = []
+						}
+						if (!this.currentArr) {
+							this.currentArr = []
+						}
+						if (this.currentArr.includes(item[this.dataValue])) {
+							let index = this.current.findIndex(e => {
+								return e[this.dataValue] == item[this.dataValue]
+							})
+							this.current.splice(index, 1)
+							this.currentArr.splice(index, 1)
+							this.emit(this.current)
+						} else {
+							this.current.push(item)
+							this.currentArr.push(item[this.dataValue])
+							this.emit(this.current)
+
+						}
+						this.filterInput = ""
+					} else {
+						this.current = this.formatItemName(item)
+						if (this.filterable) {
+							this.filterInput = item[this.dataKey]
+						}
+						this.emit(item[this.dataValue])
+					}
+				}
+			},
+			delItem(item) {
+				if (this.disabled) {
+					return
+				}
+				if (this.currentArr.includes(item[this.dataValue])) {
+					let index = this.current.findIndex(e => {
+						return e[this.dataValue] == item[this.dataValue]
+					})
+					this.current.splice(index, 1)
+					this.currentArr.splice(index, 1)
+					this.emit(this.current)
+				}
+			},
+			emit(val) {
+				if (this.multiple) {
+					this.$emit('input', this.currentArr)
+					this.$emit('update:modelValue', this.currentArr)
+				} else {
+					this.$emit('input', val)
+					this.$emit('update:modelValue', val)
+				}
+				if (this.collection) {
+					this.setCache(val);
+				}
+				this.$emit('change', val)
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+				// if (this.filterable && this.filterInput && this.mixinDatacomResData.findIndex(e => {
+				// 		return e[this.dataKey] == this
+				// 			.filterInput
+				// 	}) < 0) {
+				// 	if (!this.multiple) {
+				// 		this.filterInput = ""
+				// 	}
+
+				// }
+				this.showSelector = !this.showSelector
+				this.isFocus = this.showSelector
+				if (this.filterable && this.current && this.showSelector) {
+					if (!this.multiple) {
+						this.placeholderOld = this.current
+						// this.filterInput = ""
+					}
+				} else if (this.filterable && !this.current && !this.showSelector) {
+					if (this.placeholderOld != this.placeholder) {
+						if (!this.multiple) {
+							this.current = this.placeholderOld
+						}
+					}
+				}
+				this.filterInput = ""
+
+			},
+			formatItemName(item) {
+				if (!item) {
+					return ""
+				}
+				let text = item[this.dataKey]
+				let value = item[this.dataValue]
+				let {
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`, "g"), item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData() {
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey() {
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		cursor: pointer;
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+		min-height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		min-height: 35px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+
+		.tag-calss {
+			font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+			font-weight: 400;
+			-webkit-font-smoothing: antialiased;
+			-webkit-tap-highlight-color: transparent;
+			font-size: 12px;
+			border: 1px solid #d9ecff;
+			border-radius: 4px;
+			white-space: nowrap;
+			height: 24px;
+			padding: 0 4px 0px 8px;
+			line-height: 22px;
+			box-sizing: border-box;
+			margin: 2px 0 2px 6px;
+			display: flex;
+			max-width: 100%;
+			align-items: center;
+			background-color: #f4f4f5;
+			border-color: #e9e9eb;
+			color: #909399;
+
+			.text {
+				font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+				font-weight: 400;
+				-webkit-font-smoothing: antialiased;
+				-webkit-tap-highlight-color: transparent;
+				font-size: 12px;
+				white-space: nowrap;
+				line-height: 22px;
+				color: #909399;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+		}
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* 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-select__input-text {
+		// width: 280px;
+		width: 90%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/zxz-uni-data-select/package.json b/uni_modules/zxz-uni-data-select/package.json
new file mode 100644
index 0000000..820ab80
--- /dev/null
+++ b/uni_modules/zxz-uni-data-select/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "zxz-uni-data-select",
+  "displayName": "zxz-uni-data-select 下拉框选择器(添加下拉框检索，多选功能，多选搜索功能，自定义数据)",
+  "version": "1.0.13",
+  "description": "通过数据驱动的下拉框选择器(添加下拉框检索，多选功能，多选搜索功能，自定义数据)",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "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",
+        "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/zxz-uni-data-select/readme.md b/uni_modules/zxz-uni-data-select/readme.md
new file mode 100644
index 0000000..45483ef
--- /dev/null
+++ b/uni_modules/zxz-uni-data-select/readme.md
@@ -0,0 +1,26 @@
+## DataSelect 下拉框选择器
+> **组件名：zxz-uni-data-select**
+> 代码块： `zxz-uni-data-select`
+
+当选项过多时，使用下拉菜单展示并选择内容
+## API
+
+### zxz-uni-data-select Props
+
+|  属性名		|    类型				| 默认值	| 说明								|
+| -				| -						| -			| -									|
+| v-model		| String、Array、Number	|-			| 选中项绑定值						|
+| multiple		| Boolean				| false		| 是否多选							|
+| disabled		| Boolean				|false		| 是否禁用							|
+| dataKey		| String				|"key"		| 作为 key 唯一标识的键名			|
+| dataValue		| String				| "value"	| 作为 value 唯一标识的键名			|
+| collapseTags	| Boolean				| false		| 多选时是否将选中值按文字的形式展示|
+|collapseTagsNum|Number					| 1			| 多选时选中值按文字的形式展示的数量|
+| localdata		| Array					|-			| 下拉列表本地数据					|
+|label	| String	| -	| 左侧标题
+|placeholder	| String	| "请选择"	| 输入框的提示文字
+|emptyTips	| String	|"无选项"	| 无选项提示
+|clear	| Boolean	| true| 是否清空
+|format	| String	| -	| 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+		
+#### 如使用过程中有任何问题，或者您对组件有一些好的建议，欢迎加微weiyila520
diff --git a/utils/CLodopfuncs.js b/utils/CLodopfuncs.js
new file mode 100644
index 0000000..6915072
--- /dev/null
+++ b/utils/CLodopfuncs.js
@@ -0,0 +1,1903 @@
+/* eslint-disable */
+import store from '@/vuex/store'
+
+// #ifdef APP-PLUS
+window = {
+	location: {
+		href: 'http://127.0.0.1/print'
+	}
+};
+// #endif
+(function(win) {
+	const iparr = store.getters.printUrl;
+	const urlRegex = /http:\/\/(\d+\.\d+\.\d+\.\d+)(:\d+)?/;
+	const match = iparr.match(urlRegex);
+	let printIp = match[1]; // IP 地址
+	let printPort = match[1] + (match[2] || ''); // IP 地址加端口
+	let printListDev = [];
+	let printListOnline = [];
+	var CLODOP = {
+		strWebPageID:"JL68836",
+		strTaskID: "",
+		// strHostURI: "http://192.168.81.187:8000",
+		// wsHostURI: "ws://192.168.81.187:8000/c_webskt/",
+		strHostURI: "http://" + printPort,
+		wsHostURI: "ws://" + printPort + "/c_webskt/",
+		VERSION:"6.2.2.0",
+		IVERSION:"6220",
+		CVERSION:"3.0.2.5",
+		HTTPS_STATUS:0,
+		VERSION_EXT:false,
+		iBaseTask: 0,
+		timeThreshold: 5,
+		Priority: 0,
+		blIslocal:false,
+		Iframes: [],
+		ItemDatas: {},
+		PageData: {},
+		defStyleJson: {},
+		PageDataEx: {},
+		ItemCNameStyles: {},
+		blWorking: false,
+		blNormalItemAdded: false,
+		blTmpSelectedIndex: null,
+		Caption: null,
+		Color: null,
+		CompanyName: null,
+		strBroadcastMS: null,
+		Border: null,
+		Inbrowse: null,
+		webskt: null,
+		SocketEnable: false,
+		SocketOpened: false,
+		NoClearAfterPrint: false,
+		On_Return_Remain: false,
+		On_Broadcast_Remain: false,
+		On_Return: null,
+		Result: null,
+		iTrySendTimes: 0,
+		OBO_Mode: 1,
+		blOneByone: false,
+		DelimChar: "\f\f",
+		Printers: {
+			"default": "1",
+			"list":[]
+		},
+		altMessageWebSocketInvalid: "WebSocket没准备好，点确定继续...",
+		altMessageNoReadWriteFile: "不能远程读写文件!",
+		altMessageNoReadFile: "不能远程读文件!",
+		altMessageNoWriteFile: "不能远程写文件!",
+		altMessageNoPrintDesign: "不能远程打印设计!",
+		altMessageNoPrintSetup: "不能远程打印维护!",
+		altMessageSomeWindowExist: "有窗口已打开，先关闭它(持续如此时请刷新页面)!",
+		altMessageBusy: "上一个请求正忙，请稍后再试！",
+		Browser: (function() {
+			// #ifdef APP-PLUS
+			navigator = {
+				userAgent: `Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36`
+			};
+			// #endif
+			var ua = navigator.userAgent;
+			var isOpera = Object.prototype.toString.call(window.opera) == "[object Opera]";
+			return {
+				IE: !!window.attachEvent && !isOpera,
+				Opera: isOpera,
+				WebKit: ua.indexOf("AppleWebKit/") > -1,
+				Gecko: ua.indexOf("Gecko") > -1 && ua.indexOf("KHTML") === -1,
+				MobileSafari: /Apple.*Mobile/.test(ua)
+			}
+		})(),
+		GetTaskID: function() {
+			if (!this.strTaskID || this.strTaskID == "") {
+				var dt = new Date();
+				this.iBaseTask++;
+				this.strTaskID = "" + dt.getHours() + dt.getMinutes() + dt.getSeconds() + "_" + this.iBaseTask;
+			}
+			return this.strWebPageID + this.strTaskID;
+		},
+		DoInit: function() {
+			if (process.env.NODE_ENV === 'development') {
+				//开发环境
+				CLODOP.Printers.list = printListDev
+			} else {
+				//生产环境
+				CLODOP.Printers.list = printListOnline
+			}
+			this.strTaskID = "";
+			if (this.NoClearAfterPrint) return;
+			this.ItemDatas = {
+				"count": 0
+			};
+			this.PageData = {};
+			this.ItemCNameStyles = {};
+			this.defStyleJson = {
+				"beginpage": 0,
+				"beginpagea": 0
+			};
+			this.blNormalItemAdded = false;
+			// win.CLODOP.OpenWebSocket();
+		},
+		OpenWebSocket: function(rest) {
+			// #ifdef APP-PLUS
+			if (window.On_CLodop_Opened) {
+				if (CLODOP.Priority == window.CLODOP_OK_Priority) setTimeout("window.On_CLodop_Opened(CLODOP)", 1);
+			}
+			// #endif
+			if (!window.WebSocket && !window.MozWebSocket) {
+				if (window.On_CLodop_Opened) {
+					if (CLODOP.Priority == window.CLODOP_OK_Priority) setTimeout("window.On_CLodop_Opened(CLODOP)", 1);
+				}
+			}
+			console.log(this.webskt)
+			console.log(CLODOP.wsHostURI)
+			console.log(rest)
+			// let ip = uni.getStorageSync('fl_ip') || '192.168.81.187';
+			let ip = printIp;
+			let wsHostURI = `ws://${ip}:8000/c_webskt/`
+			this.SocketEnable = true;
+			try {
+				if (!this.webskt || this.webskt.readyState == 3 || rest) {
+					console.log('链接')
+					if (!window.WebSocket && window.MozWebSocket) window.WebSocket = window.MozWebSocket;
+					this.webskt = uni.connectSocket({
+						url: wsHostURI,
+						success: res => {
+							console.info(res);
+							console.log('链接成功')
+						},
+						fail: res => {
+							console.info(res);
+							console.log('链接失败')
+						},
+						complete: res => {
+							console.info(res);
+							console.log('链接完成')
+						}
+					});
+					console.log(this.webskt)
+					this.webskt.onOpen(function(e) {
+						CLODOP.SocketOpened = true;
+						if (window.On_CLodop_Opened) {
+							if (CLODOP.Priority == window.CLODOP_OK_Priority) setTimeout(window.On_CLodop_Opened(CLODOP), 10000);
+						}
+					});
+					this.webskt.onMessage(function(e) {
+						console.log(e);
+						CLODOP.resultHandle(e.data);
+					});
+					this.webskt.onClose(function(e) {
+						if (!CLODOP.SocketOpened) {
+							CLODOP.SocketEnable = false;
+							return;
+						}
+						// setTimeout(CLODOP.OpenWebSocket(), 2000);
+					});
+					this.webskt.onError(function(e) {
+						console.info(e);
+					});
+				}
+			} catch (err) {
+				this.webskt = null;
+				if (err.message.indexOf("SecurityError") > -1)
+					this.SocketEnable = false;
+				else
+					setTimeout(()=>{
+          CLODOP.OpenWebSocket()
+        }, 2000);
+			}
+		},
+		resultHandle: function(data) {
+			CLODOP.blOneByone = false;
+			var strResult = data;
+			CLODOP.Result = strResult;
+			try {
+				var strFTaskID = null;
+				var iPos = strResult.indexOf("=");
+				if (iPos >= 0 && iPos < 30) {
+					strFTaskID = strResult.slice(0, iPos);
+					strResult = strResult.slice(iPos + 1);
+				}
+				if (strFTaskID.indexOf("ErrorMS") > -1) {
+					console.info(strResult);
+					return;
+				}
+				if (strFTaskID.indexOf("BroadcastMS") > -1) {
+					CLODOP.strBroadcastMS = strResult;
+					if (CLODOP.On_Broadcast) {
+						var selfFunc = CLODOP.On_Broadcast;
+						CLODOP.On_Broadcast(strResult);
+						if (!CLODOP.On_Broadcast_Remain && selfFunc === CLODOP.On_Broadcast)
+							CLODOP.On_Broadcast = null;
+					}
+					return;
+				}
+				if (CLODOP.On_Return) {
+					var selfFunc = CLODOP.On_Return;
+					if ((strResult.toLowerCase() == "true") || (strResult.toLowerCase() == "false"))
+						CLODOP.On_Return(strFTaskID, strResult.toLowerCase() == "true");
+					else
+						CLODOP.On_Return(strFTaskID, strResult);
+					if (!CLODOP.On_Return_Remain && selfFunc === CLODOP.On_Return) CLODOP.On_Return = null;
+				}
+			} catch (err) {
+				console.log(err);
+			};
+		},
+		wsSend: function(strData) {
+			// console.info(strData);
+			console.log(this.webskt);
+			console.log(this.wsHostURI);
+			console.log(11);
+			if (this.webskt && this.webskt.readyState == 1) {
+				this.Result = null;
+				this.iTrySendTimes = 0;
+				this.webskt.send({
+					data: strData,
+					success: res => {
+						console.info(res);
+					},
+					fail: res => {
+						console.info(res);
+					}
+				});
+				return true;
+			} else {
+				this.iTrySendTimes++;
+				console.log(this.iTrySendTimes);
+				if (this.iTrySendTimes <= 1) {
+					this.OpenWebSocket();
+					setTimeout(()=>{
+						CLODOP.wsSend(strData)
+					}, 1000);
+				}
+			}
+		},
+		FORMAT: function(oType, oValue) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (oType !== undefined && oValue !== undefined) {
+				if (oType.replace(/^\s+|\s+$/g, "").toLowerCase().indexOf("time:") == 0) {
+					oType = oType.replace(/^\s+|\s+$/g, "").slice(5);
+					if (oValue.toLowerCase().indexOf("now") > -1) oValue = (new Date()).toString();
+					if (oValue.toLowerCase().indexOf("date") > -1) oValue = (new Date()).toString();
+					if (oValue.toLowerCase().indexOf("time") > -1) oValue = (new Date()).toString();
+					var TypeYMD = "ymd";
+					if (oValue.toLowerCase().indexOf("ymd") > -1) {
+						TypeYMD = "ymd";
+						oValue = oValue.slice(3);
+					}
+					if (oValue.toLowerCase().indexOf("dmy") > -1) {
+						TypeYMD = "dmy";
+						oValue = oValue.slice(3);
+					}
+					if (oValue.toLowerCase().indexOf("mdy") > -1) {
+						TypeYMD = "mdy";
+						oValue = oValue.slice(3);
+					}
+					oValue = oValue.replace(/ [^ ]*\+[^ ]* /g, " ");
+					oValue = oValue.replace(/\(.*\)/g, " ");
+					oValue = oValue.replace(/星期日|星期一|星期二|星期三|星期四|星期五|星期六/g, " ");
+					oValue = oValue.replace(/[A-Za-z]+day|Mon|Tue|Wed|Thu|Fri|Sat|Sun/g, " ");
+					var aMonth = 0;
+					var exp = new RegExp("Oct[A-Za-z]*|十月|10月", "i");
+					if (oValue.match(exp) !== null) {
+						aMonth = 10;
+						oValue = oValue.replace(exp, "");
+					}
+					exp = new RegExp("Nov[A-Za-z]*|十一月|11月", "i");
+					if (oValue.match(exp) !== null) {
+						aMonth = 11;
+						oValue = oValue.replace(exp, "");
+					}
+					exp = new RegExp("Dec[A-Za-z]*|十二月|12月", "i");
+					if (oValue.match(exp) !== null) {
+						aMonth = 12;
+						oValue = oValue.replace(exp, "");
+					}
+					exp = new RegExp("Jan[A-Za-z]*|一月|01月|1月", "i");
+					if (oValue.match(exp) !== null) {
+						aMonth = 1;
+						oValue = oValue.replace(exp, "");
+					}
+					exp = new RegExp("Feb[A-Za-z]*|二月|02月|2月", "i");
+					if (oValue.match(exp) !== null) {
+						aMonth = 2;
+						oValue = oValue.replace(exp, "");
+					}
+					exp = new RegExp("Mar[A-Za-z]*|三月|03月|3月", "i");
+					if (oValue.match(exp) !== null) {
+						aMonth = 3;
+						oValue = oValue.replace(exp, "");
+					}
+					exp = new RegExp("Apr[A-Za-z]*|四月|04月|4月", "i");
+					if (oValue.match(exp) !== null) {
+						aMonth = 4;
+						oValue = oValue.replace(exp, "");
+					}
+					exp = new RegExp("May[A-Za-z]*|五月|05月|5月", "i");
+					if (oValue.match(exp) !== null) {
+						aMonth = 5;
+						oValue = oValue.replace(exp, "");
+					}
+					exp = new RegExp("Jun[A-Za-z]*|六月|06月|6月", "i");
+					if (oValue.match(exp) !== null) {
+						aMonth = 6;
+						oValue = oValue.replace(exp, "");
+					}
+					exp = new RegExp("Jul[A-Za-z]*|七月|07月|7月", "i");
+					if (oValue.match(exp) !== null) {
+						aMonth = 7;
+						oValue = oValue.replace(exp, "");
+					}
+					exp = new RegExp("Aug[A-Za-z]*|八月|08月|8月", "i");
+					if (oValue.match(exp) !== null) {
+						aMonth = 8;
+						oValue = oValue.replace(exp, "");
+					}
+					exp = new RegExp("Sep[A-Za-z]*|九月|09月|9月", "i");
+					if (oValue.match(exp) !== null) {
+						aMonth = 9;
+						oValue = oValue.replace(exp, "");
+					}
+					oValue = oValue.replace(/日|秒/g, " ");
+					oValue = oValue.replace(/时|分/g, ":");
+					var subTime = oValue.match(/ \d+:\d+:\d+/);
+					if (subTime == null) subTime = "";
+					oValue = oValue.replace(/ \d+:\d+:\d+/, "") + subTime;
+					var dValue = new Date();
+					var iYear = 0;
+					var iMonth = 0;
+					var iDate = 0;
+					var iHour = 0;
+					var iMinutes = 0;
+					var iSecond = 0;
+					var tmpValue = oValue;
+					var sValue = "";
+					var MC1 = 0;
+					MC2 = 0;
+					MC3 = 0;
+					sValue = tmpValue.match(/\d+/);
+					if (sValue !== null) {
+						MC1 = parseInt(sValue[0]);
+						tmpValue = tmpValue.replace(/\d+/, "");
+					}
+					sValue = tmpValue.match(/\d+/);
+					if (sValue !== null) {
+						MC2 = parseInt(sValue[0]);
+						tmpValue = tmpValue.replace(/\d+/, "");
+					}
+					if (aMonth <= 0) {
+						sValue = tmpValue.match(/\d+/);
+						if (sValue !== null) {
+							MC3 = parseInt(sValue[0]);
+							tmpValue = tmpValue.replace(/\d+/, "");
+						}
+					}
+					if (aMonth > 0) {
+						iMonth = aMonth;
+						if (MC2 <= 31) {
+							iYear = MC1;
+							iDate = MC2;
+						} else {
+							iYear = MC2;
+							iDate = MC1;
+						}
+					} else
+					if (TypeYMD == "dmy") {
+						iDate = MC1;
+						iMonth = MC2;
+						iYear = MC3;
+					} else
+					if (TypeYMD == "mdy") {
+						iMonth = MC1;
+						iDate = MC2;
+						iYear = MC3;
+					} else {
+						iYear = MC1;
+						iMonth = MC2;
+						iDate = MC3;
+						if (MC3 > 31) {
+							iYear = MC3;
+							iMonth = MC1;
+							iDate = MC2;
+							if (MC1 > 12) {
+								iDate = MC1;
+								iMonth = MC2
+							};
+						} else {
+							if (MC2 > 12) {
+								iYear = MC2;
+								iMonth = MC1;
+							}
+						}
+					}
+					var sValue = tmpValue.match(/\d+/);
+					if (sValue !== null) {
+						iHour = parseInt(sValue[0]);
+						tmpValue = tmpValue.replace(/\d+/, "");
+					}
+					var sValue = tmpValue.match(/\d+/);
+					if (sValue !== null) {
+						iMinutes = parseInt(sValue[0]);
+						tmpValue = tmpValue.replace(/\d+/, "");
+					}
+					var sValue = tmpValue.match(/\d+/);
+					if (sValue !== null) {
+						iSecond = parseInt(sValue[0]);
+						tmpValue = tmpValue.replace(/\d+/, "");
+					}
+					if (oType.toLowerCase() == "isvalidformat")
+						oValue = (iYear > 0 && iMonth > 0 && iMonth <= 12 && iDate > 0 && iDate <= 31);
+					else {
+						if (("" + iYear).length < 4) iYear = iYear + 2000;
+						dValue.setFullYear(iYear, iMonth - 1, iDate);
+						dValue.setHours(iHour);
+						dValue.setMinutes(iMinutes);
+						dValue.setSeconds(iSecond);
+						var iDay = dValue.getDay();
+						if (oType.toLowerCase() == "weekindex")
+							oValue = iDay;
+						else
+						if (oType.toLowerCase() == "floatvalue")
+							oValue = dValue.getTime();
+						else {
+							var sWeek = "";
+							switch (iDay) {
+								case 0:
+									sWeek = "日";
+									break;
+								case 1:
+									sWeek = "一";
+									break;
+								case 2:
+									sWeek = "二";
+									break;
+								case 3:
+									sWeek = "三";
+									break;
+								case 4:
+									sWeek = "四";
+									break;
+								case 5:
+									sWeek = "五";
+									break;
+								case 6:
+									sWeek = "六";
+									break;
+							}
+							oValue = oType.replace(/dddd/ig, "星期" + sWeek);
+							if (/(y+)/i.test(oValue)) oValue = oValue.replace(RegExp.$1, (iYear + "").substr(4 - RegExp.$1.length));
+							if (/(m+:)/i.test(oValue)) oValue = oValue.replace(RegExp.$1, ("00" + iMinutes + ":").substr(("00" + iMinutes +
+								":").length - RegExp.$1.length));
+							if (/(M+)/i.test(oValue)) {
+								var dsWidth = ("" + iMonth).length > RegExp.$1.length ? ("" + iMonth).length : RegExp.$1.length;
+								oValue = oValue.replace(RegExp.$1, ("00" + iMonth).substr(("00" + iMonth).length - dsWidth));
+							}
+							if (/(d+)/i.test(oValue)) {
+								var dsWidth = ("" + iDate).length > RegExp.$1.length ? ("" + iDate).length : RegExp.$1.length;
+								oValue = oValue.replace(RegExp.$1, ("00" + iDate).substr(("00" + iDate).length - dsWidth));
+							}
+							if (/(H+)/i.test(oValue)) oValue = oValue.replace(RegExp.$1, ("00" + iHour).substr(("00" + iHour).length -
+								RegExp.$1.length));
+							if (/(n+)/i.test(oValue)) oValue = oValue.replace(RegExp.$1, ("00" + iMinutes).substr(("00" + iMinutes).length -
+								RegExp.$1.length));
+							if (/(s+)/i.test(oValue)) oValue = oValue.replace(RegExp.$1, ("00" + iSecond).substr(("00" + iSecond).length -
+								RegExp.$1.length));
+						}
+					}
+					if (CLODOP.On_Return) {
+						var selfFunc = CLODOP.On_Return;
+						CLODOP.On_Return(0, oValue);
+						if (!CLODOP.On_Return_Remain && selfFunc === CLODOP.On_Return) CLODOP.On_Return = null;
+					}
+					return oValue;
+				} else
+				if (this.blIslocal || oType.indexOf("FILE:") < 0) {
+					this.PageData["format_type"] = oType;
+					this.PageData["format_value"] = oValue;
+					if (this.DoPostDatas("format") == true) {
+						this.GetLastResult(false);
+						tResult = this.GetTaskID();
+					}
+				} else console.info(this.altMessageNoReadWriteFile)
+			}
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		SET_PRINT_PAPER: function(Top, Left, Width, Height, strPrintTask) {
+			return this.PRINT_INITA(Top, Left, Width, Height, strPrintTask);
+		},
+		PRINT_INIT: function(strPrintTask,host) {
+			this.wsHostURI = `ws://${host}:8000/c_webskt/`;
+			return this.PRINT_INITA(null, null, null, null, strPrintTask);
+		},
+		PRINT_INITA: function(Top, Left, Width, Height, strPrintTask) {
+			if (Top === undefined || Top === null) Top = "";
+			if (Left === undefined || Left === null) Left = "";
+			if (Width === undefined || Width === null) Width = "";
+			if (Height === undefined || Height === null) Height = "";
+			if (strPrintTask === undefined || strPrintTask === null) strPrintTask = "";
+			this.NoClearAfterPrint = false;
+			this.DoInit();
+			this.PageData["top"] = Top;
+			this.PageData["left"] = Left;
+			this.PageData["width"] = Width;
+			this.PageData["height"] = Height;
+			this.PageData["printtask"] = strPrintTask;
+			return true;
+		},
+		SET_PRINT_MODE: function(strModeType, ModeValue) {
+			if (strModeType === undefined || strModeType === null) strModeType = "";
+			if (ModeValue === undefined || ModeValue === null) ModeValue = "";
+			if (strModeType === "") return false;
+			strModeType = strModeType.toLowerCase();
+			this.PageData[strModeType] = ModeValue;
+			if (strModeType == "noclear_after_print") this.NoClearAfterPrint = ModeValue;
+			if (strModeType.indexOf("window_def") > -1 || strModeType.indexOf("control_printer") > -1) {
+				var tResult = null;
+				if (this.DoPostDatas("onlysetprint") == true) {
+					this.GetLastResult(false);
+					tResult = this.GetTaskID();
+				}
+				this.DoInit();
+				this.blWorking = false;
+				return tResult;
+			}
+		},
+		ADD_PRINT_TEXT: function(top, left, width, height, strText) {
+			return this.AddItemArray(2, top, left, width, height, strText);
+		},
+		ADD_PRINT_TEXTA: function(itemName, top, left, width, height, strText) {
+			return this.AddItemArray(2, top, left, width, height, strText, itemName);
+		},
+		ADD_PRINT_HTM: function(top, left, width, height, strHTML) {
+			return this.AddItemArray(4, top, left, width, height, strHTML);
+		},
+		ADD_PRINT_HTML: function(top, left, width, height, strHTML) {
+			return this.AddItemArray(1, top, left, width, height, strHTML);
+		},
+		ADD_PRINT_HTMLA: function(itemName, top, left, width, height, strHTML) {
+			return this.AddItemArray(1, top, left, width, height, strHTML, itemName);
+		},
+		ADD_PRINT_BARCODE: function(top, left, width, height, BarType, BarValue) {
+			return this.AddItemArray(9, top, left, width, height, BarValue, null, null, null, null, null, null, BarType);
+		},
+		ADD_PRINT_BARCODEA: function(ItemName, top, left, width, height, BarType, BarValue) {
+			return this.AddItemArray(9, top, left, width, height, BarValue, ItemName, null, null, null, null, null, BarType);
+		},
+		ADD_PRINT_RECTA: function(top, left, width, height, intPenStyle, intPenWidth, intColor) {
+			return this.AddItemArray(3, top, left, width, height, null, null, 2, intPenStyle, intPenWidth, intColor, null);
+		},
+		ADD_PRINT_RECT: function(top, left, width, height, intPenStyle, intPenWidth) {
+			return this.AddItemArray(3, top, left, width, height, null, null, 2, intPenStyle, intPenWidth, null, null);
+		},
+		ADD_PRINT_ELLIPSEA: function(top, left, width, height, intPenStyle, intPenWidth, intColor) {
+			return this.AddItemArray(3, top, left, width, height, null, null, 3, intPenStyle, intPenWidth, intColor, null);
+		},
+		ADD_PRINT_ELLIPSE: function(top, left, width, height, intPenStyle, intPenWidth) {
+			return this.AddItemArray(3, top, left, width, height, null, null, 3, intPenStyle, intPenWidth, null, null);
+		},
+		ADD_PRINT_SHAPE: function(ShapeType, top, left, width, height, intPenStyle, intPenWidth, intColor) {
+			return this.AddItemArray(3, top, left, width, height, null, null, ShapeType, intPenStyle, intPenWidth, intColor,
+				null);
+		},
+		ADD_PRINT_LINE: function(top1, left1, top2, left2, intPenStyle, intPenWidth) {
+			return this.AddItemArray(3, top1, left1, top2, left2, null, null, 0, intPenStyle, intPenWidth, null, "1");
+		},
+		ADD_PRINT_DNLINE: function(Top, Left, Width, Height, intPenStyle, intPenWidth) {
+			return this.AddItemArray(3, Top, Left, Width, Height, null, null, 1, intPenStyle, intPenWidth, null, null);
+		},
+		ADD_PRINT_DNLINEA: function(Top, Left, Width, Height, intPenStyle, intPenWidth, intColor) {
+			return this.AddItemArray(3, Top, Left, Width, Height, null, null, 1, intPenStyle, intPenWidth, intColor, null);
+		},
+		ADD_PRINT_UPLINE: function(Top, Left, Width, Height, intPenStyle, intPenWidth) {
+			return this.AddItemArray(3, Top, Left, Width, Height, null, null, 0, intPenStyle, intPenWidth, null, null);
+		},
+		ADD_PRINT_UPLINEA: function(Top, Left, Width, Height, intPenStyle, intPenWidth, intColor) {
+			return this.AddItemArray(3, Top, Left, Width, Height, null, null, 0, intPenStyle, intPenWidth, intColor, null);
+		},
+		ADD_PRINT_TABLE: function(top, left, width, height, strHTML) {
+			return this.AddItemArray(6, top, left, width, height, strHTML);
+		},
+		ADD_PRINT_TBURL: function(top, left, width, height, strURL) {
+			return this.AddItemArray(7, top, left, width, height, strURL);
+		},
+		ADD_PRINT_URL: function(top, left, width, height, strURL) {
+			return this.AddItemArray(5, top, left, width, height, strURL);
+		},
+		ADD_PRINT_IMAGE: function(top, left, width, height, strHTML) {
+			return this.AddItemArray(8, top, left, width, height, strHTML);
+		},
+		ADD_PRINT_CHART: function(top, left, width, height, strChartTypess, strHTML) {
+			return this.AddItemArray(10, top, left, width, height, strHTML, null, null, null, null, null, null, null,
+				strChartTypess);
+		},
+
+		SET_PRINT_PROPERTY: function(ItemNO, intPageType, intHorzOrient, intVertOrient) {
+			this.SET_PRINT_STYLEA(ItemNO, "ItemType", intPageType);
+			this.SET_PRINT_STYLEA(ItemNO, "HOrient", intHorzOrient);
+			this.SET_PRINT_STYLEA(ItemNO, "VOrient", intVertOrient);
+		},
+		SET_PRINT_PROPERTYA: function(ItemName, intPageType, intHorzOrient, intVertOrient) {
+			this.SET_PRINT_PROPERTY(ItemName, intPageType, intHorzOrient, intVertOrient);
+		},
+		SET_PRINT_STYLE: function(strStyleName, StyleValue) {
+			if (strStyleName === undefined || strStyleName === null) strStyleName = "";
+			if (StyleValue === undefined || StyleValue === null) StyleValue = "";
+			if (strStyleName === "") return false;
+			strStyleName = strStyleName.toLowerCase();
+			this.defStyleJson[strStyleName] = StyleValue;
+		},
+		SET_PRINT_STYLEA: function(ItemNo, strKey, Value) {
+			if (ItemNo === undefined || ItemNo === null) ItemNo = "";
+			if (strKey === undefined || strKey === null) strKey = "";
+			if (Value === undefined || Value === null) Value = "";
+			if (ItemNo === "" || strKey === "") return false;
+			if (this.ItemDatas["count"] <= 0) {
+				if (this.PageData["add_print_program_data"] !== undefined) {
+					this.ItemCNameStyles[strKey.toLowerCase() + "-" + ItemNo] = Value;
+					return true;
+				} else {
+					return false;
+				}
+			}
+			strKey = strKey.toLowerCase();
+			if (strKey == "type") return false;
+			var blResult = false;
+			if (ItemNo == 0) {
+				ItemNo = this.ItemDatas["count"];
+			}
+			for (var vItemNO in this.ItemDatas) {
+				var ItemName = this.ItemDatas[vItemNO]["itemname"];
+				if ((ItemNo == vItemNO) || (ItemNo == ItemName) || ((typeof ItemNo === "string") && (typeof ItemName ===
+						"string") && (ItemNo.toUpperCase() == ItemName.toUpperCase()))) {
+					this.ItemDatas[vItemNO][strKey] = Value;
+					blResult = true;
+				}
+			}
+			if (blResult) return true;
+			return false;
+		},
+		SET_PRINT_TEXT_STYLE: function(ItemNO, strFontName, intSize, intBold, intItalic, intUnderline, intAlignment) {
+			this.SET_PRINT_STYLEA(ItemNO, "fontname", strFontName);
+			this.SET_PRINT_STYLEA(ItemNO, "fontsize", intSize);
+			this.SET_PRINT_STYLEA(ItemNO, "bold", intBold);
+			this.SET_PRINT_STYLEA(ItemNO, "italic", intItalic);
+			this.SET_PRINT_STYLEA(ItemNO, "underline", intUnderline);
+			this.SET_PRINT_STYLEA(ItemNO, "alignment", intAlignment);
+		},
+		SET_PRINT_TEXT_STYLEA: function(ItemNO, strFontName, intSize, intBold, intItalic, intUnderline, intAlignment, Color) {
+			this.SET_PRINT_TEXT_STYLE(ItemNO, strFontName, intSize, intBold, intItalic, intUnderline, intAlignment);
+			this.SET_PRINT_STYLEA(ItemNO, "fontcolor", Color);
+		},
+		SET_PRINT_TEXT_STYLEB: function(ItemNO, strFontName, intSize, intBold, intItalic, intUnderline, intAlignment, Color) {
+			this.SET_PRINT_TEXT_STYLEA(ItemNO, strFontName, intSize, intBold, intItalic, intUnderline, intAlignment, Color);
+		},
+		NEWPAGE: function() {
+			this.NewPage();
+		},
+		NewPage: function() {
+			var blSomeNormal = false;
+			var noItemType;
+			for (var vItemNO in this.ItemDatas) {
+				if (vItemNO == "count") noItemType = false;
+				else noItemType = true;
+				for (var vItemxx in this.ItemDatas[vItemNO]) {
+					if (vItemxx == "itemtype") {
+						noItemType = false;
+						if ((this.ItemDatas[vItemNO][vItemxx] == 0) || (this.ItemDatas[vItemNO][vItemxx] == 4)) {
+							blSomeNormal = true;
+							break;
+						}
+					}
+				}
+				if (noItemType) blSomeNormal = true;
+				if (blSomeNormal) break;
+			}
+			if (blSomeNormal) this.defStyleJson["beginpage"] = this.defStyleJson["beginpage"] + 1;
+		},
+		NEWPAGEA: function() {
+			this.NewPageA();
+		},
+		NewPageA: function() {
+			var blSomeNormal = false;
+			var noItemType;
+			for (var vItemNO in this.ItemDatas) {
+				if (vItemNO == "count") noItemType = false;
+				else noItemType = true;
+				for (var vItemxx in this.ItemDatas[vItemNO]) {
+					if (vItemxx == "itemtype") {
+						noItemType = false;
+						if ((this.ItemDatas[vItemNO][vItemxx] == 0) || (this.ItemDatas[vItemNO][vItemxx] == 4)) {
+							blSomeNormal = true;
+							break;
+						}
+					}
+				}
+				if (noItemType) blSomeNormal = true;
+				if (blSomeNormal) break;
+			}
+			if (blSomeNormal) this.defStyleJson["beginpagea"] = this.defStyleJson["beginpagea"] + 1;
+		},
+		PREVIEW: function(sView, iW, iH) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if ((!sView) && (this.blIslocal)) {
+				if (this.DoPostDatas("preview") == true) {
+					this.Result = null;
+					this.GetLastResult(true);
+					tResult = this.GetTaskID();
+				}
+			} else {
+				if (this.DoPostDatas("cpreview") == true) {
+					this.DoCPreview(sView, iW, iH);
+					tResult = this.GetTaskID();
+				}
+			}
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		PRINT: function(sView, iW, iH) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (this.DoPostDatas("print") == true)
+				tResult = this.GetTaskID();
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		GET_PRINTER_COUNT: function() {
+			if (this.Printers === undefined) return 0;
+			else {
+				return this.Printers["list"].length;
+			}
+		},
+		GET_PRINTER_NAME: function(intNO) {
+			if (this.Printers === undefined) return "";
+			else {
+				if (typeof intNO == "string" && intNO.indexOf(":") > -1) {
+					var strPPname = intNO.slice(intNO.indexOf(":") + 1);
+					intNO = intNO.slice(0, intNO.indexOf(":"));
+					if (intNO == -1)
+						return this.Printers["list"][this.Printers["default"]][strPPname];
+					else
+						return this.Printers["list"][intNO][strPPname];
+				} else {
+					if (intNO == -1)
+						return this.Printers["list"][this.Printers["default"]].name;
+					else
+					if (intNO >= 0 && intNO < this.Printers["list"].length)
+						return this.Printers["list"][intNO].name;
+					else return "Printer NO. overflow";
+				}
+			}
+		},
+		GET_PAGESIZES_LIST: function(PNameIndx, Split, ListName, NameOrID) {
+			if (!ListName) ListName = "pagelist";
+			if (!NameOrID) NameOrID = "name";
+			if (this.Printers === undefined) return "";
+			else {
+				if (PNameIndx == -1) PNameIndx = this.Printers["list"][this.Printers["default"]].name;
+				for (var intNO in this.Printers["list"]) {
+					if (PNameIndx == intNO || PNameIndx == this.Printers["list"][intNO].name) {
+						var strList = "";
+						for (var iPNO in this.Printers["list"][intNO][ListName]) {
+							if ((NameOrID == "id") && this.Printers["list"][intNO][ListName][iPNO].id) {
+								if (strList === "") strList = this.Printers["list"][intNO][ListName][iPNO].id;
+								else
+									strList = strList + Split + this.Printers["list"][intNO][ListName][iPNO].id;
+							} else {
+								if (strList === "") strList = this.Printers["list"][intNO][ListName][iPNO].name;
+								else
+									strList = strList + Split + this.Printers["list"][intNO][ListName][iPNO].name;
+							}
+						}
+						return strList;
+					}
+				}
+				return "";
+			}
+		},
+		SET_PRINTER_INDEX: function(strName, strKeyModeName) {
+			if (isNaN(strName)) {
+				this.PageData.printerindex = 1
+			} else{
+				this.PageData.printerindex = strName
+			}
+			return true;
+			if (this.Printers === undefined) return false;
+			else {
+				if (!strKeyModeName) strKeyModeName = "printerindex";
+				strName = strName + "";
+				strName = strName.replace(/^\s+|\s+$/g, "");
+				var iPos = strName.indexOf(",");
+				var strNameOrNO = strName;
+				if (iPos > -1) strNameOrNO = strName.slice(0, iPos);
+				if (strNameOrNO == "-1") {
+					this.PageData[strKeyModeName] = this.Printers["default"];
+					if (iPos > -1) this.PageData["printersubid"] = strName.slice(iPos + 1);
+					return true;
+				} else {
+					for (var vNO in this.Printers["list"]) {
+						var strPrinterName = this.Printers["list"][vNO].name;
+						if (!strPrinterName) continue;
+						if ((strPrinterName.replace(/\\/g, "") == strNameOrNO.replace(/\\/g, "")) || (vNO == strNameOrNO)) {
+							this.PageData[strKeyModeName] = vNO;
+							if (iPos > -1) this.PageData["printersubid"] = strName.slice(iPos + 1);
+							return true;
+						}
+					}
+					return false;
+				}
+			}
+		},
+		SET_PRINTER_INDEXA: function(strName) {
+			return this.SET_PRINTER_INDEX(strName, "printerindexa");
+		},
+		PRINT_DESIGN: function() {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (this.blIslocal) {
+				if (this.DoPostDatas("print_design") == true) {
+					this.Result = null;
+					this.GetLastResult(true);
+					tResult = this.GetTaskID();
+				}
+			} else console.info(this.altMessageNoPrintDesign);
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		PRINT_SETUP: function() {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (this.blIslocal) {
+				if (this.DoPostDatas("print_setup") == true) {
+					this.Result = null;
+					this.GetLastResult(true);
+					tResult = this.GetTaskID();
+				}
+			} else console.info(this.altMessageNoPrintSetup);
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		SET_PRINT_PAGESIZE: function(intOrient, PageWidth, PageHeight, strPageName) {
+			if (intOrient !== undefined && intOrient !== null) this.PageData["orient"] = intOrient;
+			if (PageWidth !== undefined && PageWidth !== null) this.PageData["pagewidth"] = PageWidth;
+			if (PageHeight !== undefined && PageHeight !== null) this.PageData["pageheight"] = PageHeight;
+			if (strPageName !== undefined && strPageName !== null) this.PageData["pagename"] = strPageName;
+		},
+		SET_PRINT_COPIES: function(intCopies) {
+			if (intCopies !== undefined && intCopies !== null) {
+				this.PageData["printcopies"] = intCopies;
+				return true;
+			}
+		},
+		SELECT_PRINTER: function(blPrint) {
+			this.SelectBox.create(388, 240, !blPrint);
+			return true;
+		},
+		PRINTA: function(blPrintB, sView) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (!sView && this.blIslocal) {
+				this.Result = null;
+				if (blPrintB) {
+					if (this.DoPostDatas("printb") == true) {
+						this.GetLastResult(false);
+						tResult = this.GetTaskID();
+					}
+				} else {
+					if (this.DoPostDatas("printa") == true) {
+						this.GetLastResult(true);
+						tResult = this.GetTaskID();
+					}
+				}
+				this.DoInit();
+				this.blWorking = false;
+			} else {
+				this.SELECT_PRINTER(true);
+			}
+			return tResult;
+		},
+		PRINTAOK: function(iPrintIndex, iPrintCopies, iStartNO, iEndNO, onlySelect) {
+			this.SET_PRINTER_INDEX(iPrintIndex);
+			this.SET_PRINT_COPIES(iPrintCopies);
+			if (iStartNO !== undefined && iStartNO !== 0) this.SET_PRINT_MODE("PRINT_START_PAGE", iStartNO);
+			if (iEndNO !== undefined && iEndNO !== 0) this.SET_PRINT_MODE("PRINT_END_PAGE", iEndNO);
+			if (!onlySelect) this.PRINT();
+			else {
+				this.blTmpSelectedIndex = iPrintIndex;
+				if (CLODOP.On_Return) {
+					var selfFunc = CLODOP.On_Return;
+					CLODOP.On_Return(0, iPrintIndex);
+					if (!CLODOP.On_Return_Remain && selfFunc === CLODOP.On_Return) CLODOP.On_Return = null;
+				}
+			}
+		},
+		SET_LICENSES: function(strCompanyName, strLicense, strLicenseA, strLicenseB) {
+			if ((strCompanyName == 'THIRD LICENSE') && (strLicense == "")) {
+				if (strLicenseA && strLicenseA !== "") this.PageDataEx["licensec"] = strLicenseA;
+				if (strLicenseB && strLicenseB !== "") this.PageDataEx["licensed"] = strLicenseB;
+			} else if ((strCompanyName == 'LICENSE TETCODE') && (strLicense == "") && (strLicenseB == "")) {
+				if (strLicenseA && strLicenseA !== "") this.PageDataEx["Licensetetcode"] = strLicenseA;
+			} else {
+				if (strCompanyName && strCompanyName !== "") this.PageDataEx["companyname"] = strCompanyName;
+				if (strLicense && strLicense !== "") this.PageDataEx["license"] = strLicense;
+				if (strLicenseA && strLicenseA !== "") this.PageDataEx["licensea"] = strLicenseA;
+				if (strLicenseB && strLicenseB !== "") this.PageDataEx["licenseb"] = strLicenseB;
+			}
+		},
+		PRINTB: function() {
+			return this.PRINTA(true);
+		},
+		PREVIEWA: function() {
+			return this.PREVIEW();
+		},
+		PREVIEWB: function() {
+			return this.PREVIEW();
+		},
+		ADD_PRINT_SETUP_BKIMG: function(strContent) {
+			if (strContent !== undefined && strContent !== null) {
+				this.PageData["setup_bkimg"] = strContent;
+				return true;
+			}
+		},
+		SET_PREVIEW_WINDOW: function(intDispMode, intToolMode, blDirectPrint, oWidth, oHeight, strPButtonCaptoin) {
+			if (intDispMode !== undefined && intDispMode !== null) this.PageData["pvw_dispmode"] = intDispMode;
+			if (intToolMode !== undefined && intToolMode !== null) this.PageData["pvw_toolmode"] = intToolMode;
+			if (blDirectPrint !== undefined && blDirectPrint !== null) this.PageData["pvw_directprint"] = blDirectPrint;
+			if (oWidth !== undefined && oWidth !== null) this.PageData["pvw_width"] = oWidth;
+			if (oHeight !== undefined && oHeight !== null) this.PageData["pvw_height"] = oHeight;
+			if (strPButtonCaptoin !== undefined && strPButtonCaptoin !== null) this.PageData["pvw_puttoncaptoin"] =
+				strPButtonCaptoin;
+		},
+		SET_PREVIEW_MODE: function(ModeValue) {
+			if (ModeValue !== undefined) this.PageData["pvw_preview_mode"] = ModeValue;
+		},
+		SET_SHOW_MODE: function(strModeType, ModeValue) {
+			if (strModeType === undefined || strModeType === null) strModeType = "";
+			if (ModeValue === undefined || ModeValue === null) ModeValue = "";
+			if (strModeType === "") return false;
+			strModeType = strModeType.toLowerCase();
+			this.PageData['shwmod_' + strModeType] = ModeValue;
+		},
+		SAVE_TO_FILE: function(strFileName) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (this.blIslocal) {
+				if (strFileName) {
+					this.PageData["stf_file_name"] = strFileName;
+					if (this.DoPostDatas("savetofile") == true) {
+						this.GetLastResult(false);
+						tResult = this.GetTaskID();
+					}
+				}
+			} else console.info(this.altMessageNoWriteFile);
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		SET_SAVE_MODE: function(strModeType, ModeValue) {
+			if (strModeType === undefined || strModeType === null) strModeType = "";
+			if (ModeValue === undefined || ModeValue === null) ModeValue = "";
+			if (strModeType === "") return false;
+			strModeType = strModeType.toLowerCase();
+			this.PageData['stfmod_' + strModeType] = ModeValue;
+		},
+		SEND_PRINT_RAWDATA: function(strRawData) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (strRawData !== undefined) {
+				this.PageData["raw_print_data"] = strRawData;
+				if (this.DoPostDatas("sendrawdata") == true) {
+					this.GetLastResult(false);
+					tResult = this.GetTaskID();
+				}
+			}
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		WRITE_FILE_TEXT: function(WriteMode, strFileName, strText) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (this.blIslocal) {
+				if (strFileName !== undefined && strText !== undefined) {
+					this.PageData["write_file_mode"] = WriteMode;
+					this.PageData["write_file_name"] = strFileName;
+					this.PageData["write_file_text"] = strText;
+					if (this.DoPostDatas("writefiletext") == true) {
+						this.GetLastResult(false);
+						tResult = this.GetTaskID();
+					}
+				}
+			} else console.info(this.altMessageNoWriteFile);
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		GET_DIALOG_VALUE: function(oType, oPreValue) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (oType !== undefined && oPreValue !== undefined) {
+				if (this.blIslocal) {
+					this.PageData["dialog_type"] = oType;
+					this.PageData["dialog_value"] = oPreValue;
+					if (this.DoPostDatas("dialog") == true) {
+						this.GetLastResult(true);
+						tResult = this.GetTaskID();
+					}
+				} else console.info(this.altMessageNoReadWriteFile);
+			}
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		WRITE_PORT_DATA: function(strPortName, strData) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (strPortName !== undefined && strData !== undefined) {
+				this.PageData["write_port_name"] = strPortName;
+				this.PageData["write_port_data"] = strData;
+				if (this.DoPostDatas("writeportdata") == true) {
+					this.GetLastResult(false);
+					tResult = this.GetTaskID();
+				}
+			}
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		READ_PORT_DATA: function(strPortName) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (strPortName !== undefined) {
+				this.PageData["read_port_name"] = strPortName;
+				if (this.DoPostDatas("readportdata") == true) {
+					this.GetLastResult(false);
+					tResult = this.GetTaskID();
+				}
+			}
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		GET_SYSTEM_INFO: function(InfoType) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (InfoType !== undefined) {
+				this.PageData["system_info_type"] = InfoType;
+				if (this.DoPostDatas("getsysteminfo") == true) {
+					this.GetLastResult(false);
+					tResult = this.GetTaskID();
+				}
+			}
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		GET_FILE_TEXT: function(strFileName) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (this.blIslocal) {
+				if (strFileName !== undefined) {
+					this.PageData["get_file_name"] = strFileName;
+					if (this.DoPostDatas("getfiletext") == true) {
+						this.GetLastResult(false);
+						tResult = this.GetTaskID();
+					}
+				}
+			} else console.info(this.altMessageNoReadFile);
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		IS_FILE_EXIST: function(strFileName) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (this.blIslocal) {
+				if (strFileName !== undefined) {
+					this.PageData["file_exist_name"] = strFileName;
+					if (this.DoPostDatas("isfileexist") == true) {
+						this.GetLastResult(false);
+						tResult = this.GetTaskID();
+					}
+				}
+			} else console.info(this.altMessageNoReadFile);
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		GET_FILE_TIME: function(strFileName) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (this.blIslocal) {
+				if (strFileName !== undefined) {
+					this.PageData["file_time_name"] = strFileName;
+					if (this.DoPostDatas("getfiletime") == true) {
+						this.GetLastResult(false);
+						tResult = this.GetTaskID();
+					}
+				}
+			} else console.info(this.altMessageNoReadFile);
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		GET_PRINT_INIFFNAME: function(strPrintTaskName) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (this.blIslocal) {
+				if (strPrintTaskName !== undefined) {
+					this.PageData["iniff_task_name"] = strPrintTaskName;
+					if (this.DoPostDatas("getiniffname") == true) {
+						this.GetLastResult(false);
+						tResult = this.GetTaskID();
+					}
+				}
+			} else console.info(this.altMessageNoReadFile);
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		GET_VALUE: function(ValueType, ValueIndex) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (ValueType !== undefined && ValueIndex !== undefined) {
+				this.PageData["get_value_type"] = ValueType;
+				this.PageData["get_value_index"] = ValueIndex;
+				if (this.DoPostDatas("dogetvalue") == true) {
+					this.GetLastResult(false);
+					tResult = this.GetTaskID();
+				}
+			}
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		ADD_PRINT_DATA: function(DataType, oValue) {
+			if (DataType !== undefined && oValue !== null) {
+				if (DataType.toLowerCase().indexOf("programdata") > -1) {
+					this.PageData["add_print_program_data"] = oValue;
+					return true;
+				}
+			}
+		},
+		SHOW_CHART: function() {},
+		DO_ACTION: function(strActName, strActValue) {
+			if (this.blWorking) {
+				console.info(this.altMessageBusy);
+				return null;
+			}
+			var tResult = null;
+			if (strActName !== undefined && strActValue !== undefined) {
+				this.PageData["do_action_name"] = strActName;
+				this.PageData["do_action_value"] = strActValue;
+				if (this.DoPostDatas("doaction") == true) {
+					this.GetLastResult(false);
+					tResult = this.GetTaskID();
+				}
+			}
+			this.DoInit();
+			this.blWorking = false;
+			return tResult;
+		},
+		Create_Printer_List: function(oElement, blNoDetailForAO) {
+			while (oElement.childNodes.length > 0) {
+				var children = oElement.childNodes;
+				for (var i = 0; i < children.length; i++)
+					oElement.removeChild(children[i]);
+			};
+			var iCount = this.GET_PRINTER_COUNT();
+			var iIndex = 0;
+			for (var i = 0; i < iCount; i++) {
+				var option = document.createElement('option');
+				option.innerHTML = this.GET_PRINTER_NAME(i);
+				option.value = iIndex;
+				oElement.appendChild(option);
+				iIndex++;
+				if (this.VERSION_EXT) {
+					if (this.Printers["list"][i]["subdevlist"].length > 0) {
+						if (blNoDetailForAO) option.innerHTML = option.innerHTML + ',..';
+						else {
+							var strDrivename = option.innerHTML;
+							for (var j = 0; j < this.Printers["list"][i]["subdevlist"].length; j++) {
+								var strDevID = this.Printers["list"][i]["subdevlist"][j].id;
+								var strDevName = this.Printers["list"][i]["subdevlist"][j].name;
+								if (j == 0) {
+									option.innerHTML = strDrivename + ',' + strDevName;
+									option.value = strDrivename + ',' + strDevID + ';' + strDevName;
+								} else {
+									option = document.createElement('option');
+									option.innerHTML = strDrivename + ',' + strDevName;
+									option.value = strDrivename + ',' + strDevID + ';' + strDevName;
+									oElement.appendChild(option);
+									iIndex++;
+									if (iIndex >= 100) return;
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		Create_PageSize_List: function(oElement, printIndex) {
+			while (oElement.childNodes.length > 0) {
+				var children = oElement.childNodes;
+				for (var i = 0; i < children.length; i++)
+					oElement.removeChild(children[i]);
+			};
+			var strPageSizeList = CLODOP.GET_PAGESIZES_LIST(printIndex, "\n");
+			var Options = new Array();
+			Options = strPageSizeList.split("\n");
+			for (var i in Options) {
+				var option = document.createElement('option');
+				option.innerHTML = Options[i];
+				option.value = Options[i];
+				oElement.appendChild(option);
+			}
+		},
+		SET_BRIDGE_INDEX: function(strValue) {
+			if (this.Printers === undefined) return false;
+			else {
+				strValue = (strValue + "").replace(/^\s+|\s+$/g, "");
+				for (var vNO in this.Printers["list"]) {
+					var strDriverOrName = this.Printers["list"][vNO].name;
+					if (strDriverOrName == "(AO)Client-Bridge Driver") {
+						this.PageData["printerindex"] = vNO;
+						this.PageData["printersubid"] = strValue;
+						return true;
+					}
+				}
+				return false;
+			}
+		},
+		Get_AOPrinters_List: function(DriverNameOrIndex, strListName, strSplit) {
+			if (!strSplit) strSplit = "\n";
+			if (!strListName) strListName = "name";
+			return CLODOP.GET_PAGESIZES_LIST(DriverNameOrIndex, strSplit, "subdevlist", strListName);
+		},
+		Get_AOBridges_List: function(DriverNameOrIndex, strListName, strSplit) {
+			return CLODOP.Get_AOPrinters_List(DriverNameOrIndex, strListName, strSplit);
+		},
+		Get_AOBridge_List: function(strListName, strSplit) {
+			return CLODOP.Get_AOPrinters_List("(AO)Client-Bridge Driver", strListName, strSplit);
+		},
+		Get_AOBridge_SubPrinters_List: function(BridgeNameOrIndex, strListName, strSplit, DriverNameOrIndex) {
+			if (!DriverNameOrIndex) DriverNameOrIndex = "(AO)Client-Bridge Driver";
+			if (!strSplit) strSplit = "\n";
+			if (!strListName) strListName = "name";
+			for (var iDrvNO in this.Printers["list"]) {
+				if (DriverNameOrIndex == iDrvNO || DriverNameOrIndex == this.Printers["list"][iDrvNO].name) {
+					for (var iBdgNO in this.Printers["list"][iDrvNO]["subdevlist"]) {
+						var BridgeID = this.Printers["list"][iDrvNO]["subdevlist"][iBdgNO].id;
+						var BridgeName = this.Printers["list"][iDrvNO]["subdevlist"][iBdgNO].name;
+						if (BridgeNameOrIndex == iBdgNO || BridgeNameOrIndex == BridgeID + ";" + BridgeName) {
+							var strList = "";
+							for (var iSsbPNO in this.Printers["list"][iDrvNO]["subdevlist"][iBdgNO].ssbprinter["list"]) {
+								if (iSsbPNO != "0") strList = strList + strSplit;
+								if (strListName.toLowerCase() == "id") strList = strList + iSsbPNO;
+								else
+									strList = strList + this.Printers["list"][iDrvNO]["subdevlist"][iBdgNO].ssbprinter["list"][iSsbPNO].name;
+							}
+							return strList;
+						}
+					}
+				}
+			}
+			return "";
+		},
+		Get_AOBridge_SubPrinters_PageSize_List: function(BridgeNameOrIndex, SubPrinterNameOrIndex, strSplit,
+			DriverNameOrIndex) {
+			if (!DriverNameOrIndex) DriverNameOrIndex = "(AO)Client-Bridge Driver";
+			if (!strSplit) strSplit = "\n";
+			for (var iDrvNO in this.Printers["list"]) {
+				if (DriverNameOrIndex == iDrvNO || DriverNameOrIndex == this.Printers["list"][iDrvNO].name) {
+					for (var iBdgNO in this.Printers["list"][iDrvNO]["subdevlist"]) {
+						var BridgeID = this.Printers["list"][iDrvNO]["subdevlist"][iBdgNO].id;
+						var BridgeName = this.Printers["list"][iDrvNO]["subdevlist"][iBdgNO].name;
+						if (BridgeNameOrIndex == iBdgNO || BridgeNameOrIndex == BridgeID + ";" + BridgeName) {
+							for (var iSsbPNO in this.Printers["list"][iDrvNO]["subdevlist"][iBdgNO].ssbprinter["list"]) {
+								if (SubPrinterNameOrIndex == iSsbPNO || SubPrinterNameOrIndex == this.Printers["list"][iDrvNO]["subdevlist"]
+									[iBdgNO].ssbprinter["list"][iSsbPNO].name) {
+									var strList = "";
+									for (var iPageSizeNO in this.Printers["list"][iDrvNO]["subdevlist"][iBdgNO].ssbprinter["list"][iSsbPNO][
+											"pagelist"
+										]) {
+										if (iPageSizeNO != "0") strList = strList + strSplit;
+										strList = strList + this.Printers["list"][iDrvNO]["subdevlist"][iBdgNO].ssbprinter["list"][iSsbPNO][
+											"pagelist"
+										][iPageSizeNO].name;
+									}
+									return strList;
+								};
+							}
+						}
+					}
+				}
+			}
+			return "";
+		},
+		AddItemArray: function(type, top, left, width, height, strContent, itemname, ShapeType, intPenStyle, intPenWidth,
+			intColor, isLinePosition, BarType, strChartTypess) {
+			if (top === undefined || left === undefined || width === undefined || height === undefined || strContent ===
+				undefined) {
+				return false;
+			}
+			var sCount = this.ItemDatas["count"];
+			sCount++;
+			var oneItem = {};
+			for (var vstyle in this.defStyleJson) {
+				oneItem[vstyle] = this.defStyleJson[vstyle];
+			}
+			oneItem["type"] = type;
+			oneItem["top"] = top;
+			oneItem["left"] = left;
+			oneItem["width"] = width;
+			oneItem["height"] = height;
+			if (strContent != null) {
+				if (typeof strContent === "string" && strContent.indexOf(this.DelimChar) > -1)
+					oneItem["content"] = strContent.replace(new RegExp(this.DelimChar, 'g'), '');
+				else
+					oneItem["content"] = strContent;
+			}
+			if ((itemname !== undefined) && (itemname != null)) oneItem["itemname"] = itemname + "";
+			if ((ShapeType !== undefined) && (ShapeType != null)) oneItem["shapetype"] = ShapeType;
+			if ((intPenStyle !== undefined) && (intPenStyle != null)) oneItem["penstyle"] = intPenStyle;
+			if ((intPenWidth !== undefined) && (intPenWidth != null)) oneItem["penwidth"] = intPenWidth;
+			if ((intColor !== undefined) && (intColor != null)) oneItem["fontcolor"] = intColor;
+			if ((isLinePosition !== undefined) && (isLinePosition != null)) oneItem["lineposition"] = "1";
+			if ((BarType !== undefined) && (BarType != null)) oneItem["fontname"] = BarType;
+			if ((strChartTypess !== undefined) && (strChartTypess != null)) oneItem["charttypess"] = strChartTypess;
+
+			oneItem["beginpage"] = this.defStyleJson["beginpage"];
+			oneItem["beginpagea"] = this.defStyleJson["beginpagea"];
+			this.ItemDatas["count"] = sCount;
+			this.ItemDatas[sCount] = oneItem;
+			this.blNormalItemAdded = true;
+			return true;
+		},
+		RemoveIframes: function() {
+			// #ifndef APP-PLUS
+			var obody = document.body || document.getElementsByTagName("body")[0] || document.documentElement;
+			// #endif
+			try {
+				for (var i = 0; i < this.Iframes.length; i++) {
+					var now = (new Date()).getTime();
+					if ((now - this.Iframes[i]["time"]) > this.timeThreshold * 60000) {
+						// #ifndef APP-PLUS
+						obody.removeChild(this.Iframes[i]["iframe"]);
+						// #endif
+						this.Iframes.splice(i, 1);
+					}
+				}
+			} catch (err) {};
+		},
+		AddInputElement: function(odocument, oform, name, value) {
+			if (value !== undefined) {
+				var oinput = odocument.createElement("input");
+				oinput.name = name;
+				oinput.type = "hidden";
+				oinput.value = value;
+				oform.appendChild(oinput);
+			}
+		},
+		createPostDataString: function(afterPostAction) {
+			var strData = "act=" + afterPostAction + this.DelimChar;
+			strData = strData + "browseurl=" + window.location.href + this.DelimChar;
+			for (var vMode in this.PageDataEx) {
+				strData = strData + vMode + "=" + this.PageDataEx[vMode] + this.DelimChar;
+			}
+			var PrintModeNamess = "";
+			for (var vMode in this.PageData) {
+				strData = strData + vMode + "=" + this.PageData[vMode] + this.DelimChar;
+				if (vMode != "top" && vMode != "left" && vMode != "width" && vMode != "height" && vMode != "printtask" && vMode !=
+					"printerindex" && vMode != "printerindexa" && vMode != "printersubid" && vMode != "orient" && vMode !=
+					"pagewidth" && vMode != "pageheight" && vMode != "pagename" && vMode != "printcopies" && vMode != "setup_bkimg"
+				)
+					PrintModeNamess = PrintModeNamess + ";" + vMode;
+			}
+			if (PrintModeNamess !== "")
+				strData = strData + "printmodenames=" + PrintModeNamess + this.DelimChar;
+			var StyleClassNamess = "";
+			for (var vClassStyle in this.ItemCNameStyles) {
+				strData = strData + vClassStyle + "=" + this.ItemCNameStyles[vClassStyle] + this.DelimChar;
+				StyleClassNamess = StyleClassNamess + ";" + vClassStyle;
+			}
+			if (StyleClassNamess !== "")
+				strData = strData + "printstyleclassnames=" + StyleClassNamess + this.DelimChar;
+			strData = strData + "itemcount=" + this.ItemDatas["count"] + this.DelimChar;
+			for (var vItemNO in this.ItemDatas) {
+				var ItemStyless = "";
+				for (var vItemxx in this.ItemDatas[vItemNO]) {
+					if (vItemxx != "beginpage" && vItemxx != "beginpagea" && vItemxx != "type" && vItemxx != "top" && vItemxx !=
+						"left" && vItemxx != "width" && vItemxx != "height")
+						ItemStyless = ItemStyless + ";" + vItemxx;
+				}
+				strData = strData + vItemNO + "_itemstylenames" + "=" + ItemStyless + this.DelimChar;
+				for (var vItemxx in this.ItemDatas[vItemNO]) {
+					strData = strData + vItemNO + "_" + vItemxx + "=" + this.ItemDatas[vItemNO][vItemxx] + this.DelimChar;
+				}
+			}
+			return strData;
+		},
+		wsDoPostDatas: function(afterPostAction) {
+			var strData = "charset=丂" + this.DelimChar;
+			strData = strData + "tid=" + this.GetTaskID() + this.DelimChar;
+			strData = strData + this.createPostDataString(afterPostAction);
+			return this.wsSend("post:" + strData);
+		},
+		DoPostDatas: function(afterPostAction) {
+			if (this.OBO_Mode && this.blOneByone) {
+				console.info(this.altMessageSomeWindowExist);
+				return false;
+			}
+			this.blWorking = true;
+			if (this.blTmpSelectedIndex !== null)
+				this.SET_PRINTER_INDEX(this.blTmpSelectedIndex);
+			if (this.SocketEnable) {
+				return this.wsDoPostDatas(afterPostAction);
+			}
+			// #ifdef APP-PLUS
+			return this.wsDoPostDatas(afterPostAction);
+			// #endif
+			this.RemoveIframes();
+			var obody = document.body || document.getElementsByTagName("body")[0] || document.documentElement;
+			var oiframe = document.createElement("iframe");
+			oiframe.setAttribute("src", "about:blank");
+			oiframe.setAttribute("style", "display:none");
+			oiframe.height = 0;
+			obody.appendChild(oiframe);
+			var contentdocument = oiframe.contentWindow.document;
+			contentdocument.write("<form action='" + this.strHostURI +
+				"/c_dopostdatas' method='post' enctype='application/x-www-form-urlencoded'></form>");
+			var oform = contentdocument.getElementsByTagName("form")[0];
+			this.AddInputElement(contentdocument, oform, "charset", "丂");
+			this.AddInputElement(contentdocument, oform, "tid", this.GetTaskID());
+			this.AddInputElement(contentdocument, oform, "post", this.createPostDataString(afterPostAction));
+			oform.submit();
+			var IframeMS = {};
+			IframeMS["time"] = (new Date()).getTime();
+			IframeMS["iframe"] = oiframe;
+			this.Iframes.push(IframeMS);
+			return true;
+		},
+		GetLastResult: function(blFOneByone) {
+			if (blFOneByone) this.blOneByone = true;
+			if (this.SocketEnable) {
+				return true;
+			}
+			var url = this.strHostURI + "/c_lastresult.js";
+			url = url + "?times=" + (new Date().getTime());
+			url = url + "&tid=" + this.GetTaskID();
+			url = encodeURI(url).replace("%20", "+");
+			var oscript = document.createElement("script");
+			oscript.src = url;
+			oscript.async = false;
+			oscript.type = "text/javascript";
+			oscript.charset = "utf-8";
+			var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
+			head.insertBefore(oscript, head.firstChild);
+			oscript.onload = oscript.onreadystatechange = function() {
+				if (!oscript.readyState || /loaded|complete/.test(oscript.readyState)) {
+					CLODOP.blOneByone = false;
+					if (CLodop_ACTLastResult)
+						var strResult = decodeURIComponent(CLodop_ACTLastResult);
+					var strResultTaskID = CLodop_ACTTaskID;
+					CLODOP.Result = strResult;
+					if (CLodop_ACTAlert) CLodop_ACTconsole.info();
+					if (CLODOP.On_Return)
+						try {
+							var selfFunc = CLODOP.On_Return;
+							if (strResult == "true" || strResult == "false")
+								CLODOP.On_Return(strResultTaskID, strResult == "true");
+							else
+								CLODOP.On_Return(strResultTaskID, strResult);
+							if (!CLODOP.On_Return_Remain && selfFunc === CLODOP.On_Return) CLODOP.On_Return = null;
+						} catch (err) {};
+					oscript.onload = oscript.onreadystatechange = null;
+					if (oscript.parentNode) {
+						oscript.parentNode.removeChild(oscript);
+					}
+				}
+			};
+			return true;
+		},
+		DoCPreview: function(sView, iW, iH) {
+			var obody = document.body || document.getElementsByTagName("body")[0] || document.documentElement;
+			if (typeof iW !== "number") iW = Math.round(obody.offsetWidth * 2 / 3);
+			else
+			if (obody.offsetWidth < iW) iW = obody.offsetWidth;
+			if (typeof iH !== "number") iH = Math.round(window.screen.height - 200);
+			else
+			if (window.screen.height < iH) iH = window.screen.height;
+			var url = this.strHostURI + "/c_dopreview";
+			url = url + "?times=" + (new Date().getTime());
+			url = url + "&tid=" + this.GetTaskID();
+			url = url + "&iw=" + iW;
+			url = url + "&ih=" + iH;
+			url = encodeURI(url).replace("%20", "+");
+			this.PopView(sView, url, iW, iH);
+		},
+		PopView: function(sView, strPURL, iW, iH) {
+			try {
+				if (sView && typeof sView === "string" && sView.length > 0) {
+					if (sView === "_dialog") {
+						if (window.showModalDialog) {
+							window.showModalDialog(strPURL, 'dialog', 'center:yes');
+						} else {
+							window.open(strPURL, "", "scrollbars=yes,toolbar=no,left=150,top=100,resizable=yes");
+						}
+					} else
+					if (sView === "_self" || sView === "_top" || sView === "_parent") {
+						window.location.href = strPURL;
+					} else
+					if (sView === "_blank") {
+						this.PreviewBox.create(strPURL, iW, iH);
+					} else
+					if (sView.indexOf("_winopen:") > -1) {
+						var strFeatures = sView.slice(sView.indexOf("_winopen:") + 9);
+						if (strFeatures.indexOf("_blank") > -1)
+							window.open(strPURL, "_blank", strFeatures.slice(strFeatures.indexOf("_blank") + 6));
+						else
+							window.open(strPURL, "", strFeatures);
+					} else
+					if (document.getElementById(sView)) {
+						document.getElementById(sView).src = strPURL;
+					} else
+						console.info("iframe '" + sView + "' not exist!");
+				} else this.PreviewBox.create(strPURL, iW, iH);
+			} catch (err) {
+				console.info("CLODOP PopView " + err);
+			};
+		},
+		creatMyButtonElement: function(strType, strValue) {
+			try {
+				var oElement = document.createElement("<input type='" + strType + "' value='" + strValue + "'></input>");
+			} catch (e) {};
+			if (!oElement) {
+				oElement = document.createElement("input");
+				oElement.type = strType;
+				oElement.value = strValue;
+			}
+			return oElement;
+		},
+		creatLabelElement: function(Type, Value, Width, Left, Top) {
+			var TxtLabel = document.createElement(Type);
+			TxtLabel.innerHTML = Value;
+			TxtLabel.style.cssText = "position:absolute;width:" + Width + "px;left:" + Left + "px;top:" + Top + "px;";
+			return TxtLabel;
+		},
+		SelectBox: {
+			dragapproved: false,
+			offsetx: 0,
+			offsety: 0,
+			tempx: 0,
+			tempy: 0,
+			FrantDiv: undefined,
+			PopDiv: undefined,
+			selPrinter: undefined,
+			selCopies: undefined,
+			closeit: function() {
+				if (CLODOP.SelectBox.PopDiv && CLODOP.SelectBox.PopDiv.parentNode)
+					CLODOP.SelectBox.PopDiv.parentNode.removeChild(CLODOP.SelectBox.PopDiv);
+				if (this.FrantDiv && this.FrantDiv.parentNode)
+					this.FrantDiv.parentNode.removeChild(this.FrantDiv);
+				this.PopDiv = undefined;
+			},
+			initializedrag: function(e) {
+				var we = window.event || e;
+				this.offsetx = we.clientX;
+				this.offsety = we.clientY;
+				this.tempx = parseInt(this.PopDiv.style.left);
+				this.tempy = parseInt(this.PopDiv.style.top);
+				this.dragapproved = true;
+			},
+			drag_drop: function(e) {
+				if (!this.dragapproved) return;
+				var we = window.event || e;
+				this.PopDiv.style.left = we.clientX - this.offsetx + this.tempx + "px";
+				this.PopDiv.style.top = we.clientY - this.offsety + this.tempy + "px";
+			},
+			stopdrag: function() {
+				this.dragapproved = false;
+			},
+			clickOK: function(onlySelect) {
+				CLODOP.PRINTAOK(CLODOP.SelectBox.selPrinter.value, CLODOP.SelectBox.selCopies.value, 0, 0, onlySelect);
+				this.closeit();
+			},
+			create: function(iW, iH, onlySelect) {
+				if (CLODOP.SelectBox.PopDiv) this.closeit();
+				var obody = document.body || document.getElementsByTagName("body")[0] || document.documentElement;
+				var Boxdiv = document.createElement("div");
+				obody.appendChild(Boxdiv);
+				Boxdiv.style.cssText =
+					"position:absolute;z-index:91100;display:block;top:2px;border:1px solid #6B97C1;background:#F5F5F5;color:#000;font-size:13px;";
+				Boxdiv.style.width = iW + "px";
+				Boxdiv.style.left = Math.max((obody.offsetWidth - iW) / 2, 0) + "px";
+				Boxdiv.style.top = Math.max((obody.offsetHeight - iH) / 2, 0) + "px";
+				Boxdiv.style.height = iH + "px";
+				this.PopDiv = Boxdiv;
+				var titleDiv = document.createElement("div");
+				Boxdiv.appendChild(titleDiv);
+				titleDiv.style.cssText =
+					"font: bold 13px Arial;line-height:25px;height:27px;text-indent:5px;color: white;background:#8BACCF";
+				titleDiv.innerHTML = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;打印";
+				titleDiv.onmousedown = function(event) {
+					CLODOP.SelectBox.initializedrag(event);
+				};
+				titleDiv.onmousemove = function(event) {
+					CLODOP.SelectBox.drag_drop(event);
+				};
+				titleDiv.onmouseup = function() {
+					CLODOP.SelectBox.stopdrag();
+				};
+				var icoButton = document.createElement("button");
+				titleDiv.appendChild(icoButton);
+				icoButton.style.cssText = "background:transparent url(" + CLODOP.strHostURI +
+					"/c_favicon.ico) no-repeat scroll 0 0px;margin-left:5px;position:absolute;height:20px;line-height:100px;width:34px;left:3px;border:0;top:5px";
+				var CloseButton = document.createElement("button");
+				titleDiv.appendChild(CloseButton);
+				CloseButton.style.cssText = "background:transparent url(" + CLODOP.strHostURI +
+					"/images/c_winclose.png) no-repeat scroll 0 0px;margin-right:5px;position:absolute;height:20px;line-height:100px;width:34px;right:3px;border:0;top:4px";
+				CloseButton.onclick = function() {
+					CLODOP.SelectBox.closeit();
+					if (onlySelect && CLODOP.On_Return) {
+						var selfFunc = CLODOP.On_Return;
+						CLODOP.On_Return(0, -1);
+						if (!CLODOP.On_Return_Remain && selfFunc === CLODOP.On_Return) CLODOP.On_Return = null;
+					}
+				};
+				var areaDiv = document.createElement("div");
+				Boxdiv.appendChild(areaDiv);
+				areaDiv.style.cssText = "background:#F5F5F5;color:#000;border:0px;left:0px;top:0px;";
+				areaDiv.style.width = iW - 2 + "px";
+				areaDiv.style.height = (iH - 27) + "px";
+				var OKButton = CLODOP.creatMyButtonElement("button", "确定");
+				Boxdiv.appendChild(OKButton);
+				OKButton.style.cssText = "position:absolute;width:80px;height:23px;";
+				OKButton.style.left = "110px";
+				OKButton.style.top = (iH - 64) + "px";
+				OKButton.onclick = function() {
+					CLODOP.SelectBox.clickOK(onlySelect);
+				};
+				var CancelButton = CLODOP.creatMyButtonElement("button", "取消");
+				Boxdiv.appendChild(CancelButton);
+				CancelButton.style.cssText = "position:absolute;width:80px;;height:23px;";
+				CancelButton.style.left = "240px";
+				CancelButton.style.top = (iH - 64) + "px";
+				CancelButton.onclick = function() {
+					CLODOP.SelectBox.closeit();
+					if (onlySelect && CLODOP.On_Return) {
+						var selfFunc = CLODOP.On_Return;
+						CLODOP.On_Return(0, -1);
+						if (!CLODOP.On_Return_Remain && selfFunc === CLODOP.On_Return) CLODOP.On_Return = null;
+					}
+				};
+				areaDiv.appendChild(CLODOP.creatLabelElement("span", "选打印机：", 200, 46, 67));
+				var oSelect = document.createElement("select");
+				Boxdiv.appendChild(oSelect);
+				this.selPrinter = oSelect;
+				oSelect.style.cssText = "position:absolute;size:1;width:212px;left:110px;top:62px;";
+				CLODOP.Create_Printer_List(oSelect);
+				areaDiv.appendChild(CLODOP.creatLabelElement("span", "打印份数：", 200, 46, 121));
+				var oCopies = CLODOP.creatMyButtonElement("text", "1");
+				Boxdiv.appendChild(oCopies);
+				this.selCopies = oCopies;
+				oCopies.style.cssText = "position:absolute;size:1;width:30px;left:110px;top:117px;";
+				this.FrantDiv = document.createElement("div");
+				obody.appendChild(this.FrantDiv);
+				this.FrantDiv.style.cssText =
+					"border:0px;left:0px;top:0px;filter: alpha(opacity=20); position: fixed; opacity: 0.2;-moz-opacity: 0.2; _position: absolute;z-index:91009; over-flow: hidden;";
+				if (CLODOP.Browser.IE && (document.compatMode == "BackCompat" || navigator.userAgent.indexOf("MSIE 6.0") > 0)) {
+					this.FrantDiv.style.width = obody.scrollWidth + "px";
+					this.FrantDiv.style.height = obody.scrollHeight + "px";
+				} else {
+					this.FrantDiv.style.width = "100%";
+					this.FrantDiv.style.height = "100%";
+				}
+			}
+		},
+		PreviewBox: {
+			dragapproved: false,
+			offsetx: 0,
+			offsety: 0,
+			tempx: 0,
+			tempy: 0,
+			FrantDiv: undefined,
+			PopDiv: undefined,
+			ContentFrame: undefined,
+			closeit: function(oSelf) {
+				if (CLODOP.PreviewBox.PopDiv && CLODOP.PreviewBox.PopDiv.parentNode)
+					CLODOP.PreviewBox.PopDiv.parentNode.removeChild(CLODOP.PreviewBox.PopDiv);
+				if (this.FrantDiv && this.FrantDiv.parentNode)
+					this.FrantDiv.parentNode.removeChild(this.FrantDiv);
+				this.PopDiv = undefined;
+			},
+			initializedrag: function(e, oSelf) {
+				var we = window.event || e;
+				this.offsetx = we.clientX;
+				this.offsety = we.clientY;
+				this.tempx = parseInt(oSelf.style.left);
+				this.tempy = parseInt(oSelf.style.top);
+				this.dragapproved = true;
+			},
+			drag_drop: function(e, oSelf) {
+				if (!this.dragapproved) return;
+				var we = window.event || e;
+				oSelf.style.left = we.clientX - this.offsetx + this.tempx + "px";
+				oSelf.style.top = we.clientY - this.offsety + this.tempy + "px";
+			},
+			stopdrag: function() {
+				this.dragapproved = false;
+				if (this.ContentFrame) this.ContentFrame.style.display = "block";
+			},
+			create: function(strURL, iW, iH) {
+				if (CLODOP.PreviewBox.PopDiv) this.closeit();
+				var obody = document.body || document.getElementsByTagName("body")[0] || document.documentElement;
+				var vBoxDiv = document.createElement("div");
+				obody.appendChild(vBoxDiv);
+				vBoxDiv.style.cssText =
+					"position:absolute;z-index:91100;display:block;top:2px;border:1px solid #6B97C1;font-size:13px;";
+				vBoxDiv.style.width = iW + "px";
+				var iLeft = (obody.offsetWidth - iW) / 2;
+				if (window.screen.width < obody.offsetWidth) iLeft = (window.screen.width - iW) / 2;
+				if (iLeft < 0) iLeft = 0;
+				vBoxDiv.style.left = iLeft + "px";
+				vBoxDiv.style.height = iH + "px";
+				vBoxDiv.onmousedown = function(event) {
+					CLODOP.PreviewBox.initializedrag(event, this);
+				};
+				vBoxDiv.onmouseup = function() {
+					CLODOP.PreviewBox.stopdrag();
+				};
+				vBoxDiv.onmousemove = function(event) {
+					CLODOP.PreviewBox.drag_drop(event, this);
+				};
+				this.PopDiv = vBoxDiv;
+				var titleDiv = document.createElement("div");
+				vBoxDiv.appendChild(titleDiv);
+				titleDiv.style.cssText =
+					"position:absolute;left:0px;width:100%;font: bold 14px Arial;line-height:27px;height:27px;text-indent:26px;color: white;background:#8BACCF";
+				titleDiv.innerHTML = "打印预览";
+				var icoButton = document.createElement("button");
+				titleDiv.appendChild(icoButton);
+				icoButton.style.cssText = "background:transparent url(" + CLODOP.strHostURI +
+					"/c_favicon.ico) no-repeat scroll 0 0px;margin-left:5px;position:absolute;height:20px;line-height:100px;width:34px;left:3px;border:0;top:5px";
+				var CloseButton = document.createElement("button");
+				titleDiv.appendChild(CloseButton);
+				CloseButton.style.cssText = "background:transparent url(" + CLODOP.strHostURI +
+					"/images/c_winclose.png) no-repeat scroll 0 0px;margin-right:5px;position:absolute;height:20px;line-height:100px;width:34px;right:3px;border:0;top:4px";
+				CloseButton.onclick = function() {
+					CLODOP.PreviewBox.closeit(this);
+				};
+				var areaDiv = document.createElement("div");
+				vBoxDiv.appendChild(areaDiv);
+				areaDiv.style.cssText = "background:#F5F5F5;color:#000;border:0px;left:0px;top:0px;";
+				areaDiv.style.width = iW + "px";
+				areaDiv.style.height = (iH - 0) + "px";
+				this.ContentFrame = document.createElement("iframe");
+				areaDiv.appendChild(this.ContentFrame);
+				this.ContentFrame.style.cssText = "width:100%;height:100%;";
+				this.ContentFrame.src = strURL;
+				this.ContentFrame.frameBorder = "no";
+				this.FrantDiv = document.createElement("div");
+				obody.appendChild(this.FrantDiv);
+				this.FrantDiv.style.cssText =
+					"border:0px;left:0px;top:0px;filter: alpha(opacity=20); position: fixed; opacity: 0.2; -moz-opacity: 0.2; _position: absolute;z-index:91009; over-flow: hidden;";
+				if (CLODOP.Browser.IE && (document.compatMode == "BackCompat" || navigator.userAgent.indexOf("MSIE 6.0") > 0)) {
+					this.FrantDiv.style.width = obody.scrollWidth + "px";
+					this.FrantDiv.style.height = obody.scrollHeight + "px";
+				} else {
+					this.FrantDiv.style.width = "100%";
+					this.FrantDiv.style.height = "100%";
+				}
+			}
+		}
+	};
+	if (win.CLODOP2015_7028 && win.CLODOP2015_7028.Priority && win.CLODOP2015_7028.Priority > CLODOP.Priority) {
+		CLODOP = win.CLODOP2015_7028;
+		win.CLODOP_OK_Priority = win.CLODOP2015_7028.Priority;
+		return;
+	}
+	win.LODOP = CLODOP;
+	win.CLODOP = CLODOP;
+	win.CLODOP2015_7028 = CLODOP;
+	win.CLODOP_OK_Priority = CLODOP.Priority;
+
+	// #ifndef APP-PLUS
+	win.CLODOP.DoInit();
+	// #endif
+
+	if (navigator.userAgent.indexOf("Lodop") < 0) win.CLODOP.OpenWebSocket();
+})(window);
+
+function getCLodop() {
+	return window.CLODOP2015_7028;
+}
+
+async function getPrinterList(ip){
+  if (!ip) {
+    ip = uni.getStorageSync('fl_ip');
+  }
+  try{
+    const res = await uni.request({
+        url: `http://${ip}:8000/CLodopfuncs.js`,
+    });
+    if (res[0]) {
+      return [];
+    }
+    let temp = res[1].data.match(/"list":(.+)/);
+    const printerListString = temp[1].substr(0,temp[1].length-2);
+    let printerListArray = JSON.parse(printerListString);
+    let printerList = [];
+    printerListArray.forEach(item=>{
+      printerList.push(item.name)
+    })
+    return printerList;
+  }catch(e){
+    console.log(e);
+  }
+}
+export {
+	getCLodop,
+  getPrinterList
+}; //导出getLodop
diff --git a/utils/getData2.js b/utils/getData2.js
new file mode 100644
index 0000000..e845244
--- /dev/null
+++ b/utils/getData2.js
@@ -0,0 +1,282 @@
+import request from './request.js'
+
+// 版本更新测试
+export const pdaUpdate = () => request({
+	url:'api/pda/update'
+})
+// export const pdaUpdate = () => {
+// 	let res = {
+// 		versionName: '1.0.1',
+// 		url: 'https://mp-e979e0eb-882b-42b3-a4a1-923ad08ea194.cdn.bspapp.com/cloudstorage/f72ec59f-7b25-487d-a034-fead1b6654c6.apk'
+// 	}
+// 	return res
+// }
+
+// 登录
+export const handLogin = (user, password) => request({
+	url:'api/bigScreenScreen/login',
+	data: {
+		user: user,
+		password: password
+	}
+})
+
+/**
+ * 物料组盘入库
+ */
+export const storList = () => request({
+	url:'api/pda/common/storList',
+	data: {}
+})
+export const groupMaterList = (page, size, search) => request({
+	url:'api/groupMater/maters',
+	data: {page: page, size: size, search: search}
+})
+export const groupMaterIn = (code, item) => request({
+	url:'api/groupMater/in',
+	data: {stor_code: code, item: item}
+})
+/**
+ * 设备操控
+ */
+export const switchInOut = (code, mode) => request({
+	url:'api/deviceManage/changeMode/switchInOut',
+	data: {device_code: code, mode: mode}
+})
+export const pinkStartStop = (code, mode) => request({
+	url:'api/deviceManage/changeMode/pinkStartStop',
+	data: {device_code: code, mode: mode}
+})
+export const toCommandTP = (code, mode, vcode, isC) => request({
+	url:'api/deviceManage/changeMode/toCommandTP',
+	data: {device_code: code, mode: mode, vehicle_code: vcode,  is_check: isC}
+})
+/**
+ * 组盘入库
+ */
+// 单据类型
+export const FormTypes = () => request({
+	method: 'GET',
+	url:'api/bmFormStruc/getTypes?type=pda'
+})
+// 单据数据
+export const pmFormData = (page, size, form_type, code) => request({
+	method: 'GET',
+	url:'api/pmFormData?page=' + page + '&size=' + size + '&form_type=' + form_type + '&vehicle_code=' + code
+})
+// 组盘确认
+export const mdGruopDick = (item, code, type) => request({
+	url:'api/mdGruopDick',
+	data: {item: item, stor_code: code, type: type}
+})
+/**
+ * 空托盘入库
+ */
+export const pdaPalletIostorinvIn = (code, id) => request({
+	url:'api/pdaPalletIostorinv/in',
+	data: {vehicle_code: code, material_id: id}
+})
+/**
+ * 托盘出库
+ */
+export const targetPoint = () => request({
+	url:'api/pdaPalletIostorinv/targetPoint',
+	method: 'GET'
+})
+export const pdaPalletIostorinvOut = (id, qty, point) => request({
+	url:'api/pdaPalletIostorinv/out',
+	data: {material_id: id, qty: qty, pcsn: '1', target_point: point}
+})
+/**
+ * 出库确认
+ */
+export const ioStorageOut = (code) => request({
+	url:'api/ioStorage/out',
+	data: {vehicle_code: code}
+})
+/**
+ * 拣选单列表
+ */
+export const pmFormData2 = (page, size, form_type, status, code) => request({
+	method: 'GET',
+	url:'api/pmFormData?page=' + page + '&size=' + size + '&form_type=' + form_type + '&status=' + status + '&vehicle_code=' + code
+})
+// 扫载具查看拣选单信息
+export const queryPick = (type, code) => request({
+	url:'api/pda/pick/queryPick',
+	data: {form_type: type, vehicle_code: code}
+})
+export const savePickTask = (data) => request({
+	url:'api/pda/pick/savePickTask',
+	data: data
+})
+/**
+ * 盘点作业
+ */
+export const checkByVehicle = (code) => request({
+	url:'api/pda/check/byVehicle',
+	data: {vehicle_code: code}
+})
+export const checkSaveCheckTask = (id, vehicle, qty, cqty) => request({
+	url:'api/pda/check/saveCheckTask',
+	data: {children_id: id,children_vehicle: vehicle,check_qty, qty,children_qty: cqty}
+})
+/**
+ * 任务管理
+ */
+export const getStatusEnum = () => request({
+	method: 'GET',
+	url:'api/dict/getStatusEnum?code=TASK_TYPE'
+})
+export const schBaseTask = (page, size, sort, code) => request({
+	method: 'GET',
+	url:'api/schBaseTask?page=' + page + '&size=' + size + '&sort=' + sort + '&vehicle_code=' + code
+})
+export const saveCheckTask = (code, status) => request({
+	url:'api/pda/check/saveCheckTask',
+	data: {task_code: code, status: status}
+})
+/**
+ * 单据出库
+ */
+export const outStorageOrder = () => request({
+	method: 'GET',
+	url:'api/pda/outStorage/order'
+})
+export const outStorageOrderList = (page, size, type, code) => request({
+	method: 'GET',
+	url:'api/pda/outStorage/orderList?page=' + page + '&size=' + size + '&form_type=' + type + '&code=' + code
+})
+export const outStorageOrderConfirm = (code, scode) => request({
+	url:'api/pda/outStorage/orderConfirm',
+	data: {code: code, stor_code: scode}
+})
+export const outStorageConfirm = (obj) => request({
+	url:'api/pda/outStorage/confirm',
+	data: obj
+})
+// export const outStorageConfirm = (obj) => {
+// 	let res = {
+// 		code: '200',
+// 		msg: 'ok'
+// 	}
+// 	return res
+// }
+
+// 扫描合格证获取物料信息
+export const getCertificateInfo = (id) => request({
+	url:'api/pda/inStorage/getCertificateInfo/' + id,
+	method: 'GET'
+})
+// export const getCertificateInfo = (id) => {
+// 	let res = {
+// 		moNumber: '订单号',
+// 		material_code: 'material_code',
+// 		material_name: 'material_name',
+// 		material_spec: 'material_spec',
+// 		unit_name: 'unit_name',
+// 		qty: '100',
+// 		stockOrgId: 'StockOrgId',
+// 		ownerId_id: 'OwnerId_Id',
+// 		single_weight: '500',
+// 		pcsn: 'pcsn'
+// 	}
+// 	return res
+// }
+// 单据入库组盘确认
+export const inStorageConfirm = (obj) => request({
+	url:'api/pda/inStorage/confirm',
+	data: obj
+})
+
+/**
+ * 托盘转运
+ */
+export const deviceManageTransf = (start) => request({
+	url:'api/deviceManage/transf',
+	data: {start: start}
+})
+export const transfConfirm = (start, end, code) => request({
+	url:'api/deviceManage/transfConfirm',
+	data: {start: start, end: end, vehicle_code: code}
+})
+
+/**
+ * 库存出库
+ */
+export const structattrPage = (page, size, code, mcode, has, pcsn, vcode, stcode) => request({
+	url:'api/structattr/checkQuery?page=' + page + '&size=' + size + '&stor_code=' + code + '&material_code=' + mcode + '&has=' + has + '&pcsn=' + pcsn + '&vehicle_code=' + vcode + '&struct_code=' + stcode,
+	method: 'GET'
+})
+export const outStorageMaterConfirm = (obj) => request({
+	url:'api/pda/outStorage/materConfirm',
+	data: obj
+})
+
+/**
+ * 二楼生产出库
+ */
+export const queryTargetPoint = (scode) => request({
+	url:'api/pdaPalletIostorinv/queryTargetPoint',
+	data: {site_code: scode}
+})
+export const getCtuOrderList = (scode, bcode) => request({
+	url:'api/pda/outStorage/getCtuOrderList?site_code=' + scode + '&bill_code=' + bcode,
+	method: 'GET'
+})
+export const ctuOutConfirm = (scode, bcode, arr) => request({
+	url:'api/pda/outStorage/ctuOutConfirm',
+	data: {site_code: scode, bill_code: bcode, children: arr}
+})
+
+/**
+ * 二楼取货确认
+ */
+export const takeConfirm = (scode) => request({
+	url:'api/pda/outStorage/takeConfirm',
+	data: {site_code: scode}
+})
+/**
+ * 二楼货架绑定
+ */
+export const getPointStatus = (scode) => request({
+	url:'api/point/getPointStatus',
+	data: {site_code: scode}
+})
+export const bindOrUnbind = (scode, bcode, mode) => request({
+	url:'api/point/bindOrUnbind',
+	data: {site_code: scode, shelf_code: bcode, mode: mode}
+})
+export const pointUnbind = (scode, bcode, mode) => request({
+	url:'api/point/unbind',
+	data: {site_code: scode, shelf_code: bcode}
+})
+/**
+ * 单据入库
+ */
+export const inStorageOrder = () => request({
+	method: 'GET',
+	url:'api/pda/inStorage/order'
+})
+export const getBillNoInfo = (code, type) => request({
+	url:'api/pda/inStorage/getBillNoInfo',
+	data: {code: code, form_type: type}
+})
+/**
+ * 盘点入库
+ */
+export const queryMaterByVehicleCode = (code) => request({
+	url:'api/structattr/queryMaterByVehicleCode',
+	data: {vehicle_code: code}
+})
+export const checkMaterConfirm = (obj) => request({
+	url:'api/groupMater/checkMaterConfirm',
+	data: obj
+})
+/**
+ * 扫载具码调接口
+ */
+export const getStructCount = (code) => request({
+	url:'api/pda/common/getStructCount',
+	data: {vehicle_code: code}
+})
\ No newline at end of file
diff --git a/utils/jsencrypt.js b/utils/jsencrypt.js
new file mode 100644
index 0000000..820344b
--- /dev/null
+++ b/utils/jsencrypt.js
@@ -0,0 +1,12 @@
+import JSEncrypt from './jsencrypt2.js'
+let publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD\n' +
+	  '2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ==';
+function RSAencrypt(pas){
+	//实例化jsEncrypt对象
+	let jse = new JSEncrypt();
+	//设置公钥
+	jse.setPublicKey(publicKey);
+	return jse.encrypt(pas);
+}
+
+export {RSAencrypt}
\ No newline at end of file
diff --git a/utils/jsencrypt2.js b/utils/jsencrypt2.js
new file mode 100644
index 0000000..1f14d0d
--- /dev/null
+++ b/utils/jsencrypt2.js
@@ -0,0 +1,5373 @@
+/**
+ * 复制下面代码到node_modules/jsencrypt/bin/jsencrypt.js文件中兼容app
+ */
+(function(global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+		typeof define === 'function' && define.amd ? define(['exports'], factory) :
+		(factory((global.JSEncrypt = {})));
+}(this, (function(exports) {
+	'use strict';
+	var navigator2 = {
+		appName: 'Netscape',
+		userAgent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1'
+	};
+	//  用来替换window2
+	var window2 = {
+		ASN1: null,
+		Base64: null,
+		Hex: null,
+		crypto: null,
+		href: null
+	};
+	var BI_RM = "0123456789abcdefghijklmnopqrstuvwxyz";
+
+	function int2char(n) {
+		return BI_RM.charAt(n);
+	}
+	//#region BIT_OPERATIONS
+	// (public) this & a
+	function op_and(x, y) {
+		return x & y;
+	}
+	// (public) this | a
+	function op_or(x, y) {
+		return x | y;
+	}
+	// (public) this ^ a
+	function op_xor(x, y) {
+		return x ^ y;
+	}
+	// (public) this & ~a
+	function op_andnot(x, y) {
+		return x & ~y;
+	}
+	// return index of lowest 1-bit in x, x < 2^31
+	function lbit(x) {
+		if (x == 0) {
+			return -1;
+		}
+		var r = 0;
+		if ((x & 0xffff) == 0) {
+			x >>= 16;
+			r += 16;
+		}
+		if ((x & 0xff) == 0) {
+			x >>= 8;
+			r += 8;
+		}
+		if ((x & 0xf) == 0) {
+			x >>= 4;
+			r += 4;
+		}
+		if ((x & 3) == 0) {
+			x >>= 2;
+			r += 2;
+		}
+		if ((x & 1) == 0) {
+			++r;
+		}
+		return r;
+	}
+	// return number of 1 bits in x
+	function cbit(x) {
+		var r = 0;
+		while (x != 0) {
+			x &= x - 1;
+			++r;
+		}
+		return r;
+	}
+	//#endregion BIT_OPERATIONS
+
+	var b64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	var b64pad = "=";
+
+	function hex2b64(h) {
+		var i;
+		var c;
+		var ret = "";
+		for (i = 0; i + 3 <= h.length; i += 3) {
+			c = parseInt(h.substring(i, i + 3), 16);
+			ret += b64map.charAt(c >> 6) + b64map.charAt(c & 63);
+		}
+		if (i + 1 == h.length) {
+			c = parseInt(h.substring(i, i + 1), 16);
+			ret += b64map.charAt(c << 2);
+		} else if (i + 2 == h.length) {
+			c = parseInt(h.substring(i, i + 2), 16);
+			ret += b64map.charAt(c >> 2) + b64map.charAt((c & 3) << 4);
+		}
+		while ((ret.length & 3) > 0) {
+			ret += b64pad;
+		}
+		return ret;
+	}
+	// convert a base64 string to hex
+	function b64tohex(s) {
+		var ret = "";
+		var i;
+		var k = 0; // b64 state, 0-3
+		var slop = 0;
+		for (i = 0; i < s.length; ++i) {
+			if (s.charAt(i) == b64pad) {
+				break;
+			}
+			var v = b64map.indexOf(s.charAt(i));
+			if (v < 0) {
+				continue;
+			}
+			if (k == 0) {
+				ret += int2char(v >> 2);
+				slop = v & 3;
+				k = 1;
+			} else if (k == 1) {
+				ret += int2char((slop << 2) | (v >> 4));
+				slop = v & 0xf;
+				k = 2;
+			} else if (k == 2) {
+				ret += int2char(slop);
+				ret += int2char(v >> 2);
+				slop = v & 3;
+				k = 3;
+			} else {
+				ret += int2char((slop << 2) | (v >> 4));
+				ret += int2char(v & 0xf);
+				k = 0;
+			}
+		}
+		if (k == 1) {
+			ret += int2char(slop << 2);
+		}
+		return ret;
+	}
+
+	/*! *****************************************************************************
+	Copyright (c) Microsoft Corporation. All rights reserved.
+	Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+	this file except in compliance with the License. You may obtain a copy of the
+	License at http://www.apache.org/licenses/LICENSE-2.0
+
+	THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+	WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+	MERCHANTABLITY OR NON-INFRINGEMENT.
+
+	See the Apache Version 2.0 License for specific language governing permissions
+	and limitations under the License.
+	***************************************************************************** */
+	/* global Reflect, Promise */
+
+	var extendStatics = function(d, b) {
+		extendStatics = Object.setPrototypeOf ||
+			({
+					__proto__: []
+				}
+				instanceof Array && function(d, b) {
+					d.__proto__ = b;
+				}) ||
+			function(d, b) {
+				for (var p in b)
+					if (b.hasOwnProperty(p)) d[p] = b[p];
+			};
+		return extendStatics(d, b);
+	};
+
+	function __extends(d, b) {
+		extendStatics(d, b);
+
+		function __() {
+			this.constructor = d;
+		}
+		d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+	}
+
+	// Hex JavaScript decoder
+	// Copyright (c) 2008-2013 Lapo Luchini <lapo@lapo.it>
+	// Permission to use, copy, modify, and/or distribute this software for any
+	// purpose with or without fee is hereby granted, provided that the above
+	// copyright notice and this permission notice appear in all copies.
+	//
+	// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+	// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+	// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+	// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+	// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+	// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+	// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+	/*jshint browser: true, strict: true, immed: true, latedef: true, undef: true, regexdash: false */
+	var decoder;
+	var Hex = {
+		decode: function(a) {
+			var i;
+			if (decoder === undefined) {
+				var hex = "0123456789ABCDEF";
+				var ignore = " \f\n\r\t\u00A0\u2028\u2029";
+				decoder = {};
+				for (i = 0; i < 16; ++i) {
+					decoder[hex.charAt(i)] = i;
+				}
+				hex = hex.toLowerCase();
+				for (i = 10; i < 16; ++i) {
+					decoder[hex.charAt(i)] = i;
+				}
+				for (i = 0; i < ignore.length; ++i) {
+					decoder[ignore.charAt(i)] = -1;
+				}
+			}
+			var out = [];
+			var bits = 0;
+			var char_count = 0;
+			for (i = 0; i < a.length; ++i) {
+				var c = a.charAt(i);
+				if (c == "=") {
+					break;
+				}
+				c = decoder[c];
+				if (c == -1) {
+					continue;
+				}
+				if (c === undefined) {
+					throw new Error("Illegal character at offset " + i);
+				}
+				bits |= c;
+				if (++char_count >= 2) {
+					out[out.length] = bits;
+					bits = 0;
+					char_count = 0;
+				} else {
+					bits <<= 4;
+				}
+			}
+			if (char_count) {
+				throw new Error("Hex encoding incomplete: 4 bits missing");
+			}
+			return out;
+		}
+	};
+
+	// Base64 JavaScript decoder
+	// Copyright (c) 2008-2013 Lapo Luchini <lapo@lapo.it>
+	// Permission to use, copy, modify, and/or distribute this software for any
+	// purpose with or without fee is hereby granted, provided that the above
+	// copyright notice and this permission notice appear in all copies.
+	//
+	// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+	// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+	// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+	// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+	// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+	// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+	// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+	/*jshint browser: true, strict: true, immed: true, latedef: true, undef: true, regexdash: false */
+	var decoder$1;
+	var Base64 = {
+		decode: function(a) {
+			var i;
+			if (decoder$1 === undefined) {
+				var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+				var ignore = "= \f\n\r\t\u00A0\u2028\u2029";
+				decoder$1 = Object.create(null);
+				for (i = 0; i < 64; ++i) {
+					decoder$1[b64.charAt(i)] = i;
+				}
+				for (i = 0; i < ignore.length; ++i) {
+					decoder$1[ignore.charAt(i)] = -1;
+				}
+			}
+			var out = [];
+			var bits = 0;
+			var char_count = 0;
+			for (i = 0; i < a.length; ++i) {
+				var c = a.charAt(i);
+				if (c == "=") {
+					break;
+				}
+				c = decoder$1[c];
+				if (c == -1) {
+					continue;
+				}
+				if (c === undefined) {
+					throw new Error("Illegal character at offset " + i);
+				}
+				bits |= c;
+				if (++char_count >= 4) {
+					out[out.length] = (bits >> 16);
+					out[out.length] = (bits >> 8) & 0xFF;
+					out[out.length] = bits & 0xFF;
+					bits = 0;
+					char_count = 0;
+				} else {
+					bits <<= 6;
+				}
+			}
+			switch (char_count) {
+				case 1:
+					throw new Error("Base64 encoding incomplete: at least 2 bits missing");
+				case 2:
+					out[out.length] = (bits >> 10);
+					break;
+				case 3:
+					out[out.length] = (bits >> 16);
+					out[out.length] = (bits >> 8) & 0xFF;
+					break;
+			}
+			return out;
+		},
+		re: /-----BEGIN [^-]+-----([A-Za-z0-9+\/=\s]+)-----END [^-]+-----|begin-base64[^\n]+\n([A-Za-z0-9+\/=\s]+)====/,
+		unarmor: function(a) {
+			var m = Base64.re.exec(a);
+			if (m) {
+				if (m[1]) {
+					a = m[1];
+				} else if (m[2]) {
+					a = m[2];
+				} else {
+					throw new Error("RegExp out of sync");
+				}
+			}
+			return Base64.decode(a);
+		}
+	};
+
+	// Big integer base-10 printing library
+	// Copyright (c) 2014 Lapo Luchini <lapo@lapo.it>
+	// Permission to use, copy, modify, and/or distribute this software for any
+	// purpose with or without fee is hereby granted, provided that the above
+	// copyright notice and this permission notice appear in all copies.
+	//
+	// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+	// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+	// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+	// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+	// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+	// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+	// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+	/*jshint browser: true, strict: true, immed: true, latedef: true, undef: true, regexdash: false */
+	var max = 10000000000000; // biggest integer that can still fit 2^53 when multiplied by 256
+	var Int10 = /** @class */ (function() {
+		function Int10(value) {
+			this.buf = [+value || 0];
+		}
+		Int10.prototype.mulAdd = function(m, c) {
+			// assert(m <= 256)
+			var b = this.buf;
+			var l = b.length;
+			var i;
+			var t;
+			for (i = 0; i < l; ++i) {
+				t = b[i] * m + c;
+				if (t < max) {
+					c = 0;
+				} else {
+					c = 0 | (t / max);
+					t -= c * max;
+				}
+				b[i] = t;
+			}
+			if (c > 0) {
+				b[i] = c;
+			}
+		};
+		Int10.prototype.sub = function(c) {
+			// assert(m <= 256)
+			var b = this.buf;
+			var l = b.length;
+			var i;
+			var t;
+			for (i = 0; i < l; ++i) {
+				t = b[i] - c;
+				if (t < 0) {
+					t += max;
+					c = 1;
+				} else {
+					c = 0;
+				}
+				b[i] = t;
+			}
+			while (b[b.length - 1] === 0) {
+				b.pop();
+			}
+		};
+		Int10.prototype.toString = function(base) {
+			if ((base || 10) != 10) {
+				throw new Error("only base 10 is supported");
+			}
+			var b = this.buf;
+			var s = b[b.length - 1].toString();
+			for (var i = b.length - 2; i >= 0; --i) {
+				s += (max + b[i]).toString().substring(1);
+			}
+			return s;
+		};
+		Int10.prototype.valueOf = function() {
+			var b = this.buf;
+			var v = 0;
+			for (var i = b.length - 1; i >= 0; --i) {
+				v = v * max + b[i];
+			}
+			return v;
+		};
+		Int10.prototype.simplify = function() {
+			var b = this.buf;
+			return (b.length == 1) ? b[0] : this;
+		};
+		return Int10;
+	}());
+
+	// ASN.1 JavaScript decoder
+	var ellipsis = "\u2026";
+	var reTimeS =
+		/^(\d\d)(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])([01]\d|2[0-3])(?:([0-5]\d)(?:([0-5]\d)(?:[.,](\d{1,3}))?)?)?(Z|[-+](?:[0]\d|1[0-2])([0-5]\d)?)?$/;
+	var reTimeL =
+		/^(\d\d\d\d)(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])([01]\d|2[0-3])(?:([0-5]\d)(?:([0-5]\d)(?:[.,](\d{1,3}))?)?)?(Z|[-+](?:[0]\d|1[0-2])([0-5]\d)?)?$/;
+
+	function stringCut(str, len) {
+		if (str.length > len) {
+			str = str.substring(0, len) + ellipsis;
+		}
+		return str;
+	}
+	var Stream = /** @class */ (function() {
+		function Stream(enc, pos) {
+			this.hexDigits = "0123456789ABCDEF";
+			if (enc instanceof Stream) {
+				this.enc = enc.enc;
+				this.pos = enc.pos;
+			} else {
+				// enc should be an array or a binary string
+				this.enc = enc;
+				this.pos = pos;
+			}
+		}
+		Stream.prototype.get = function(pos) {
+			if (pos === undefined) {
+				pos = this.pos++;
+			}
+			if (pos >= this.enc.length) {
+				throw new Error("Requesting byte offset " + pos + " on a stream of length " +
+					this.enc.length);
+			}
+			return ("string" === typeof this.enc) ? this.enc.charCodeAt(pos) : this.enc[pos];
+		};
+		Stream.prototype.hexByte = function(b) {
+			return this.hexDigits.charAt((b >> 4) & 0xF) + this.hexDigits.charAt(b & 0xF);
+		};
+		Stream.prototype.hexDump = function(start, end, raw) {
+			var s = "";
+			for (var i = start; i < end; ++i) {
+				s += this.hexByte(this.get(i));
+				if (raw !== true) {
+					switch (i & 0xF) {
+						case 0x7:
+							s += "  ";
+							break;
+						case 0xF:
+							s += "\n";
+							break;
+						default:
+							s += " ";
+					}
+				}
+			}
+			return s;
+		};
+		Stream.prototype.isASCII = function(start, end) {
+			for (var i = start; i < end; ++i) {
+				var c = this.get(i);
+				if (c < 32 || c > 176) {
+					return false;
+				}
+			}
+			return true;
+		};
+		Stream.prototype.parseStringISO = function(start, end) {
+			var s = "";
+			for (var i = start; i < end; ++i) {
+				s += String.fromCharCode(this.get(i));
+			}
+			return s;
+		};
+		Stream.prototype.parseStringUTF = function(start, end) {
+			var s = "";
+			for (var i = start; i < end;) {
+				var c = this.get(i++);
+				if (c < 128) {
+					s += String.fromCharCode(c);
+				} else if ((c > 191) && (c < 224)) {
+					s += String.fromCharCode(((c & 0x1F) << 6) | (this.get(i++) & 0x3F));
+				} else {
+					s += String.fromCharCode(((c & 0x0F) << 12) | ((this.get(i++) & 0x3F) <<
+						6) | (this.get(i++) & 0x3F));
+				}
+			}
+			return s;
+		};
+		Stream.prototype.parseStringBMP = function(start, end) {
+			var str = "";
+			var hi;
+			var lo;
+			for (var i = start; i < end;) {
+				hi = this.get(i++);
+				lo = this.get(i++);
+				str += String.fromCharCode((hi << 8) | lo);
+			}
+			return str;
+		};
+		Stream.prototype.parseTime = function(start, end, shortYear) {
+			var s = this.parseStringISO(start, end);
+			var m = (shortYear ? reTimeS : reTimeL).exec(s);
+			if (!m) {
+				return "Unrecognized time: " + s;
+			}
+			if (shortYear) {
+				// to avoid querying the timer, use the fixed range [1970, 2069]
+				// it will conform with ITU X.400 [-10, +40] sliding window2 until 2030
+				m[1] = +m[1];
+				m[1] += (+m[1] < 70) ? 2000 : 1900;
+			}
+			s = m[1] + "-" + m[2] + "-" + m[3] + " " + m[4];
+			if (m[5]) {
+				s += ":" + m[5];
+				if (m[6]) {
+					s += ":" + m[6];
+					if (m[7]) {
+						s += "." + m[7];
+					}
+				}
+			}
+			if (m[8]) {
+				s += " UTC";
+				if (m[8] != "Z") {
+					s += m[8];
+					if (m[9]) {
+						s += ":" + m[9];
+					}
+				}
+			}
+			return s;
+		};
+		Stream.prototype.parseInteger = function(start, end) {
+			var v = this.get(start);
+			var neg = (v > 127);
+			var pad = neg ? 255 : 0;
+			var len;
+			var s = "";
+			// skip unuseful bits (not allowed in DER)
+			while (v == pad && ++start < end) {
+				v = this.get(start);
+			}
+			len = end - start;
+			if (len === 0) {
+				return neg ? -1 : 0;
+			}
+			// show bit length of huge integers
+			if (len > 4) {
+				s = v;
+				len <<= 3;
+				while (((+s ^ pad) & 0x80) == 0) {
+					s = +s << 1;
+					--len;
+				}
+				s = "(" + len + " bit)\n";
+			}
+			// decode the integer
+			if (neg) {
+				v = v - 256;
+			}
+			var n = new Int10(v);
+			for (var i = start + 1; i < end; ++i) {
+				n.mulAdd(256, this.get(i));
+			}
+			return s + n.toString();
+		};
+		Stream.prototype.parseBitString = function(start, end, maxLength) {
+			var unusedBit = this.get(start);
+			var lenBit = ((end - start - 1) << 3) - unusedBit;
+			var intro = "(" + lenBit + " bit)\n";
+			var s = "";
+			for (var i = start + 1; i < end; ++i) {
+				var b = this.get(i);
+				var skip = (i == end - 1) ? unusedBit : 0;
+				for (var j = 7; j >= skip; --j) {
+					s += (b >> j) & 1 ? "1" : "0";
+				}
+				if (s.length > maxLength) {
+					return intro + stringCut(s, maxLength);
+				}
+			}
+			return intro + s;
+		};
+		Stream.prototype.parseOctetString = function(start, end, maxLength) {
+			if (this.isASCII(start, end)) {
+				return stringCut(this.parseStringISO(start, end), maxLength);
+			}
+			var len = end - start;
+			var s = "(" + len + " byte)\n";
+			maxLength /= 2; // we work in bytes
+			if (len > maxLength) {
+				end = start + maxLength;
+			}
+			for (var i = start; i < end; ++i) {
+				s += this.hexByte(this.get(i));
+			}
+			if (len > maxLength) {
+				s += ellipsis;
+			}
+			return s;
+		};
+		Stream.prototype.parseOID = function(start, end, maxLength) {
+			var s = "";
+			var n = new Int10();
+			var bits = 0;
+			for (var i = start; i < end; ++i) {
+				var v = this.get(i);
+				n.mulAdd(128, v & 0x7F);
+				bits += 7;
+				if (!(v & 0x80)) { // finished
+					if (s === "") {
+						n = n.simplify();
+						if (n instanceof Int10) {
+							n.sub(80);
+							s = "2." + n.toString();
+						} else {
+							var m = n < 80 ? n < 40 ? 0 : 1 : 2;
+							s = m + "." + (n - m * 40);
+						}
+					} else {
+						s += "." + n.toString();
+					}
+					if (s.length > maxLength) {
+						return stringCut(s, maxLength);
+					}
+					n = new Int10();
+					bits = 0;
+				}
+			}
+			if (bits > 0) {
+				s += ".incomplete";
+			}
+			return s;
+		};
+		return Stream;
+	}());
+	var ASN1 = /** @class */ (function() {
+		function ASN1(stream, header, length, tag, sub) {
+			if (!(tag instanceof ASN1Tag)) {
+				throw new Error("Invalid tag value.");
+			}
+			this.stream = stream;
+			this.header = header;
+			this.length = length;
+			this.tag = tag;
+			this.sub = sub;
+		}
+		ASN1.prototype.typeName = function() {
+			switch (this.tag.tagClass) {
+				case 0: // universal
+					switch (this.tag.tagNumber) {
+						case 0x00:
+							return "EOC";
+						case 0x01:
+							return "BOOLEAN";
+						case 0x02:
+							return "INTEGER";
+						case 0x03:
+							return "BIT_STRING";
+						case 0x04:
+							return "OCTET_STRING";
+						case 0x05:
+							return "NULL";
+						case 0x06:
+							return "OBJECT_IDENTIFIER";
+						case 0x07:
+							return "ObjectDescriptor";
+						case 0x08:
+							return "EXTERNAL";
+						case 0x09:
+							return "REAL";
+						case 0x0A:
+							return "ENUMERATED";
+						case 0x0B:
+							return "EMBEDDED_PDV";
+						case 0x0C:
+							return "UTF8String";
+						case 0x10:
+							return "SEQUENCE";
+						case 0x11:
+							return "SET";
+						case 0x12:
+							return "NumericString";
+						case 0x13:
+							return "PrintableString"; // ASCII subset
+						case 0x14:
+							return "TeletexString"; // aka T61String
+						case 0x15:
+							return "VideotexString";
+						case 0x16:
+							return "IA5String"; // ASCII
+						case 0x17:
+							return "UTCTime";
+						case 0x18:
+							return "GeneralizedTime";
+						case 0x19:
+							return "GraphicString";
+						case 0x1A:
+							return "VisibleString"; // ASCII subset
+						case 0x1B:
+							return "GeneralString";
+						case 0x1C:
+							return "UniversalString";
+						case 0x1E:
+							return "BMPString";
+					}
+					return "Universal_" + this.tag.tagNumber.toString();
+				case 1:
+					return "Application_" + this.tag.tagNumber.toString();
+				case 2:
+					return "[" + this.tag.tagNumber.toString() + "]"; // Context
+				case 3:
+					return "Private_" + this.tag.tagNumber.toString();
+			}
+		};
+		ASN1.prototype.content = function(maxLength) {
+			if (this.tag === undefined) {
+				return null;
+			}
+			if (maxLength === undefined) {
+				maxLength = Infinity;
+			}
+			var content = this.posContent();
+			var len = Math.abs(this.length);
+			if (!this.tag.isUniversal()) {
+				if (this.sub !== null) {
+					return "(" + this.sub.length + " elem)";
+				}
+				return this.stream.parseOctetString(content, content + len, maxLength);
+			}
+			switch (this.tag.tagNumber) {
+				case 0x01: // BOOLEAN
+					return (this.stream.get(content) === 0) ? "false" : "true";
+				case 0x02: // INTEGER
+					return this.stream.parseInteger(content, content + len);
+				case 0x03: // BIT_STRING
+					return this.sub ? "(" + this.sub.length + " elem)" :
+						this.stream.parseBitString(content, content + len, maxLength);
+				case 0x04: // OCTET_STRING
+					return this.sub ? "(" + this.sub.length + " elem)" :
+						this.stream.parseOctetString(content, content + len, maxLength);
+					// case 0x05: // NULL
+				case 0x06: // OBJECT_IDENTIFIER
+					return this.stream.parseOID(content, content + len, maxLength);
+					// case 0x07: // ObjectDescriptor
+					// case 0x08: // EXTERNAL
+					// case 0x09: // REAL
+					// case 0x0A: // ENUMERATED
+					// case 0x0B: // EMBEDDED_PDV
+				case 0x10: // SEQUENCE
+				case 0x11: // SET
+					if (this.sub !== null) {
+						return "(" + this.sub.length + " elem)";
+					} else {
+						return "(no elem)";
+					}
+					case 0x0C: // UTF8String
+						return stringCut(this.stream.parseStringUTF(content, content + len),
+							maxLength);
+					case 0x12: // NumericString
+					case 0x13: // PrintableString
+					case 0x14: // TeletexString
+					case 0x15: // VideotexString
+					case 0x16: // IA5String
+						// case 0x19: // GraphicString
+					case 0x1A: // VisibleString
+						// case 0x1B: // GeneralString
+						// case 0x1C: // UniversalString
+						return stringCut(this.stream.parseStringISO(content, content + len),
+							maxLength);
+					case 0x1E: // BMPString
+						return stringCut(this.stream.parseStringBMP(content, content + len),
+							maxLength);
+					case 0x17: // UTCTime
+					case 0x18: // GeneralizedTime
+						return this.stream.parseTime(content, content + len, (this.tag
+							.tagNumber == 0x17));
+			}
+			return null;
+		};
+		ASN1.prototype.toString = function() {
+			return this.typeName() + "@" + this.stream.pos + "[header:" + this.header +
+				",length:" + this.length + ",sub:" + ((this.sub === null) ? "null" : this.sub
+					.length) + "]";
+		};
+		ASN1.prototype.toPrettyString = function(indent) {
+			if (indent === undefined) {
+				indent = "";
+			}
+			var s = indent + this.typeName() + " @" + this.stream.pos;
+			if (this.length >= 0) {
+				s += "+";
+			}
+			s += this.length;
+			if (this.tag.tagConstructed) {
+				s += " (constructed)";
+			} else if ((this.tag.isUniversal() && ((this.tag.tagNumber == 0x03) || (this.tag
+					.tagNumber == 0x04))) && (this.sub !== null)) {
+				s += " (encapsulates)";
+			}
+			s += "\n";
+			if (this.sub !== null) {
+				indent += "  ";
+				for (var i = 0, max = this.sub.length; i < max; ++i) {
+					s += this.sub[i].toPrettyString(indent);
+				}
+			}
+			return s;
+		};
+		ASN1.prototype.posStart = function() {
+			return this.stream.pos;
+		};
+		ASN1.prototype.posContent = function() {
+			return this.stream.pos + this.header;
+		};
+		ASN1.prototype.posEnd = function() {
+			return this.stream.pos + this.header + Math.abs(this.length);
+		};
+		ASN1.prototype.toHexString = function() {
+			return this.stream.hexDump(this.posStart(), this.posEnd(), true);
+		};
+		ASN1.decodeLength = function(stream) {
+			var buf = stream.get();
+			var len = buf & 0x7F;
+			if (len == buf) {
+				return len;
+			}
+			// no reason to use Int10, as it would be a huge buffer anyways
+			if (len > 6) {
+				throw new Error("Length over 48 bits not supported at position " + (stream.pos -
+					1));
+			}
+			if (len === 0) {
+				return null;
+			} // undefined
+			buf = 0;
+			for (var i = 0; i < len; ++i) {
+				buf = (buf * 256) + stream.get();
+			}
+			return buf;
+		};
+		/**
+		 * Retrieve the hexadecimal value (as a string) of the current ASN.1 element
+		 * @returns {string}
+		 * @public
+		 */
+		ASN1.prototype.getHexStringValue = function() {
+			var hexString = this.toHexString();
+			var offset = this.header * 2;
+			var length = this.length * 2;
+			return hexString.substr(offset, length);
+		};
+		ASN1.decode = function(str) {
+			var stream;
+			if (!(str instanceof Stream)) {
+				stream = new Stream(str, 0);
+			} else {
+				stream = str;
+			}
+			var streamStart = new Stream(stream);
+			var tag = new ASN1Tag(stream);
+			var len = ASN1.decodeLength(stream);
+			var start = stream.pos;
+			var header = start - streamStart.pos;
+			var sub = null;
+			var getSub = function() {
+				var ret = [];
+				if (len !== null) {
+					// definite length
+					var end = start + len;
+					while (stream.pos < end) {
+						ret[ret.length] = ASN1.decode(stream);
+					}
+					if (stream.pos != end) {
+						throw new Error(
+							"Content size is not correct for container starting at offset " +
+							start);
+					}
+				} else {
+					// undefined length
+					try {
+						for (;;) {
+							var s = ASN1.decode(stream);
+							if (s.tag.isEOC()) {
+								break;
+							}
+							ret[ret.length] = s;
+						}
+						len = start - stream
+						.pos; // undefined lengths are represented as negative values
+					} catch (e) {
+						throw new Error(
+							"Exception while decoding undefined length content: " + e);
+					}
+				}
+				return ret;
+			};
+			if (tag.tagConstructed) {
+				// must have valid content
+				sub = getSub();
+			} else if (tag.isUniversal() && ((tag.tagNumber == 0x03) || (tag.tagNumber ==
+				0x04))) {
+				// sometimes BitString and OctetString are used to encapsulate ASN.1
+				try {
+					if (tag.tagNumber == 0x03) {
+						if (stream.get() != 0) {
+							throw new Error("BIT STRINGs with unused bits cannot encapsulate.");
+						}
+					}
+					sub = getSub();
+					for (var i = 0; i < sub.length; ++i) {
+						if (sub[i].tag.isEOC()) {
+							throw new Error("EOC is not supposed to be actual content.");
+						}
+					}
+				} catch (e) {
+					// but silently ignore when they don't
+					sub = null;
+				}
+			}
+			if (sub === null) {
+				if (len === null) {
+					throw new Error(
+						"We can't skip over an invalid tag with undefined length at offset " +
+						start);
+				}
+				stream.pos = start + Math.abs(len);
+			}
+			return new ASN1(streamStart, header, len, tag, sub);
+		};
+		return ASN1;
+	}());
+	var ASN1Tag = /** @class */ (function() {
+		function ASN1Tag(stream) {
+			var buf = stream.get();
+			this.tagClass = buf >> 6;
+			this.tagConstructed = ((buf & 0x20) !== 0);
+			this.tagNumber = buf & 0x1F;
+			if (this.tagNumber == 0x1F) { // long tag
+				var n = new Int10();
+				do {
+					buf = stream.get();
+					n.mulAdd(128, buf & 0x7F);
+				} while (buf & 0x80);
+				this.tagNumber = n.simplify();
+			}
+		}
+		ASN1Tag.prototype.isUniversal = function() {
+			return this.tagClass === 0x00;
+		};
+		ASN1Tag.prototype.isEOC = function() {
+			return this.tagClass === 0x00 && this.tagNumber === 0x00;
+		};
+		return ASN1Tag;
+	}());
+
+	// Copyright (c) 2005  Tom Wu
+	// Bits per digit
+	var dbits;
+	// JavaScript engine analysis
+	var canary = 0xdeadbeefcafe;
+	var j_lm = ((canary & 0xffffff) == 0xefcafe);
+	//#region
+	var lowprimes = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83,
+		89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181,
+		191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283,
+		293, 307, 311, 313, 317, 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409,
+		419, 421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523,
+		541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641, 643, 647,
+		653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, 773,
+		787, 797, 809, 811, 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911,
+		919, 929, 937, 941, 947, 953, 967, 971, 977, 983, 991, 997
+	];
+	var lplim = (1 << 26) / lowprimes[lowprimes.length - 1];
+	//#endregion
+	// (public) Constructor
+	var BigInteger = /** @class */ (function() {
+		function BigInteger(a, b, c) {
+			if (a != null) {
+				if ("number" == typeof a) {
+					this.fromNumber(a, b, c);
+				} else if (b == null && "string" != typeof a) {
+					this.fromString(a, 256);
+				} else {
+					this.fromString(a, b);
+				}
+			}
+		}
+		//#region PUBLIC
+		// BigInteger.prototype.toString = bnToString;
+		// (public) return string representation in given radix
+		BigInteger.prototype.toString = function(b) {
+			if (this.s < 0) {
+				return "-" + this.negate().toString(b);
+			}
+			var k;
+			if (b == 16) {
+				k = 4;
+			} else if (b == 8) {
+				k = 3;
+			} else if (b == 2) {
+				k = 1;
+			} else if (b == 32) {
+				k = 5;
+			} else if (b == 4) {
+				k = 2;
+			} else {
+				return this.toRadix(b);
+			}
+			var km = (1 << k) - 1;
+			var d;
+			var m = false;
+			var r = "";
+			var i = this.t;
+			var p = this.DB - (i * this.DB) % k;
+			if (i-- > 0) {
+				if (p < this.DB && (d = this[i] >> p) > 0) {
+					m = true;
+					r = int2char(d);
+				}
+				while (i >= 0) {
+					if (p < k) {
+						d = (this[i] & ((1 << p) - 1)) << (k - p);
+						d |= this[--i] >> (p += this.DB - k);
+					} else {
+						d = (this[i] >> (p -= k)) & km;
+						if (p <= 0) {
+							p += this.DB;
+							--i;
+						}
+					}
+					if (d > 0) {
+						m = true;
+					}
+					if (m) {
+						r += int2char(d);
+					}
+				}
+			}
+			return m ? r : "0";
+		};
+		// BigInteger.prototype.negate = bnNegate;
+		// (public) -this
+		BigInteger.prototype.negate = function() {
+			var r = nbi();
+			BigInteger.ZERO.subTo(this, r);
+			return r;
+		};
+		// BigInteger.prototype.abs = bnAbs;
+		// (public) |this|
+		BigInteger.prototype.abs = function() {
+			return (this.s < 0) ? this.negate() : this;
+		};
+		// BigInteger.prototype.compareTo = bnCompareTo;
+		// (public) return + if this > a, - if this < a, 0 if equal
+		BigInteger.prototype.compareTo = function(a) {
+			var r = this.s - a.s;
+			if (r != 0) {
+				return r;
+			}
+			var i = this.t;
+			r = i - a.t;
+			if (r != 0) {
+				return (this.s < 0) ? -r : r;
+			}
+			while (--i >= 0) {
+				if ((r = this[i] - a[i]) != 0) {
+					return r;
+				}
+			}
+			return 0;
+		};
+		// BigInteger.prototype.bitLength = bnBitLength;
+		// (public) return the number of bits in "this"
+		BigInteger.prototype.bitLength = function() {
+			if (this.t <= 0) {
+				return 0;
+			}
+			return this.DB * (this.t - 1) + nbits(this[this.t - 1] ^ (this.s & this.DM));
+		};
+		// BigInteger.prototype.mod = bnMod;
+		// (public) this mod a
+		BigInteger.prototype.mod = function(a) {
+			var r = nbi();
+			this.abs().divRemTo(a, null, r);
+			if (this.s < 0 && r.compareTo(BigInteger.ZERO) > 0) {
+				a.subTo(r, r);
+			}
+			return r;
+		};
+		// BigInteger.prototype.modPowInt = bnModPowInt;
+		// (public) this^e % m, 0 <= e < 2^32
+		BigInteger.prototype.modPowInt = function(e, m) {
+			var z;
+			if (e < 256 || m.isEven()) {
+				z = new Classic(m);
+			} else {
+				z = new Montgomery(m);
+			}
+			return this.exp(e, z);
+		};
+		// BigInteger.prototype.clone = bnClone;
+		// (public)
+		BigInteger.prototype.clone = function() {
+			var r = nbi();
+			this.copyTo(r);
+			return r;
+		};
+		// BigInteger.prototype.intValue = bnIntValue;
+		// (public) return value as integer
+		BigInteger.prototype.intValue = function() {
+			if (this.s < 0) {
+				if (this.t == 1) {
+					return this[0] - this.DV;
+				} else if (this.t == 0) {
+					return -1;
+				}
+			} else if (this.t == 1) {
+				return this[0];
+			} else if (this.t == 0) {
+				return 0;
+			}
+			// assumes 16 < DB < 32
+			return ((this[1] & ((1 << (32 - this.DB)) - 1)) << this.DB) | this[0];
+		};
+		// BigInteger.prototype.byteValue = bnByteValue;
+		// (public) return value as byte
+		BigInteger.prototype.byteValue = function() {
+			return (this.t == 0) ? this.s : (this[0] << 24) >> 24;
+		};
+		// BigInteger.prototype.shortValue = bnShortValue;
+		// (public) return value as short (assumes DB>=16)
+		BigInteger.prototype.shortValue = function() {
+			return (this.t == 0) ? this.s : (this[0] << 16) >> 16;
+		};
+		// BigInteger.prototype.signum = bnSigNum;
+		// (public) 0 if this == 0, 1 if this > 0
+		BigInteger.prototype.signum = function() {
+			if (this.s < 0) {
+				return -1;
+			} else if (this.t <= 0 || (this.t == 1 && this[0] <= 0)) {
+				return 0;
+			} else {
+				return 1;
+			}
+		};
+		// BigInteger.prototype.toByteArray = bnToByteArray;
+		// (public) convert to bigendian byte array
+		BigInteger.prototype.toByteArray = function() {
+			var i = this.t;
+			var r = [];
+			r[0] = this.s;
+			var p = this.DB - (i * this.DB) % 8;
+			var d;
+			var k = 0;
+			if (i-- > 0) {
+				if (p < this.DB && (d = this[i] >> p) != (this.s & this.DM) >> p) {
+					r[k++] = d | (this.s << (this.DB - p));
+				}
+				while (i >= 0) {
+					if (p < 8) {
+						d = (this[i] & ((1 << p) - 1)) << (8 - p);
+						d |= this[--i] >> (p += this.DB - 8);
+					} else {
+						d = (this[i] >> (p -= 8)) & 0xff;
+						if (p <= 0) {
+							p += this.DB;
+							--i;
+						}
+					}
+					if ((d & 0x80) != 0) {
+						d |= -256;
+					}
+					if (k == 0 && (this.s & 0x80) != (d & 0x80)) {
+						++k;
+					}
+					if (k > 0 || d != this.s) {
+						r[k++] = d;
+					}
+				}
+			}
+			return r;
+		};
+		// BigInteger.prototype.equals = bnEquals;
+		BigInteger.prototype.equals = function(a) {
+			return (this.compareTo(a) == 0);
+		};
+		// BigInteger.prototype.min = bnMin;
+		BigInteger.prototype.min = function(a) {
+			return (this.compareTo(a) < 0) ? this : a;
+		};
+		// BigInteger.prototype.max = bnMax;
+		BigInteger.prototype.max = function(a) {
+			return (this.compareTo(a) > 0) ? this : a;
+		};
+		// BigInteger.prototype.and = bnAnd;
+		BigInteger.prototype.and = function(a) {
+			var r = nbi();
+			this.bitwiseTo(a, op_and, r);
+			return r;
+		};
+		// BigInteger.prototype.or = bnOr;
+		BigInteger.prototype.or = function(a) {
+			var r = nbi();
+			this.bitwiseTo(a, op_or, r);
+			return r;
+		};
+		// BigInteger.prototype.xor = bnXor;
+		BigInteger.prototype.xor = function(a) {
+			var r = nbi();
+			this.bitwiseTo(a, op_xor, r);
+			return r;
+		};
+		// BigInteger.prototype.andNot = bnAndNot;
+		BigInteger.prototype.andNot = function(a) {
+			var r = nbi();
+			this.bitwiseTo(a, op_andnot, r);
+			return r;
+		};
+		// BigInteger.prototype.not = bnNot;
+		// (public) ~this
+		BigInteger.prototype.not = function() {
+			var r = nbi();
+			for (var i = 0; i < this.t; ++i) {
+				r[i] = this.DM & ~this[i];
+			}
+			r.t = this.t;
+			r.s = ~this.s;
+			return r;
+		};
+		// BigInteger.prototype.shiftLeft = bnShiftLeft;
+		// (public) this << n
+		BigInteger.prototype.shiftLeft = function(n) {
+			var r = nbi();
+			if (n < 0) {
+				this.rShiftTo(-n, r);
+			} else {
+				this.lShiftTo(n, r);
+			}
+			return r;
+		};
+		// BigInteger.prototype.shiftRight = bnShiftRight;
+		// (public) this >> n
+		BigInteger.prototype.shiftRight = function(n) {
+			var r = nbi();
+			if (n < 0) {
+				this.lShiftTo(-n, r);
+			} else {
+				this.rShiftTo(n, r);
+			}
+			return r;
+		};
+		// BigInteger.prototype.getLowestSetBit = bnGetLowestSetBit;
+		// (public) returns index of lowest 1-bit (or -1 if none)
+		BigInteger.prototype.getLowestSetBit = function() {
+			for (var i = 0; i < this.t; ++i) {
+				if (this[i] != 0) {
+					return i * this.DB + lbit(this[i]);
+				}
+			}
+			if (this.s < 0) {
+				return this.t * this.DB;
+			}
+			return -1;
+		};
+		// BigInteger.prototype.bitCount = bnBitCount;
+		// (public) return number of set bits
+		BigInteger.prototype.bitCount = function() {
+			var r = 0;
+			var x = this.s & this.DM;
+			for (var i = 0; i < this.t; ++i) {
+				r += cbit(this[i] ^ x);
+			}
+			return r;
+		};
+		// BigInteger.prototype.testBit = bnTestBit;
+		// (public) true iff nth bit is set
+		BigInteger.prototype.testBit = function(n) {
+			var j = Math.floor(n / this.DB);
+			if (j >= this.t) {
+				return (this.s != 0);
+			}
+			return ((this[j] & (1 << (n % this.DB))) != 0);
+		};
+		// BigInteger.prototype.setBit = bnSetBit;
+		// (public) this | (1<<n)
+		BigInteger.prototype.setBit = function(n) {
+			return this.changeBit(n, op_or);
+		};
+		// BigInteger.prototype.clearBit = bnClearBit;
+		// (public) this & ~(1<<n)
+		BigInteger.prototype.clearBit = function(n) {
+			return this.changeBit(n, op_andnot);
+		};
+		// BigInteger.prototype.flipBit = bnFlipBit;
+		// (public) this ^ (1<<n)
+		BigInteger.prototype.flipBit = function(n) {
+			return this.changeBit(n, op_xor);
+		};
+		// BigInteger.prototype.add = bnAdd;
+		// (public) this + a
+		BigInteger.prototype.add = function(a) {
+			var r = nbi();
+			this.addTo(a, r);
+			return r;
+		};
+		// BigInteger.prototype.subtract = bnSubtract;
+		// (public) this - a
+		BigInteger.prototype.subtract = function(a) {
+			var r = nbi();
+			this.subTo(a, r);
+			return r;
+		};
+		// BigInteger.prototype.multiply = bnMultiply;
+		// (public) this * a
+		BigInteger.prototype.multiply = function(a) {
+			var r = nbi();
+			this.multiplyTo(a, r);
+			return r;
+		};
+		// BigInteger.prototype.divide = bnDivide;
+		// (public) this / a
+		BigInteger.prototype.divide = function(a) {
+			var r = nbi();
+			this.divRemTo(a, r, null);
+			return r;
+		};
+		// BigInteger.prototype.remainder = bnRemainder;
+		// (public) this % a
+		BigInteger.prototype.remainder = function(a) {
+			var r = nbi();
+			this.divRemTo(a, null, r);
+			return r;
+		};
+		// BigInteger.prototype.divideAndRemainder = bnDivideAndRemainder;
+		// (public) [this/a,this%a]
+		BigInteger.prototype.divideAndRemainder = function(a) {
+			var q = nbi();
+			var r = nbi();
+			this.divRemTo(a, q, r);
+			return [q, r];
+		};
+		// BigInteger.prototype.modPow = bnModPow;
+		// (public) this^e % m (HAC 14.85)
+		BigInteger.prototype.modPow = function(e, m) {
+			var i = e.bitLength();
+			var k;
+			var r = nbv(1);
+			var z;
+			if (i <= 0) {
+				return r;
+			} else if (i < 18) {
+				k = 1;
+			} else if (i < 48) {
+				k = 3;
+			} else if (i < 144) {
+				k = 4;
+			} else if (i < 768) {
+				k = 5;
+			} else {
+				k = 6;
+			}
+			if (i < 8) {
+				z = new Classic(m);
+			} else if (m.isEven()) {
+				z = new Barrett(m);
+			} else {
+				z = new Montgomery(m);
+			}
+			// precomputation
+			var g = [];
+			var n = 3;
+			var k1 = k - 1;
+			var km = (1 << k) - 1;
+			g[1] = z.convert(this);
+			if (k > 1) {
+				var g2 = nbi();
+				z.sqrTo(g[1], g2);
+				while (n <= km) {
+					g[n] = nbi();
+					z.mulTo(g2, g[n - 2], g[n]);
+					n += 2;
+				}
+			}
+			var j = e.t - 1;
+			var w;
+			var is1 = true;
+			var r2 = nbi();
+			var t;
+			i = nbits(e[j]) - 1;
+			while (j >= 0) {
+				if (i >= k1) {
+					w = (e[j] >> (i - k1)) & km;
+				} else {
+					w = (e[j] & ((1 << (i + 1)) - 1)) << (k1 - i);
+					if (j > 0) {
+						w |= e[j - 1] >> (this.DB + i - k1);
+					}
+				}
+				n = k;
+				while ((w & 1) == 0) {
+					w >>= 1;
+					--n;
+				}
+				if ((i -= n) < 0) {
+					i += this.DB;
+					--j;
+				}
+				if (is1) { // ret == 1, don't bother squaring or multiplying it
+					g[w].copyTo(r);
+					is1 = false;
+				} else {
+					while (n > 1) {
+						z.sqrTo(r, r2);
+						z.sqrTo(r2, r);
+						n -= 2;
+					}
+					if (n > 0) {
+						z.sqrTo(r, r2);
+					} else {
+						t = r;
+						r = r2;
+						r2 = t;
+					}
+					z.mulTo(r2, g[w], r);
+				}
+				while (j >= 0 && (e[j] & (1 << i)) == 0) {
+					z.sqrTo(r, r2);
+					t = r;
+					r = r2;
+					r2 = t;
+					if (--i < 0) {
+						i = this.DB - 1;
+						--j;
+					}
+				}
+			}
+			return z.revert(r);
+		};
+		// BigInteger.prototype.modInverse = bnModInverse;
+		// (public) 1/this % m (HAC 14.61)
+		BigInteger.prototype.modInverse = function(m) {
+			var ac = m.isEven();
+			if ((this.isEven() && ac) || m.signum() == 0) {
+				return BigInteger.ZERO;
+			}
+			var u = m.clone();
+			var v = this.clone();
+			var a = nbv(1);
+			var b = nbv(0);
+			var c = nbv(0);
+			var d = nbv(1);
+			while (u.signum() != 0) {
+				while (u.isEven()) {
+					u.rShiftTo(1, u);
+					if (ac) {
+						if (!a.isEven() || !b.isEven()) {
+							a.addTo(this, a);
+							b.subTo(m, b);
+						}
+						a.rShiftTo(1, a);
+					} else if (!b.isEven()) {
+						b.subTo(m, b);
+					}
+					b.rShiftTo(1, b);
+				}
+				while (v.isEven()) {
+					v.rShiftTo(1, v);
+					if (ac) {
+						if (!c.isEven() || !d.isEven()) {
+							c.addTo(this, c);
+							d.subTo(m, d);
+						}
+						c.rShiftTo(1, c);
+					} else if (!d.isEven()) {
+						d.subTo(m, d);
+					}
+					d.rShiftTo(1, d);
+				}
+				if (u.compareTo(v) >= 0) {
+					u.subTo(v, u);
+					if (ac) {
+						a.subTo(c, a);
+					}
+					b.subTo(d, b);
+				} else {
+					v.subTo(u, v);
+					if (ac) {
+						c.subTo(a, c);
+					}
+					d.subTo(b, d);
+				}
+			}
+			if (v.compareTo(BigInteger.ONE) != 0) {
+				return BigInteger.ZERO;
+			}
+			if (d.compareTo(m) >= 0) {
+				return d.subtract(m);
+			}
+			if (d.signum() < 0) {
+				d.addTo(m, d);
+			} else {
+				return d;
+			}
+			if (d.signum() < 0) {
+				return d.add(m);
+			} else {
+				return d;
+			}
+		};
+		// BigInteger.prototype.pow = bnPow;
+		// (public) this^e
+		BigInteger.prototype.pow = function(e) {
+			return this.exp(e, new NullExp());
+		};
+		// BigInteger.prototype.gcd = bnGCD;
+		// (public) gcd(this,a) (HAC 14.54)
+		BigInteger.prototype.gcd = function(a) {
+			var x = (this.s < 0) ? this.negate() : this.clone();
+			var y = (a.s < 0) ? a.negate() : a.clone();
+			if (x.compareTo(y) < 0) {
+				var t = x;
+				x = y;
+				y = t;
+			}
+			var i = x.getLowestSetBit();
+			var g = y.getLowestSetBit();
+			if (g < 0) {
+				return x;
+			}
+			if (i < g) {
+				g = i;
+			}
+			if (g > 0) {
+				x.rShiftTo(g, x);
+				y.rShiftTo(g, y);
+			}
+			while (x.signum() > 0) {
+				if ((i = x.getLowestSetBit()) > 0) {
+					x.rShiftTo(i, x);
+				}
+				if ((i = y.getLowestSetBit()) > 0) {
+					y.rShiftTo(i, y);
+				}
+				if (x.compareTo(y) >= 0) {
+					x.subTo(y, x);
+					x.rShiftTo(1, x);
+				} else {
+					y.subTo(x, y);
+					y.rShiftTo(1, y);
+				}
+			}
+			if (g > 0) {
+				y.lShiftTo(g, y);
+			}
+			return y;
+		};
+		// BigInteger.prototype.isProbablePrime = bnIsProbablePrime;
+		// (public) test primality with certainty >= 1-.5^t
+		BigInteger.prototype.isProbablePrime = function(t) {
+			var i;
+			var x = this.abs();
+			if (x.t == 1 && x[0] <= lowprimes[lowprimes.length - 1]) {
+				for (i = 0; i < lowprimes.length; ++i) {
+					if (x[0] == lowprimes[i]) {
+						return true;
+					}
+				}
+				return false;
+			}
+			if (x.isEven()) {
+				return false;
+			}
+			i = 1;
+			while (i < lowprimes.length) {
+				var m = lowprimes[i];
+				var j = i + 1;
+				while (j < lowprimes.length && m < lplim) {
+					m *= lowprimes[j++];
+				}
+				m = x.modInt(m);
+				while (i < j) {
+					if (m % lowprimes[i++] == 0) {
+						return false;
+					}
+				}
+			}
+			return x.millerRabin(t);
+		};
+		//#endregion PUBLIC
+		//#region PROTECTED
+		// BigInteger.prototype.copyTo = bnpCopyTo;
+		// (protected) copy this to r
+		BigInteger.prototype.copyTo = function(r) {
+			for (var i = this.t - 1; i >= 0; --i) {
+				r[i] = this[i];
+			}
+			r.t = this.t;
+			r.s = this.s;
+		};
+		// BigInteger.prototype.fromInt = bnpFromInt;
+		// (protected) set from integer value x, -DV <= x < DV
+		BigInteger.prototype.fromInt = function(x) {
+			this.t = 1;
+			this.s = (x < 0) ? -1 : 0;
+			if (x > 0) {
+				this[0] = x;
+			} else if (x < -1) {
+				this[0] = x + this.DV;
+			} else {
+				this.t = 0;
+			}
+		};
+		// BigInteger.prototype.fromString = bnpFromString;
+		// (protected) set from string and radix
+		BigInteger.prototype.fromString = function(s, b) {
+			var k;
+			if (b == 16) {
+				k = 4;
+			} else if (b == 8) {
+				k = 3;
+			} else if (b == 256) {
+				k = 8;
+				/* byte array */
+			} else if (b == 2) {
+				k = 1;
+			} else if (b == 32) {
+				k = 5;
+			} else if (b == 4) {
+				k = 2;
+			} else {
+				this.fromRadix(s, b);
+				return;
+			}
+			this.t = 0;
+			this.s = 0;
+			var i = s.length;
+			var mi = false;
+			var sh = 0;
+			while (--i >= 0) {
+				var x = (k == 8) ? (+s[i]) & 0xff : intAt(s, i);
+				if (x < 0) {
+					if (s.charAt(i) == "-") {
+						mi = true;
+					}
+					continue;
+				}
+				mi = false;
+				if (sh == 0) {
+					this[this.t++] = x;
+				} else if (sh + k > this.DB) {
+					this[this.t - 1] |= (x & ((1 << (this.DB - sh)) - 1)) << sh;
+					this[this.t++] = (x >> (this.DB - sh));
+				} else {
+					this[this.t - 1] |= x << sh;
+				}
+				sh += k;
+				if (sh >= this.DB) {
+					sh -= this.DB;
+				}
+			}
+			if (k == 8 && ((+s[0]) & 0x80) != 0) {
+				this.s = -1;
+				if (sh > 0) {
+					this[this.t - 1] |= ((1 << (this.DB - sh)) - 1) << sh;
+				}
+			}
+			this.clamp();
+			if (mi) {
+				BigInteger.ZERO.subTo(this, this);
+			}
+		};
+		// BigInteger.prototype.clamp = bnpClamp;
+		// (protected) clamp off excess high words
+		BigInteger.prototype.clamp = function() {
+			var c = this.s & this.DM;
+			while (this.t > 0 && this[this.t - 1] == c) {
+				--this.t;
+			}
+		};
+		// BigInteger.prototype.dlShiftTo = bnpDLShiftTo;
+		// (protected) r = this << n*DB
+		BigInteger.prototype.dlShiftTo = function(n, r) {
+			var i;
+			for (i = this.t - 1; i >= 0; --i) {
+				r[i + n] = this[i];
+			}
+			for (i = n - 1; i >= 0; --i) {
+				r[i] = 0;
+			}
+			r.t = this.t + n;
+			r.s = this.s;
+		};
+		// BigInteger.prototype.drShiftTo = bnpDRShiftTo;
+		// (protected) r = this >> n*DB
+		BigInteger.prototype.drShiftTo = function(n, r) {
+			for (var i = n; i < this.t; ++i) {
+				r[i - n] = this[i];
+			}
+			r.t = Math.max(this.t - n, 0);
+			r.s = this.s;
+		};
+		// BigInteger.prototype.lShiftTo = bnpLShiftTo;
+		// (protected) r = this << n
+		BigInteger.prototype.lShiftTo = function(n, r) {
+			var bs = n % this.DB;
+			var cbs = this.DB - bs;
+			var bm = (1 << cbs) - 1;
+			var ds = Math.floor(n / this.DB);
+			var c = (this.s << bs) & this.DM;
+			for (var i = this.t - 1; i >= 0; --i) {
+				r[i + ds + 1] = (this[i] >> cbs) | c;
+				c = (this[i] & bm) << bs;
+			}
+			for (var i = ds - 1; i >= 0; --i) {
+				r[i] = 0;
+			}
+			r[ds] = c;
+			r.t = this.t + ds + 1;
+			r.s = this.s;
+			r.clamp();
+		};
+		// BigInteger.prototype.rShiftTo = bnpRShiftTo;
+		// (protected) r = this >> n
+		BigInteger.prototype.rShiftTo = function(n, r) {
+			r.s = this.s;
+			var ds = Math.floor(n / this.DB);
+			if (ds >= this.t) {
+				r.t = 0;
+				return;
+			}
+			var bs = n % this.DB;
+			var cbs = this.DB - bs;
+			var bm = (1 << bs) - 1;
+			r[0] = this[ds] >> bs;
+			for (var i = ds + 1; i < this.t; ++i) {
+				r[i - ds - 1] |= (this[i] & bm) << cbs;
+				r[i - ds] = this[i] >> bs;
+			}
+			if (bs > 0) {
+				r[this.t - ds - 1] |= (this.s & bm) << cbs;
+			}
+			r.t = this.t - ds;
+			r.clamp();
+		};
+		// BigInteger.prototype.subTo = bnpSubTo;
+		// (protected) r = this - a
+		BigInteger.prototype.subTo = function(a, r) {
+			var i = 0;
+			var c = 0;
+			var m = Math.min(a.t, this.t);
+			while (i < m) {
+				c += this[i] - a[i];
+				r[i++] = c & this.DM;
+				c >>= this.DB;
+			}
+			if (a.t < this.t) {
+				c -= a.s;
+				while (i < this.t) {
+					c += this[i];
+					r[i++] = c & this.DM;
+					c >>= this.DB;
+				}
+				c += this.s;
+			} else {
+				c += this.s;
+				while (i < a.t) {
+					c -= a[i];
+					r[i++] = c & this.DM;
+					c >>= this.DB;
+				}
+				c -= a.s;
+			}
+			r.s = (c < 0) ? -1 : 0;
+			if (c < -1) {
+				r[i++] = this.DV + c;
+			} else if (c > 0) {
+				r[i++] = c;
+			}
+			r.t = i;
+			r.clamp();
+		};
+		// BigInteger.prototype.multiplyTo = bnpMultiplyTo;
+		// (protected) r = this * a, r != this,a (HAC 14.12)
+		// "this" should be the larger one if appropriate.
+		BigInteger.prototype.multiplyTo = function(a, r) {
+			var x = this.abs();
+			var y = a.abs();
+			var i = x.t;
+			r.t = i + y.t;
+			while (--i >= 0) {
+				r[i] = 0;
+			}
+			for (i = 0; i < y.t; ++i) {
+				r[i + x.t] = x.am(0, y[i], r, i, 0, x.t);
+			}
+			r.s = 0;
+			r.clamp();
+			if (this.s != a.s) {
+				BigInteger.ZERO.subTo(r, r);
+			}
+		};
+		// BigInteger.prototype.squareTo = bnpSquareTo;
+		// (protected) r = this^2, r != this (HAC 14.16)
+		BigInteger.prototype.squareTo = function(r) {
+			var x = this.abs();
+			var i = r.t = 2 * x.t;
+			while (--i >= 0) {
+				r[i] = 0;
+			}
+			for (i = 0; i < x.t - 1; ++i) {
+				var c = x.am(i, x[i], r, 2 * i, 0, 1);
+				if ((r[i + x.t] += x.am(i + 1, 2 * x[i], r, 2 * i + 1, c, x.t - i - 1)) >= x
+					.DV) {
+					r[i + x.t] -= x.DV;
+					r[i + x.t + 1] = 1;
+				}
+			}
+			if (r.t > 0) {
+				r[r.t - 1] += x.am(i, x[i], r, 2 * i, 0, 1);
+			}
+			r.s = 0;
+			r.clamp();
+		};
+		// BigInteger.prototype.divRemTo = bnpDivRemTo;
+		// (protected) divide this by m, quotient and remainder to q, r (HAC 14.20)
+		// r != q, this != m.  q or r may be null.
+		BigInteger.prototype.divRemTo = function(m, q, r) {
+			var pm = m.abs();
+			if (pm.t <= 0) {
+				return;
+			}
+			var pt = this.abs();
+			if (pt.t < pm.t) {
+				if (q != null) {
+					q.fromInt(0);
+				}
+				if (r != null) {
+					this.copyTo(r);
+				}
+				return;
+			}
+			if (r == null) {
+				r = nbi();
+			}
+			var y = nbi();
+			var ts = this.s;
+			var ms = m.s;
+			var nsh = this.DB - nbits(pm[pm.t - 1]); // normalize modulus
+			if (nsh > 0) {
+				pm.lShiftTo(nsh, y);
+				pt.lShiftTo(nsh, r);
+			} else {
+				pm.copyTo(y);
+				pt.copyTo(r);
+			}
+			var ys = y.t;
+			var y0 = y[ys - 1];
+			if (y0 == 0) {
+				return;
+			}
+			var yt = y0 * (1 << this.F1) + ((ys > 1) ? y[ys - 2] >> this.F2 : 0);
+			var d1 = this.FV / yt;
+			var d2 = (1 << this.F1) / yt;
+			var e = 1 << this.F2;
+			var i = r.t;
+			var j = i - ys;
+			var t = (q == null) ? nbi() : q;
+			y.dlShiftTo(j, t);
+			if (r.compareTo(t) >= 0) {
+				r[r.t++] = 1;
+				r.subTo(t, r);
+			}
+			BigInteger.ONE.dlShiftTo(ys, t);
+			t.subTo(y, y); // "negative" y so we can replace sub with am later
+			while (y.t < ys) {
+				y[y.t++] = 0;
+			}
+			while (--j >= 0) {
+				// Estimate quotient digit
+				var qd = (r[--i] == y0) ? this.DM : Math.floor(r[i] * d1 + (r[i - 1] + e) * d2);
+				if ((r[i] += y.am(0, qd, r, j, 0, ys)) < qd) { // Try it out
+					y.dlShiftTo(j, t);
+					r.subTo(t, r);
+					while (r[i] < --qd) {
+						r.subTo(t, r);
+					}
+				}
+			}
+			if (q != null) {
+				r.drShiftTo(ys, q);
+				if (ts != ms) {
+					BigInteger.ZERO.subTo(q, q);
+				}
+			}
+			r.t = ys;
+			r.clamp();
+			if (nsh > 0) {
+				r.rShiftTo(nsh, r);
+			} // Denormalize remainder
+			if (ts < 0) {
+				BigInteger.ZERO.subTo(r, r);
+			}
+		};
+		// BigInteger.prototype.invDigit = bnpInvDigit;
+		// (protected) return "-1/this % 2^DB"; useful for Mont. reduction
+		// justification:
+		//         xy == 1 (mod m)
+		//         xy =  1+km
+		//   xy(2-xy) = (1+km)(1-km)
+		// x[y(2-xy)] = 1-k^2m^2
+		// x[y(2-xy)] == 1 (mod m^2)
+		// if y is 1/x mod m, then y(2-xy) is 1/x mod m^2
+		// should reduce x and y(2-xy) by m^2 at each step to keep size bounded.
+		// JS multiply "overflows" differently from C/C++, so care is needed here.
+		BigInteger.prototype.invDigit = function() {
+			if (this.t < 1) {
+				return 0;
+			}
+			var x = this[0];
+			if ((x & 1) == 0) {
+				return 0;
+			}
+			var y = x & 3; // y == 1/x mod 2^2
+			y = (y * (2 - (x & 0xf) * y)) & 0xf; // y == 1/x mod 2^4
+			y = (y * (2 - (x & 0xff) * y)) & 0xff; // y == 1/x mod 2^8
+			y = (y * (2 - (((x & 0xffff) * y) & 0xffff))) & 0xffff; // y == 1/x mod 2^16
+			// last step - calculate inverse mod DV directly;
+			// assumes 16 < DB <= 32 and assumes ability to handle 48-bit ints
+			y = (y * (2 - x * y % this.DV)) % this.DV; // y == 1/x mod 2^dbits
+			// we really want the negative inverse, and -DV < y < DV
+			return (y > 0) ? this.DV - y : -y;
+		};
+		// BigInteger.prototype.isEven = bnpIsEven;
+		// (protected) true iff this is even
+		BigInteger.prototype.isEven = function() {
+			return ((this.t > 0) ? (this[0] & 1) : this.s) == 0;
+		};
+		// BigInteger.prototype.exp = bnpExp;
+		// (protected) this^e, e < 2^32, doing sqr and mul with "r" (HAC 14.79)
+		BigInteger.prototype.exp = function(e, z) {
+			if (e > 0xffffffff || e < 1) {
+				return BigInteger.ONE;
+			}
+			var r = nbi();
+			var r2 = nbi();
+			var g = z.convert(this);
+			var i = nbits(e) - 1;
+			g.copyTo(r);
+			while (--i >= 0) {
+				z.sqrTo(r, r2);
+				if ((e & (1 << i)) > 0) {
+					z.mulTo(r2, g, r);
+				} else {
+					var t = r;
+					r = r2;
+					r2 = t;
+				}
+			}
+			return z.revert(r);
+		};
+		// BigInteger.prototype.chunkSize = bnpChunkSize;
+		// (protected) return x s.t. r^x < DV
+		BigInteger.prototype.chunkSize = function(r) {
+			return Math.floor(Math.LN2 * this.DB / Math.log(r));
+		};
+		// BigInteger.prototype.toRadix = bnpToRadix;
+		// (protected) convert to radix string
+		BigInteger.prototype.toRadix = function(b) {
+			if (b == null) {
+				b = 10;
+			}
+			if (this.signum() == 0 || b < 2 || b > 36) {
+				return "0";
+			}
+			var cs = this.chunkSize(b);
+			var a = Math.pow(b, cs);
+			var d = nbv(a);
+			var y = nbi();
+			var z = nbi();
+			var r = "";
+			this.divRemTo(d, y, z);
+			while (y.signum() > 0) {
+				r = (a + z.intValue()).toString(b).substr(1) + r;
+				y.divRemTo(d, y, z);
+			}
+			return z.intValue().toString(b) + r;
+		};
+		// BigInteger.prototype.fromRadix = bnpFromRadix;
+		// (protected) convert from radix string
+		BigInteger.prototype.fromRadix = function(s, b) {
+			this.fromInt(0);
+			if (b == null) {
+				b = 10;
+			}
+			var cs = this.chunkSize(b);
+			var d = Math.pow(b, cs);
+			var mi = false;
+			var j = 0;
+			var w = 0;
+			for (var i = 0; i < s.length; ++i) {
+				var x = intAt(s, i);
+				if (x < 0) {
+					if (s.charAt(i) == "-" && this.signum() == 0) {
+						mi = true;
+					}
+					continue;
+				}
+				w = b * w + x;
+				if (++j >= cs) {
+					this.dMultiply(d);
+					this.dAddOffset(w, 0);
+					j = 0;
+					w = 0;
+				}
+			}
+			if (j > 0) {
+				this.dMultiply(Math.pow(b, j));
+				this.dAddOffset(w, 0);
+			}
+			if (mi) {
+				BigInteger.ZERO.subTo(this, this);
+			}
+		};
+		// BigInteger.prototype.fromNumber = bnpFromNumber;
+		// (protected) alternate constructor
+		BigInteger.prototype.fromNumber = function(a, b, c) {
+			if ("number" == typeof b) {
+				// new BigInteger(int,int,RNG)
+				if (a < 2) {
+					this.fromInt(1);
+				} else {
+					this.fromNumber(a, c);
+					if (!this.testBit(a - 1)) {
+						// force MSB set
+						this.bitwiseTo(BigInteger.ONE.shiftLeft(a - 1), op_or, this);
+					}
+					if (this.isEven()) {
+						this.dAddOffset(1, 0);
+					} // force odd
+					while (!this.isProbablePrime(b)) {
+						this.dAddOffset(2, 0);
+						if (this.bitLength() > a) {
+							this.subTo(BigInteger.ONE.shiftLeft(a - 1), this);
+						}
+					}
+				}
+			} else {
+				// new BigInteger(int,RNG)
+				var x = [];
+				var t = a & 7;
+				x.length = (a >> 3) + 1;
+				b.nextBytes(x);
+				if (t > 0) {
+					x[0] &= ((1 << t) - 1);
+				} else {
+					x[0] = 0;
+				}
+				this.fromString(x, 256);
+			}
+		};
+		// BigInteger.prototype.bitwiseTo = bnpBitwiseTo;
+		// (protected) r = this op a (bitwise)
+		BigInteger.prototype.bitwiseTo = function(a, op, r) {
+			var i;
+			var f;
+			var m = Math.min(a.t, this.t);
+			for (i = 0; i < m; ++i) {
+				r[i] = op(this[i], a[i]);
+			}
+			if (a.t < this.t) {
+				f = a.s & this.DM;
+				for (i = m; i < this.t; ++i) {
+					r[i] = op(this[i], f);
+				}
+				r.t = this.t;
+			} else {
+				f = this.s & this.DM;
+				for (i = m; i < a.t; ++i) {
+					r[i] = op(f, a[i]);
+				}
+				r.t = a.t;
+			}
+			r.s = op(this.s, a.s);
+			r.clamp();
+		};
+		// BigInteger.prototype.changeBit = bnpChangeBit;
+		// (protected) this op (1<<n)
+		BigInteger.prototype.changeBit = function(n, op) {
+			var r = BigInteger.ONE.shiftLeft(n);
+			this.bitwiseTo(r, op, r);
+			return r;
+		};
+		// BigInteger.prototype.addTo = bnpAddTo;
+		// (protected) r = this + a
+		BigInteger.prototype.addTo = function(a, r) {
+			var i = 0;
+			var c = 0;
+			var m = Math.min(a.t, this.t);
+			while (i < m) {
+				c += this[i] + a[i];
+				r[i++] = c & this.DM;
+				c >>= this.DB;
+			}
+			if (a.t < this.t) {
+				c += a.s;
+				while (i < this.t) {
+					c += this[i];
+					r[i++] = c & this.DM;
+					c >>= this.DB;
+				}
+				c += this.s;
+			} else {
+				c += this.s;
+				while (i < a.t) {
+					c += a[i];
+					r[i++] = c & this.DM;
+					c >>= this.DB;
+				}
+				c += a.s;
+			}
+			r.s = (c < 0) ? -1 : 0;
+			if (c > 0) {
+				r[i++] = c;
+			} else if (c < -1) {
+				r[i++] = this.DV + c;
+			}
+			r.t = i;
+			r.clamp();
+		};
+		// BigInteger.prototype.dMultiply = bnpDMultiply;
+		// (protected) this *= n, this >= 0, 1 < n < DV
+		BigInteger.prototype.dMultiply = function(n) {
+			this[this.t] = this.am(0, n - 1, this, 0, 0, this.t);
+			++this.t;
+			this.clamp();
+		};
+		// BigInteger.prototype.dAddOffset = bnpDAddOffset;
+		// (protected) this += n << w words, this >= 0
+		BigInteger.prototype.dAddOffset = function(n, w) {
+			if (n == 0) {
+				return;
+			}
+			while (this.t <= w) {
+				this[this.t++] = 0;
+			}
+			this[w] += n;
+			while (this[w] >= this.DV) {
+				this[w] -= this.DV;
+				if (++w >= this.t) {
+					this[this.t++] = 0;
+				}
+				++this[w];
+			}
+		};
+		// BigInteger.prototype.multiplyLowerTo = bnpMultiplyLowerTo;
+		// (protected) r = lower n words of "this * a", a.t <= n
+		// "this" should be the larger one if appropriate.
+		BigInteger.prototype.multiplyLowerTo = function(a, n, r) {
+			var i = Math.min(this.t + a.t, n);
+			r.s = 0; // assumes a,this >= 0
+			r.t = i;
+			while (i > 0) {
+				r[--i] = 0;
+			}
+			for (var j = r.t - this.t; i < j; ++i) {
+				r[i + this.t] = this.am(0, a[i], r, i, 0, this.t);
+			}
+			for (var j = Math.min(a.t, n); i < j; ++i) {
+				this.am(0, a[i], r, i, 0, n - i);
+			}
+			r.clamp();
+		};
+		// BigInteger.prototype.multiplyUpperTo = bnpMultiplyUpperTo;
+		// (protected) r = "this * a" without lower n words, n > 0
+		// "this" should be the larger one if appropriate.
+		BigInteger.prototype.multiplyUpperTo = function(a, n, r) {
+			--n;
+			var i = r.t = this.t + a.t - n;
+			r.s = 0; // assumes a,this >= 0
+			while (--i >= 0) {
+				r[i] = 0;
+			}
+			for (i = Math.max(n - this.t, 0); i < a.t; ++i) {
+				r[this.t + i - n] = this.am(n - i, a[i], r, 0, 0, this.t + i - n);
+			}
+			r.clamp();
+			r.drShiftTo(1, r);
+		};
+		// BigInteger.prototype.modInt = bnpModInt;
+		// (protected) this % n, n < 2^26
+		BigInteger.prototype.modInt = function(n) {
+			if (n <= 0) {
+				return 0;
+			}
+			var d = this.DV % n;
+			var r = (this.s < 0) ? n - 1 : 0;
+			if (this.t > 0) {
+				if (d == 0) {
+					r = this[0] % n;
+				} else {
+					for (var i = this.t - 1; i >= 0; --i) {
+						r = (d * r + this[i]) % n;
+					}
+				}
+			}
+			return r;
+		};
+		// BigInteger.prototype.millerRabin = bnpMillerRabin;
+		// (protected) true if probably prime (HAC 4.24, Miller-Rabin)
+		BigInteger.prototype.millerRabin = function(t) {
+			var n1 = this.subtract(BigInteger.ONE);
+			var k = n1.getLowestSetBit();
+			if (k <= 0) {
+				return false;
+			}
+			var r = n1.shiftRight(k);
+			t = (t + 1) >> 1;
+			if (t > lowprimes.length) {
+				t = lowprimes.length;
+			}
+			var a = nbi();
+			for (var i = 0; i < t; ++i) {
+				// Pick bases at random, instead of starting at 2
+				a.fromInt(lowprimes[Math.floor(Math.random() * lowprimes.length)]);
+				var y = a.modPow(r, this);
+				if (y.compareTo(BigInteger.ONE) != 0 && y.compareTo(n1) != 0) {
+					var j = 1;
+					while (j++ < k && y.compareTo(n1) != 0) {
+						y = y.modPowInt(2, this);
+						if (y.compareTo(BigInteger.ONE) == 0) {
+							return false;
+						}
+					}
+					if (y.compareTo(n1) != 0) {
+						return false;
+					}
+				}
+			}
+			return true;
+		};
+		// BigInteger.prototype.square = bnSquare;
+		// (public) this^2
+		BigInteger.prototype.square = function() {
+			var r = nbi();
+			this.squareTo(r);
+			return r;
+		};
+		//#region ASYNC
+		// Public API method
+		BigInteger.prototype.gcda = function(a, callback) {
+			var x = (this.s < 0) ? this.negate() : this.clone();
+			var y = (a.s < 0) ? a.negate() : a.clone();
+			if (x.compareTo(y) < 0) {
+				var t = x;
+				x = y;
+				y = t;
+			}
+			var i = x.getLowestSetBit();
+			var g = y.getLowestSetBit();
+			if (g < 0) {
+				callback(x);
+				return;
+			}
+			if (i < g) {
+				g = i;
+			}
+			if (g > 0) {
+				x.rShiftTo(g, x);
+				y.rShiftTo(g, y);
+			}
+			// Workhorse of the algorithm, gets called 200 - 800 times per 512 bit keygen.
+			var gcda1 = function() {
+				if ((i = x.getLowestSetBit()) > 0) {
+					x.rShiftTo(i, x);
+				}
+				if ((i = y.getLowestSetBit()) > 0) {
+					y.rShiftTo(i, y);
+				}
+				if (x.compareTo(y) >= 0) {
+					x.subTo(y, x);
+					x.rShiftTo(1, x);
+				} else {
+					y.subTo(x, y);
+					y.rShiftTo(1, y);
+				}
+				if (!(x.signum() > 0)) {
+					if (g > 0) {
+						y.lShiftTo(g, y);
+					}
+					setTimeout(function() {
+						callback(y);
+					}, 0); // escape
+				} else {
+					setTimeout(gcda1, 0);
+				}
+			};
+			setTimeout(gcda1, 10);
+		};
+		// (protected) alternate constructor
+		BigInteger.prototype.fromNumberAsync = function(a, b, c, callback) {
+			if ("number" == typeof b) {
+				if (a < 2) {
+					this.fromInt(1);
+				} else {
+					this.fromNumber(a, c);
+					if (!this.testBit(a - 1)) {
+						this.bitwiseTo(BigInteger.ONE.shiftLeft(a - 1), op_or, this);
+					}
+					if (this.isEven()) {
+						this.dAddOffset(1, 0);
+					}
+					var bnp_1 = this;
+					var bnpfn1_1 = function() {
+						bnp_1.dAddOffset(2, 0);
+						if (bnp_1.bitLength() > a) {
+							bnp_1.subTo(BigInteger.ONE.shiftLeft(a - 1), bnp_1);
+						}
+						if (bnp_1.isProbablePrime(b)) {
+							setTimeout(function() {
+								callback();
+							}, 0); // escape
+						} else {
+							setTimeout(bnpfn1_1, 0);
+						}
+					};
+					setTimeout(bnpfn1_1, 0);
+				}
+			} else {
+				var x = [];
+				var t = a & 7;
+				x.length = (a >> 3) + 1;
+				b.nextBytes(x);
+				if (t > 0) {
+					x[0] &= ((1 << t) - 1);
+				} else {
+					x[0] = 0;
+				}
+				this.fromString(x, 256);
+			}
+		};
+		return BigInteger;
+	}());
+	//#region REDUCERS
+	//#region NullExp
+	var NullExp = /** @class */ (function() {
+		function NullExp() {}
+		// NullExp.prototype.convert = nNop;
+		NullExp.prototype.convert = function(x) {
+			return x;
+		};
+		// NullExp.prototype.revert = nNop;
+		NullExp.prototype.revert = function(x) {
+			return x;
+		};
+		// NullExp.prototype.mulTo = nMulTo;
+		NullExp.prototype.mulTo = function(x, y, r) {
+			x.multiplyTo(y, r);
+		};
+		// NullExp.prototype.sqrTo = nSqrTo;
+		NullExp.prototype.sqrTo = function(x, r) {
+			x.squareTo(r);
+		};
+		return NullExp;
+	}());
+	// Modular reduction using "classic" algorithm
+	var Classic = /** @class */ (function() {
+		function Classic(m) {
+			this.m = m;
+		}
+		// Classic.prototype.convert = cConvert;
+		Classic.prototype.convert = function(x) {
+			if (x.s < 0 || x.compareTo(this.m) >= 0) {
+				return x.mod(this.m);
+			} else {
+				return x;
+			}
+		};
+		// Classic.prototype.revert = cRevert;
+		Classic.prototype.revert = function(x) {
+			return x;
+		};
+		// Classic.prototype.reduce = cReduce;
+		Classic.prototype.reduce = function(x) {
+			x.divRemTo(this.m, null, x);
+		};
+		// Classic.prototype.mulTo = cMulTo;
+		Classic.prototype.mulTo = function(x, y, r) {
+			x.multiplyTo(y, r);
+			this.reduce(r);
+		};
+		// Classic.prototype.sqrTo = cSqrTo;
+		Classic.prototype.sqrTo = function(x, r) {
+			x.squareTo(r);
+			this.reduce(r);
+		};
+		return Classic;
+	}());
+	//#endregion
+	//#region Montgomery
+	// Montgomery reduction
+	var Montgomery = /** @class */ (function() {
+		function Montgomery(m) {
+			this.m = m;
+			this.mp = m.invDigit();
+			this.mpl = this.mp & 0x7fff;
+			this.mph = this.mp >> 15;
+			this.um = (1 << (m.DB - 15)) - 1;
+			this.mt2 = 2 * m.t;
+		}
+		// Montgomery.prototype.convert = montConvert;
+		// xR mod m
+		Montgomery.prototype.convert = function(x) {
+			var r = nbi();
+			x.abs().dlShiftTo(this.m.t, r);
+			r.divRemTo(this.m, null, r);
+			if (x.s < 0 && r.compareTo(BigInteger.ZERO) > 0) {
+				this.m.subTo(r, r);
+			}
+			return r;
+		};
+		// Montgomery.prototype.revert = montRevert;
+		// x/R mod m
+		Montgomery.prototype.revert = function(x) {
+			var r = nbi();
+			x.copyTo(r);
+			this.reduce(r);
+			return r;
+		};
+		// Montgomery.prototype.reduce = montReduce;
+		// x = x/R mod m (HAC 14.32)
+		Montgomery.prototype.reduce = function(x) {
+			while (x.t <= this.mt2) {
+				// pad x so am has enough room later
+				x[x.t++] = 0;
+			}
+			for (var i = 0; i < this.m.t; ++i) {
+				// faster way of calculating u0 = x[i]*mp mod DV
+				var j = x[i] & 0x7fff;
+				var u0 = (j * this.mpl + (((j * this.mph + (x[i] >> 15) * this.mpl) & this
+					.um) << 15)) & x.DM;
+				// use am to combine the multiply-shift-add into one call
+				j = i + this.m.t;
+				x[j] += this.m.am(0, u0, x, i, 0, this.m.t);
+				// propagate carry
+				while (x[j] >= x.DV) {
+					x[j] -= x.DV;
+					x[++j]++;
+				}
+			}
+			x.clamp();
+			x.drShiftTo(this.m.t, x);
+			if (x.compareTo(this.m) >= 0) {
+				x.subTo(this.m, x);
+			}
+		};
+		// Montgomery.prototype.mulTo = montMulTo;
+		// r = "xy/R mod m"; x,y != r
+		Montgomery.prototype.mulTo = function(x, y, r) {
+			x.multiplyTo(y, r);
+			this.reduce(r);
+		};
+		// Montgomery.prototype.sqrTo = montSqrTo;
+		// r = "x^2/R mod m"; x != r
+		Montgomery.prototype.sqrTo = function(x, r) {
+			x.squareTo(r);
+			this.reduce(r);
+		};
+		return Montgomery;
+	}());
+	//#endregion Montgomery
+	//#region Barrett
+	// Barrett modular reduction
+	var Barrett = /** @class */ (function() {
+		function Barrett(m) {
+			this.m = m;
+			// setup Barrett
+			this.r2 = nbi();
+			this.q3 = nbi();
+			BigInteger.ONE.dlShiftTo(2 * m.t, this.r2);
+			this.mu = this.r2.divide(m);
+		}
+		// Barrett.prototype.convert = barrettConvert;
+		Barrett.prototype.convert = function(x) {
+			if (x.s < 0 || x.t > 2 * this.m.t) {
+				return x.mod(this.m);
+			} else if (x.compareTo(this.m) < 0) {
+				return x;
+			} else {
+				var r = nbi();
+				x.copyTo(r);
+				this.reduce(r);
+				return r;
+			}
+		};
+		// Barrett.prototype.revert = barrettRevert;
+		Barrett.prototype.revert = function(x) {
+			return x;
+		};
+		// Barrett.prototype.reduce = barrettReduce;
+		// x = x mod m (HAC 14.42)
+		Barrett.prototype.reduce = function(x) {
+			x.drShiftTo(this.m.t - 1, this.r2);
+			if (x.t > this.m.t + 1) {
+				x.t = this.m.t + 1;
+				x.clamp();
+			}
+			this.mu.multiplyUpperTo(this.r2, this.m.t + 1, this.q3);
+			this.m.multiplyLowerTo(this.q3, this.m.t + 1, this.r2);
+			while (x.compareTo(this.r2) < 0) {
+				x.dAddOffset(1, this.m.t + 1);
+			}
+			x.subTo(this.r2, x);
+			while (x.compareTo(this.m) >= 0) {
+				x.subTo(this.m, x);
+			}
+		};
+		// Barrett.prototype.mulTo = barrettMulTo;
+		// r = x*y mod m; x,y != r
+		Barrett.prototype.mulTo = function(x, y, r) {
+			x.multiplyTo(y, r);
+			this.reduce(r);
+		};
+		// Barrett.prototype.sqrTo = barrettSqrTo;
+		// r = x^2 mod m; x != r
+		Barrett.prototype.sqrTo = function(x, r) {
+			x.squareTo(r);
+			this.reduce(r);
+		};
+		return Barrett;
+	}());
+	//#endregion
+	//#endregion REDUCERS
+	// return new, unset BigInteger
+	function nbi() {
+		return new BigInteger(null);
+	}
+
+	function parseBigInt(str, r) {
+		return new BigInteger(str, r);
+	}
+	// am: Compute w_j += (x*this_i), propagate carries,
+	// c is initial carry, returns final carry.
+	// c < 3*dvalue, x < 2*dvalue, this_i < dvalue
+	// We need to select the fastest one that works in this environment.
+	// am1: use a single mult and divide to get the high bits,
+	// max digit bits should be 26 because
+	// max internal value = 2*dvalue^2-2*dvalue (< 2^53)
+	function am1(i, x, w, j, c, n) {
+		while (--n >= 0) {
+			var v = x * this[i++] + w[j] + c;
+			c = Math.floor(v / 0x4000000);
+			w[j++] = v & 0x3ffffff;
+		}
+		return c;
+	}
+	// am2 avoids a big mult-and-extract completely.
+	// Max digit bits should be <= 30 because we do bitwise ops
+	// on values up to 2*hdvalue^2-hdvalue-1 (< 2^31)
+	function am2(i, x, w, j, c, n) {
+		var xl = x & 0x7fff;
+		var xh = x >> 15;
+		while (--n >= 0) {
+			var l = this[i] & 0x7fff;
+			var h = this[i++] >> 15;
+			var m = xh * l + h * xl;
+			l = xl * l + ((m & 0x7fff) << 15) + w[j] + (c & 0x3fffffff);
+			c = (l >>> 30) + (m >>> 15) + xh * h + (c >>> 30);
+			w[j++] = l & 0x3fffffff;
+		}
+		return c;
+	}
+	// Alternately, set max digit bits to 28 since some
+	// browsers slow down when dealing with 32-bit numbers.
+	function am3(i, x, w, j, c, n) {
+		var xl = x & 0x3fff;
+		var xh = x >> 14;
+		while (--n >= 0) {
+			var l = this[i] & 0x3fff;
+			var h = this[i++] >> 14;
+			var m = xh * l + h * xl;
+			l = xl * l + ((m & 0x3fff) << 14) + w[j] + c;
+			c = (l >> 28) + (m >> 14) + xh * h;
+			w[j++] = l & 0xfffffff;
+		}
+		return c;
+	}
+	var inBrowser = typeof navigator2 !== "undefined";
+	if (inBrowser && j_lm && (navigator2.appName == "Microsoft Internet Explorer")) {
+		BigInteger.prototype.am = am2;
+		dbits = 30;
+	} else if (inBrowser && j_lm && (navigator2.appName != "Netscape")) {
+		BigInteger.prototype.am = am1;
+		dbits = 26;
+	} else { // Mozilla/Netscape seems to prefer am3
+		BigInteger.prototype.am = am3;
+		dbits = 28;
+	}
+	BigInteger.prototype.DB = dbits;
+	BigInteger.prototype.DM = ((1 << dbits) - 1);
+	BigInteger.prototype.DV = (1 << dbits);
+	var BI_FP = 52;
+	BigInteger.prototype.FV = Math.pow(2, BI_FP);
+	BigInteger.prototype.F1 = BI_FP - dbits;
+	BigInteger.prototype.F2 = 2 * dbits - BI_FP;
+	// Digit conversions
+	var BI_RC = [];
+	var rr;
+	var vv;
+	rr = "0".charCodeAt(0);
+	for (vv = 0; vv <= 9; ++vv) {
+		BI_RC[rr++] = vv;
+	}
+	rr = "a".charCodeAt(0);
+	for (vv = 10; vv < 36; ++vv) {
+		BI_RC[rr++] = vv;
+	}
+	rr = "A".charCodeAt(0);
+	for (vv = 10; vv < 36; ++vv) {
+		BI_RC[rr++] = vv;
+	}
+
+	function intAt(s, i) {
+		var c = BI_RC[s.charCodeAt(i)];
+		return (c == null) ? -1 : c;
+	}
+	// return bigint initialized to value
+	function nbv(i) {
+		var r = nbi();
+		r.fromInt(i);
+		return r;
+	}
+	// returns bit length of the integer x
+	function nbits(x) {
+		var r = 1;
+		var t;
+		if ((t = x >>> 16) != 0) {
+			x = t;
+			r += 16;
+		}
+		if ((t = x >> 8) != 0) {
+			x = t;
+			r += 8;
+		}
+		if ((t = x >> 4) != 0) {
+			x = t;
+			r += 4;
+		}
+		if ((t = x >> 2) != 0) {
+			x = t;
+			r += 2;
+		}
+		if ((t = x >> 1) != 0) {
+			x = t;
+			r += 1;
+		}
+		return r;
+	}
+	// "constants"
+	BigInteger.ZERO = nbv(0);
+	BigInteger.ONE = nbv(1);
+
+	// prng4.js - uses Arcfour as a PRNG
+	var Arcfour = /** @class */ (function() {
+		function Arcfour() {
+			this.i = 0;
+			this.j = 0;
+			this.S = [];
+		}
+		// Arcfour.prototype.init = ARC4init;
+		// Initialize arcfour context from key, an array of ints, each from [0..255]
+		Arcfour.prototype.init = function(key) {
+			var i;
+			var j;
+			var t;
+			for (i = 0; i < 256; ++i) {
+				this.S[i] = i;
+			}
+			j = 0;
+			for (i = 0; i < 256; ++i) {
+				j = (j + this.S[i] + key[i % key.length]) & 255;
+				t = this.S[i];
+				this.S[i] = this.S[j];
+				this.S[j] = t;
+			}
+			this.i = 0;
+			this.j = 0;
+		};
+		// Arcfour.prototype.next = ARC4next;
+		Arcfour.prototype.next = function() {
+			var t;
+			this.i = (this.i + 1) & 255;
+			this.j = (this.j + this.S[this.i]) & 255;
+			t = this.S[this.i];
+			this.S[this.i] = this.S[this.j];
+			this.S[this.j] = t;
+			return this.S[(t + this.S[this.i]) & 255];
+		};
+		return Arcfour;
+	}());
+	// Plug in your RNG constructor here
+	function prng_newstate() {
+		return new Arcfour();
+	}
+	// Pool size must be a multiple of 4 and greater than 32.
+	// An array of bytes the size of the pool will be passed to init()
+	var rng_psize = 256;
+
+	// Random number generator - requires a PRNG backend, e.g. prng4.js
+	var rng_state;
+	var rng_pool = null;
+	var rng_pptr;
+	// Initialize the pool with junk if needed.
+	if (rng_pool == null) {
+		rng_pool = [];
+		rng_pptr = 0;
+		var t = void 0;
+		if (window2.crypto && window2.crypto.getRandomValues) {
+			// Extract entropy (2048 bits) from RNG if available
+			var z = new Uint32Array(256);
+			window2.crypto.getRandomValues(z);
+			for (t = 0; t < z.length; ++t) {
+				rng_pool[rng_pptr++] = z[t] & 255;
+			}
+		}
+		// Use mouse events for entropy, if we do not have enough entropy by the time
+		// we need it, entropy will be generated by Math.random.
+		var onMouseMoveListener_1 = function(ev) {
+			this.count = this.count || 0;
+			if (this.count >= 256 || rng_pptr >= rng_psize) {
+				if (window2.removeEventListener) {
+					window2.removeEventListener("mousemove", onMouseMoveListener_1, false);
+				} else if (window2.detachEvent) {
+					window2.detachEvent("onmousemove", onMouseMoveListener_1);
+				}
+				return;
+			}
+			try {
+				var mouseCoordinates = ev.x + ev.y;
+				rng_pool[rng_pptr++] = mouseCoordinates & 255;
+				this.count += 1;
+			} catch (e) {
+				// Sometimes Firefox will deny permission to access event properties for some reason. Ignore.
+			}
+		};
+		if (window2.addEventListener) {
+			window2.addEventListener("mousemove", onMouseMoveListener_1, false);
+		} else if (window2.attachEvent) {
+			window2.attachEvent("onmousemove", onMouseMoveListener_1);
+		}
+	}
+
+	function rng_get_byte() {
+		if (rng_state == null) {
+			rng_state = prng_newstate();
+			// At this point, we may not have collected enough entropy.  If not, fall back to Math.random
+			while (rng_pptr < rng_psize) {
+				var random = Math.floor(65536 * Math.random());
+				rng_pool[rng_pptr++] = random & 255;
+			}
+			rng_state.init(rng_pool);
+			for (rng_pptr = 0; rng_pptr < rng_pool.length; ++rng_pptr) {
+				rng_pool[rng_pptr] = 0;
+			}
+			rng_pptr = 0;
+		}
+		// TODO: allow reseeding after first request
+		return rng_state.next();
+	}
+	var SecureRandom = /** @class */ (function() {
+		function SecureRandom() {}
+		SecureRandom.prototype.nextBytes = function(ba) {
+			for (var i = 0; i < ba.length; ++i) {
+				ba[i] = rng_get_byte();
+			}
+		};
+		return SecureRandom;
+	}());
+
+	// Depends on jsbn.js and rng.js
+	// function linebrk(s,n) {
+	//   var ret = "";
+	//   var i = 0;
+	//   while(i + n < s.length) {
+	//     ret += s.substring(i,i+n) + "\n";
+	//     i += n;
+	//   }
+	//   return ret + s.substring(i,s.length);
+	// }
+	// function byte2Hex(b) {
+	//   if(b < 0x10)
+	//     return "0" + b.toString(16);
+	//   else
+	//     return b.toString(16);
+	// }
+	function pkcs1pad1(s, n) {
+		if (n < s.length + 22) {
+			console.error("Message too long for RSA");
+			return null;
+		}
+		var len = n - s.length - 6;
+		var filler = "";
+		for (var f = 0; f < len; f += 2) {
+			filler += "ff";
+		}
+		var m = "0001" + filler + "00" + s;
+		return parseBigInt(m, 16);
+	}
+	// PKCS#1 (type 2, random) pad input string s to n bytes, and return a bigint
+	function pkcs1pad2(s, n) {
+		if (n < s.length + 11) { // TODO: fix for utf-8
+			console.error("Message too long for RSA");
+			return null;
+		}
+		var ba = [];
+		var i = s.length - 1;
+		while (i >= 0 && n > 0) {
+			var c = s.charCodeAt(i--);
+			if (c < 128) { // encode using utf-8
+				ba[--n] = c;
+			} else if ((c > 127) && (c < 2048)) {
+				ba[--n] = (c & 63) | 128;
+				ba[--n] = (c >> 6) | 192;
+			} else {
+				ba[--n] = (c & 63) | 128;
+				ba[--n] = ((c >> 6) & 63) | 128;
+				ba[--n] = (c >> 12) | 224;
+			}
+		}
+		ba[--n] = 0;
+		var rng = new SecureRandom();
+		var x = [];
+		while (n > 2) { // random non-zero pad
+			x[0] = 0;
+			while (x[0] == 0) {
+				rng.nextBytes(x);
+			}
+			ba[--n] = x[0];
+		}
+		ba[--n] = 2;
+		ba[--n] = 0;
+		return new BigInteger(ba);
+	}
+	// "empty" RSA key constructor
+	var RSAKey = /** @class */ (function() {
+		function RSAKey() {
+			this.n = null;
+			this.e = 0;
+			this.d = null;
+			this.p = null;
+			this.q = null;
+			this.dmp1 = null;
+			this.dmq1 = null;
+			this.coeff = null;
+		}
+		//#region PROTECTED
+		// protected
+		// RSAKey.prototype.doPublic = RSADoPublic;
+		// Perform raw public operation on "x": return x^e (mod n)
+		RSAKey.prototype.doPublic = function(x) {
+			return x.modPowInt(this.e, this.n);
+		};
+		// RSAKey.prototype.doPrivate = RSADoPrivate;
+		// Perform raw private operation on "x": return x^d (mod n)
+		RSAKey.prototype.doPrivate = function(x) {
+			if (this.p == null || this.q == null) {
+				return x.modPow(this.d, this.n);
+			}
+			// TODO: re-calculate any missing CRT params
+			var xp = x.mod(this.p).modPow(this.dmp1, this.p);
+			var xq = x.mod(this.q).modPow(this.dmq1, this.q);
+			while (xp.compareTo(xq) < 0) {
+				xp = xp.add(this.p);
+			}
+			return xp.subtract(xq).multiply(this.coeff).mod(this.p).multiply(this.q).add(xq);
+		};
+		//#endregion PROTECTED
+		//#region PUBLIC
+		// RSAKey.prototype.setPublic = RSASetPublic;
+		// Set the public key fields N and e from hex strings
+		RSAKey.prototype.setPublic = function(N, E) {
+			if (N != null && E != null && N.length > 0 && E.length > 0) {
+				this.n = parseBigInt(N, 16);
+				this.e = parseInt(E, 16);
+			} else {
+				console.error("Invalid RSA public key");
+			}
+		};
+		// RSAKey.prototype.encrypt = RSAEncrypt;
+		// Return the PKCS#1 RSA encryption of "text" as an even-length hex string
+		RSAKey.prototype.encrypt = function(text) {
+			var m = pkcs1pad2(text, (this.n.bitLength() + 7) >> 3);
+			if (m == null) {
+				return null;
+			}
+			var c = this.doPublic(m);
+			if (c == null) {
+				return null;
+			}
+			var h = c.toString(16);
+			if ((h.length & 1) == 0) {
+				return h;
+			} else {
+				return "0" + h;
+			}
+		};
+		// RSAKey.prototype.setPrivate = RSASetPrivate;
+		// Set the private key fields N, e, and d from hex strings
+		RSAKey.prototype.setPrivate = function(N, E, D) {
+			if (N != null && E != null && N.length > 0 && E.length > 0) {
+				this.n = parseBigInt(N, 16);
+				this.e = parseInt(E, 16);
+				this.d = parseBigInt(D, 16);
+			} else {
+				console.error("Invalid RSA private key");
+			}
+		};
+		// RSAKey.prototype.setPrivateEx = RSASetPrivateEx;
+		// Set the private key fields N, e, d and CRT params from hex strings
+		RSAKey.prototype.setPrivateEx = function(N, E, D, P, Q, DP, DQ, C) {
+			if (N != null && E != null && N.length > 0 && E.length > 0) {
+				this.n = parseBigInt(N, 16);
+				this.e = parseInt(E, 16);
+				this.d = parseBigInt(D, 16);
+				this.p = parseBigInt(P, 16);
+				this.q = parseBigInt(Q, 16);
+				this.dmp1 = parseBigInt(DP, 16);
+				this.dmq1 = parseBigInt(DQ, 16);
+				this.coeff = parseBigInt(C, 16);
+			} else {
+				console.error("Invalid RSA private key");
+			}
+		};
+		// RSAKey.prototype.generate = RSAGenerate;
+		// Generate a new random private key B bits long, using public expt E
+		RSAKey.prototype.generate = function(B, E) {
+			var rng = new SecureRandom();
+			var qs = B >> 1;
+			this.e = parseInt(E, 16);
+			var ee = new BigInteger(E, 16);
+			for (;;) {
+				for (;;) {
+					this.p = new BigInteger(B - qs, 1, rng);
+					if (this.p.subtract(BigInteger.ONE).gcd(ee).compareTo(BigInteger.ONE) ==
+						0 && this.p.isProbablePrime(10)) {
+						break;
+					}
+				}
+				for (;;) {
+					this.q = new BigInteger(qs, 1, rng);
+					if (this.q.subtract(BigInteger.ONE).gcd(ee).compareTo(BigInteger.ONE) ==
+						0 && this.q.isProbablePrime(10)) {
+						break;
+					}
+				}
+				if (this.p.compareTo(this.q) <= 0) {
+					var t = this.p;
+					this.p = this.q;
+					this.q = t;
+				}
+				var p1 = this.p.subtract(BigInteger.ONE);
+				var q1 = this.q.subtract(BigInteger.ONE);
+				var phi = p1.multiply(q1);
+				if (phi.gcd(ee).compareTo(BigInteger.ONE) == 0) {
+					this.n = this.p.multiply(this.q);
+					this.d = ee.modInverse(phi);
+					this.dmp1 = this.d.mod(p1);
+					this.dmq1 = this.d.mod(q1);
+					this.coeff = this.q.modInverse(this.p);
+					break;
+				}
+			}
+		};
+		// RSAKey.prototype.decrypt = RSADecrypt;
+		// Return the PKCS#1 RSA decryption of "ctext".
+		// "ctext" is an even-length hex string and the output is a plain string.
+		RSAKey.prototype.decrypt = function(ctext) {
+			var c = parseBigInt(ctext, 16);
+			var m = this.doPrivate(c);
+			if (m == null) {
+				return null;
+			}
+			return pkcs1unpad2(m, (this.n.bitLength() + 7) >> 3);
+		};
+		// Generate a new random private key B bits long, using public expt E
+		RSAKey.prototype.generateAsync = function(B, E, callback) {
+			var rng = new SecureRandom();
+			var qs = B >> 1;
+			this.e = parseInt(E, 16);
+			var ee = new BigInteger(E, 16);
+			var rsa = this;
+			// These functions have non-descript names because they were originally for(;;) loops.
+			// I don't know about cryptography to give them better names than loop1-4.
+			var loop1 = function() {
+				var loop4 = function() {
+					if (rsa.p.compareTo(rsa.q) <= 0) {
+						var t = rsa.p;
+						rsa.p = rsa.q;
+						rsa.q = t;
+					}
+					var p1 = rsa.p.subtract(BigInteger.ONE);
+					var q1 = rsa.q.subtract(BigInteger.ONE);
+					var phi = p1.multiply(q1);
+					if (phi.gcd(ee).compareTo(BigInteger.ONE) == 0) {
+						rsa.n = rsa.p.multiply(rsa.q);
+						rsa.d = ee.modInverse(phi);
+						rsa.dmp1 = rsa.d.mod(p1);
+						rsa.dmq1 = rsa.d.mod(q1);
+						rsa.coeff = rsa.q.modInverse(rsa.p);
+						setTimeout(function() {
+							callback();
+						}, 0); // escape
+					} else {
+						setTimeout(loop1, 0);
+					}
+				};
+				var loop3 = function() {
+					rsa.q = nbi();
+					rsa.q.fromNumberAsync(qs, 1, rng, function() {
+						rsa.q.subtract(BigInteger.ONE).gcda(ee, function(r) {
+							if (r.compareTo(BigInteger.ONE) == 0 && rsa
+								.q.isProbablePrime(10)) {
+								setTimeout(loop4, 0);
+							} else {
+								setTimeout(loop3, 0);
+							}
+						});
+					});
+				};
+				var loop2 = function() {
+					rsa.p = nbi();
+					rsa.p.fromNumberAsync(B - qs, 1, rng, function() {
+						rsa.p.subtract(BigInteger.ONE).gcda(ee, function(r) {
+							if (r.compareTo(BigInteger.ONE) == 0 && rsa
+								.p.isProbablePrime(10)) {
+								setTimeout(loop3, 0);
+							} else {
+								setTimeout(loop2, 0);
+							}
+						});
+					});
+				};
+				setTimeout(loop2, 0);
+			};
+			setTimeout(loop1, 0);
+		};
+		RSAKey.prototype.sign = function(text, digestMethod, digestName) {
+			var header = getDigestHeader(digestName);
+			var digest = header + digestMethod(text).toString();
+			var m = pkcs1pad1(digest, this.n.bitLength() / 4);
+			if (m == null) {
+				return null;
+			}
+			var c = this.doPrivate(m);
+			if (c == null) {
+				return null;
+			}
+			var h = c.toString(16);
+			if ((h.length & 1) == 0) {
+				return h;
+			} else {
+				return "0" + h;
+			}
+		};
+		RSAKey.prototype.verify = function(text, signature, digestMethod) {
+			var c = parseBigInt(signature, 16);
+			var m = this.doPublic(c);
+			if (m == null) {
+				return null;
+			}
+			var unpadded = m.toString(16).replace(/^1f+00/, "");
+			var digest = removeDigestHeader(unpadded);
+			return digest == digestMethod(text).toString();
+		};
+		return RSAKey;
+	}());
+	// Undo PKCS#1 (type 2, random) padding and, if valid, return the plaintext
+	function pkcs1unpad2(d, n) {
+		var b = d.toByteArray();
+		var i = 0;
+		while (i < b.length && b[i] == 0) {
+			++i;
+		}
+		if (b.length - i != n - 1 || b[i] != 2) {
+			return null;
+		}
+		++i;
+		while (b[i] != 0) {
+			if (++i >= b.length) {
+				return null;
+			}
+		}
+		var ret = "";
+		while (++i < b.length) {
+			var c = b[i] & 255;
+			if (c < 128) { // utf-8 decode
+				ret += String.fromCharCode(c);
+			} else if ((c > 191) && (c < 224)) {
+				ret += String.fromCharCode(((c & 31) << 6) | (b[i + 1] & 63));
+				++i;
+			} else {
+				ret += String.fromCharCode(((c & 15) << 12) | ((b[i + 1] & 63) << 6) | (b[i + 2] & 63));
+				i += 2;
+			}
+		}
+		return ret;
+	}
+	// https://tools.ietf.org/html/rfc3447#page-43
+	var DIGEST_HEADERS = {
+		md2: "3020300c06082a864886f70d020205000410",
+		md5: "3020300c06082a864886f70d020505000410",
+		sha1: "3021300906052b0e03021a05000414",
+		sha224: "302d300d06096086480165030402040500041c",
+		sha256: "3031300d060960864801650304020105000420",
+		sha384: "3041300d060960864801650304020205000430",
+		sha512: "3051300d060960864801650304020305000440",
+		ripemd160: "3021300906052b2403020105000414",
+	};
+
+	function getDigestHeader(name) {
+		return DIGEST_HEADERS[name] || "";
+	}
+
+	function removeDigestHeader(str) {
+		for (var name_1 in DIGEST_HEADERS) {
+			if (DIGEST_HEADERS.hasOwnProperty(name_1)) {
+				var header = DIGEST_HEADERS[name_1];
+				var len = header.length;
+				if (str.substr(0, len) == header) {
+					return str.substr(len);
+				}
+			}
+		}
+		return str;
+	}
+	// Return the PKCS#1 RSA encryption of "text" as a Base64-encoded string
+	// function RSAEncryptB64(text) {
+	//  var h = this.encrypt(text);
+	//  if(h) return hex2b64(h); else return null;
+	// }
+	// public
+	// RSAKey.prototype.encrypt_b64 = RSAEncryptB64;
+
+	/*!
+	Copyright (c) 2011, Yahoo! Inc. All rights reserved.
+	Code licensed under the BSD License:
+	http://developer.yahoo.com/yui/license.html
+	version: 2.9.0
+	*/
+	var YAHOO = {};
+	YAHOO.lang = {
+		/**
+		 * Utility to set up the prototype, constructor and superclass properties to
+		 * support an inheritance strategy that can chain constructors and methods.
+		 * Static members will not be inherited.
+		 *
+		 * @method extend
+		 * @static
+		 * @param {Function} subc   the object to modify
+		 * @param {Function} superc the object to inherit
+		 * @param {Object} overrides  additional properties/methods to add to the
+		 *                              subclass prototype.  These will override the
+		 *                              matching items obtained from the superclass
+		 *                              if present.
+		 */
+		extend: function(subc, superc, overrides) {
+			if (!superc || !subc) {
+				throw new Error("YAHOO.lang.extend failed, please check that " +
+					"all dependencies are included.");
+			}
+
+			var F = function() {};
+			F.prototype = superc.prototype;
+			subc.prototype = new F();
+			subc.prototype.constructor = subc;
+			subc.superclass = superc.prototype;
+
+			if (superc.prototype.constructor == Object.prototype.constructor) {
+				superc.prototype.constructor = superc;
+			}
+
+			if (overrides) {
+				var i;
+				for (i in overrides) {
+					subc.prototype[i] = overrides[i];
+				}
+
+				/*
+				 * IE will not enumerate native functions in a derived object even if the
+				 * function was overridden.  This is a workaround for specific functions
+				 * we care about on the Object prototype.
+				 * @property _IEEnumFix
+				 * @param {Function} r  the object to receive the augmentation
+				 * @param {Function} s  the object that supplies the properties to augment
+				 * @static
+				 * @private
+				 */
+				var _IEEnumFix = function() {},
+					ADD = ["toString", "valueOf"];
+				try {
+					if (/MSIE/.test(navigator2.userAgent)) {
+						_IEEnumFix = function(r, s) {
+							for (i = 0; i < ADD.length; i = i + 1) {
+								var fname = ADD[i],
+									f = s[fname];
+								if (typeof f === 'function' && f != Object.prototype[fname]) {
+									r[fname] = f;
+								}
+							}
+						};
+					}
+				} catch (ex) {}
+				_IEEnumFix(subc.prototype, overrides);
+			}
+		}
+	};
+
+	/* asn1-1.0.13.js (c) 2013-2017 Kenji Urushima | kjur.github.com/jsrsasign/license
+	 */
+
+	/**
+	 * @fileOverview
+	 * @name asn1-1.0.js
+	 * @author Kenji Urushima kenji.urushima@gmail.com
+	 * @version asn1 1.0.13 (2017-Jun-02)
+	 * @since jsrsasign 2.1
+	 * @license <a href="https://kjur.github.io/jsrsasign/license/">MIT License</a>
+	 */
+
+	/**
+	 * kjur's class library name space
+	 * <p>
+	 * This name space provides following name spaces:
+	 * <ul>
+	 * <li>{@link KJUR.asn1} - ASN.1 primitive hexadecimal encoder</li>
+	 * <li>{@link KJUR.asn1.x509} - ASN.1 structure for X.509 certificate and CRL</li>
+	 * <li>{@link KJUR.crypto} - Java Cryptographic Extension(JCE) style MessageDigest/Signature
+	 * class and utilities</li>
+	 * </ul>
+	 * </p>
+	 * NOTE: Please ignore method summary and document of this namespace. This caused by a bug of jsdoc2.
+	 * @name KJUR
+	 * @namespace kjur's class library name space
+	 */
+	var KJUR = {};
+
+	/**
+	 * kjur's ASN.1 class library name space
+	 * <p>
+	 * This is ITU-T X.690 ASN.1 DER encoder class library and
+	 * class structure and methods is very similar to
+	 * org.bouncycastle.asn1 package of
+	 * well known BouncyCaslte Cryptography Library.
+	 * <h4>PROVIDING ASN.1 PRIMITIVES</h4>
+	 * Here are ASN.1 DER primitive classes.
+	 * <ul>
+	 * <li>0x01 {@link KJUR.asn1.DERBoolean}</li>
+	 * <li>0x02 {@link KJUR.asn1.DERInteger}</li>
+	 * <li>0x03 {@link KJUR.asn1.DERBitString}</li>
+	 * <li>0x04 {@link KJUR.asn1.DEROctetString}</li>
+	 * <li>0x05 {@link KJUR.asn1.DERNull}</li>
+	 * <li>0x06 {@link KJUR.asn1.DERObjectIdentifier}</li>
+	 * <li>0x0a {@link KJUR.asn1.DEREnumerated}</li>
+	 * <li>0x0c {@link KJUR.asn1.DERUTF8String}</li>
+	 * <li>0x12 {@link KJUR.asn1.DERNumericString}</li>
+	 * <li>0x13 {@link KJUR.asn1.DERPrintableString}</li>
+	 * <li>0x14 {@link KJUR.asn1.DERTeletexString}</li>
+	 * <li>0x16 {@link KJUR.asn1.DERIA5String}</li>
+	 * <li>0x17 {@link KJUR.asn1.DERUTCTime}</li>
+	 * <li>0x18 {@link KJUR.asn1.DERGeneralizedTime}</li>
+	 * <li>0x30 {@link KJUR.asn1.DERSequence}</li>
+	 * <li>0x31 {@link KJUR.asn1.DERSet}</li>
+	 * </ul>
+	 * <h4>OTHER ASN.1 CLASSES</h4>
+	 * <ul>
+	 * <li>{@link KJUR.asn1.ASN1Object}</li>
+	 * <li>{@link KJUR.asn1.DERAbstractString}</li>
+	 * <li>{@link KJUR.asn1.DERAbstractTime}</li>
+	 * <li>{@link KJUR.asn1.DERAbstractStructured}</li>
+	 * <li>{@link KJUR.asn1.DERTaggedObject}</li>
+	 * </ul>
+	 * <h4>SUB NAME SPACES</h4>
+	 * <ul>
+	 * <li>{@link KJUR.asn1.cades} - CAdES long term signature format</li>
+	 * <li>{@link KJUR.asn1.cms} - Cryptographic Message Syntax</li>
+	 * <li>{@link KJUR.asn1.csr} - Certificate Signing Request (CSR/PKCS#10)</li>
+	 * <li>{@link KJUR.asn1.tsp} - RFC 3161 Timestamping Protocol Format</li>
+	 * <li>{@link KJUR.asn1.x509} - RFC 5280 X.509 certificate and CRL</li>
+	 * </ul>
+	 * </p>
+	 * NOTE: Please ignore method summary and document of this namespace.
+	 * This caused by a bug of jsdoc2.
+	 * @name KJUR.asn1
+	 * @namespace
+	 */
+	if (typeof KJUR.asn1 == "undefined" || !KJUR.asn1) KJUR.asn1 = {};
+
+	/**
+	 * ASN1 utilities class
+	 * @name KJUR.asn1.ASN1Util
+	 * @class ASN1 utilities class
+	 * @since asn1 1.0.2
+	 */
+	KJUR.asn1.ASN1Util = new function() {
+		this.integerToByteHex = function(i) {
+			var h = i.toString(16);
+			if ((h.length % 2) == 1) h = '0' + h;
+			return h;
+		};
+		this.bigIntToMinTwosComplementsHex = function(bigIntegerValue) {
+			var h = bigIntegerValue.toString(16);
+			if (h.substr(0, 1) != '-') {
+				if (h.length % 2 == 1) {
+					h = '0' + h;
+				} else {
+					if (!h.match(/^[0-7]/)) {
+						h = '00' + h;
+					}
+				}
+			} else {
+				var hPos = h.substr(1);
+				var xorLen = hPos.length;
+				if (xorLen % 2 == 1) {
+					xorLen += 1;
+				} else {
+					if (!h.match(/^[0-7]/)) {
+						xorLen += 2;
+					}
+				}
+				var hMask = '';
+				for (var i = 0; i < xorLen; i++) {
+					hMask += 'f';
+				}
+				var biMask = new BigInteger(hMask, 16);
+				var biNeg = biMask.xor(bigIntegerValue).add(BigInteger.ONE);
+				h = biNeg.toString(16).replace(/^-/, '');
+			}
+			return h;
+		};
+		/**
+		 * get PEM string from hexadecimal data and header string
+		 * @name getPEMStringFromHex
+		 * @memberOf KJUR.asn1.ASN1Util
+		 * @function
+		 * @param {String} dataHex hexadecimal string of PEM body
+		 * @param {String} pemHeader PEM header string (ex. 'RSA PRIVATE KEY')
+		 * @return {String} PEM formatted string of input data
+		 * @description
+		 * This method converts a hexadecimal string to a PEM string with
+		 * a specified header. Its line break will be CRLF("\r\n").
+		 * @example
+		 * var pem  = KJUR.asn1.ASN1Util.getPEMStringFromHex('616161', 'RSA PRIVATE KEY');
+		 * // value of pem will be:
+		 * -----BEGIN PRIVATE KEY-----
+		 * YWFh
+		 * -----END PRIVATE KEY-----
+		 */
+		this.getPEMStringFromHex = function(dataHex, pemHeader) {
+			return hextopem(dataHex, pemHeader);
+		};
+
+		/**
+		 * generate ASN1Object specifed by JSON parameters
+		 * @name newObject
+		 * @memberOf KJUR.asn1.ASN1Util
+		 * @function
+		 * @param {Array} param JSON parameter to generate ASN1Object
+		 * @return {KJUR.asn1.ASN1Object} generated object
+		 * @since asn1 1.0.3
+		 * @description
+		 * generate any ASN1Object specified by JSON param
+		 * including ASN.1 primitive or structured.
+		 * Generally 'param' can be described as follows:
+		 * <blockquote>
+		 * {TYPE-OF-ASNOBJ: ASN1OBJ-PARAMETER}
+		 * </blockquote>
+		 * 'TYPE-OF-ASN1OBJ' can be one of following symbols:
+		 * <ul>
+		 * <li>'bool' - DERBoolean</li>
+		 * <li>'int' - DERInteger</li>
+		 * <li>'bitstr' - DERBitString</li>
+		 * <li>'octstr' - DEROctetString</li>
+		 * <li>'null' - DERNull</li>
+		 * <li>'oid' - DERObjectIdentifier</li>
+		 * <li>'enum' - DEREnumerated</li>
+		 * <li>'utf8str' - DERUTF8String</li>
+		 * <li>'numstr' - DERNumericString</li>
+		 * <li>'prnstr' - DERPrintableString</li>
+		 * <li>'telstr' - DERTeletexString</li>
+		 * <li>'ia5str' - DERIA5String</li>
+		 * <li>'utctime' - DERUTCTime</li>
+		 * <li>'gentime' - DERGeneralizedTime</li>
+		 * <li>'seq' - DERSequence</li>
+		 * <li>'set' - DERSet</li>
+		 * <li>'tag' - DERTaggedObject</li>
+		 * </ul>
+		 * @example
+		 * newObject({'prnstr': 'aaa'});
+		 * newObject({'seq': [{'int': 3}, {'prnstr': 'aaa'}]})
+		 * // ASN.1 Tagged Object
+		 * newObject({'tag': {'tag': 'a1',
+		 *                    'explicit': true,
+		 *                    'obj': {'seq': [{'int': 3}, {'prnstr': 'aaa'}]}}});
+		 * // more simple representation of ASN.1 Tagged Object
+		 * newObject({'tag': ['a1',
+		 *                    true,
+		 *                    {'seq': [
+		 *                      {'int': 3},
+		 *                      {'prnstr': 'aaa'}]}
+		 *                   ]});
+		 */
+		this.newObject = function(param) {
+			var _KJUR = KJUR,
+				_KJUR_asn1 = _KJUR.asn1,
+				_DERBoolean = _KJUR_asn1.DERBoolean,
+				_DERInteger = _KJUR_asn1.DERInteger,
+				_DERBitString = _KJUR_asn1.DERBitString,
+				_DEROctetString = _KJUR_asn1.DEROctetString,
+				_DERNull = _KJUR_asn1.DERNull,
+				_DERObjectIdentifier = _KJUR_asn1.DERObjectIdentifier,
+				_DEREnumerated = _KJUR_asn1.DEREnumerated,
+				_DERUTF8String = _KJUR_asn1.DERUTF8String,
+				_DERNumericString = _KJUR_asn1.DERNumericString,
+				_DERPrintableString = _KJUR_asn1.DERPrintableString,
+				_DERTeletexString = _KJUR_asn1.DERTeletexString,
+				_DERIA5String = _KJUR_asn1.DERIA5String,
+				_DERUTCTime = _KJUR_asn1.DERUTCTime,
+				_DERGeneralizedTime = _KJUR_asn1.DERGeneralizedTime,
+				_DERSequence = _KJUR_asn1.DERSequence,
+				_DERSet = _KJUR_asn1.DERSet,
+				_DERTaggedObject = _KJUR_asn1.DERTaggedObject,
+				_newObject = _KJUR_asn1.ASN1Util.newObject;
+
+			var keys = Object.keys(param);
+			if (keys.length != 1)
+				throw "key of param shall be only one.";
+			var key = keys[0];
+
+			if (":bool:int:bitstr:octstr:null:oid:enum:utf8str:numstr:prnstr:telstr:ia5str:utctime:gentime:seq:set:tag:"
+				.indexOf(":" + key + ":") == -1)
+				throw "undefined key: " + key;
+
+			if (key == "bool") return new _DERBoolean(param[key]);
+			if (key == "int") return new _DERInteger(param[key]);
+			if (key == "bitstr") return new _DERBitString(param[key]);
+			if (key == "octstr") return new _DEROctetString(param[key]);
+			if (key == "null") return new _DERNull(param[key]);
+			if (key == "oid") return new _DERObjectIdentifier(param[key]);
+			if (key == "enum") return new _DEREnumerated(param[key]);
+			if (key == "utf8str") return new _DERUTF8String(param[key]);
+			if (key == "numstr") return new _DERNumericString(param[key]);
+			if (key == "prnstr") return new _DERPrintableString(param[key]);
+			if (key == "telstr") return new _DERTeletexString(param[key]);
+			if (key == "ia5str") return new _DERIA5String(param[key]);
+			if (key == "utctime") return new _DERUTCTime(param[key]);
+			if (key == "gentime") return new _DERGeneralizedTime(param[key]);
+
+			if (key == "seq") {
+				var paramList = param[key];
+				var a = [];
+				for (var i = 0; i < paramList.length; i++) {
+					var asn1Obj = _newObject(paramList[i]);
+					a.push(asn1Obj);
+				}
+				return new _DERSequence({
+					'array': a
+				});
+			}
+
+			if (key == "set") {
+				var paramList = param[key];
+				var a = [];
+				for (var i = 0; i < paramList.length; i++) {
+					var asn1Obj = _newObject(paramList[i]);
+					a.push(asn1Obj);
+				}
+				return new _DERSet({
+					'array': a
+				});
+			}
+
+			if (key == "tag") {
+				var tagParam = param[key];
+				if (Object.prototype.toString.call(tagParam) === '[object Array]' &&
+					tagParam.length == 3) {
+					var obj = _newObject(tagParam[2]);
+					return new _DERTaggedObject({
+						tag: tagParam[0],
+						explicit: tagParam[1],
+						obj: obj
+					});
+				} else {
+					var newParam = {};
+					if (tagParam.explicit !== undefined)
+						newParam.explicit = tagParam.explicit;
+					if (tagParam.tag !== undefined)
+						newParam.tag = tagParam.tag;
+					if (tagParam.obj === undefined)
+						throw "obj shall be specified for 'tag'.";
+					newParam.obj = _newObject(tagParam.obj);
+					return new _DERTaggedObject(newParam);
+				}
+			}
+		};
+
+		/**
+		 * get encoded hexadecimal string of ASN1Object specifed by JSON parameters
+		 * @name jsonToASN1HEX
+		 * @memberOf KJUR.asn1.ASN1Util
+		 * @function
+		 * @param {Array} param JSON parameter to generate ASN1Object
+		 * @return hexadecimal string of ASN1Object
+		 * @since asn1 1.0.4
+		 * @description
+		 * As for ASN.1 object representation of JSON object,
+		 * please see {@link newObject}.
+		 * @example
+		 * jsonToASN1HEX({'prnstr': 'aaa'});
+		 */
+		this.jsonToASN1HEX = function(param) {
+			var asn1Obj = this.newObject(param);
+			return asn1Obj.getEncodedHex();
+		};
+	};
+
+	/**
+	 * get dot noted oid number string from hexadecimal value of OID
+	 * @name oidHexToInt
+	 * @memberOf KJUR.asn1.ASN1Util
+	 * @function
+	 * @param {String} hex hexadecimal value of object identifier
+	 * @return {String} dot noted string of object identifier
+	 * @since jsrsasign 4.8.3 asn1 1.0.7
+	 * @description
+	 * This static method converts from hexadecimal string representation of
+	 * ASN.1 value of object identifier to oid number string.
+	 * @example
+	 * KJUR.asn1.ASN1Util.oidHexToInt('550406') &rarr; "2.5.4.6"
+	 */
+	KJUR.asn1.ASN1Util.oidHexToInt = function(hex) {
+		var s = "";
+		var i01 = parseInt(hex.substr(0, 2), 16);
+		var i0 = Math.floor(i01 / 40);
+		var i1 = i01 % 40;
+		var s = i0 + "." + i1;
+
+		var binbuf = "";
+		for (var i = 2; i < hex.length; i += 2) {
+			var value = parseInt(hex.substr(i, 2), 16);
+			var bin = ("00000000" + value.toString(2)).slice(-8);
+			binbuf = binbuf + bin.substr(1, 7);
+			if (bin.substr(0, 1) == "0") {
+				var bi = new BigInteger(binbuf, 2);
+				s = s + "." + bi.toString(10);
+				binbuf = "";
+			}
+		}
+		return s;
+	};
+
+	/**
+	 * get hexadecimal value of object identifier from dot noted oid value
+	 * @name oidIntToHex
+	 * @memberOf KJUR.asn1.ASN1Util
+	 * @function
+	 * @param {String} oidString dot noted string of object identifier
+	 * @return {String} hexadecimal value of object identifier
+	 * @since jsrsasign 4.8.3 asn1 1.0.7
+	 * @description
+	 * This static method converts from object identifier value string.
+	 * to hexadecimal string representation of it.
+	 * @example
+	 * KJUR.asn1.ASN1Util.oidIntToHex("2.5.4.6") &rarr; "550406"
+	 */
+	KJUR.asn1.ASN1Util.oidIntToHex = function(oidString) {
+		var itox = function(i) {
+			var h = i.toString(16);
+			if (h.length == 1) h = '0' + h;
+			return h;
+		};
+
+		var roidtox = function(roid) {
+			var h = '';
+			var bi = new BigInteger(roid, 10);
+			var b = bi.toString(2);
+			var padLen = 7 - b.length % 7;
+			if (padLen == 7) padLen = 0;
+			var bPad = '';
+			for (var i = 0; i < padLen; i++) bPad += '0';
+			b = bPad + b;
+			for (var i = 0; i < b.length - 1; i += 7) {
+				var b8 = b.substr(i, 7);
+				if (i != b.length - 7) b8 = '1' + b8;
+				h += itox(parseInt(b8, 2));
+			}
+			return h;
+		};
+
+		if (!oidString.match(/^[0-9.]+$/)) {
+			throw "malformed oid string: " + oidString;
+		}
+		var h = '';
+		var a = oidString.split('.');
+		var i0 = parseInt(a[0]) * 40 + parseInt(a[1]);
+		h += itox(i0);
+		a.splice(0, 2);
+		for (var i = 0; i < a.length; i++) {
+			h += roidtox(a[i]);
+		}
+		return h;
+	};
+
+
+	// ********************************************************************
+	//  Abstract ASN.1 Classes
+	// ********************************************************************
+
+	// ********************************************************************
+
+	/**
+	 * base class for ASN.1 DER encoder object
+	 * @name KJUR.asn1.ASN1Object
+	 * @class base class for ASN.1 DER encoder object
+	 * @property {Boolean} isModified flag whether internal data was changed
+	 * @property {String} hTLV hexadecimal string of ASN.1 TLV
+	 * @property {String} hT hexadecimal string of ASN.1 TLV tag(T)
+	 * @property {String} hL hexadecimal string of ASN.1 TLV length(L)
+	 * @property {String} hV hexadecimal string of ASN.1 TLV value(V)
+	 * @description
+	 */
+	KJUR.asn1.ASN1Object = function() {
+		var hV = '';
+
+		/**
+		 * get hexadecimal ASN.1 TLV length(L) bytes from TLV value(V)
+		 * @name getLengthHexFromValue
+		 * @memberOf KJUR.asn1.ASN1Object#
+		 * @function
+		 * @return {String} hexadecimal string of ASN.1 TLV length(L)
+		 */
+		this.getLengthHexFromValue = function() {
+			if (typeof this.hV == "undefined" || this.hV == null) {
+				throw "this.hV is null or undefined.";
+			}
+			if (this.hV.length % 2 == 1) {
+				throw "value hex must be even length: n=" + hV.length + ",v=" + this.hV;
+			}
+			var n = this.hV.length / 2;
+			var hN = n.toString(16);
+			if (hN.length % 2 == 1) {
+				hN = "0" + hN;
+			}
+			if (n < 128) {
+				return hN;
+			} else {
+				var hNlen = hN.length / 2;
+				if (hNlen > 15) {
+					throw "ASN.1 length too long to represent by 8x: n = " + n.toString(16);
+				}
+				var head = 128 + hNlen;
+				return head.toString(16) + hN;
+			}
+		};
+
+		/**
+		 * get hexadecimal string of ASN.1 TLV bytes
+		 * @name getEncodedHex
+		 * @memberOf KJUR.asn1.ASN1Object#
+		 * @function
+		 * @return {String} hexadecimal string of ASN.1 TLV
+		 */
+		this.getEncodedHex = function() {
+			if (this.hTLV == null || this.isModified) {
+				this.hV = this.getFreshValueHex();
+				this.hL = this.getLengthHexFromValue();
+				this.hTLV = this.hT + this.hL + this.hV;
+				this.isModified = false;
+				//alert("first time: " + this.hTLV);
+			}
+			return this.hTLV;
+		};
+
+		/**
+		 * get hexadecimal string of ASN.1 TLV value(V) bytes
+		 * @name getValueHex
+		 * @memberOf KJUR.asn1.ASN1Object#
+		 * @function
+		 * @return {String} hexadecimal string of ASN.1 TLV value(V) bytes
+		 */
+		this.getValueHex = function() {
+			this.getEncodedHex();
+			return this.hV;
+		};
+
+		this.getFreshValueHex = function() {
+			return '';
+		};
+	};
+
+	// == BEGIN DERAbstractString ================================================
+	/**
+	 * base class for ASN.1 DER string classes
+	 * @name KJUR.asn1.DERAbstractString
+	 * @class base class for ASN.1 DER string classes
+	 * @param {Array} params associative array of parameters (ex. {'str': 'aaa'})
+	 * @property {String} s internal string of value
+	 * @extends KJUR.asn1.ASN1Object
+	 * @description
+	 * <br/>
+	 * As for argument 'params' for constructor, you can specify one of
+	 * following properties:
+	 * <ul>
+	 * <li>str - specify initial ASN.1 value(V) by a string</li>
+	 * <li>hex - specify initial ASN.1 value(V) by a hexadecimal string</li>
+	 * </ul>
+	 * NOTE: 'params' can be omitted.
+	 */
+	KJUR.asn1.DERAbstractString = function(params) {
+		KJUR.asn1.DERAbstractString.superclass.constructor.call(this);
+
+		/**
+		 * get string value of this string object
+		 * @name getString
+		 * @memberOf KJUR.asn1.DERAbstractString#
+		 * @function
+		 * @return {String} string value of this string object
+		 */
+		this.getString = function() {
+			return this.s;
+		};
+
+		/**
+		 * set value by a string
+		 * @name setString
+		 * @memberOf KJUR.asn1.DERAbstractString#
+		 * @function
+		 * @param {String} newS value by a string to set
+		 */
+		this.setString = function(newS) {
+			this.hTLV = null;
+			this.isModified = true;
+			this.s = newS;
+			this.hV = stohex(this.s);
+		};
+
+		/**
+		 * set value by a hexadecimal string
+		 * @name setStringHex
+		 * @memberOf KJUR.asn1.DERAbstractString#
+		 * @function
+		 * @param {String} newHexString value by a hexadecimal string to set
+		 */
+		this.setStringHex = function(newHexString) {
+			this.hTLV = null;
+			this.isModified = true;
+			this.s = null;
+			this.hV = newHexString;
+		};
+
+		this.getFreshValueHex = function() {
+			return this.hV;
+		};
+
+		if (typeof params != "undefined") {
+			if (typeof params == "string") {
+				this.setString(params);
+			} else if (typeof params['str'] != "undefined") {
+				this.setString(params['str']);
+			} else if (typeof params['hex'] != "undefined") {
+				this.setStringHex(params['hex']);
+			}
+		}
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERAbstractString, KJUR.asn1.ASN1Object);
+	// == END   DERAbstractString ================================================
+
+	// == BEGIN DERAbstractTime ==================================================
+	/**
+	 * base class for ASN.1 DER Generalized/UTCTime class
+	 * @name KJUR.asn1.DERAbstractTime
+	 * @class base class for ASN.1 DER Generalized/UTCTime class
+	 * @param {Array} params associative array of parameters (ex. {'str': '130430235959Z'})
+	 * @extends KJUR.asn1.ASN1Object
+	 * @description
+	 * @see KJUR.asn1.ASN1Object - superclass
+	 */
+	KJUR.asn1.DERAbstractTime = function(params) {
+		KJUR.asn1.DERAbstractTime.superclass.constructor.call(this);
+
+		// --- PRIVATE METHODS --------------------
+		this.localDateToUTC = function(d) {
+			utc = d.getTime() + (d.getTimezoneOffset() * 60000);
+			var utcDate = new Date(utc);
+			return utcDate;
+		};
+
+		/*
+		 * format date string by Data object
+		 * @name formatDate
+		 * @memberOf KJUR.asn1.AbstractTime;
+		 * @param {Date} dateObject
+		 * @param {string} type 'utc' or 'gen'
+		 * @param {boolean} withMillis flag for with millisections or not
+		 * @description
+		 * 'withMillis' flag is supported from asn1 1.0.6.
+		 */
+		this.formatDate = function(dateObject, type, withMillis) {
+			var pad = this.zeroPadding;
+			var d = this.localDateToUTC(dateObject);
+			var year = String(d.getFullYear());
+			if (type == 'utc') year = year.substr(2, 2);
+			var month = pad(String(d.getMonth() + 1), 2);
+			var day = pad(String(d.getDate()), 2);
+			var hour = pad(String(d.getHours()), 2);
+			var min = pad(String(d.getMinutes()), 2);
+			var sec = pad(String(d.getSeconds()), 2);
+			var s = year + month + day + hour + min + sec;
+			if (withMillis === true) {
+				var millis = d.getMilliseconds();
+				if (millis != 0) {
+					var sMillis = pad(String(millis), 3);
+					sMillis = sMillis.replace(/[0]+$/, "");
+					s = s + "." + sMillis;
+				}
+			}
+			return s + "Z";
+		};
+
+		this.zeroPadding = function(s, len) {
+			if (s.length >= len) return s;
+			return new Array(len - s.length + 1).join('0') + s;
+		};
+
+		// --- PUBLIC METHODS --------------------
+		/**
+		 * get string value of this string object
+		 * @name getString
+		 * @memberOf KJUR.asn1.DERAbstractTime#
+		 * @function
+		 * @return {String} string value of this time object
+		 */
+		this.getString = function() {
+			return this.s;
+		};
+
+		/**
+		 * set value by a string
+		 * @name setString
+		 * @memberOf KJUR.asn1.DERAbstractTime#
+		 * @function
+		 * @param {String} newS value by a string to set such like "130430235959Z"
+		 */
+		this.setString = function(newS) {
+			this.hTLV = null;
+			this.isModified = true;
+			this.s = newS;
+			this.hV = stohex(newS);
+		};
+
+		/**
+		 * set value by a Date object
+		 * @name setByDateValue
+		 * @memberOf KJUR.asn1.DERAbstractTime#
+		 * @function
+		 * @param {Integer} year year of date (ex. 2013)
+		 * @param {Integer} month month of date between 1 and 12 (ex. 12)
+		 * @param {Integer} day day of month
+		 * @param {Integer} hour hours of date
+		 * @param {Integer} min minutes of date
+		 * @param {Integer} sec seconds of date
+		 */
+		this.setByDateValue = function(year, month, day, hour, min, sec) {
+			var dateObject = new Date(Date.UTC(year, month - 1, day, hour, min, sec, 0));
+			this.setByDate(dateObject);
+		};
+
+		this.getFreshValueHex = function() {
+			return this.hV;
+		};
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERAbstractTime, KJUR.asn1.ASN1Object);
+	// == END   DERAbstractTime ==================================================
+
+	// == BEGIN DERAbstractStructured ============================================
+	/**
+	 * base class for ASN.1 DER structured class
+	 * @name KJUR.asn1.DERAbstractStructured
+	 * @class base class for ASN.1 DER structured class
+	 * @property {Array} asn1Array internal array of ASN1Object
+	 * @extends KJUR.asn1.ASN1Object
+	 * @description
+	 * @see KJUR.asn1.ASN1Object - superclass
+	 */
+	KJUR.asn1.DERAbstractStructured = function(params) {
+		KJUR.asn1.DERAbstractString.superclass.constructor.call(this);
+
+		/**
+		 * set value by array of ASN1Object
+		 * @name setByASN1ObjectArray
+		 * @memberOf KJUR.asn1.DERAbstractStructured#
+		 * @function
+		 * @param {array} asn1ObjectArray array of ASN1Object to set
+		 */
+		this.setByASN1ObjectArray = function(asn1ObjectArray) {
+			this.hTLV = null;
+			this.isModified = true;
+			this.asn1Array = asn1ObjectArray;
+		};
+
+		/**
+		 * append an ASN1Object to internal array
+		 * @name appendASN1Object
+		 * @memberOf KJUR.asn1.DERAbstractStructured#
+		 * @function
+		 * @param {ASN1Object} asn1Object to add
+		 */
+		this.appendASN1Object = function(asn1Object) {
+			this.hTLV = null;
+			this.isModified = true;
+			this.asn1Array.push(asn1Object);
+		};
+
+		this.asn1Array = new Array();
+		if (typeof params != "undefined") {
+			if (typeof params['array'] != "undefined") {
+				this.asn1Array = params['array'];
+			}
+		}
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERAbstractStructured, KJUR.asn1.ASN1Object);
+
+
+	// ********************************************************************
+	//  ASN.1 Object Classes
+	// ********************************************************************
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER Boolean
+	 * @name KJUR.asn1.DERBoolean
+	 * @class class for ASN.1 DER Boolean
+	 * @extends KJUR.asn1.ASN1Object
+	 * @description
+	 * @see KJUR.asn1.ASN1Object - superclass
+	 */
+	KJUR.asn1.DERBoolean = function() {
+		KJUR.asn1.DERBoolean.superclass.constructor.call(this);
+		this.hT = "01";
+		this.hTLV = "0101ff";
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERBoolean, KJUR.asn1.ASN1Object);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER Integer
+	 * @name KJUR.asn1.DERInteger
+	 * @class class for ASN.1 DER Integer
+	 * @extends KJUR.asn1.ASN1Object
+	 * @description
+	 * <br/>
+	 * As for argument 'params' for constructor, you can specify one of
+	 * following properties:
+	 * <ul>
+	 * <li>int - specify initial ASN.1 value(V) by integer value</li>
+	 * <li>bigint - specify initial ASN.1 value(V) by BigInteger object</li>
+	 * <li>hex - specify initial ASN.1 value(V) by a hexadecimal string</li>
+	 * </ul>
+	 * NOTE: 'params' can be omitted.
+	 */
+	KJUR.asn1.DERInteger = function(params) {
+		KJUR.asn1.DERInteger.superclass.constructor.call(this);
+		this.hT = "02";
+
+		/**
+		 * set value by Tom Wu's BigInteger object
+		 * @name setByBigInteger
+		 * @memberOf KJUR.asn1.DERInteger#
+		 * @function
+		 * @param {BigInteger} bigIntegerValue to set
+		 */
+		this.setByBigInteger = function(bigIntegerValue) {
+			this.hTLV = null;
+			this.isModified = true;
+			this.hV = KJUR.asn1.ASN1Util.bigIntToMinTwosComplementsHex(bigIntegerValue);
+		};
+
+		/**
+		 * set value by integer value
+		 * @name setByInteger
+		 * @memberOf KJUR.asn1.DERInteger
+		 * @function
+		 * @param {Integer} integer value to set
+		 */
+		this.setByInteger = function(intValue) {
+			var bi = new BigInteger(String(intValue), 10);
+			this.setByBigInteger(bi);
+		};
+
+		/**
+		 * set value by integer value
+		 * @name setValueHex
+		 * @memberOf KJUR.asn1.DERInteger#
+		 * @function
+		 * @param {String} hexadecimal string of integer value
+		 * @description
+		 * <br/>
+		 * NOTE: Value shall be represented by minimum octet length of
+		 * two's complement representation.
+		 * @example
+		 * new KJUR.asn1.DERInteger(123);
+		 * new KJUR.asn1.DERInteger({'int': 123});
+		 * new KJUR.asn1.DERInteger({'hex': '1fad'});
+		 */
+		this.setValueHex = function(newHexString) {
+			this.hV = newHexString;
+		};
+
+		this.getFreshValueHex = function() {
+			return this.hV;
+		};
+
+		if (typeof params != "undefined") {
+			if (typeof params['bigint'] != "undefined") {
+				this.setByBigInteger(params['bigint']);
+			} else if (typeof params['int'] != "undefined") {
+				this.setByInteger(params['int']);
+			} else if (typeof params == "number") {
+				this.setByInteger(params);
+			} else if (typeof params['hex'] != "undefined") {
+				this.setValueHex(params['hex']);
+			}
+		}
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERInteger, KJUR.asn1.ASN1Object);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER encoded BitString primitive
+	 * @name KJUR.asn1.DERBitString
+	 * @class class for ASN.1 DER encoded BitString primitive
+	 * @extends KJUR.asn1.ASN1Object
+	 * @description
+	 * <br/>
+	 * As for argument 'params' for constructor, you can specify one of
+	 * following properties:
+	 * <ul>
+	 * <li>bin - specify binary string (ex. '10111')</li>
+	 * <li>array - specify array of boolean (ex. [true,false,true,true])</li>
+	 * <li>hex - specify hexadecimal string of ASN.1 value(V) including unused bits</li>
+	 * <li>obj - specify {@link KJUR.asn1.ASN1Util.newObject}
+	 * argument for "BitString encapsulates" structure.</li>
+	 * </ul>
+	 * NOTE1: 'params' can be omitted.<br/>
+	 * NOTE2: 'obj' parameter have been supported since
+	 * asn1 1.0.11, jsrsasign 6.1.1 (2016-Sep-25).<br/>
+	 * @example
+	 * // default constructor
+	 * o = new KJUR.asn1.DERBitString();
+	 * // initialize with binary string
+	 * o = new KJUR.asn1.DERBitString({bin: "1011"});
+	 * // initialize with boolean array
+	 * o = new KJUR.asn1.DERBitString({array: [true,false,true,true]});
+	 * // initialize with hexadecimal string (04 is unused bits)
+	 * o = new KJUR.asn1.DEROctetString({hex: "04bac0"});
+	 * // initialize with ASN1Util.newObject argument for encapsulated
+	 * o = new KJUR.asn1.DERBitString({obj: {seq: [{int: 3}, {prnstr: 'aaa'}]}});
+	 * // above generates a ASN.1 data like this:
+	 * // BIT STRING, encapsulates {
+	 * //   SEQUENCE {
+	 * //     INTEGER 3
+	 * //     PrintableString 'aaa'
+	 * //     }
+	 * //   }
+	 */
+	KJUR.asn1.DERBitString = function(params) {
+		if (params !== undefined && typeof params.obj !== "undefined") {
+			var o = KJUR.asn1.ASN1Util.newObject(params.obj);
+			params.hex = "00" + o.getEncodedHex();
+		}
+		KJUR.asn1.DERBitString.superclass.constructor.call(this);
+		this.hT = "03";
+
+		/**
+		 * set ASN.1 value(V) by a hexadecimal string including unused bits
+		 * @name setHexValueIncludingUnusedBits
+		 * @memberOf KJUR.asn1.DERBitString#
+		 * @function
+		 * @param {String} newHexStringIncludingUnusedBits
+		 */
+		this.setHexValueIncludingUnusedBits = function(newHexStringIncludingUnusedBits) {
+			this.hTLV = null;
+			this.isModified = true;
+			this.hV = newHexStringIncludingUnusedBits;
+		};
+
+		/**
+		 * set ASN.1 value(V) by unused bit and hexadecimal string of value
+		 * @name setUnusedBitsAndHexValue
+		 * @memberOf KJUR.asn1.DERBitString#
+		 * @function
+		 * @param {Integer} unusedBits
+		 * @param {String} hValue
+		 */
+		this.setUnusedBitsAndHexValue = function(unusedBits, hValue) {
+			if (unusedBits < 0 || 7 < unusedBits) {
+				throw "unused bits shall be from 0 to 7: u = " + unusedBits;
+			}
+			var hUnusedBits = "0" + unusedBits;
+			this.hTLV = null;
+			this.isModified = true;
+			this.hV = hUnusedBits + hValue;
+		};
+
+		/**
+		 * set ASN.1 DER BitString by binary string<br/>
+		 * @name setByBinaryString
+		 * @memberOf KJUR.asn1.DERBitString#
+		 * @function
+		 * @param {String} binaryString binary value string (i.e. '10111')
+		 * @description
+		 * Its unused bits will be calculated automatically by length of
+		 * 'binaryValue'. <br/>
+		 * NOTE: Trailing zeros '0' will be ignored.
+		 * @example
+		 * o = new KJUR.asn1.DERBitString();
+		 * o.setByBooleanArray("01011");
+		 */
+		this.setByBinaryString = function(binaryString) {
+			binaryString = binaryString.replace(/0+$/, '');
+			var unusedBits = 8 - binaryString.length % 8;
+			if (unusedBits == 8) unusedBits = 0;
+			for (var i = 0; i <= unusedBits; i++) {
+				binaryString += '0';
+			}
+			var h = '';
+			for (var i = 0; i < binaryString.length - 1; i += 8) {
+				var b = binaryString.substr(i, 8);
+				var x = parseInt(b, 2).toString(16);
+				if (x.length == 1) x = '0' + x;
+				h += x;
+			}
+			this.hTLV = null;
+			this.isModified = true;
+			this.hV = '0' + unusedBits + h;
+		};
+
+		/**
+		 * set ASN.1 TLV value(V) by an array of boolean<br/>
+		 * @name setByBooleanArray
+		 * @memberOf KJUR.asn1.DERBitString#
+		 * @function
+		 * @param {array} booleanArray array of boolean (ex. [true, false, true])
+		 * @description
+		 * NOTE: Trailing falses will be ignored in the ASN.1 DER Object.
+		 * @example
+		 * o = new KJUR.asn1.DERBitString();
+		 * o.setByBooleanArray([false, true, false, true, true]);
+		 */
+		this.setByBooleanArray = function(booleanArray) {
+			var s = '';
+			for (var i = 0; i < booleanArray.length; i++) {
+				if (booleanArray[i] == true) {
+					s += '1';
+				} else {
+					s += '0';
+				}
+			}
+			this.setByBinaryString(s);
+		};
+
+		/**
+		 * generate an array of falses with specified length<br/>
+		 * @name newFalseArray
+		 * @memberOf KJUR.asn1.DERBitString
+		 * @function
+		 * @param {Integer} nLength length of array to generate
+		 * @return {array} array of boolean falses
+		 * @description
+		 * This static method may be useful to initialize boolean array.
+		 * @example
+		 * o = new KJUR.asn1.DERBitString();
+		 * o.newFalseArray(3) &rarr; [false, false, false]
+		 */
+		this.newFalseArray = function(nLength) {
+			var a = new Array(nLength);
+			for (var i = 0; i < nLength; i++) {
+				a[i] = false;
+			}
+			return a;
+		};
+
+		this.getFreshValueHex = function() {
+			return this.hV;
+		};
+
+		if (typeof params != "undefined") {
+			if (typeof params == "string" && params.toLowerCase().match(/^[0-9a-f]+$/)) {
+				this.setHexValueIncludingUnusedBits(params);
+			} else if (typeof params['hex'] != "undefined") {
+				this.setHexValueIncludingUnusedBits(params['hex']);
+			} else if (typeof params['bin'] != "undefined") {
+				this.setByBinaryString(params['bin']);
+			} else if (typeof params['array'] != "undefined") {
+				this.setByBooleanArray(params['array']);
+			}
+		}
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERBitString, KJUR.asn1.ASN1Object);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER OctetString<br/>
+	 * @name KJUR.asn1.DEROctetString
+	 * @class class for ASN.1 DER OctetString
+	 * @param {Array} params associative array of parameters (ex. {'str': 'aaa'})
+	 * @extends KJUR.asn1.DERAbstractString
+	 * @description
+	 * This class provides ASN.1 OctetString simple type.<br/>
+	 * Supported "params" attributes are:
+	 * <ul>
+	 * <li>str - to set a string as a value</li>
+	 * <li>hex - to set a hexadecimal string as a value</li>
+	 * <li>obj - to set a encapsulated ASN.1 value by JSON object
+	 * which is defined in {@link KJUR.asn1.ASN1Util.newObject}</li>
+	 * </ul>
+	 * NOTE: A parameter 'obj' have been supported
+	 * for "OCTET STRING, encapsulates" structure.
+	 * since asn1 1.0.11, jsrsasign 6.1.1 (2016-Sep-25).
+	 * @see KJUR.asn1.DERAbstractString - superclass
+	 * @example
+	 * // default constructor
+	 * o = new KJUR.asn1.DEROctetString();
+	 * // initialize with string
+	 * o = new KJUR.asn1.DEROctetString({str: "aaa"});
+	 * // initialize with hexadecimal string
+	 * o = new KJUR.asn1.DEROctetString({hex: "616161"});
+	 * // initialize with ASN1Util.newObject argument
+	 * o = new KJUR.asn1.DEROctetString({obj: {seq: [{int: 3}, {prnstr: 'aaa'}]}});
+	 * // above generates a ASN.1 data like this:
+	 * // OCTET STRING, encapsulates {
+	 * //   SEQUENCE {
+	 * //     INTEGER 3
+	 * //     PrintableString 'aaa'
+	 * //     }
+	 * //   }
+	 */
+	KJUR.asn1.DEROctetString = function(params) {
+		if (params !== undefined && typeof params.obj !== "undefined") {
+			var o = KJUR.asn1.ASN1Util.newObject(params.obj);
+			params.hex = o.getEncodedHex();
+		}
+		KJUR.asn1.DEROctetString.superclass.constructor.call(this, params);
+		this.hT = "04";
+	};
+	YAHOO.lang.extend(KJUR.asn1.DEROctetString, KJUR.asn1.DERAbstractString);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER Null
+	 * @name KJUR.asn1.DERNull
+	 * @class class for ASN.1 DER Null
+	 * @extends KJUR.asn1.ASN1Object
+	 * @description
+	 * @see KJUR.asn1.ASN1Object - superclass
+	 */
+	KJUR.asn1.DERNull = function() {
+		KJUR.asn1.DERNull.superclass.constructor.call(this);
+		this.hT = "05";
+		this.hTLV = "0500";
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERNull, KJUR.asn1.ASN1Object);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER ObjectIdentifier
+	 * @name KJUR.asn1.DERObjectIdentifier
+	 * @class class for ASN.1 DER ObjectIdentifier
+	 * @param {Array} params associative array of parameters (ex. {'oid': '2.5.4.5'})
+	 * @extends KJUR.asn1.ASN1Object
+	 * @description
+	 * <br/>
+	 * As for argument 'params' for constructor, you can specify one of
+	 * following properties:
+	 * <ul>
+	 * <li>oid - specify initial ASN.1 value(V) by a oid string (ex. 2.5.4.13)</li>
+	 * <li>hex - specify initial ASN.1 value(V) by a hexadecimal string</li>
+	 * </ul>
+	 * NOTE: 'params' can be omitted.
+	 */
+	KJUR.asn1.DERObjectIdentifier = function(params) {
+		var itox = function(i) {
+			var h = i.toString(16);
+			if (h.length == 1) h = '0' + h;
+			return h;
+		};
+		var roidtox = function(roid) {
+			var h = '';
+			var bi = new BigInteger(roid, 10);
+			var b = bi.toString(2);
+			var padLen = 7 - b.length % 7;
+			if (padLen == 7) padLen = 0;
+			var bPad = '';
+			for (var i = 0; i < padLen; i++) bPad += '0';
+			b = bPad + b;
+			for (var i = 0; i < b.length - 1; i += 7) {
+				var b8 = b.substr(i, 7);
+				if (i != b.length - 7) b8 = '1' + b8;
+				h += itox(parseInt(b8, 2));
+			}
+			return h;
+		};
+
+		KJUR.asn1.DERObjectIdentifier.superclass.constructor.call(this);
+		this.hT = "06";
+
+		/**
+		 * set value by a hexadecimal string
+		 * @name setValueHex
+		 * @memberOf KJUR.asn1.DERObjectIdentifier#
+		 * @function
+		 * @param {String} newHexString hexadecimal value of OID bytes
+		 */
+		this.setValueHex = function(newHexString) {
+			this.hTLV = null;
+			this.isModified = true;
+			this.s = null;
+			this.hV = newHexString;
+		};
+
+		/**
+		 * set value by a OID string<br/>
+		 * @name setValueOidString
+		 * @memberOf KJUR.asn1.DERObjectIdentifier#
+		 * @function
+		 * @param {String} oidString OID string (ex. 2.5.4.13)
+		 * @example
+		 * o = new KJUR.asn1.DERObjectIdentifier();
+		 * o.setValueOidString("2.5.4.13");
+		 */
+		this.setValueOidString = function(oidString) {
+			if (!oidString.match(/^[0-9.]+$/)) {
+				throw "malformed oid string: " + oidString;
+			}
+			var h = '';
+			var a = oidString.split('.');
+			var i0 = parseInt(a[0]) * 40 + parseInt(a[1]);
+			h += itox(i0);
+			a.splice(0, 2);
+			for (var i = 0; i < a.length; i++) {
+				h += roidtox(a[i]);
+			}
+			this.hTLV = null;
+			this.isModified = true;
+			this.s = null;
+			this.hV = h;
+		};
+
+		/**
+		 * set value by a OID name
+		 * @name setValueName
+		 * @memberOf KJUR.asn1.DERObjectIdentifier#
+		 * @function
+		 * @param {String} oidName OID name (ex. 'serverAuth')
+		 * @since 1.0.1
+		 * @description
+		 * OID name shall be defined in 'KJUR.asn1.x509.OID.name2oidList'.
+		 * Otherwise raise error.
+		 * @example
+		 * o = new KJUR.asn1.DERObjectIdentifier();
+		 * o.setValueName("serverAuth");
+		 */
+		this.setValueName = function(oidName) {
+			var oid = KJUR.asn1.x509.OID.name2oid(oidName);
+			if (oid !== '') {
+				this.setValueOidString(oid);
+			} else {
+				throw "DERObjectIdentifier oidName undefined: " + oidName;
+			}
+		};
+
+		this.getFreshValueHex = function() {
+			return this.hV;
+		};
+
+		if (params !== undefined) {
+			if (typeof params === "string") {
+				if (params.match(/^[0-2].[0-9.]+$/)) {
+					this.setValueOidString(params);
+				} else {
+					this.setValueName(params);
+				}
+			} else if (params.oid !== undefined) {
+				this.setValueOidString(params.oid);
+			} else if (params.hex !== undefined) {
+				this.setValueHex(params.hex);
+			} else if (params.name !== undefined) {
+				this.setValueName(params.name);
+			}
+		}
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERObjectIdentifier, KJUR.asn1.ASN1Object);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER Enumerated
+	 * @name KJUR.asn1.DEREnumerated
+	 * @class class for ASN.1 DER Enumerated
+	 * @extends KJUR.asn1.ASN1Object
+	 * @description
+	 * <br/>
+	 * As for argument 'params' for constructor, you can specify one of
+	 * following properties:
+	 * <ul>
+	 * <li>int - specify initial ASN.1 value(V) by integer value</li>
+	 * <li>hex - specify initial ASN.1 value(V) by a hexadecimal string</li>
+	 * </ul>
+	 * NOTE: 'params' can be omitted.
+	 * @example
+	 * new KJUR.asn1.DEREnumerated(123);
+	 * new KJUR.asn1.DEREnumerated({int: 123});
+	 * new KJUR.asn1.DEREnumerated({hex: '1fad'});
+	 */
+	KJUR.asn1.DEREnumerated = function(params) {
+		KJUR.asn1.DEREnumerated.superclass.constructor.call(this);
+		this.hT = "0a";
+
+		/**
+		 * set value by Tom Wu's BigInteger object
+		 * @name setByBigInteger
+		 * @memberOf KJUR.asn1.DEREnumerated#
+		 * @function
+		 * @param {BigInteger} bigIntegerValue to set
+		 */
+		this.setByBigInteger = function(bigIntegerValue) {
+			this.hTLV = null;
+			this.isModified = true;
+			this.hV = KJUR.asn1.ASN1Util.bigIntToMinTwosComplementsHex(bigIntegerValue);
+		};
+
+		/**
+		 * set value by integer value
+		 * @name setByInteger
+		 * @memberOf KJUR.asn1.DEREnumerated#
+		 * @function
+		 * @param {Integer} integer value to set
+		 */
+		this.setByInteger = function(intValue) {
+			var bi = new BigInteger(String(intValue), 10);
+			this.setByBigInteger(bi);
+		};
+
+		/**
+		 * set value by integer value
+		 * @name setValueHex
+		 * @memberOf KJUR.asn1.DEREnumerated#
+		 * @function
+		 * @param {String} hexadecimal string of integer value
+		 * @description
+		 * <br/>
+		 * NOTE: Value shall be represented by minimum octet length of
+		 * two's complement representation.
+		 */
+		this.setValueHex = function(newHexString) {
+			this.hV = newHexString;
+		};
+
+		this.getFreshValueHex = function() {
+			return this.hV;
+		};
+
+		if (typeof params != "undefined") {
+			if (typeof params['int'] != "undefined") {
+				this.setByInteger(params['int']);
+			} else if (typeof params == "number") {
+				this.setByInteger(params);
+			} else if (typeof params['hex'] != "undefined") {
+				this.setValueHex(params['hex']);
+			}
+		}
+	};
+	YAHOO.lang.extend(KJUR.asn1.DEREnumerated, KJUR.asn1.ASN1Object);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER UTF8String
+	 * @name KJUR.asn1.DERUTF8String
+	 * @class class for ASN.1 DER UTF8String
+	 * @param {Array} params associative array of parameters (ex. {'str': 'aaa'})
+	 * @extends KJUR.asn1.DERAbstractString
+	 * @description
+	 * @see KJUR.asn1.DERAbstractString - superclass
+	 */
+	KJUR.asn1.DERUTF8String = function(params) {
+		KJUR.asn1.DERUTF8String.superclass.constructor.call(this, params);
+		this.hT = "0c";
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERUTF8String, KJUR.asn1.DERAbstractString);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER NumericString
+	 * @name KJUR.asn1.DERNumericString
+	 * @class class for ASN.1 DER NumericString
+	 * @param {Array} params associative array of parameters (ex. {'str': 'aaa'})
+	 * @extends KJUR.asn1.DERAbstractString
+	 * @description
+	 * @see KJUR.asn1.DERAbstractString - superclass
+	 */
+	KJUR.asn1.DERNumericString = function(params) {
+		KJUR.asn1.DERNumericString.superclass.constructor.call(this, params);
+		this.hT = "12";
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERNumericString, KJUR.asn1.DERAbstractString);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER PrintableString
+	 * @name KJUR.asn1.DERPrintableString
+	 * @class class for ASN.1 DER PrintableString
+	 * @param {Array} params associative array of parameters (ex. {'str': 'aaa'})
+	 * @extends KJUR.asn1.DERAbstractString
+	 * @description
+	 * @see KJUR.asn1.DERAbstractString - superclass
+	 */
+	KJUR.asn1.DERPrintableString = function(params) {
+		KJUR.asn1.DERPrintableString.superclass.constructor.call(this, params);
+		this.hT = "13";
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERPrintableString, KJUR.asn1.DERAbstractString);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER TeletexString
+	 * @name KJUR.asn1.DERTeletexString
+	 * @class class for ASN.1 DER TeletexString
+	 * @param {Array} params associative array of parameters (ex. {'str': 'aaa'})
+	 * @extends KJUR.asn1.DERAbstractString
+	 * @description
+	 * @see KJUR.asn1.DERAbstractString - superclass
+	 */
+	KJUR.asn1.DERTeletexString = function(params) {
+		KJUR.asn1.DERTeletexString.superclass.constructor.call(this, params);
+		this.hT = "14";
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERTeletexString, KJUR.asn1.DERAbstractString);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER IA5String
+	 * @name KJUR.asn1.DERIA5String
+	 * @class class for ASN.1 DER IA5String
+	 * @param {Array} params associative array of parameters (ex. {'str': 'aaa'})
+	 * @extends KJUR.asn1.DERAbstractString
+	 * @description
+	 * @see KJUR.asn1.DERAbstractString - superclass
+	 */
+	KJUR.asn1.DERIA5String = function(params) {
+		KJUR.asn1.DERIA5String.superclass.constructor.call(this, params);
+		this.hT = "16";
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERIA5String, KJUR.asn1.DERAbstractString);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER UTCTime
+	 * @name KJUR.asn1.DERUTCTime
+	 * @class class for ASN.1 DER UTCTime
+	 * @param {Array} params associative array of parameters (ex. {'str': '130430235959Z'})
+	 * @extends KJUR.asn1.DERAbstractTime
+	 * @description
+	 * <br/>
+	 * As for argument 'params' for constructor, you can specify one of
+	 * following properties:
+	 * <ul>
+	 * <li>str - specify initial ASN.1 value(V) by a string (ex.'130430235959Z')</li>
+	 * <li>hex - specify initial ASN.1 value(V) by a hexadecimal string</li>
+	 * <li>date - specify Date object.</li>
+	 * </ul>
+	 * NOTE: 'params' can be omitted.
+	 * <h4>EXAMPLES</h4>
+	 * @example
+	 * d1 = new KJUR.asn1.DERUTCTime();
+	 * d1.setString('130430125959Z');
+	 *
+	 * d2 = new KJUR.asn1.DERUTCTime({'str': '130430125959Z'});
+	 * d3 = new KJUR.asn1.DERUTCTime({'date': new Date(Date.UTC(2015, 0, 31, 0, 0, 0, 0))});
+	 * d4 = new KJUR.asn1.DERUTCTime('130430125959Z');
+	 */
+	KJUR.asn1.DERUTCTime = function(params) {
+		KJUR.asn1.DERUTCTime.superclass.constructor.call(this, params);
+		this.hT = "17";
+
+		/**
+		 * set value by a Date object<br/>
+		 * @name setByDate
+		 * @memberOf KJUR.asn1.DERUTCTime#
+		 * @function
+		 * @param {Date} dateObject Date object to set ASN.1 value(V)
+		 * @example
+		 * o = new KJUR.asn1.DERUTCTime();
+		 * o.setByDate(new Date("2016/12/31"));
+		 */
+		this.setByDate = function(dateObject) {
+			this.hTLV = null;
+			this.isModified = true;
+			this.date = dateObject;
+			this.s = this.formatDate(this.date, 'utc');
+			this.hV = stohex(this.s);
+		};
+
+		this.getFreshValueHex = function() {
+			if (typeof this.date == "undefined" && typeof this.s == "undefined") {
+				this.date = new Date();
+				this.s = this.formatDate(this.date, 'utc');
+				this.hV = stohex(this.s);
+			}
+			return this.hV;
+		};
+
+		if (params !== undefined) {
+			if (params.str !== undefined) {
+				this.setString(params.str);
+			} else if (typeof params == "string" && params.match(/^[0-9]{12}Z$/)) {
+				this.setString(params);
+			} else if (params.hex !== undefined) {
+				this.setStringHex(params.hex);
+			} else if (params.date !== undefined) {
+				this.setByDate(params.date);
+			}
+		}
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERUTCTime, KJUR.asn1.DERAbstractTime);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER GeneralizedTime
+	 * @name KJUR.asn1.DERGeneralizedTime
+	 * @class class for ASN.1 DER GeneralizedTime
+	 * @param {Array} params associative array of parameters (ex. {'str': '20130430235959Z'})
+	 * @property {Boolean} withMillis flag to show milliseconds or not
+	 * @extends KJUR.asn1.DERAbstractTime
+	 * @description
+	 * <br/>
+	 * As for argument 'params' for constructor, you can specify one of
+	 * following properties:
+	 * <ul>
+	 * <li>str - specify initial ASN.1 value(V) by a string (ex.'20130430235959Z')</li>
+	 * <li>hex - specify initial ASN.1 value(V) by a hexadecimal string</li>
+	 * <li>date - specify Date object.</li>
+	 * <li>millis - specify flag to show milliseconds (from 1.0.6)</li>
+	 * </ul>
+	 * NOTE1: 'params' can be omitted.
+	 * NOTE2: 'withMillis' property is supported from asn1 1.0.6.
+	 */
+	KJUR.asn1.DERGeneralizedTime = function(params) {
+		KJUR.asn1.DERGeneralizedTime.superclass.constructor.call(this, params);
+		this.hT = "18";
+		this.withMillis = false;
+
+		/**
+		 * set value by a Date object
+		 * @name setByDate
+		 * @memberOf KJUR.asn1.DERGeneralizedTime#
+		 * @function
+		 * @param {Date} dateObject Date object to set ASN.1 value(V)
+		 * @example
+		 * When you specify UTC time, use 'Date.UTC' method like this:<br/>
+		 * o1 = new DERUTCTime();
+		 * o1.setByDate(date);
+		 *
+		 * date = new Date(Date.UTC(2015, 0, 31, 23, 59, 59, 0)); #2015JAN31 23:59:59
+		 */
+		this.setByDate = function(dateObject) {
+			this.hTLV = null;
+			this.isModified = true;
+			this.date = dateObject;
+			this.s = this.formatDate(this.date, 'gen', this.withMillis);
+			this.hV = stohex(this.s);
+		};
+
+		this.getFreshValueHex = function() {
+			if (this.date === undefined && this.s === undefined) {
+				this.date = new Date();
+				this.s = this.formatDate(this.date, 'gen', this.withMillis);
+				this.hV = stohex(this.s);
+			}
+			return this.hV;
+		};
+
+		if (params !== undefined) {
+			if (params.str !== undefined) {
+				this.setString(params.str);
+			} else if (typeof params == "string" && params.match(/^[0-9]{14}Z$/)) {
+				this.setString(params);
+			} else if (params.hex !== undefined) {
+				this.setStringHex(params.hex);
+			} else if (params.date !== undefined) {
+				this.setByDate(params.date);
+			}
+			if (params.millis === true) {
+				this.withMillis = true;
+			}
+		}
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERGeneralizedTime, KJUR.asn1.DERAbstractTime);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER Sequence
+	 * @name KJUR.asn1.DERSequence
+	 * @class class for ASN.1 DER Sequence
+	 * @extends KJUR.asn1.DERAbstractStructured
+	 * @description
+	 * <br/>
+	 * As for argument 'params' for constructor, you can specify one of
+	 * following properties:
+	 * <ul>
+	 * <li>array - specify array of ASN1Object to set elements of content</li>
+	 * </ul>
+	 * NOTE: 'params' can be omitted.
+	 */
+	KJUR.asn1.DERSequence = function(params) {
+		KJUR.asn1.DERSequence.superclass.constructor.call(this, params);
+		this.hT = "30";
+		this.getFreshValueHex = function() {
+			var h = '';
+			for (var i = 0; i < this.asn1Array.length; i++) {
+				var asn1Obj = this.asn1Array[i];
+				h += asn1Obj.getEncodedHex();
+			}
+			this.hV = h;
+			return this.hV;
+		};
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERSequence, KJUR.asn1.DERAbstractStructured);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER Set
+	 * @name KJUR.asn1.DERSet
+	 * @class class for ASN.1 DER Set
+	 * @extends KJUR.asn1.DERAbstractStructured
+	 * @description
+	 * <br/>
+	 * As for argument 'params' for constructor, you can specify one of
+	 * following properties:
+	 * <ul>
+	 * <li>array - specify array of ASN1Object to set elements of content</li>
+	 * <li>sortflag - flag for sort (default: true). ASN.1 BER is not sorted in 'SET OF'.</li>
+	 * </ul>
+	 * NOTE1: 'params' can be omitted.<br/>
+	 * NOTE2: sortflag is supported since 1.0.5.
+	 */
+	KJUR.asn1.DERSet = function(params) {
+		KJUR.asn1.DERSet.superclass.constructor.call(this, params);
+		this.hT = "31";
+		this.sortFlag = true; // item shall be sorted only in ASN.1 DER
+		this.getFreshValueHex = function() {
+			var a = new Array();
+			for (var i = 0; i < this.asn1Array.length; i++) {
+				var asn1Obj = this.asn1Array[i];
+				a.push(asn1Obj.getEncodedHex());
+			}
+			if (this.sortFlag == true) a.sort();
+			this.hV = a.join('');
+			return this.hV;
+		};
+
+		if (typeof params != "undefined") {
+			if (typeof params.sortflag != "undefined" &&
+				params.sortflag == false)
+				this.sortFlag = false;
+		}
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERSet, KJUR.asn1.DERAbstractStructured);
+
+	// ********************************************************************
+	/**
+	 * class for ASN.1 DER TaggedObject
+	 * @name KJUR.asn1.DERTaggedObject
+	 * @class class for ASN.1 DER TaggedObject
+	 * @extends KJUR.asn1.ASN1Object
+	 * @description
+	 * <br/>
+	 * Parameter 'tagNoNex' is ASN.1 tag(T) value for this object.
+	 * For example, if you find '[1]' tag in a ASN.1 dump,
+	 * 'tagNoHex' will be 'a1'.
+	 * <br/>
+	 * As for optional argument 'params' for constructor, you can specify *ANY* of
+	 * following properties:
+	 * <ul>
+	 * <li>explicit - specify true if this is explicit tag otherwise false
+	 *     (default is 'true').</li>
+	 * <li>tag - specify tag (default is 'a0' which means [0])</li>
+	 * <li>obj - specify ASN1Object which is tagged</li>
+	 * </ul>
+	 * @example
+	 * d1 = new KJUR.asn1.DERUTF8String({'str':'a'});
+	 * d2 = new KJUR.asn1.DERTaggedObject({'obj': d1});
+	 * hex = d2.getEncodedHex();
+	 */
+	KJUR.asn1.DERTaggedObject = function(params) {
+		KJUR.asn1.DERTaggedObject.superclass.constructor.call(this);
+		this.hT = "a0";
+		this.hV = '';
+		this.isExplicit = true;
+		this.asn1Object = null;
+
+		/**
+		 * set value by an ASN1Object
+		 * @name setString
+		 * @memberOf KJUR.asn1.DERTaggedObject#
+		 * @function
+		 * @param {Boolean} isExplicitFlag flag for explicit/implicit tag
+		 * @param {Integer} tagNoHex hexadecimal string of ASN.1 tag
+		 * @param {ASN1Object} asn1Object ASN.1 to encapsulate
+		 */
+		this.setASN1Object = function(isExplicitFlag, tagNoHex, asn1Object) {
+			this.hT = tagNoHex;
+			this.isExplicit = isExplicitFlag;
+			this.asn1Object = asn1Object;
+			if (this.isExplicit) {
+				this.hV = this.asn1Object.getEncodedHex();
+				this.hTLV = null;
+				this.isModified = true;
+			} else {
+				this.hV = null;
+				this.hTLV = asn1Object.getEncodedHex();
+				this.hTLV = this.hTLV.replace(/^../, tagNoHex);
+				this.isModified = false;
+			}
+		};
+
+		this.getFreshValueHex = function() {
+			return this.hV;
+		};
+
+		if (typeof params != "undefined") {
+			if (typeof params['tag'] != "undefined") {
+				this.hT = params['tag'];
+			}
+			if (typeof params['explicit'] != "undefined") {
+				this.isExplicit = params['explicit'];
+			}
+			if (typeof params['obj'] != "undefined") {
+				this.asn1Object = params['obj'];
+				this.setASN1Object(this.isExplicit, this.hT, this.asn1Object);
+			}
+		}
+	};
+	YAHOO.lang.extend(KJUR.asn1.DERTaggedObject, KJUR.asn1.ASN1Object);
+
+	/**
+	 * Create a new JSEncryptRSAKey that extends Tom Wu's RSA key object.
+	 * This object is just a decorator for parsing the key parameter
+	 * @param {string|Object} key - The key in string format, or an object containing
+	 * the parameters needed to build a RSAKey object.
+	 * @constructor
+	 */
+	var JSEncryptRSAKey = /** @class */ (function(_super) {
+		__extends(JSEncryptRSAKey, _super);
+
+		function JSEncryptRSAKey(key) {
+			var _this = _super.call(this) || this;
+			// Call the super constructor.
+			//  RSAKey.call(this);
+			// If a key key was provided.
+			if (key) {
+				// If this is a string...
+				if (typeof key === "string") {
+					_this.parseKey(key);
+				} else if (JSEncryptRSAKey.hasPrivateKeyProperty(key) ||
+					JSEncryptRSAKey.hasPublicKeyProperty(key)) {
+					// Set the values for the key.
+					_this.parsePropertiesFrom(key);
+				}
+			}
+			return _this;
+		}
+		/**
+		 * Method to parse a pem encoded string containing both a public or private key.
+		 * The method will translate the pem encoded string in a der encoded string and
+		 * will parse private key and public key parameters. This method accepts public key
+		 * in the rsaencryption pkcs #1 format (oid: 1.2.840.113549.1.1.1).
+		 *
+		 * @todo Check how many rsa formats use the same format of pkcs #1.
+		 *
+		 * The format is defined as:
+		 * PublicKeyInfo ::= SEQUENCE {
+		 *   algorithm       AlgorithmIdentifier,
+		 *   PublicKey       BIT STRING
+		 * }
+		 * Where AlgorithmIdentifier is:
+		 * AlgorithmIdentifier ::= SEQUENCE {
+		 *   algorithm       OBJECT IDENTIFIER,     the OID of the enc algorithm
+		 *   parameters      ANY DEFINED BY algorithm OPTIONAL (NULL for PKCS #1)
+		 * }
+		 * and PublicKey is a SEQUENCE encapsulated in a BIT STRING
+		 * RSAPublicKey ::= SEQUENCE {
+		 *   modulus           INTEGER,  -- n
+		 *   publicExponent    INTEGER   -- e
+		 * }
+		 * it's possible to examine the structure of the keys obtained from openssl using
+		 * an asn.1 dumper as the one used here to parse the components: http://lapo.it/asn1js/
+		 * @argument {string} pem the pem encoded string, can include the BEGIN/END header/footer
+		 * @private
+		 */
+		JSEncryptRSAKey.prototype.parseKey = function(pem) {
+			try {
+				var modulus = 0;
+				var public_exponent = 0;
+				var reHex = /^\s*(?:[0-9A-Fa-f][0-9A-Fa-f]\s*)+$/;
+				var der = reHex.test(pem) ? Hex.decode(pem) : Base64.unarmor(pem);
+				var asn1 = ASN1.decode(der);
+				// Fixes a bug with OpenSSL 1.0+ private keys
+				if (asn1.sub.length === 3) {
+					asn1 = asn1.sub[2].sub[0];
+				}
+				if (asn1.sub.length === 9) {
+					// Parse the private key.
+					modulus = asn1.sub[1].getHexStringValue(); // bigint
+					this.n = parseBigInt(modulus, 16);
+					public_exponent = asn1.sub[2].getHexStringValue(); // int
+					this.e = parseInt(public_exponent, 16);
+					var private_exponent = asn1.sub[3].getHexStringValue(); // bigint
+					this.d = parseBigInt(private_exponent, 16);
+					var prime1 = asn1.sub[4].getHexStringValue(); // bigint
+					this.p = parseBigInt(prime1, 16);
+					var prime2 = asn1.sub[5].getHexStringValue(); // bigint
+					this.q = parseBigInt(prime2, 16);
+					var exponent1 = asn1.sub[6].getHexStringValue(); // bigint
+					this.dmp1 = parseBigInt(exponent1, 16);
+					var exponent2 = asn1.sub[7].getHexStringValue(); // bigint
+					this.dmq1 = parseBigInt(exponent2, 16);
+					var coefficient = asn1.sub[8].getHexStringValue(); // bigint
+					this.coeff = parseBigInt(coefficient, 16);
+				} else if (asn1.sub.length === 2) {
+					// Parse the public key.
+					var bit_string = asn1.sub[1];
+					var sequence = bit_string.sub[0];
+					modulus = sequence.sub[0].getHexStringValue();
+					this.n = parseBigInt(modulus, 16);
+					public_exponent = sequence.sub[1].getHexStringValue();
+					this.e = parseInt(public_exponent, 16);
+				} else {
+					return false;
+				}
+				return true;
+			} catch (ex) {
+				return false;
+			}
+		};
+		/**
+		 * Translate rsa parameters in a hex encoded string representing the rsa key.
+		 *
+		 * The translation follow the ASN.1 notation :
+		 * RSAPrivateKey ::= SEQUENCE {
+		 *   version           Version,
+		 *   modulus           INTEGER,  -- n
+		 *   publicExponent    INTEGER,  -- e
+		 *   privateExponent   INTEGER,  -- d
+		 *   prime1            INTEGER,  -- p
+		 *   prime2            INTEGER,  -- q
+		 *   exponent1         INTEGER,  -- d mod (p1)
+		 *   exponent2         INTEGER,  -- d mod (q-1)
+		 *   coefficient       INTEGER,  -- (inverse of q) mod p
+		 * }
+		 * @returns {string}  DER Encoded String representing the rsa private key
+		 * @private
+		 */
+		JSEncryptRSAKey.prototype.getPrivateBaseKey = function() {
+			var options = {
+				array: [
+					new KJUR.asn1.DERInteger({
+						int: 0
+					}),
+					new KJUR.asn1.DERInteger({
+						bigint: this.n
+					}),
+					new KJUR.asn1.DERInteger({
+						int: this.e
+					}),
+					new KJUR.asn1.DERInteger({
+						bigint: this.d
+					}),
+					new KJUR.asn1.DERInteger({
+						bigint: this.p
+					}),
+					new KJUR.asn1.DERInteger({
+						bigint: this.q
+					}),
+					new KJUR.asn1.DERInteger({
+						bigint: this.dmp1
+					}),
+					new KJUR.asn1.DERInteger({
+						bigint: this.dmq1
+					}),
+					new KJUR.asn1.DERInteger({
+						bigint: this.coeff
+					})
+				]
+			};
+			var seq = new KJUR.asn1.DERSequence(options);
+			return seq.getEncodedHex();
+		};
+		/**
+		 * base64 (pem) encoded version of the DER encoded representation
+		 * @returns {string} pem encoded representation without header and footer
+		 * @public
+		 */
+		JSEncryptRSAKey.prototype.getPrivateBaseKeyB64 = function() {
+			return hex2b64(this.getPrivateBaseKey());
+		};
+		/**
+		 * Translate rsa parameters in a hex encoded string representing the rsa public key.
+		 * The representation follow the ASN.1 notation :
+		 * PublicKeyInfo ::= SEQUENCE {
+		 *   algorithm       AlgorithmIdentifier,
+		 *   PublicKey       BIT STRING
+		 * }
+		 * Where AlgorithmIdentifier is:
+		 * AlgorithmIdentifier ::= SEQUENCE {
+		 *   algorithm       OBJECT IDENTIFIER,     the OID of the enc algorithm
+		 *   parameters      ANY DEFINED BY algorithm OPTIONAL (NULL for PKCS #1)
+		 * }
+		 * and PublicKey is a SEQUENCE encapsulated in a BIT STRING
+		 * RSAPublicKey ::= SEQUENCE {
+		 *   modulus           INTEGER,  -- n
+		 *   publicExponent    INTEGER   -- e
+		 * }
+		 * @returns {string} DER Encoded String representing the rsa public key
+		 * @private
+		 */
+		JSEncryptRSAKey.prototype.getPublicBaseKey = function() {
+			var first_sequence = new KJUR.asn1.DERSequence({
+				array: [
+					new KJUR.asn1.DERObjectIdentifier({
+						oid: "1.2.840.113549.1.1.1"
+					}),
+					new KJUR.asn1.DERNull()
+				]
+			});
+			var second_sequence = new KJUR.asn1.DERSequence({
+				array: [
+					new KJUR.asn1.DERInteger({
+						bigint: this.n
+					}),
+					new KJUR.asn1.DERInteger({
+						int: this.e
+					})
+				]
+			});
+			var bit_string = new KJUR.asn1.DERBitString({
+				hex: "00" + second_sequence.getEncodedHex()
+			});
+			var seq = new KJUR.asn1.DERSequence({
+				array: [
+					first_sequence,
+					bit_string
+				]
+			});
+			return seq.getEncodedHex();
+		};
+		/**
+		 * base64 (pem) encoded version of the DER encoded representation
+		 * @returns {string} pem encoded representation without header and footer
+		 * @public
+		 */
+		JSEncryptRSAKey.prototype.getPublicBaseKeyB64 = function() {
+			return hex2b64(this.getPublicBaseKey());
+		};
+		/**
+		 * wrap the string in block of width chars. The default value for rsa keys is 64
+		 * characters.
+		 * @param {string} str the pem encoded string without header and footer
+		 * @param {Number} [width=64] - the length the string has to be wrapped at
+		 * @returns {string}
+		 * @private
+		 */
+		JSEncryptRSAKey.wordwrap = function(str, width) {
+			width = width || 64;
+			if (!str) {
+				return str;
+			}
+			var regex = "(.{1," + width + "})( +|$\n?)|(.{1," + width + "})";
+			return str.match(RegExp(regex, "g")).join("\n");
+		};
+		/**
+		 * Retrieve the pem encoded private key
+		 * @returns {string} the pem encoded private key with header/footer
+		 * @public
+		 */
+		JSEncryptRSAKey.prototype.getPrivateKey = function() {
+			var key = "-----BEGIN RSA PRIVATE KEY-----\n";
+			key += JSEncryptRSAKey.wordwrap(this.getPrivateBaseKeyB64()) + "\n";
+			key += "-----END RSA PRIVATE KEY-----";
+			return key;
+		};
+		/**
+		 * Retrieve the pem encoded public key
+		 * @returns {string} the pem encoded public key with header/footer
+		 * @public
+		 */
+		JSEncryptRSAKey.prototype.getPublicKey = function() {
+			var key = "-----BEGIN PUBLIC KEY-----\n";
+			key += JSEncryptRSAKey.wordwrap(this.getPublicBaseKeyB64()) + "\n";
+			key += "-----END PUBLIC KEY-----";
+			return key;
+		};
+		/**
+		 * Check if the object contains the necessary parameters to populate the rsa modulus
+		 * and public exponent parameters.
+		 * @param {Object} [obj={}] - An object that may contain the two public key
+		 * parameters
+		 * @returns {boolean} true if the object contains both the modulus and the public exponent
+		 * properties (n and e)
+		 * @todo check for types of n and e. N should be a parseable bigInt object, E should
+		 * be a parseable integer number
+		 * @private
+		 */
+		JSEncryptRSAKey.hasPublicKeyProperty = function(obj) {
+			obj = obj || {};
+			return (obj.hasOwnProperty("n") &&
+				obj.hasOwnProperty("e"));
+		};
+		/**
+		 * Check if the object contains ALL the parameters of an RSA key.
+		 * @param {Object} [obj={}] - An object that may contain nine rsa key
+		 * parameters
+		 * @returns {boolean} true if the object contains all the parameters needed
+		 * @todo check for types of the parameters all the parameters but the public exponent
+		 * should be parseable bigint objects, the public exponent should be a parseable integer number
+		 * @private
+		 */
+		JSEncryptRSAKey.hasPrivateKeyProperty = function(obj) {
+			obj = obj || {};
+			return (obj.hasOwnProperty("n") &&
+				obj.hasOwnProperty("e") &&
+				obj.hasOwnProperty("d") &&
+				obj.hasOwnProperty("p") &&
+				obj.hasOwnProperty("q") &&
+				obj.hasOwnProperty("dmp1") &&
+				obj.hasOwnProperty("dmq1") &&
+				obj.hasOwnProperty("coeff"));
+		};
+		/**
+		 * Parse the properties of obj in the current rsa object. Obj should AT LEAST
+		 * include the modulus and public exponent (n, e) parameters.
+		 * @param {Object} obj - the object containing rsa parameters
+		 * @private
+		 */
+		JSEncryptRSAKey.prototype.parsePropertiesFrom = function(obj) {
+			this.n = obj.n;
+			this.e = obj.e;
+			if (obj.hasOwnProperty("d")) {
+				this.d = obj.d;
+				this.p = obj.p;
+				this.q = obj.q;
+				this.dmp1 = obj.dmp1;
+				this.dmq1 = obj.dmq1;
+				this.coeff = obj.coeff;
+			}
+		};
+		return JSEncryptRSAKey;
+	}(RSAKey));
+
+	/**
+	 *
+	 * @param {Object} [options = {}] - An object to customize JSEncrypt behaviour
+	 * possible parameters are:
+	 * - default_key_size        {number}  default: 1024 the key size in bit
+	 * - default_public_exponent {string}  default: '010001' the hexadecimal representation of the public exponent
+	 * - log                     {boolean} default: false whether log warn/error or not
+	 * @constructor
+	 */
+	var JSEncrypt = /** @class */ (function() {
+		function JSEncrypt(options) {
+			options = options || {};
+			this.default_key_size = parseInt(options.default_key_size, 10) || 1024;
+			this.default_public_exponent = options.default_public_exponent ||
+			"010001"; // 65537 default openssl public exponent for rsa key type
+			this.log = options.log || false;
+			// The private and public key.
+			this.key = null;
+		}
+		/**
+		 * Method to set the rsa key parameter (one method is enough to set both the public
+		 * and the private key, since the private key contains the public key paramenters)
+		 * Log a warning if logs are enabled
+		 * @param {Object|string} key the pem encoded string or an object (with or without header/footer)
+		 * @public
+		 */
+		JSEncrypt.prototype.setKey = function(key) {
+			if (this.log && this.key) {
+				console.warn("A key was already set, overriding existing.");
+			}
+			this.key = new JSEncryptRSAKey(key);
+		};
+		/**
+		 * Proxy method for setKey, for api compatibility
+		 * @see setKey
+		 * @public
+		 */
+		JSEncrypt.prototype.setPrivateKey = function(privkey) {
+			// Create the key.
+			this.setKey(privkey);
+		};
+		/**
+		 * Proxy method for setKey, for api compatibility
+		 * @see setKey
+		 * @public
+		 */
+		JSEncrypt.prototype.setPublicKey = function(pubkey) {
+			// Sets the public key.
+			this.setKey(pubkey);
+		};
+		/**
+		 * Proxy method for RSAKey object's decrypt, decrypt the string using the private
+		 * components of the rsa key object. Note that if the object was not set will be created
+		 * on the fly (by the getKey method) using the parameters passed in the JSEncrypt constructor
+		 * @param {string} str base64 encoded crypted string to decrypt
+		 * @return {string} the decrypted string
+		 * @public
+		 */
+		JSEncrypt.prototype.decrypt = function(str) {
+			// Return the decrypted string.
+			try {
+				return this.getKey().decrypt(b64tohex(str));
+			} catch (ex) {
+				return false;
+			}
+		};
+		/**
+		 * Proxy method for RSAKey object's encrypt, encrypt the string using the public
+		 * components of the rsa key object. Note that if the object was not set will be created
+		 * on the fly (by the getKey method) using the parameters passed in the JSEncrypt constructor
+		 * @param {string} str the string to encrypt
+		 * @return {string} the encrypted string encoded in base64
+		 * @public
+		 */
+		JSEncrypt.prototype.encrypt = function(str) {
+			// Return the encrypted string.
+			try {
+				return hex2b64(this.getKey().encrypt(str));
+			} catch (ex) {
+				return false;
+			}
+		};
+		/**
+		 * Proxy method for RSAKey object's sign.
+		 * @param {string} str the string to sign
+		 * @param {function} digestMethod hash method
+		 * @param {string} digestName the name of the hash algorithm
+		 * @return {string} the signature encoded in base64
+		 * @public
+		 */
+		JSEncrypt.prototype.sign = function(str, digestMethod, digestName) {
+			// return the RSA signature of 'str' in 'hex' format.
+			try {
+				return hex2b64(this.getKey().sign(str, digestMethod, digestName));
+			} catch (ex) {
+				return false;
+			}
+		};
+		/**
+		 * Proxy method for RSAKey object's verify.
+		 * @param {string} str the string to verify
+		 * @param {string} signature the signature encoded in base64 to compare the string to
+		 * @param {function} digestMethod hash method
+		 * @return {boolean} whether the data and signature match
+		 * @public
+		 */
+		JSEncrypt.prototype.verify = function(str, signature, digestMethod) {
+			// Return the decrypted 'digest' of the signature.
+			try {
+				return this.getKey().verify(str, b64tohex(signature), digestMethod);
+			} catch (ex) {
+				return false;
+			}
+		};
+		/**
+		 * Getter for the current JSEncryptRSAKey object. If it doesn't exists a new object
+		 * will be created and returned
+		 * @param {callback} [cb] the callback to be called if we want the key to be generated
+		 * in an async fashion
+		 * @returns {JSEncryptRSAKey} the JSEncryptRSAKey object
+		 * @public
+		 */
+		JSEncrypt.prototype.getKey = function(cb) {
+			// Only create new if it does not exist.
+			if (!this.key) {
+				// Get a new private key.
+				this.key = new JSEncryptRSAKey();
+				if (cb && {}.toString.call(cb) === "[object Function]") {
+					this.key.generateAsync(this.default_key_size, this.default_public_exponent,
+						cb);
+					return;
+				}
+				// Generate the key.
+				this.key.generate(this.default_key_size, this.default_public_exponent);
+			}
+			return this.key;
+		};
+		/**
+		 * Returns the pem encoded representation of the private key
+		 * If the key doesn't exists a new key will be created
+		 * @returns {string} pem encoded representation of the private key WITH header and footer
+		 * @public
+		 */
+		JSEncrypt.prototype.getPrivateKey = function() {
+			// Return the private representation of this key.
+			return this.getKey().getPrivateKey();
+		};
+		/**
+		 * Returns the pem encoded representation of the private key
+		 * If the key doesn't exists a new key will be created
+		 * @returns {string} pem encoded representation of the private key WITHOUT header and footer
+		 * @public
+		 */
+		JSEncrypt.prototype.getPrivateKeyB64 = function() {
+			// Return the private representation of this key.
+			return this.getKey().getPrivateBaseKeyB64();
+		};
+		/**
+		 * Returns the pem encoded representation of the public key
+		 * If the key doesn't exists a new key will be created
+		 * @returns {string} pem encoded representation of the public key WITH header and footer
+		 * @public
+		 */
+		JSEncrypt.prototype.getPublicKey = function() {
+			// Return the private representation of this key.
+			return this.getKey().getPublicKey();
+		};
+		/**
+		 * Returns the pem encoded representation of the public key
+		 * If the key doesn't exists a new key will be created
+		 * @returns {string} pem encoded representation of the public key WITHOUT header and footer
+		 * @public
+		 */
+		JSEncrypt.prototype.getPublicKeyB64 = function() {
+			// Return the private representation of this key.
+			return this.getKey().getPublicBaseKeyB64();
+		};
+		JSEncrypt.version = "3.0.0-rc.1";
+		return JSEncrypt;
+	}());
+
+	window2.JSEncrypt = JSEncrypt;
+
+	exports.JSEncrypt = JSEncrypt;
+	exports.default = JSEncrypt;
+
+	Object.defineProperty(exports, '__esModule', {
+		value: true
+	});
+
+})));
diff --git a/utils/mork2.js b/utils/mork2.js
new file mode 100644
index 0000000..280c2b3
--- /dev/null
+++ b/utils/mork2.js
@@ -0,0 +1,399 @@
+export const FormTypes = (code) => {
+	let res = [
+		{
+			lable: '收料通知单明细',
+			id: '1778673956455321600',
+			value: 'MRN_DTL'
+		},
+		{
+			lable: '收料通知单',
+			id: '1778676876466851840',
+			value: 'MRN_MST'
+		},
+		{
+			lable: '出入库单主表',
+			id: '1780517070820216832',
+			value: 'st_ivt_iostorinv'
+		}
+	]
+	return res
+}
+export const pmFormData = (code) => {
+	let res = {
+		totalElements: '2',
+		content: [
+			{
+				id: '1813491860891635712',
+				code: 'MV20240717001',
+				proc_inst_id: '1813491872891539456',
+				source_form_id: '',
+				source_form_type: '',
+				source_form_date: '',
+				form_type: 'st_ivt_move',
+				status: '80',
+				remark: '',
+				create_time: '2024-07-17 16:32:07',
+				create_name: '管理员',
+				material_id: null,
+				material_name: null,
+				material_code: '100',
+				material_spec: null,
+				single_weight: null,
+				qty: '0.000',
+				assign_qty: '0.000',
+				unit_id: null,
+				pcsn: null,
+				vehicle_code: null,
+				vehicle_id: null,
+				form_data: {
+					stor_code: 'FStockPallet'
+				},
+				parent_id: null,
+				hasChildren: true
+			}
+		],
+		data: null,
+		code: '200',
+		msg: '查询成功'
+	}
+	return res
+}
+
+export const groupMaterList = () => {
+	let res = {
+		totalElements: '2',
+		content: [
+			{
+				material_id: '1',
+				material_name: null,
+				material_code: '100',
+				material_spec: null,
+				single_weight: null,
+				qty: '0.000',
+				assign_qty: '0.000',
+				unit_id: null,
+				pcsn: null,
+				vehicle_code: '100',
+				vehicle_id: null
+			},
+			{
+				material_id: '2',
+				material_name: null,
+				material_code: '200',
+				material_spec: null,
+				single_weight: null,
+				qty: '0.000',
+				assign_qty: '0.000',
+				unit_id: null,
+				pcsn: null,
+				vehicle_code: null,
+				vehicle_id: null
+			},
+			{
+				material_id: '3',
+				"material_code": "02.03.05.01.00075",
+				"material_name": "密封球",
+				"material_spec": "D377-DQF-E-2150-01",
+				"single_weight": null,
+				"unit_name": null
+			}
+		],
+		data: null,
+		code: '200',
+		msg: '查询成功'
+	}
+	return res
+}
+export const outStorageOrder = () => {
+	let res = [{value: '1', text: 'a'},{"text": "直接调拨单", "value": "STK_TransferDirect"},{"text": "简单领料申请单","value": "ka7c19edf9d4b4b39b8cc4a06802163b0"},{"text": "其他出库单", "value": "STK_MisDelivery"}]
+	return res
+}
+export const outStorageOrderList = (page, size, type) => {
+	let res = {
+	  "totalElements": 10,
+	  "content": [
+		{
+		  "code": "PPBOM241102856",
+		  "form_type": "ka7c19edf9d4b4b39b8cc4a06802163b0",
+		  "remark": "备注",
+		  "create_time": "2024-10-20 21:41:50",
+		  "create_name": "创建人",
+		  "material_code": "04.01.DY.00531",
+		  "qty": 0.0,
+		  "sto_qty": 8888,
+		  "plan_qty": 0.0,
+		  "assign_qty": 0.0,
+		  "unit_name": "单位",
+		  "pcsn": "批次",
+		  "stor_code": "FStockPallet",
+		  "product_area": "A4",
+		  "children": [
+			{
+			  "code": "bbb",
+			  "material_name": "白色插座下线套 (模号587#)（色号12081407乳白）",
+			  "material_code": "物料编码",
+			  "material_spec": "物料类型",
+			  "stor_code": "FStockPallet",
+			  "product_area": "A4",
+			  "qty": 1000.0,
+			  "sto_qty": 99,
+			  "plan_qty": 0.0,
+			  "assign_qty": 0.0,
+			  "unit_name": "单位",
+			  "pcsn": "批次",
+			},
+			{
+			  "code": "CCC",
+			  "material_name": "物料名称",
+			  "material_code": "物料编码",
+			  "material_spec": "物料类型",
+			  "stor_code": "FStockPallet",
+			  "product_area": "A4",
+			  "qty": 1000.0,
+			  "sto_qty": 88,
+			  "plan_qty": 0.0,
+			  "assign_qty": 0.0,
+			  "unit_name": "单位",
+			  "pcsn": "批次"
+			}
+		  ]
+		}
+	  ],
+	  "data": {},
+	  "code": "200",
+	  "msg": ""
+	}
+	return res
+}
+export const outStorageOrderConfirm = (code) => {
+	let res = {
+	  "totalElements": 10,
+	  "content": [
+		{
+		  "code": "PPBOM241102856",
+		  "form_type": "单据类型",
+		  "remark": "备注",
+		  "create_time": "2024-10-20 21:41:50",
+		  "create_name": "创建人",
+		  "material_code": "04.01.DY.00531",
+		  "qty": 0.0,
+		  "sto_qty": 8888,
+		  "plan_qty": 0.0,
+		  "assign_qty": 0.0,
+		  "unit_name": "单位",
+		  "pcsn": "批次",
+		  "stor_code": "FStockPallet",
+		  "product_area": "A4",
+		  "children": [
+			{
+			  "code": "bbb",
+			  "material_name": "白色插座下线套 (模号587#)（色号12081407乳白）",
+			  "material_code": "物料编码",
+			  "material_spec": "物料类型",
+			  "stor_code": "FStockPallet",
+			  "product_area": "A4",
+			  "qty": 10.0,
+			  "sto_qty": 8888,
+			  "plan_qty": 0.0,
+			  "assign_qty": 0.0,
+			  "unit_name": "单位",
+			  "pcsn": "批次",
+			},
+			{
+			  "code": "CCC",
+			  "material_name": "物料名称",
+			  "material_code": "物料编码",
+			  "material_spec": "物料类型",
+			  "stor_code": "FStockPallet",
+			  "product_area": "A4",
+			  "qty": 10.0,
+			  "plan_qty": 0.0,
+			  "assign_qty": 0.0,
+			  "unit_id": "单位",
+			  "pcsn": "批次"
+			}
+		  ]
+		}
+	  ],
+	  "data": {},
+	  "code": "200",
+	  "msg": ""
+	}
+	return res
+}
+export const deviceManageTransf = () => {
+	let res = [{value: '1109', text: '一楼楼入库点'}, {value: '2109', text: '二楼楼入库点'}]
+	return res
+}
+export const structattrPage = () => {
+	let res = {
+	  "totalElements": 10,
+	  "content": [
+		{
+		  "id": '1',
+		  "code": "PPBOM241102856",
+		  "struct_code": "struct_code",
+		  "product_area": "A1",
+		  "vehicle_code": "vehicle_code",
+		  "material_code": "04.01.DY.00531",
+		  "qty": 0.0,
+		  "pcsn": "批次",
+		  "stor_code": "FStockPallet"
+		}
+	  ],
+	  "data": {},
+	  "code": "200",
+	  "msg": ""
+	}
+	return res
+}
+export const getCtuOrderList = () => {
+	let res = {
+		"code": "200",
+		data: 'JDSCLLSQ250500293',
+		content: [{material_name: '1', status: '1'}, {material_name: '2', status: '1'}, {material_name: '3', status: '1'}, {material_name: '4', status: '1'}, {material_name: '5', status: '1'}, {material_name: '6', status: '1'}, {material_name: '7', status: '1'}, {material_name: '8', status: '1'}, {material_name: '9', status: '0'}, {material_name: '10', status: '1'}]
+	}
+	return res
+}
+export const ctuOutConfirm = () => {
+	let res = {
+		"code": "200",
+		msg: 'ok'
+	}
+	return res
+}
+export const getPointStatus = () => {
+	let res = {code: 'a', name: 'ldjlfjl', lock_type: '00'}
+	return res
+}
+export const queryTargetPoint = () => {
+	let res = {
+		code: '200',
+		site_code: 'a102',
+		msg: '查询成功！'
+	}
+	return res
+}
+export const storList = () => {
+	let res = {
+		code: '200',
+		content: [{value: 'FicStockId', label: '虚拟库编码'}, {value: 'FStockId', label: '料箱编码'}, {value: 'FStockPallet', label: '托盘库编码'}]
+	}
+	return res
+}
+export const getBillNoInfo = (id) => {
+	let res = [
+		{
+			code: '订单号1',
+			material_code: '1',
+			material_name: 'material_name',
+			material_spec: 'material_spec',
+			unit_name: 'unit_name',
+			qty: '100',
+			stockOrgId: 'StockOrgId',
+			ownerId_id: 'OwnerId_Id',
+			single_weight: '500',
+			pcsn: 'pcsn',
+			vehicle_code: 'T001',
+			unit_id: 'unit_id'
+		},
+		{
+			code: '订单号2',
+			material_code: '2',
+			material_name: 'material_name',
+			material_spec: 'material_spec',
+			unit_name: 'unit_name',
+			qty: '100',
+			stockOrgId: 'StockOrgId',
+			ownerId_id: 'OwnerId_Id',
+			single_weight: '500',
+			pcsn: 'pcsn',
+			vehicle_code: '0001',
+			unit_id: 'unit_id'
+		}
+	]
+	return res
+}
+export const inStorageOrder = () => {
+	let res = [{value: '1', text: 'a'},{"text": "直接调拨单", "value": "STK_TransferDirect"},{"text": "简单领料申请单","value": "ka7c19edf9d4b4b39b8cc4a06802163b0"},{"text": "其他出库单", "value": "STK_MisDelivery"}]
+	return res
+}
+
+export const inStorageConfirm = () => {
+	let res = {code: '200'}
+	return res
+}
+export const queryPick = () => {
+	let res = {
+	'code': 'a00001',
+	'product_area': 'A2',
+	'stor_code': 'FStockId',
+    "point_code": "001",
+    "material_code": "100001",
+    "material_name": "垃圾了付定金",
+	"material_spec": "垃圾了付定金",
+    "prd_ppbom_no": "20202020",
+    "assign_qty": 6,
+	'qty': 35
+}
+	return res
+}
+export const savePickTask = (data) => {
+	let res = {
+    code: '200',
+	msg: 'ok'
+}
+	return res
+}
+export const queryMaterByVehicleCode = (code) => {
+	let res = {
+		"totalElements": 1,
+		"content": [
+			{
+				"id": "1926551433252048896",
+				"group_id": "1926551433247854592",
+				"stor_code": "FStockPallet",
+				"vehicle_code": "T00000278",
+				"material_id": "985577",
+				"pcsn": "001",
+				"qty": 13.000,
+				"frozen_qty": 0.000,
+				"is_lock": false,
+				"is_delete": false,
+				"unit_id": "100438",
+				"is_check": "1",
+				"parent_vehicle_code": null,
+				"has_child": false,
+				"source_form_type": null,
+				"source_form_id": null,
+				"task_code": "132799",
+				"form_data": {},
+				"update_time": "2025-06-11 21:35:40",
+				"update_name": null,
+				"create_time": "2025-05-25 16:10:29",
+				"create_name": "管理员",
+				"remark": "",
+				"proc_inst_id": null,
+				"prd_ppbom_no": "PPBOM250600121",
+				"need_pick": true,
+				"material_code": "02.03.05.01.00075",
+				"material_name": "密封球(S∅155×116×12×∅100)",
+				"material_spec": "D377-DQF-E-2150-01",
+				"single_weight": null,
+				"unit_name": null
+			}
+		],
+		"data": null,
+		"code": "200",
+		"msg": "查询成功"
+	}
+	return res
+}
+export const getStructCount = (code) => {
+	let res = {
+		d: 100,
+		g: 200,
+		z: 300
+	}
+	return res
+}
\ No newline at end of file
diff --git a/utils/permission.js b/utils/permission.js
new file mode 100644
index 0000000..d9249d9
--- /dev/null
+++ b/utils/permission.js
@@ -0,0 +1,245 @@
+/// null = 未请求，1 = 已允许，0 = 拒绝|受限, 2 = 系统未开启
+
+var isIOS
+
+function album() {
+    var result = 0;
+    var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
+    var authStatus = PHPhotoLibrary.authorizationStatus();
+    if (authStatus === 0) {
+        result = null;
+    } else if (authStatus == 3) {
+        result = 1;
+    } else {
+        result = 0;
+    }
+    plus.ios.deleteObject(PHPhotoLibrary);
+    return result;
+}
+
+function camera() {
+    var result = 0;
+    var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
+    var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
+    if (authStatus === 0) {
+        result = null;
+    } else if (authStatus == 3) {
+        result = 1;
+    } else {
+        result = 0;
+    }
+    plus.ios.deleteObject(AVCaptureDevice);
+    return result;
+}
+
+function location() {
+    var result = 0;
+    var cllocationManger = plus.ios.import("CLLocationManager");
+    var enable = cllocationManger.locationServicesEnabled();
+    var status = cllocationManger.authorizationStatus();
+    if (!enable) {
+        result = 2;
+    } else if (status === 0) {
+        result = null;
+    } else if (status === 3 || status === 4) {
+        result = 1;
+    } else {
+        result = 0;
+    }
+    plus.ios.deleteObject(cllocationManger);
+    return result;
+}
+
+function push() {
+    var result = 0;
+    var UIApplication = plus.ios.import("UIApplication");
+    var app = UIApplication.sharedApplication();
+    var enabledTypes = 0;
+    if (app.currentUserNotificationSettings) {
+        var settings = app.currentUserNotificationSettings();
+        enabledTypes = settings.plusGetAttribute("types");
+        if (enabledTypes == 0) {
+            result = 0;
+            console.log("推送权限没有开启");
+        } else {
+            result = 1;
+            console.log("已经开启推送功能!")
+        }
+        plus.ios.deleteObject(settings);
+    } else {
+        enabledTypes = app.enabledRemoteNotificationTypes();
+        if (enabledTypes == 0) {
+            result = 3;
+            console.log("推送权限没有开启!");
+        } else {
+            result = 4;
+            console.log("已经开启推送功能!")
+        }
+    }
+    plus.ios.deleteObject(app);
+    plus.ios.deleteObject(UIApplication);
+    return result;
+}
+
+function contact() {
+    var result = 0;
+    var CNContactStore = plus.ios.import("CNContactStore");
+    var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
+    if (cnAuthStatus === 0) {
+        result = null;
+    } else if (cnAuthStatus == 3) {
+        result = 1;
+    } else {
+        result = 0;
+    }
+    plus.ios.deleteObject(CNContactStore);
+    return result;
+}
+
+function record() {
+    var result = null;
+    var avaudiosession = plus.ios.import("AVAudioSession");
+    var avaudio = avaudiosession.sharedInstance();
+    var status = avaudio.recordPermission();
+    console.log("permissionStatus:" + status);
+    if (status === 1970168948) {
+        result = null;
+    } else if (status === 1735552628) {
+        result = 1;
+    } else {
+        result = 0;
+    }
+    plus.ios.deleteObject(avaudiosession);
+    return result;
+}
+
+function calendar() {
+    var result = null;
+    var EKEventStore = plus.ios.import("EKEventStore");
+    var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
+    if (ekAuthStatus == 3) {
+        result = 1;
+        console.log("日历权限已经开启");
+    } else {
+        console.log("日历权限没有开启");
+    }
+    plus.ios.deleteObject(EKEventStore);
+    return result;
+}
+
+function memo() {
+    var result = null;
+    var EKEventStore = plus.ios.import("EKEventStore");
+    var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
+    if (ekAuthStatus == 3) {
+        result = 1;
+        console.log("备忘录权限已经开启");
+    } else {
+        console.log("备忘录权限没有开启");
+    }
+    plus.ios.deleteObject(EKEventStore);
+    return result;
+}
+
+
+function requestIOS(permissionID) {
+    return new Promise((resolve, reject) => {
+        switch (permissionID) {
+            case "push":
+                resolve(push());
+                break;
+            case "location":
+                resolve(location());
+                break;
+            case "record":
+                resolve(record());
+                break;
+            case "camera":
+                resolve(camera());
+                break;
+            case "album":
+                resolve(album());
+                break;
+            case "contact":
+                resolve(contact());
+                break;
+            case "calendar":
+                resolve(calendar());
+                break;
+            case "memo":
+                resolve(memo());
+                break;
+            default:
+                resolve(0);
+                break;
+        }
+    });
+}
+
+function requestAndroid(permissionID) {
+    return new Promise((resolve, reject) => {
+        plus.android.requestPermissions(
+            [permissionID],
+            function(resultObj) {
+                var result = 0;
+                for (var i = 0; i < resultObj.granted.length; i++) {
+                    var grantedPermission = resultObj.granted[i];
+                    console.log('已获取的权限：' + grantedPermission);
+                    result = 1
+                }
+                for (var i = 0; i < resultObj.deniedPresent.length; i++) {
+                    var deniedPresentPermission = resultObj.deniedPresent[i];
+                    console.log('拒绝本次申请的权限：' + deniedPresentPermission);
+                    result = 0
+                }
+                for (var i = 0; i < resultObj.deniedAlways.length; i++) {
+                    var deniedAlwaysPermission = resultObj.deniedAlways[i];
+                    console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
+                    result = -1
+                }
+                resolve(result);
+            },
+            function(error) {
+                console.log('result error: ' + error.message)
+                resolve({
+                    code: error.code,
+                    message: error.message
+                });
+            }
+        );
+    });
+}
+
+function gotoAppPermissionSetting() {
+    if (permission.isIOS) {
+        var UIApplication = plus.ios.import("UIApplication");
+        var application2 = UIApplication.sharedApplication();
+        var NSURL2 = plus.ios.import("NSURL");
+        var setting2 = NSURL2.URLWithString("app-settings:");
+        application2.openURL(setting2);
+        plus.ios.deleteObject(setting2);
+        plus.ios.deleteObject(NSURL2);
+        plus.ios.deleteObject(application2);
+    } else {
+        var Intent = plus.android.importClass("android.content.Intent");
+        var Settings = plus.android.importClass("android.provider.Settings");
+        var Uri = plus.android.importClass("android.net.Uri");
+        var mainActivity = plus.android.runtimeMainActivity();
+        var intent = new Intent();
+        intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+        intent.setData(uri);
+        mainActivity.startActivity(intent);
+    }
+}
+
+const permission = {
+    get isIOS(){
+        return typeof isIOS === 'boolean' ? isIOS : (isIOS = uni.getSystemInfoSync().platform === 'ios')
+    },
+    requestIOS: requestIOS,
+    requestAndroid: requestAndroid,
+    gotoAppSetting: gotoAppPermissionSetting
+}
+
+export default permission
diff --git a/utils/request.js b/utils/request.js
new file mode 100644
index 0000000..3c31fe1
--- /dev/null
+++ b/utils/request.js
@@ -0,0 +1,133 @@
+// import qs from 'qs' // 处理data
+import store from '@/vuex/store'
+const request = (params) => {
+	let _self = this;
+	let url = params.url;
+	let method = params.method || 'POST';
+	let data = params.data || {};
+	let acsurl = params.acsurl
+	// data.token = "default-access_token"
+	// if (!params.token) {
+	// 	let token = uni.getStorageSync('token');
+	// 	if (!token) {
+	// 		uni.navigateTo({
+	// 			url: '/pages/login/login'
+	// 		});
+	// 	} else {
+	// 		data.token = '179509245-9c91827e0224bdc18d0b118b8be1b5af';
+	// 	}
+	// }
+	let token = ''
+	if (store.getters.saveToken !== '') {
+		token = store.getters.saveToken
+	}
+	let defaultOpot = {
+		// 'Content-Type': 'application/x-www-form-urlencoded',
+		'Terminal-Type': 'innerH5',
+		'Content-Type': 'application/json;charset=UTF-8',
+	}
+	let header = {}
+	method = method.toUpperCase()
+	if (method == 'POST') {
+		header = {
+			'Content-Type': 'application/json;charset=UTF-8',
+			'Authorization': token
+		}
+		// data = qs.stringify(data)
+	}
+	let requestUrl = `${store.getters.baseUrl}/` + url;
+	if (acsurl) {
+		requestUrl = `${store.getters.acsUrl}/` + url;
+	}
+	uni.showLoading({
+		title: '加载中...'
+	});
+	return new Promise((resolve, reject) => {
+		uni.request({
+				url: requestUrl,
+				method: method,
+				header: Object.assign({}, defaultOpot, header),
+				data: data,
+				dataType: 'json',
+			})
+			.then(res => { // 成功
+				uni.hideLoading();
+				if (res.length === 1) {
+					uni.showModal({
+						content: 'request:fail',
+						showCancel: false
+					})
+					reject('request:fail')
+				} else if (res[1] && res[1].statusCode === 400) {
+					uni.showModal({
+						content: res[1].data.message,
+						showCancel: false
+					})
+					reject(res[1].data.message)
+				} else if (res[1] && res[1].statusCode === 401) {
+					uni.showModal({
+						content: res[1].data.message,
+						showCancel: false
+					})
+					// store.dispatch('delUserInfo', '')
+					// uni.redirectTo({
+					// 	url: '/pages/login/login'
+					// })
+				} else if (res[1] && res[1].statusCode === 200) {
+					let {
+						data: dataType
+					} = res[1]
+					resolve(dataType)
+					// switch (dataType.code * 1) { // 拦截返回参数
+					// 	case 0:
+					// 		resolve(dataType)
+					// 		break;
+					// 	case 1003:
+					// 		uni.showModal({
+					// 			title: '登录已过期',
+					// 			content: '很抱歉，登录已过期，请重新登录',
+					// 			confirmText: '重新登录',
+					// 			success: function(res) {
+					// 				if (res.confirm) {
+					// 					uni.navigateTo({
+					// 						// 切记这儿需要哈pages.json保持一致；不能有.vue后缀
+					// 						url: '/pages/login/login'
+					// 					});
+					// 				} else if (res.cancel) {
+					// 					console.log('用户点击取消');
+					// 				}
+					// 			}
+					// 		})
+					// 		break;
+					// 	case -1:
+					// 		uni.showModal({
+					// 			title: '请求数据失败',
+					// 			content: '获取数据失败！',
+					// 			confirmText: '确定',
+					// 			showCancel: false,
+					// 			success: function(res) {
+					// 				if (res.confirm) {} else if (res.cancel) {
+					// 					console.log('用户点击取消');
+					// 				}
+					// 			}
+					// 		})
+					// 		break
+					// }
+				}else {
+					uni.showModal({
+						content: res[1].data.message,
+						showCancel: false
+					})
+					reject(res[1].data.message)
+				}
+			})
+			.catch(err => { // 错误
+				uni.hideLoading();
+				reject(err)
+			})
+			.finally(() => {
+				// uni.hideLoading();
+			})
+	})
+}
+export default request
\ No newline at end of file
diff --git a/utils/utils.js b/utils/utils.js
new file mode 100644
index 0000000..6f94817
--- /dev/null
+++ b/utils/utils.js
@@ -0,0 +1,39 @@
+/**
+ * yy-mm-dd
+ */
+export const dateFtt = date => {
+    if (date == null) {
+      return ''
+    }
+    let year = date.getFullYear()
+    let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+    let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+    return `${year}-${month}-${day}`
+  }
+  
+  /**
+   * yy-mm-dd hh:mm:ss
+   */
+  export const dateTimeFtt = date => {
+    if (date == null) {
+      return ''
+    }
+    let year = date.getFullYear()
+    let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+    let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+    let hh = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+    let mm = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+    let ss = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+    return `${year}-${month}-${day} ${hh}:${mm}:${ss}`
+  }
+  
+  /**
+   * 将字符串形式的日期转换成日期对象
+   */
+  export const dateNew = date => {
+    if (date === undefined || date === 'undefined') {
+      return new Date()
+    }
+    return new Date(Date.parse(date))
+  }
+  
\ No newline at end of file
diff --git a/vuex/modules/data.js b/vuex/modules/data.js
new file mode 100644
index 0000000..e2914f9
--- /dev/null
+++ b/vuex/modules/data.js
@@ -0,0 +1,31 @@
+import * as types from '../types'
+const state = {
+	publicObj: '',
+	publicArr: ''
+}
+const getters = {
+	publicObj: state => state.publicObj,
+	publicArr: state => state.publicArr
+}
+const actions = {
+  setPublicObj ({commit}, res) {
+    commit(types.PUBLIC_OBJ, res)
+  },
+  setPublicArr ({commit}, res) {
+    commit(types.PUBLIC_ARR, res)
+  }
+}
+const mutations = {
+	[types.PUBLIC_OBJ] (state, res) {
+	  state.publicObj = res
+	},
+	[types.PUBLIC_ARR] (state, res) {
+	state.publicArr = res
+	}
+}
+export default {
+  state,
+  getters,
+  actions,
+  mutations
+}
\ No newline at end of file
diff --git a/vuex/modules/user.js b/vuex/modules/user.js
new file mode 100644
index 0000000..502d21b
--- /dev/null
+++ b/vuex/modules/user.js
@@ -0,0 +1,88 @@
+import * as types from '../types'
+
+const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.49:8099' : 'http://192.168.10.49:8099'
+const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.18.250:8012' : 'http://192.168.18.250:8012'
+const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.162:8010' : 'http://192.168.81.162:8010'
+const state = {
+	baseUrl: uni.getStorageSync('baseUrl') || baseUrl,
+	acsUrl: uni.getStorageSync('acsUrl') || acsUrl,
+	printUrl: uni.getStorageSync('printUrl') || printUrl,
+	setTime: uni.getStorageSync('setTime') || 5000,
+	setPrintName: uni.getStorageSync('setPrintName') || '',
+	loginName: uni.getStorageSync('loginName') ? uni.getStorageSync('loginName') : '',
+	userInfo: uni.getStorageSync('userInfo') ? uni.getStorageSync('userInfo') : '',
+	saveToken: uni.getStorageSync('saveToken') || ''
+}
+const getters = {
+	baseUrl: state => state.baseUrl,
+	acsUrl: state => state.acsUrl,
+	printUrl: state => state.printUrl,
+    setTime: state => state.setTime,
+    setPrintName: state => state.setPrintName,
+	loginName: state => state.loginName,
+	userInfo: state => state.userInfo,
+	saveToken: state => state.saveToken
+}
+const actions = {
+	setConfig ({commit}, res) {
+	    uni.setStorageSync('baseUrl', res.baseUrl)
+		uni.setStorageSync('acsUrl', res.acsUrl)
+		uni.setStorageSync('printUrl', res.printUrl)
+	    uni.setStorageSync('setTime', res.setTime)
+	    uni.setStorageSync('setPrintName', res.setPrintName)
+	    commit(types.COM_CONFIG, res)
+	  },
+	saveLoginName({commit}, res) {
+		uni.setStorageSync('loginName', res)
+		commit(types.SAVE_LOGIN_NAME, res)
+	},
+	delLoginName({commit}, res) {
+		uni.clearStorageSync('loginName')
+		commit(types.DEL_LOGIN_NAME, res)
+	},
+	saveUserInfo({commit}, res) {
+		uni.setStorageSync('userInfo', res)
+		commit(types.SAVE_USER_INFO, res)
+	},
+	delUserInfo({commit}, res) {
+		uni.removeStorageSync('userInfo')
+		uni.removeStorageSync('saveToken')
+		commit(types.DEL_USER_INFO, res)
+	},
+	saveToken({commit}, res) {
+		uni.setStorageSync('saveToken', res)
+		commit(types.SAVE_TOKEN, res)
+	}
+}
+const mutations = {
+	[types.COM_CONFIG] (state, res) {
+	    state.baseUrl = res.baseUrl
+		state.acsUrl = res.acsUrl
+		state.printUrl = res.printUrl
+	    state.setTime = res.setTime
+	    state.setPrintName = res.setPrintName
+	},
+	[types.SAVE_LOGIN_NAME] (state, res) {
+	    state.loginName = res
+	},
+	[types.DEL_LOGIN_NAME] (state, res) {
+		state.loginName = res
+	},
+	[types.SAVE_USER_INFO] (state, res) {
+		state.userInfo = res
+	},
+	[types.DEL_USER_INFO] (state, res) {
+		state.userInfo = res
+		state.saveToken = res
+	},
+	[types.SAVE_TOKEN] (state, res) {
+		state.saveToken = res
+	}
+}
+
+export default {
+  state,
+  getters,
+  actions,
+  mutations
+}
\ No newline at end of file
diff --git a/vuex/store.js b/vuex/store.js
new file mode 100644
index 0000000..f8cd813
--- /dev/null
+++ b/vuex/store.js
@@ -0,0 +1,14 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+
+import user from './modules/user'
+import data from './modules/data'
+
+Vue.use(Vuex)
+
+export default new Vuex.Store({
+  modules: {
+    user,
+	data
+  }
+})
diff --git a/vuex/types.js b/vuex/types.js
new file mode 100644
index 0000000..e66f0dc
--- /dev/null
+++ b/vuex/types.js
@@ -0,0 +1,14 @@
+/**
+ * user
+ */
+export const SAVE_LOGIN_NAME = 'SAVE_LOGIN_NAME'
+export const DEL_LOGIN_NAME = 'DEL_LOGIN_NAME'
+export const COM_CONFIG = 'COM_CONFIG'
+export const SAVE_USER_INFO = 'SAVE_USER_INFO'
+export const DEL_USER_INFO = 'DEL_USER_INFO'
+export const SAVE_TOKEN = 'SAVE_TOKEN'
+/**
+ * data
+ */
+export const PUBLIC_OBJ = 'PUBLIC_OBJ'
+export const PUBLIC_ARR = 'PUBLIC_ARR'
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 0000000..9370773
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,8 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+jsencrypt@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jsencrypt/-/jsencrypt-3.2.1.tgz#09766983cc760088ff26b12fe7e574252af97727"
+  integrity sha512-k1sD5QV0KPn+D8uG9AdGzTQuamt82QZ3A3l6f7TRwMU6Oi2Vg0BsL+wZIQBONcraO1pc78ExMdvmBBJ8WhNYUA==