diff --git a/README.md b/README.md
index f00b800..12e3f99 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 # 注意事项
 + 原生APP云打包使用自有证书
 + 证书别名：testalias
-+ 接口线上地址：https://apifox.com/apidoc/shared-a365d40f-4236-45de-972d-58ce2435c7b4/api-145311043
\ No newline at end of file
++ 接口线上地址：https://apifox.com/apidoc/shared-3b67df3b-411c-4dd4-9752-f9b71898ee7d/api-150208183
\ No newline at end of file
diff --git a/common/style/layout.css b/common/style/layout.css
index 54812ae..902f8e2 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -67,10 +67,10 @@ uni-button:after {
 	color: #fff;
 }
 .icon_scan {
-	width: 42rpx;
-	height: 48rpx;
-	font-size: 40rpx;
-	line-height: 48rpx;
+	width: 60rpx;
+	height: 80rpx;
+	font-size: 48rpx;
+	line-height: 80rpx;
 	color: #323232;
 	text-align: center;
 }
@@ -149,39 +149,49 @@ uni-button:after {
 	height: auto;
 	background-color: #fff;
 	border-radius: 24rpx;
-	padding: 22rpx 14rpx;
+	padding: 22rpx;
 	margin-bottom: 20rpx;
 	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
 }
-.filter_item {
-	display: flex;
-	align-items: center;
-	width: 100%;
-	margin-bottom: 10rpx;
-}
-.filter_item:last-child {
-	margin-bottom: 0;
-}
-.filter_label_wraper {
-	flex: none;
-	width: 140rpx;
-	text-align:justify;
-	text-align-last: justify;
-	text-justify: inter-ideograph;/*兼容ie*/
-}
 .filter_label {
 	display: block;
-	width: 140rpx;
 	line-height: 80rpx;
 	font-size: 28rpx;
 	color: #323232;
 	font-weight: bold;
-	text-align:justify;
+	letter-spacing: 4rpx;
+	/* text-align:justify;
 	text-align-last: justify;
-	text-justify: inter-ideograph;/*兼容ie*/
+	text-justify: inter-ideograph; */
 }
-.filter_label_1 {
-	line-height: 30rpx;
+/** 筛选选择器样式 */
+.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: 80rpx;
+	border: 0;
+	background-color: transparent;
+	font-size: 28rpx;
+	color: #606266;
+}
+.filter_input_disabled {
+	background-color: #eee;
 }
 .filter_search {
 	width: 100rpx;
@@ -210,29 +220,6 @@ uni-button:after {
 	justify-content: flex-start;
 	align-items: center;
 }
-.filter_input_wraper_1 {
-	height: 30rpx;
-}
-.filter_input_wraper_inn_text {
-	line-height: 30rpx;
-	font-size: 28rpx;
-	color: #606266;
-}
-.filter_input {
-	width: 100%;
-	height: 70rpx;
-	line-height: 70rpx;
-	border: 1px solid #dcdfe6;
-	background-color: #fff;
-	padding: 0 15rpx;
-	font-size: 28rpx;
-	color: #606266;
-	border-radius: 10rpx;
-}
-.filter_input_disabled {
-	background-color: #eee;
-}
-
 .grid-wraper {
 	width: 100%;
 }
@@ -289,23 +276,6 @@ uni-button:after {
 
 /** 提交栏 **/
 .submit-bar {
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: flex-end;
-	align-items: center;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	width: 100%;
-	z-index: 200;
-	background-color: #fff;
-	padding-top: 20rpx;
-	box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
-}
-.submit-bar_new {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
 	position: fixed;
 	bottom: 0;
 	left: 0;
@@ -315,29 +285,33 @@ uni-button:after {
 	padding: 14rpx;
 	box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
 }
-.submit-button {
+.button-default {
 	font-size: 34rpx;
 	line-height: 88rpx;
 	color: #ff6a00;
 	text-align: center;
-	letter-spacing: 1rpx;
-	padding: 0 22rpx;
+	letter-spacing: 4rpx;
+	padding: 0;
 	background-color: #fff;
-	border: 1px solid #ff6a00;
-	margin: 0 40rpx 20rpx 0;
+	border: 2rpx solid #ff6a00;
 	border-radius: 10rpx;
 }
-.submit-button_new {
-	/* width: 35%; */
+.button-primary {
 	font-size: 34rpx;
 	line-height: 88rpx;
 	color: #fff;
 	text-align: center;
-	letter-spacing: 1rpx;
+	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;
+}
 .submit-more {
 	width: 20%;
 	font-size: 34rpx;
@@ -347,11 +321,6 @@ uni-button:after {
 	text-align: center;
 	background-color: #fff
 }
-.btn-disabled, .submit-button[disabled] {
-	background-color: #c9c9c9 !important;
-	border: 1px solid #c9c9c9 !important;
-	color: #fff !important;
-}
 .more_btns_wraper {
 	position: fixed;
 	bottom: 0;
diff --git a/common/style/reset.css b/common/style/reset.css
index 4273edf..3e1befa 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -52,6 +52,7 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 }
 
 .zd-row {
+	width: 100%;
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
@@ -128,6 +129,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 .zd-col-1 {
     width: 4.16667%
 }
+.border-bottom {
+	border-bottom: 1rpx solid #e5e5e5;
+}
 .mgb10 {
 	margin-bottom: 10rpx;
 }
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index e0d75fc..599d1cb 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -2,15 +2,15 @@
 	<view class="search_wraper">
 		<input 
 		type="text" 
-		class="filter_input search_input" 
+		class="filter_input pdr110" 
 		:value="value"
 		:focus="focusState"
 		@blur="handleBlur($event)"
 		@input="handleChange($event)">
 		<view class="buttons_wraper">
-			<view class="iconfont icon_del" @tap="toDel">&#xe6dc;</view>
+			<!-- <view class="iconfont icon_del" @tap="toDel">&#xe6dc;</view> -->
 			<view class="iconfont icon_scan" :class="{'icon_scan_active': focusState === true}" @tap="toScan">&#xe6e2;</view>
-			<view class="iconfont icon_phone" @tap="toPhone">&#xe663;</view>
+			<view class="iconfont icon_scan" @tap="toPhone">&#xe663;</view>
 			<view v-show="seaShow" class="iconfont icon_search" @tap="toSearch">&#xe6e1;</view>
 		</view>
 	</view>
@@ -129,9 +129,9 @@
 @import '../common/style/mixin.styl';
 .search_wraper
 	position relative
-	_wh(100%, 70rpx)
-.search_input
-	padding-right: 160rpx;
+	_wh(100%, 80rpx)
+.pdr110
+	padding-right: 110rpx;
 .buttons_wraper
 	position absolute
 	top 0
diff --git a/components/SearchBox1.vue b/components/SearchBox1.vue
index 63134f7..f5c42b0 100644
--- a/components/SearchBox1.vue
+++ b/components/SearchBox1.vue
@@ -2,7 +2,7 @@
 	<view class="search_wraper">
 		<input 
 		type="text" 
-		class="filter_input search_input" 
+		class="filter_input pdr160" 
 		:value="value"
 		:focus="focused"
 		@input="handleChange($event)">
@@ -100,7 +100,7 @@
 .search_wraper
 	position relative
 	_wh(100%, 70rpx)
-.search_input
+.pdr160
 	padding-right: 160rpx;
 .buttons_wraper
 	position absolute
diff --git a/components/SearchBoxMx.vue b/components/SearchBoxMx.vue
index 6b0a818..a8abadb 100644
--- a/components/SearchBoxMx.vue
+++ b/components/SearchBoxMx.vue
@@ -75,7 +75,7 @@
 .search_wraper
 	position relative
 	_wh(100%, 70rpx)
-.search_input
+.pdr160
 	padding-right: 160rpx;
 .buttons_wraper
 	position absolute
diff --git a/pages.json b/pages.json
index 5e6856b..549a551 100644
--- a/pages.json
+++ b/pages.json
@@ -72,6 +72,22 @@
 		    }
 		    
 		}
+        ,{
+            "path" : "pages/manage/empty-tray-out",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/empty-tray-in",
+            "style" :                                                                                    
+            {
+               "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 194aaca..7be49fc 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -44,8 +44,8 @@
 					]}
 				],
 				menuList1: [
-					{id: 1, title: '空托盘出库', icon: 'RF01', path: ''},
-					{id: 2, title: '空托盘入库', icon: 'RF02', path: ''},
+					{id: 1, title: '空托盘出库', icon: 'RF01', path: '/pages/manage/empty-tray-out'},
+					{id: 2, title: '空托盘入库', icon: 'RF02', path: '/pages/manage/empty-tray-in'},
 					{id: 3, title: '组盘入库', icon: 'RF03', path: ''},
 					{id: 4, title: '原料出库', icon: 'RF04', path: ''},
 					{id: 5, title: '生产下料', icon: 'RF05', path: ''},
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index a6e0bac..624398e 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -3,27 +3,22 @@
 		<nav-bar title="设置" :inner2="true" @goIn="goIn" :show1="false"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="input-wrap">
-					<view class="input-label">服务器地址</view>
+				<view class="setup-item">
+					<view class="setup-label">服务器地址</view>
 					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
 				</view>
-			</view>
-			<view class="zd_wrapper">
-				<view class="input-wrap">
-					<view class="input-label">打印地址</view>
+				<view class="setup-item">
+					<view class="setup-label">打印地址</view>
 					<input type="text" class="setup-input" placeholder="请输入打印地址" v-model="printip">
 				</view>
-			</view>
-			<view class="zd_wrapper">
-				<view class="input-wrap">
-					<view class="input-label">刷新时间(s)</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>
-		<view class="submit-bar">
-		  <button class="submit-button" @click="_submit">确认</button>
-		  <button class="submit-button" @click="_virtualprintType">查询</button>
+		<view class="zd-row submit-bar">
+		  <button class="zd-col-24 button-primary" @click="_submit">确认</button>
 		</view>
 	</view>
 </template>
@@ -81,15 +76,16 @@
 
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
-.input-wrap
+.setup-item
 	width 100%
-	_fj()
-.input-label
-	wh(200rpx, 58rpx)
-	_font(28rpx,58rpx,#464646)
+	margin-bottom 40rpx
+.setup-label
+	_font(24rpx,40rpx,#000)
 .setup-input
-	_wh(calc(100% - 200rpx), 58rpx)
+	_wh(100%, 80rpx)
 	background #fff
-	_font(28rpx,58rpx,#323232)
-	padding 0 10rpx
+	_font(28rpx,80rpx,#323232)
+	padding 0 28rpx
+	border 2px solid #e9ecf3
+	border-radius 12rpx
 </style>
diff --git a/pages/manage/empty-tray-in.vue b/pages/manage/empty-tray-in.vue
new file mode 100644
index 0000000..a9ab1d3
--- /dev/null
+++ b/pages/manage/empty-tray-in.vue
@@ -0,0 +1,101 @@
+<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-5">
+						<span class="filter_label">载具类型</span>
+					</view>
+					<view class="zd-col-19 filter_picker">
+						<picker @change="pickerChange" :value="index1" :range="options1" range-key="text">
+							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-19">
+						<input type="text" class="filter_input" v-model="val2">
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">点位编码</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-11 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': index1 === '' || !val1 || !val2}" :disabled="disabled" @tap="_emptyInStore">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getVehicleType, emptyInStore} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				options1: [],
+				index1: '',
+				val1: '',
+				val2: '',
+				disabled: false
+			};
+		},
+		created () {
+			this._getVehicleType()
+		},
+		methods: {
+			/** 载具类型下拉框 */
+			async _getVehicleType () {
+				let res = await getVehicleType()
+				this.options1 = [...res]
+			},
+			pickerChange (e) {
+				this.index1 = e.detail.value
+			},
+			async _emptyInStore () {
+				this.disabled = true
+				if (!this.val1 || this.index1 === '' || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await emptyInStore(this.options1[this.index1].value, this.val2, this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.val1 = ''
+				this.val2 = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/manage/empty-tray-out.vue b/pages/manage/empty-tray-out.vue
new file mode 100644
index 0000000..23e8955
--- /dev/null
+++ b/pages/manage/empty-tray-out.vue
@@ -0,0 +1,101 @@
+<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-5">
+						<span class="filter_label">载具类型</span>
+					</view>
+					<view class="zd-col-19 filter_picker">
+						<picker @change="pickerChange" :value="index1" :range="options1" range-key="text">
+							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
+						</picker>
+					</view>
+				</view>
+				<!-- <view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">点位编码</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
+					</view>
+				</view> -->
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">点位编码</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-11 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': index1 === '' || !val1}" :disabled="disabled" @tap="_callEmptyVehicle">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getVehicleType, callEmptyVehicle} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				options1: [],
+				index1: '',
+				// options2: [],
+				// index2: '',
+				val1: '',
+				disabled: false
+			};
+		},
+		created () {
+			this._getVehicleType()
+		},
+		methods: {
+			/** 载具类型下拉框 */
+			async _getVehicleType () {
+				let res = await getVehicleType()
+				this.options1 = [...res]
+			},
+			pickerChange (e) {
+				this.index1 = e.detail.value
+			},
+			async _callEmptyVehicle () {
+				this.disabled = true
+				if (!this.val1 || this.index1 === '') {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await callEmptyVehicle(this.options1[this.index1].value, this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.val1 = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
index 6449885..620ab02 100644
--- a/uni_modules/uni-icons/changelog.md
+++ b/uni_modules/uni-icons/changelog.md
@@ -1,3 +1,21 @@
+## 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）
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
index a87f68e..9634a9c 100644
--- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -1,24 +1,28 @@
-<template>
-	<!-- #ifdef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
-	<!-- #endif -->
-	<!-- #ifndef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+<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 icons from './icons.js';
-	const getVal = (val) => {
-		const reg = /^[0-9]*$/g
-		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
-	} 
+	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+"')"
+		'src': "url('" + iconUrl + "')"
 	});
 	// #endif
 
@@ -28,13 +32,13 @@
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
 	 * @property {Number} size 图标大小
 	 * @property {String} type 图标图案，参考示例
-	 * @property {String} color 图标颜色
-	 * @property {String} customPrefix 自定义图标
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
 	 * @event {Function} click 点击 Icon 触发事件
 	 */
 	export default {
 		name: 'UniIcons',
-		emits:['click'],
+		emits: ['click'],
 		props: {
 			type: {
 				type: String,
@@ -47,28 +51,38 @@
 			size: {
 				type: [Number, String],
 				default: 16
-			},
-			customPrefix:{
-				type: String,
-				default: ''
+			},
+			customPrefix: {
+				type: String,
+				default: ''
+			},
+			fontFamily: {
+				type: String,
+				default: ''
 			}
 		},
 		data() {
 			return {
-				icons: icons.glyphs
+				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};`
 			}
-		},
-		computed:{
-			unicode(){
-				let code = this.icons.find(v=>v.font_class === this.type)
-				if(code){
-					return unescape(`%u${code.unicode}`)
-				}
-				return ''
-			},
-			iconSize(){
-				return getVal(this.size)
-			}
 		},
 		methods: {
 			_onClick() {
@@ -78,19 +92,19 @@
 	}
 </script>
 
-<style lang="scss">
-	/* #ifndef APP-NVUE */
+<style lang="scss">
+	/* #ifndef APP-NVUE */
 	@import './uniicons.css';
+
 	@font-face {
 		font-family: uniicons;
-		src: url('./uniicons.ttf') format('truetype');
+		src: url('./uniicons.ttf');
 	}
 
-	/* #endif */
+	/* #endif */
 	.uni-icons {
 		font-family: uniicons;
 		text-decoration: none;
 		text-align: center;
 	}
-
 </style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
index 2f56eab..0a6b6fe 100644
--- a/uni_modules/uni-icons/components/uni-icons/uniicons.css
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -1,3 +1,12 @@
+
+.uniui-cart-filled:before {
+  content: "\e6d0";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
 .uniui-color:before {
   content: "\e6cf";
 }
@@ -58,10 +67,6 @@
   content: "\e6c3";
 }
 
-.uniui-gift-filled:before {
-  content: "\e6c4";
-}
-
 .uniui-fire-filled:before {
   content: "\e6c5";
 }
@@ -82,6 +87,18 @@
   content: "\e698";
 }
 
+.uniui-arrowthinleft:before {
+  content: "\e6d2";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6d3";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6d4";
+}
+
 .uniui-back:before {
   content: "\e6b9";
 }
@@ -94,55 +111,43 @@
   content: "\e6bb";
 }
 
-.uniui-arrowthinright:before {
-  content: "\e6bb";
-}
-
 .uniui-arrow-left:before {
   content: "\e6bc";
 }
 
-.uniui-arrowthinleft:before {
-  content: "\e6bc";
-}
-
 .uniui-arrow-up:before {
   content: "\e6bd";
 }
 
-.uniui-arrowthinup:before {
-  content: "\e6bd";
-}
-
 .uniui-arrow-down:before {
   content: "\e6be";
 }
 
-.uniui-arrowthindown:before {
-  content: "\e6be";
+.uniui-arrowthinright:before {
+  content: "\e6d1";
+}
+
+.uniui-down:before {
+  content: "\e6b8";
 }
 
 .uniui-bottom:before {
   content: "\e6b8";
 }
 
-.uniui-arrowdown:before {
-  content: "\e6b8";
+.uniui-arrowright:before {
+  content: "\e6d5";
 }
 
 .uniui-right:before {
   content: "\e6b5";
 }
 
-.uniui-arrowright:before {
-  content: "\e6b5";
-}
-
-.uniui-top:before {
+.uniui-up:before {
   content: "\e6b6";
 }
 
-.uniui-arrowup:before {
+.uniui-top:before {
   content: "\e6b6";
 }
 
@@ -150,8 +155,8 @@
   content: "\e6b7";
 }
 
-.uniui-arrowleft:before {
-  content: "\e6b7";
+.uniui-arrowup:before {
+  content: "\e6d6";
 }
 
 .uniui-eye:before {
@@ -638,10 +643,6 @@
   content: "\e627";
 }
 
-.uniui-cart-filled:before {
-  content: "\e629";
-}
-
 .uniui-checkbox:before {
   content: "\e62b";
 }
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
index 835f33b..14696d0 100644
Binary files a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf 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
index d1c4e77..397be83 100644
--- a/uni_modules/uni-icons/package.json
+++ b/uni_modules/uni-icons/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "1.3.5",
+  "version": "2.0.9",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",
@@ -16,11 +16,7 @@
   "directories": {
     "example": "../../temps/example_temps"
   },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
+"dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -37,7 +33,8 @@
       "data": "无",
       "permissions": "无"
     },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
   },
   "uni_modules": {
     "dependencies": ["uni-scss"],
@@ -50,7 +47,8 @@
       "client": {
         "App": {
           "app-vue": "y",
-          "app-nvue": "y"
+          "app-nvue": "y",
+          "app-uvue": "y"
         },
         "H5-mobile": {
           "Safari": "y",
@@ -70,11 +68,15 @@
           "阿里": "y",
           "百度": "y",
           "字节跳动": "y",
-          "QQ": "y"
+          "QQ": "y",
+					"钉钉": "y",
+					"快手": "y",
+					"飞书": "y",
+					"京东": "y"
         },
         "快应用": {
-          "华为": "u",
-          "联盟": "u"
+          "华为": "y",
+          "联盟": "y"
         },
         "Vue": {
             "vue2": "y",
@@ -83,4 +85,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
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..d832751
--- /dev/null
+++ b/uni_modules/zxz-uni-data-select/changelog.md
@@ -0,0 +1,35 @@
+## 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..490b09e
--- /dev/null
+++ b/uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue
@@ -0,0 +1,759 @@
+<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
+					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..d73644b
--- /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.12",
+  "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/getData2.js b/utils/getData2.js
index 88c401c..e473484 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -21,14 +21,51 @@ export const handLogin = (user, password) => request({
 		password: password
 	}
 })
-
-// 测试状态码报错接口
-export const handRequest = () => request({
-	url:'getInfo/4',
-	data: {}
+/**
+ * 空托盘出库
+ */
+// 1.1获取载具类型
+// export const getVehicleType = () => request({
+// 	url:'api/pda/group/getVehicleType',
+// 	data: {}
+// })
+export const getVehicleType = () => {
+	let res = [
+    {
+        "value": "LZ",
+        "text": "料盅"
+    },
+    {
+        "value": "GTP",
+        "text": "钢托盘"
+    },
+    {
+        "value": "1",
+        "text": "木托盘"
+    }
+]
+	return res
+}
+// 1.2空托盘出库确认
+export const callEmptyVehicle = (type, code) => request({
+	url:'api/pda/callEmptyVehicle',
+	data: {
+		vehicle_type: type,
+		point_code: code
+	}
+})
+/**
+ * 空托盘入库
+ */
+// 1.1空托盘入库确认
+export const emptyInStore = (type, vcode, code) => request({
+	url:'api/pda/emptyInStore',
+	data: {
+		vehicle_type: type,
+		vehicle_code: vcode,
+		point_code: code
+	}
 })
-
-
 /**
  * 任务流转
  */
@@ -98,13 +135,7 @@ export const queryPoints = (type) => request({
 // ]
 // 	return res
 // }
-// 1.2呼叫空托
-export const callEmptyVehicle = (code) => request({
-	url:'api/pda/callEmptyVehicle',
-	data: {
-		point_code: code
-	}
-})
+
 //1.3满托入库
 export const fullVehicleIn = (code) => request({
 	url:'api/pda/fullVehicleIn',
@@ -165,31 +196,7 @@ export const fullVehicleOutConfirm = (code, vcode, num) => request({
 	}
 })
 
-/**
- * 人工组盘
- */
-// 1.1获取载具类型
-export const getVehicleType = () => request({
-	url:'api/pda/group/getVehicleType',
-	data: {}
-})
-// export const getVehicleType = () => {
-// 	let res = [
-//     {
-//         "value": "LZ",
-//         "text": "料盅"
-//     },
-//     {
-//         "value": "GTP",
-//         "text": "钢托盘"
-//     },
-//     {
-//         "value": "1",
-//         "text": "木托盘"
-//     }
-// ]
-// 	return res
-// }
+
 // 1.2获取物料信息
 export const queryMaterial = () => request({
 	url:'api/pda/queryMaterial',