From d1da79c75b7445ae9471b208f237e67f017ea799 Mon Sep 17 00:00:00 2001
From: Admin <2310393060@qq.com>
Date: Mon, 26 Jul 2021 22:52:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9vue3...=E5=BE=85=E7=BB=AD?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |   2 +-
 pages/ucenter/ucenter.vue                     |   4 +-
 .../uni_modules/uni-badge/changelog.md        |   6 -
 .../components/uni-badge/uni-badge.vue        | 159 ---
 .../uni_modules/uni-badge/package.json        |  83 --
 .../uni_modules/uni-badge/readme.md           |  45 -
 .../uni_modules/uni-dateformat/changelog.md   |   3 -
 .../components/uni-dateformat/date-format.js  | 191 ----
 .../uni-dateformat/uni-dateformat.vue         |  90 --
 .../uni_modules/uni-dateformat/package.json   |  83 --
 .../uni_modules/uni-dateformat/readme.md      |  71 --
 .../uni-datetime-picker/changelog.md          |  13 -
 .../uni-datetime-picker/basic/calendar.js     | 546 -----------
 .../components/time-picker/keypress.js        |  45 -
 .../components/time-picker/time-picker.vue    | 924 ------------------
 .../basic/uni-calendar-item.vue               | 183 ----
 .../basic/uni-calendar.vue                    | 760 --------------
 .../uni-datetime-picker/basic/util.js         | 408 --------
 .../uni-datetime-picker/icon/cale-50.png      | Bin 673 -> 0 bytes
 .../uni-datetime-picker.vue                   | 780 ---------------
 .../uni-datetime-picker/package.json          |  82 --
 .../uni_modules/uni-datetime-picker/readme.md |  62 --
 .../uni_modules/uni-easyinput/changelog.md    |   7 -
 .../components/uni-easyinput/common.js        |  56 --
 .../uni-easyinput/uni-easyinput.vue           | 425 --------
 .../uni_modules/uni-easyinput/package.json    |  83 --
 .../uni_modules/uni-easyinput/readme.md       | 194 ----
 .../uni_modules/uni-fab/changelog.md          |   4 -
 .../uni-fab/components/uni-fab/uni-fab.vue    | 447 ---------
 .../components/uni-fab/uni-fab.vue.bak        | 383 --------
 .../uni_modules/uni-fab/package.json          |  82 --
 .../uni_modules/uni-fab/readme.md             |  84 --
 .../uni_modules/uni-file-picker/changelog.md  |   9 -
 .../uni-file-picker/choose-and-upload-file.js | 186 ----
 .../uni-file-picker/uni-file-picker.vue       | 669 -------------
 .../uni-file-picker/upload-file.vue           | 324 ------
 .../uni-file-picker/upload-image.vue          | 289 ------
 .../uni_modules/uni-file-picker/package.json  |  82 --
 .../uni_modules/uni-file-picker/readme.md     | 296 ------
 .../uni_modules/uni-forms/changelog.md        |  10 -
 .../uni-forms-item/uni-forms-item.vue         | 453 ---------
 .../components/uni-forms/uni-forms.vue        | 456 ---------
 .../components/uni-forms/validate.js          | 472 ---------
 .../uni_modules/uni-forms/package.json        |  86 --
 .../uni_modules/uni-forms/readme.md           | 535 ----------
 .../uni_modules/uni-group/changelog.md        |   3 -
 .../components/uni-group/uni-group.vue        | 128 ---
 .../uni_modules/uni-group/package.json        |  82 --
 .../uni_modules/uni-group/readme.md           |  48 -
 .../uni_modules/uni-icons/changelog.md        |   2 -
 .../uni-icons/components/uni-icons/icons.js   | 132 ---
 .../components/uni-icons/uni-icons.vue        |  71 --
 .../uni-icons/components/uni-icons/uni.ttf    | Bin 26164 -> 0 bytes
 .../uni_modules/uni-icons/package.json        |  81 --
 .../uni_modules/uni-icons/readme.md           |  43 -
 .../uni_modules/uni-link/changelog.md         |   4 -
 .../uni-link/components/uni-link/uni-link.vue | 111 ---
 .../uni_modules/uni-link/package.json         |  82 --
 .../uni_modules/uni-link/readme.md            |  41 -
 .../uni_modules/uni-list/changelog.md         |   5 -
 .../components/uni-list-ad/uni-list-ad.vue    | 107 --
 .../uni-list-chat/uni-list-chat.scss          |  58 --
 .../uni-list-chat/uni-list-chat.vue           | 533 ----------
 .../uni-list-item/uni-list-item.vue           | 440 ---------
 .../uni-list/components/uni-list/uni-list.vue | 106 --
 .../components/uni-list/uni-refresh.vue       |  65 --
 .../components/uni-list/uni-refresh.wxs       |  87 --
 .../uni_modules/uni-list/package.json         |  85 --
 .../uni_modules/uni-list/readme.md            | 340 -------
 .../uni_modules/uni-load-more/changelog.md    |   4 -
 .../uni-load-more/uni-load-more.vue           | 362 -------
 .../uni_modules/uni-load-more/package.json    |  82 --
 .../uni_modules/uni-load-more/readme.md       |  65 --
 uni_modules/uni-file-picker/changelog.md      |   6 +-
 .../uni-file-picker/choose-and-upload-file.js |   2 +-
 .../uni-file-picker/uni-file-picker.vue       |  12 +-
 uni_modules/uni-file-picker/package.json      | 159 ++-
 uni_modules/uni-file-picker/readme.md         |   2 +-
 .../uni-id-cf/package-lock.json               |   1 -
 .../common/uni-id/package-lock.json           |  19 +-
 80 files changed, 95 insertions(+), 13445 deletions(-)
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-badge/changelog.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-badge/package.json
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-badge/readme.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-dateformat/changelog.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-dateformat/package.json
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-dateformat/readme.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-datetime-picker/changelog.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/calendar.js
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/time-picker/components/time-picker/keypress.js
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/time-picker/components/time-picker/time-picker.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/uni-calendar-item.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/uni-calendar.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/util.js
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/icon/cale-50.png
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-datetime-picker/package.json
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-datetime-picker/readme.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-easyinput/changelog.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-easyinput/components/uni-easyinput/common.js
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-easyinput/package.json
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-easyinput/readme.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-fab/changelog.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-fab/components/uni-fab/uni-fab.vue.bak
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-fab/package.json
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-fab/readme.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-file-picker/changelog.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-file-picker/package.json
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-file-picker/readme.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-forms/changelog.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-forms/components/uni-forms/validate.js
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-forms/package.json
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-forms/readme.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-group/changelog.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-group/components/uni-group/uni-group.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-group/package.json
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-group/readme.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-icons/changelog.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-icons/components/uni-icons/icons.js
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-icons/components/uni-icons/uni.ttf
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-icons/package.json
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-icons/readme.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-link/changelog.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-link/components/uni-link/uni-link.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-link/package.json
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-link/readme.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-list/changelog.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list/uni-list.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list/uni-refresh.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-list/package.json
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-list/readme.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-load-more/changelog.md
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-load-more/package.json
 delete mode 100644 uni_modules/uni-feedback/uni_modules/uni-load-more/readme.md

diff --git a/manifest.json b/manifest.json
index eb6aa999..a3af0d3e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -116,5 +116,5 @@
         "template" : ""
     },
     "_spaceID" : "76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e",
-    "vueVersion" : "3"
+    "vueVersion" : "2"
 }
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 75816f07..affc5ada 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="center">
 		<uni-sign-in ref="signIn"></uni-sign-in>
-		<view class="userInfo" @click.capture="toUserInfo">
-			<uni-file-picker v-if="userInfo.avatar_file" v-model="userInfo.avatar_file"
+		<view class="userInfo" @click.capture="toUserInfo">
+			<uni-file-picker v-if="userInfo.avatar_file&&userInfo.avatar_file.url" v-model="userInfo.avatar_file"
 				fileMediatype="image" :del-icon="false" return-type="object" :image-styles="listStyles" disablePreview
 				disabled />
 			<image v-else class="logo-img" src="/static/uni-center/defaultAvatarUrl.png"></image>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-badge/changelog.md b/uni_modules/uni-feedback/uni_modules/uni-badge/changelog.md
deleted file mode 100644
index 5ec77203..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-badge/changelog.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## 1.0.7（2021-05-07）
-- 修复 uni-badge 在 App 端，数字小于10时不是圆形的bug
-- 修复 uni-badge 在父元素不是 flex 布局时，宽度缩小的bug
-- 新增 uni-badge 属性 custom-style， 支持自定义样式
-## 1.0.6（2021-02-04）
-- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-feedback/uni_modules/uni-badge/components/uni-badge/uni-badge.vue b/uni_modules/uni-feedback/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
deleted file mode 100644
index 5d36c388..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<template>
-	<text v-if="text" :class="inverted ? 'uni-badge--' + type + ' uni-badge--' + size + ' uni-badge--' + type + '-inverted' : 'uni-badge--' + type + ' uni-badge--' + size"
-	 :style="badgeStyle" class="uni-badge" @click="onClick()">{{ text }}</text>
-</template>
-
-<script>
-	/**
-	 * Badge 数字角标
-	 * @description 数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21
-	 * @property {String} text 角标内容
-	 * @property {String} type = [default|primary|success|warning|error] 颜色类型
-	 * 	@value default 灰色
-	 * 	@value primary 蓝色
-	 * 	@value success 绿色
-	 * 	@value warning 黄色
-	 * 	@value error 红色
-	 * @property {String} size = [normal|small] Badge 大小
-	 * 	@value normal 一般尺寸
-	 * 	@value small 小尺寸
-	 * @property {String} inverted = [true|false] 是否无需背景颜色
-	 * @event {Function} click 点击 Badge 触发事件
-	 * @example <uni-badge text="1"></uni-badge>
-	 */
-	export default {
-		name: 'UniBadge',
-		props: {
-			type: {
-				type: String,
-				default: 'default'
-			},
-			inverted: {
-				type: Boolean,
-				default: false
-			},
-			text: {
-				type: [String, Number],
-				default: ''
-			},
-			size: {
-				type: String,
-				default: 'normal'
-			},
-			customStyle: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				badgeStyle: ''
-			};
-		},
-		watch: {
-			text() {
-				this.setStyle()
-			}
-		},
-		mounted() {
-			this.setStyle()
-		},
-		methods: {
-			setStyle() {
-				this.badgeStyle = `width: ${String(this.text).length * 8 + 12}px;` + this.customStyle
-			},
-			onClick() {
-				this.$emit('click');
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	$bage-size: 12px;
-	$bage-small: scale(0.8);
-	$bage-height: 20px;
-
-	.uni-badge {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		overflow: hidden;
-		box-sizing: border-box;
-		/* #endif */
-		justify-content: center;
-		flex-direction: row;
-		height: $bage-height;
-		line-height: $bage-height;
-		color: $uni-text-color;
-		border-radius: 100px;
-		background-color: $uni-bg-color-hover;
-		background-color: transparent;
-		text-align: center;
-		font-family: 'Helvetica Neue', Helvetica, sans-serif;
-		font-size: $bage-size;
-		/* #ifdef H5 */
-		cursor: pointer;
-		/* #endif */
-	}
-
-	.uni-badge--inverted {
-		padding: 0 5px 0 0;
-		color: $uni-bg-color-hover;
-	}
-
-	.uni-badge--default {
-		color: $uni-text-color;
-		background-color: $uni-bg-color-hover;
-	}
-
-	.uni-badge--default-inverted {
-		color: $uni-text-color-grey;
-		background-color: transparent;
-	}
-
-	.uni-badge--primary {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-primary;
-	}
-
-	.uni-badge--primary-inverted {
-		color: $uni-color-primary;
-		background-color: transparent;
-	}
-
-	.uni-badge--success {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-success;
-	}
-
-	.uni-badge--success-inverted {
-		color: $uni-color-success;
-		background-color: transparent;
-	}
-
-	.uni-badge--warning {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-warning;
-	}
-
-	.uni-badge--warning-inverted {
-		color: $uni-color-warning;
-		background-color: transparent;
-	}
-
-	.uni-badge--error {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-error;
-	}
-
-	.uni-badge--error-inverted {
-		color: $uni-color-error;
-		background-color: transparent;
-	}
-
-	.uni-badge--small {
-		transform: $bage-small;
-		transform-origin: center center;
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-badge/package.json b/uni_modules/uni-feedback/uni_modules/uni-badge/package.json
deleted file mode 100644
index e215ab6a..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-badge/package.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "id": "uni-badge",
-  "displayName": "Badge 数字角标",
-  "version": "1.0.7",
-  "description": "数字角标（徽章）组件，在元素周围展示消息提醒，一般用于列表、九宫格、按钮等地方。",
-  "keywords": [
-    "",
-    "badge",
-    "uni-ui",
-    "数字角标",
-    "徽章"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "y",
-          "联盟": "y"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-badge/readme.md b/uni_modules/uni-feedback/uni_modules/uni-badge/readme.md
deleted file mode 100644
index 0a8c4a04..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-badge/readme.md
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-## Badge 数字角标
-> **组件名：uni-badge**
-> 代码块： `uBadge`
-
-
-数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景，
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<uni-badge text="1"></uni-badge>
-<uni-badge text="2" type="purple" @click="bindClick"></uni-badge>
-<uni-badge text="3" type="primary" :inverted="true"></uni-badge>
-```
-
-
-## API
-
-### Badge Props
-
-|属性名				|类型		|默认值	|说明																																														|
-|:-:					|:-:		|:-:		|:-:																																														|
-|text					|String	|-			|角标内容																																												|
-|type					|String	|default|颜色类型，可选值：default（灰色）、primary（蓝色）、success（绿色）、warning(黄色)、error(红色)|
-|size					|String	|normal	|Badge 大小，可取值：normal、small																															|
-|custom-style	|String	|				|自定义 Badge 样式																																							|
-|inverted			|Boolean|false	|是否无需背景颜色，为 true 时，背景颜色将变为文字的字体颜色																			|
-
-### Badge Events
-
-|事件名	|事件说明			|返回参数	|
-|:-:	|:-:				|:-:		|
-|@click	|点击 Badge 触发事件| -			|
-
-
diff --git a/uni_modules/uni-feedback/uni_modules/uni-dateformat/changelog.md b/uni_modules/uni-feedback/uni_modules/uni-dateformat/changelog.md
deleted file mode 100644
index 9dee4463..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-dateformat/changelog.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 0.0.3（2021-02-04）
-- 调整为uni_modules目录规范
-- 修复 iOS 平台日期格式化出错的问题
diff --git a/uni_modules/uni-feedback/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js b/uni_modules/uni-feedback/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js
deleted file mode 100644
index 24b450e1..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js
+++ /dev/null
@@ -1,191 +0,0 @@
-// yyyy-MM-dd hh:mm:ss.SSS 所有支持的类型
-function pad(str, length = 2) {
-	str += ''
-	while (str.length < length) {
-		str = '0' + str
-	}
-	return str.slice(-length)
-}
-
-const parser = {
-	yyyy: (dateObj) => {
-		return pad(dateObj.year, 4)
-	},
-	yy: (dateObj) => {
-		return pad(dateObj.year)
-	},
-	MM: (dateObj) => {
-		return pad(dateObj.month)
-	},
-	M: (dateObj) => {
-		return dateObj.month
-	},
-	dd: (dateObj) => {
-		return pad(dateObj.day)
-	},
-	d: (dateObj) => {
-		return dateObj.day
-	},
-	hh: (dateObj) => {
-		return pad(dateObj.hour)
-	},
-	h: (dateObj) => {
-		return dateObj.hour
-	},
-	mm: (dateObj) => {
-		return pad(dateObj.minute)
-	},
-	m: (dateObj) => {
-		return dateObj.minute
-	},
-	ss: (dateObj) => {
-		return pad(dateObj.second)
-	},
-	s: (dateObj) => {
-		return dateObj.second
-	},
-	SSS: (dateObj) => {
-		return pad(dateObj.millisecond, 3)
-	},
-	S: (dateObj) => {
-		return dateObj.millisecond
-	},
-}
-
-// 这都n年了iOS依然不认识2020-12-12，需要转换为2020/12/12
-function getDate(time) {
-	if (time instanceof Date) {
-		return time
-	}
-	switch (typeof time) {
-		case 'string':
-			return new Date(time.replace(/-/g, '/'))
-		default:
-			return new Date(time)
-	}
-}
-
-export function formatDate(date, format = 'yyyy/MM/dd hh:mm:ss') {
-	if (!date && date !== 0) {
-		return ''
-	}
-	date = getDate(date)
-	const dateObj = {
-		year: date.getFullYear(),
-		month: date.getMonth() + 1,
-		day: date.getDate(),
-		hour: date.getHours(),
-		minute: date.getMinutes(),
-		second: date.getSeconds(),
-		millisecond: date.getMilliseconds()
-	}
-	const tokenRegExp = /yyyy|yy|MM|M|dd|d|hh|h|mm|m|ss|s|SSS|SS|S/
-	let flag = true
-	let result = format
-	while (flag) {
-		flag = false
-		result = result.replace(tokenRegExp, function(matched) {
-			flag = true
-			return parser[matched](dateObj)
-		})
-	}
-	return result
-}
-
-export function friendlyDate(time, {
-	locale = 'zh',
-	threshold = [60000, 3600000],
-	format = 'yyyy/MM/dd hh:mm:ss'
-}) {
-	if (!time && time !== 0) {
-		return ''
-	}
-	const localeText = {
-		zh: {
-			year: '年',
-			month: '月',
-			day: '天',
-			hour: '小时',
-			minute: '分钟',
-			second: '秒',
-			ago: '前',
-			later: '后',
-			justNow: '刚刚',
-			soon: '马上',
-			template: '{num}{unit}{suffix}'
-		},
-		en: {
-			year: 'year',
-			month: 'month',
-			day: 'day',
-			hour: 'hour',
-			minute: 'minute',
-			second: 'second',
-			ago: 'ago',
-			later: 'later',
-			justNow: 'just now',
-			soon: 'soon',
-			template: '{num} {unit} {suffix}'
-		}
-	}
-	const text = localeText[locale] || localeText.zh
-	let date = getDate(time)
-	let ms = date.getTime() - Date.now()
-	let absMs = Math.abs(ms)
-	if (absMs < threshold[0]) {
-		return ms < 0 ? text.justNow : text.soon
-	}
-	if (absMs >= threshold[1]) {
-		return formatDate(date, format)
-	}
-	let num
-	let unit
-	let suffix = text.later
-	if (ms < 0) {
-		suffix = text.ago
-		ms = -ms
-	}
-	const seconds = Math.floor((ms) / 1000)
-	const minutes = Math.floor(seconds / 60)
-	const hours = Math.floor(minutes / 60)
-	const days = Math.floor(hours / 24)
-	const months = Math.floor(days / 30)
-	const years = Math.floor(months / 12)
-	switch (true) {
-		case years > 0:
-			num = years
-			unit = text.year
-			break
-		case months > 0:
-			num = months
-			unit = text.month
-			break
-		case days > 0:
-			num = days
-			unit = text.day
-			break
-		case hours > 0:
-			num = hours
-			unit = text.hour
-			break
-		case minutes > 0:
-			num = minutes
-			unit = text.minute
-			break
-		default:
-			num = seconds
-			unit = text.second
-			break
-	}
-
-	if (locale === 'en') {
-		if (num === 1) {
-			num = 'a'
-		} else {
-			unit += 's'
-		}
-	}
-
-	return text.template.replace(/{\s*num\s*}/g, num + '').replace(/{\s*unit\s*}/g, unit).replace(/{\s*suffix\s*}/g,
-		suffix)
-}
diff --git a/uni_modules/uni-feedback/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue b/uni_modules/uni-feedback/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue
deleted file mode 100644
index af452055..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-	<text>{{dateShow}}</text>
-</template>
-
-<script>
-	/**
-	 * Dateformat 日期格式化
-	 * @description 日期格式化组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3279
-	 * @property {Object|String|Number} date 日期对象/日期字符串/时间戳
-	 * @property {String} locale 格式化使用的语言
-	 * 	@value zh 中文
-	 * 	@value en 英文
-	 * @property {Array} threshold 应用不同类型格式化的阈值
-	 * @property {String} format 输出日期字符串时的格式
-	 */
-	import {
-		friendlyDate
-	} from './date-format.js'
-	export default {
-		name: 'uniDateformat',
-		props: {
-			date: {
-				type: [Object, String, Number],
-				default () {
-					return Date.now()
-				}
-			},
-			locale: {
-				type: String,
-				default: 'zh',
-			},
-			threshold: {
-				type: Array,
-				default () {
-					return [0, 0]
-				}
-			},
-			format: {
-				type: String,
-				default: 'yyyy/MM/dd hh:mm:ss'
-			},
-			// refreshRate使用不当可能导致性能问题，谨慎使用
-			refreshRate: {
-				type: [Number, String],
-				default: 0
-			}
-		},
-		data() {
-			return {
-				refreshMark: 0
-			}
-		},
-		computed: {
-			dateShow() {
-				this.refreshMark
-				return friendlyDate(this.date, {
-					locale: this.locale,
-					threshold: this.threshold,
-					format: this.format
-				})
-			}
-		},
-		watch: {
-			refreshRate: {
-				handler() {
-					this.setAutoRefresh()
-				},
-				immediate: true
-			}
-		},
-		methods: {
-			refresh() {
-				this.refreshMark++
-			},
-			setAutoRefresh() {
-				clearInterval(this.refreshInterval)
-				if (this.refreshRate) {
-					this.refreshInterval = setInterval(() => {
-						this.refresh()
-					}, parseInt(this.refreshRate))
-				}
-			}
-		}
-	}
-</script>
-
-<style>
-
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-dateformat/package.json b/uni_modules/uni-feedback/uni_modules/uni-dateformat/package.json
deleted file mode 100644
index 718062f7..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-dateformat/package.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "id": "uni-dateformat",
-  "displayName": "Dateformat 日期格式化",
-  "version": "0.0.3",
-  "description": "日期格式化组件，可以将日期格式化为1分钟前、刚刚等形式",
-  "keywords": [
-    "日期格式化",
-    "时间格式化",
-    "格式化时间",
-    "",
-    "date-format"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "y",
-          "联盟": "y"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-dateformat/readme.md b/uni_modules/uni-feedback/uni_modules/uni-dateformat/readme.md
deleted file mode 100644
index e54f7a81..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-dateformat/readme.md
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-### DateFormat 日期格式化
-> 代码块： `uDateformat`
-
-
-日期格式化组件。
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<!-- 一般用法 -->
-<uni-dateformat date="2020/10/20 20:20:20"></uni-dateformat>
-
-<!-- 不显示刚刚/马上/xx分钟前 -->
-<uni-dateformat date="2020/10/20 20:20:20" :threshold="[0,0]"></uni-dateformat>
-```
-
-## API
-
-### Dateformat Props
-
-|属性名		|类型							|默认值					|说明												|
-|:-:		|:-:							|:-:					|:-:												|
-|date		|Object&#124;String&#124;Number	|Date.now()				|要格式化的日期对象/日期字符串/时间戳				|
-|threshold	|Array							|[0, 0]					|转化类型阈值										|
-|format		|String							|'yyyy/MM/dd hh:mm:ss'	|格式字符串											|
-|locale		|String							|zh						|格式化使用的语言，目前支持zh（中文）、en（英文）	|
-
-
-#### Threshold Options
-
-格式化组件会对时间进行用户友好转化，threshold就是用来控制转化的时间阈值的。
-
-以`[60000, 3600000]`为例，将传入时间与当前时间差的绝对值记为delta（单位毫秒）
-
-- `delta < 60000`时，时间会被转化为“刚刚|马上”
-- `delta >= 60000 && delta < 3600000`时，时间会被转化为“xx分钟前|xx分钟后”，如果超过1小时会显示成“xx小时前|xx小时后”，以此类推
-- `delta >= 3600000`时，会按照format参数传入的格式进行格式化
-
-如果不想转化为“马上|刚刚”可以传入`:threshold = "[0,3600000]"`。默认值`[0,0]`既不会转换为“马上|刚刚”也不会转化为“xx分钟前|xx分钟后”
-
-#### Format Options
-
-format接收字符以及含义如下：
-
-|字符	|说明							|
-|:-:	|:-:							|
-|yyyy	|四位年份						|
-|yy		|两位年份						|
-|MM		|两位月份（不足两位在前面补0）	|
-|M		|月份，不自动补0				|
-|dd		|两位天（不足两位在前面补0）	|
-|d		|天，不自动补0					|
-|hh		|两位小时（不足两位在前面补0）	|
-|h		|小时，不自动补0				|
-|mm		|两位分钟（不足两位在前面补0）	|
-|m		|分钟，不自动补0				|
-|ss		|两位秒（不足两位在前面补0）	|
-|s		|秒，不自动补0					|
-|SSS	|三位毫秒（不足三位在前面补0）	|
-|S		|毫秒，不自动补0				|
-
diff --git a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/changelog.md b/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/changelog.md
deleted file mode 100644
index 43ee2824..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/changelog.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## 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-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/calendar.js b/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/calendar.js
deleted file mode 100644
index b8d7d6fc..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/calendar.js
+++ /dev/null
@@ -1,546 +0,0 @@
-/**
-* @1900-2100区间内的公历、农历互转
-* @charset UTF-8
-* @github  https://github.com/jjonline/calendar.js
-* @Author  Jea杨(JJonline@JJonline.Cn)
-* @Time    2014-7-21
-* @Time    2016-8-13 Fixed 2033hex、Attribution Annals
-* @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
-* @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
-* @Version 1.0.3
-* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
-* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
-*/
-/* eslint-disable */
-var calendar = {
-
-  /**
-      * 农历1900-2100的润大小信息表
-      * @Array Of Property
-      * @return Hex
-      */
-  lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
-    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
-    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
-    0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
-    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
-    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
-    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
-    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
-    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
-    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
-    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
-    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
-    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
-    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
-    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
-    /** Add By JJonline@JJonline.Cn**/
-    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
-    0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
-    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
-    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
-    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
-    0x0d520], // 2100
-
-  /**
-      * 公历每个月份的天数普通表
-      * @Array Of Property
-      * @return Number
-      */
-  solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
-
-  /**
-      * 天干地支之天干速查表
-      * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
-      * @return Cn string
-      */
-  Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
-
-  /**
-      * 天干地支之地支速查表
-      * @Array Of Property
-      * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
-      * @return Cn string
-      */
-  Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5'],
-
-  /**
-      * 天干地支之地支速查表<=>生肖
-      * @Array Of Property
-      * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
-      * @return Cn string
-      */
-  Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a'],
-
-  /**
-      * 24节气速查表
-      * @Array Of Property
-      * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
-      * @return Cn string
-      */
-  solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206', '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3', '\u5c0f\u6691', '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732', '\u971c\u964d', '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'],
-
-  /**
-      * 1900-2100各年的24节气日期速查表
-      * @Array Of Property
-      * @return 0x string For splice
-      */
-  sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f',
-    '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
-    '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
-    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
-    'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
-    '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
-    '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
-    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
-    '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
-    '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
-    '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
-    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
-    '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
-    '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
-    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
-    '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
-    '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
-    '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
-    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
-    '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
-    '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
-    '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
-    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
-    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
-    '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
-    '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
-    '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
-    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
-    '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
-    '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
-    '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
-    '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
-    '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
-    '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
-    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
-    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
-    '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
-    '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
-    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
-    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
-    '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
-    '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
-    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
-    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
-    '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
-    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
-    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
-    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
-    '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
-    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
-    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
-    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
-    '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
-    '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
-    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
-    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
-    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
-    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
-    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
-    '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
-    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
-    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
-    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
-    '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
-    '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
-    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
-    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'],
-
-  /**
-      * 数字转中文速查表
-      * @Array Of Property
-      * @trans ['日','一','二','三','四','五','六','七','八','九','十']
-      * @return Cn string
-      */
-  nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341'],
-
-  /**
-      * 日期转农历称呼速查表
-      * @Array Of Property
-      * @trans ['初','十','廿','卅']
-      * @return Cn string
-      */
-  nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
-
-  /**
-      * 月份转农历称呼速查表
-      * @Array Of Property
-      * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
-      * @return Cn string
-      */
-  nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341', '\u51ac', '\u814a'],
-
-  /**
-      * 返回农历y年一整年的总天数
-      * @param lunar Year
-      * @return Number
-      * @eg:var count = calendar.lYearDays(1987) ;//count=387
-      */
-  lYearDays: function (y) {
-    var i; var sum = 348
-    for (i = 0x8000; i > 0x8; i >>= 1) { sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0 }
-    return (sum + this.leapDays(y))
-  },
-
-  /**
-      * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
-      * @param lunar Year
-      * @return Number (0-12)
-      * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
-      */
-  leapMonth: function (y) { // 闰字编码 \u95f0
-    return (this.lunarInfo[y - 1900] & 0xf)
-  },
-
-  /**
-      * 返回农历y年闰月的天数 若该年没有闰月则返回0
-      * @param lunar Year
-      * @return Number (0、29、30)
-      * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
-      */
-  leapDays: function (y) {
-    if (this.leapMonth(y)) {
-      return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
-    }
-    return (0)
-  },
-
-  /**
-      * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
-      * @param lunar Year
-      * @return Number (-1、29、30)
-      * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
-      */
-  monthDays: function (y, m) {
-    if (m > 12 || m < 1) { return -1 }// 月份参数从1至12，参数错误返回-1
-    return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
-  },
-
-  /**
-      * 返回公历(!)y年m月的天数
-      * @param solar Year
-      * @return Number (-1、28、29、30、31)
-      * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
-      */
-  solarDays: function (y, m) {
-    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
-    var ms = m - 1
-    if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
-      return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
-    } else {
-      return (this.solarMonth[ms])
-    }
-  },
-
-  /**
-     * 农历年份转换为干支纪年
-     * @param  lYear 农历年的年份数
-     * @return Cn string
-     */
-  toGanZhiYear: function (lYear) {
-    var ganKey = (lYear - 3) % 10
-    var zhiKey = (lYear - 3) % 12
-    if (ganKey == 0) ganKey = 10// 如果余数为0则为最后一个天干
-    if (zhiKey == 0) zhiKey = 12// 如果余数为0则为最后一个地支
-    return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
-  },
-
-  /**
-     * 公历月、日判断所属星座
-     * @param  cMonth [description]
-     * @param  cDay [description]
-     * @return Cn string
-     */
-  toAstro: function (cMonth, cDay) {
-    var s = '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
-    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
-    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7'// 座
-  },
-
-  /**
-      * 传入offset偏移量返回干支
-      * @param offset 相对甲子的偏移量
-      * @return Cn string
-      */
-  toGanZhi: function (offset) {
-    return this.Gan[offset % 10] + this.Zhi[offset % 12]
-  },
-
-  /**
-      * 传入公历(!)y年获得该年第n个节气的公历日期
-      * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
-      * @return day Number
-      * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
-      */
-  getTerm: function (y, n) {
-    if (y < 1900 || y > 2100) { return -1 }
-    if (n < 1 || n > 24) { return -1 }
-    var _table = this.sTermInfo[y - 1900]
-    var _info = [
-      parseInt('0x' + _table.substr(0, 5)).toString(),
-      parseInt('0x' + _table.substr(5, 5)).toString(),
-      parseInt('0x' + _table.substr(10, 5)).toString(),
-      parseInt('0x' + _table.substr(15, 5)).toString(),
-      parseInt('0x' + _table.substr(20, 5)).toString(),
-      parseInt('0x' + _table.substr(25, 5)).toString()
-    ]
-    var _calday = [
-      _info[0].substr(0, 1),
-      _info[0].substr(1, 2),
-      _info[0].substr(3, 1),
-      _info[0].substr(4, 2),
-
-      _info[1].substr(0, 1),
-      _info[1].substr(1, 2),
-      _info[1].substr(3, 1),
-      _info[1].substr(4, 2),
-
-      _info[2].substr(0, 1),
-      _info[2].substr(1, 2),
-      _info[2].substr(3, 1),
-      _info[2].substr(4, 2),
-
-      _info[3].substr(0, 1),
-      _info[3].substr(1, 2),
-      _info[3].substr(3, 1),
-      _info[3].substr(4, 2),
-
-      _info[4].substr(0, 1),
-      _info[4].substr(1, 2),
-      _info[4].substr(3, 1),
-      _info[4].substr(4, 2),
-
-      _info[5].substr(0, 1),
-      _info[5].substr(1, 2),
-      _info[5].substr(3, 1),
-      _info[5].substr(4, 2)
-    ]
-    return parseInt(_calday[n - 1])
-  },
-
-  /**
-      * 传入农历数字月份返回汉语通俗表示法
-      * @param lunar month
-      * @return Cn string
-      * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
-      */
-  toChinaMonth: function (m) { // 月 => \u6708
-    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
-    var s = this.nStr3[m - 1]
-    s += '\u6708'// 加上月字
-    return s
-  },
-
-  /**
-      * 传入农历日期数字返回汉字表示法
-      * @param lunar day
-      * @return Cn string
-      * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
-      */
-  toChinaDay: function (d) { // 日 => \u65e5
-    var s
-    switch (d) {
-      case 10:
-        s = '\u521d\u5341'; break
-      case 20:
-        s = '\u4e8c\u5341'; break
-        break
-      case 30:
-        s = '\u4e09\u5341'; break
-        break
-      default :
-        s = this.nStr2[Math.floor(d / 10)]
-        s += this.nStr1[d % 10]
-    }
-    return (s)
-  },
-
-  /**
-      * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
-      * @param y year
-      * @return Cn string
-      * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
-      */
-  getAnimal: function (y) {
-    return this.Animals[(y - 4) % 12]
-  },
-
-  /**
-      * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
-      * @param y  solar year
-      * @param m  solar month
-      * @param d  solar day
-      * @return JSON object
-      * @eg:console.log(calendar.solar2lunar(1987,11,01));
-      */
-  solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
-    // 年份限定、上限
-    if (y < 1900 || y > 2100) {
-      return -1// undefined转换为数字变为NaN
-    }
-    // 公历传参最下限
-    if (y == 1900 && m == 1 && d < 31) {
-      return -1
-    }
-    // 未传参  获得当天
-    if (!y) {
-      var objDate = new Date()
-    } else {
-      var objDate = new Date(y, parseInt(m) - 1, d)
-    }
-    var i; var leap = 0; var temp = 0
-    // 修正ymd参数
-    var y = objDate.getFullYear()
-    var m = objDate.getMonth() + 1
-    var d = objDate.getDate()
-    var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0, 31)) / 86400000
-    for (i = 1900; i < 2101 && offset > 0; i++) {
-      temp = this.lYearDays(i)
-      offset -= temp
-    }
-    if (offset < 0) {
-      offset += temp; i--
-    }
-
-    // 是否今天
-    var isTodayObj = new Date()
-    var isToday = false
-    if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
-      isToday = true
-    }
-    // 星期几
-    var nWeek = objDate.getDay()
-    var cWeek = this.nStr1[nWeek]
-    // 数字表示周几顺应天朝周一开始的惯例
-    if (nWeek == 0) {
-      nWeek = 7
-    }
-    // 农历年
-    var year = i
-    var leap = this.leapMonth(i) // 闰哪个月
-    var isLeap = false
-
-    // 效验闰月
-    for (i = 1; i < 13 && offset > 0; i++) {
-      // 闰月
-      if (leap > 0 && i == (leap + 1) && isLeap == false) {
-        --i
-        isLeap = true; temp = this.leapDays(year) // 计算农历闰月天数
-      } else {
-        temp = this.monthDays(year, i)// 计算农历普通月天数
-      }
-      // 解除闰月
-      if (isLeap == true && i == (leap + 1)) { isLeap = false }
-      offset -= temp
-    }
-    // 闰月导致数组下标重叠取反
-    if (offset == 0 && leap > 0 && i == leap + 1) {
-      if (isLeap) {
-        isLeap = false
-      } else {
-        isLeap = true; --i
-      }
-    }
-    if (offset < 0) {
-      offset += temp; --i
-    }
-    // 农历月
-    var month = i
-    // 农历日
-    var day = offset + 1
-    // 天干地支处理
-    var sm = m - 1
-    var gzY = this.toGanZhiYear(year)
-
-    // 当月的两个节气
-    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
-    var firstNode = this.getTerm(y, (m * 2 - 1))// 返回当月「节」为几日开始
-    var secondNode = this.getTerm(y, (m * 2))// 返回当月「节」为几日开始
-
-    // 依据12节气修正干支月
-    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
-    if (d >= firstNode) {
-      gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
-    }
-
-    // 传入的日期的节气与否
-    var isTerm = false
-    var Term = null
-    if (firstNode == d) {
-      isTerm = true
-      Term = this.solarTerm[m * 2 - 2]
-    }
-    if (secondNode == d) {
-      isTerm = true
-      Term = this.solarTerm[m * 2 - 1]
-    }
-    // 日柱 当月一日与 1900/1/1 相差天数
-    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
-    var gzD = this.toGanZhi(dayCyclical + d - 1)
-    // 该日期所属的星座
-    var astro = this.toAstro(m, d)
-
-    return { 'lYear': year, 'lMonth': month, 'lDay': day, 'Animal': this.getAnimal(year), 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month), 'IDayCn': this.toChinaDay(day), 'cYear': y, 'cMonth': m, 'cDay': d, 'gzYear': gzY, 'gzMonth': gzM, 'gzDay': gzD, 'isToday': isToday, 'isLeap': isLeap, 'nWeek': nWeek, 'ncWeek': '\u661f\u671f' + cWeek, 'isTerm': isTerm, 'Term': Term, 'astro': astro }
-  },
-
-  /**
-      * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
-      * @param y  lunar year
-      * @param m  lunar month
-      * @param d  lunar day
-      * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
-      * @return JSON object
-      * @eg:console.log(calendar.lunar2solar(1987,9,10));
-      */
-  lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
-    var isLeapMonth = !!isLeapMonth
-    var leapOffset = 0
-    var leapMonth = this.leapMonth(y)
-    var leapDay = this.leapDays(y)
-    if (isLeapMonth && (leapMonth != m)) { return -1 }// 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
-    if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) { return -1 }// 超出了最大极限值
-    var day = this.monthDays(y, m)
-    var _day = day
-    // bugFix 2016-9-25
-    // if month is leap, _day use leapDays method
-    if (isLeapMonth) {
-      _day = this.leapDays(y, m)
-    }
-    if (y < 1900 || y > 2100 || d > _day) { return -1 }// 参数合法性效验
-
-    // 计算农历的时间差
-    var offset = 0
-    for (var i = 1900; i < y; i++) {
-      offset += this.lYearDays(i)
-    }
-    var leap = 0; var isAdd = false
-    for (var i = 1; i < m; i++) {
-      leap = this.leapMonth(y)
-      if (!isAdd) { // 处理闰月
-        if (leap <= i && leap > 0) {
-          offset += this.leapDays(y); isAdd = true
-        }
-      }
-      offset += this.monthDays(y, i)
-    }
-    // 转换闰月农历 需补充该年闰月的前一个月的时差
-    if (isLeapMonth) { offset += day }
-    // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
-    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
-    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
-    var cY = calObj.getUTCFullYear()
-    var cM = calObj.getUTCMonth() + 1
-    var cD = calObj.getUTCDate()
-
-    return this.solar2lunar(cY, cM, cD)
-  }
-}
-
-export default calendar
diff --git a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/time-picker/components/time-picker/keypress.js b/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/time-picker/components/time-picker/keypress.js
deleted file mode 100644
index 9601abae..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/time-picker/components/time-picker/keypress.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// #ifdef H5
-export default {
-  name: 'Keypress',
-  props: {
-    disable: {
-      type: Boolean,
-      default: false
-    }
-  },
-  mounted () {
-    const keyNames = {
-      esc: ['Esc', 'Escape'],
-      tab: 'Tab',
-      enter: 'Enter',
-      space: [' ', 'Spacebar'],
-      up: ['Up', 'ArrowUp'],
-      left: ['Left', 'ArrowLeft'],
-      right: ['Right', 'ArrowRight'],
-      down: ['Down', 'ArrowDown'],
-      delete: ['Backspace', 'Delete', 'Del']
-    }
-    const listener = ($event) => {
-      if (this.disable) {
-        return
-      }
-      const keyName = Object.keys(keyNames).find(key => {
-        const keyName = $event.key
-        const value = keyNames[key]
-        return value === keyName || (Array.isArray(value) && value.includes(keyName))
-      })
-      if (keyName) {
-        // 避免和其他按键事件冲突
-        setTimeout(() => {
-          this.$emit(keyName, {})
-        }, 0)
-      }
-    }
-    document.addEventListener('keyup', listener)
-    this.$once('hook:beforeDestroy', () => {
-      document.removeEventListener('keyup', listener)
-    })
-  },
-	render: () => {}
-}
-// #endif
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/time-picker/components/time-picker/time-picker.vue b/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/time-picker/components/time-picker/time-picker.vue
deleted file mode 100644
index 08a6a9b1..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/time-picker/components/time-picker/time-picker.vue
+++ /dev/null
@@ -1,924 +0,0 @@
-<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">选择{{title}}</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">设置{{title}}</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">清空</text>
-				</view>
-				<view class="uni-datetime-picker-btn-group">
-					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">
-						<text class="uni-datetime-picker-btn-text">取消</text>
-					</view>
-					<view @click="setTime">
-						<text class="uni-datetime-picker-btn-text">确定</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- #ifdef H5 -->
-		<keypress v-if="visible" @esc="tiggerTimePicker" @enter="setTime" />
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	// #ifdef H5
-	import keypress from './keypress'
-	// #endif
-
-	/**
-	 * 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',
-		components: {
-			// #ifdef H5
-			keypress
-			// #endif
-		},
-		data() {
-			return {
-				indicatorStyle: `height: 50px;`,
-				visible: false,
-				fixNvueBug: {},
-				dateShow: true,
-				timeShow: true,
-				title: '日期和时间',
-				// 输入框当前时间
-				time: '',
-				// 当前的年月日时分秒
-				year: 1900,
-				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: ''
-			},
-			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: {
-			value: {
-				handler(newVal, oldVal) {
-					if (newVal) {
-						this.parseValue(this.fixIosDateFormat(newVal)) //兼容 iOS、safari 日期格式
-						this.initTime(false)
-					} else {
-						this.parseValue(Date.now())
-					}
-				},
-				immediate: true
-			},
-			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(this.fixIosDateFormat(newVal), 'start') //兼容 iOS、safari 日期格式
-				},
-				immediate: true
-			},
-			end: {
-				handler(newVal) {
-					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'end') //兼容 iOS、safari 日期格式
-				},
-				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)
-			}
-		},
-		created() {
-			this.form = this.getForm('uniForms')
-			this.formItem = this.getForm('uniFormsItem')
-
-			if (this.formItem) {
-				if (this.formItem.name) {
-					this.rename = this.formItem.name
-					this.form.inputChildrens.push(this)
-				}
-			}
-		},
-		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
-					}
-				}
-			}
-		},
-
-		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
-			},
-
-			/**
-			 * 获取父元素实例
-			 */
-			getForm(name = 'uniForms') {
-				let parent = this.$parent;
-				let parentName = parent.$options.name;
-				while (parentName !== name) {
-					parent = parent.$parent;
-					if (!parent) return false
-					parentName = parent.$options.name;
-				}
-				return parent;
-			},
-
-			/**
-			 * 解析时分秒字符串，例如：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) && typeof value !== NaN) {
-					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 = 120
-						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) && Number(point) !== NaN) {
-						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();
-			},
-
-			//兼容 iOS、safari 日期格式
-			fixIosDateFormat(value) {
-				if (typeof value === 'string') {
-					value = value.replace(/-/g, '/')
-				}
-				return value
-			},
-
-			/**
-			 * 生成时间戳
-			 * @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.formItem && this.formItem.setValue(this.createTimeStamp(this.time))
-					this.$emit('change', this.createTimeStamp(this.time))
-					this.$emit('input', this.createTimeStamp(this.time))
-				} else {
-					this.formItem && this.formItem.setValue(this.time)
-					this.$emit('change', this.time)
-					this.$emit('input', 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 = this.fixIosDateFormat(this.value)
-				this.initPickerValue(value)
-				this.visible = !this.visible
-			},
-
-			/**
-			 * 触发或关闭弹框
-			 */
-			tiggerTimePicker(e) {
-				this.visible = !this.visible
-			},
-
-			/**
-			 * 用户点击“清空”按钮，清空当前值
-			 */
-			clearTime() {
-				this.time = ''
-				this.formItem && this.formItem.setValue(this.time)
-				this.$emit('change', this.time)
-				this.$emit('input', this.time)
-				this.tiggerTimePicker()
-			},
-
-			/**
-			 * 用户点击“确定”按钮
-			 */
-			setTime() {
-				this.initTime()
-				this.tiggerTimePicker()
-			}
-		}
-	}
-</script>
-
-<style>
-	.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: #007AFF;
-	}
-
-	.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;
-	}
-
-	.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-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/uni-calendar-item.vue b/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/uni-calendar-item.vue
deleted file mode 100644
index 8f4e6f8a..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/uni-calendar-item.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<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--isDay-text': weeks.isDay,
-				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
-				'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">{{weeks.date}}</text>
-		<!-- 	<text v-if="!lunar&&!weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text">今天</text>
-			<text v-if="lunar&&!weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text" >{{weeks.isDay?'今天': (weeks.lunar.IDayCn === '初一'?weeks.lunar.IMonthCn:weeks.lunar.IDayCn)}}</text> -->
-			<!-- <text v-if="weeks.extraInfo&&weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text">{{weeks.extraInfo.info}}</text> -->
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			weeks: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			calendar: {
-				type: Object,
-				default: () => {
-					return {}
-				}
-			},
-			selected: {
-				type: Array,
-				default: () => {
-					return []
-				}
-			},
-			lunar: {
-				type: Boolean,
-				default: false
-			},
-			checkHover: {
-				type: Boolean,
-				default: false
-			}
-		},
-		methods: {
-			choiceDate(weeks) {
-				this.$emit('change', weeks)
-			},
-			handleMousemove(weeks) {
-				this.$emit('handleMouse', weeks)
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-calendar-item__weeks-box {
-		flex: 1;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		margin: 3px 0;
-	}
-
-	.uni-calendar-item__weeks-box-text {
-		font-size: $uni-font-size-base;
-		// color: $uni-text-color;
-	}
-
-	.uni-calendar-item__weeks-lunar-text {
-		font-size: $uni-font-size-sm;
-		color: $uni-text-color;
-	}
-
-	.uni-calendar-item__weeks-box-item {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		width: 100rpx;
-		height: 100rpx;
-		/* #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: $uni-color-error;
-
-	}
-
-	.uni-calendar-item__weeks-box .uni-calendar-item--disable {
-		// background-color: rgba(249, 249, 249, $uni-opacity-disabled);
-		color: $uni-text-color-disable;
-		cursor: default;
-	}
-
-	.uni-calendar-item--isDay-text {
-		color: $uni-color-primary !important;
-	}
-
-	.uni-calendar-item--isDay {
-		background-color: $uni-color-primary;
-		opacity: 0.8;
-		color: #fff;
-	}
-
-	.uni-calendar-item--extra {
-		color: $uni-color-error;
-		opacity: 0.8;
-	}
-
-	.uni-calendar-item--checked {
-		background-color: $uni-color-primary;
-		// border-radius: 50%;
-		box-sizing: border-box;
-		border: 6px solid #f2f6fc;
-		color: #fff;
-		opacity: 0.8;
-	}
-	
-	.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
-		color: #333;
-	}
-
-	.uni-calendar-item--multiple {
-		background-color:  #f2f6fc;
-		// color: #fff;
-		opacity: 0.8;
-	}
-
-	.uni-calendar-item--multiple .uni-calendar-item--before-checked {
-		background-color: #409eff;
-		color: #fff;
-		// border-radius: 50%;
-		box-sizing: border-box;
-		border: 6px solid #f2f6fc;
-	}
-
-	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
-		background-color: #409eff;;
-		color: #fff;
-		// border-radius: 50%;
-		box-sizing: border-box;
-		border: 6px solid #f2f6fc;
-	}
-	
-	.uni-calendar-item--before-checked-x {
-		// border-top-left-radius: 25px;
-		// border-bottom-left-radius: 25px;
-		background-color: #f2f6fc;
-	}
-	
-	.uni-calendar-item--after-checked-x {
-		// border-top-right-radius: 25px;
-		// border-bottom-right-radius: 25px;
-		background-color: #f2f6fc;
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/uni-calendar.vue b/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/uni-calendar.vue
deleted file mode 100644
index 8d62f461..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/uni-calendar.vue
+++ /dev/null
@@ -1,760 +0,0 @@
-<template>
-	<view class="uni-calendar" @mouseleave="leaveCale">
-		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
-			@click="clean"></view>
-		<view v-if="insert || show" class="uni-calendar__content"
-			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow}">
-
-			<view class="uni-calendar__header">
-				<view v-if="left" class="uni-calendar__header-btn-box" @click.stop="pre">
-					<view class="uni-calendar__header-btn uni-calendar--left"></view>
-				</view>
-				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
-					<text
-						class="uni-calendar__header-text">{{ (nowDate.year||'') +'年'+( nowDate.month||'') +'月'}}</text>
-				</picker>
-				<view v-if="right" class="uni-calendar__header-btn-box" @click.stop="next">
-					<view class="uni-calendar__header-btn uni-calendar--right"></view>
-				</view>
-				<!-- <text class="uni-calendar__backtoday" @click="backtoday">回到今天</text> -->
-
-			</view>
-			<view class="uni-calendar__box">
-				<view v-if="showMonth" class="uni-calendar__box-bg">
-					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
-				</view>
-				<view class="uni-calendar__weeks">
-					<view class="uni-calendar__weeks-day">
-						<text class="uni-calendar__weeks-day-text">日</text>
-					</view>
-					<view class="uni-calendar__weeks-day">
-						<text class="uni-calendar__weeks-day-text">一</text>
-					</view>
-					<view class="uni-calendar__weeks-day">
-						<text class="uni-calendar__weeks-day-text">二</text>
-					</view>
-					<view class="uni-calendar__weeks-day">
-						<text class="uni-calendar__weeks-day-text">三</text>
-					</view>
-					<view class="uni-calendar__weeks-day">
-						<text class="uni-calendar__weeks-day-text">四</text>
-					</view>
-					<view class="uni-calendar__weeks-day">
-						<text class="uni-calendar__weeks-day-text">五</text>
-					</view>
-					<view class="uni-calendar__weeks-day">
-						<text class="uni-calendar__weeks-day-text">六</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" :lunar="lunar" :checkHover="range" @change="choiceDate"
-							@handleMouse="handleMouse">
-						</calendar-item>
-					</view>
-				</view>
-			</view>
-			<view v-if="!insert && !range && typeHasTime" class="uni-date-changed uni-calendar--fixed-top"
-				style="padding: 0 40px;">
-				<text class="uni-date-changed--time-date">{{tempSingleDate ? tempSingleDate : '选择日期'}}</text>
-				<time-picker type="time" :start="reactStartTime" :end="reactEndTime" v-model="time" :disabled="!tempSingleDate"
-					:border="false" class="time-picker-style">
-				</time-picker>
-			</view>
-
-			<view v-if="!insert && range && typeHasTime" class="uni-date-changed uni-calendar--fixed-top">
-				<view class="uni-date-changed--time-start">
-					<text class="uni-date-changed--time-date">{{tempRange.before ? tempRange.before : '开始日期'}}</text>
-					<time-picker type="time" :start="reactStartTime" v-model="timeRange.startTime"
-						:border="false" :disabled="!tempRange.before" class="time-picker-style">
-					</time-picker>
-				</view>
-				<uni-icons type="arrowthinright" color="#999" style="line-height: 50px;"></uni-icons>
-				<view class="uni-date-changed--time-end">
-					<text class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : '结束日期'}}</text>
-					<time-picker type="time" :end="reactEndTime" v-model="timeRange.endTime" :border="false"
-						:disabled="!tempRange.after" class="time-picker-style">
-					</time-picker>
-				</view>
-			</view>
-
-			<view v-if="!insert" class="uni-date-changed uni-calendar__header" @click="confirm">
-				<!-- 				<view class="uni-calendar__header-btn-box" @click="close">
-					<text class="uni-calendar__header-text uni-calendar--fixed-width">取消</text>
-				</view> -->
-				<view class="uni-calendar__header-btn-box">
-					<text class="uni-calendar__button-text uni-calendar--fixed-width">确定</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import Calendar from './util.js';
-	import calendarItem from './uni-calendar-item.vue'
-	import timePicker from './time-picker/components/time-picker/time-picker.vue'
-	/**
-	 * Calendar 日历
-	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
-	 * @property {String} date 自定义当前时间，默认为今天
-	 * @property {Boolean} lunar 显示农历
-	 * @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 是否选择月份为背景
-	 * @event {Function} change 日期改变，`insert :ture` 时生效
-	 * @event {Function} confirm 确认选择`insert :false` 时生效
-	 * @event {Function} monthSwitch 切换月份时触发
-	 * @example <uni-calendar :insert="true":lunar="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 []
-				}
-			},
-			lunar: {
-				type: Boolean,
-				default: false
-			},
-			startDate: {
-				type: String,
-				default: ''
-			},
-			endDate: {
-				type: String,
-				default: ''
-			},
-			range: {
-				type: Boolean,
-				default: false
-			},
-			typeHasTime: {
-				type: Boolean,
-				default: false
-			},
-			insert: {
-				type: Boolean,
-				default: true
-			},
-			showMonth: {
-				type: Boolean,
-				default: true
-			},
-			clearDate: {
-				type: Boolean,
-				default: true
-			},
-			left: {
-				type: Boolean,
-				default: true
-			},
-			right: {
-				type: Boolean,
-				default: true
-			},
-			checkHover: {
-				type: Boolean,
-				default: true
-			},
-			pleStatus: {
-				type: Object,
-				default () {
-					return {
-						before: '',
-						after: '',
-						data: [],
-						fulldate: ''
-					}
-				}
-			}
-		},
-		data() {
-			return {
-				show: false,
-				weeks: [],
-				calendar: {},
-				nowDate: '',
-				aniMaskShow: false,
-				firstEnter: true,
-				time: this.defTime ? this.defTime : '',
-				timeRange: {
-					startTime: this.defTime.start ? this.defTime.start : '',
-					endTime: this.defTime.end ? this.defTime.end : ''
-				},
-				tempSingleDate: this.date,
-				tempRange: {
-					before: '',
-					after: ''
-				}
-			}
-		},
-		watch: {
-			date(newVal, oldVal) {
-				// this.cale.setDate(newVal)
-				this.init(newVal)
-			},
-			startDate(val) {
-				this.cale.resetSatrtDate(val)
-			},
-			endDate(val) {
-				this.cale.resetEndDate(val)
-			},
-			selected(newVal) {
-				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
-				this.weeks = this.cale.weeks
-			},
-			// tempRange: {
-			// 	immediate: true,
-			// 	handler(newVal, oldVal) {debugger
-			// 		if (!oldVal) return
-			// 		if (!newVal.before) this.timeRange.startTime = ''
-			// 		if (!newVal.after) this.timeRange.endTime = ''
-			// 	}
-			// },
-			pleStatus: {
-				immediate: true,
-				handler(newVal, oldVal) {
-					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)
-							}
-							if (!before && !after) {
-								this.cale.setMultiple(fulldate)
-								this.setDate(this.nowDate.fullDate)
-								this.calendar.fullDate = ''
-								this.cale.lastHover = false
-							}
-						} else {
-							this.cale.setDefaultMultiple(before, after)
-							if (which === 'left') {
-								this.setDate(before)
-							} else {
-								this.setDate(after)
-							}
-							this.cale.lastHover = true
-						}
-					}, 16)
-				}
-			}
-		},
-		computed: {
-			reactStartTime() {
-				const activeDate = this.range ? this.tempRange.before : this.calendar.fullDate
-				const res = activeDate === this.startDate ? this.selectableTimes.start : ''
-				return res
-			},
-			reactEndTime() {
-				const activeDate = this.range ? this.tempRange.after : this.calendar.fullDate
-				const res = activeDate === this.endDate ? this.selectableTimes.end : ''
-				return res
-			}
-		},
-		created() {
-			// 获取日历方法实例
-			this.cale = new Calendar({
-				// date: new Date(),
-				selected: this.selected,
-				startDate: this.startDate,
-				endDate: this.endDate,
-				range: this.range,
-				// multipleStatus: this.pleStatus
-			})
-			// 选中某一天
-			// this.cale.setDate(this.date)
-
-			this.init(this.date)
-			// this.setDay
-		},
-		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
-			},
-
-			// 取消穿透
-			clean() {
-				this.close()
-			},
-
-			bindDateChange(e) {
-				const value = e.detail.value + '-1'
-				console.log(this.cale.getDate(value));
-				this.init(value)
-			},
-			/**
-			 * 初始化日期显示
-			 * @param {Object} date
-			 */
-			init(date) {
-
-				this.cale.setDate(date)
-				this.weeks = this.cale.weeks
-				this.nowDate = this.calendar = this.cale.getInfo(date)
-			},
-			/**
-			 * 打开日历弹窗
-			 */
-			open() {
-				// 弹窗模式并且清理数据
-				if (this.clearDate && !this.insert) {
-					this.cale.cleanMultipleStatus()
-					// this.cale.setDate(this.date)
-					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) {
-				let {
-					year,
-					month,
-					date,
-					fullDate,
-					lunar,
-					extraInfo
-				} = this.calendar
-				this.$emit(name, {
-					range: this.cale.multipleStatus,
-					year,
-					month,
-					date,
-					time: this.time,
-					timeRange: this.timeRange,
-					fulldate: fullDate,
-					lunar,
-					extraInfo: extraInfo || {}
-				})
-			},
-			/**
-			 * 选择天触发
-			 * @param {Object} weeks
-			 */
-			choiceDate(weeks) {
-				if (weeks.disable) return
-				this.calendar = weeks
-				// 设置多选
-				this.cale.setMultiple(this.calendar.fullDate, true)
-				this.weeks = this.cale.weeks
-				this.tempSingleDate = this.calendar.fullDate
-				this.tempRange.before = this.cale.multipleStatus.before
-				this.tempRange.after = this.cale.multipleStatus.after
-				this.change()
-			},
-			/**
-			 * 回到今天
-			 */
-			backtoday() {
-				console.log(this.cale.getDate(new Date()).fullDate);
-				let date = this.cale.getDate(new Date()).fullDate
-				// this.cale.setDate(date)
-				this.init(date)
-				this.change()
-			},
-			/**
-			 * 比较时间大小
-			 */
-			dateCompare(startDate, endDate) {
-				// 计算截止时间
-				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
-				// 计算详细项的截止时间
-				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
-				if (startDate <= endDate) {
-					return true
-				} else {
-					return false
-				}
-			},
-			/**
-			 * 上个月
-			 */
-			pre() {
-				const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate
-				this.setDate(preDate)
-				this.monthSwitch()
-
-			},
-			/**
-			 * 下个月
-			 */
-			next() {
-				const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate
-				this.setDate(nextDate)
-				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" scoped>
-	.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: $uni-bg-color-mask;
-		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: 0;
-		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__header {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		height: 50px;
-		// border-bottom-color: $uni-border-color;
-		// border-bottom-style: solid;
-		// border-bottom-width: 1px;
-	}
-
-	.uni-calendar--fixed-top {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: space-between;
-		border-top-color: $uni-border-color;
-		border-top-style: solid;
-		border-top-width: 1px;
-	}
-
-	.uni-calendar--fixed-width {
-		width: 50px;
-		// padding: 0 15px;
-	}
-
-	.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: $uni-text-color;
-		background-color: $uni-bg-color-hover;
-	}
-
-	.uni-calendar__header-text {
-		text-align: center;
-		width: 100px;
-		font-size: $uni-font-size-base;
-		color: $uni-text-color;
-	}
-
-	.uni-calendar__button-text {
-		text-align: center;
-		width: 100px;
-		font-size: $uni-font-size-base;
-		color: #007aff;
-		letter-spacing: 3px;
-	}
-
-	.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: 10px;
-		height: 10px;
-		border-left-color: $uni-text-color-placeholder;
-		border-left-style: solid;
-		border-left-width: 2px;
-		border-top-color: $uni-color-subtitle;
-		border-top-style: solid;
-		border-top-width: 2px;
-	}
-
-	.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: 45px;
-		border-bottom-color: #F5F5F5;
-		border-bottom-style: solid;
-		border-bottom-width: 1px;
-	}
-
-	.uni-calendar__weeks-day-text {
-		font-size: 14px;
-	}
-
-	.uni-calendar__box {
-		position: relative;
-	}
-
-	.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: $uni-text-color-grey;
-		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: $uni-border-color;
-		border-top-style: solid;
-		border-top-width: 1px;
-	}
-
-
-	.uni-date-changed--time text {
-		// padding: 0 20px;
-		// height: 50px;
-		line-height: 50px;
-	}
-
-	.uni-date-changed {
-		flex: 1;
-	}
-
-	.uni-date-changed--time {
-		display: flex;
-		flex: 1;
-	}
-
-	.uni-date-changed--time-start {
-		display: flex;
-		justify-content: right;
-		align-items: center;
-		// flex: 1;
-	}
-
-	.uni-date-changed--time-end {
-		display: flex;
-		justify-content: left;
-		align-items: center;
-		// flex: 1;
-	}
-
-	.uni-date-changed--time-date {
-		color: #999;
-		line-height: 50px;
-		// opacity: 0.6;
-	}
-
-	.time-picker-style {
-		width: 62px;
-		display: flex;
-		justify-content: center;
-		align-items: center
-	}
-
-	.mr-10 {
-		margin-right: 10px;
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/util.js b/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/util.js
deleted file mode 100644
index 6b95347a..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/basic/util.js
+++ /dev/null
@@ -1,408 +0,0 @@
-import CALENDAR from './calendar.js'
-
-class Calendar {
-	constructor({
-		date,
-		selected,
-		startDate,
-		endDate,
-		range,
-		// multipleStatus
-	} = {}) {
-		// 当前日期
-		this.date = this.getDate(new Date()) // 当前初入日期
-		// 打点信息
-		this.selected = selected || [];
-		// 范围开始
-		this.startDate = startDate
-		// 范围结束
-		this.endDate = endDate
-		this.range = range
-		// 多选状态
-		this.cleanMultipleStatus()
-		// 每周日期
-		this.weeks = {}
-		// this._getWeek(this.date.fullDate)
-		// this.multipleStatus = multipleStatus
-		this.lastHover = false
-	}
-	/**
-	 * 设置日期
-	 * @param {Object} date
-	 */
-	setDate(date) {
-		this.selectDate = this.getDate(date)
-		this._getWeek(this.selectDate.fullDate)
-	}
-
-	/**
-	 * 清理多选状态
-	 */
-	cleanMultipleStatus() {
-		this.multipleStatus = {
-			before: '',
-			after: '',
-			data: []
-		}
-	}
-
-	/**
-	 * 重置开始日期
-	 */
-	resetSatrtDate(startDate) {
-		// 范围开始
-		this.startDate = startDate
-
-	}
-
-	/**
-	 * 重置结束日期
-	 */
-	resetEndDate(endDate) {
-		// 范围结束
-		this.endDate = endDate
-	}
-
-	/**
-	 * 获取任意时间
-	 */
-	getDate(date, AddDayCount = 0, str = 'day') {
-		if (!date) {
-			date = new Date()
-		}
-		if (typeof date !== 'object') {
-			date = date.replace(/-/g, '/')
-		}
-		const dd = new Date(date)
-		switch (str) {
-			case 'day':
-				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
-				break
-			case 'month':
-				if (dd.getDate() === 31) {
-					dd.setDate(dd.getDate() + AddDayCount)
-				} else {
-					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
-				}
-				break
-			case 'year':
-				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
-				break
-		}
-		const y = dd.getFullYear()
-		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
-		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
-		return {
-			fullDate: y + '-' + m + '-' + d,
-			year: y,
-			month: m,
-			date: d,
-			day: dd.getDay()
-		}
-	}
-
-
-	/**
-	 * 获取上月剩余天数
-	 */
-	_getLastMonthDays(firstDay, full) {
-		let dateArr = []
-		for (let i = firstDay; i > 0; i--) {
-			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
-			dateArr.push({
-				date: beforeDate,
-				month: full.month - 1,
-				lunar: this.getlunar(full.year, full.month - 1, beforeDate),
-				disable: true
-			})
-		}
-		return dateArr
-	}
-	/**
-	 * 获取本月天数
-	 */
-	_currentMonthDys(dateData, full) {
-		let dateArr = []
-		let fullDate = this.date.fullDate
-		for (let i = 1; i <= dateData; i++) {
-			let isinfo = false
-			let nowDate = full.year + '-' + (full.month < 10 ?
-				full.month : full.month) + '-' + (i < 10 ?
-				'0' + i : i)
-			// 是否今天
-			let isDay = fullDate === nowDate
-			// 获取打点信息
-			let info = this.selected && this.selected.find((item) => {
-				if (this.dateEqual(nowDate, item.date)) {
-					return item
-				}
-			})
-
-			// 日期禁用
-			let disableBefore = true
-			let disableAfter = true
-			if (this.startDate) {
-				// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
-				// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
-				disableBefore = this.dateCompare(this.startDate, nowDate)
-			}
-
-			if (this.endDate) {
-				// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
-				// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
-				disableAfter = this.dateCompare(nowDate, this.endDate)
-			}
-			let multiples = this.multipleStatus.data
-			let checked = false
-			let multiplesStatus = -1
-			if (this.range) {
-				if (multiples) {
-					multiplesStatus = multiples.findIndex((item) => {
-						return this.dateEqual(item, nowDate)
-					})
-				}
-				if (multiplesStatus !== -1) {
-					checked = true
-				}
-			}
-			let data = {
-				fullDate: nowDate,
-				year: full.year,
-				date: i,
-				multiple: this.range ? checked : false,
-				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
-				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
-				month: full.month,
-				lunar: this.getlunar(full.year, full.month, i),
-				disable: !(disableBefore && disableAfter),
-				isDay
-			}
-			if (info) {
-				data.extraInfo = info
-			}
-
-			dateArr.push(data)
-		}
-		return dateArr
-	}
-	/**
-	 * 获取下月天数
-	 */
-	_getNextMonthDays(surplus, full) {
-		let dateArr = []
-		for (let i = 1; i < surplus + 1; i++) {
-			dateArr.push({
-				date: i,
-				month: Number(full.month) + 1,
-				lunar: this.getlunar(full.year, Number(full.month) + 1, i),
-				disable: true
-			})
-		}
-		return dateArr
-	}
-
-	/**
-	 * 获取当前日期详情
-	 * @param {Object} date
-	 */
-	getInfo(date) {
-		if (!date) {
-			date = new Date()
-		}
-		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
-		return dateInfo
-	}
-
-	/**
-	 * 比较时间大小
-	 */
-	dateCompare(startDate, endDate) {
-		// 计算截止时间
-		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
-		// 计算详细项的截止时间
-		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
-		if (startDate <= endDate) {
-			return true
-		} else {
-			return false
-		}
-	}
-
-	/**
-	 * 比较时间是否相等
-	 */
-	dateEqual(before, after) {
-		// 计算截止时间
-		before = new Date(before.replace('-', '/').replace('-', '/'))
-		// 计算详细项的截止时间
-		after = new Date(after.replace('-', '/').replace('-', '/'))
-		if (before.getTime() - after.getTime() === 0) {
-			return true
-		} else {
-			return false
-		}
-	}
-
-
-	/**
-	 * 获取日期范围内所有日期
-	 * @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.getDate(new Date(parseInt(k))).fullDate)
-		}
-		return arr
-	}
-	/**
-	 * 计算阴历日期显示
-	 */
-	getlunar(year, month, date) {
-		return CALENDAR.solar2lunar(year, month, date)
-	}
-	/**
-	 * 设置打点
-	 */
-	setSelectInfo(data, value) {
-		this.selected = value
-		this._getWeek(data)
-	}
-
-	/**
-	 *  获取多选状态
-	 */
-	setMultiple(fullDate) {
-		let {
-			before,
-			after
-		} = this.multipleStatus
-
-		if (!this.range) return
-		if (before && after) {
-			if (!this.lastHover) {
-				this.lastHover = true
-				return
-			}
-			this.multipleStatus.before = ''
-			this.multipleStatus.after = ''
-			this.multipleStatus.data = []
-			this.multipleStatus.fulldate = ''
-			this.lastHover = false
-		} else {
-			this.lastHover = false
-			if (!before) {
-				this.multipleStatus.before = fullDate
-			} else {
-				this.multipleStatus.after = fullDate
-				if (this.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._getWeek(fullDate)
-	}
-
-	/**
-	 *  鼠标 hover 更新多选状态
-	 */
-	setHoverMultiple(fullDate) {
-		let {
-			before,
-			after
-		} = this.multipleStatus
-
-		if (!this.range) return
-		if (this.lastHover) return
-
-		if (!before) {
-			this.multipleStatus.before = fullDate
-		} else {
-			this.multipleStatus.after = fullDate
-			if (this.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._getWeek(fullDate)
-	}
-
-	/**
-	 * 更新默认值多选状态
-	 */
-	setDefaultMultiple(before, after) {
-		this.multipleStatus.before = before
-		this.multipleStatus.after = after
-		if (before && after) {
-			if (this.dateCompare(before, after)) {
-				this.multipleStatus.data = this.geDateAll(before, after);
-				this._getWeek(after)
-			} else {
-				this.multipleStatus.data = this.geDateAll(after, before);
-				this._getWeek(before)
-			}
-		}
-	}
-
-	/**
-	 * 获取每周数据
-	 * @param {Object} dateData
-	 */
-	_getWeek(dateData) {
-		const {
-			fullDate,
-			year,
-			month,
-			date,
-			day
-		} = this.getDate(dateData)
-		let firstDay = new Date(year, month - 1, 1).getDay()
-		let currentDay = new Date(year, month, 0).getDate()
-		let dates = {
-			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
-			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
-			nextMonthDays: [], // 下个月开始几天
-			weeks: []
-		}
-		let canlender = []
-		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
-		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
-		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
-		let weeks = {}
-		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
-		for (let i = 0; i < canlender.length; i++) {
-			if (i % 7 === 0) {
-				weeks[parseInt(i / 7)] = new Array(7)
-			}
-			weeks[parseInt(i / 7)][i % 7] = canlender[i]
-		}
-		this.canlender = canlender
-		this.weeks = weeks
-	}
-
-	//静态方法
-	// static init(date) {
-	// 	if (!this.instance) {
-	// 		this.instance = new Calendar(date);
-	// 	}
-	// 	return this.instance;
-	// }
-}
-
-
-export default Calendar
diff --git a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/icon/cale-50.png b/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/icon/cale-50.png
deleted file mode 100644
index fc72eaae94388cf559207f04e95aba049b878605..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 673
zcmV;S0$%-zP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00006VoOIv0RI60
z0RN!9r;`8x0#->xK~!jg?U}!8(?Jx#KZ+J51T2zjB?Jl5K~o${7U|;V<{(9cPVFcn
zI5~)epro^Io%A0tbm&qFPF4resSpd|uNFkK6|0L5cOlO&-}`#^%_SF-`@q5DeedqQ
z`+i^EyWBw}5|jr(OSkKTXycG&zY<W@^0=#!e%LtZ*Ozb{FzC+!3qTDx44eZd^|QCS
z`6kWAFW?365ZHE|a1Pi9{tQt23e37J;ymzs030_h=7h=d<d6LZDwF^|0}Wsom<Q@w
z-vpjoz8DwMY)k;RfFf`VSOo6cO!kJ(8@MX;%R+z0hu0~XY}^+5rfG08YZZk2!IOjC
z@?OXVQzzRxvO*_oJj?4*KW%K$`HW6kqKC}W@oCM}X=n;!R%l%UruyYb2KE1U$zI4!
zPmc73kqE7qsA?LTQ@~l*K{0EE#<n1uD5Cxlf!Z;D6!TU@Ke_F%2)mzvpIR>I`9Otq
zS7GfMTBgr_ntyk$Ha1Lqt<egtp;<_hn6*MPatkpXo?RCDCqiEq`c`7Db)lcJuwg~F
z2XsZDf0vlIN;(x(dImUZVZ(}{2`$?%(f}T7Syt&);G&jgCEgbLB-el=T7G3=BNs9K
zhQ>CuOb2vz{S06eSkm%w;GP)2*oBX|@U@}K+BCWnLn{r_;n{28zLsUC`6l#17@Dm0
zL&)VGIF$$K$DXNEGPE{OH%Fif)JfpGU%#AaUn{hEZaZ)qb=?*EQYWo_(F?QY3hF>0
zwByM|T*z|TbQxMj6|ovHX8#VnvyTe*N5D=%KO&Jx#4~>ZHrP8;-9Ar000000NkvXX
Hu0mjf5KA%s

diff --git a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
deleted file mode 100644
index 189226de..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
+++ /dev/null
@@ -1,780 +0,0 @@
-<template>
-	<view class="uni-date">
-		<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" @click="show">
-				<view class="uni-date__icon-logo">
-					<image class="uni-date-editor--logo" src="./icon/cale-50.png" mode=""></image>
-				</view>
-				<input class="uni-date__input" type="text" v-model="singleVal" :placeholder="placeholder"
-					:disabled="true" />
-			</view>
-			<view v-else class="uni-date-x uni-date-range" @click="show">
-				<view class="uni-date__icon-logo">
-					<image class="uni-date-editor--logo" src="./icon/cale-50.png" mode=""></image>
-				</view>
-				<input class="uni-date__input uni-date-range__input" type="text" v-model="range.startDate"
-					:placeholder="startPlaceholder" :disabled="true" />
-				<slot>
-					<view class="">{{rangeSeparator}}</view>
-				</slot>
-				<input class="uni-date__input uni-date-range__input" type="text" v-model="range.endDate"
-					:placeholder="endPlaceholder" :disabled="true" />
-			</view>
-			<view v-show="!disabled && (singleVal || (range.startDate && range.endDate))" class="uni-date__icon-clear"
-				@click="clear">
-				<uni-icons type="clear" color="#e1e1e1" size="14"></uni-icons>
-			</view>
-		</view>
-
-		<view v-show="popup" class="uni-date-mask" @click="close"></view>
-		<view ref="datePicker" v-show="popup" class="uni-date-picker__container">
-			<view v-if="!isRange" class="uni-date-single--x" :style="popover">
-				<view v-show="hasTime" class="uni-date-changed popup-x-header">
-					<input class="uni-date__input uni-date-range__input" type="text" v-model="tempSingleDate"
-						placeholder="选择日期" />
-					<time-picker type="time" v-model="time" :border="false" :disabled="!tempSingleDate"
-						:start="reactStartTime" :end="reactEndTime">
-						<input class="uni-date__input uni-date-range__input" type="text" v-model="time"
-							placeholder="选择时间" :disabled="!tempSingleDate" />
-					</time-picker>
-				</view>
-				<uni-calendar ref="pcSingle" :showMonth="false" :start-date="caleRange.startDate"
-					:end-date="caleRange.endDate" :date="defSingleDate" @change="singleChange" />
-				<view v-if="hasTime" class="popup-x-footer">
-					<!-- <text class="">此刻</text> -->
-					<text class="confirm" @click="confirmSingleChange">确定</text>
-				</view>
-			</view>
-
-			<view v-else class="uni-date-range--x" :style="popover">
-				<view v-show="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="开始日期" />
-						<time-picker type="time" v-model="tempRange.startTime" :start="reactStartTime"
-							:border="false" :disabled="!tempRange.startDate">
-							<input class="uni-date__input uni-date-range__input" type="text"
-								v-model="tempRange.startTime" placeholder="开始时间" :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="结束日期" />
-						<time-picker type="time" v-model="tempRange.endTime" :end="reactEndTime" :border="false"
-							:disabled="!tempRange.endDate">
-							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endTime"
-								placeholder="结束时间" :disabled="!tempRange.endDate" />
-						</time-picker>
-					</view>
-				</view>
-				<view class="popup-x-body">
-					<uni-calendar ref="left" :showMonth="false" :start-date="caleRange.startDate"
-						:end-date="caleRange.endDate" :range="true" @change="leftChange" :pleStatus="endMultipleStatus"
-						@firstEnterCale="updateRightCale" @monthSwitch="leftMonthSwitch" style="padding-right: 16px;" />
-					<uni-calendar ref="right" :showMonth="false" :start-date="caleRange.startDate"
-						:end-date="caleRange.endDate" :range="true" @change="rightChange"
-						:pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
-						@monthSwitch="rightMonthSwitch" style="padding-left: 16px;border-left: 1px solid #F1F1F1;" />
-				</view>
-				<view v-if="hasTime" class="popup-x-footer">
-					<text class="" @click="clear">清空</text>
-					<text class="confirm" @click="confirmRangeChange">确定</text>
-				</view>
-			</view>
-		</view>
-		<uni-calendar ref="mobile" :clearDate="false" :date="defSingleDate" :defTime="reactMobDefTime"
-			:start-date="caleRange.startDate" :end-date="caleRange.endDate" :selectableTimes="mobSelectableTime"
-			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :typeHasTime="hasTime" :insert="false"
-			@confirm="mobileChange" />
-	</view>
-</template>
-<script>
-	import uniCalendar from './basic/uni-calendar.vue'
-	import timePicker from './basic/time-picker/components/time-picker/time-picker.vue'
-
-	/**
-	 * uni-date-picker
-	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=4700
-	 * @property {String} type 选择器类型
-	 * @property {String|Array} value 绑定值
-	 * @property {String} placeholder 单选择时的占位内容
-	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
-	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
-	 * @property {String} range-separator 选择范围时的分隔符
-	 * @property {Boolean} border = [true|false] 是否有边框
-	 * @property {Boolean} disabled = [true|false] 是否禁用
-	 * @event {Function} change 确定日期时触发的事件
-	 **/
-
-	export default {
-		components: {
-			uniCalendar,
-			timePicker
-		},
-		data() {
-			return {
-				isRange: false,
-				hasTime: false,
-				mobileRange: false,
-				// 单选
-				singleVal: '',
-				tempSingleDate: '',
-				defSingleDate: '',
-				time: '',
-				// 范围选
-				caleRange: {
-					startDate: '',
-					startTime: '',
-					endDate: '',
-					endTime: ''
-				},
-				range: {
-					startDate: '',
-					// startTime: '',
-					endDate: '',
-					// endTime: ''
-				},
-				tempRange: {
-					startDate: '',
-					startTime: '',
-					endDate: '',
-					endTime: ''
-				},
-				// 左右日历同步数据
-				startMultipleStatus: {
-					before: '',
-					after: '',
-					data: [],
-					fulldate: ''
-				},
-				endMultipleStatus: {
-					before: '',
-					after: '',
-					data: [],
-					fulldate: ''
-				},
-				visible: false,
-				popup: false,
-				popover: null
-			}
-		},
-		props: {
-			type: {
-				type: String,
-				default: 'datetime'
-			},
-			value: {
-				type: [String, Number, Array],
-				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
-			}
-		},
-		watch: {
-			type: {
-				immediate: true,
-				handler(newVal, oldVal) {
-					if (newVal.indexOf('time') !== -1) {
-						this.hasTime = true
-					}
-					if (newVal.indexOf('range') !== -1) {
-						this.isRange = true
-					} else {
-						this.isRange = false
-					}
-				}
-			},
-			value: {
-				immediate: true,
-				handler(newVal, oldVal) {
-					if (!newVal) return
-					if (!Array.isArray(newVal) && !this.isRange) {
-						const {
-							defDate,
-							defTime
-						} = this.parseDate(newVal)
-						this.singleVal = defDate
-						this.tempSingleDate = defDate
-						this.defSingleDate = defDate
-						if (this.hasTime) {
-							this.singleVal = defDate + ' ' + defTime
-							this.time = defTime
-						}
-					} else {
-						if (oldVal) return // 只初始默认值
-						const [before, after] = newVal
-						if (!before && !after) return
-						const defBefore = this.parseDate(before)
-						const defAfter = this.parseDate(after)
-						this.range.startDate = this.tempRange.startDate = defBefore.defDate
-						this.range.endDate = this.tempRange.endDate = defAfter.defDate
-
-						if (this.hasTime) {
-							this.range.startDate = defBefore.defDate + ' ' + defBefore.defTime
-							this.range.endDate = defAfter.defDate + ' ' + defAfter.defTime
-							this.tempRange.startTime = defBefore.defTime
-							this.tempRange.endTime = defAfter.defTime
-						}
-						const defaultRange = {
-							before: defBefore.defDate,
-							after: defAfter.defDate
-						}
-						this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, defaultRange, {
-							which: 'right'
-						})
-						this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, defaultRange, {
-							which: 'left'
-						})
-					}
-				}
-			},
-
-			start: {
-				immediate: true,
-				handler(newVal, oldVal) {
-					if (!newVal) return
-					const {
-						defDate,
-						defTime
-					} = this.parseDate(newVal)
-					this.caleRange.startDate = defDate
-					if (this.hasTime) {
-						this.caleRange.startTime = defTime
-					}
-				}
-			},
-
-			end: {
-				immediate: true,
-				handler(newVal, oldVal) {
-					if (!newVal) return
-					const {
-						defDate,
-						defTime
-					} = this.parseDate(newVal)
-					this.caleRange.endDate = defDate
-					if (this.hasTime) {
-						this.caleRange.endTime = defTime
-					}
-				}
-			},
-		},
-		computed: {
-			reactStartTime() {
-				const activeDate = this.isRange ? this.tempRange.startDate : this.tempSingleDate
-				const res = activeDate === this.caleRange.startDate ? this.caleRange.startTime : ''
-				return res
-			},
-			reactEndTime() {
-				const activeDate = this.isRange ? this.tempRange.endDate : this.tempSingleDate
-				const res = activeDate === this.caleRange.endDate ? this.caleRange.endTime : ''
-				return res
-			},
-			reactMobDefTime() {
-				return this.isRange ? {
-					start: this.tempRange.startTime,
-					end: this.tempRange.endTime
-				} : this.time
-			},
-			mobSelectableTime() {
-				return {
-					start: this.caleRange.startTime,
-					end: this.caleRange.endTime
-				}
-			}
-		},
-		mounted() {
-			if (this.isRange) {
-				if (!Array.isArray(this.value)) return
-				const [before, after] = this.value
-				if (before && after) return
-				setTimeout(() => {
-					this.$refs.right.next()
-					this.$refs.right.cale.lastHover = false
-				}, 20)
-			}
-		},
-		methods: {
-			updateLeftCale(e) {
-				// console.log('----updateStartCale:', e);
-				const left = this.$refs.left
-				// 设置范围选
-				left.cale.setHoverMultiple(e.after)
-				left.setDate(this.$refs.left.nowDate.fullDate)
-			},
-			updateRightCale(e) {
-				// console.log('----updateStartCale:', e);
-				const right = this.$refs.right
-				// 设置范围选
-				right.cale.setHoverMultiple(e.after)
-				right.setDate(this.$refs.right.nowDate.fullDate)
-			},
-			getRef() {
-				this.$refs.left.pre()
-			},
-			show(event) {
-				if (this.disabled) {
-					return
-				}
-				const systemInfo = uni.getSystemInfoSync()
-				if (systemInfo.windowWidth <= 500) {
-					this.$refs.mobile.open()
-					return
-				}
-				this.popover = {
-					top: '10px'
-				}
-				// const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor--x")
-				// dateEditor.boundingClientRect(rect => {
-				// 	console.log(22222222, rect);
-				// 	if (leftWindowInfo.errMsg) {
-				// 		left = rect.left + 'px'
-				// 	} else {
-				// 		left = '15px'
-				// 	}
-				// 	this.popover = {
-				// 		// top: rect.top + rect.height + 15 + 'px',
-				// 		top: '40px',
-				// 		left: 0,
-				// 	}
-				// }).exec()
-				setTimeout(() => {
-					this.popup = !this.popup
-					// this.visible = true
-				}, 20)
-			},
-
-			close() {
-				setTimeout(() => {
-					this.popup = false
-					// this.visible = true
-				}, 20)
-			},
-			setEmit(value) {
-				if (this.returnType === "timestamp") {
-					if (!Array.isArray(value)) {
-						if (!this.hasTime) {
-							value = value + ' ' + '00:00:00'
-						}
-						value = Date.parse(new Date(value))
-					} else {
-						if (!this.hasTime) {
-							value[0] = value[0] + ' ' + '00:00:00'
-							value[1] = value[1] + ' ' + '00:00:00'
-						}
-						value[0] = Date.parse(new Date(value[0]))
-						value[1] = Date.parse(new Date(value[1]))
-					}
-				}
-				this.$emit('change', value)
-				this.$emit('input', value)
-			},
-			singleChange(e) {
-				this.tempSingleDate = e.fulldate
-				if (this.hasTime) return
-				this.confirmSingleChange()
-			},
-
-			confirmSingleChange() {
-				if (!this.tempSingleDate) {
-					this.popup = false
-					return
-				}
-				if (this.hasTime) {
-					this.singleVal = this.tempSingleDate + ' ' + (this.time ? this.time : '00:00:00')
-				} else {
-					this.singleVal = this.tempSingleDate
-				}
-				this.setEmit(this.singleVal)
-				this.popup = 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)
-				// console.log('startMultipleStatus 返回:', this.startMultipleStatus)
-			},
-
-			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)
-				// console.log('endMultipleStatus 返回:', this.endMultipleStatus)
-			},
-
-			mobileChange(e) {
-				if (this.isRange) {
-					const {
-						before,
-						after
-					} = e.range
-					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.singleVal = e.fulldate + ' ' + e.time
-					} else {
-						this.singleVal = e.fulldate
-					}
-					this.setEmit(this.singleVal)
-				}
-				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.popup = false
-					return
-				}
-				let start, end
-				if (!this.hasTime) {
-					start = this.range.startDate = this.tempRange.startDate
-					end = this.range.endDate = this.tempRange.endDate
-				} else {
-					start = this.range.startDate = this.tempRange.startDate + ' ' +
-						(this.tempRange.startTime ? this.tempRange.startTime : '00:00:00')
-					end = this.range.endDate = this.tempRange.endDate + ' ' +
-						(this.tempRange.endTime ? this.tempRange.endTime : '00:00:00')
-				}
-				const displayRange = [start, end]
-				this.setEmit(displayRange)
-				this.popup = false
-			},
-
-			handleStartAndEnd(before, after, temp = false) {
-				if (!(before && after)) return
-				const type = temp ? 'tempRange' : 'range'
-				if (this.dateCompare(before, after)) {
-					this[type].startDate = before
-					this[type].endDate = after
-				} else {
-					this[type].startDate = after
-					this[type].endDate = before
-				}
-			},
-
-			/**
-			 * 比较时间大小
-			 */
-			dateCompare(startDate, endDate) {
-				// 计算截止时间
-				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
-				// 计算详细项的截止时间
-				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
-				if (startDate <= endDate) {
-					return true
-				} else {
-					return false
-				}
-			},
-
-			clear() {
-				if (!this.isRange) {
-					this.singleVal = ''
-					this.$refs.pcSingle.calendar.fullDate = ''
-					this.$refs.pcSingle.setDate()
-					this.$emit('change', '')
-					this.$emit('input', '')
-				} else {
-					this.range.startDate = ''
-					this.range.endDate = ''
-					this.tempRange = {}
-					this.$refs.left.cale.multipleStatus.before = ''
-					this.$refs.left.cale.multipleStatus.after = ''
-					this.$refs.left.cale.multipleStatus.data = []
-					this.$refs.left.cale.lastHover = false
-					this.$refs.left.setDate()
-					this.$refs.right.cale.multipleStatus.before = ''
-					this.$refs.right.cale.multipleStatus.after = ''
-					this.$refs.right.cale.multipleStatus.data = []
-					this.$refs.right.cale.lastHover = false
-					this.$refs.right.setDate()
-					this.$refs.right.next()
-					this.$emit('change', ['', ''])
-					this.$emit('input', ['', ''])
-				}
-				// if (this.popup) this.popup = false
-			},
-
-			parseDate(date) {
-				const defVal = new Date(date)
-				const year = defVal.getFullYear()
-				const month = defVal.getMonth() + 1
-				const day = defVal.getDate()
-				const hour = defVal.getHours()
-				const minute = defVal.getMinutes()
-				const second = defVal.getSeconds()
-				const defDate = year + '-' + this.lessTen(month) + '-' + this.lessTen(day)
-				const defTime = this.lessTen(hour) + ':' + this.lessTen(minute) + ':' + this.lessTen(second)
-				return {
-					defDate,
-					defTime
-				}
-			},
-
-			lessTen(item) {
-				return item < 10 ? '0' + item : item
-			},
-
-
-			leftMonthSwitch(e) {
-				// console.log('leftMonthSwitch 返回:', e)
-			},
-			rightMonthSwitch(e) {
-				// console.log('rightMonthSwitch 返回:', e)
-			}
-		}
-	}
-</script>
-
-<style>
-	.uni-date-x {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		padding: 0 10px;
-		border-radius: 4px;
-		background-color: #fff;
-		color: #666;
-		font-size: 14px;
-	}
-
-	.uni-date-x--border {
-		box-sizing: border-box;
-		border-radius: 4px;
-		border: 1px solid #dcdfe6;
-	}
-
-	.uni-date-editor--x {
-		position: relative;
-	}
-
-	.uni-date-editor--x:hover .uni-date__icon-clear {
-		position: absolute;
-		top: 5px;
-		right: 0;
-		display: inline-block;
-		box-sizing: border-box;
-		border: 6px solid transparent;
-		margin-right: 6px;
-		/* #ifdef H5 */
-		cursor: pointer;
-		/* #endif */
-	}
-
-	.uni-date__icon-clear {
-		display: none;
-	}
-
-	.uni-date__input {
-		height: 40px;
-		width: 100%;
-		padding: 0 8px;
-		line-height: 40px;
-		font-size: 14px;
-	}
-
-	.uni-date-range__input {
-		text-align: center;
-	}
-
-	.uni-date-picker__container {
-		position: relative;
-		/* 		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		box-sizing: border-box;
-		z-index: 996;
-		font-size: 14px; */
-	}
-
-	.uni-date-mask {
-		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 {
-		position: absolute;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		/* width: 375px; */
-		border: 1px solid #F1F1F1;
-		border-radius: 4px;
-	}
-
-	.uni-date-range--x {
-		background-color: #fff;
-		position: absolute;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		/* width: 733px; */
-		border: 1px solid #F1F1F1;
-		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;
-		/* justify-content: space-between; */
-	}
-
-	.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;
-		background-color: #fff;
-		line-height: 40px;
-		text-align: right;
-		color: #666;
-	}
-
-	.popup-x-footer text:hover {
-		color: #007aff;
-		cursor: pointer;
-		opacity: 0.8;
-	}
-
-	.popup-x-footer .confirm {
-		margin-left: 20px;
-		color: #007aff;
-	}
-
-	.uni-date-changed {
-		background-color: #fff;
-		text-align: center;
-		color: #333;
-		border-bottom-color: #F1F1F1;
-		border-bottom-style: solid;
-		border-bottom-width: 1px;
-		/* padding: 0 50px; */
-	}
-
-	.uni-date-changed--time text {
-		/* padding: 0 20px; */
-		height: 50px;
-		line-height: 50px;
-	}
-
-	.uni-date-changed .uni-date-changed--time {
-		/* display: flex; */
-		flex: 1;
-	}
-
-	.uni-date-changed--time-date {
-		color: #333;
-		opacity: 0.6;
-	}
-
-	.mr-50 {
-		margin-right: 50px;
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/package.json b/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/package.json
deleted file mode 100644
index 7d7ba31b..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/package.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "id": "uni-datetime-picker",
-  "displayName": "uni-datetime-picker 日期选择器",
-  "version": "2.0.2",
-  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
-  "keywords": [
-    "uni-datetime-picker",
-    "uni-ui",
-    "日期时间选择器",
-    "日期时间"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "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"
-        }
-      }
-    }
-  }
-}
diff --git a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/readme.md b/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/readme.md
deleted file mode 100644
index 1823a4fd..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-datetime-picker/readme.md
+++ /dev/null
@@ -1,62 +0,0 @@
-
-> `重要通知：组件升级更新 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 显示框中
-
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<uni-datetime-picker></uni-datetime-picker>
-<uni-datetime-picker v-model="vModelDatetime" start="2010-6-10 08:30:30" end="2021-6-10 08:30:30"></uni-datetime-picker>
-<uni-datetime-picker :value="timestamp" return-type="timestamp" start="1276129830000" end="1623285030000" @change="timestampChange"></uni-datetime-picker>
-<uni-datetime-picker type="date" :value="date" start="2020-6-15" end="2025-6-15" @change="dateChange"></uni-datetime-picker>
-<uni-datetime-picker type="time" :value="time" start="06:30:30" end="12:30:30" @change="timeChange"></uni-datetime-picker>
-```
-
-## API
-
-### DatetimePicker Props
-
-|属性名			|类型						|默认值		|值域									|说明																											|
-|:-:				|:-:						|:-:			|											|:-:																											|
-|type				|String					|datetime	|date/daterange/datetime/datetimerange
-range|选择器类型																								|
-|value			|String、Number	|-				|-										|输入框当前值																							|
-|start			|String、Number	|-				|-										|最小值，可以使用日期的字符串（String）、时间戳（Number）	|
-|end				|String、Number	|-				|-										|最大值，可以使用日期的字符串（String）、时间戳（Number）	|
-|return-type|String					|timestamp|timestamp 、string		|返回值格式																								|
-|border			|Boolean、String|true			|											|是否有边框																								|
-|placeholder		|String			|-			|-																			|非范围选择时的占位内容			|
-|start-placeholder	|String			|-			|-																			|范围选择时开始日期的占位内容	|
-|end-placeholder	|String			|-			|-																			|范围选择时结束日期的占位内容	|
-|disabled		|Boolean、String|false		|											|是否不可选择																							|
-
-
-
-
-### DatetimePicker Events
-
-|事件名称	|说明												|返回值	|
-|:-:		|:-:												|:-:	|
-|change		|确定日期时间时触发的事件，参数为当前选择的日期对象	|	单选返回日期字符串，如：'2010-02-3'；范围选返回日期字符串数组，如：['2020-10-1',  '2021-4-1']	|
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-easyinput/changelog.md b/uni_modules/uni-feedback/uni_modules/uni-easyinput/changelog.md
deleted file mode 100644
index 958e44c0..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-easyinput/changelog.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## 0.0.11（2021-05-07）
-- 修复 input-border 属性不生效的问题
-## 0.0.10（2021-04-30）
-- 修复 ios 遮挡文字、显示一半的问题
-## 0.0.9（2021-02-05）
-- 调整为uni_modules目录规范
-- 优化 兼容 nvue 页面
diff --git a/uni_modules/uni-feedback/uni_modules/uni-easyinput/components/uni-easyinput/common.js b/uni_modules/uni-feedback/uni_modules/uni-easyinput/components/uni-easyinput/common.js
deleted file mode 100644
index 5549cc99..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-easyinput/components/uni-easyinput/common.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @desc 函数防抖
- * @param func 目标函数
- * @param wait 延迟执行毫秒数
- * @param immediate true - 立即执行， false - 延迟执行
- */
-export const debounce = function(func, wait = 1000, immediate = true) {
-	let timer;
-	console.log(1);
-	return function() {
-		console.log(123);
-		let context = this,
-			args = arguments;
-		if (timer) clearTimeout(timer);
-		if (immediate) {
-			let callNow = !timer;
-			timer = setTimeout(() => {
-				timer = null;
-			}, wait);
-			if (callNow) func.apply(context, args);
-		} else {
-			timer = setTimeout(() => {
-				func.apply(context, args);
-			}, wait)
-		}
-	}
-}
-/**
- * @desc 函数节流
- * @param func 函数
- * @param wait 延迟执行毫秒数
- * @param type 1 使用表时间戳，在时间段开始的时候触发 2 使用表定时器，在时间段结束的时候触发
- */
-export const throttle = (func, wait = 1000, type = 1) => {
-	let previous = 0;
-	let timeout;
-	return function() {
-		let context = this;
-		let args = arguments;
-		if (type === 1) {
-			let now = Date.now();
-
-			if (now - previous > wait) {
-				func.apply(context, args);
-				previous = now;
-			}
-		} else if (type === 2) {
-			if (!timeout) {
-				timeout = setTimeout(() => {
-					timeout = null;
-					func.apply(context, args)
-				}, wait)
-			}
-		}
-	}
-}
diff --git a/uni_modules/uni-feedback/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue b/uni_modules/uni-feedback/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
deleted file mode 100644
index e4c73e11..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<template>
-	<view class="uni-easyinput" :class="{'uni-easyinput-error':msg}" :style="{color:inputBorder && msg?'#dd524d':styles.color}">
-		<view class="uni-easyinput__content" :class="{'is-input-border':inputBorder ,'is-input-error-border':inputBorder && msg,'is-textarea':type==='textarea','is-disabled':disabled}"
-		 :style="{'border-color':inputBorder && msg?'#dd524d':styles.borderColor,'background-color':disabled?styles.disableColor:''}">
-			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc" @click="onClickIcon('prefix')"></uni-icons>
-			<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea" :class="{'input-padding':inputBorder}"
-			 :name="name" :value="val" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled"
-			 :maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" @input="onInput" @blur="onBlur" @focus="onFocus"
-			 @confirm="onConfirm"></textarea>
-			<input v-else :type="type === 'password'?'text':type" class="uni-easyinput__content-input" :style="{
-				 'padding-right':type === 'password' ||clearable || prefixIcon?'':'10px',
-				 'padding-left':prefixIcon?'':'10px'
-			 }"
-			 :name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder"
-			 :placeholderStyle="placeholderStyle" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" @focus="onFocus"
-			 @blur="onBlur" @input="onInput" @confirm="onConfirm" />
-			<template v-if="type === 'password'">
-				<uni-icons v-if="val != '' " class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}" :type="showPassword?'eye-slash-filled':'eye-filled'"
-				 :size="18" color="#c0c4cc" @click="onEyes"></uni-icons>
-			</template>
-			<template v-else-if="suffixIcon">
-				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc" @click="onClickIcon('suffix')"></uni-icons>
-			</template>
-			<template v-else>
-				<uni-icons class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}" type="clear" :size="clearSize"
-				 v-if="clearable && val " color="#c0c4cc" @click="onClear"></uni-icons>
-			</template>
-			<slot name="right"></slot>
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * Field 输入框
-	 * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21001
-	 * @property {String| Number} 	value 		输入内容
-	 * @property {String } 	type 							输入框的类型（默认text） password/text/textarea/..
-	 * 	@value text				文本输入键盘
-	 * 	@value textarea 	多行文本输入键盘
-	 * 	@value password 	密码输入键盘
-	 * 	@value number			数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式
-	 * 	@value idcard			身份证输入键盘，信、支付宝、百度、QQ小程序
-	 * 	@value digit			带小数点的数字键盘	，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
-	 * @property {Boolean} 	clearable 				是否显示右侧清空内容的图标控件(输入框有内容，且获得焦点时才显示)，点击可清空输入框内容（默认true）
-	 * @property {Boolean} 	autoHeight 				是否自动增高输入区域，type为textarea时有效（默认true）
-	 * @property {String } 	placeholder 			输入框的提示文字
-	 * @property {String } 	placeholderStyle 	placeholder的样式(内联样式，字符串)，如"color: #ddd"
-	 * @property {Boolean} 	focus 						是否自动获得焦点（默认false）
-	 * @property {Boolean} 	disabled 					是否不可输入（默认false）
-	 * @property {Number } 	maxlength 				最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
-	 * @property {String } 	confirmType 			设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
-	 * @property {Number } 	clearSize 				清除图标的大小，单位px（默认15）
-	 * @property {String} 	prefixIcon				输入框头部图标
-	 * @property {String} 	suffixIcon				输入框尾部图标
-	 * @property {Boolean} 	trim 							是否自动去除两端的空格
-	 * @value both	去除两端空格
-	 * @value left	去除左侧空格
-	 * @value right	去除右侧空格
-	 * @value start	去除左侧空格
-	 * @value end		去除右侧空格
-	 * @value all		去除全部空格
-	 * @value none	不去除空格
-	 * @property {Boolean} 	inputBorder 			是否显示input输入框的边框（默认true）
-	 * @property {Object} 	styles 						自定义颜色
-	 * @event {Function} 		input 						输入框内容发生变化时触发
-	 * @event {Function} 		focus 						输入框获得焦点时触发
-	 * @event {Function} 		blur 							输入框失去焦点时触发
-	 * @event {Function} 		confirm 					点击完成按钮时触发
-	 * @event {Function} 		iconClick 				点击图标时触发
-	 * @example <uni-easyinput v-model="mobile"></uni-easyinput>
-	 */
-
-	import {
-		debounce,
-		throttle
-	} from './common.js'
-
-	export default {
-		name: 'uni-easyinput',
-		props: {
-			name: String,
-			value: [Number, String],
-			type: {
-				type: String,
-				default: 'text'
-			},
-			clearable: {
-				type: Boolean,
-				default: true
-			},
-			autoHeight: {
-				type: Boolean,
-				default: false
-			},
-			placeholder: String,
-			placeholderStyle: String,
-			focus: {
-				type: Boolean,
-				default: false
-			},
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			maxlength: {
-				type: [Number, String],
-				default: 140
-			},
-			confirmType: {
-				type: String,
-				default: 'done'
-			},
-			// 清除按钮的大小
-			clearSize: {
-				type: [Number, String],
-				default: 15
-			},
-			// 是否显示 input 边框
-			inputBorder: {
-				type: Boolean,
-				default: true
-			},
-			prefixIcon: {
-				type: String,
-				default: ''
-			},
-			suffixIcon: {
-				type: String,
-				default: ''
-			},
-			// 是否自动去除两端的空格
-			trim: {
-				type: [Boolean, String],
-				default: true
-			},
-			// 自定义样式
-			styles: {
-				type: Object,
-				default () {
-					return {
-						color: '#333',
-						disableColor: '#eee',
-						borderColor: '#e5e5e5'
-					}
-				}
-			}
-		},
-		data() {
-			return {
-				focused: false,
-				errMsg: '',
-				val: '',
-				showMsg: '',
-				border: false,
-				isFirstBorder: false,
-				showClearIcon: false,
-				showPassword: false
-			};
-		},
-		computed: {
-			msg() {
-				return this.errorMessage || this.errMsg;
-			},
-			// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
-			inputMaxlength() {
-				return Number(this.maxlength);
-			},
-		},
-		watch: {
-			value(newVal) {
-				if (this.errMsg) this.errMsg = ''
-				this.val = newVal
-				if (this.form && this.formItem) {
-					this.formItem.setValue(newVal)
-				}
-			},
-			focus(newVal) {
-				this.$nextTick(() => {
-					this.focused = this.focus
-				})
-			}
-		},
-		created() {
-			this.val = this.value
-			this.form = this.getForm('uniForms')
-			this.formItem = this.getForm('uniFormsItem')
-			if (this.form && this.formItem) {
-				if (this.formItem.name) {
-					this.rename = this.formItem.name
-					this.form.inputChildrens.push(this)
-				}
-			}
-		},
-		mounted() {
-			// this.onInput = throttle(this.input, 500)
-			this.$nextTick(() => {
-				// setTimeout(()=>{
-				// },1000)
-				this.focused = this.focus
-			})
-		},
-		methods: {
-			/**
-			 * 初始化变量值
-			 */
-			init() {
-
-			},
-			onClickIcon(type) {
-				this.$emit('iconClick', type)
-			},
-			/**
-			 * 获取父元素实例
-			 */
-			getForm(name = 'uniForms') {
-				let parent = this.$parent;
-				let parentName = parent.$options.name;
-				while (parentName !== name) {
-					parent = parent.$parent;
-					if (!parent) return false;
-					parentName = parent.$options.name;
-				}
-				return parent;
-			},
-
-			onEyes() {
-				this.showPassword = !this.showPassword
-			},
-			onInput(event) {
-				let value = event.detail.value;
-				// 判断是否去除空格
-				if (this.trim) {
-					if (typeof(this.trim) === 'boolean' && this.trim) {
-						value = this.trimStr(value)
-					}
-					if (typeof(this.trim) === 'string') {
-						value = this.trimStr(value, this.trim)
-					}
-				};
-				if (this.errMsg) this.errMsg = ''
-				this.val = value
-				this.$emit('input', value);
-			},
-
-			onFocus(event) {
-				// this.focused = true;
-				this.$emit('focus', event);
-			},
-			onBlur(event) {
-				let value = event.detail.value;
-				// setTimeout(() => {
-				// this.focused = false;
-				// }, 100);
-				this.$emit('blur', event);
-			},
-			onConfirm(e) {
-				this.$emit('confirm', e.detail.value);
-			},
-			onClear(event) {
-				this.val = '';
-				this.$emit('input', '');
-			},
-			fieldClick() {
-				this.$emit('click');
-			},
-			trimStr(str, pos = 'both') {
-				if (pos === 'both') {
-					return str.trim();
-				} else if (pos === 'left') {
-					return str.trimLeft();
-				} else if (pos === 'right') {
-					return str.trimRight();
-				} else if (pos === 'start') {
-					return str.trimStart()
-				} else if (pos === 'end') {
-					return str.trimEnd()
-				} else if (pos === 'all') {
-					return str.replace(/\s+/g, '');
-				} else if (pos === 'none') {
-					return str;
-				}
-				return str;
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	.uni-easyinput {
-		/* #ifndef APP-NVUE */
-		width: 100%;
-		/* #endif */
-		flex: 1;
-		position: relative;
-		text-align: left;
-		color: #333;
-		font-size: 14px;
-	}
-
-	.uni-easyinput__content {
-		flex: 1;
-		/* #ifndef APP-NVUE */
-		width: 100%;
-		display: flex;
-		box-sizing: border-box;
-		/* #endif */
-		min-height: 36px;
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.uni-easyinput__content-input {
-		/* #ifndef APP-NVUE */
-		width: auto;
-		/* #endif */
-		position: relative;
-		overflow: hidden;
-		flex: 1;
-		line-height: 1;
-		font-size: 14px;
-	}
-
-	.is-textarea {
-		align-items: flex-start;
-	}
-
-	.is-textarea-icon {
-		margin-top: 5px;
-	}
-
-	.uni-easyinput__content-textarea {
-		position: relative;
-		overflow: hidden;
-		flex: 1;
-		line-height: 1.5;
-		font-size: 14px;
-		padding-top: 6px;
-		padding-bottom: 10px;
-		height: 80px;
-		/* #ifndef APP-NVUE */
-		min-height: 80px;
-		width: auto;
-		/* #endif */
-	}
-
-	.input-padding {
-		padding-left: 10px;
-	}
-
-	.content-clear-icon {
-		padding: 0 5px;
-	}
-
-	.label-icon {
-		margin-right: 5px;
-		margin-top: -1px;
-	}
-
-	// 显示边框
-	.is-input-border {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		box-sizing: border-box;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		border: 1px solid $uni-border-color;
-		border-radius: 4px;
-	}
-
-	.uni-easyinput__right {
-		// margin-left: 5px;
-	}
-
-	// 必填
-	.is-required {
-		color: $uni-color-error;
-	}
-
-	.uni-error-message {
-		position: absolute;
-		bottom: -17px;
-		left: 0;
-		line-height: 12px;
-		color: $uni-color-error;
-		font-size: 12px;
-		text-align: left;
-	}
-
-	.uni-error-msg--boeder {
-		position: relative;
-		bottom: 0;
-		line-height: 22px;
-	}
-
-	.is-input-error-border {
-		border-color: $uni-color-error;
-	}
-
-	.uni-easyinput--border {
-		margin-bottom: 0;
-		padding: 10px 15px;
-		// padding-bottom: 0;
-		border-top: 1px #eee solid;
-	}
-
-	.uni-easyinput-error {
-		padding-bottom: 0;
-	}
-
-	.is-first-border {
-		/* #ifndef APP-NVUE */
-		border: none;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		border-width: 0;
-		/* #endif */
-	}
-
-	.is-disabled {
-		background-color: #eee;
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-easyinput/package.json b/uni_modules/uni-feedback/uni_modules/uni-easyinput/package.json
deleted file mode 100644
index fac77e33..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-easyinput/package.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "id": "uni-easyinput",
-  "displayName": "Easyinput 增强输入框",
-  "version": "0.0.11",
-  "description": "Easyinput 组件是对原生input组件的增强",
-  "keywords": [
-    "input",
-    "uni-easyinput",
-    "输入框"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [
-      "uni-icons"
-    ],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-easyinput/readme.md b/uni_modules/uni-feedback/uni_modules/uni-easyinput/readme.md
deleted file mode 100644
index 4d61363e..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-easyinput/readme.md
+++ /dev/null
@@ -1,194 +0,0 @@
-
-
-### Easyinput 增强输入框
-> **组件名：uni-easyinput**
-> 代码块： `uEasyinput`
-
-
-easyinput 组件是对原生input组件的增强 ，是专门为配合表单组件[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)而设计的，easyinput 内置了边框，图标等，同时包含 input 所有功能
-
-
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 组件需要依赖 `sass` 插件 ，请自行手动安装
-> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-
-
-### 平台差异说明
-
-暂不支持在nvue页面中使用
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-### 基本用法
-
-输入内容后，输入框尾部会显示清除按钮，点击可清除内容，如不需要展示图标，`clearable` 属性设置为 `false` 即可
-
-`clearable` 属性设置为 `true` ，输入框聚焦且内容不为空时，才会显示内容
-
-```html
-<uni-easyinput v-model="value" placeholder="请输入内容"></uni-easyinput>
-```
-
-
-### 输入框带左右图标
-
-设置 `prefixIcon` 属性来显示输入框的头部图标
-
-设置 `suffixIcon` 属性来显示输入框的尾部图标 
-
-注意图标当前只支持 `uni-icons` 内置的图标，当配置 `suffixIcon` 属性后，会覆盖 `:clearable="true"` 和 `type="password"` 时的原有图标
-
-绑定 `@iconClick` 事件可以触发图标的点击 ，返回 `prefix` 表示点击左侧图标，返回 `suffix` 表示点击右侧图标
-
-```html
-
-<!-- 输入框头部图标 -->
-<uni-easyinput prefixIcon="search" v-model="value" placeholder="请输入内容" @iconClick="onClick"></uni-easyinput>
-<!-- 展示输入框尾部图标 -->
-<uni-easyinput suffixIcon="search"  v-model="value" placeholder="请输入内容" @iconClick="onClick"></uni-easyinput>
-```
-
-### 输入框禁用
-
-设置 `disable` 属性可以禁用输入框，此时输入框不可编辑
-
-```html
-<uni-easyinput disabled  v-model="value" placeholder="请输入内容"></uni-easyinput>
-```
-
-### 密码框
-
-设置 `type="password"` 时，输入框内容将会不可见，由实心点代替，同时输入框尾部会显示眼睛图标，点击可切换内容显示状态
-
-```html
-<uni-easyinput type="password" v-model="password" placeholder="请输入密码"></uni-easyinput>
-```
-
-### 输入框聚焦
-
-设置 `focus` 属性可以使输入框聚焦
-
-如果页面存在多个设置 `focus` 属性的输入框，只有最后一个输入框的 `focus` 属性会生效
-
-```html
-<uni-easyinput focus v-model="password" placeholder="请输入内容"></uni-easyinput>
-```
-
-
-### 多行文本
-
-设置 `type="textarea"` 时可输入多行文本
-
-```html
-<uni-easyinput type="textarea" v-model="value" placeholder="请输入内容"></uni-easyinput>
-```
-
-### 多行文本自动高度
-
-设置 `type="textarea"` 时且设置 `autoHeight` 属性，可使用多行文本的自动高度，会跟随内容调整输入框的显示高度
-
-```html
-<uni-easyinput type="textarea" autoHeight v-model="value" placeholder="请输入内容"></uni-easyinput>
-```
-
-### 取消边框
-
-设置 `:inputBorder="false"` 时可取消输入框的边框显示，同时搭配 `uni-forms` 的 `:border="true"` 有较好的效果
-
-```html
-<uni-forms border>
-	<uni-forms-item label="姓名">
-		<uni-easyinput :inputBorder="false" placeholder="请输入姓名"></uni-easyinput>
-	</uni-forms-item>
-	<uni-forms-item label="年龄">
-		<uni-easyinput :inputBorder="false" placeholder="请输入年龄"></uni-easyinput>
-	</uni-forms-item>
-</uni-forms>
-```
-
-
-## API
-
-### Easyinput Props
-
-|属性名							| 类型						|	可选值 		| 		默认值					| 说明|
-|:-:								| :-:						|:-:				| :-:								| :-:	|	
-|value 							|String/ Number	| -				 	|	-									|输入内容|
-|type	   						|String 				| 见 type Options |text| 				输入框的类型（默认text） |
-|clearable	   			|Boolean				| -	|true| 是否显示右侧清空内容的图标控件(输入框有内容，且获得焦点时才显示)，点击可清空输入框内容|
-|autoHeight	   			|Boolean				| -	|false|	是否自动增高输入区域，type为textarea时有效|
-|placeholder	   		|String 				| -	| - |	输入框的提示文字|
-|placeholderStyle 	|String 				| -	| - |	placeholder的样式(内联样式，字符串)，如"color: #ddd"|
-|focus	   					|Boolean				| -	|false|	是否自动获得焦点|
-|disabled	   				|Boolean				| -	|false|	是否不可输入|
-|maxlength	   			|Number 				| -	|140|	最大输入长度，设置为 -1 的时候不限制最大长度|
-|confirmType	   		|String 				| -	|done|	设置键盘右下角按钮的文字，仅在type="text"时生效|
-|clearSize	   			|Number 				| -	|15|	清除图标的大小，单位px|
-|prefixIcon	   			|String					| -	| - |输入框头部图标	|
-|suffixIcon	   			|String					| -	| - |输入框尾部图标|
-|trim	   						|Boolean/String	| 见 trim Options	| false |	是否自动去除空格，传入类型为 Boolean 时，自动去除前后空格|
-|inputBorder	   		|Boolean				| -	|true|	是否显示input输入框的边框|
-|styles				   		|Object					| -	| - |	样式自定义|
-
-
-#### Type Options
-
-|属性名		| 说明																								|
-|:-:			| :-:																								|
-|text			|文本输入键盘																					|
-|textarea	|多行文本输入键盘																			|
-|password	|密码输入键盘																					|
-|number		|数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式	|
-|idcard		|身份证输入键盘，仅支持微信、支付宝、百度、QQ小程序					|
-|digit		|带小数点的数字键盘，仅支持微信、支付宝、百度、头条、QQ小程序	|
-
-#### ConfirmType Options
-
-平台差异与 [input](https://uniapp.dcloud.io/component/input) 相同
-
-|属性名	| 说明							|
-|:-:		| :-:							|
-|send		|右下角按钮为“发送”	|
-|search	|右下角按钮为“搜索”	|
-|next		|右下角按钮为“下一个”|
-|go			|右下角按钮为“前往”	|											
-|done		|右下角按钮为“完成”	|
-	
-
-#### Styles Options 
-	
-|属性名				| 默认值 	|说明																			|
-|:-:					| :-:		 	| :-:																		|
-|color				| #333   	|	输入文字颜色														|
-|disableColor	|#eee			|	输入框禁用背景色													|
-|borderColor	|#e5e5e5	|	边框颜色												|
-
-#### Trim Options
-
-传入类型为 `Boolean` 时，自动去除前后空格,传入类型为 `String` 时，可以单独控制，下面是可选值
-
-|属性名				 	|说明																			|
-|:-:		| :-:																		|
-|both		|	去除两端空格														|
-|left		|	去除左侧空格													|
-|right	|	去除右侧空格												|
-|all	 |	去除所有空格												|
-|none	 |	不去除空格												|
-
-
-### Easyinput Events
-
-|事件称名		| 说明										|返回值					|
-|:-:				| :-:											|:-:						|
-|@input			|输入框内容发生变化时触发	| -							|
-|@focus			|输入框获得焦点时触发			| -							|
-|@blur			|输入框失去焦点时触发			| -							|
-|@confirm		|点击完成按钮时触发				| -							|
-|@iconClick	|点击图标时触发						| prefix/suffix	|
-
-
diff --git a/uni_modules/uni-feedback/uni_modules/uni-fab/changelog.md b/uni_modules/uni-feedback/uni_modules/uni-fab/changelog.md
deleted file mode 100644
index d8e69eb9..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-fab/changelog.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## 1.0.6（2021-02-05）
-- 调整为uni_modules目录规范
-- 优化 按钮背景色调整
-- 优化 兼容pc端
diff --git a/uni_modules/uni-feedback/uni_modules/uni-fab/components/uni-fab/uni-fab.vue b/uni_modules/uni-feedback/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
deleted file mode 100644
index e077eae7..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
+++ /dev/null
@@ -1,447 +0,0 @@
-<template>
-	<view class="uni-cursor-point">
-		<view v-if="popMenu && (leftBottom||rightBottom||leftTop||rightTop) && content.length > 0" :class="{
-        'uni-fab--leftBottom': leftBottom,
-        'uni-fab--rightBottom': rightBottom,
-        'uni-fab--leftTop': leftTop,
-        'uni-fab--rightTop': rightTop
-      }"
-		 class="uni-fab">
-			<view :class="{
-          'uni-fab__content--left': horizontal === 'left',
-          'uni-fab__content--right': horizontal === 'right',
-          'uni-fab__content--flexDirection': direction === 'vertical',
-          'uni-fab__content--flexDirectionStart': flexDirectionStart,
-          'uni-fab__content--flexDirectionEnd': flexDirectionEnd,
-		  'uni-fab__content--other-platform': !isAndroidNvue
-        }"
-			 :style="{ width: boxWidth, height: boxHeight, backgroundColor: styles.backgroundColor }" class="uni-fab__content"
-			 elevation="5">
-				<view v-if="flexDirectionStart || horizontalLeft" class="uni-fab__item uni-fab__item--first" />
-				<view v-for="(item, index) in content" :key="index" :class="{ 'uni-fab__item--active': isShow }" class="uni-fab__item"
-				 @click="_onItemClick(index, item)">
-					<image :src="item.active ? item.selectedIconPath : item.iconPath" class="uni-fab__item-image" mode="widthFix" />
-					<text class="uni-fab__item-text" :style="{ color: item.active ? styles.selectedColor : styles.color }">{{ item.text }}</text>
-				</view>
-				<view v-if="flexDirectionEnd || horizontalRight" class="uni-fab__item uni-fab__item--first" />
-			</view>
-		</view>
-		<view :class="{
-		  'uni-fab__circle--leftBottom': leftBottom,
-		  'uni-fab__circle--rightBottom': rightBottom,
-		  'uni-fab__circle--leftTop': leftTop,
-		  'uni-fab__circle--rightTop': rightTop,
-		  'uni-fab__content--other-platform': !isAndroidNvue
-		}"
-		 class="uni-fab__circle uni-fab__plus" :style="{ 'background-color': styles.buttonColor }" @click="_onClick">
-			<view class="fab-circle-v"  :class="{'uni-fab__plus--active': isShow && content.length > 0}"></view>
-			<view class="fab-circle-h" :class="{'uni-fab__plus--active': isShow  && content.length > 0}"></view>
-		</view>
-	</view>
-</template>
-
-<script>
-	let platform = 'other'
-	// #ifdef APP-NVUE
-	platform = uni.getSystemInfoSync().platform
-	// #endif
-
-	/**
-	 * Fab 悬浮按钮
-	 * @description 点击可展开一个图形按钮菜单
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=144
-	 * @property {Object} pattern 可选样式配置项
-	 * @property {Object} horizontal = [left | right] 水平对齐方式
-	 * 	@value left 左对齐
-	 * 	@value right 右对齐
-	 * @property {Object} vertical = [bottom | top] 垂直对齐方式
-	 * 	@value bottom 下对齐
-	 * 	@value top 上对齐
-	 * @property {Object} direction = [horizontal | vertical] 展开菜单显示方式
-	 * 	@value horizontal 水平显示
-	 * 	@value vertical 垂直显示
-	 * @property {Array} content 展开菜单内容配置项
-	 * @property {Boolean} popMenu 是否使用弹出菜单
-	 * @event {Function} trigger 展开菜单点击事件，返回点击信息
-	 * @event {Function} fabClick 悬浮按钮点击事件
-	 */
-	export default {
-		name: 'UniFab',
-		props: {
-			pattern: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			horizontal: {
-				type: String,
-				default: 'left'
-			},
-			vertical: {
-				type: String,
-				default: 'bottom'
-			},
-			direction: {
-				type: String,
-				default: 'horizontal'
-			},
-			content: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			show: {
-				type: Boolean,
-				default: false
-			},
-			popMenu: {
-				type: Boolean,
-				default: true
-			}
-		},
-		data() {
-			return {
-				fabShow: false,
-				isShow: false,
-				isAndroidNvue: platform === 'android',
-				styles: {
-					color: '#3c3e49',
-					selectedColor: '#007AFF',
-					backgroundColor: '#fff',
-					buttonColor: '#007AFF'
-				}
-			}
-		},
-		computed: {
-			contentWidth(e) {
-				return (this.content.length + 1) * 55 + 10 + 'px'
-			},
-			contentWidthMin() {
-				return 55 + 'px'
-			},
-			// 动态计算宽度
-			boxWidth() {
-				return this.getPosition(3, 'horizontal')
-			},
-			// 动态计算高度
-			boxHeight() {
-				return this.getPosition(3, 'vertical')
-			},
-			// 计算左下位置
-			leftBottom() {
-				return this.getPosition(0, 'left', 'bottom')
-			},
-			// 计算右下位置
-			rightBottom() {
-				return this.getPosition(0, 'right', 'bottom')
-			},
-			// 计算左上位置
-			leftTop() {
-				return this.getPosition(0, 'left', 'top')
-			},
-			rightTop() {
-				return this.getPosition(0, 'right', 'top')
-			},
-			flexDirectionStart() {
-				return this.getPosition(1, 'vertical', 'top')
-			},
-			flexDirectionEnd() {
-				return this.getPosition(1, 'vertical', 'bottom')
-			},
-			horizontalLeft() {
-				return this.getPosition(2, 'horizontal', 'left')
-			},
-			horizontalRight() {
-				return this.getPosition(2, 'horizontal', 'right')
-			}
-		},
-		watch: {
-			pattern(newValue, oldValue) {
-				//console.log(JSON.stringify(newValue))
-				this.styles = Object.assign({}, this.styles, newValue)
-			}
-		},
-		created() {
-			this.isShow = this.show
-			if (this.top === 0) {
-				this.fabShow = true
-			}
-			// 初始化样式
-			this.styles = Object.assign({}, this.styles, this.pattern)
-		},
-		methods: {
-			_onClick() {
-				this.$emit('fabClick')
-				if (!this.popMenu) {
-					return
-				}
-				this.isShow = !this.isShow
-			},
-			open() {
-				this.isShow = true
-			},
-			close() {
-				this.isShow = false
-			},
-			/**
-			 * 按钮点击事件
-			 */
-			_onItemClick(index, item) {
-				this.$emit('trigger', {
-					index,
-					item
-				})
-			},
-			/**
-			 * 获取 位置信息
-			 */
-			getPosition(types, paramA, paramB) {
-				if (types === 0) {
-					return this.horizontal === paramA && this.vertical === paramB
-				} else if (types === 1) {
-					return this.direction === paramA && this.vertical === paramB
-				} else if (types === 2) {
-					return this.direction === paramA && this.horizontal === paramB
-				} else {
-					return this.isShow && this.direction === paramA ? this.contentWidth : this.contentWidthMin
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-fab {
-		position: fixed;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-		z-index: 10;
-	}
-	
-	.uni-cursor-point {
-		/* #ifdef H5 */
-		cursor: pointer;
-		/* #endif */
-	}
-
-	.uni-fab--active {
-		opacity: 1;
-	}
-
-	.uni-fab--leftBottom {
-		left: 5px;
-		bottom: 20px;
-		/* #ifdef H5 */
-		left: calc(5px + var(--window-left));
-		bottom: calc(20px + var(--window-bottom));
-		/* #endif */
-		padding: 10px;
-	}
-
-	.uni-fab--leftTop {
-		left: 5px;
-		top: 30px;
-		/* #ifdef H5 */
-		left: calc(5px + var(--window-left));
-		top: calc(30px + var(--window-top));
-		/* #endif */
-		padding: 10px;
-	}
-
-	.uni-fab--rightBottom {
-		right: 5px;
-		bottom: 20px;
-		/* #ifdef H5 */
-		right: calc(5px + var(--window-right));
-		bottom: calc(20px + var(--window-bottom));
-		/* #endif */
-		padding: 10px;
-	}
-
-	.uni-fab--rightTop {
-		right: 5px;
-		top: 30px;
-		/* #ifdef H5 */
-		right: calc(5px + var(--window-right));
-		top: calc(30px + var(--window-top));
-		/* #endif */
-		padding: 10px;
-	}
-
-	.uni-fab__circle {
-		position: fixed;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-		width: 55px;
-		height: 55px;
-		background-color: #3c3e49;
-		border-radius: 55px;
-		z-index: 11;
-	}
-
-	.uni-fab__circle--leftBottom {
-		left: 15px;
-		bottom: 30px;
-		/* #ifdef H5 */
-		left: calc(15px + var(--window-left));
-		bottom: calc(30px + var(--window-bottom));
-		/* #endif */
-	}
-
-	.uni-fab__circle--leftTop {
-		left: 15px;
-		top: 40px;
-		/* #ifdef H5 */
-		left: calc(15px + var(--window-left));
-		top: calc(40px + var(--window-top));
-		/* #endif */
-	}
-
-	.uni-fab__circle--rightBottom {
-		right: 15px;
-		bottom: 30px;
-		/* #ifdef H5 */
-		right: calc(15px + var(--window-right));
-		bottom: calc(30px + var(--window-bottom));
-		/* #endif */
-	}
-
-	.uni-fab__circle--rightTop {
-		right: 15px;
-		top: 40px;
-		/* #ifdef H5 */
-		right: calc(15px + var(--window-right));
-		top: calc(40px + var(--window-top));
-		/* #endif */
-	}
-
-	.uni-fab__circle--left {
-		left: 0;
-	}
-
-	.uni-fab__circle--right {
-		right: 0;
-	}
-
-	.uni-fab__circle--top {
-		top: 0;
-	}
-
-	.uni-fab__circle--bottom {
-		bottom: 0;
-	}
-
-	.uni-fab__plus {
-		font-weight: bold;
-	}
-
-	.fab-circle-v {
-		position: absolute;
-		width: 3px;
-		height: 31px;
-		left: 26px;
-		top: 12px;
-		background-color: white;
-		transform: rotate(0deg);
-		transition: transform 0.3s;
-	}
-
-	.fab-circle-h {
-		position: absolute;
-		width: 31px;
-		height: 3px;
-		left: 12px;
-		top: 26px;
-		background-color: white;
-		transform: rotate(0deg);
-		transition: transform 0.3s;
-	}
-
-	.uni-fab__plus--active {
-		transform: rotate(135deg);
-	}
-
-	.uni-fab__content {
-		/* #ifndef APP-NVUE */
-		box-sizing: border-box;
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		border-radius: 55px;
-		overflow: hidden;
-		transition-property: width, height;
-		transition-duration: 0.2s;
-		width: 55px;
-		border-color: #DDDDDD;
-		border-width: 1rpx;
-		border-style: solid;
-	}
-
-	.uni-fab__content--other-platform {
-		border-width: 0px;
-		box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.2);
-	}
-
-	.uni-fab__content--left {
-		justify-content: flex-start;
-	}
-
-	.uni-fab__content--right {
-		justify-content: flex-end;
-	}
-
-	.uni-fab__content--flexDirection {
-		flex-direction: column;
-		justify-content: flex-end;
-	}
-
-	.uni-fab__content--flexDirectionStart {
-		flex-direction: column;
-		justify-content: flex-start;
-	}
-
-	.uni-fab__content--flexDirectionEnd {
-		flex-direction: column;
-		justify-content: flex-end;
-	}
-
-	.uni-fab__item {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		width: 55px;
-		height: 55px;
-		opacity: 0;
-		transition: opacity 0.2s;
-	}
-
-	.uni-fab__item--active {
-		opacity: 1;
-	}
-
-	.uni-fab__item-image {
-		width: 25px;
-		height: 25px;
-		margin-bottom: 3px;
-	}
-
-	.uni-fab__item-text {
-		color: #FFFFFF;
-		font-size: 12px;
-	}
-
-	.uni-fab__item--first {
-		width: 55px;
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-fab/components/uni-fab/uni-fab.vue.bak b/uni_modules/uni-feedback/uni_modules/uni-fab/components/uni-fab/uni-fab.vue.bak
deleted file mode 100644
index 9df4dcd7..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-fab/components/uni-fab/uni-fab.vue.bak
+++ /dev/null
@@ -1,383 +0,0 @@
-<template>
-	<view>
-		<view :class="{
-        leftBottom: leftBottom,
-        rightBottom: rightBottom,
-        leftTop: leftTop,
-        rightTop: rightTop
-      }" v-if="leftBottom||rightBottom||leftTop||rightTop" class="fab-box fab">
-			<view :class="{
-          left: horizontal === 'left' && direction === 'horizontal',
-          top: vertical === 'top' && direction === 'vertical',
-          bottom: vertical === 'bottom' && direction === 'vertical',
-          right: horizontal === 'right' && direction === 'horizontal'
-        }" :style="{ 'background-color': styles.buttonColor }" class="fab-circle" @click="_onClick">
-                <view class="fab-circle-box" :class="{ active: isShow }">
-                    <view class="fab-circle-v"></view>
-                    <view class="fab-circle-h"></view>
-                </view>
-			</view>
-			<view :class="{
-          left: horizontal === 'left',
-          right: horizontal === 'right',
-          flexDirection: direction === 'vertical',
-          flexDirectionStart: flexDirectionStart,
-          flexDirectionEnd: flexDirectionEnd
-        }" :style="{ width: boxWidth, height: boxHeight, background: styles.backgroundColor }" class="fab-content">
-				<view v-if="flexDirectionStart || horizontalLeft" class="fab-item first" />
-				<view v-for="(item, index) in content" :key="index" :class="{ active: isShow }" :style="{
-            color: item.active ? styles.selectedColor : styles.color
-          }" class="fab-item" @click="_onItemClick(index, item)">
-					<image :src="item.active ? item.selectedIconPath : item.iconPath" class="content-image" mode="widthFix" />
-					<text class="text">{{ item.text }}</text>
-				</view>
-				<view v-if="flexDirectionEnd || horizontalRight" class="fab-item first" />
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import uniIcons from "../uni-icons/uni-icons.vue";
-	export default {
-		name: 'UniFab',
-        components:{
-            uniIcons
-        },
-		props: {
-			pattern: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			horizontal: {
-				type: String,
-				default: 'left'
-			},
-			vertical: {
-				type: String,
-				default: 'bottom'
-			},
-			direction: {
-				type: String,
-				default: 'horizontal'
-			},
-			content: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			show: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				fabShow: false,
-				flug: true,
-				isShow: false,
-				styles: {
-					color: '#3c3e49',
-					selectedColor: '#007AFF',
-					backgroundColor: '#fff',
-					buttonColor: '#3c3e49'
-				}
-			}
-		},
-		computed: {
-			contentWidth(e) {
-				return uni.upx2px((this.content.length + 1) * 110 + 20) + 'px'
-			},
-			contentWidthMin() {
-				return uni.upx2px(110) + 'px'
-			},
-			// 动态计算宽度
-			boxWidth() {
-				return this.getPosition(3, 'horizontal')
-			},
-			// 动态计算高度
-			boxHeight() {
-				return this.getPosition(3, 'vertical')
-			},
-			// 计算左下位置
-			leftBottom() {
-				return this.getPosition(0, 'left', 'bottom')
-			},
-			// 计算右下位置
-			rightBottom() {
-				return this.getPosition(0, 'right', 'bottom')
-			},
-			// 计算左上位置
-			leftTop() {
-				return this.getPosition(0, 'left', 'top')
-			},
-			rightTop() {
-				return this.getPosition(0, 'right', 'top')
-			},
-			flexDirectionStart() {
-				return this.getPosition(1, 'vertical', 'top')
-			},
-			flexDirectionEnd() {
-				return this.getPosition(1, 'vertical', 'bottom')
-			},
-			horizontalLeft() {
-				return this.getPosition(2, 'horizontal', 'left')
-			},
-			horizontalRight() {
-				return this.getPosition(2, 'horizontal', 'right')
-			}
-		},
-		watch: {
-			pattern(newValue, oldValue) {
-				//console.log(JSON.stringify(newValue))
-				this.styles = Object.assign({}, this.styles, newValue)
-			}
-		},
-		created() {
-			this.isShow = this.show
-			if (this.top === 0) {
-				this.fabShow = true
-			}
-			// 初始化样式
-			this.styles = Object.assign({}, this.styles, this.pattern)
-		},
-		methods: {
-			_onClick() {
-				this.isShow = !this.isShow
-			},
-			open() {
-				this.isShow = true
-			},
-			close() {
-				this.isShow = false
-			},
-			/**
-			 * 按钮点击事件
-			 */
-			_onItemClick(index, item) {
-				this.$emit('trigger', {
-					index,
-					item
-				})
-			},
-			/**
-			 * 获取 位置信息
-			 */
-			getPosition(types, paramA, paramB) {
-				if (types === 0) {
-					return this.horizontal === paramA && this.vertical === paramB
-				} else if (types === 1) {
-					return this.direction === paramA && this.vertical === paramB
-				} else if (types === 2) {
-					return this.direction === paramA && this.horizontal === paramB
-				} else {
-					return this.isShow && this.direction === paramA ? this.contentWidth : this.contentWidthMin
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-
-	.uni-icon {
-		font-family: uniicons;
-		font-size: 30px;
-		font-weight: normal;
-		font-style: normal;
-		line-height: 1;
-		display: inline-block;
-		text-decoration: none;
-		-webkit-font-smoothing: antialiased;
-	}
-
-	.fab-box {
-		position: fixed;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		z-index: 2;
-	}
-
-	.fab-box.top {
-		width: 60rpx;
-		height: 60rpx;
-		right: 30rpx;
-		bottom: 60rpx;
-		border: 1px #5989b9 solid;
-		background: #6699cc;
-		border-radius: 10rpx;
-		color: #fff;
-		transition: all 0.3;
-		opacity: 0;
-	}
-
-	.fab-box.active {
-		opacity: 1;
-	}
-
-	.fab-box.fab {
-		z-index: 10;
-	}
-
-	.fab-box.fab.leftBottom {
-		left: 30rpx;
-		bottom: 60rpx;
-	}
-
-	.fab-box.fab.leftTop {
-		left: 30rpx;
-		top: 80rpx;
-		/* #ifdef H5 */
-		top: calc(80rpx + var(--window-top));
-		/* #endif */
-	}
-
-	.fab-box.fab.rightBottom {
-		right: 30rpx;
-		bottom: 60rpx;
-	}
-
-	.fab-box.fab.rightTop {
-		right: 30rpx;
-		top: 80rpx;
-		/* #ifdef H5 */
-		top: calc(80rpx + var(--window-top));
-		/* #endif */
-	}
-
-	.fab-circle {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: absolute;
-		width: 110rpx;
-		height: 110rpx;
-		background: #3c3e49;
-		/* background: #5989b9; */
-		border-radius: 50%;
-		box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.2);
-		z-index: 11;
-	}
-
-    .fab-circle-box {
-        position: absolute;
-        left: 0;
-        top: 0;
-        right: 0;
-        bottom: 0;
-		transition: all 0.3s;
-    }
-
-    .fab-circle-v {
-        position: absolute;
-        width: 8rpx;
-        height: 60rpx;
-        left: 50%;
-        top: 50%;
-        margin: -30rpx 0 0 -4rpx;
-        background-color: white;
-    }
-
-    .fab-circle-h {
-        position: absolute;
-        width: 60rpx;
-        height: 8rpx;
-        left: 50%;
-        top: 50%;
-        margin: -4rpx 0 0 -30rpx;
-        background-color: white;
-    }
-
-	.fab-circle.left {
-		left: 0;
-	}
-
-	.fab-circle.right {
-		right: 0;
-	}
-
-	.fab-circle.top {
-		top: 0;
-	}
-
-	.fab-circle.bottom {
-		bottom: 0;
-	}
-
-	.fab-circle .uni-icon-plusempty {
-		color: #ffffff;
-		font-size: 80rpx;
-		transition: all 0.3s;
-		font-weight: bold;
-	}
-
-	.fab-circle-box.active {
-		transform: rotate(135deg);
-		font-size: 80rpx;
-	}
-
-	.fab-content {
-		background: #6699cc;
-		box-sizing: border-box;
-		display: flex;
-		border-radius: 100rpx;
-		overflow: hidden;
-		box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.1);
-		transition: all 0.2s;
-		width: 110rpx;
-	}
-
-	.fab-content.left {
-		justify-content: flex-start;
-	}
-
-	.fab-content.right {
-		justify-content: flex-end;
-	}
-
-	.fab-content.flexDirection {
-		flex-direction: column;
-		justify-content: flex-end;
-	}
-
-	.fab-content.flexDirectionStart {
-		flex-direction: column;
-		justify-content: flex-start;
-	}
-
-	.fab-content.flexDirectionEnd {
-		flex-direction: column;
-		justify-content: flex-end;
-	}
-
-	.fab-content .fab-item {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		width: 110rpx;
-		height: 110rpx;
-		font-size: 24rpx;
-		color: #fff;
-		opacity: 0;
-		transition: opacity 0.2s;
-	}
-
-	.fab-content .fab-item.active {
-		opacity: 1;
-	}
-
-	.fab-content .fab-item .content-image {
-		width: 50rpx;
-		height: 50rpx;
-		margin-bottom: 5rpx;
-	}
-
-	.fab-content .fab-item.first {
-		width: 110rpx;
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-fab/package.json b/uni_modules/uni-feedback/uni_modules/uni-fab/package.json
deleted file mode 100644
index 4fbe3768..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-fab/package.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "id": "uni-fab",
-  "displayName": "Fab 悬浮按钮",
-  "version": "1.0.6",
-  "description": "悬浮按钮 fab button ，点击可展开一个图标按钮菜单。",
-  "keywords": [
-    "按钮",
-    "悬浮按钮",
-    "fab",
-    "uni-fab"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-fab/readme.md b/uni_modules/uni-feedback/uni_modules/uni-fab/readme.md
deleted file mode 100644
index 725f67a3..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-fab/readme.md
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-## Fab 悬浮按钮
-> 代码块： `uFab`
-
-
-点击可展开一个图形按钮菜单
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 不建议动态修改属性，可能会耗损部分性能。
-> - 展开菜单暂不支持字体图标，使用图片路径时建议使用绝对路径，相对路径可能会有问题。
-> - 选中状态要通过自己控制，如果不希望有选中状态，不处理 `active` 即可。 
-> - 展开菜单建议最多显示四个，如果过多对于小屏手机可能会超出屏幕。
-
-
-### 基本用法
-
-在 `template` 中使用组件
-
-```html
-<template>
-	<view>
-		<uni-fab
-			:pattern="pattern"
-			:content="content"
-			:horizontal="horizontal"
-			:vertical="vertical"
-			:direction="direction"
-			@trigger="trigger"
-		></uni-fab>
-	</view>
-</template>
-```
-
-
-## API
-
-### Fab Props
-
-|  属性名	|    类型	| 默认值		| 说明															|
-| :-:		| :-:		| :-:			| :-:															|
-| pattern	| Object	| -				| 可选样式配置项												|
-| horizontal| String	| 'left'		| 水平对齐方式。`left`:左对齐，`right`：右对齐					|
-| vertical	| String	| 'bottom'		| 垂直对齐方式。`bottom`:下对齐，`top`：上对齐					|
-| direction	| String	| 'horizontal'	| 展开菜单显示方式。`horizontal`:水平显示，`vertical`：垂直显示	|
-| popMenu	| Boolean	| true			| 是否使用弹出菜单											|
-| content	| Array		| -				| 展开菜单内容配置项											|
-
-
-
-**pattern配置项：**
-
-|  参数				|    类型	| 默认值	| 说明				|
-| :-:				|  :-:		| :-:		| :-:				|
-| color				| String	| #3c3e49	| 文字默认颜色		|
-| selectedColor		| String	| #007AFF	| 文字选中时的颜色	|
-| backgroundColor	| String	| #ffffff	| 背景色			|
-| buttonColor		| String	| #3c3e49	| 按钮背景色		|
-
-**content配置项：**
-
-|  参数				|    类型	| 说明			|
-| :-:				|  :-:				| :-:		| :-:			|
-| iconPath			| String	| 图片路径		|
-| selectedIconPath	| String	| 选中后图片路径|
-| text				| String	| 文字			|
-| active			| Boolean	| 是否选中当前	|
-
-### Fab Events
-
-|  参数		|    类型	| 说明							|
-| :-:		|  :-:		| :-:							|
-| @trigger	| Function	| 展开菜单点击事件，返回点击信息|
-| @fabClick	| Function	| 悬浮按钮点击事件				|
-
-
-
-
diff --git a/uni_modules/uni-feedback/uni_modules/uni-file-picker/changelog.md b/uni_modules/uni-feedback/uni_modules/uni-file-picker/changelog.md
deleted file mode 100644
index 8f891261..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-file-picker/changelog.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## 0.0.6（2021-04-09）
-- 修复 选择的文件非 file-extname 字段指定的扩展名报错的Bug
-## 0.0.5（2021-04-09）
-- 优化 更新组件示例
-## 0.0.4（2021-04-09）
-- 优化 file-extname 字段支持字符串写法，多个扩展名需要用逗号分隔
-## 0.0.3（2021-02-05）
-- 调整为uni_modules目录规范
-- 修复 微信小程序不指定 fileExtname 属性选择失败的Bug
diff --git a/uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js b/uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js
deleted file mode 100644
index 1d57b5ed..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js
+++ /dev/null
@@ -1,186 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-const ERR_MSG_OK = 'chooseAndUploadFile:ok';
-const ERR_MSG_FAIL = 'chooseAndUploadFile:fail';
-function chooseImage(opts) {
-    const { count, sizeType, sourceType, extension } = opts;
-    return new Promise((resolve, reject) => {
-        uni.chooseImage({
-            count,
-            sizeType,
-            sourceType,
-            extension,
-            success(res) {
-                resolve(normalizeChooseAndUploadFileRes(res, 'image'));
-            },
-            fail(res) {
-                reject({
-                    errMsg: res.errMsg.replace('chooseImage:fail', ERR_MSG_FAIL),
-                });
-            },
-        });
-    });
-}
-function chooseVideo(opts) {
-    const { camera, compressed, maxDuration, sourceType, extension } = opts;
-    return new Promise((resolve, reject) => {
-        uni.chooseVideo({
-            camera,
-            compressed,
-            maxDuration,
-            sourceType,
-            extension,
-            success(res) {
-                const { tempFilePath, duration, size, height, width } = res;
-                resolve(normalizeChooseAndUploadFileRes({
-                    errMsg: 'chooseVideo:ok',
-                    tempFilePaths: [tempFilePath],
-                    tempFiles: [
-                        {
-                            name: (res.tempFile && res.tempFile.name) || '',
-                            path: tempFilePath,
-                            size,
-                            type: (res.tempFile && res.tempFile.type) || '',
-                            width,
-                            height,
-                            duration,
-                            fileType: 'video',
-                            cloudPath: '',
-                        },
-                    ],
-                }, 'video'));
-            },
-            fail(res) {
-                reject({
-                    errMsg: res.errMsg.replace('chooseVideo:fail', ERR_MSG_FAIL),
-                });
-            },
-        });
-    });
-}
-function chooseAll(opts) {
-    const { count, extension } = opts;
-    return new Promise((resolve, reject) => {
-        let chooseFile = uni.chooseFile;
-        if (typeof wx !== 'undefined' &&
-            typeof wx.chooseMessageFile === 'function') {
-            chooseFile = wx.chooseMessageFile;
-        }
-        if (typeof chooseFile !== 'function') {
-            return reject({
-                errMsg: ERR_MSG_FAIL + ' 请指定 type 类型，该平台仅支持选择 image 或 video。',
-            });
-        }
-        chooseFile({
-            type: 'all',
-            count,
-            extension,
-            success(res) {
-                resolve(normalizeChooseAndUploadFileRes(res));
-            },
-            fail(res) {
-                reject({
-                    errMsg: res.errMsg.replace('chooseFile:fail', ERR_MSG_FAIL),
-                });
-            },
-        });
-    });
-}
-function normalizeChooseAndUploadFileRes(res, fileType) {
-    res.tempFiles.forEach((item, index) => {
-        if (!item.name) {
-            item.name = item.path.substring(item.path.lastIndexOf('/') + 1);
-        }
-        if (fileType) {
-            item.fileType = fileType;
-        }
-        item.cloudPath =
-            Date.now() + '_' + index + item.name.substring(item.name.lastIndexOf('.'));
-    });
-    // wx.chooseMessageFile
-    if (!res.tempFilePaths) {
-        res.tempFilePaths = res.tempFiles.map((file) => file.path);
-    }
-    return res;
-}
-function uploadCloudFiles(res, max = 5, onUploadProgress) {
-    res = Object.assign({}, res);
-    res.errMsg = ERR_MSG_OK;
-    const files = res.tempFiles;
-    const len = files.length;
-    let count = 0;
-    return new Promise((resolve) => {
-        while (count < max) {
-            next();
-        }
-        function next() {
-            let cur = count++;
-            if (cur >= len) {
-                !files.find((item) => !item.url && !item.errMsg) && resolve(res);
-                return;
-            }
-            const fileItem = files[cur];
-            uniCloud
-                .uploadFile({
-                filePath: fileItem.path,
-                cloudPath: fileItem.cloudPath,
-                fileType: fileItem.fileType,
-                onUploadProgress(res) {
-                    res.index = cur;
-                    res.tempFile = fileItem;
-                    res.tempFilePath = fileItem.path;
-                    onUploadProgress &&
-                        onUploadProgress(res);
-                },
-            })
-                .then((res) => {
-                fileItem.url = res.fileID;
-                if (cur < len) {
-                    next();
-                }
-            })
-                .catch((res) => {
-                // fileItem.errMsg = res.message;
-								fileItem.errMsg =  res.errMsg || res.message;
-                if (cur < len) {
-                    next();
-                }
-            });
-        }
-    });
-}
-function uploadFiles(choosePromise, { onChooseFile, onUploadProgress }) {
-    return choosePromise
-        .then((res) => {
-        if (onChooseFile) {
-            const customChooseRes = onChooseFile(res);
-            if (typeof customChooseRes !== 'undefined') {
-                return Promise.resolve(customChooseRes).then((chooseRes) => typeof chooseRes === 'undefined' ? res : chooseRes);
-            }
-        }
-        return res;
-    })
-        .then((res) => {
-        if (res === false) {
-            return {
-                errMsg: ERR_MSG_OK,
-                tempFilePaths: [],
-                tempFiles: [],
-            };
-        }
-        return uploadCloudFiles(res, 5, onUploadProgress);
-    });
-}
-function chooseAndUploadFile(opts = { type: 'all' }) {
-    if (opts.type === 'image') {
-        return uploadFiles(chooseImage(opts), opts);
-    }
-    else if (opts.type === 'video') {
-        return uploadFiles(chooseVideo(opts), opts);
-    }
-    return uploadFiles(chooseAll(opts), opts);
-}
-
-exports.chooseAndUploadFile = chooseAndUploadFile;
diff --git a/uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue b/uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
deleted file mode 100644
index 370d98e4..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
+++ /dev/null
@@ -1,669 +0,0 @@
-<template>
-	<view class="uni-file-picker">
-		<view v-if="title" class="uni-file-picker__header">
-			<text class="file-title">{{ title }}</text>
-			<text class="file-count">{{ filesList.length }}/{{ limitLength }}</text>
-		</view>
-		<upload-image
-			v-if="fileMediatype === 'image' && showType === 'grid'"
-			:readonly="readonly"
-			:image-styles="imageStyles"
-			:files-list="filesList"
-			:limit="limitLength"
-			:disablePreview="disablePreview"
-			:delIcon="delIcon"
-			@uploadFiles="uploadFiles"
-			@choose="choose"
-			@delFile="delFile"
-		>
-			<slot>
-				<view class="is-add">
-					<view class="icon-add"></view>
-					<view class="icon-add rotate"></view>
-				</view>
-			</slot>
-		</upload-image>
-		<upload-file
-			v-if="fileMediatype !== 'image' || showType !== 'grid'"
-			:readonly="readonly"
-			:list-styles="listStyles"
-			:files-list="filesList"
-			:showType="showType"
-			:delIcon="delIcon"
-			@uploadFiles="uploadFiles"
-			@choose="choose"
-			@delFile="delFile"
-		>
-			<slot><button type="primary" size="mini">选择文件</button></slot>
-		</upload-file>
-	</view>
-</template>
-
-<script>
-/**
- * FilePicker
- * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
- * @tutorial https://ext.dcloud.net.cn/plugin?id=-1
- * @property {Object|Array}	value	组件数据，通常用来回显 ,类型由return-type属性决定
- * @property {Boolean}	disabled=[true|false]	组件禁用
- * 	@value true 	禁用
- * 	@value false 	取消禁用
- * @property {Boolean}	readonly=[true|false]	组件只读，不可选择，不显示进度，不显示删除按钮
- * 	@value true 	只读
- * 	@value false 	取消只读
- * @property {String}	return-type=[array|object]	限制 value 格式，当为 object 时 ，组件只能单选，且会覆盖
- * 	@value array	规定 value 属性的类型为数组
- * 	@value object	规定 value 属性的类型为对象
- * @property {Boolean}	disable-preview=[true|false]	禁用图片预览，仅 mode:grid 时生效
- * 	@value true 	禁用图片预览
- * 	@value false 	取消禁用图片预览
- * @property {Boolean}	del-icon=[true|false]	是否显示删除按钮
- * 	@value true 	显示删除按钮
- * 	@value false 	不显示删除按钮
- * @property {Boolean}	auto-upload=[true|false]	是否自动上传，值为true则只触发@select,可自行上传
- * 	@value true 	自动上传
- * 	@value false 	取消自动上传
- * @property {Number|String}	limit	最大选择个数 ，h5 会自动忽略多选的部分
- * @property {String}	title	组件标题，右侧显示上传计数
- * @property {String}	mode=[list|grid]	选择文件后的文件列表样式
- * 	@value list 	列表显示
- * 	@value grid 	宫格显示
- * @property {String}	file-mediatype=[image|video|all]	选择文件类型
- * 	@value image	只选择图片
- * 	@value video	只选择视频
- * 	@value all		选择所有文件
- * @property {Array}	file-extname	选择文件后缀，根据 file-mediatype 属性而不同
- * @property {Object}	list-style	mode:list 时的样式
- * @property {Object}	image-styles	选择文件后缀，根据 file-mediatype 属性而不同
- * @event {Function} select 	选择文件后触发
- * @event {Function} progress 文件上传时触发
- * @event {Function} success 	上传成功触发
- * @event {Function} fail 		上传失败触发
- * @event {Function} delete 	文件从列表移除时触发
- */
-
-import { chooseAndUploadFile } from './choose-and-upload-file.js'
-import uploadImage from './upload-image.vue'
-import uploadFile from './upload-file.vue'
-let fileInput = null
-export default {
-	name: 'uniFilePicker',
-	components: {
-		uploadImage,
-		uploadFile
-	},
-	props: {
-		value: {
-			type: [Array, Object],
-			default() {
-				return []
-			}
-		},
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		disablePreview: {
-			type: Boolean,
-			default: false
-		},
-		delIcon: {
-			type: Boolean,
-			default: true
-		},
-		// 自动上传
-		autoUpload: {
-			type: Boolean,
-			default: true
-		},
-		// 最大选择个数 ，h5只能限制单选或是多选
-		limit: {
-			type: [Number, String],
-			default: 9
-		},
-		// 列表样式 grid | list | list-card
-		mode: {
-			type: String,
-			default: 'grid'
-		},
-		// inputUrl: {
-		// 	type: Boolean,
-		// 	default: false
-		// },
-		// 选择文件类型  image/video/all
-		fileMediatype: {
-			type: String,
-			default: 'image'
-		},
-		// 文件类型筛选
-		fileExtname: {
-			type: [Array, String],
-			default() {
-				return []
-			}
-		},
-		title: {
-			type: String,
-			default: ''
-		},
-		listStyles: {
-			type: Object,
-			default() {
-				return {
-					// 是否显示边框
-					border: true,
-					// 是否显示分隔线
-					dividline: true,
-					// 线条样式
-					borderStyle: {}
-				}
-			}
-		},
-		imageStyles: {
-			type: Object,
-			default() {
-				return {
-					width: 'auto',
-					height: 'auto'
-				}
-			}
-		},
-		readonly: {
-			type: Boolean,
-			default: false
-		},
-		returnType: {
-			type: String,
-			default: 'array'
-		}
-	},
-	watch: {
-		value: {
-			handler(newVal) {
-				let newFils = []
-				let newData = [].concat(newVal || [])
-				newData.forEach(v => {
-					const files = this.files.find(i => i.url === v.url)
-					const reg = /cloud:\/\/([\w.]+\/?)\S*/
-					if (!v.path) {
-						v.path = v.url
-					}
-					if (reg.test(v.url)) {
-						this.getTempFileURL(v, v.url)
-					}
-					newFils.push(files ? files : v)
-				})
-				this.files = newFils
-			},
-			immediate: true
-		}
-	},
-	data() {
-		return {
-			files: [],
-		}
-	},
-	computed: {
-		filesList() {
-			let files = []
-			this.files.forEach(v => {
-				files.push(v)
-			})
-			return files
-		},
-		showType() {
-			if (this.fileMediatype === 'image') {
-				return this.mode
-			}
-			return 'list'
-		},
-		limitLength() {
-			if (this.returnType === 'object') {
-				return 1
-			}
-			if (!this.limit) {
-				return 1
-			}
-			if (this.limit >= 9) {
-				return 9
-			}
-			return this.limit
-		},
-		extname(){
-			if (!Array.isArray(this.fileExtname)) {
-				let extname = this.fileExtname.replace(/(\[|\])/g,'')
-				return extname.split(',')
-			} else {
-				return this.fileExtname
-			}
-			return []
-		}
-	},
-	created() {
-		// this.files = Object.assign([], this.value)
-		this.tempData = {}
-
-	},
-	methods: {
-		/**
-		 * 继续上传
-		 */
-		upload() {
-			// TODO 先放弃这个实现 ，不能全部上传
-			// if (this.$uploadFiles) {
-			// 	this.$uploadFiles()
-			// } else {
-			// 	uni.showToast({
-			// 		title: '请先选择文件',
-			// 		icon: 'none'
-			// 	})
-			// }
-			let files = []
-			this.files.forEach((v, index) => {
-				if (v.status === 'ready' || v.status === 'error') {
-					files.push(Object.assign({}, v))
-				}
-			})
-
-			this.uploadFiles(files)
-		},
-		/**
-		 * 选择文件
-		 */
-		choose() {
-			if (this.disabled) return
-			if (this.files.length >= Number(this.limitLength) && this.showType !== 'grid' && this.returnType === 'array') {
-				uni.showToast({
-					title: `您最多选择 ${this.limitLength} 个文件`,
-					icon: 'none'
-				})
-				return
-			}
-			// uni.showActionSheet({
-			// 	itemList: ['填写 url 地址', '选择文件'],
-			// 	success: (res) => {
-			// 		if (res.tapIndex === 1) {
-			// 			this.chooseFiles()
-			// 		}
-			// 	},
-			// 	fail: function(res) {}
-			// });
-			this.chooseFiles()
-		},
-
-		/**
-		 * 选择文件并上传
-		 */
-		chooseFiles() {
-			// API 正式发布前，使用本地API上传函数
-			if (!uniCloud.chooseAndUploadFile) {
-				uniCloud.chooseAndUploadFile = chooseAndUploadFile
-			}
-
-			uniCloud
-				.chooseAndUploadFile({
-					type: this.fileMediatype,
-					compressed: false,
-					// TODO 如果为空，video 有问题
-					extension: this.extname.length > 0 ? this.extname : undefined,
-					count: this.limitLength - this.files.length, //默认9
-					onChooseFile: async res => {
-						if ((Number(this.limitLength) === 1 && this.disablePreview && !this.disabled) || this.returnType === 'object') {
-							this.files = []
-						}
-						let filePaths = []
-						let files = []
-						if (this.extname && this.extname.length > 0) {
-							res.tempFiles.forEach(v => {
-								let fileFullName = this.getFileExt(v.name)
-								const extname = fileFullName.ext.toLowerCase()
-								if (this.extname.indexOf(extname) !== -1) {
-									files.push(v)
-									filePaths.push(v.path)
-								}
-							})
-							if (files.length !== res.tempFiles.length) {
-								uni.showToast({
-									title: `当前选择了${res.tempFiles.length}个文件 ，${res.tempFiles.length - files.length} 个文件格式不正确`,
-									icon: 'none',
-									duration: 5000
-								})
-							}
-						} else {
-							filePaths = res.tempFilePaths
-							files = res.tempFiles
-						}
-
-						let currentData = []
-						for (let i = 0; i < files.length; i++) {
-							if (this.limitLength - this.files.length <= 0) break
-							files[i].uuid = Date.now()
-							let filedata = await this.getFileData(files[i], this.fileMediatype)
-							filedata.progress = 0
-							filedata.status = 'ready'
-							this.files.push(filedata)
-							currentData.push(filedata)
-						}
-						this.$emit('select', {
-							tempFiles: currentData,
-							tempFilePaths: filePaths
-						})
-						res.tempFiles = files
-						// 停止自动上传
-						if (!this.autoUpload) {
-							res.tempFiles = []
-							// TODO 先放弃这个实现 ，不能全部上传
-							// return new Promise((resolve) => {
-							// 	this.$uploadFiles = () => {
-							// 		// this._is_uploading = true
-							// 		resolve(res)
-							// 	}
-							// })
-						}
-					},
-					onUploadProgress: progressEvent => {
-						this.setProgress(progressEvent, progressEvent.index)
-					}
-				})
-				.then(result => {
-					this.setSuccessAndError(result.tempFiles)
-				})
-				.catch(err => {
-					console.log('选择失败', err)
-				})
-		},
-
-		/**
-		 * 批传
-		 * @param {Object} e
-		 */
-		uploadFiles(files) {
-			files = [].concat(files)
-			this.uploadCloudFiles(files, 5, res => {
-				this.setProgress(res, res.index, true)
-			})
-				.then(result => {
-					this.setSuccessAndError(result)
-				})
-				.catch(err => {
-					console.log('err', err)
-				})
-		},
-
-		/**
-		 * 成功或失败
-		 */
-		async setSuccessAndError(res, fn) {
-			let successData = []
-			let errorData = []
-			let tempFilePath = []
-			let errorTempFilePath = []
-			for (let i = 0; i < res.length; i++) {
-				// const index  = item.index
-				const item = res[i]
-				const index = item.uuid ? this.files.findIndex(p => p.uuid === item.uuid) : item.index
-				if (index === -1 || !this.files) break
-				if (item.errMsg === 'request:fail') {
-					this.files[index].url = item.path
-					this.files[index].status = 'error'
-					this.files[index].errMsg = item.errMsg
-					this.files[index].progress = -1
-					errorData.push(this.files[index])
-					errorTempFilePath.push(this.files[index].url)
-				} else {
-					this.files[index].errMsg = ''
-					this.files[index].url = item.url
-					this.files[index].status = 'success'
-					successData.push(this.files[index])
-					tempFilePath.push(this.files[index].url)
-				}
-			}
-
-			if (successData.length > 0) {
-				this.setEmit()
-				// 状态改变返回
-				this.$emit('success', {
-					tempFiles: this.backObject(successData),
-					tempFilePaths: tempFilePath
-				})
-			}
-
-			if (errorData.length > 0) {
-				this.$emit('fail', {
-					tempFiles: this.backObject(errorData),
-					tempFilePaths: errorTempFilePath
-				})
-			}
-		},
-
-		/**
-		 * 获取进度
-		 * @param {Object} progressEvent
-		 * @param {Object} index
-		 * @param {Object} type
-		 */
-		setProgress(progressEvent, index, type) {
-			const fileLenth = this.files.length
-			const percentNum = (index / fileLenth) * 100
-			const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)
-			let idx = index
-			if (!type) {
-				idx = this.files.findIndex(p => p.uuid === progressEvent.tempFile.uuid)
-			}
-			if (idx === -1 || !this.files[idx]) return
-			this.files[idx].progress = percentCompleted
-			// 上传中
-			this.$emit('progress', {
-				index: idx,
-				progress: parseInt(percentCompleted),
-				tempFile: this.files[idx]
-			})
-		},
-
-		/**
-		 * 删除
-		 * @param {Object} index
-		 */
-		delFile(index) {
-			this.$emit('delete', {
-				tempFile: this.files[index],
-				tempFilePath: this.files[index].url
-			})
-			this.files.splice(index, 1)
-		},
-
-		/**
-		 * 获取文件名和后缀
-		 * @param {Object} name
-		 */
-		getFileExt(name) {
-			const last_len = name.lastIndexOf('.')
-			const len = name.length
-			return {
-				name: name.substring(0, last_len),
-				ext: name.substring(last_len + 1, len)
-			}
-		},
-
-		/**
-		 * 获取图片信息
-		 * @param {Object} filepath
-		 */
-		getFileInfo(filepath) {
-			return new Promise((resolve, reject) => {
-				uni.getImageInfo({
-					src: filepath,
-					success(res) {
-						resolve(res)
-					},
-					fail(err) {
-						reject(err)
-					}
-				})
-			})
-		},
-
-		/**
-		 * 获取封装数据
-		 */
-		async getFileData(files, type = 'image') {
-			// 最终需要上传数据库的数据
-			let fileFullName = this.getFileExt(files.name)
-			const extname = fileFullName.ext.toLowerCase()
-			let filedata = {
-				name: files.name,
-				uuid: files.uuid,
-				extname: extname || '',
-				cloudPath: files.cloudPath,
-				fileType: files.fileType,
-				url: files.path || files.path,
-				size: files.size, //单位是字节
-				image: {},
-				path: files.path,
-				video: {}
-			}
-			if (type === 'image') {
-				const imageinfo = await this.getFileInfo(files.path)
-				filedata.image.width = imageinfo.width
-				filedata.image.height = imageinfo.height
-				filedata.image.location = imageinfo.path
-			}
-			return filedata
-		},
-
-		/**
-		 * 批量上传
-		 */
-		uploadCloudFiles(files, max = 5, onUploadProgress) {
-			files = JSON.parse(JSON.stringify(files))
-			const len = files.length
-			let count = 0
-			let self = this
-			return new Promise(resolve => {
-				while (count < max) {
-					next()
-				}
-
-				function next() {
-					let cur = count++
-					if (cur >= len) {
-						!files.find(item => !item.url && !item.errMsg) && resolve(files)
-						return
-					}
-					const fileItem = files[cur]
-					const index = self.files.findIndex(v => v.uuid === fileItem.uuid)
-					fileItem.url = ''
-					delete fileItem.errMsg
-
-					uniCloud
-						.uploadFile({
-							filePath: fileItem.path,
-							cloudPath: fileItem.cloudPath,
-							fileType: fileItem.fileType,
-							onUploadProgress: res => {
-								res.index = index
-								onUploadProgress && onUploadProgress(res)
-							}
-						})
-						.then(res => {
-							fileItem.url = res.fileID
-							fileItem.index = index
-							if (cur < len) {
-								next()
-							}
-						})
-						.catch(res => {
-							fileItem.errMsg = res.errMsg || res.message
-							fileItem.index = index
-							if (cur < len) {
-								next()
-							}
-						})
-				}
-			})
-		},
-		setEmit() {
-			let data = []
-			if (this.returnType === 'object') {
-				data = this.backObject(this.files)[0]
-			} else {
-				data = this.backObject(this.files)
-			}
-			this.$emit('input', data)
-		},
-		backObject(files) {
-			let newFilesData = JSON.parse(JSON.stringify(files))
-			newFilesData.map(v => {
-				delete v.path
-				delete v.uuid
-				delete v.video
-				delete v.progress
-				delete v.errMsg
-				delete v.status
-				delete v.cloudPath
-				return v
-			})
-			return newFilesData
-		},
-		async getTempFileURL(file, fileList) {
-			fileList = {
-				fileList: [].concat(fileList)
-			}
-			const urls = await uniCloud.getTempFileURL(fileList)
-			file.path = urls.fileList[0].tempFileURL || ''
-			const index = this.files.findIndex(v => v.path === file.path)
-			if (index !== -1) {
-				this.$set(this.files, index, file)
-			}
-		}
-	}
-}
-</script>
-
-<style>
-.uni-file-picker {
-	/* #ifndef APP-NVUE */
-	box-sizing: border-box;
-	overflow: hidden;
-	/* #endif */
-}
-
-.uni-file-picker__header {
-	padding-top: 5px;
-	padding-bottom: 10px;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	justify-content: space-between;
-}
-
-.file-title {
-	font-size: 14px;
-	color: #333;
-}
-
-.file-count {
-	font-size: 14px;
-	color: #999;
-}
-
-.is-add {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	align-items: center;
-	justify-content: center;
-}
-
-.icon-add {
-	width: 50px;
-	height: 5px;
-	background-color: #f1f1f1;
-	border-radius: 2px;
-}
-
-.rotate {
-	position: absolute;
-	transform: rotate(90deg);
-}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue b/uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue
deleted file mode 100644
index c369d7d5..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue
+++ /dev/null
@@ -1,324 +0,0 @@
-<template>
-	<view class="uni-file-picker__files">
-		<view v-if="!readonly" class="files-button" @click="choose">
-			<slot></slot>
-		</view>
-		<!-- :class="{'is-text-box':showType === 'list'}" -->
-		<view v-if="list.length > 0" class="uni-file-picker__lists is-text-box" :style="borderStyle">
-			<!-- ,'is-list-card':showType === 'list-card' -->
-
-			<view class="uni-file-picker__lists-box" v-for="(item ,index) in list" :key="index" :class="{
-				'files-border':index !== 0 && styles.dividline}"
-			 :style="index !== 0 && styles.dividline &&borderLineStyle">
-				<view class="uni-file-picker__item">
-					<!-- :class="{'is-text-image':showType === 'list'}" -->
-					<!-- 	<view class="files__image is-text-image">
-						<image class="header-image" :src="item.logo" mode="aspectFit"></image>
-					</view> -->
-					<view class="files__name">{{item.name}}</view>
-					<view v-if="delIcon&&!readonly" class="icon-del-box icon-files" @click="delFile(index)">
-						<view class="icon-del icon-files"></view>
-						<view class="icon-del rotate"></view>
-					</view>
-				</view>
-				<view v-if="(item.progress && item.progress !== 100) ||item.progress===0 " class="file-picker__progress">
-					<progress class="file-picker__progress-item" :percent="item.progress === -1?0:item.progress" stroke-width="4"
-					 :backgroundColor="item.errMsg?'#ff5a5f':'#EBEBEB'" />
-				</view>
-				<view v-if="item.status === 'error'" class="file-picker__mask" @click.stop="uploadFiles(item,index)">
-					点击重试
-				</view>
-			</view>
-
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "uploadFile",
-		props: {
-			filesList: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			delIcon: {
-				type: Boolean,
-				default: true
-			},
-			limit: {
-				type: [Number, String],
-				default: 9
-			},
-			showType: {
-				type: String,
-				default: ''
-			},
-			listStyles: {
-				type: Object,
-				default () {
-					return {
-						// 是否显示边框
-						border: true,
-						// 是否显示分隔线
-						dividline: true,
-						// 线条样式
-						borderStyle: {}
-					}
-				}
-			},
-			readonly:{
-				type:Boolean,
-				default:false
-			}
-		},
-		computed: {
-			list() {
-				let files = []
-				this.filesList.forEach(v => {
-					files.push(v)
-				})
-				return files
-			},
-			styles() {
-				let styles = {
-					border: true,
-					dividline: true,
-					'border-style': {}
-				}
-				return Object.assign(styles, this.listStyles)
-			},
-			borderStyle() {
-				let {
-					borderStyle,
-					border
-				} = this.styles
-				let obj = {}
-				if (!border) {
-					obj.border = 'none'
-				} else {
-					let width = (borderStyle && borderStyle.width) || 1
-					width = this.value2px(width)
-					let radius = (borderStyle && borderStyle.radius) || 5
-					radius = this.value2px(radius)
-					obj = {
-						'border-width': width,
-						'border-style': (borderStyle && borderStyle.style) || 'solid',
-						'border-color': (borderStyle && borderStyle.color) || '#eee',
-						'border-radius': radius
-					}
-				}
-				let classles = ''
-				for (let i in obj) {
-					classles += `${i}:${obj[i]};`
-				}
-				return classles
-			},
-			borderLineStyle() {
-				let obj = {}
-				let {
-					borderStyle
-				} = this.styles
-				if (borderStyle && borderStyle.color) {
-					obj['border-color'] = borderStyle.color
-				}
-				if (borderStyle && borderStyle.width) {
-					let width = borderStyle && borderStyle.width || 1
-					let style = borderStyle && borderStyle.style || 0
-					if (typeof width === 'number') {
-						width += 'px'
-					} else {
-						width = width.indexOf('px') ? width : width + 'px'
-					}
-					obj['border-width'] = width
-
-					if (typeof style === 'number') {
-						style += 'px'
-					} else {
-						style = style.indexOf('px') ? style : style + 'px'
-					}
-					obj['border-top-style'] = style
-				}
-				let classles = ''
-				for (let i in obj) {
-					classles += `${i}:${obj[i]};`
-				}
-				return classles
-			}
-		},
-
-		methods: {
-			uploadFiles(item, index) {
-				this.$emit("uploadFiles", {
-					item,
-					index
-				})
-			},
-			choose() {
-				this.$emit("choose")
-			},
-			delFile(index) {
-				this.$emit('delFile', index)
-			},
-			value2px(value) {
-				if (typeof value === 'number') {
-					value += 'px'
-				} else {
-					value = value.indexOf('px') !== -1 ? value : value + 'px'
-				}
-				return value
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.uni-file-picker__files {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: flex-start;
-	}
-
-	.files-button {
-		// border: 1px red solid;
-	}
-
-	.uni-file-picker__lists {
-		position: relative;
-		margin-top: 5px;
-		overflow: hidden;
-	}
-
-	.file-picker__mask {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-		position: absolute;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		color: #fff;
-		font-size: 14px;
-		background-color: rgba(0, 0, 0, 0.4);
-	}
-
-	.uni-file-picker__lists-box {
-		position: relative;
-	}
-
-	.uni-file-picker__item {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		align-items: center;
-		padding: 8px 10px;
-		padding-right: 5px;
-		padding-left: 10px;
-	}
-
-	.files-border {
-		border-top: 1px #eee solid;
-	}
-
-	.files__name {
-		flex: 1;
-		font-size: 14px;
-		color: #666;
-		margin-right: 25px;
-		/* #ifndef APP-NVUE */
-		word-break: break-all;
-		word-wrap: break-word
-		/* #endif */
-	}
-
-	.icon-files {
-		/* #ifndef APP-NVUE */
-		position: static;
-		background-color: initial;
-		/* #endif */
-	}
-
-	// .icon-files .icon-del {
-	// 	background-color: #333;
-	// 	width: 12px;
-	// 	height: 1px;
-	// }
-
-
-	.is-list-card {
-		border: 1px #eee solid;
-		margin-bottom: 5px;
-		border-radius: 5px;
-		box-shadow: 0 0 2px 0px rgba(0, 0, 0, 0.1);
-		padding: 5px;
-	}
-
-	.files__image {
-		width: 40px;
-		height: 40px;
-		margin-right: 10px;
-	}
-
-	.header-image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.is-text-box {
-		border: 1px #eee solid;
-		border-radius: 5px;
-	}
-
-	.is-text-image {
-		width: 25px;
-		height: 25px;
-		margin-left: 5px;
-	}
-
-	.rotate {
-		position: absolute;
-		transform: rotate(90deg);
-	}
-
-	.icon-del-box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		margin: auto 0;
-		/* #endif */
-		align-items: center;
-		justify-content: center;
-		position: absolute;
-		top: 0px;
-		bottom: 0;
-		right: 5px;
-		height: 26px;
-		width: 26px;
-		// border-radius: 50%;
-		// background-color: rgba(0, 0, 0, 0.5);
-		z-index: 2;
-		transform: rotate(-45deg);
-	}
-
-	.icon-del {
-		width: 15px;
-		height: 1px;
-		background-color: #333;
-		// border-radius: 1px;
-	}
-
-	/* #ifdef H5 */
-	@media all and (min-width: 768px) {
-		.uni-file-picker__files {
-			max-width: 375px;
-		}
-	}
-
-	/* #endif */
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue b/uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
deleted file mode 100644
index 486e2094..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
+++ /dev/null
@@ -1,289 +0,0 @@
-<template>
-	<view class="uni-file-picker__container">
-		<view class="file-picker__box" v-for="(item,index) in filesList" :key="index" :style="boxStyle">
-			<view class="file-picker__box-content" :style="borderStyle">
-				<image class="file-image" :src="item.path" mode="aspectFill" @click.stop="prviewImage(item,index)"></image>
-				<view v-if="delIcon && !readonly" class="icon-del-box" @click.stop="delFile(index)">
-					<view class="icon-del"></view>
-					<view class="icon-del rotate"></view>
-				</view>
-				<view v-if="(item.progress && item.progress !== 100) ||item.progress===0 " class="file-picker__progress">
-					<progress class="file-picker__progress-item" :percent="item.progress === -1?0:item.progress" stroke-width="4"
-					 :backgroundColor="item.errMsg?'#ff5a5f':'#EBEBEB'" />
-				</view>
-				<view v-if="item.errMsg" class="file-picker__mask" @click.stop="uploadFiles(item,index)">
-					点击重试
-				</view>
-			</view>
-		</view>
-		<view v-if="filesList.length < limit && !readonly" class="file-picker__box" :style="boxStyle">
-			<view class="file-picker__box-content is-add" :style="borderStyle" @click="choose">
-				<slot>
-					<view class="icon-add"></view>
-					<view class="icon-add rotate"></view>
-				</slot>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "uploadImage",
-		props: {
-			filesList: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			disabled:{
-				type: Boolean,
-				default: false
-			},
-			disablePreview: {
-				type: Boolean,
-				default: false
-			},
-			limit: {
-				type: [Number, String],
-				default: 9
-			},
-			imageStyles: {
-				type: Object,
-				default () {
-					return {
-						width: 'auto',
-						height: 'auto',
-						border: {}
-					}
-				}
-			},
-			delIcon: {
-				type: Boolean,
-				default: true
-			},
-			readonly:{
-				type:Boolean,
-				default:false
-			}
-		},
-		computed: {
-			styles() {
-				let styles = {
-					width: 'auto',
-					height: 'auto',
-					border: {}
-				}
-				return Object.assign(styles, this.imageStyles)
-			},
-			boxStyle() {
-				const {
-					width = 'auto',
-						height = 'auto'
-				} = this.styles
-				let obj = {}
-				if (height === 'auto') {
-					if (width !== 'auto') {
-						obj.height = this.value2px(width)
-						obj['padding-top'] = 0
-					} else {
-						obj.height = 0
-					}
-				} else {
-					obj.height = this.value2px(height)
-					obj['padding-top'] = 0
-				}
-
-				if (width === 'auto') {
-					if (height !== 'auto') {
-						obj.width = this.value2px(height)
-					} else {
-						obj.width = '33.3%'
-					}
-				} else {
-					obj.width = this.value2px(width)
-				}
-
-				let classles = ''
-				for(let i in obj){
-					classles+= `${i}:${obj[i]};`
-				}
-				return classles
-			},
-			borderStyle() {
-				let {
-					border
-				} = this.styles
-				let obj = {}
-				if (typeof border === 'boolean') {
-					obj.border = border ? '1px #eee solid' : 'none'
-				} else {
-					let width = (border && border.width) || 1
-					width = this.value2px(width)
-					let radius = (border && border.radius) || 5
-					radius = this.value2px(radius)
-					obj = {
-						'border-width': width,
-						'border-style': (border && border.style) || 'solid',
-						'border-color': (border && border.color) || '#eee',
-						'border-radius': radius
-					}
-				}
-				let classles = ''
-				for(let i in obj){
-					classles+= `${i}:${obj[i]};`
-				}
-				return classles
-			}
-		},
-		methods: {
-			uploadFiles(item, index) {
-				this.$emit("uploadFiles", item)
-			},
-			choose() {
-				this.$emit("choose")
-			},
-			delFile(index) {
-				this.$emit('delFile', index)
-			},
-			prviewImage(img, index) {
-				let urls = []
-				if(Number(this.limit) === 1&&this.disablePreview&&!this.disabled){
-					this.$emit("choose")
-				}
-				if(this.disablePreview) return
-				this.filesList.forEach(i => {
-					urls.push(i.path)
-				})
-
-				uni.previewImage({
-					urls: urls,
-					current: index
-				});
-			},
-			value2px(value) {
-				if (typeof value === 'number') {
-					value += 'px'
-				} else {
-					if (value.indexOf('%') === -1) {
-						value = value.indexOf('px') !== -1 ? value : value + 'px'
-					}
-				}
-				return value
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.uni-file-picker__container {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		box-sizing: border-box;
-		/* #endif */
-		flex-wrap: wrap;
-		margin: -5px;
-	}
-
-	.file-picker__box {
-		position: relative;
-		// flex: 0 0 33.3%;
-		width: 33.3%;
-		height: 0;
-		padding-top: 33.33%;
-		/* #ifndef APP-NVUE */
-		box-sizing: border-box;
-		/* #endif */
-	}
-
-	.file-picker__box-content {
-		position: absolute;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		margin: 5px;
-		border: 1px #eee solid;
-		border-radius: 8px;
-		overflow: hidden;
-	}
-
-	.file-picker__progress {
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		/* border: 1px red solid; */
-		z-index: 2;
-	}
-
-	.file-picker__progress-item {
-		width: 100%;
-	}
-
-	.file-picker__mask {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-		position: absolute;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		color: #fff;
-		font-size: 12px;
-		background-color: rgba(0, 0, 0, 0.4);
-	}
-
-	.file-image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.is-add {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		align-items: center;
-		justify-content: center;
-	}
-
-	.icon-add {
-		width: 50px;
-		height: 5px;
-		background-color: #f1f1f1;
-		border-radius: 2px;
-	}
-
-	.rotate {
-		position: absolute;
-		transform: rotate(90deg);
-	}
-
-	.icon-del-box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		align-items: center;
-		justify-content: center;
-		position: absolute;
-		top: 5px;
-		right: 5px;
-		height: 26px;
-		width: 26px;
-		border-radius: 50%;
-		background-color: rgba(0, 0, 0, 0.5);
-		z-index: 2;
-		transform: rotate(-45deg);
-	}
-
-	.icon-del {
-		width: 15px;
-		height: 2px;
-		background-color: #fff;
-		border-radius: 2px;
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-file-picker/package.json b/uni_modules/uni-feedback/uni_modules/uni-file-picker/package.json
deleted file mode 100644
index 0b8c6d88..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-file-picker/package.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "id": "uni-file-picker",
-  "displayName": "FilePicker 文件选择上传",
-  "version": "0.0.6",
-  "description": "文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间",
-  "keywords": [
-    "uni-ui",
-    "图片上传",
-    "文件上传",
-    "uni-file-picker"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "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"
-        }
-      }
-    }
-  }
-}
diff --git a/uni_modules/uni-feedback/uni_modules/uni-file-picker/readme.md b/uni_modules/uni-feedback/uni_modules/uni-file-picker/readme.md
deleted file mode 100644
index 7d360503..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-file-picker/readme.md
+++ /dev/null
@@ -1,296 +0,0 @@
-
-## FilePicker 文件选择上传
-
-> **组件名：uni-file-picker**
->  代码块： `uFilePicker`
-
-
-文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
-
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 组件需要依赖 `sass` 插件 ，请自行手动安装
-> - 使用组件需要绑定服务空间
-> - 选择文件目前只支持 `H5` 和 `微信小程序平台` ，且 `微信小程序平台` 使用 `wx.chooseMessageFile()`
-> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-
-
-
-## API
-
-### FilePicker Props
-
-| 属性名					| 类型			| 默认值	| 可选值								| 说明																	|
-| :-:						| :-:			| :-:		| :-:									| :-:																	|
-| v-model/value	| Array\Object	| -			| -						| 组件数据，通常用来回显 ,类型由`return-type`属性决定	，**格式见下文**	|
-| disabled			| Boolean	| false	| -										| 组件禁用								|
-| readonly			| Boolean	| false	| -										| 组件只读，不可选择，不显示进度，不显示删除按钮								|
-| return-type		| String	| array	| array/object				| 限制 `value` 格式，当为 `object`	 时	，组件只能单选，且会覆盖	|
-| disable-preview| Boolean	| false	| -									| 禁用图片预览，仅	`mode:grid`生效	|
-| del-icon			| Boolean	| true	| -										| 是否显示删除按钮	|
-| auto-upload		| Boolean	| true	| -										| 是否自动上传，值为`true`则只触发@select,可自行上传|
-| limit					| Number\String	| 9	| -									| 最大选择个数 ，h5 会自动忽略多选的部分			|
-| title					| String	| -			| -										| 组件标题，右侧显示上传计数			|
-| mode					| String	| list	| list/grid						| 选择文件后的文件列表样式								|
-| file-mediatype| String	| image	| image/video/all			| 选择文件类型,all 只支持 H5 和微信小程序平台	|
-| file-extname	| Array\String		| -			| -						| 选择文件后缀，字符串的情况下需要用逗号分隔（推荐使用字符串），根据 `file-mediatype` 属性而不同|
-| list-styles	  | Object	| -			| -										| `mode:list` 时的样式			|
-| image-styles	| Object	| -			| -										| `mode:grid` 时的样式	|
-
-
-### value 格式 
-
-三个属性必填，否则影响组件显示
-
-```json 
-[
-	{
-		"name":"file.txt",
-		"extname":"txt",
-		"url":"https://xxxx",
-		// ...
-	}
-]
-
-```
-
-### list-styles 格式 
-
-```json 
-{
-	"borderStyle":{
-		"color":"#eee",		// 边框颜色
-		"width":"1px",		// 边框宽度
-		"style":"solid", 	// 边框样式
-		"radius":"5px" 		// 边框圆角，不支持百分比
-	},
-	"border":false, // 是否显示边框
-	"dividline":true // 是否显示分隔线
-}
-```
-
-### image-styles 格式 
-
-```json 
-{
-	"height": 60,	// 边框高度
-	"width": 60,	// 边框宽度
-	"border":{ // 如果为 Boolean 值，可以控制边框显示与否
-		"color":"#eee",		// 边框颜色
-		"width":"1px",		// 边框宽度
-		"style":"solid", 	// 边框样式
-		"radius":"50%" 		// 边框圆角，支持百分比
-	}
-}
-```
-
-### FilePicker Events
-
-|事件称名		|说明							|	返回值	|					
-|:-:			|:-:							|	:-:	|
-|@select	| 选择文件后触发 		| 见下文|
-|@progress|文件上传时触发			| 见下文|
-|@success	|上传成功触发				| 见下文|
-|@fail		|上传失败触发				| 见下文|
-|@delete	|文件从列表移除时触发| 见下文|
-
-
-#### Callback Params
-
-```json
-{
-	"progress"			: Number, 		// 上传进度 ，仅 @progress 事件包含此字段
-	"index"				: Number, 		// 上传文件索引 ，仅 @progress 事件包含此字段
-	"tempFile"			: file, 		// 当前文件对象 ，包含文件流，文件大小，文件名称等，仅 @progress 事件包含此字段
-	"tempFiles"			: files, 		// 文件列表,包含文件流，文件大小，文件名称等
-	"tempFilePaths"		: filePaths, 	// 文件地址列表，@sucess 事件为上传后的线上文件地址
-}
-
-```
-
-
-### FilePicker Methods
-
-通过 `$ref` 调用
-
-| 方法称名						| 说明			|		参数 		|				
-| :-:								| :-:		  |		:-:		  |				
-| upload						| 手动上传 	，如`autoUpload`为`false`  ，必须调用此方法| - |
-
-### FilePicker Slots
-
-插槽可定义上传按钮显示样式 
-
-|	插槽名 	| 说明 |
-| :-:			| :-:		  |
-|	default	|默认插槽|
-
-## 组件用法
-
-### 基础用法
-
-```html
-<uni-file-picker 
-	v-model="imageValue" 
-	fileMediatype="image" 
-	mode="grid" 
-	@select="select" 
-	@progress="progress" 
-	@success="success" 
-	@fail="fail" 
-/>
-```
-
-```javascript
-export default {
-		data() {
-			return {
-				imageValue:[]
-			}
-		},
-		methods:{
-			// 获取上传状态
-			select(e){
-				console.log('选择文件：',e)
-			}
-			// 获取上传进度
-			progress(e){
-				console.log('上传进度：',e)
-			},
-			
-			// 上传成功
-			success(e){
-				console.log('上传成功')
-			},
-			
-			// 上传失败
-			fail(e){
-				console.log('上传失败：',e)
-			}
-		}
-}
-
-```
-
-### 选择指定后缀图片，且限制选择个数
-
-配置 `file-mediatype` 属性为 `image`，限定只选择图片
-
-配置 `file-extname` 属性为 `'png,jpg'`，限定只选择 `png`和`jpg`后缀的图片
-
-配置 `limit` 属性为 1 ，则最多选择一张图片
-
-配置 `mode` 属性为 `grid` ，可以使用九宫格样式选择图片
-
-
-```html
-<uni-file-picker 
-	v-model="imageValue"  
-	file-mediatype="image"
-	mode="grid"
-	file-extname="png,jpg"
-	:limit="1"
-	@progress="progress" 
-	@success="success" 
-	@fail="fail" 
-	@select="select"
-/>
-```
-
-### 手动上传
-
-配置 `auto-upload` 属性为 `false` ，可以停止自动上传，通过`ref`调用`upload`方法自行选择上传时机
-
-```html
-<view>
-	<uni-file-picker  ref="files" :auto-upload="false"/>
-	<button @click="upload">上传文件</button>
-</view>
-```
-
-```javascript
-export default {
-		data() {},
-		methods:{
-			upload(){
-				this.$refs.files.upload()
-			}
-		}
-}
-
-```
-
-### 单选图片且点击再次选择
-
-配置 `disable-preview` 属性为 `true`，禁用点击预览图片功能
-
-配置 `del-icon` 属性为 `false`，隐藏删除按钮
-
-配置 `return-type` 属性为 `object`，设置 `value` 类型 ，如需绑定 `array`类型 ，则设置`limit:1`，可达到一样的效果
-
-
-
-```html
-<uni-file-picker 
-	disable-preview
-	:del-icon="false"
-	return-type="object"
->选择头像</uni-file-picker>
-```
-
-### 自定义样式
-
-配置 `image-styles` 属性，可以自定义`mode:image`时的回显样式
-
-配置 `list-styles` 属性，可以自定义`mode:video|| mode:all`时的回显样式
-
-```html
-<view>
-	<uni-file-picker fileMediatype="image" :image-styles="imageStyles"/>
-	<uni-file-picker fileMediatype="all" :list-styles="listStyles"/>
-</view>
-```
-
-```javascript
-export default {
-		data() {
-			imageStyles:{
-				width:64,
-				height:64,
-				border:{
-					color:"#ff5a5f",
-					width:2,
-					style:'dashed',
-					radius:'2px'
-				}
-			},
-			listStyles:{
-				// 是否显示边框
-				border: true,
-				// 是否显示分隔线
-				dividline: true,
-				// 线条样式
-				borderStyle: {
-					width:1,
-					color:'blue',
-					radius:2
-				}
-			}
-		}
-}
-
-```
-
-
-
-### 使用插槽 
-
-使用默认插槽可以自定义选择文件按钮样式
-
-```html
-<uni-file-picker 
-	v-model="value" file-mediatype="all">
-	<button>选择文件</button>
-</uni-file-picker>
-```
-
diff --git a/uni_modules/uni-feedback/uni_modules/uni-forms/changelog.md b/uni_modules/uni-feedback/uni_modules/uni-forms/changelog.md
deleted file mode 100644
index 86e4c391..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-forms/changelog.md
+++ /dev/null
@@ -1,10 +0,0 @@
-## 1.0.42（2021-04-30）
-- 修复 自定义检验器失效的问题
-## 1.0.41（2021-03-05）
-- 更新 校验器
-- 修复 表单规则设置类型为 number 的情况下，值为0校验失败的Bug
-## 1.0.40（2021-03-04）
-- 修复 动态显示uni-forms-item的情况下，submit 方法获取值错误的Bug
-## 1.0.39（2021-02-05）
-- 调整为uni_modules目录规范
-- 修复 校验器传入 int 等类型 ，返回String类型的Bug
diff --git a/uni_modules/uni-feedback/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue b/uni_modules/uni-feedback/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
deleted file mode 100644
index acaac80e..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
+++ /dev/null
@@ -1,453 +0,0 @@
-<template>
-	<view class="uni-forms-item" :class="{'uni-forms-item--border':border,'is-first-border':border&&isFirstBorder,'uni-forms-item-error':msg}">
-		<view class="uni-forms-item__box">
-			<view class="uni-forms-item__inner" :class="['is-direction-'+labelPos,]">
-				<view v-if="label" class="uni-forms-item__label" :style="{width:labelWid+'px',justifyContent: justifyContent}">
-					<slot name="left">
-						<uni-icons v-if="leftIcon" class="label-icon" size="16" :type="leftIcon" :color="iconColor" />
-						<text class="label-text">{{label}}</text>
-						<text v-if="required" class="is-required">*</text>
-					</slot>
-				</view>
-				<view class="uni-forms-item__content" :class="{'is-input-error-border': msg}">
-					<slot></slot>
-				</view>
-			</view>
-			<view v-if="msg" class="uni-error-message" :class="{'uni-error-msg--boeder':border}" :style="{
-				paddingLeft: (labelPos === 'left'? Number(labelWid)+5:5) + 'px'
-			}"><text class="uni-error-message-text">{{ showMsg === 'undertext' ? msg:'' }}</text></view>
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * Field 输入框
-	 * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21001
-	 * @property {Boolean} 	required 			是否必填，左边显示红色"*"号（默认false）
-	 * @property {String} validateTrigger = [bind|submit]	校验触发器方式 默认 submit 可选
-	 * 	@value bind 	发生变化时触发
-	 * 	@value submit 	提交时触发
-	 * @property {String } 	leftIcon 			label左边的图标，限 uni-ui 的图标名称
-	 * @property {String } 	iconColor 			左边通过icon配置的图标的颜色（默认#606266）
-	 * @property {String } 	label 				输入框左边的文字提示
-	 * @property {Number } 	labelWidth 			label的宽度，单位px（默认65）
-	 * @property {String } 	labelAlign = [left|center|right] label的文字对齐方式（默认left）
-	 * 	@value left		label 左侧显示
-	 * 	@value center	label 居中
-	 * 	@value right	label 右侧对齐
-	 * @property {String } 	labelPosition = [top|left] label的文字的位置（默认left）
-	 * 	@value top	顶部显示 label
-	 * 	@value left	左侧显示 label
-	 * @property {String } 	errorMessage 		显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
-	 * @property {String } 	name 				表单域的属性名，在使用校验规则时必填
-	 */
-
-
-
-	export default {
-		name: "uniFormsItem",
-		props: {
-			// 自定义内容
-			custom: {
-				type: Boolean,
-				default: false
-			},
-			// 是否显示报错信息
-			showMessage: {
-				type: Boolean,
-				default: true
-			},
-			name: String,
-			required: Boolean,
-			validateTrigger: {
-				type: String,
-				default: ''
-			},
-			leftIcon: String,
-			iconColor: {
-				type: String,
-				default: '#606266'
-			},
-			label: String,
-			// 左边标题的宽度单位px
-			labelWidth: {
-				type: [Number, String],
-				default: ''
-			},
-			// 对齐方式，left|center|right
-			labelAlign: {
-				type: String,
-				default: ''
-			},
-			// lable的位置，可选为 left-左边，top-上边
-			labelPosition: {
-				type: String,
-				default: ''
-			},
-			errorMessage: {
-				type: [String, Boolean],
-				default: ''
-			}
-		},
-		data() {
-			return {
-				errorTop: false,
-				errorBottom: false,
-				labelMarginBottom: '',
-				errorWidth: '',
-				errMsg: '',
-				val: '',
-				labelPos: '',
-				labelWid: '',
-				labelAli: '',
-				showMsg: 'undertext',
-				border: false,
-				isFirstBorder: false
-			};
-		},
-		computed: {
-			msg() {
-				return this.errorMessage || this.errMsg;
-			},
-			fieldStyle() {
-				let style = {}
-				if (this.labelPos == 'top') {
-					style.padding = '0 0'
-					this.labelMarginBottom = '6px'
-				}
-				if (this.labelPos == 'left' && this.msg !== false && this.msg != '') {
-					style.paddingBottom = '0px'
-					this.errorBottom = true
-					this.errorTop = false
-				} else if (this.labelPos == 'top' && this.msg !== false && this.msg != '') {
-					this.errorBottom = false
-					this.errorTop = true
-				} else {
-					// style.paddingBottom = ''
-					this.errorTop = false
-					this.errorBottom = false
-				}
-				return style
-			},
-
-			// uni不支持在computed中写style.justifyContent = 'center'的形式，故用此方法
-			justifyContent() {
-				if (this.labelAli === 'left') return 'flex-start';
-				if (this.labelAli === 'center') return 'center';
-				if (this.labelAli === 'right') return 'flex-end';
-			}
-		},
-		watch: {
-			validateTrigger(trigger) {
-				this.formTrigger = trigger
-			}
-		},
-		created() {
-			this.form = this.getForm()
-			this.group = this.getForm('uniGroup')
-			this.formRules = []
-			this.formTrigger = this.validateTrigger
-			if (this.form) {
-			this.form.childrens.push(this)
-			}
-			this.init()
-		},
-		destroyed() {
-			if (this.form) {
-				this.form.childrens.forEach((item, index) => {
-					if (item === this) {
-						this.form.childrens.splice(index, 1)
-						delete this.form.formData[item.name]
-					}
-				})
-			}
-		},
-		methods: {
-			init() {
-				if (this.form) {
-					let {
-						formRules,
-						validator,
-						formData,
-						value,
-						labelPosition,
-						labelWidth,
-						labelAlign,
-						errShowType
-					} = this.form
-
-					this.labelPos = this.labelPosition ? this.labelPosition : labelPosition
-					this.labelWid = this.label ? (this.labelWidth ? this.labelWidth : labelWidth):0
-					this.labelAli = this.labelAlign ? this.labelAlign : labelAlign
-
-					// 判断第一个 item
-					if (!this.form.isFirstBorder) {
-						this.form.isFirstBorder = true
-						this.isFirstBorder = true
-					}
-
-					// 判断 group 里的第一个 item
-					if (this.group) {
-						if (!this.group.isFirstBorder) {
-							this.group.isFirstBorder = true
-							this.isFirstBorder = true
-						}
-					}
-
-					this.border = this.form.border
-					this.showMsg = errShowType
-
-					if (formRules) {
-						this.formRules = formRules[this.name] || {}
-					}
-
-					this.validator = validator
-				} else {
-					this.labelPos = this.labelPosition || 'left'
-					this.labelWid = this.labelWidth || 65
-					this.labelAli = this.labelAlign || 'left'
-				}
-			},
-			/**
-			 * 获取父元素实例
-			 */
-			getForm(name = 'uniForms') {
-				let parent = this.$parent;
-				let parentName = parent.$options.name;
-				while (parentName !== name) {
-					parent = parent.$parent;
-					if (!parent) return false
-					parentName = parent.$options.name;
-				}
-				return parent;
-			},
-
-			/**
-			 * 移除该表单项的校验结果
-			 */
-			clearValidate() {
-				this.errMsg = ''
-			},
-
-			setValue(value){
-				if (this.name) {
-					if(this.errMsg) this.errMsg = ''
-					this.form.formData[this.name] =  this.form._getValue(this.name, value)
-					if(!this.formRules || (typeof(this.formRules) && JSON.stringify(this.formRules) === '{}')) return
-					this.triggerCheck(this.form._getValue(this.name, value))
-				}
-			},
-
-			/**
-			 * 校验规则
-			 * @param {Object} value
-			 */
-			async triggerCheck(value, callback) {
-				let promise = null;
-				this.errMsg = ''
-				// if no callback, return promise
-				// if (callback && typeof callback !== 'function' && Promise) {
-				// 	promise = new Promise((resolve, reject) => {
-				// 		callback = function(valid) {
-				// 			!valid ? resolve(valid) : reject(valid)
-				// 		};
-				// 	});
-				// }
-				// if (!this.validator) {
-				// 	typeof callback === 'function' && callback(null);
-				// 	if (promise) return promise
-				// }
-				if (!this.validator) return
-				const isNoField = this.isRequired(this.formRules.rules || [])
-				let isTrigger = this.isTrigger(this.formRules.validateTrigger, this.validateTrigger, this.form.validateTrigger)
-				let result = null
-				if (!(!isTrigger)) {
-					result = await this.validator.validateUpdate({
-						[this.name]: value
-					}, this.form.formData)
-				}
-				// 判断是否必填,非必填，不填不校验，填写才校验
-				if (!isNoField && (value === undefined || value === '')) {
-					result = null
-				}
-				if (isTrigger && result && result.errorMessage) {
-					const inputComp = this.form.inputChildrens.find(child => child.rename === this.name)
-					if (inputComp) {
-						inputComp.errMsg = result.errorMessage
-					}
-					if (this.form.errShowType === 'toast') {
-						uni.showToast({
-							title: result.errorMessage || '校验错误',
-							icon: 'none'
-						})
-					}
-					if (this.form.errShowType === 'modal') {
-						uni.showModal({
-							title: '提示',
-							content: result.errorMessage || '校验错误'
-						})
-					}
-				}
-
-				this.errMsg = !result ? '' : result.errorMessage
-				// 触发validate事件
-				this.form.validateCheck(result ? result : null)
-				// typeof callback === 'function' && callback(result ? result : null);
-				// if (promise) return promise
-
-			},
-			/**
-			 * 触发时机
-			 * @param {Object} event
-			 */
-			isTrigger(rule, itemRlue, parentRule) {
-				let rl = true;
-				//  bind  submit
-				if (rule === 'submit' || !rule) {
-					if (rule === undefined) {
-						if (itemRlue !== 'bind') {
-							if (!itemRlue) {
-								return parentRule === 'bind' ? true : false
-							}
-							return false
-						}
-						return true
-					}
-					return false
-				}
-				return true;
-			},
-			// 是否有必填字段
-			isRequired(rules) {
-				let isNoField = false
-				for (let i = 0; i < rules.length; i++) {
-					const ruleData = rules[i]
-					if (ruleData.required) {
-						isNoField = true
-						break
-					}
-				}
-				return isNoField
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	.uni-forms-item {
-		position: relative;
-		padding: 0px;
-		text-align: left;
-		color: #333;
-		font-size: 14px;
-		// margin-bottom: 22px;
-	}
-	.uni-forms-item__box {
-		position: relative;
-
-	}
-	.uni-forms-item__inner {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		// flex-direction: row;
-		// align-items: center;
-		padding-bottom: 22px;
-		// margin-bottom: 22px;
-	}
-
-	.is-direction-left {
-		flex-direction: row;
-	}
-
-	.is-direction-top {
-		flex-direction: column;
-	}
-
-	.uni-forms-item__label {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		flex-shrink: 0;
-		box-sizing: border-box;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		width: 65px;
-		// line-height: 2;
-		// margin-top: 3px;
-		padding: 5px 0;
-		height: 36px;
-		margin-right: 5px;
-		.label-text {
-			font-size: 14px;
-			color: #333;
-		}
-	}
-
-	.uni-forms-item__content {
-		/* #ifndef APP-NVUE */
-		width: 100%;
-		box-sizing: border-box;
-		min-height: 36px;
-		/* #endif */
-		flex: 1;
-	}
-
-
-	.label-icon {
-		margin-right: 5px;
-		margin-top: -1px;
-	}
-
-	// 必填
-	.is-required {
-		color: $uni-color-error;
-	}
-
-	.uni-error-message {
-		position: absolute;
-		bottom: 0px;
-		left: 0;
-		text-align: left;
-	}
-	.uni-error-message-text {
-		line-height: 22px;
-		color: $uni-color-error;
-		font-size: 12px;
-	}
-
-	.uni-error-msg--boeder {
-		position: relative;
-		bottom: 0;
-		line-height: 22px;
-	}
-
-	.is-input-error-border {
-		border-color: $uni-color-error;
-	}
-
-	.uni-forms-item--border {
-		margin-bottom: 0;
-		padding: 10px 0;
-		// padding-bottom: 0;
-		border-top: 1px #eee solid;
-		.uni-forms-item__inner {
-			padding: 0;
-		}
-	}
-
-	.uni-forms-item-error {
-		padding-bottom: 0;
-	}
-
-	.is-first-border {
-		/* #ifndef APP-NVUE */
-		border: none;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		border-width: 0;
-		/* #endif */
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-forms/components/uni-forms/uni-forms.vue b/uni_modules/uni-feedback/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
deleted file mode 100644
index 7a5ce73d..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
+++ /dev/null
@@ -1,456 +0,0 @@
-<template>
-	<!--   -->
-	<view class="uni-forms" :class="{'uni-forms--top':!border}">
-		<form @submit.stop="submitForm" @reset="resetForm">
-			<slot></slot>
-		</form>
-	</view>
-</template>
-
-<script>
-	/**
-	 * Forms 表单
-	 * @description 由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=2773
-	 * @property {Object} rules  							表单校验规则
-	 * @property {String} validateTrigger = [bind|submit]	校验触发器方式 默认 submit 可选
-	 * @value bind 	发生变化时触发
-	 * @value submit 	提交时触发
-	 * @property {String} labelPosition = [top|left]				label 位置 默认 left 可选
-	 * @value top		顶部显示 label
-	 * @value left		左侧显示 label
-	 * @property {String} labelWidth  							label 宽度，默认 65px
-	 * @property {String} labelAlign = [left|center|right]		label 居中方式  默认 left 可选
-	 * @value left		label 左侧显示
-	 * @value center	label 居中
-	 * @value right		label 右侧对齐
-	 * @property {String} errShowType = [undertext|toast|modal]	校验错误信息提示方式
-	 * @value undertext	错误信息在底部显示
-	 * @value toast		错误信息toast显示
-	 * @value modal		错误信息modal显示
-	 * @event {Function} submit 提交时触发
-	 */
-	import Vue from 'vue'
-	Vue.prototype.binddata = function(name, value, formName) {
-		if (formName) {
-			this.$refs[formName].setValue(name, value)
-		} else {
-			let formVm
-			for (let i in this.$refs) {
-				const vm = this.$refs[i]
-				if (vm && vm.$options && vm.$options.name === 'uniForms') {
-					formVm = vm
-					break
-				}
-			}
-			if (!formVm) return console.error('当前 uni-froms 组件缺少 ref 属性')
-			formVm.setValue(name, value)
-		}
-	}
-
-	import Validator from './validate.js'
-
-	export default {
-		name: 'uniForms',
-		props: {
-			value: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			// 表单校验规则
-			rules: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			// 校验触发器方式，默认 关闭
-			validateTrigger: {
-				type: String,
-				default: ''
-			},
-			// label 位置，可选值 top/left
-			labelPosition: {
-				type: String,
-				default: 'left'
-			},
-			// label 宽度，单位 px
-			labelWidth: {
-				type: [String, Number],
-				default: 65
-			},
-			// label 居中方式，可选值 left/center/right
-			labelAlign: {
-				type: String,
-				default: 'left'
-			},
-			errShowType: {
-				type: String,
-				default: 'undertext'
-			},
-			border: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				formData: {}
-			};
-		},
-		watch: {
-			rules(newVal) {
-				this.init(newVal)
-			},
-			trigger(trigger) {
-				this.formTrigger = trigger
-			},
-		},
-		created() {
-			let _this = this
-			this.childrens = []
-			this.inputChildrens = []
-			this.checkboxChildrens = []
-			this.formRules = []
-			// this.init(this.rules)
-		},
-		mounted() {
-			this.init(this.rules)
-		},
-		methods: {
-			init(formRules) {
-				// 判断是否有规则
-				if (Object.keys(formRules).length > 0) {
-					this.formTrigger = this.trigger
-					this.formRules = formRules
-					// if (!this.validator) {
-						this.validator = new Validator(formRules)
-					// }
-				} else {
-					return
-				}
-				// 判断表单存在那些实例
-				for (let i in this.value) {
-					const itemData = this.childrens.find(v => v.name === i)
-					if (itemData) {
-						this.formData[i] = this.value[i]
-						itemData.init()
-					}
-				}
-
-				// watch 每个属性 ，需要知道具体那个属性发变化
-				Object.keys(this.value).forEach((key) => {
-					this.$watch('value.' + key, (newVal) => {
-						const itemData = this.childrens.find(v => v.name === key)
-						if (itemData) {
-							this.formData[key] = this._getValue(key, newVal)
-							itemData.init()
-						} else {
-							this.formData[key] = this.value[key] || null
-						}
-					})
-				})
-			},
-			/**
-			 * 设置校验规则
-			 * @param {Object} formRules
-			 */
-			setRules(formRules) {
-				this.init(formRules)
-			},
-			/**
-			 * 公开给用户使用
-			 * 设置自定义表单组件 value 值
-			 *  @param {String} name 字段名称
-			 *  @param {String} value 字段值
-			 */
-			setValue(name, value, callback) {
-				let example = this.childrens.find(child => child.name === name)
-				if (!example) return null
-				value = this._getValue(example.name, value)
-				this.formData[name] = value
-				example.val = value
-				this.$emit('input', Object.assign({}, this.value, this.formData))
-				return example.triggerCheck(value, callback)
-			},
-
-			/**
-			 * TODO 表单提交， 小程序暂不支持这种用法
-			 * @param {Object} event
-			 */
-			submitForm(event) {
-				const value = event.detail.value
-				return this.validateAll(value || this.formData, 'submit')
-			},
-
-			/**
-			 * 表单重置
-			 * @param {Object} event
-			 */
-			resetForm(event) {
-				this.childrens.forEach(item => {
-					item.errMsg = ''
-					const inputComp = this.inputChildrens.find(child => child.rename === item.name)
-					if (inputComp) {
-						inputComp.errMsg = ''
-						inputComp.$emit('input', inputComp.multiple ? [] : '')
-					}
-				})
-
-				this.childrens.forEach((item) => {
-					if (item.name) {
-						this.formData[item.name] = this._getValue(item.name, '')
-					}
-				})
-
-				this.$emit('input', this.formData)
-				this.$emit('reset', event)
-			},
-
-			/**
-			 * 触发表单校验，通过 @validate 获取
-			 * @param {Object} validate
-			 */
-			validateCheck(validate) {
-				if (validate === null) validate = null
-				this.$emit('validate', validate)
-			},
-			/**
-			 * 校验所有或者部分表单
-			 */
-			async validateAll(invalidFields, type, callback) {
-				this.childrens.forEach(item => {
-					item.errMsg = ''
-				})
-
-				let promise;
-				if (!callback && typeof callback !== 'function' && Promise) {
-					promise = new Promise((resolve, reject) => {
-						callback = function(valid, invalidFields) {
-							!valid ? resolve(invalidFields) : reject(valid);
-						};
-					});
-				}
-
-				let fieldsValue = {}
-				let tempInvalidFields = Object.assign({}, invalidFields)
-
-				Object.keys(this.formRules).forEach(item => {
-					const values = this.formRules[item]
-					const rules = (values && values.rules) || []
-					let isNoField = false
-					for (let i = 0; i < rules.length; i++) {
-						const rule = rules[i]
-						if (rule.required) {
-							isNoField = true
-							break
-						}
-					}
-					// 如果存在 required 才会将内容插入校验对象
-					if (!isNoField &&
-						((tempInvalidFields[item] === undefined ||
-								tempInvalidFields[item] === '') &&
-							tempInvalidFields[item] !== false
-						)) {
-						delete tempInvalidFields[item]
-					}
-				})
-
-				// 循环字段是否存在于校验规则中
-				for (let i in this.formRules) {
-					for (let j in tempInvalidFields) {
-						const index = this.childrens.findIndex(v => v.name === j)
-						if (i === j && index !== -1) {
-							fieldsValue[i] = tempInvalidFields[i]
-						}
-					}
-				}
-				let result = []
-				let example = null
-
-				let newFormData = {}
-				this.childrens.forEach(v => {
-					newFormData[v.name] = this._getValue(v.name, invalidFields[v.name])
-				})
-				if (this.validator) {
-					for (let i in fieldsValue) {
-						// 循环校验，目的是异步校验
-						const resultData = await this.validator.validateUpdate({
-							[i]: fieldsValue[i]
-						}, this.formData)
-
-						// 未通过
-						if (resultData) {
-							// 获取当前未通过子组件实例
-							example = this.childrens.find(child => child.name === resultData.key)
-							// 获取easyInput 组件实例
-							const inputComp = this.inputChildrens.find(child => child.rename === (example && example.name))
-							if (inputComp) {
-								inputComp.errMsg = resultData.errorMessage
-							}
-							result.push(resultData)
-							// 区分触发类型
-							if (this.errShowType === 'undertext') {
-								if (example) example.errMsg = resultData.errorMessage
-							} else {
-								if (this.errShowType === 'toast') {
-									uni.showToast({
-										title: resultData.errorMessage || '校验错误',
-										icon: 'none'
-									})
-									break
-								} else if (this.errShowType === 'modal') {
-									uni.showModal({
-										title: '提示',
-										content: resultData.errorMessage || '校验错误'
-									})
-									break
-								} else {
-									if (example) example.errMsg = resultData.errorMessage
-								}
-							}
-						}
-					}
-				}
-
-				if (Array.isArray(result)) {
-					if (result.length === 0) result = null
-				}
-
-				if (type === 'submit') {
-					this.$emit('submit', {
-						detail: {
-							value: newFormData,
-							errors: result
-						}
-					})
-				} else {
-					this.$emit('validate', result)
-				}
-
-				callback && typeof callback === 'function' && callback(result, newFormData)
-
-				if (promise && callback) {
-					return promise
-				} else {
-					return null
-				}
-			},
-
-			/**
-			 * 外部调用方法
-			 * 手动提交校验表单
-			 * 对整个表单进行校验的方法，参数为一个回调函数。
-			 */
-			submit(callback) {
-				// Object.assign(this.formData,formData)
-				for (let i in this.value) {
-					const itemData = this.childrens.find(v => v.name === i)
-					if (itemData) {
-						if (this.formData[i] === undefined) {
-							this.formData[i] = this._getValue(i, this.value[i])
-						}
-					}
-				}
-				return this.validateAll(this.formData, 'submit', callback)
-			},
-
-			/**
-			 * 外部调用方法
-			 * 校验表单
-			 * 对整个表单进行校验的方法，参数为一个回调函数。
-			 */
-			validate(callback) {
-				return this.validateAll(this.formData, '', callback)
-			},
-
-			/**
-			 * 部分表单校验
-			 * @param {Object} props
-			 * @param {Object} cb
-			 */
-			validateField(props, callback) {
-				props = [].concat(props);
-				let invalidFields = {}
-				this.childrens.forEach(item => {
-					if (props.indexOf(item.name) !== -1) {
-						invalidFields = Object.assign({}, invalidFields, {
-							[item.name]: this.formData[item.name]
-						})
-					}
-				})
-				return this.validateAll(invalidFields, '', callback)
-			},
-
-			/**
-			 * 对整个表单进行重置，将所有字段值重置为初始值并移除校验结果
-			 */
-			resetFields() {
-				this.resetForm()
-			},
-
-			/**
-			 * 移除表单项的校验结果。传入待移除的表单项的 prop 属性或者 prop 组成的数组，如不传则移除整个表单的校验结果
-			 */
-			clearValidate(props) {
-				props = [].concat(props);
-				this.childrens.forEach(item => {
-					const inputComp = this.inputChildrens.find(child => child.rename === item.name)
-					if (props.length === 0) {
-						item.errMsg = ''
-						if (inputComp) {
-							inputComp.errMsg = ''
-						}
-					} else {
-						if (props.indexOf(item.name) !== -1) {
-							item.errMsg = ''
-							if (inputComp) {
-								inputComp.errMsg = ''
-							}
-						}
-					}
-				})
-			},
-			/**
-			 * 把 value 转换成指定的类型
-			 * @param {Object} key
-			 * @param {Object} value
-			 */
-			_getValue(key, value) {
-				const rules = (this.formRules[key] && this.formRules[key].rules) || []
-				const isRuleNum = rules.find(val => val.format && this.type_filter(val.format))
-				const isRuleBool = rules.find(val => val.format && val.format === 'boolean' || val.format === 'bool')
-				// 输入值为 number
-				if (isRuleNum) {
-					value = isNaN(value) ? value : (value === '' || value === null ? null : Number(value))
-				}
-				// 简单判断真假值
-				if (isRuleBool) {
-					value = !value ? false : true
-				}
-				return value
-			},
-			/**
-			 * 过滤数字类型
-			 * @param {Object} format
-			 */
-			type_filter(format) {
-				return format === 'int' || format === 'double' || format === 'number' || format === 'timestamp'
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-forms {
-		// overflow: hidden;
-		// padding: 10px 15px;
-	}
-
-	.uni-forms--top {
-		// padding: 10px 15px;
-		// padding-top: 22px;
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-forms/components/uni-forms/validate.js b/uni_modules/uni-feedback/uni_modules/uni-forms/components/uni-forms/validate.js
deleted file mode 100644
index e4aad950..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-forms/components/uni-forms/validate.js
+++ /dev/null
@@ -1,472 +0,0 @@
-
-var pattern = {
-  email: /^\S+?@\S+?\.\S+?$/,
-  idcard: /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-  url: new RegExp("^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$", 'i')
-};
-
-const FORMAT_MAPPING = {
-  "int": 'integer',
-  "bool": 'boolean',
-  "double": 'number',
-  "long": 'number',
-  "password": 'string'
-  // "fileurls": 'array'
-}
-
-function formatMessage(args, resources = '') {
-  var defaultMessage = ['label']
-  defaultMessage.forEach((item) => {
-    if (args[item] === undefined) {
-      args[item] = ''
-    }
-  })
-
-  let str = resources
-  for (let key in args) {
-    let reg = new RegExp('{' + key + '}')
-    str = str.replace(reg, args[key])
-  }
-  return str
-}
-
-function isEmptyValue(value, type) {
-  if (value === undefined || value === null) {
-    return true;
-  }
-
-  if (typeof value === 'string' && !value) {
-    return true;
-  }
-
-  if (Array.isArray(value) && !value.length) {
-    return true;
-  }
-
-  if (type === 'object' && !Object.keys(value).length) {
-    return true;
-  }
-
-  return false;
-}
-
-const types = {
-  integer(value) {
-    return types.number(value) && parseInt(value, 10) === value;
-  },
-  string(value) {
-    return typeof value === 'string';
-  },
-  number(value) {
-    if (isNaN(value)) {
-      return false;
-    }
-    return typeof value === 'number';
-  },
-  "boolean": function (value) {
-    return typeof value === 'boolean';
-  },
-  "float": function (value) {
-    return types.number(value) && !types.integer(value);
-  },
-  array(value) {
-    return Array.isArray(value);
-  },
-  object(value) {
-    return typeof value === 'object' && !types.array(value);
-  },
-  date(value) {
-    return value instanceof Date;
-  },
-  timestamp(value) {
-    if (!this.integer(value) || Math.abs(value).toString().length > 16) {
-      return false
-    }
-    return true;
-  },
-  file(value) {
-    return typeof value.url === 'string';
-  },
-  email(value) {
-    return typeof value === 'string' && !!value.match(pattern.email) && value.length < 255;
-  },
-  url(value) {
-    return typeof value === 'string' && !!value.match(pattern.url);
-  },
-  pattern(reg, value) {
-    try {
-      return new RegExp(reg).test(value);
-    } catch (e) {
-      return false;
-    }
-  },
-  method(value) {
-    return typeof value === 'function';
-  },
-  idcard(value) {
-    return typeof value === 'string' && !!value.match(pattern.idcard);
-  },
-  'url-https'(value) {
-    return this.url(value) && value.startsWith('https://');
-  },
-  'url-scheme'(value) {
-    return value.startsWith('://');
-  },
-  'url-web'(value) {
-    return false;
-  }
-}
-
-class RuleValidator {
-
-  constructor(message) {
-    this._message = message
-  }
-
-  async validateRule(fieldKey, fieldValue, value, data, allData) {
-    var result = null
-
-    let rules = fieldValue.rules
-
-    let hasRequired = rules.findIndex((item) => {
-      return item.required
-    })
-    if (hasRequired < 0) {
-      if (value === null || value === undefined) {
-        return result
-      }
-      if (typeof value === 'string' && !value.length) {
-        return result
-      }
-    }
-
-    var message = this._message
-
-    if (rules === undefined) {
-      return message['default']
-    }
-
-    for (var i = 0; i < rules.length; i++) {
-      let rule = rules[i]
-      let vt = this._getValidateType(rule)
-
-      Object.assign(rule, {
-        label: fieldValue.label || `["${fieldKey}"]`
-      })
-
-      if (RuleValidatorHelper[vt]) {
-        result = RuleValidatorHelper[vt](rule, value, message)
-        if (result != null) {
-          break
-        }
-      }
-
-      if (rule.validateExpr) {
-        let now = Date.now()
-        let resultExpr = rule.validateExpr(value, allData, now)
-        if (resultExpr === false) {
-          result = this._getMessage(rule, rule.errorMessage || this._message['default'])
-          break
-        }
-      }
-
-      if (rule.validateFunction) {
-        result = await this.validateFunction(rule, value, data, allData, vt)
-        if (result !== null) {
-          break
-        }
-      }
-    }
-
-    if (result !== null) {
-      result = message.TAG + result
-    }
-
-    return result
-  }
-
-  async validateFunction(rule, value, data, allData, vt) {
-    let result = null
-    try {
-      let callbackMessage = null
-      const res = await rule.validateFunction(rule, value, allData || data, (message) => {
-        callbackMessage = message
-      })
-      if (callbackMessage || (typeof res === 'string' && res) || res === false) {
-        result = this._getMessage(rule, callbackMessage || res, vt)
-      }
-    } catch (e) {
-      result = this._getMessage(rule, e.message, vt)
-    }
-    return result
-  }
-
-  _getMessage(rule, message, vt) {
-    return formatMessage(rule, message || rule.errorMessage || this._message[vt] || message['default'])
-  }
-
-  _getValidateType(rule) {
-    // TODO
-    var result = ''
-    if (rule.required) {
-      result = 'required'
-    } else if (rule.format) {
-      result = 'format'
-    } else if (rule.arrayType) {
-      result = 'arrayTypeFormat'
-    } else if (rule.range) {
-      result = 'range'
-    } else if (rule.maximum || rule.minimum) {
-      result = 'rangeNumber'
-    } else if (rule.maxLength || rule.minLength) {
-      result = 'rangeLength'
-    } else if (rule.pattern) {
-      result = 'pattern'
-    } else if (rule.validateFunction) {
-      result = 'validateFunction'
-    }
-    return result
-  }
-}
-
-const RuleValidatorHelper = {
-  required(rule, value, message) {
-    if (rule.required && isEmptyValue(value, rule.format || typeof value)) {
-      return formatMessage(rule, rule.errorMessage || message.required);
-    }
-
-    return null
-  },
-
-  range(rule, value, message) {
-    const { range, errorMessage } = rule;
-
-    let list = new Array(range.length);
-    for (let i = 0; i < range.length; i++) {
-      const item = range[i];
-      if (types.object(item) && item.value !== undefined) {
-        list[i] = item.value;
-      } else {
-        list[i] = item;
-      }
-    }
-
-    let result = false
-    if (Array.isArray(value)) {
-      result = (new Set(value.concat(list)).size === list.length);
-    } else {
-      if (list.indexOf(value) > -1) {
-        result = true;
-      }
-    }
-
-    if (!result) {
-      return formatMessage(rule, errorMessage || message['enum']);
-    }
-
-    return null
-  },
-
-  rangeNumber(rule, value, message) {
-    if (!types.number(value)) {
-      return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
-    }
-
-    let { minimum, maximum, exclusiveMinimum, exclusiveMaximum } = rule;
-    let min = exclusiveMinimum ? value <= minimum : value < minimum;
-    let max = exclusiveMaximum ? value >= maximum : value > maximum;
-
-    if (minimum !== undefined && min) {
-      return formatMessage(rule, rule.errorMessage || message['number'][exclusiveMinimum ? 'exclusiveMinimum' : 'minimum'])
-    } else if (maximum !== undefined && max) {
-      return formatMessage(rule, rule.errorMessage || message['number'][exclusiveMaximum ? 'exclusiveMaximum' : 'maximum'])
-    } else if (minimum !== undefined && maximum !== undefined && (min || max)) {
-      return formatMessage(rule, rule.errorMessage || message['number'].range)
-    }
-
-    return null
-  },
-
-  rangeLength(rule, value, message) {
-    if (!types.string(value) && !types.array(value)) {
-      return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
-    }
-
-    let min = rule.minLength;
-    let max = rule.maxLength;
-    let val = value.length;
-
-    if (min !== undefined && val < min) {
-      return formatMessage(rule, rule.errorMessage || message['length'].minLength)
-    } else if (max !== undefined && val > max) {
-      return formatMessage(rule, rule.errorMessage || message['length'].maxLength)
-    } else if (min !== undefined && max !== undefined && (val < min || val > max)) {
-      return formatMessage(rule, rule.errorMessage || message['length'].range)
-    }
-
-    return null
-  },
-
-  pattern(rule, value, message) {
-    if (!types['pattern'](rule.pattern, value)) {
-      return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
-    }
-
-    return null
-  },
-
-  format(rule, value, message) {
-    var customTypes = Object.keys(types);
-    var format = FORMAT_MAPPING[rule.format] ? FORMAT_MAPPING[rule.format] : (rule.format || rule.arrayType);
-
-    if (customTypes.indexOf(format) > -1) {
-      if (!types[format](value)) {
-        return formatMessage(rule, rule.errorMessage || message.typeError);
-      }
-    }
-
-    return null
-  },
-
-  arrayTypeFormat(rule, value, message) {
-    if (!Array.isArray(value)) {
-      return formatMessage(rule, rule.errorMessage || message.typeError);
-    }
-
-    for (let i = 0; i < value.length; i++) {
-      const element = value[i];
-      let formatResult = this.format(rule, element, message)
-      if (formatResult !== null) {
-        return formatResult
-      }
-    }
-
-    return null
-  }
-}
-
-class SchemaValidator extends RuleValidator {
-
-  constructor(schema, options) {
-    super(SchemaValidator.message);
-
-    this._schema = schema
-    this._options = options || null
-  }
-
-  updateSchema(schema) {
-    this._schema = schema
-  }
-
-  async validate(data, allData) {
-    let result = this._checkFieldInSchema(data)
-    if (!result) {
-      result = await this.invokeValidate(data, false, allData)
-    }
-    return result.length ? result[0] : null
-  }
-
-  async validateAll(data, allData) {
-    let result = this._checkFieldInSchema(data)
-    if (!result) {
-      result = await this.invokeValidate(data, true, allData)
-    }
-    return result
-  }
-
-  async validateUpdate(data, allData) {
-    let result = this._checkFieldInSchema(data)
-    if (!result) {
-      result = await this.invokeValidateUpdate(data, false, allData)
-    }
-    return result.length ? result[0] : null
-  }
-
-  async invokeValidate(data, all, allData) {
-    let result = []
-    let schema = this._schema
-    for (let key in schema) {
-      let value = schema[key]
-      let errorMessage = await this.validateRule(key, value, data[key], data, allData)
-      if (errorMessage != null) {
-        result.push({
-          key,
-          errorMessage
-        })
-        if (!all) break
-      }
-    }
-    return result
-  }
-
-  async invokeValidateUpdate(data, all, allData) {
-    let result = []
-    for (let key in data) {
-      let errorMessage = await this.validateRule(key, this._schema[key], data[key], data, allData)
-      if (errorMessage != null) {
-        result.push({
-          key,
-          errorMessage
-        })
-        if (!all) break
-      }
-    }
-    return result
-  }
-
-  _checkFieldInSchema(data) {
-    var keys = Object.keys(data)
-    var keys2 = Object.keys(this._schema)
-    if (new Set(keys.concat(keys2)).size === keys2.length) {
-      return ''
-    }
-
-    var noExistFields = keys.filter((key) => { return keys2.indexOf(key) < 0; })
-    var errorMessage = formatMessage({
-      field: JSON.stringify(noExistFields)
-    }, SchemaValidator.message.TAG + SchemaValidator.message['defaultInvalid'])
-    return [{
-      key: 'invalid',
-      errorMessage
-    }]
-  }
-}
-
-function Message() {
-  return {
-    TAG: "",
-    default: '验证错误',
-    defaultInvalid: '提交的字段{field}在数据库中并不存在',
-    validateFunction: '验证无效',
-    required: '{label}必填',
-    'enum': '{label}超出范围',
-    timestamp: '{label}格式无效',
-    whitespace: '{label}不能为空',
-    typeError: '{label}类型无效',
-    date: {
-      format: '{label}日期{value}格式无效',
-      parse: '{label}日期无法解析,{value}无效',
-      invalid: '{label}日期{value}无效'
-    },
-    length: {
-      minLength: '{label}长度不能少于{minLength}',
-      maxLength: '{label}长度不能超过{maxLength}',
-      range: '{label}必须介于{minLength}和{maxLength}之间'
-    },
-    number: {
-      minimum: '{label}不能小于{minimum}',
-      maximum: '{label}不能大于{maximum}',
-      exclusiveMinimum: '{label}不能小于等于{minimum}',
-      exclusiveMaximum: '{label}不能大于等于{maximum}',
-      range: '{label}必须介于{minimum}and{maximum}之间'
-    },
-    pattern: {
-      mismatch: '{label}格式不匹配'
-    }
-  };
-}
-
-
-SchemaValidator.message = new Message();
-
-export default SchemaValidator
diff --git a/uni_modules/uni-feedback/uni_modules/uni-forms/package.json b/uni_modules/uni-feedback/uni_modules/uni-forms/package.json
deleted file mode 100644
index 5c9f5370..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-forms/package.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "id": "uni-forms",
-  "displayName": "Forms 表单",
-  "version": "1.0.42",
-  "description": "由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据",
-  "keywords": [
-    "",
-    "uni-forms",
-    "form",
-    "表单",
-    "表单校验",
-    "表单验证"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [
-      "uni-icons"
-    ],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-forms/readme.md b/uni_modules/uni-feedback/uni_modules/uni-forms/readme.md
deleted file mode 100644
index 6c811c73..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-forms/readme.md
+++ /dev/null
@@ -1,535 +0,0 @@
-
-
-## Forms 表单
-
-> **组件名：uni-forms**
-> 代码块： `uForms`、`uni-forms-item`
-> 关联组件：`uni-forms-item`、`uni-easyinput`、`uni-data-checkbox`、`uni-group`。
-
-
-uni-app的内置组件已经有了 `<form>`组件，用于提交表单内容。
-
-然而几乎每个表单都需要做表单验证，为了方便做表单验证，减少重复开发，`uni ui` 又基于 `<form>`组件封装了 `<uni-forms>`组件，内置了表单验证功能。
-
-`<uni-forms>` 提供了 `rules`属性来描述校验规则、`<uni-forms-item>`子组件来包裹具体的表单项，以及给原生或三方组件提供了 `binddata()` 来设置表单值。
-
-每个要校验的表单项，不管input还是checkbox，都必须放在`<uni-forms-item>`组件中，且一个`<uni-forms-item>`组件只能放置一个表单项。
-
-`<uni-forms-item>`组件内部预留了显示error message的区域，默认是在表单项的底部。
-
-另外，`<uni-forms>`组件下面的各个表单项，可以通过`<uni-group>`包裹为不同的分组。同一`<uni-group>`下的不同表单项目将聚拢在一起，同其他group保持垂直间距。`<uni-group>`仅影响视觉效果。
-
-> **注意事项**
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 组件需要依赖 `sass` 插件 ，请自行手动安装
-> - `focus` 属性在开发者工具从不生效，需要真机测试
-> - `resetFields` 方法不会重置原生组件和三方组件的值
-> - 如果配置 `validateTrigger` 属性为 `bind` 且表单域组件使用 `input` 事件触发会耗损部分性能，请谨慎使用
-> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-
-
-
-### 平台差异说明
-
-暂不支持在nvue页面中使用
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-### 基本用法 
-
-`uni-forms` 组件通常用来做表单校验和提交。每一个 `uni-forms-item` 是它的一个表单域组件，用来承载表单具体内容，`uni-forms-item` 中可以嵌套 `uni-easyinput`、`uni-data-checkbox` 和 uni-app内置的表单组件 ，不过 uni-app 的内置表单组件需要通过 `binddata` 或者 `uni-forms` 提供的 `setValue` 方法，将内容与 `uni-forms` 关联，才可完成表单的校验与提交（详见后文`表单校验` 部分）
-
-- 如需 `submit` 事件返回表单值，必须要指定 `name` 属性
-
-```html
-<template>
-	<view class="">
-		<uni-forms :value="formData" ref="form">
-			<uni-forms-item label="姓名" name="name">
-				<uni-easyinput type="text" v-model="formData.name" placeholder="请输入姓名" />
-			</uni-forms-item>
-			<uni-forms-item required name="hobby" label="兴趣爱好">
-				<uni-data-checkbox multiple v-model="formData.hobby" :localdata="hobby"/>
-			</uni-forms-item>
-			<uni-forms-item label="年龄" name="age">
-				<input type="text" v-model="formData.age" placeholder="请输入年龄" @input="binddata('age',$event.detail.value)" />
-			</uni-forms-item>
-			<button @click="submitForm">Submit</button>
-		</uni-forms>
-	</view>
-</template>
-			 
-```
-
-```javascript
-export default {
-	data() {
-		return {
-			formData:{
-				name:'',
-				age:''
-			},
-			hobby: [{
-				text: '足球',
-				value: 0
-			}, {
-				text: '篮球',
-				value: 1
-			}, {
-				text: '游泳',
-				value: 2
-			}]
-		}
-	},
-	methods: {
-		submitForm(form) {
-			// 手动提交表单
-			this.$refs.form.submit().then((res)=>{
-				console.log('表单返回得值：', res)
-			})
-		}
-	}
-}
-
-```
-
-
-## 表单校验
-
-表单校验还可以直接通过 `uniCloud web 控制台` 快速根据 `schema` 自动生成表单维护界面，比如新建页面和编辑页面，自动处理校验规则，更多参考[DB Schema](https://uniapp.dcloud.io/uniCloud/schema)
-
-### 如何使用 
-
-1. `uni-forms` 需要通过 `rules` 属性传入约定的校验规则(下文会详细描述)
-2. `uni-forms` 需要绑定value属性，值为表单的key\value 组成的对象
-3. `uni-forms-item` 需要设置 `name` 属性为当前字段名，字段为 `String` 类型而非变量
-4. 如果使用`uni-easyinput` 和 `uni-data-checkbox` 等关联组件，只需绑定 v-model，无需其他操作
-5. 如果使用原生 input、checkbox 或三方组件等，只需要给组件绑定 `binddata` 方法即可触发表单校验，无需绑定事件到 `methods` 中
-6. `binddata('name',$event.detail.value,'form')"` 方法接受三个值，
-	- 第一个参数传入当前表单组件所在的 name，同当前父组件 `uni-forms-item` 绑定属性 `name` 的值
-	- 第二个参数传入需要校验的值，内置组件可以通过 `$event.detail.value` 获取到组件的返回值，自定义组件传入需要校验的值即可
-	- 第三个参数传入 `uni-forms` 组件绑定属性 `ref` 的值，通常在多表单的时候需要传入，用来区分表单，如页面中仅有一个 `uni-forms` 可忽略
-7. 如果内置 `binddata` 方法无法满足需求，在当前页面的 `methods` 中复写此方法即可，复写此方法需要调用 `uni-forms` 的 `setValue` 来触发表单校验
-8. 通过 `button` 按钮调用 `uni-forms` 的 `submit` 事件来校验并提交整个表单
-
-```html
-<template>
-	<view>
-		<uni-forms ref="form" :value="formData" :rules="rules">
-			<uni-forms-item label="姓名" name="name">
-				<uni-easyinput type="text" v-model="formData.name" placeholder="请输入姓名" />
-			</uni-forms-item>
-			<uni-forms-item label="邮箱" name="email">
-				<input class="input" v-model="formData.email" type="text" placeholder="请输入用户名" @input="binddata('email',$event.detail.value)" />
-			</uni-forms-item>
-			<button @click="submit">Submit</button>
-		</uni-forms>
-	</view>
-</template>
-			 
-```
-
-```javascript
-export default {
-	data() {
-		return {
-			formData: {
-				name: 'LiMing',
-				email: 'dcloud@email.com'
-			},
-			rules: {
-				// 对name字段进行必填验证
-				name: {
-					rules: [{
-							required: true,
-							errorMessage: '请输入姓名',
-						},
-						{
-							minLength: 3,
-							maxLength: 5,
-							errorMessage: '姓名长度在 {minLength} 到 {maxLength} 个字符',
-						}
-					]
-				},
-				// 对email字段进行必填验证
-				email: {
-					rules: [{
-						format: 'email',
-						errorMessage: '请输入正确的邮箱地址',
-					}]
-				}
-			}
-		}
-	},
-	methods: {
-		/**
-		 * 复写 binddata 方法，如果只是为了校验，无复杂自定义操作，可忽略此方法
-		 * @param {String} name 字段名称
-		 * @param {String} value 表单域的值
-		 */
-		// binddata(name,value){
-		// 通过 input 事件设置表单指定 name 的值
-		//   this.$refs.form.setValue(name, value)
-		// },
-		// 触发提交表单
-		submit() {
-			this.$refs.form.submit().then(res=>{
-				console.log('表单数据信息：', res);
-			}).catch(err =>{
-				console.log('表单错误信息：', err);
-			})
-		}
-	}
-}
-```
-
-
-
-
-### 校验规则
-
-校验规则接受一个 `Object` 类型的值，通过传入不同的规则来表示每个表单域的值该如何校验
-
-对象的 `key` 表示当前表单域的字段名，`value` 为具体的校验规则
-
-以下为 `value` 所包含的内容：
-
-|属性名					| 类型	| 说明																												|
-|:-:						| :-:		| :-:																													|
-|rules					| Array	| 校验规则，见下方 `rules 属性说明`														|
-|validateTrigger| String| 表单校验时机|
-|label					| String| 当前表单域的字段中文名，多用于 `errorMessage` 的显示，可不填|
-
-
-```javascript
-rules: {
-	// 对name字段进行必填验证
-	name: {
-		// name 字段的校验规则
-		rules:[
-			// 校验 name 不能为空
-			{
-				required: true,
-				message: '请填写姓名',
-			},
-			// 对name字段进行长度验证
-			{
-				minLength: 3,
-				maxLength: 5,
-				message: '{label}长度在 {minLength} 到 {maxLength} 个字符',
-			}
-		],
-		label:'姓名'
-	}
-}
-
-```
-
-
-### rules 属性说明
-每一个验证规则中，可以配置多个属性，下面是一些常见规则属性。实际上这里的规范，与uniCloud的[DB Schema](https://uniapp.dcloud.io/uniCloud/schema?id=validator)规范相同。
-
-|属性名						| 类型		| 默认值|可选值							| 说明	|
-|:-:							| :-:			| :-:		|:-:								| :-:	|
-|required					| Boolean	| -			|										| 是否必填，配置此参数不会显示输入框左边的必填星号，如需要，请配置`uni-forms-item`组件的的required为true|
-|range						| Array		| -			| -									| 数组至少要有一个元素，且数组内的每一个元素都是唯一的。	|
-|format						| String	| -			| -									| 内置校验规则，如这些规则无法满足需求，可以使用正则匹配或者自定义规则	|
-|pattern					| RegExp	| -			| -									| 正则表达式，如验证邮箱：/^\S+?@\S+?\.\S+?$/ （注意不带引号）,或使用 "^\\S+?@\\S+?\\.\\S+?$"（注意带引号需要使用 `\` 转义）		|
-|maximum					| Number	| -			| -									| 校验最大值(大于)|
-|minimum					| Number	| -			| -									| 校验最小值(小于)		|
-|maxLength				| Number	| -			| -									| 校验数据最大长度		|
-|errorMessage			| String	| -			| -									| 校验失败提示信息语，可添加属性占位符，当前表格内属性都可用作占位符	|
-|trigger					| String	| blur	| blur/change/submit| 校验触发时机	|
-|validateFunction	| Function| -			| -									| 自定义校验规则		|
-
-
-**format属性值说明**
-
-|属性名		| 说明	  |
-|:-:			| :-:		|
-|string	| 必须是 string 类型，默认类型|
-|number	| 必须是 number 类型|
-|boolean	| 必须是 boolean 类型|
-|array		| 必须是 array 类型|
-|object	| 必须是 object 类型|
-|url			| 必须是 url 类型|
-|email		| 必须是 email 类型|
-
-
-### validateFunction 自定义校验规则使用说明
-`uni-forms` 的 `rules` 基础规则有时候不能满足项目的所有使用场景，这时候可以使用 `validateFunction` 来自定义校验规则
-
-`validateFunction` 方法返回四个参数 `validateFunction:function(rule,value,data,callback){}` ，当然返回参数名开发者可以自定义：
- - rule :  当前校验字段在 rules 中所对应的校验规则
- - value : 当前校验字段的值
- - data	:  所有校验字段的字段和值的对象
- - callback : 校验完成时的回调，一般无需执行callback，返回true(校验通过)或者false(校验失败)即可 ，如果需要显示不同的 `errMessage`，如果校验不通过需要执行 callback('提示错误信息')，如果校验通过，执行callback()即可
-
-
-需要注意的是，如果需要使用 `validateFunction` 自定义校验规则,则不能采用 `uni-forms` 的 `rules` 属性来配置校验规则，这时候需要通过`ref`，在`onReady`生命周期调用组件的`setRules`方法绑定验证规则
-
-无法通过props传递变量，是因为微信小程序会过滤掉对象中的方法，导致自定义验证规则无效。
-
-
-
-```html
-<template>
-	<view>
-		<uni-forms ref="form">
-			<uni-forms-item name="hobby" label="兴趣爱好">
-				<checkbox-group @change="binddata('hobby',$event.detail.value)">
-					<label class="label-box">
-						<checkbox class="transform-scale" value="0" /><text>足球</text>
-					</label>
-					<label class="label-box">
-						<checkbox class="transform-scale" value="1" /><text>篮球</text>
-					</label>
-					<label class="label-box">
-						<checkbox class="transform-scale" value="1" /><text>游泳</text>
-					</label>
-				</checkbox-group>
-			</uni-forms-item>
-			<button class="button" @click="submit">校验表单</button>
-		</uni-forms>
-	</view>
-</template>
-
-```
-
-```javascript
-export default {
-	data() {
-		return {
-			rules: {
-				hobby: {
-					rules: [{
-						required: true,
-						errorMessage: '请选择兴趣',
-					},{
-						validateFunction:function(rule,value,data,callback){
-							if (value.length < 2) {
-								callback('请至少勾选两个兴趣爱好')
-							}
-							return true
-						}
-					}]
-				}
-			}
-		}
-	},
-	onReady() {
-		// 需要在onReady中设置规则
-		this.$refs.form.setRules(this.rules)
-	},
-	methods: {
-		submit(form) {
-			this.$refs.form.submit().then(res=>{
-				console.log('表单数据信息：', res);
-			}).catch(err =>{
-				console.log('表单错误信息：', err);
-			})
-		}
-	}
-}
-
-```
-
-
-### validateFunction 异步校验
-
-上面的自定义校验方式为同步校验 ，如果需要异步校验，`validateFunction` 需要返回一个 `Promise` ，校验不通过 执行 `reject(new Error('错误信息'))` 返回对应的错误信息，如果校验通过则直接执行 `resolve()` 即可，在异步校验方法中，不需要使用 `callback` 
-
-```html
-<template>
-	<view>
-		<uni-forms :value="formData" ref="form">
-			<uni-forms-item name="age" label="年龄">
-				<uni-easyinput v-model="formData.age" type="text" placeholder="请输入年龄" />
-			</uni-forms-item>
-			<button class="button" @click="submit">校验表单</button>
-		</uni-forms>
-	</view>
-</template>
-
-```
-
-```javascript
-export default {
-	data() {
-		return {
-			rules: {
-				age: {
-					rules: [{
-						required: true,
-						errorMessage: '请输入年龄',
-					},{
-						validateFunction: (rule, value, data, callback) => {
-							// 异步需要返回 Promise 对象
-							return new Promise((resolve, reject) => {
-								setTimeout(() => {
-									if (value > 10 ) {
-										// 通过返回 resolve
-										resolve()
-									} else {
-										// 不通过返回 reject(new Error('错误信息'))
-										reject(new Error('年龄必须大于十岁'))
-									}
-								}, 2000)
-							})
-						}
-					}]
-				}
-			}
-		}
-	},
-	onReady() {
-		// 需要在onReady中设置规则
-		this.$refs.form.setRules(this.rules)
-	},
-	methods: {
-		/**
-		 * 表单提交
-		 * @param {Object} event
-		 */
-		submit() {
-			uni.showLoading()
-			this.$refs.form.submit().then(res => {
-				uni.hideLoading()
-				console.log('表单数据信息：', res);
-			}).catch(err => {
-				uni.hideLoading()
-				console.log('表单错误信息：', err);
-			})
-		}
-	}
-}
-
-```
-
-
-### 表单校验时机说明
-
-不管是在规则里还是`uni-forms`、`uni-forms-item`里，都有 `validateTrigger` 属性， `validateTrigger` 属性规定了表单校验时机，当前只有 `bind`、`submit` 两个值域
-
-- `bind` ： 数据绑定时触发校验，`uni-esayinput` 、`uni-data-checkbox` 组件表现为数据发生变化时。其他内置或三方组件为 `binddata` 事件执行时机
-
-```html
-
-<template>
-	<view>
-		<uni-forms  ref="form" :value="formData" validate-trigger="bind">
-			<uni-forms-item name="age" label="年龄">
-				<!-- uni-easyinput 的校验时机是数据发生变化， 即触发 input 时 -->
-				<uni-easyinput v-model="formData.age" type="text" placeholder="请输入年龄" />
-			</uni-forms-item>
-			<uni-forms-item  name="email" label="邮箱">
-			 <!-- input 的校验时机是触发 binddata 时， 即触发 blur 时 -->
-				<input v-model="formData.email"  @blur="binddata('email',$event.detail.value)" />
-			</uni-forms-item>
-			<button class="button" @click="submit">校验表单</button>
-		</uni-forms>
-	</view>
-</template>
-
-```
-
-- `submit`： 只有提交表单才会触发表单校验
-
-
-对于表单校验时机，同时只会有一个 `validateTrigger` 发生作用，它的作用权重为
-
-**`规则 > uni-forms-item > uni-forms `**
-
-- 如果规则里配置 `validateTrigger` ，则优先使用规则里的 `validateTrigger` 属性来决定表单校验时机
-- 如果规则里没有配置 `validateTrigger` ，则优先使用 `uni-forms-item` 的 `validateTrigger` 属性来决定表单校验时机
-- 如果 `uni-forms-item` 组件里没有配置 `validateTrigger` ，则优先使用 `uni-forms` 的 `validateTrigger` 属性来决定表单校验时机
-- 以此类推，如果都没有使用 `validateTrigger` 属性，则会使用 `uni-forms` 的 `validateTrigger` 属性默认值来决定表单校验时机
-
-
-## API
-
-### Forms Props
-
-| 属性名						| 类型				|默认值	 		| 可选值							| 说明|
-| :-:							| :-:				|:-:				| :-:								| :-:		|
-| v-model/value		| Object		| -					| -									| 表单数据|
-| rules						| Object		| -					| -									| 表单校验规则	|
-| validate-trigger| String		| submit		| bind/submit				| 表单校验时机|
-| label-position	| String		| left 			| top/left					| label 位置
-| label-width			| String/Number	| 75		| -											| label 宽度，单位 px	|
-| label-align			| String		| left			| left/center/right			| label 居中方式|
-| err-show-type		| String		| undertext	| undertext/toast/modal	| 表单错误信息提示方式|
-| border					| Boolean		|false			|-											|是否显示分格线|
-
-### Forms Events
-
-事件称名			|说明										
-:-:					|:-:												
-validate		| 任意表单项被校验后触发，返回表单校验信息		
-
-### Forms Methods
-
-| 方法称名				| 说明		|						
-| :-:						| :-:		|						
-| submit 				| 对整个表单进行校验的方法，会返回一个 promise	|
-| setValue			| 设置表单某一项 name 的对应值，通常在 uni-forms-item 和自定表单组件中使用|
-| validateField	| 部分表单进行校验		|
-| clearValidate	| 移除表单的校验结果	|
-| resetFields   | 重置表单, 需要把 `uni-forms` 的`value`属性改为 `v-model` ,且对内置组件可能不生效|
-
-
-```javascript
-/**
- * 模板 <uni-forms ref="form"></uni-forms>
- */
-
-// 对整个表单进行校验，返回一个 Promise
-this.$refs.form.submit().then((res)=>{
-	// 成功返回，res 为表单数据
-	// 其他逻辑处理 
-	// ...
-}).catch((err)=>{
-	// 表单校验验失败，err 为具体错误信息
-	// 其他逻辑处理
-	// ...
-})
-
-// 设置表单某项对应得值来触发表单校验
-// 接受两个参数，第一个参数为表单域的 name ，第二个参数为表单域的值
-this.$refs.form.setValue('name','内容')
-
-// 部分表单进行校验，接受一个参数，类型为 String 或 Array ，只校验传入 name 表单域的值
-this.$refs.form.validateField(['name', 'email']).then((res)=>{
-	// 成功返回，res 为对应表单数据
-	// 其他逻辑处理 
-	// ...
-}).catch((err)=>{
-	// 表单校验验失败，err 为具体错误信息
-	// 其他逻辑处理
-	// ...
-})
-
-// 移除表单校验，接受一个参数，类型为 String 或 Array ，只移除传入 name 表单域的值，如果不传入参数，则移除所有
-this.$refs.form.clearValidate(['name', 'email'])
-
-```
-
-
-### FormsItem Props
-
-| 属性名						|类型	|默认值	 		|可选值	|说明|
-| :-:							|:-:		|:-:			|:-:		|:-:	|
-| name						|String	| -				|-					| 表单域的属性名，在使用校验规则时必填|
-| required				|Boolean| false		|					| 左边显示红色"*"号，样式显示不会对校验规则产生效果|
-| validate-trigger|String | submit	| bind/submit		| 表单校验时机|
-| left-icon				|String | -				|- 					| label左边的图标，限uni-ui的图标名称|
-| icon-color			|String | #606266	|- 					| 左边通过icon配置的图标的颜色|
-| label						|String	| -			|-					| 输入框左边的文字提示|
-| label-width			|Number	| 65		|-					| label的宽度，单位px|
-| label-align			|String	| left		|left/center/right	| label的文字对齐方式|
-| label-position	|String	| left		|top/left			| label的文字的位置|
-| error-message		|String	| -			|-					| 显示的错误提示内容，如果为空字符串或者false，则不显示错误信息|
diff --git a/uni_modules/uni-feedback/uni_modules/uni-group/changelog.md b/uni_modules/uni-feedback/uni_modules/uni-group/changelog.md
deleted file mode 100644
index ddaac006..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-group/changelog.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 1.0.2（2021-02-05）
-- 调整为uni_modules目录规范
-- 优化 兼容 nvue 页面
diff --git a/uni_modules/uni-feedback/uni_modules/uni-group/components/uni-group/uni-group.vue b/uni_modules/uni-feedback/uni_modules/uni-group/components/uni-group/uni-group.vue
deleted file mode 100644
index 67ba869b..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-group/components/uni-group/uni-group.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-	<view class="uni-group" :class="['uni-group--'+mode ,margin?'group-margin':'']" :style="{marginTop: `${top}px` }">
-		<slot name="title">
-			<view v-if="title" class="uni-group__title" :style="{'padding-left':border?'30px':'15px'}">
-				<text class="uni-group__title-text">{{ title }}</text>
-			</view>
-		</slot>
-		<view class="uni-group__content" :class="{'group-conent-padding':border}">
-			<slot />
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * Group 分组
-	 * @description 表单字段分组
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21002
-	 * @property {String} title 主标题
-	 * @property {Number} top 分组间隔
-	 */
-	export default {
-		name: 'uniGroup',
-		props: {
-			title: {
-				type: String,
-				default: ''
-			},
-			top: {
-				type: [Number, String],
-				default: 10
-			},
-			mode: {
-				type: String,
-				default: 'default'
-			}
-		},
-		data() {
-			return {
-				margin: false,
-				border: false
-			}
-		},
-		watch: {
-			title(newVal) {
-				if (uni.report && newVal !== '') {
-					uni.report('title', newVal)
-				}
-			}
-		},
-		created() {
-			this.form = this.getForm()
-			if (this.form) {
-				this.margin = true
-				this.border = this.form.border
-			}
-		},
-		methods: {
-			/**
-			 * 获取父元素实例
-			 */
-			getForm() {
-				let parent = this.$parent;
-				let parentName = parent.$options.name;
-				while (parentName !== 'uniForms') {
-					parent = parent.$parent;
-					if (!parent) return false
-					parentName = parent.$options.name;
-				}
-				return parent;
-			},
-			onClick() {
-				this.$emit('click')
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-group {
-		background: #fff;
-		margin-top: 10px;
-		// border: 1px red solid;
-	}
-
-	.group-margin {
-		// margin: 0 -15px;
-	}
-
-	.uni-group__title {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		padding-left: 15px;
-		height: 40px;
-		background-color: $uni-bg-color-grey;
-		font-weight: normal;
-		color: $uni-text-color;
-	}
-
-	.uni-group__content {
-		padding: 15px;
-		// padding-bottom: 5px;
-		// background-color: #FFF;
-	}
-
-	.group-conent-padding {
-		padding: 0 15px;
-	}
-
-	.uni-group__title-text {
-		font-size: $uni-font-size-base;
-		color: $uni-text-color;
-	}
-
-	.distraction {
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.uni-group--card {
-		margin: 10px;
-		border-radius: 5px;
-		overflow: hidden;
-		box-shadow: 0 0 5px 1px rgba($color: #000000, $alpha: 0.08);
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-group/package.json b/uni_modules/uni-feedback/uni_modules/uni-group/package.json
deleted file mode 100644
index 127766e0..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-group/package.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "id": "uni-group",
-  "displayName": "Group 分组",
-  "version": "1.0.2",
-  "description": "分组组件可用于将组件用于分组，添加间隔，以产生明显的区块",
-  "keywords": [
-    "uni-group",
-    "group",
-    "分组",
-    "uni-ui"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "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"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-group/readme.md b/uni_modules/uni-feedback/uni_modules/uni-group/readme.md
deleted file mode 100644
index dcce669f..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-group/readme.md
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-### Group 分组
-
-分组组件可用于将组件分组，添加间隔，以产生明显的区块，组件名：``uni-group``，代码块： uGroup。
-
-### 平台差异说明
-
-如无特殊说明，则全平台可用
-
-### 组件使用注意事项
-
-为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-
-- 组件需要依赖 `sass` 插件 ，请自行手动安装
-- 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
-
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-
-### 使用方式
-
-在 ``template`` 中使用组件
-
-```html
-<uni-group title="分组1" margin-top="20">
-    <view>分组1 的内容</view>
-    <view>分组1 的内容</view>
-</uni-group>
-
-<uni-group title="分组2">
-    <view>分组2 的内容</view>
-    <view>分组2 的内容</view>
-</uni-group>
-```
-
-### 属性说明
-
-属性名|类型|默认值|说明
-:-:|:-:|:-:|:-:
-title|String|主标题|
-top|Number|分组间隔|
-
diff --git a/uni_modules/uni-feedback/uni_modules/uni-icons/changelog.md b/uni_modules/uni-feedback/uni_modules/uni-icons/changelog.md
deleted file mode 100644
index 887bcdff..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-icons/changelog.md
+++ /dev/null
@@ -1,2 +0,0 @@
-## 1.1.4（2021-02-05）
-- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-feedback/uni_modules/uni-icons/components/uni-icons/icons.js b/uni_modules/uni-feedback/uni_modules/uni-icons/components/uni-icons/icons.js
deleted file mode 100644
index 5242f227..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-icons/components/uni-icons/icons.js
+++ /dev/null
@@ -1,132 +0,0 @@
-export default {
-	"pulldown": "\ue588",
-	"refreshempty": "\ue461",
-	"back": "\ue471",
-	"forward": "\ue470",
-	"more": "\ue507",
-	"more-filled": "\ue537",
-	"scan": "\ue612",
-	"qq": "\ue264",
-	"weibo": "\ue260",
-	"weixin": "\ue261",
-	"pengyouquan": "\ue262",
-	"loop": "\ue565",
-	"refresh": "\ue407",
-	"refresh-filled": "\ue437",
-	"arrowthindown": "\ue585",
-	"arrowthinleft": "\ue586",
-	"arrowthinright": "\ue587",
-	"arrowthinup": "\ue584",
-	"undo-filled": "\ue7d6",
-	"undo": "\ue406",
-	"redo": "\ue405",
-	"redo-filled": "\ue7d9",
-	"bars": "\ue563",
-	"chatboxes": "\ue203",
-	"camera": "\ue301",
-	"chatboxes-filled": "\ue233",
-	"camera-filled": "\ue7ef",
-	"cart-filled": "\ue7f4",
-	"cart": "\ue7f5",
-	"checkbox-filled": "\ue442",
-	"checkbox": "\ue7fa",
-	"arrowleft": "\ue582",
-	"arrowdown": "\ue581",
-	"arrowright": "\ue583",
-	"smallcircle-filled": "\ue801",
-	"arrowup": "\ue580",
-	"circle": "\ue411",
-	"eye-filled": "\ue568",
-	"eye-slash-filled": "\ue822",
-	"eye-slash": "\ue823",
-	"eye": "\ue824",
-	"flag-filled": "\ue825",
-	"flag": "\ue508",
-	"gear-filled": "\ue532",
-	"reload": "\ue462",
-	"gear": "\ue502",
-	"hand-thumbsdown-filled": "\ue83b",
-	"hand-thumbsdown": "\ue83c",
-	"hand-thumbsup-filled": "\ue83d",
-	"heart-filled": "\ue83e",
-	"hand-thumbsup": "\ue83f",
-	"heart": "\ue840",
-	"home": "\ue500",
-	"info": "\ue504",
-	"home-filled": "\ue530",
-	"info-filled": "\ue534",
-	"circle-filled": "\ue441",
-	"chat-filled": "\ue847",
-	"chat": "\ue263",
-	"mail-open-filled": "\ue84d",
-	"email-filled": "\ue231",
-	"mail-open": "\ue84e",
-	"email": "\ue201",
-	"checkmarkempty": "\ue472",
-	"list": "\ue562",
-	"locked-filled": "\ue856",
-	"locked": "\ue506",
-	"map-filled": "\ue85c",
-	"map-pin": "\ue85e",
-	"map-pin-ellipse": "\ue864",
-	"map": "\ue364",
-	"minus-filled": "\ue440",
-	"mic-filled": "\ue332",
-	"minus": "\ue410",
-	"micoff": "\ue360",
-	"mic": "\ue302",
-	"clear": "\ue434",
-	"smallcircle": "\ue868",
-	"close": "\ue404",
-	"closeempty": "\ue460",
-	"paperclip": "\ue567",
-	"paperplane": "\ue503",
-	"paperplane-filled": "\ue86e",
-	"person-filled": "\ue131",
-	"contact-filled": "\ue130",
-	"person": "\ue101",
-	"contact": "\ue100",
-	"images-filled": "\ue87a",
-	"phone": "\ue200",
-	"images": "\ue87b",
-	"image": "\ue363",
-	"image-filled": "\ue877",
-	"location-filled": "\ue333",
-	"location": "\ue303",
-	"plus-filled": "\ue439",
-	"plus": "\ue409",
-	"plusempty": "\ue468",
-	"help-filled": "\ue535",
-	"help": "\ue505",
-	"navigate-filled": "\ue884",
-	"navigate": "\ue501",
-	"mic-slash-filled": "\ue892",
-	"search": "\ue466",
-	"settings": "\ue560",
-	"sound": "\ue590",
-	"sound-filled": "\ue8a1",
-	"spinner-cycle": "\ue465",
-	"download-filled": "\ue8a4",
-	"personadd-filled": "\ue132",
-	"videocam-filled": "\ue8af",
-	"personadd": "\ue102",
-	"upload": "\ue402",
-	"upload-filled": "\ue8b1",
-	"starhalf": "\ue463",
-	"star-filled": "\ue438",
-	"star": "\ue408",
-	"trash": "\ue401",
-	"phone-filled": "\ue230",
-	"compose": "\ue400",
-	"videocam": "\ue300",
-	"trash-filled": "\ue8dc",
-	"download": "\ue403",
-	"chatbubble-filled": "\ue232",
-	"chatbubble": "\ue202",
-	"cloud-download": "\ue8e4",
-	"cloud-upload-filled": "\ue8e5",
-	"cloud-upload": "\ue8e6",
-	"cloud-download-filled": "\ue8e9",
-	"headphones":"\ue8bf",
-	"shop":"\ue609"
-}
diff --git a/uni_modules/uni-feedback/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-feedback/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
deleted file mode 100644
index 71aef8a0..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" :class="[customIcons,customIcons?type:'']" @click="_onClick">{{icons[type]}}</text>
-</template>
-
-<script>
-	import icons from './icons.js';
-	// #ifdef APP-NVUE
-	var domModule = weex.requireModule('dom');
-	domModule.addRule('fontFace', {
-		'fontFamily': "uniicons",
-		'src': "url('data:font/truetype;charset=utf-8;base64,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AXcBeAF5AXoBewF8AX0BfgF/AYABgQGCAYMHdW5pMDAwMAdjb250YWN0BnBlcnNvbglwZXJzb25hZGQNY29udGFjdGZpbGxlZAxwZXJzb25maWxsZWQPcGVyc29uYWRkZmlsbGVkBXBob25lBWVtYWlsCmNoYXRidWJibGUJY2hhdGJveGVzC3Bob25lZmlsbGVkC2VtYWlsZmlsbGVkEGNoYXRidWJibGVmaWxsZWQPY2hhdGJveGVzZmlsbGVkBXdlaWJvBndlaXhpbgtwZW5neW91cXVhbgRjaGF0AnFxCHZpZGVvY2FtBmNhbWVyYQNtaWMIbG9jYXRpb24JbWljZmlsbGVkDmxvY2F0aW9uZmlsbGVkBm1pY29mZgVpbWFnZQNtYXAHY29tcG9zZQV0cmFzaAZ1cGxvYWQIZG93bmxvYWQFY2xvc2UEcmVkbwR1bmRvB3JlZnJlc2gEc3Rhcgt3aGl0ZWNpcmNsZQVjbGVhcg1yZWZyZXNoZmlsbGVkCnN0YXJmaWxsZWQKcGx1c2ZpbGxlZAttaW51c2ZpbGxlZAxjaXJjbGVmaWxsZWQOY2hlY2tib3hmaWxsZWQKY2xvc2VlbXB0eQxyZWZyZXNoZW1wdHkGcmVsb2FkCHN0YXJoYWxmDHNwaW5uZXJjeWNsZQZzZWFyY2gJcGx1c2VtcHR5B2ZvcndhcmQEYmFjaw5jaGVja21hcmtlbXB0eQRob21lCG5hdmlnYXRlBGdlYXIKcGFwZXJwbGFuZQRpbmZvBGhlbHAGbG9ja2VkBG1vcmUEZmxhZwpob21lZmlsbGVkCmdlYXJmaWxsZWQKaW5mb2ZpbGxlZApoZWxwZmlsbGVkCm1vcmVmaWxsZWQIc2V0dGluZ3MEbGlzdARiYXJzBGxvb3AJcGFwZXJjbGlwCWV5ZWZpbGxlZAx1cHdhcmRzYXJyb3cOZG93bndhcmRzYXJyb3cObGVmdHdhcmRzYXJyb3cPcmlnaHR3YXJkc2Fycm93C2Fycm93dGhpbnVwDWFycm93dGhpbmRvd24NYXJyb3d0aGlubGVmdA5hcnJvd3RoaW5yaWdodAhwdWxsZG93bgVzb3VuZARzaG9wBHNjYW4KdW5kb2ZpbGxlZApyZWRvZmlsbGVkDGNhbWVyYWZpbGxlZApjYXJ0ZmlsbGVkBGNhcnQIY2hlY2tib3gRc21hbGxjaXJjbGVmaWxsZWQOZXllc2xhc2hmaWxsZWQIZXllc2xhc2gDZXllCmZsYWdmaWxsZWQVaGFuZHRodW1ic2Rvd25fZmlsbGVkDmhhbmR0aHVtYnNkb3duEmhhbmR0aHVtYnN1cGZpbGxlZAtoZWFydGZpbGxlZAxoYW5kdGh1bWJzdXAOYmxhY2toZWFydHN1aXQKY2hhdGZpbGxlZA5tYWlsb3BlbmZpbGxlZAhtYWlsb3Blbgxsb2NrZWRmaWxsZWQJbWFwZmlsbGVkBm1hcHBpbg1tYXBwaW5lbGxpcHNlC3NtYWxsY2lyY2xlEHBhcGVycGxhbmVmaWxsZWQLaW1hZ2VmaWxsZWQMaW1hZ2VzZmlsbGVkBmltYWdlcw5uYXZpZ2F0ZWZpbGxlZA5taWNzbGFzaGZpbGxlZAtzb3VuZGZpbGxlZA5kb3dubG9hZGZpbGxlZA52aWRlb2NhbWZpbGxlZAx1cGxvYWRmaWxsZWQKaGVhZHBob25lcwt0cmFzaGZpbGxlZA1jbG91ZGRvd25sb2FkEWNsb3VkdXBsb2FkZmlsbGVkC2Nsb3VkdXBsb2FkE2Nsb3VkZG93bmxvYWRmaWxsZWQHdW5pMDAwOQAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAQCFAAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAANoxE3MAAAAA2jSpUA==')"
-	});
-	// #endif
-
-	/**
-	 * Icons 图标
-	 * @description 用于展示 icons 图标
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
-	 * @property {Number} size 图标大小
-	 * @property {String} type 图标图案，参考示例
-	 * @property {String} color 图标颜色
-	 * @event {Function} click 点击 Icon 触发事件
-	 */
-	export default {
-		name: 'UniIcons',
-		props: {
-			type: {
-				type: String,
-				default: ''
-			},
-			color: {
-				type: String,
-				default: '#333333'
-			},
-			size: {
-				type: [Number, String],
-				default: 16
-			},
-			customIcons:{
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				icons: icons
-			}
-		},
-		methods: {
-			_onClick() {
-				this.$emit('click')
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	/* #ifndef APP-NVUE */
-	@font-face {
-		font-family: uniicons;
-		src: url('./uni.ttf') format('truetype');
-	}
-
-	/* #endif */
-
-	.uni-icons {
-		font-family: uniicons;
-		text-decoration: none;
-		text-align: center;
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-icons/components/uni-icons/uni.ttf b/uni_modules/uni-feedback/uni_modules/uni-icons/components/uni-icons/uni.ttf
deleted file mode 100644
index 60a1968d08cc6056c70b5402b2effac43c6f96a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26164
zcmd_TX?z^TwKv?SdZuUZ*{5e;H8a|*T^d=EEqULKckpgml5KgDk!);i2nH_%0>luO
zfPriTxR4OC00t6b2;2t}2qA%7wj=~>Fd>kT3xQvPTF<|_N4Df(=f3y-@P2qDb$4}D
zb=Rq?Q>V__5=amPo3K|9g_?5~R@W^Zx8lD9ftr!KrfW;*w!{L<_XI(_8%KJ5=fJk1
zA=DJsRifOye)EOvZhZIVd4gbiSrC>)H}rINE8h@~qU^^wnl>QA^bf;6q(8z@vSG{i
zT`W<x2=D)@ATW7zUsvb8_isrGg7hr%>{~i_ZKJ~i+M*!pC%1NP=}G-?!i$2i63^2U
z+xiB!_dU4dZ-TJ;2%b4#;IQNP?t51qT<vW8Sg;w8AqcP5dIz*?!+!v_p&JZQaTD&%
z0^_;(!879Cp}oQi!(M)Ch-z=*$>E>Nw44LNt%6<4;!j%fi`Nyah~j5-NHC%wS1>>?
zd|AKJdqN$Vkt-N6PQyR0;RLSp)=lXaIt1awyE+WwUW~p56Mu?5hctflo*;X%mY#+C
zD{!Q6@bpbM%5bd2k;hSrgFiEH+I`ZnS6Ga^-8guiTX9^6!;IrO9M9nRUGcgLR|&^N
z97}L)#Ie74@HT6U2Tw<F@ayTv>G?BI=Pd&Uvsjmx$8c=H@ipXk=!b9w_ck2-eZ1}V
zVw&H-fTJ77J{-IbFX#FE;Q8}#%*Vm|Wx&DV=IvdjA5@Jts*rxPc=Y3ngW|Y4aE!$P
zI8OGDkBu9L2M33rx5M8zd~i7Un6?$K93GzLS3btM;_+KtC!n3xxUR>+-^2UG$9VW%
zJdck%zvpAk`@pYLw5vym7JpHLuRHB1Vk?W{j<0~IV9*fzB4CwKXhTlykL-_iZ;Ef$
zzuEnk_*VT}Yu@TUW;y0Q)^Kd>v5CjJj;%Yk;aLB1^YNPFb;lcz7mlwv-gUg^_=e+O
zJbvhH%iErJe*4ZV@BHPRkKg&n2|AHI(Q#thiMc11oLF&U)rsyC8%}IJvGc^96Z=nG
zcj6l-?l|$i6W>4a(-W_sc>Bb=pbh*d_DA85HE#-U*1WmqE#a*?wBB`0IOam@g<~DZ
z)*S0W>)VbCTI&s3>ub^a`r~^?wf>RTdiq2wTAy=T>%0G@^<!G=G;}N>#(x{P#C{k1
zek>3@5&d!Wk!T_sihL6JIP#asuOlx+eieBp(iZVYd=YQN6aG{9-SCO<JK<l2p9#+o
z&j=n2?hp0_HwD)RJA)H~mBCyv6$}UcL0`}rv<FSfkTR%ztej9@RbEzpsXV6~Rqjx3
zQx0qMpmqNLn-fVz0)pm=BZGzzBVgfp^8cTonZhlUq_uR2K4sh36QWPNQGDG{Vwh|A
zy0O7{pEO>&Px{ET#PnzLJoA<2H!L2@EtX@}4(pXRpKYV<F}u&c-TtDZ!*QqMQ@Kg*
zmhW~lXPtAK^A_i;E|06jwb6CITX6rw)8tv_+3mT;^N2U<-QcV8?e)FtpYFfPe<CnG
zaI0cf7AW6Q-U#jr{yr2B?G61t91gdI*M|3p?+L#iks}?E{>c8QJ$fY865AHLGwzCS
zh(De1C8`qFCs}eq^2+1~sjsIE>6-MLnTE{%%!?&$C7Vm`EO|BCkX@U-HT!mMeD15c
zU*#v}@5_H$T3*^;`b1ev*^}iZ<@Z&{pbfKzejz>}Hez>=31xy{98ZNR%FASmlNV>C
zkrOAyCl%AfrA#>TsnPi9k%vFw=e1X*D{9E_?5&5NGt^e3uUgx_kl2ED?c9iRz3!1u
zDNbYaH5W}oHN$g<r(INAI(8;4n>uM3W6LH@UCOb~AY3u@H*u%v08EOI7RCTuM?l5F
z(?ODnQh~e<k5rHf4NU;lAILM|oDGa^IA?AzW4&{0CJ{}nt($<e`UDGaBzo%p`=26O
z;-=fKzy3CI(O%ZSc+pnI`W7ude>|Jr0*GkF*p@kJElpkieM$QM@~IQa(Rzg>UD4_w
zP|wuRcf>cuMH+mSLbHI~_e>C)(vm5laKMy6J|&qnfJaqM=f+W{iW-_)sj;D{E)b*o
zx&THy<M&AbAAK0^N$o`56aC!MQx@^JFTMU&BDZ>gtkl1e*pq{AF29JeJu6o15yd?#
zZ0-d%r_;8;t+@1ri~bL~x_Aq^x^QuSJI!t#J45g4&QKr_O_0{XRFZdFO|gsc9{#qK
zduGax^T-)+F15?DeJK)jo<rtyH4=Xmq2x6DL8pgNh^NxId_kMJ(WukDfYCyZDYTF#
zQ~eijyrPbx2fMlsjKmvu7srof#FheAREM##rKQnWHi5ATpkg--4T-%XVLreSjvQPu
zRoB$0BZx1+glS!jbxoVLma(<}$-;Hz?5B6%{Zm#>SJB1=^VborpFe-2+8>QAy<3v*
zUK)#XTr3;<f%vjG7w--WIbqW1_bZrPpq$Tyc7TW@n=YWYjhS>#o7eGF7f}4#yjGB3
zCf26`p@TB5usUDeWTq{3<wQRnd=Ha1JoGE=E}Cz5I_>kxrSK$%A4z(J^$r8vdrr`o
z+d3hch((v)tyZ#&mahN`@Tr^0r%D-~GcAF!S~>K(c!yXb<b}DItw2*dHRYSCDVKJV
zl&=!=xpwpd_nDlNWOOag3h64AZz?ol?h+L6p`K5Pi%OslkJceaLJoVjFfV1v6OFw%
z)*ea8PESi+rNb(x!sI_UUsYCNFG+6w)r%_^9=*4ZsLo*Y=Iskj)?C2lEi_CF2kHVj
ztKWLDmpoEchEiE;WodQk5??qaTkUmq^?q4SMcQK*H&fn{oL5-+(yz8o+;s1gi>8ke
z4KC)r7|-UE+CX@GLyOOaS4oTPd7rr!9YjB!;w$V!!2wzl6H-EzAQU)OxEnI5wB&dD
zEYwt=s#8cx8{LhHDM#*nfztV`5-0@P$tY#M%YM+>esFMZO9$Pl{#f?0dwfpyCy_dJ
z?<apJvF78C2fZGUg=poN$}v$AWUq7LBzk54#EEMD04=8u$)r9Wd6Zr;{O!LD^tzh<
z@Wa73q`^o9QAK1BTQU<$haLltjTJ&djUZ&3ltBGSdgluys4k;mB^8>esiY7vD3ZaH
z&e!H7lf)+qSl3flktzA!F@xdQ_i&!v?jdFhg(z%Se_<r+GtZFKXjK3HOhswM(hXxK
zXJX3C#oe;SX!!9JSNzz3^VEx~9R_c8#39k_yWcPv-njce{$P~MQxf)ROG2)~&DuH_
zh8{2o>^R1=Ljajp>VP=`r5=z0*m3++;43Y|PbsW=H$blU`#`NL_`-LOCyX){K?Y@h
zpJFm%y=Wzk!zD7mmrNfzLatr;S$lT60uGPQIe8w@yvfZpZ-&aIaT+nLx`~|jsWlBm
z4K?%$uJ2BpL#BN!*KhU67mTSTsvSd%^lQ%Uq>SCUse;xyoTT^{)9h)#o;I5zGtMD8
zXNLL^uASxIa>?~|G^MV-zAnTo#DW***IP_A)xWB)(N3}xV?e^d(1+sHqEo2EEOCO4
z717v`<BNr_fwZ=K8n7w~4ann^9}6f>G<)?6s}{C;ybkC7m=cX9Og@uu+=P0YQHq0j
ztO%C)%e{#h+x6V4J&fAD6#-Y=w$e}WxMZ-`PZ;MjdrZk_REb}jAg?Drqioglpi9Ge
zZ57<0dZ4@%C;*UD+C%}Pg*av#IhN-wl&UL`NlI4}1sH`Rv_059IJe-Zoe^~wRja?U
zig#Nr>I<r!{h-OOJ{v1vQ65vD4bnLjrSk)R^_u8EFg2B)N;O~Q@s6QaDm>~->LDN1
zMa#>h>hpd+Hp4g^5Cre%<7w%ckdeOoxmXA8bm#}bx%VNvG!`)q$OU|9CBEyAz_I|?
zmQy&0f*AR9<b2!aacp$?iB>IA$uMoa>TJjEKC`{e&6YadIsHbxW#aVd69@J=JQ16H
zt*xr^uZvd7&Dd?HPEc>1IE#ASzIyVxHqxvKznd_XXa8=(EZS+e3nn2cgvEb|P1qlj
zz>8*KvM@(jf&ppDnWS8yDS$K9Xdb-DcuWGwC~^WyfQeNE^uY2#z9<Fs{6bR>L>HYy
zCW<mS8T`_C$`ytaV#HFJN!sEwmU<nH>g~6FD9xID{clo+pg6EUZLruL`eoSm-QByt
zYShl5jGW!LFDi|5=8vfV72Ywfr92qf+}c+Au(wpPWXprLa+A|6I$dT1^JZ!#vB_rd
znHqDeIl6pT`<0WgHXL*tsk&yh!y?X6e}RR#%qs7mKX19!xtmS2w~OvWy(PZXSDqdG
zMsuylzq+BmMs}|>%h?jQoGVF*lI$=^P6yVGBrG2KJ2Wg-As{4#QeiB1(m5EVIt60`
zih$WN6+lYr3OUSgo-;sv>ooBbzu`lOYFKo2O$7z~UzV5P37=GdGR59<yFx#`^xDS_
z(<h{NCdVdRE-U+1t4~o%<MG#gi9}ve*mH)vcV7H0QT*1$p@#6PaKj{Zuk7>5UPbv2
z+2?oQ$|7vz0fq`ww~txhX0n2O4SaQtf`{|UV*R3i(0i3AUe&wtD$!<YSd#DV@rQjx
zzKC!5iauL}-9!Hn4~i17#Dz7QM87+P>B2nWJkSprn<;2!)*n#n3i+JmO`AYa8goX;
z<O8kG7tmeKRe)Gxk8LHs+m0hnSU@E~ZL%gwsRyMI-9Btn*aa{)Zr~Js%osb=)|F9x
zbC#86-)F|V^4SlJG)JA1CG!WO<VG3IN2LeZDkdHfaXyvEy>F17&C+*`>`-9N;C}zy
zMl!IwaUAl`X`J#L-ta!2R7@X;#^<uXo3p$WuVzmN<}@1FZTp8`wco&2isDMq^uCeJ
zS)QkudcO{nx?;F(3=j6^(xIoY@3mrVYK0bH#B5~peI*6D>Tck~jFT}eWWNtX)4+S4
zLjm8f11OMq1rruhTJi;e7bg=9IX#D}T@ml~<XzL<y=L%be)b1To$kg7<Ht{6rTnb^
z$*q8+O4cOt_vG+3#cxxsZudUwSxwVd_w=k*kF4&YzEEuLMIL8IJ56uz=xA4uw0D>t
zln?USso<y!`bWa8L$8S4VvfsISs*Z&`Z#Dn4w#(Jac~<k$7v9WcET-+6c7eUT;^^P
z%PNAcX7AC4hNE6{Yp|kBY;v1f*zU?1_g;O~UPI1h53}<PbEMK`IaAyxGf85yFK)^$
zE0yLL<}N8MU48w}4Th(0TwPka1biO$i|d4Mi(A=p!HM-ZMra3>#@2*^<VdBBbpF(!
zYTLC@L%b%ws{`FQ=Z?+F?URXbczEbFP(;c){eGwVnhVIkHC|B>SFekMi7jWfrV<NZ
z5S9{C*%ph>XS4ZymMt=U@H&5hpH`vr>--TaiB~)@+hUAMR@*_FRf-$4=SiZ)V^iO>
zc`VFyp3S|@t>cS%=pFG>F(gEUR$&^Xu5RoKsiuNkLk!LeaR!33t+<-p0kGg4Td;O8
z!hF}L12YxZt{V1aPjXq<q=7#TKp@WY1{6+iP*@jd7~3ziHxCjW><)$<8D~CqZ?e>x
zafE}N$h<t6$t2H@mAKOGc=VEJ+?{rn#J2NH^-%XdQQX(9o$0HAILV=CNRBJ&v(r~I
zwt9McTunG!GcH8?>GAyzSI*=0dU7tuezkr7<aC-IPN!r~*5`EkvK~2=R;Q)Ylg0hr
z-TN8iXPO@mID@hrbmGnGUueyAyfsuae)9O55Faa1cy8zcv0j`7zBeRH1Tum)a0<%V
zG7wl!UisL7Bhyw7M+CmUKz#W^OG`0~q6v>^HzuHp;%B$g;;B;?lXmW?U07GQu$I*0
zvd1ISB@VCG@%4+ZXWodHF5T958F|BAV%J|xH;_DQIb+LbsehZbf@sC8n&##jl4}Zu
zn!$yrjlXXD*Y}>wU$D6EGR7|JTg=nv?)|#G8@%x|Lr;nYu>cC1Kri%8#JL~>f{1MZ
z@B%i8fxpS;82f--ws9j~vU#c1R${X*-8}d^@&5h$?-wmcX87v8Gmg+}mtISB?WMDR
zy+d|5<Q>16dFKN}58Sy=eR)YBu$Zt^neaQbnGxGCc1@>`9EQag&_@fr?(k@tAk%51
z#Ys?%lVU%+jHb1;Oe5{AKE%63hxqyKonInP*h6&jx^)+mmi*EMw3q6}%?7JDPW@%u
z90Ij|oR1(M#8viNcJ??t9!F0%7wo$A^v+xCt1!=}#z%&HDtJc^$4CT!=CpCBsvZw{
zwOTvVYo`rD%Ww(GL8o^O9ThJZJHTnigz>^m&i|v2F>S*EQh~9?NMJ^q8uAb%As%`;
z{XL0OO@+LsJSrj<A05yfkZuUhN>d|9J}N*|&Nt>cyL=*BIgy<+v1PV}+NqMhWQ};O
zgALY*&wBf*QM_wGYgOZ{br&&D#KW%KNt5`H8XKMJOQ90EQF5kpG?C_rjOz2hoJjKI
zB}9{&9OEnV^@B01H)3VaS$z@fU_c+_Rp#=l5@Ht*5AI?6D*B@~=Alr1RpBcZOM|H_
z9iFsk<_x~Jq@j<&^VwkaNeC632GxNE<-vNp1NA^rC&+sqd$hZ_QH`92tJ&L}m<)#b
znN5gIi#<Ls5|4%V(gb!anI62Zd@O|M@(O;o?q~M>bYSqK19VlGBHx`Jq~HL(JPG6=
z{~KySCC0{9l#c}-7=(#KFNlwc)u4@8jSt063XY)>Z~>CMCf@VCv>v%iAe+YGZzs1&
zGJ=}BAy>E|-v<;om+slsLGK^4RO9p=d)Hgz`+Y8~IQ_4@A5?>qeDn#CervHj;`r&5
zCk)I;@^`G&woCjKY(Wj#zHp7*eu=+)@V;Q!zT<$s*TlR|OW)wLn@Bbqds&@%`{47e
zv6m4^gYUb{-H?4nVad>Q;+<j*xFt8=C#lfHc^pu2Do`G~Wq|8&3T~5ICT#b4KBfh2
zq{WL8Hk;KNu_e?w3u#ZQdN9u{_tGaV?KFizXKh?LL<3XQX&7qu^MpNu>dcx@O(nFu
zMLjrAvZ_CuG?9KcMctH2Poj4wP1&z{4sc#|<Ip#t3to-cEfea&v(4ccpY_&r8i`fU
zPgw6<l=Xo#^8%s4v1l4RuD;8FBgu;?5moX4-K(Lx=nG_^brAWDA5Rp(-(UrR9M?68
zRq+arY(E}b_l>${dW2(nMNDk2rYowN)m1^?jlSRq)4V~7GiQ{7zIK~Tb{QncA^*2c
zb~ydAgB*7_{TMTxBsSmy5$>pJB5JDYAWzgYcy)CnQKOjfD2k_TFi$}*+dOzZ-Z<Oo
zpeG$rFsZF}m&;C1LD}R`+Z<?zC-rQN&g>t$RlHd229;^XSa1bO9x5PhvVdT+MvqNE
zFfrAHNy=xqwoB*Hz)dt2>Y)q6Efb(WS!s=Utk>GZ_G>NVj#^iVz7zE4%dwm8ydarQ
zCsl>(IWO3C@Xt^{AL;0_x+0dV?DnfHVYjt=f;wIHs`q2pylX#ANvG9LY?hPgYm;co
z0d*;6kJH5cL*ECibBAHYI>2B%i(~G0D_9N^SOJb&r@_h*jKj+LP9`|)*IGRh>q_Q}
z`ovY%sGF>Z?C<KZUbN>Fth+Bd_zOGel*`)PK~KtFudKFpbOUbdmmKPe{q!h6&7{;h
z>C`0pAt0sw>XZYg=}sHK`+|B8Z*V-J6LXoe+M3nI8moi%gm(a9feBQ0v@Vsa)ioWw
z_)GQIPV4Rqt#Pk)_a3V+YTdKP8ueLs@3#6z>QyJ})uD^O_1PcTQ0k3aP#-n-ARR+}
zOWe!Hw07w4;`5>fQp|XbOD|wh^B{H^zTssgrhuCaa3NRc*3;k+O?;I|X}(L=2XNm6
zEnC260)?q?MqRW(QPlf9A*T{`y!{eU$RkH=&3El_M5`sa<>n`{%*ej;N{cL-M5=`X
z>v@AkmZ=@)HfnP@<H|Rg`q#fkW90B|m`8U6qAR33u>e*tFc@$D&_vFAL{U^<GnftP
z9}J%dKhy<H0RUaV5^ZAIszz4;oKL~tmQQ0RYd|0Qg7y{avBZ7Q??Atm!#%weh&uM%
zRj@~7Pl)KHw;fT%8Fs7pDGDtBwu%Pzd83hP0lM7s%6FJV*(YvpkuA}{9W-yf&q1;1
zU&$qYGZ1&W)F;s+^>JBVVW1Sir7Qry$4RCSzh*EjSdArpr$#4F*=ZE6g+3FmaNYys
zt&tg>C&68vVv;~;_&NY>)lesgxj8fHe4A}vFn<$s2i<ID^Vpe;%^Yhsm77Uc%nQxt
z1?He^ic8YWjc39nTC@O0hAs0sP0=53p2?`p9CYG&#j?okQp^cry}+v|*6J~F2DsF5
z*hwMEDuJfF2t`Q7DCW{8F`JeWP>>YTfF8g%)f-Vq(>oWkbudJrG$5e>sn^1#Z@pF8
z=vsQb)K{mzv)DPowOD<p)?apfnQJN7R!iU|kqjh;%`=%uGtFT#h$Oxgur4Mh{xaZy
zp0#=7citJtJlpPwwllI<SF0bf_UIkz$5j&yABUV@VWN@3pBfCGhRG<huQ)>=8<=>T
z%XK@HRikYoXIamDVK)wMCOXGh+)5yOoN-cab$jWcC*b!UByZYt&>K)Z2R&z+fLqD$
zy~LC85b6c+1d^9{pqd*EW9BS)qzMFEz&;B|>JeJXAyV%GG-m>ZCVSFeK#aK_iNj~a
z;4==unHtb({;7ADp4KbqhuT3gL4Fe8F0h9J#UTGwgEoz7EAI5$_U^U$<JL<rwZ(jd
z8!K**HL~Tu@$$XaxDN$(@@Y2-KOW(3Kco6s7!8N0EyN-maV}G9faOeBro}}IYNHDh
zqu{cMn`TQ=!sHB^7n#Vs$f7vS<tB3r7Z+N_&SLJ6n{8RJaO+4Y>GlPi7$wX>mwAa9
z&zbQs1aq1-wq+J$vs&zKw|yZuc>-pbE>5n&v#h|gt**1Io6%$PuX6+ACs*K&G=6gV
zof|(#8kisQc(3+i-mdnR_^t+tMrzbP_L|~7;LUok;dQP-;(!m>KDupX^n7@Evyf4M
z3z<<(iBK5&Xd~1B-cdt(C0>ia|M?o?>wI`WAJxK<5!>|P?YE2K?b|Q74d;=~jog?Q
zh_~<9!K>lS`!r+d8Sx>=#9Zer7)NjlUX9NOYU@N^Gto6L;Sp}Ae?&XmEMd#j){v#u
z8uD5;SVGp1EQR4R)L>IBD7Lm(y&>y*i{&FLv<W1<C3J}~b{k|1p}<vboJfBTJMw`o
zkg&i0x-FsDa8?pH+Y<rXYj=#y8Ik6=M}n|d6xhqq3u`(uP8t<c<H<Eq&$p>9heYwv
zmZL{k>}G8D3Y<&DLwk{f{PXtq_33#yZ@HGwIf2gH2A_siT%IWIlQ}S`*z8Z5qYDr;
zi`yZ@P^~p>hG^{~XUuJKOqoyOFArmy#9J-`XL6-1U*QSU&HpJHKkb4y!<HlCY{qEB
zTKCnJx+BAZqw(<pyJHQ+ku`RkGA{YvH;;S@SVrz|@MAdh{+4w&VIv#8rJZfXQ3v~%
z9n5-`W%v$D(`maF{0||)#xPcIiCsvAVBglIon^v$VY_gtaE)*n!^s78E~aozAcz%L
zq3MQ4BNx-aSU|hh1idxqs9~!B@=3r+E)(!E9#4ucFL6CC6gK)r&oVag+L#(V*#wIk
zudP3cY2*4ly|t`nrLH308nopaAUaTB(cN%>2=kL_m!#RIV8CRWZBpoEyJDUV*NdPD
zv~zHcWU}qI1s#$dXR+NBv>mWX4h46n7PtIWhuiJ=s_g!(#qGG6r*RSw@<;57L&7=u
z+2h4Wf_ROI-J&<8ph2^ume~~ZERz&ew5Co0BzB#8b;ro(B@LR8T>=!rdo(~LMFZ46
z^2KkTdX?i;QblX%(&yCw$;fVLZE)~;kEfjiM8nA~L+^^$i;CcfJ)FyO1uSPi;3MeO
zNcn>vZ0M}`g<Kvc`RB<D86LUnsz*fek*l_Rg|V+}+42=p{L21h{1<Yh%=z>3p0Qtg
zR1_cm(p8U45>a@aC|-vuXcp`8Yl0$nvJ<f930bb<PmR}f&zdOgcWb<cl7bA$1XqCk
zu0X)0z86Ra)c1H2o;?ad#*GoO2%9w&&u{Xi`j!(GNKQ*SgbsF;9figUdISr>j^8nX
z+SSJ=46#cls7KYK6S(i;=z6e^7V_-q1Ss6vPpc;!5e|sU*d_2B5ID~O;eeA?ZsFyA
z53s5>)rpfFR;#+g7PCKKvpH-r+YWooMqRcT+s^M$VtWvUcAIU7)rx$y&jj1hPsESK
zNwDE^o)@Fg=!WVa^MK`0)GoxhjE4rn8q{NbVNftsT)pjgXCP2xsuXg=N$4F`UsYFd
zc(?}MeuG<XmfiO#&5An94(+?k<0#bA6K>~&PS2Oi2sUY#iE>nSXc9M(UtTAZ$LY0R
zJ}A40T=KQI`2A|X#q0EtT&G@GRYRRlx7(?{MdkDW*(EZmAE~p-L9tKgBVi9elRUy@
zSADdaa(RuRKPyA|fK9qyvPxeu`yC|SVJo+OTeP2PSNx*sdZY1rlf!GFZ-v9^O0&-)
z7@$x3jrbk095#-1Lcj0@U>X-nq1}RsC6|XuwlSC2jNvAKK+0!ebAiqaqzQJ}03;_9
ze3Y6XOz;bYCB8Huc4#Z49o3+Z(l3y{B@@hc`UN66SG^8z_R5GYnH_XGS<f7kRA9{p
zX+bZu*;&g?Es~dQT4*&%<Hm_bqhSG5WODPh-<j0PsHM6#<Ibm2WzJ-Cbqk5j<Fm<y
z$#h47QEOFYMvkY`QFk_rBGxuJgrex`5vttksVf;<IaNDHB-5N8=5&s|wi%N1CP>Cc
zaojkQ*}8BO^GYo@jTP-SI1)*QX7&X+Q_0_0=t$#@+40RH;Al=d%TlSlJ5$SxS|>$O
z6q?+|;mBs)(R4b&DYmXc#<_X8U9_&_Nc+%F#mB`7f=@_tFFvm5)l@Mi5O!{6F+ve0
zW+7*1f#N2Z^3r*c6Cs|I*ttsDP9b}+B0iXimXs!_ahWB$NqyOBVUt6l+A78KRfD*U
za-LGy@T{*HCS()rckzm#T|I71DY2+!nfl9A8U19LXg0iNwJTY#XYfKRl~UeQ6Q~V^
z2Y+k<zMPU96hH}G>X|TE<k~+j4vE;tG+T+jAh`<A57oh0<fN|!6N#EcvgSV7?Uoze
zuK8TsSJjBSGvPL)WOWjM>K<~1-LHE5*yEmZhqVZS(J;3OQ_cc2cZ<+m4}hECawLp8
z1W&96?zP7KQ=rWN*6STRBaeEA%j*v$^Tg(En_@9|Y#yh@UlGehqQQ8|8wuwlku&uJ
zY=GNgbVr=t>TFXpRm5#J+3B`tiDDst+~dk8r1V}2<wE$=apnd1qgKNo)rVaIx^<2F
z(5%4RoB*wLo^v6(KV8Z=tYVb7Evp{RZ3o1eH8pg5P0dX4z#v=p#br!AN?V+=>{Qpq
zWT)78>Atm=<?2%nwY3e@y4<pM-=+UtwtDrl-U+ft{jtYMX^5-vY?Op<suFLb-yj~u
zqv_PExZV>SjqaEL>pV9(gN-r%kFuEH3x`X?VPB@YdTMobMt#s5iR5u#QdKn#_v{9g
zV;sFGpH>B1#P^6-FAZmj*PmKVCI2>qj~^5E4ZQ~4XBIm<G!R@B#MN)$eCx)u0&IX>
zB?s!1mKoPQgT=~oE%bQe8ZM~WWx7N5kh!I1;K-KR#xY^2<-E?0!q$hj>vtYDcKyS<
zO4>Yzrn;?12BuaT8?)q*KQK7SIN50Pm&E8t&{MdE?*^OkIzNicX8MXPV3=$qhuUW=
z%4Wm+V2ZCh&;s}~V6%X5_xXFFm-CL8Xs(X)yRixz-4Jw4WYcy!`X=AqzB#-Vy5zAZ
zx5C}^WA5`fZ*qFRTUDoCZ*rQ{8)zTj=ICORN!>Sk8@%o?w!s0bdQkHqb8^<wsXos)
z%&{~b)gRQyd3c}U9zTNdf4gh&t!a4Ipl|#y$^YE-jIE!moh$!$bo}qb&*Lql<XfLc
zw?_b}NzHX}l3?V}r1qlpe#&oo6czcAk_6?W)GCegRdKpE-{t0%Paa7!*o=|n4usC_
z_q+;n_b<Fg&FK`{%N5Ohhv$3~CurP`*iabH0$kS9=$lmZB05dsd4EYF6pxl9#`vvn
zkIhR4%Zv-)iCmUaf*zMQ8qG&3Iub@&n2}OtZf`OWjuXo{+%BihmK;N^&G}ltGwL<U
zo=d}Jp->s@uo%N(`e6~gu$l_MwIabteNKuAC+WgTf-p=8eltt~PQP+Il;BO|74K(%
zh7S#2MH7YP+$(}hYnp<w0xKK~JO#f7*kj`y*>s00Bj2zTEF{!Sjc2f4Y84f(6yX$&
zZ^K0urTzvk&1rAoH8=vWTT%`7>$$D!dVBrk2AkUA^m5<k|Fkuv1JPJ{G&=YMFTL5;
zfKqx~D^=TZS8wn1$6^)HD23AXwi|e*8*B}e_$y>Td7auT{IO_76c(>UHsOo;;<;QL
zmqfOKq7|`dW%LK$xR>I&EKHYB)y1>f_~KZ3424nkDas~zX`-YgLB5z55Ant-Fbf#3
z`NA}e*TbOeJ}u&*j@vW5d<*3B!d-)bNZK5o-0(3#oKWhSpI7r>AekH!kH5rbIK5uy
z;6pfn?_`$NB|T3`oL-I1p+sep;#F}k2N||RuljDXGMT7~dpPXH9Ey(_U5U@VsQL74
zVatoMJMV?A&%%7?{Fp#YI5v6A?8zG_baU5%T(aw2KA&rFt21!s8&-gfmGDvEZZ2H-
zk~sPGWWvt{E+!a;o)<q8gBZtF;9N#0WLzP@$r?5ka7A2B($oWdgF$W+#CR-Az6aIo
zGCmjT#aEmCC%(P<Tdg)03ft<gm~;8#-f;n&eT6k_U1_&{)_Afw7_rt|G4G2<M;6o9
zzVV`g=1z9R+y?ttxKrM9Fy!7Z%lkZ`^S<#LluVL&Npm}~dk#|21A_0|=hpZQg01%<
z@iuWDG#>)IW~*3%i&g<{2-4FzB;ltC(-t>)f%o7#h&YVXyeDE#eX9M?7O{=)%dLW?
zBCD=&r4`XhSu1&iR`nIkT5@5U?rdvpysBNDH`g$I*3TBwIFyEIoBGr^!<H|1(06mD
zOm<Zc&l({9;@O~=tm>=j#qlId(VgSJ)YL$2>b!+Nn>F1q7Y|3hMY<>m)$ot~0rY^J
zcZH-=QplC$;U69_@Lffp1R3s>Mb4E8?~vbMQ2+GyarIq;fr7`D?PP4{GX0#ate8+)
zS?%~>+SCsmjt{0z`(UlObLp}R7`tHE(w+M&J1QzVAn8Glze@O?xSh?1PmZn+gseU6
z{9(Gu7D(HumTGP3fKC08J#GKcn(^DHS$*2(&sb>@yk_-x+=q88fYqN%Xk09iOcpFN
zZhwOUz-_15HYI6SpI4u^Clwpbw%<o~T4YNG$)-L{%{B_6^t*T&QMF)aFR+g|JXsA8
z`1FIN#Z>te_GMezuRq~W+tlya?TRgsvU3RSsUn2@9aY75aCo?6ue-7Y6d(m;?<KH}
zFSPUac>7vs0(Jo9z?){-i*TaH=o-f7(V_RmDWae2IUw`EQqEU_{zeWHRs^^&E-$$K
z;@-8kq~ER{bD%eG+5Jh|+P$LR?{~9?6<4pZ`V%k~Ivna-4%ishT)krOS+}n17}<uV
z6;Pm=08Pi>Y0yIv41TX6H=+%Sq78}-w}DpNgU=QlK?A%Yy%E-+HA0Y|Tg7YGfAW5K
zwKqc~X7F~w;AT=LEbA(U{`3z&dF=)kck{Qtx&F`^8~GD5x<z|k4)vJU=swAx_DlPC
zhe=kCbHCtGZ4e)GP~ilFFAatXo*p0$7%ohQcn#hnbNH^^F!&~Kg~c~qJ3K(V5sE;l
z#PE%1#f~oXxs3}Z_A2`Ws6V_oGH(3RXTQJp@F5d~!TZ&DfWsg-hCUJh8}{vxPz8x<
zd2!~@QSMPFRS>uPVn^iKPv|2-;IK__nF_Q3G*${2p&H^2h!Xe_-Q%#S4o(DxQ*}Z1
zhAY$G190ev$@m$A>5}EkFEJUOaYg7dN5ooQT~%R?ghWe8X=#Z?R4)|`kC|ojmqVd1
z<MNnjebpYehNH2NHEfqfE95edRfJ)g-K)Tu`~w56xpxg2ek9B1nk7f;O?TeZriot-
zmma#TUXDtJdrdH4J`ggPzavV6_e<N%Mn`((x|JEb(PWLu;c0WHg=I{)B#a&UgZOJP
zjmU!8;4#)}+7y8rYN4V65llh#%Ovg=$i+#JLw>5S4PabM7_2mEL5Sy^7ZTi_Q^f_*
zb_QkxPM8ez6<Qc21I=;@`WUPQUAoI6m#{^Fqto^-@iAhvZ4IfxW63((LbA}>S*Fry
z;reS@?bh(L(yFqS>Z_EHAz1EgZkEikoKo%_+w3Y=q{<c}TVRw~-eebNGkf$^#>5X<
zA~SenKAlk5Atf<5#7Lw~YMZ88d=h8oBctK*L<vzk@w71-pR-;}CtK|`HhVHffz*Y|
z>^|@0$z~}?xK8o-*|;k5xQ+iuCadXZQt6CMa5J(xr8oX)@~9svk%)qPWRbu(QD8M+
zxJIF4=ne6xm;}vEV9%K@KvkmmSl_zEVSbwX<!assG8y^KT8s_k+6Hd25_#Al2z)W7
zj5}fYB#a!M;%Y*SU@I_HfsikL{j;OoM^o&;d8?M>r>KXT20!_FSrc~<^2lFD)(4Q)
zn#y=eyJdglDg6Onjn?p*QIER!<P$P~e&jPz4@=_dk#E)B#arWV#t>l5pYkQ)^zrPT
z81!#^Ezasw@h@%Zg#AojEC0qX<?Q|^pdqLHlk<pJfn0bt?_}-~KD<Lis%mV2QUh`=
zcq4+W-cZH3s2-=YcpuXzBYcd1rNlK4V~PjVXN%6oY0cI6^IVL-cxGSXq8Bk-l&7x&
zkLiX!;V;l9WI-2U(T0?+dA#xU%6EY(m<^D`UI30GlLATPN@}2<&T|-bp(ic5$>X?o
zid0ukA8{d2^?CxLi6yJ+Olg><v1d#+i=pIA4i6#5ucfT4B~OP+TTAgL8XaD>tf~=6
z2Pd2{ja6@1B}5GdL*79-o-b`F&Bx>Ud|N)xamyfhitv^|d(^=7>)EqHT6Ey!L<-P*
zb*Oy-?HRrY(bj(lu--4W9#qXc`1|ahC<i`I_r*EzrT6|T*kP?Z^ulvK<<r5{yaNDU
z`{O+Qux*#?Ou=pG0hgNDL06-5bvkz?0QPA3p^QKy_LOF_g<Tis+g2ENVd?$x;pYv8
z=MU@W5r$yqvvT9FWjzeRu=iS@whVrJvfkn6=Zr84YistDo^+Ikbd<C|Qe5V=P7ng%
zPagxVi$agk#J@TL{tWKt*yfqS$roo=;RDQt1E}FOKVbByp}_kVFhB*DL0C+lZ!>wZ
z#DWl5%iy(eY9I@{?z}Z5s_&gxy<lywZ0Qc>{^^D#Yb$Dz3S72w9o&2Zw36KEilE7~
z|9v*8-gz)#aVr+qXC_zBJowMnJ(;P0a!|C>&9*PAD0!a}T>*B%x%K7y+AhgX`4bg_
z6=^rLM0Jzspx&1t`tm6H5)-Pi5)eU=4S);K`;tA`3na9DiNjvcxYK)+)k2XalNanR
z-#W#FHQ+W6-pIRUrdey|)r^~T^q+>MbF0qlMA!cO?)oJ)6K5fZRxPM1cIgf`+i_lH
zc7AQS`ktR{PgxKbY+)PGCk62qu^O-anK7ZR+N!pT(7VCwDPHR*+f#Lc4fR!Rmy}F-
z?+>|(rP~>~)B*C7zr60;9emB`a>VyFIU>Wc?u?Se2*d*h>Z*icsp7qNj;SX!sp7HE
z42I7h`^lieF!&Q)ept4XAVpwF0MD!KrzDJO+tc-9o^?2$9aH~w8QXQ<vK@@=Sa#m7
zD=E(xzqY1ngiiC{YBc|i`tsi@D=`)fv1&gP?}h(=9ejTU{uKno<$ypSY*oJ?n1kCd
z_zuhIwXRdg(BKbTVI~c3C!aw)56U3qz8)?mvKmajnA2o)dMw_6tvq#eEMw>}q{D%j
zy>@$jc^TbzbK7EeFKt*br=>t*ZM=Qv8nIqVCqjt5vy_D4#%VIA1J0Ps9rGkBDH5!{
zye*N6g;pJ&*tB)l?!yN4y{>~|#YHpc@5nIC4^|Y~VB3FE>_Sv=udoxeggZEDy#bRA
z^%(l2vv5sZSB6CfRt{YN$eg->=`iti30@7QGIxp83OFy<2xFQi4L3Fvni{!S+=wtH
zJptt#K`G8(nbFm9bbD*r#9(DTks%PYI^D9D+H1e*CS!+z8Y>gkzTCRm^Wm=q)V{i+
z=YqB?zR4(CQFlR|-D6E@wd(UX`y*s?NCulF<`6Ars<JY(q1xL*M_L!)69x_WV4yrN
zb{Qqx*ix6%Ro$pK%av3pQd$c~2|0Vk<T1^ZDV=%!a`C2ZeK(3qXo7fo-{ju09k;Iz
zA&jYTurXUkk$_XNOAez`al``_o6+F*+0u&9DjGd5Q_5~M)`;gXTHMdZbT+rGhbxng
zD^CJf#_71iZAZC$PD2Fk(%4W1GN;*ep_fFdCQ#@D$}M0BJLbeq3-~Nx!xu9Vjx0vA
zFG^0c-RZG<G;E2d`8b?JmvUgsqQNDju!SQ_Q2rcbsh}uFmUtS-a_fYqt+OvYY#={J
zmOZnEk%eG4{Y1P6@(=ft0v<GZI1T_`u&ZMx10IMjOfb1kM_yp!!Hwfq#$v15HXan&
zuO2qJEhfWuGF>@vHR~u8I@r|%SE`@%8%!9VQ#e>FY!r6k-CSPKMv2o-eP}egm?@$c
zZ<C`A4n8t*P)`5?e8WTIfucI9YD*8834xbevS8SfcmlDtKx!=qZqs-U55a?ok2G65
z8VOCN|94nur;%u=P9K4Wr?9Xo;4BY1<8}=V9V4;u#`AS7BsLNan=T)XhH#&<*bK(A
zqaiyvcLDzW0IxPz|1yONh5`esDSY)LMwrK}(-QXUhY()jHa+y~kyAU7t)A05({Gk#
zhs8g$b<S#LeD+Hwqx7X`ndwUPA3F>tlVJx*eAeqLE9)`qOV$y!r0rI#J>5dIZprTV
zR~U^e-skJYfLPC;A=Y!8rl&6F+BRSrB0V*mo~CexundZdsRF^(bj)0Xe_Dcaj)3zp
zrA`HO`g}_%+gOrm%KjJOi#H{WxRx}Q;BTBPU#&-P;tL5{{N_b|g@z(1%Vxu)E_@y5
zh7OCbiaq$=4E8?-7{?WXJUov32k<}|_%DF+0Xw<S@AmPaAI<s{s3qSChfG^t!BD_W
zeJ0b}<gt=lQSS<tSCuR3or;@wvmdmF)GtLEBI*_X1iAm{vOzb2AN82gY5Jr3S5GDV
zAYJYy8~4{$KlYZV)wyHNQ|SCiM7`P%UMe?q1K`^PYeEKoZ8eCOg>+H(FJNgPI%$j!
zyo0$5+9xf1rhFkl>5OJxOXHIkcR~>wS07L+ID`+xL&WL>W5!elqUsP$bSj{PG-*f}
z{2TrKLrJVL{`Dgo^csx#Vntnq%8kZN2k4$LO$r$_a6eO;#;8jU(BXj37l;i0)9!HC
zKl|*T^q~EtKilbPb*9_#{)Yw?4k*#6`YOi<Cj55jmtwhCr`dT0KCJ#TS$Q?H?v#ph
zx~IHi$|<w1Sa<2Z^`-^t!&Ma(RWyBpX<gBl%Y9l!VZzXhh=-~~>^0}41*01=S@5#q
z{wQv)(ZLi3j9hLhhDfpVU$i-1wyJig|3`NFFY**-^CZ(7S{&44mF&4oP2ynLg+{Bb
zll_;`v_lJX3faksfG4&P!B6mIr`1D`uy2S{F-N-QuK>d;C!;zogS}Ne#WTqvYMMxF
z*_0{E7)@%VP*O?YqfUvb-D~Jd=i=rmJZN&t*u}DX!J01i1|?Beg^uvPt%r^LX4uI6
zLcAD_qgi=R%8Ux<F7>73le{_%Tvr1)beh<xL4;r&4TxY>Yw|QGlqX*#^HZIZuaMYX
zH{5U+ldhQD`IMPn+}OSP=g!4rldV-jwtRBSBInOnce7NoDv7_r4sr9Wb2|}@(^}Io
zmC>|@npWI&o;zzZ=KGZVz;~Dt<Kopp(!d)fO&lq359dPjEVwO?lq?VvIIFq9b5Vxz
zAYs_g1QDWq?<y*PHM$SYE6)h<Rm*jE|Ke40!Uw(KZ!NM(ooP3iCRw8Y;zlx65*_rA
zNw%n^_Nf2O6ue3?2d82HgBryc83Q=7OPKO;P>*rVVS!6<-0fmi5a6R@+KAf5RPyuN
ziOjxOJQ-W?TyjS8sZ3%-1mLCAI!3QKrd9nJWfGD8aAd}Vk?4by5^2pI06u=`s6h}h
zt%!Wea0=n&9?p&YOE;jdtq4;C!Qgj_n}1P3XWunV61G+z99_JCsm)xycp<Y~IQYQs
z-QN4ytlhhjf}rlq*VWCguYW8OofIx9&4;s>Bx>qv6I~Py(<=)XS$FMHH|%_L7u~vZ
zr`o-XW>P(B&#qVhI~Gok$G1;{$^KX-9bYv+9OH6F5neBBm-SpaEY$lYXchn@LXnGL
z7qpnH6h0lp;r60Kb&4C?7LS6;@Te}XishpE?&%=2fOI;CdQU53t!zdssja&~3we@V
z6YhxIHw9tXp`Kso8XD%**YBCMi^JNkfjxd4UCSq-ZKryilyT$KpBz*ucuRXAaNd7V
z!yG)&Fba>8qwyHg<_!fe+!wrhbb;oIJqn@mEhF)3)-uc240gZi%SNm5%chZd{gT~l
zrW-;bb(7g^m%c3F4|IPQVv#S0EW+)Tjlu+I3{S>#`%hXGzy@L0)U~Kw0%;r;KEZho
z2PA8wR1CQ_@jzRpj%}o=tz!|ReB$gew(gi)i?MYh0uC{@@BD<Owq)o#&~;;l&TKIa
z_FH{n8+%p@sZ~w}E}P2nEhj`QcXKzwZXU5rf6$VlU_*7&?w?FTq_eh`grQG?w+2o3
z4y_s1FfagttGebrZGz|LSv2qY&sVX(rbMCvSIGUSQMzO~(eg_q<D&>`yw?sTdsS6A
zSF&3(`Fx4RaJwyH4Mk%?u2MJHJbu5|BATI6zZ0=vPS^JhYrYMY`VVEtxfZC@Z~XQR
zZFb2WmFq9P=2EECH=2z0^on&W(hj598g+)I&e1jKe2*KBL$pD6#=lDjc0!vFzv71V
zWc+Em9XQ(MxWzyVO3cvj3EvAOL>^9IkqMTV$9BjOb{w*KqSlq-Zw?;RqY&A7+<N{J
z4>^29{cwD2ij@$s$fG3@V`*DE9;@VlI_&_$B_H08p$6R={tg89{f>h|U^$^t&;$&*
z5o-y|^N5c;TsMQZ&X}QIH-puW_>2QvK0|$d#tbT%arx(bs)6@=I962e_c;2TSW$3#
zdaP&#!R?5Dj^KX~A^LL)m4tqAkj3G2ba{K1)g3++8rpHW>>0cmUA^Ui`kW^i^icf)
zbsdkhoHBGwd{pFLNiFC5C6wlx?i@?N530yD(Aa~x#G#91T=kAc1ePR_;#C`X8T9Lc
z9>vC<yXW3#nN5*B;(L$9AA3*qTv3*<sK}R9K-E8~bj+C2((>|aY#$!}A<+*He`s?#
z{&L?7qWHpne{s0(Da}3%CXy;XtE~JC_4B!hvpgUM<Mlo9B5}SJZ`_3FzH<a2f{EZd
z*22lCV_maaj5@Bz#}2t60HK%IY#Oo0!xc`1sQ@=3r|W*NPb%<X<zL>y?Mo3hrj+_i
z$FOKESHRv+^%b|3*VFg7j{n`D?;2n5ZPo7bKsn~}l2iS?-RW}&T^{GHgbUn*gC4eh
z@S3vn@-o)Xb(-TU>+37WapS=kcvSJY!TFdH`cPBu$};zwlId^Som2KCc`JG$Ul-A#
zhYc2d_ho{x0=g!I!ofF<E0Uo?z(nw6pNE1F@vWE=e1MMoSL#ecZah<T;l;<LLlkS#
zfFN?CqI<aw5k}-Iei<lD0QRa}i$vnC<xQ*N(b_<H23{3~vU<eCRfL{+V*W-(^E)Ux
zepWWWd)BV6iPScmSodu8k<+7pUDiX6yQa93rGb2lMQ*iPm+yk}b-65=Bl*BsyRD-l
zSef=rVVmYn>2~EO*T}Y(DI|Vvm&4&))iJw=y-$c?MvQP*2hG%CgdgnavXK_t%*O--
z(26lhYFbk4!1x?O>P)@X!X0%xG6*@ar19heV@*_&A@$Gm5dVdKrN+<9<@WG?v2lp}
z>OsHkjzd;=)G{F^!gt0?2yBkH5srP=9-rUu+jB<nX`=?e+cr7T@gRqvgYV{{*`O;N
zezOLDyRb}~Q;oy>+$rVX6g=CM5|4z@0`wG(Fy!5E2*&0LUY%X}9QSpu%C;DZUAU~k
zC)8ho31x-ydQZAC__Lp#x!-&~-4TSF7rSkVy0saF3-kYOLQjrJSBI*N2+bTZBqQ)V
z!+nghTo;t)gyf9VIs%!C8#hALi^x3A?hE?t>PP<%@%2M|rWSu6o^e`FVdXh|QqMVs
zll%)-{h*%kjKd7)wB3WJ34Rt0#eB|d=89<%)O9%DFrto8xIkD{tRs!cx8gf#FBbD{
zLXOHo`TB((p%bx3J@8^n!s>h>&b>mH&?jt#1)86?3ky)XUf3aQM$LX)x1z>yodIyY
zOHke~3?Pr!PvYBBRgjl!&Y0hdFPe0s<__(Byv2HO^hs#+YP6$Om|AT46nuSXfxo#<
zdpCc771E7(vJv@B7>6-{z8BC=12kJTh)(a<0LEoKp4yJzb$E)$EA$ClkQ#2U2YuX(
zyri&AE8B?obfI>Yut9rj8+u!f-{FxNu3x2%*cNSF;)EY7X6^HSpeTlgnny(&2>~9k
zLs;-FSsOfU91xhCaO8#Ij=+Y%To6FWNs#beNs8dZfcz^r2})9m(v*RBau$Ilc`5}y
z{DsO8F@g^ULJPsEdJTMS>ZqO?sF9lBIMobC+7?(5+aMT?M+89!O`wSo6er`u2vcbq
zO{W<U9A?pMnnQEx9GXY-X#u_syNDLk5;~X8qouSAAJ$v}1J5d2O>3wVUvciDZt9_R
zw4OFlFIMIz+Duz$EA`PfI-mM!fVR^Px`1}lF1nC*(;m8rE~YQgCHVBtrF0qXGws;g
zTZ5nCb*!nYZ|nBXuI<vcp8kQptrq>#+1>3Z7Od;tyt${_uIKAF&Xbk&d*ikZeOr5s
zJzF|^H(R?lbZ%d}W9{0_Jr*t5x2tEsrd7}@+q7zW+I6aO@y#b6DZY7UPw(133FlqC
zTW#BVwywXhZ^!vNI=32lMRxxA<_mhed+@Ilwn#X7`a8ufy<KMhzZACjqBFSB-=qC|
z1)infN+{@Cx6atRrE`6ci2v+>QP_h2sL*5F-rqT}LE5oxb6;n-xw~)YR-Q0+ZAO`)
zzo)y;uw!d?pQ*oRU4PHO2E)Mi&VJj@4ZYiYx_bM&Hus=nPiMcQSgf~Y<&}!bZJT!t
z=t<j_-mSxFyZ*3VAa`x(>DsimZ&&dVt?8aE+qPe5FTPg0k@|Zy5c$hDbZ%Z}AK2Er
zb!$(5*M$H<8UPes8!Wszt+r`hU;oa|{%*tC&aO>*3tKw-H)&;t4SidB%v(Dz=w08r
zy~nT~k6O2NVurVE?%djA=-s-m&#<9q^EL^ix~Zqzu%)lR$FOd5=XxuDum~l8s+i;t
z6qEe1Vv;|lC(Q#r+qd^_T|Z#h+&i!x5cMO~*SF20HQKegcblc>!eU+fj%^(5fzJN^
zzMV3kjuE$;d)93~b?fZ!UB6+(y-j;&`vwg2Hpj^{f5oXg{s#GEnf3znwjG-{^IFD%
zK1{V?U_;+F!$4Q(Rx6+QVrMua=t;Ydb;bOy&i?Is(!i7E;i+^FZ0X#*dDJYUivyd1
zYI=3^@U4i1l@G3-@88h5wR`)99b488aF|x>x$@{-&#BuT#o@N$pN$NIVjo#7uiXp`
z&`Jk(^lsM{Yw@Lg@%CYb6(JhFwd>Qa=UT8-^pu1YFwUW0dNyO)26}8G`sq4_L;4do
zZL#TTyOu641xde=hfz?kB4de;7$KWB9mOI(799JFx5Ff$_-=ji>Ni&YZ&)<qGhow}
jww~?4s@l;#{2I4*H}Wyth#c>zy883_9z*ya5A6Q}&m5Ln

diff --git a/uni_modules/uni-feedback/uni_modules/uni-icons/package.json b/uni_modules/uni-feedback/uni_modules/uni-icons/package.json
deleted file mode 100644
index 8a856970..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-icons/package.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "id": "uni-icons",
-  "displayName": "Icons 图标",
-  "version": "1.1.4",
-  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
-  "keywords": [
-    "icon",
-    "图标",
-    "uni-icons"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-icons/readme.md b/uni_modules/uni-feedback/uni_modules/uni-icons/readme.md
deleted file mode 100644
index a2372048..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-icons/readme.md
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-## Icons 图标
-> 代码块： `uIcons`
-
-
-用于展示 icons 图标 。
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<uni-icons type="contact" size="30"></uni-icons>
-```
-
-## 图标示例
-
-点击复制图标类型
-<icons-layouts></icons-layouts>
-
-## API
-
-### Icons Props
-
-|属性名	|类型		|默认值	|说明				|
-|:-:	|:-:		|:-:	|:-:				|
-|size	|Number		|24		|图标大小			|
-|type	|String		|-		|图标图案，参考示例	|
-|color	|String		|-		|图标颜色			|
-
-
-### Icons Events
-|事件名	|说明			|返回值|
-|:-:	|:-:			|:-:  |
-|@click|点击 Icon 触发事件|-    |
-
diff --git a/uni_modules/uni-feedback/uni_modules/uni-link/changelog.md b/uni_modules/uni-feedback/uni_modules/uni-link/changelog.md
deleted file mode 100644
index 861e56be..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-link/changelog.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## 0.0.3（2021-03-09）
-- 新增 href 属性支持 tel:|mailto:
-## 0.0.2（2021-02-05）
-- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-feedback/uni_modules/uni-link/components/uni-link/uni-link.vue b/uni_modules/uni-feedback/uni_modules/uni-link/components/uni-link/uni-link.vue
deleted file mode 100644
index 6b5f4fb7..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-link/components/uni-link/uni-link.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-	<a v-if="isShowA" class="uni-link" :href="href"
-		:class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
-		:style="{color,fontSize:fontSize+'px'}">{{text}}</a>
-	<text v-else class="uni-link" :class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
-		:style="{color,fontSize:fontSize+'px'}" @click="openURL">{{text}}</text>
-</template>
-
-<script>
-	/**
-	 * Link 外部网页超链接组件
-	 * @description uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打开新网页
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=1182
-	 * @property {String} href 点击后打开的外部网页url
-	 * @property {String} text 显示的文字
-	 * @property {Boolean} showUnderLine 是否显示下划线
-	 * @property {String} copyTips 在小程序端复制链接时显示的提示语
-	 * @property {String} color 链接文字颜色
-	 * @property {String} fontSize 链接文字大小
-	 * @example * <uni-link href="https://ext.dcloud.net.cn" text="https://ext.dcloud.net.cn"></uni-link>
-	 */
-	export default {
-		name: 'uniLink',
-		props: {
-			href: {
-				type: String,
-				default: ''
-			},
-			text: {
-				type: String,
-				default: ''
-			},
-			showUnderLine: {
-				type: [Boolean, String],
-				default: true
-			},
-			copyTips: {
-				type: String,
-				default: '已自动复制网址，请在手机浏览器里粘贴该网址'
-			},
-			color: {
-				type: String,
-				default: '#999999'
-			},
-			fontSize: {
-				type: [Number, String],
-				default: 14
-			}
-		},
-		computed: {
-			isShowA() {
-				// #ifdef H5
-				this._isH5 = true;
-				// #endif
-				if ((this.isMail() || this.isTel()) && this._isH5 === true) {
-					return true;
-				}
-				return false;
-			}
-		},
-		created() {
-			this._isH5 = null;
-		},
-		methods: {
-			isMail() {
-				return this.href.startsWith('mailto:');
-			},
-			isTel() {
-				return this.href.startsWith('tel:');
-			},
-			openURL() {
-				// #ifdef APP-PLUS
-				if (this.isTel()) {
-					this.makePhoneCall(this.href.replace('tel:', ''));
-				} else {
-					plus.runtime.openURL(this.href);
-				}
-				// #endif
-				// #ifdef H5
-				window.open(this.href)
-				// #endif
-				// #ifdef MP
-				uni.setClipboardData({
-					data: this.href
-				});
-				uni.showModal({
-					content: this.copyTips,
-					showCancel: false
-				});
-				// #endif
-			},
-			makePhoneCall(phoneNumber) {
-				uni.makePhoneCall({
-					phoneNumber
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-	/* #ifndef APP-NVUE */
-	.uni-link {
-		cursor: pointer;
-	}
-
-	/* #endif */
-	.uni-link--withline {
-		text-decoration: underline;
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-link/package.json b/uni_modules/uni-feedback/uni_modules/uni-link/package.json
deleted file mode 100644
index 3908ef07..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-link/package.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "id": "uni-link",
-  "displayName": "Link 超链接",
-  "version": "0.0.3",
-  "description": "uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打",
-  "keywords": [
-    "",
-    "link",
-    "超链接",
-    "ulink"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "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"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-link/readme.md b/uni_modules/uni-feedback/uni_modules/uni-link/readme.md
deleted file mode 100644
index 43f6c582..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-link/readme.md
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-## Link 链接
-> 代码块： `uLink`
-
-
-uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打开新网页。
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-### 基本用法
-
-在 ``template`` 中使用组件
-
-```html
-<uni-link href="https://uniapp.dcloud.io/" text="https://uniapp.dcloud.io/"></uni-link>
-```
-
-## API
-
-### Link Props
-
-|属性名				|类型		|默认值										|说明							|
-|:-:					|:-:		|:-:										|:-:							|
-|href					|String	|-											|链接地址						|
-|text					|String	|-											|显示文字						|
-|showUnderLine|Boolean|true										|是否显示下划线					|
-|copyTips			|String	|已自动复制网址，请在手机浏览器里粘贴该网址	|在小程序端复制链接时的提示语	|
-|color				|String	|#999999								|链接文字颜色					|
-|fontSize			|String	|14											|链接文字大小，单位px			|
-
-### href属性对tel和mailto格式说明
-
-|值									|说明							|平台					|
-|:-:								|:-:							|:-:					|
-|tel:xxxxxxxxxxx		|拨打电话					|H5，App			|
-|mailto:xxx@xxx.xxx	|发送邮件					|H5						|
diff --git a/uni_modules/uni-feedback/uni_modules/uni-list/changelog.md b/uni_modules/uni-feedback/uni_modules/uni-list/changelog.md
deleted file mode 100644
index cc4ea776..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-list/changelog.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## 1.0.16（2021-02-05）
-- 优化 组件引用关系，通过uni_modules引用组件
-## 1.0.15（2021-02-05）
-- 调整为uni_modules目录规范
-- 修复 uni-list-chat 角标显示不正常的问题
diff --git a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue b/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
deleted file mode 100644
index 553dea2c..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-	<!-- #ifdef APP-NVUE -->
-	<cell>
-		<!-- #endif -->
-		<view class="uni-list-ad">
-			<view v-if="borderShow" :class="{'uni-list--border':border,'uni-list-item--first':isFirstChild}"></view>
-			<ad style="width: 200px;height: 300px;border-width: 1px;border-color: red;border-style: solid;" adpid="1111111111"
-			 unit-id="" appid="" apid="" type="feed" @error="aderror" @close="closeAd"></ad>
-		</view>
-		<!-- #ifdef APP-NVUE -->
-	</cell>
-	<!-- #endif -->
-
-</template>
-
-<script>
-	// #ifdef APP-NVUE
-	const dom = uni.requireNativePlugin('dom');
-	// #endif
-	export default {
-		name: 'UniListAd',
-		props: {
-			title: {
-				type: String,
-				default: '',
-
-			}
-		},
-		// inject: ['list'],
-		data() {
-			return {
-				isFirstChild: false,
-				border: false,
-				borderShow: true,
-			}
-		},
-
-		mounted() {
-			this.list = this.getForm()
-			if (this.list) {
-				if (!this.list.firstChildAppend) {
-					this.list.firstChildAppend = true
-					this.isFirstChild = true
-				}
-				this.border = this.list.border
-			}
-		},
-		methods: {
-			/**
-			 * 获取父元素实例
-			 */
-			getForm(name = 'uniList') {
-				let parent = this.$parent;
-				let parentName = parent.$options.name;
-				while (parentName !== name) {
-					parent = parent.$parent;
-					if (!parent) return false
-					parentName = parent.$options.name;
-				}
-				return parent;
-			},
-			aderror(e) {
-				console.log("aderror: " + JSON.stringify(e.detail));
-			},
-			closeAd(e) {
-				this.borderShow = false
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-list-ad {
-		position: relative;
-		border: 1px red solid;
-	}
-
-	.uni-list--border {
-		position: relative;
-		padding-bottom: 1px;
-		/* #ifdef APP-PLUS */
-		border-top-color: $uni-border-color;
-		border-top-style: solid;
-		border-top-width: 0.5px;
-		/* #endif */
-		margin-left: $uni-spacing-row-lg;
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-list--border:after {
-		position: absolute;
-		top: 0;
-		right: 0;
-		left: 0;
-		height: 1px;
-		content: '';
-		-webkit-transform: scaleY(.5);
-		transform: scaleY(.5);
-		background-color: $uni-border-color;
-	}
-
-	.uni-list-item--first:after {
-		height: 0px;
-	}
-
-	/* #endif */
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss b/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss
deleted file mode 100644
index 7e2708f7..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * 这里是 uni-list 组件内置的常用样式变量
- * 如果需要覆盖样式，这里提供了基本的组件样式变量，您可以尝试修改这里的变量，去完成样式替换，而不用去修改源码
- *
- */
-
-// 背景色
-$background-color : #fff;
-// 分割线颜色
-$divide-line-color : #e5e5e5;
-
-// 默认头像大小，如需要修改此值，注意同步修改 js 中的值 const avatarWidth = xx ，目前只支持方形头像
-// nvue 页面不支持修改头像大小
-$avatar-width : 45px ;
-
-// 头像边框
-$avatar-border-radius: 5px;
-$avatar-border-color: #eee;
-$avatar-border-width: 1px;
-
-// 标题文字样式
-$title-size : 16px;
-$title-color : #3b4144;
-$title-weight : normal;
-
-// 描述文字样式
-$note-size : 12px;
-$note-color : #999;
-$note-weight : normal;
-
-// 右侧额外内容默认样式
-$right-text-size : 12px;
-$right-text-color : #999;
-$right-text-weight : normal;
-
-// 角标样式
-// nvue 页面不支持修改圆点位置以及大小
-// 角标在左侧时，角标的位置，默认为 0 ，负数左/下移动，正数右/上移动
-$badge-left: 0px;
-$badge-top: 0px;
-
-// 显示圆点时，圆点大小
-$dot-width: 10px;
-$dot-height: 10px;
-
-// 显示角标时，角标大小和字体大小
-$badge-size : 18px;
-$badge-font : 12px;
-// 显示角标时，角标前景色
-$badge-color : #fff;
-// 显示角标时，角标背景色
-$badge-background-color : #ff5a5f;
-// 显示角标时，角标左右间距
-$badge-space : 6px;
-
-// 状态样式
-// 选中颜色
-$hover : #f5f5f5;
diff --git a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue b/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
deleted file mode 100644
index 8e8b1e67..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
+++ /dev/null
@@ -1,533 +0,0 @@
-<template>
-	<!-- #ifdef APP-NVUE -->
-	<cell>
-		<!-- #endif -->
-		<view :hover-class="!clickable && !link ? '' : 'uni-list-chat--hover'" class="uni-list-chat" @click.stop="onClick">
-			<view :class="{ 'uni-list--border': border, 'uni-list-chat--first': isFirstChild }"></view>
-			<view class="uni-list-chat__container">
-				<view class="uni-list-chat__header-warp">
-					<view v-if="avatarCircle || avatarList.length === 0" class="uni-list-chat__header" :class="{ 'header--circle': avatarCircle }">
-						<image class="uni-list-chat__header-image" :src="avatar" mode="aspectFill"></image>
-					</view>
-					<!-- 头像组 -->
-					<view v-else class="uni-list-chat__header">
-						<view v-for="(item, index) in avatarList" :key="index" class="uni-list-chat__header-box" :class="computedAvatar"
-						 :style="{ width: imageWidth + 'px', height: imageWidth + 'px' }">
-							<image class="uni-list-chat__header-image" :style="{ width: imageWidth + 'px', height: imageWidth + 'px' }" :src="item.url"
-							 mode="aspectFill"></image>
-						</view>
-					</view>
-				</view>
-				<view v-if="badgeText && badgePositon === 'left'" class="uni-list-chat__badge uni-list-chat__badge-pos" :class="[isSingle]">
-					<text class="uni-list-chat__badge-text">{{ badgeText === 'dot' ? '' : badgeText }}</text>
-				</view>
-				<view class="uni-list-chat__content">
-					<view class="uni-list-chat__content-main">
-						<text class="uni-list-chat__content-title uni-ellipsis">{{ title }}</text>
-						<text class="uni-list-chat__content-note uni-ellipsis">{{ note }}</text>
-					</view>
-					<view class="uni-list-chat__content-extra">
-						<slot>
-							<text class="uni-list-chat__content-extra-text">{{ time }}</text>
-							<view v-if="badgeText && badgePositon === 'right'" class="uni-list-chat__badge" :class="[isSingle, badgePositon === 'right' ? 'uni-list-chat--right' : '']">
-								<text class="uni-list-chat__badge-text">{{ badgeText === 'dot' ? '' : badgeText }}</text>
-							</view>
-						</slot>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- #ifdef APP-NVUE -->
-	</cell>
-	<!-- #endif -->
-</template>
-
-<script>
-	// 头像大小
-	const avatarWidth = 45;
-
-	/**
-	 * ListChat 聊天列表
-	 * @description 聊天列表,用于创建聊天类列表
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=24
-	 * @property {String} 	title 							标题
-	 * @property {String} 	note 							描述
-	 * @property {Boolean} 	clickable = [true|false] 		是否开启点击反馈，默认为false
-	 * @property {String} 	badgeText						数字角标内容
-	 * @property {String}  	badgePositon = [left|right]		角标位置，默认为 right
-	 * @property {String} 	link = [false｜navigateTo|redirectTo|reLaunch|switchTab] 是否展示右侧箭头并开启点击反馈，默认为false
-	 *  @value false	 	不开启
-	 *  @value navigateTo 	同 uni.navigateTo()
-	 * 	@value redirectTo 	同 uni.redirectTo()
-	 * 	@value reLaunch   	同 uni.reLaunch()
-	 * 	@value switchTab  	同 uni.switchTab()
-	 * @property {String | PageURIString} 	to  			跳转目标页面
-	 * @property {String} 	time							右侧时间显示
-	 * @property {Boolean} 	avatarCircle = [true|false]		是否显示圆形头像，默认为false
-	 * @property {String} 	avatar							头像地址，avatarCircle 不填时生效
-	 * @property {Array} 	avatarList 						头像组，格式为 [{url:''}]
-	 * @event {Function} 	click 							点击 uniListChat 触发事件
-	 */
-	export default {
-		name: 'UniListChat',
-		props: {
-			title: {
-				type: String,
-				default: ''
-			},
-			note: {
-				type: String,
-				default: ''
-			},
-			clickable: {
-				type: Boolean,
-				default: false
-			},
-			link: {
-				type: [Boolean, String],
-				default: false
-			},
-			to: {
-				type: String,
-				default: ''
-			},
-			badgeText: {
-				type: [String, Number],
-				default: ''
-			},
-			badgePositon: {
-				type: String,
-				default: 'right'
-			},
-			time: {
-				type: String,
-				default: ''
-			},
-			avatarCircle: {
-				type: Boolean,
-				default: false
-			},
-			avatar: {
-				type: String,
-				default: ''
-			},
-			avatarList: {
-				type: Array,
-				default () {
-					return [];
-				}
-			}
-		},
-		// inject: ['list'],
-		computed: {
-			isSingle() {
-				if (this.badgeText === 'dot') {
-					return 'uni-badge--dot';
-				} else {
-					const badgeText = this.badgeText.toString();
-					if (badgeText.length > 1) {
-						return 'uni-badge--complex';
-					} else {
-						return 'uni-badge--single';
-					}
-				}
-			},
-			computedAvatar() {
-				if (this.avatarList.length > 4) {
-					this.imageWidth = avatarWidth * 0.31;
-					return 'avatarItem--3';
-				} else if (this.avatarList.length > 1) {
-					this.imageWidth = avatarWidth * 0.47;
-					return 'avatarItem--2';
-				} else {
-					this.imageWidth = avatarWidth;
-					return 'avatarItem--1';
-				}
-			}
-		},
-		data() {
-			return {
-				isFirstChild: false,
-				border: true,
-				// avatarList: 3,
-				imageWidth: 50
-			};
-		},
-		mounted() {
-			this.list = this.getForm()
-			if (this.list) {
-				if (!this.list.firstChildAppend) {
-					this.list.firstChildAppend = true;
-					this.isFirstChild = true;
-				}
-				this.border = this.list.border;
-			}
-		},
-		methods: {
-			/**
-			 * 获取父元素实例
-			 */
-			getForm(name = 'uniList') {
-				let parent = this.$parent;
-				let parentName = parent.$options.name;
-				while (parentName !== name) {
-					parent = parent.$parent;
-					if (!parent) return false
-					parentName = parent.$options.name;
-				}
-				return parent;
-			},
-			onClick() {
-				if (this.to !== '') {
-					this.openPage();
-					return;
-				}
-
-				if (this.clickable || this.link) {
-					this.$emit('click', {
-						data: {}
-					});
-				}
-			},
-			openPage() {
-				if (['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'].indexOf(this.link) !== -1) {
-					this.pageApi(this.link);
-				} else {
-					this.pageApi('navigateTo');
-				}
-			},
-			pageApi(api) {
-				uni[api]({
-					url: this.to,
-					success: res => {
-						this.$emit('click', {
-							data: res
-						});
-					},
-					fail: err => {
-						this.$emit('click', {
-							data: err
-						});
-						console.error(err.errMsg);
-					}
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	$background-color: #fff;
-	$divide-line-color: #e5e5e5;
-	$avatar-width: 45px;
-	$avatar-border-radius: 5px;
-	$avatar-border-color: #eee;
-	$avatar-border-width: 1px;
-	$title-size: 16px;
-	$title-color: #3b4144;
-	$title-weight: normal;
-	$note-size: 12px;
-	$note-color: #999;
-	$note-weight: normal;
-	$right-text-size: 12px;
-	$right-text-color: #999;
-	$right-text-weight: normal;
-	$badge-left: 0px;
-	$badge-top: 0px;
-	$dot-width: 10px;
-	$dot-height: 10px;
-	$badge-size: 18px;
-	$badge-font: 12px;
-	$badge-color: #fff;
-	$badge-background-color: #ff5a5f;
-	$badge-space: 6px;
-	$hover: #f5f5f5;
-
-	.uni-list-chat {
-		font-size: $uni-font-size-lg;
-		position: relative;
-		flex-direction: column;
-		justify-content: space-between;
-		background-color: $background-color;
-	}
-
-	// .uni-list-chat--disabled {
-	// 	opacity: 0.3;
-	// }
-
-	.uni-list-chat--hover {
-		background-color: $hover;
-	}
-
-	.uni-list--border {
-		position: relative;
-		margin-left: $uni-spacing-row-lg;
-		/* #ifdef APP-PLUS */
-		border-top-color: $divide-line-color;
-		border-top-style: solid;
-		border-top-width: 0.5px;
-		/* #endif */
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-list--border:after {
-		position: absolute;
-		top: 0;
-		right: 0;
-		left: 0;
-		height: 1px;
-		content: '';
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-		background-color: $divide-line-color;
-	}
-
-	.uni-list-item--first:after {
-		height: 0px;
-	}
-
-	/* #endif */
-
-	.uni-list-chat--first {
-		border-top-width: 0px;
-	}
-
-	.uni-ellipsis {
-		/* #ifndef APP-NVUE */
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		lines: 1;
-		/* #endif */
-	}
-
-	.uni-ellipsis-2 {
-		/* #ifndef APP-NVUE */
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		-webkit-box-orient: vertical;
-		/* #endif */
-
-		/* #ifdef APP-NVUE */
-		lines: 2;
-		/* #endif */
-	}
-
-	.uni-list-chat__container {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		flex: 1;
-		padding: $uni-spacing-row-base $uni-spacing-row-lg;
-		position: relative;
-		overflow: hidden;
-	}
-
-	.uni-list-chat__header-warp {
-		position: relative;
-	}
-
-	.uni-list-chat__header {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		align-content: center;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		flex-wrap: wrap-reverse;
-		/* #ifdef APP-NVUE */
-		width: 50px;
-		height: 50px;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		width: $avatar-width;
-		height: $avatar-width;
-		/* #endif */
-
-		border-radius: $avatar-border-radius;
-		border-color: $avatar-border-color;
-		border-width: $avatar-border-width;
-		border-style: solid;
-		overflow: hidden;
-	}
-
-	.uni-list-chat__header-box {
-		/* #ifndef APP-PLUS */
-		box-sizing: border-box;
-		display: flex;
-		width: $avatar-width;
-		height: $avatar-width;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		width: 50px;
-		height: 50px;
-		/* #endif */
-		overflow: hidden;
-		border-radius: 2px;
-	}
-
-	.uni-list-chat__header-image {
-		margin: 1px;
-		/* #ifdef APP-NVUE */
-		width: 50px;
-		height: 50px;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		width: $avatar-width;
-		height: $avatar-width;
-		/* #endif */
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-list-chat__header-image {
-		display: block;
-		width: 100%;
-		height: 100%;
-	}
-
-	.avatarItem--1 {
-		width: 100%;
-		height: 100%;
-	}
-
-	.avatarItem--2 {
-		width: 47%;
-		height: 47%;
-	}
-
-	.avatarItem--3 {
-		width: 32%;
-		height: 32%;
-	}
-
-	/* #endif */
-	.header--circle {
-		border-radius: 50%;
-	}
-
-	.uni-list-chat__content {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		flex: 1;
-		overflow: hidden;
-		padding: 2px 0;
-	}
-
-	.uni-list-chat__content-main {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: space-between;
-		padding-left: $uni-spacing-row-base;
-		flex: 1;
-		overflow: hidden;
-	}
-
-	.uni-list-chat__content-title {
-		font-size: $title-size;
-		color: $title-color;
-		font-weight: $title-weight;
-		overflow: hidden;
-	}
-
-	.uni-list-chat__content-note {
-		margin-top: 3px;
-		color: $note-color;
-		font-size: $note-size;
-		font-weight: $title-weight;
-		overflow: hidden;
-	}
-
-	.uni-list-chat__content-extra {
-		/* #ifndef APP-NVUE */
-		flex-shrink: 0;
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: space-between;
-		align-items: flex-end;
-		margin-left: 5px;
-	}
-
-	.uni-list-chat__content-extra-text {
-		color: $right-text-color;
-		font-size: $right-text-size;
-		font-weight: $right-text-weight;
-		overflow: hidden;
-	}
-
-	.uni-list-chat__badge-pos {
-		position: absolute;
-		/* #ifdef APP-NVUE */
-		left: 55px;
-		top: 3px;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		left: calc(#{$avatar-width} + 10px - #{$badge-space} + #{$badge-left});
-		top: calc(#{$uni-spacing-row-base}/ 2 + 1px + #{$badge-top});
-		/* #endif */
-	}
-
-	.uni-list-chat__badge {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-		border-radius: 100px;
-		background-color: $badge-background-color;
-	}
-
-	.uni-list-chat__badge-text {
-		color: $badge-color;
-		font-size: $badge-font;
-	}
-
-	.uni-badge--single {
-		/* #ifndef APP-NVUE */
-		// left: calc(#{$avatar-width} + 7px + #{$badge-left});
-		/* #endif */
-		width: $badge-size;
-		height: $badge-size;
-	}
-
-	.uni-badge--complex {
-		/* #ifdef APP-NVUE */
-		left: 50px;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		width: auto;
-		/* #endif */
-		height: $badge-size;
-		padding: 0 $badge-space;
-	}
-
-	.uni-badge--dot {
-		/* #ifdef APP-NVUE */
-		left: 60px;
-		top: 6px;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		left: calc(#{$avatar-width} + 15px - #{$dot-width}/ 2 + 1px + #{$badge-left});
-		/* #endif */
-		width: $dot-width;
-		height: $dot-height;
-		padding: 0;
-	}
-
-	.uni-list-chat--right {
-		/* #ifdef APP-NVUE */
-		left: 0;
-		/* #endif */
-	}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue b/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
deleted file mode 100644
index 7f1eced0..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
+++ /dev/null
@@ -1,440 +0,0 @@
-<template>
-	<!-- #ifdef APP-NVUE -->
-	<cell>
-		<!-- #endif -->
-
-		<view
-			:class="{ 'uni-list-item--disabled': disabled }"
-			:hover-class="(!clickable && !link) || disabled || showSwitch ? '' : 'uni-list-item--hover'"
-			class="uni-list-item"
-			@click.stop="onClick"
-		>
-			<view v-if="!isFirstChild" class="border--left" :class="{ 'uni-list--border': border }"></view>
-			<view class="uni-list-item__container" :class="{ 'container--right': showArrow || link, 'flex--direction': direction === 'column' }">
-				<slot name="header">
-					<view class="uni-list-item__header">
-						<view v-if="thumb" class="uni-list-item__icon"><image :src="thumb" class="uni-list-item__icon-img" :class="['uni-list--' + thumbSize]" /></view>
-						<view v-else-if="showExtraIcon" class="uni-list-item__icon"><uni-icons :color="extraIcon.color" :size="extraIcon.size" :type="extraIcon.type" /></view>
-					</view>
-				</slot>
-				<slot name="body">
-					<view class="uni-list-item__content" :class="{ 'uni-list-item__content--center': thumb || showExtraIcon || showBadge || showSwitch }">
-						<text v-if="title" class="uni-list-item__content-title" :class="[ellipsis !== 0 && ellipsis <= 2 ? 'uni-ellipsis-' + ellipsis : '']">{{ title }}</text>
-						<text v-if="note" class="uni-list-item__content-note">{{ note }}</text>
-					</view>
-				</slot>
-				<slot name="footer">
-					<view v-if="rightText || showBadge || showSwitch" class="uni-list-item__extra" :class="{ 'flex--justify': direction === 'column' }">
-						<text v-if="rightText" class="uni-list-item__extra-text">{{ rightText }}</text>
-						<uni-badge v-if="showBadge" :type="badgeType" :text="badgeText" />
-						<switch v-if="showSwitch" :disabled="disabled" :checked="switchChecked" @change="onSwitchChange" />
-					</view>
-				</slot>
-			</view>
-			<uni-icons v-if="showArrow || link" :size="16" class="uni-icon-wrapper" color="#bbb" type="arrowright" />
-		</view>
-		<!-- #ifdef APP-NVUE -->
-	</cell>
-	<!-- #endif -->
-</template>
-
-<script>
-
-
-/**
- * ListItem 列表子组件
- * @description 列表子组件
- * @tutorial https://ext.dcloud.net.cn/plugin?id=24
- * @property {String} 	title 							标题
- * @property {String} 	note 							描述
- * @property {String} 	thumb 							左侧缩略图，若thumb有值，则不会显示扩展图标
- * @property {String}  	thumbSize = [lg|base|sm]		略缩图大小
- * 	@value 	 lg			大图
- * 	@value 	 base		一般
- * 	@value 	 sm			小图
- * @property {String} 	badgeText						数字角标内容
- * @property {String} 	badgeType 						数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)
- * @property {String} 	rightText 						右侧文字内容
- * @property {Boolean} 	disabled = [true|false]			是否禁用
- * @property {Boolean} 	clickable = [true|false] 		是否开启点击反馈
- * @property {String} 	link = [navigateTo|redirectTo|reLaunch|switchTab] 是否展示右侧箭头并开启点击反馈
- *  @value 	navigateTo 	同 uni.navigateTo()
- * 	@value redirectTo 	同 uni.redirectTo()
- * 	@value reLaunch   	同 uni.reLaunch()
- * 	@value switchTab  	同 uni.switchTab()
- * @property {String | PageURIString} 	to  			跳转目标页面
- * @property {Boolean} 	showBadge = [true|false] 		是否显示数字角标
- * @property {Boolean} 	showSwitch = [true|false] 		是否显示Switch
- * @property {Boolean} 	switchChecked = [true|false] 	Switch是否被选中
- * @property {Boolean} 	showExtraIcon = [true|false] 	左侧是否显示扩展图标
- * @property {Object} 	extraIcon 						扩展图标参数，格式为 {color: '#4cd964',size: '22',type: 'spinner'}
- * @property {String} 	direction = [row|column]		排版方向
- * @value row 			水平排列
- * @value column 		垂直排列
- * @event {Function} 	click 							点击 uniListItem 触发事件
- * @event {Function} 	switchChange 					点击切换 Switch 时触发
- */
-export default {
-	name: 'UniListItem',
-	props: {
-		direction: {
-			type: String,
-			default: 'row'
-		},
-		title: {
-			type: String,
-			default: ''
-		},
-		note: {
-			type: String,
-			default: ''
-		},
-		ellipsis: {
-			type: [Number],
-			default: 0
-		},
-		disabled: {
-			type: [Boolean, String],
-			default: false
-		},
-		clickable: {
-			type: Boolean,
-			default: false
-		},
-		showArrow: {
-			type: [Boolean, String],
-			default: false
-		},
-		link: {
-			type: [Boolean, String],
-			default: false
-		},
-		to: {
-			type: String,
-			default: ''
-		},
-		showBadge: {
-			type: [Boolean, String],
-			default: false
-		},
-		showSwitch: {
-			type: [Boolean, String],
-			default: false
-		},
-		switchChecked: {
-			type: [Boolean, String],
-			default: false
-		},
-		badgeText: {
-			type: String,
-			default: ''
-		},
-		badgeType: {
-			type: String,
-			default: 'success'
-		},
-		rightText: {
-			type: String,
-			default: ''
-		},
-		thumb: {
-			type: String,
-			default: ''
-		},
-		thumbSize: {
-			type: String,
-			default: 'base'
-		},
-		showExtraIcon: {
-			type: [Boolean, String],
-			default: false
-		},
-		extraIcon: {
-			type: Object,
-			default() {
-				return {
-					type: 'contact',
-					color: '#000000',
-					size: 20
-				};
-			}
-		},
-		border: {
-			type: Boolean,
-			default: true
-		}
-	},
-	// inject: ['list'],
-	data() {
-		return {
-			isFirstChild: false
-		};
-	},
-	mounted() {
-		this.list = this.getForm()
-		// 判断是否存在 uni-list 组件
-		if(this.list){
-			if (!this.list.firstChildAppend) {
-				this.list.firstChildAppend = true;
-				this.isFirstChild = true;
-			}
-		}
-	},
-	methods: {
-		/**
-		 * 获取父元素实例
-		 */
-		getForm(name = 'uniList') {
-			let parent = this.$parent;
-			let parentName = parent.$options.name;
-			while (parentName !== name) {
-				parent = parent.$parent;
-				if (!parent) return false
-				parentName = parent.$options.name;
-			}
-			return parent;
-		},
-		onClick() {
-			if (this.to !== '') {
-				this.openPage();
-				return;
-			}
-			if (this.clickable || this.link) {
-				this.$emit('click', {
-					data: {}
-				});
-			}
-		},
-		onSwitchChange(e) {
-			this.$emit('switchChange', e.detail);
-		},
-		openPage() {
-			if (['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'].indexOf(this.link) !== -1) {
-				this.pageApi(this.link);
-			} else {
-				this.pageApi('navigateTo');
-			}
-		},
-		pageApi(api) {
-			uni[api]({
-				url: this.to,
-				success: res => {
-					this.$emit('click', {
-						data: res
-					});
-				},
-				fail: err => {
-					this.$emit('click', {
-						data: err
-					});
-					console.error(err.errMsg);
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-$list-item-pd: $uni-spacing-col-lg $uni-spacing-row-lg;
-
-.uni-list-item {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	font-size: $uni-font-size-lg;
-	position: relative;
-	justify-content: space-between;
-	align-items: center;
-	background-color: #fff;
-	flex-direction: row;
-	/* #ifdef H5 */
-	cursor: pointer;
-	/* #endif */
-}
-
-.uni-list-item--disabled {
-	opacity: 0.3;
-}
-
-.uni-list-item--hover {
-	background-color: $uni-bg-color-hover;
-}
-
-.uni-list-item__container {
-	position: relative;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	padding: $list-item-pd;
-	padding-left: $uni-spacing-row-lg;
-	flex: 1;
-	overflow: hidden;
-	// align-items: center;
-}
-
-.container--right {
-	padding-right: 0;
-}
-
-// .border--left {
-// 	margin-left: $uni-spacing-row-lg;
-// }
-
-.uni-list--border {
-	position: absolute;
-	top: 0;
-	right: 0;
-	left: 0;
-	/* #ifdef APP-NVUE */
-	border-top-color: $uni-border-color;
-	border-top-style: solid;
-	border-top-width: 0.5px;
-	/* #endif */
-}
-
-/* #ifndef APP-NVUE */
-.uni-list--border:after {
-	position: absolute;
-	top: 0;
-	right: 0;
-	left: 0;
-	height: 1px;
-	content: '';
-	-webkit-transform: scaleY(0.5);
-	transform: scaleY(0.5);
-	background-color: $uni-border-color;
-}
-
-/* #endif */
-
-.uni-list-item__content {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	padding-right: 8px;
-	flex: 1;
-	color: #3b4144;
-	// overflow: hidden;
-	flex-direction: column;
-	justify-content: space-between;
-	overflow: hidden;
-}
-
-.uni-list-item__content--center {
-	justify-content: center;
-}
-
-.uni-list-item__content-title {
-	font-size: $uni-font-size-base;
-	color: #3b4144;
-	overflow: hidden;
-}
-
-.uni-list-item__content-note {
-	margin-top: 6rpx;
-	color: $uni-text-color-grey;
-	font-size: $uni-font-size-sm;
-	overflow: hidden;
-}
-
-.uni-list-item__extra {
-	// width: 25%;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	justify-content: flex-end;
-	align-items: center;
-}
-
-.uni-list-item__header {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	align-items: center;
-}
-
-.uni-list-item__icon {
-	margin-right: 18rpx;
-	flex-direction: row;
-	justify-content: center;
-	align-items: center;
-}
-
-.uni-list-item__icon-img {
-	/* #ifndef APP-NVUE */
-	display: block;
-	/* #endif */
-	height: $uni-img-size-base;
-	width: $uni-img-size-base;
-	marin-right: 10px;
-}
-
-.uni-icon-wrapper {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	align-items: center;
-	padding: 0 10px;
-}
-
-.flex--direction {
-	flex-direction: column;
-	/* #ifndef APP-NVUE */
-	align-items: initial;
-	/* #endif */
-}
-
-.flex--justify {
-	/* #ifndef APP-NVUE */
-	justify-content: initial;
-	/* #endif */
-}
-
-.uni-list--lg {
-	height: $uni-img-size-lg;
-	width: $uni-img-size-lg;
-}
-
-.uni-list--base {
-	height: $uni-img-size-base;
-	width: $uni-img-size-base;
-}
-
-.uni-list--sm {
-	height: $uni-img-size-sm;
-	width: $uni-img-size-sm;
-}
-
-.uni-list-item__extra-text {
-	color: $uni-text-color-grey;
-	font-size: $uni-font-size-sm;
-}
-.uni-ellipsis-1 {
-	/* #ifndef APP-NVUE */
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	/* #endif */
-	/* #ifdef APP-NVUE */
-	lines: 1;
-	/* #endif */
-}
-
-.uni-ellipsis-2 {
-	/* #ifndef APP-NVUE */
-	overflow: hidden;
-	text-overflow: ellipsis;
-	display: -webkit-box;
-	-webkit-line-clamp: 2;
-	-webkit-box-orient: vertical;
-	/* #endif */
-
-	/* #ifdef APP-NVUE */
-	lines: 2;
-	/* #endif */
-}
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list/uni-list.vue b/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list/uni-list.vue
deleted file mode 100644
index fc611ef9..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list/uni-list.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-	<!-- #ifndef APP-NVUE -->
-	<view class="uni-list uni-border-top-bottom">
-		<view v-if="border" class="uni-list--border-top"></view>
-		<slot />
-		<view v-if="border" class="uni-list--border-bottom"></view>
-	</view>
-	<!-- #endif -->
-	<!-- #ifdef APP-NVUE -->
-	<list class="uni-list" :class="{ 'uni-list--border': border }" :enableBackToTop="enableBackToTop" loadmoreoffset="15"><slot /></list>
-	<!-- #endif -->
-</template>
-
-<script>
-/**
- * List 列表
- * @description 列表组件
- * @tutorial https://ext.dcloud.net.cn/plugin?id=24
- * @property {String} 	border = [true|false] 		标题
- */
-export default {
-	name: 'uniList',
-	'mp-weixin': {
-		options: {
-			multipleSlots: false
-		}
-	},
-	props: {
-		enableBackToTop: {
-			type: [Boolean, String],
-			default: false
-		},
-		scrollY: {
-			type: [Boolean, String],
-			default: false
-		},
-		border: {
-			type: Boolean,
-			default: true
-		}
-	},
-	// provide() {
-	// 	return {
-	// 		list: this
-	// 	};
-	// },
-	created() {
-		this.firstChildAppend = false;
-	},
-	methods: {
-		loadMore(e) {
-			this.$emit('scrolltolower');
-		}
-	}
-};
-</script>
-<style lang="scss">
-.uni-list {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	background-color: $uni-bg-color;
-	position: relative;
-	flex-direction: column;
-}
-
-.uni-list--border {
-	position: relative;
-	/* #ifdef APP-NVUE */
-	border-top-color: $uni-border-color;
-	border-top-style: solid;
-	border-top-width: 0.5px;
-	border-bottom-color: $uni-border-color;
-	border-bottom-style: solid;
-	border-bottom-width: 0.5px;
-	/* #endif */
-	z-index: -1;
-}
-
-/* #ifndef APP-NVUE */
-
-.uni-list--border-top {
-	position: absolute;
-	top: 0;
-	right: 0;
-	left: 0;
-	height: 1px;
-	-webkit-transform: scaleY(0.5);
-	transform: scaleY(0.5);
-	background-color: $uni-border-color;
-	z-index: 1;
-}
-
-.uni-list--border-bottom {
-	position: absolute;
-	bottom: 0;
-	right: 0;
-	left: 0;
-	height: 1px;
-	-webkit-transform: scaleY(0.5);
-	transform: scaleY(0.5);
-	background-color: $uni-border-color;
-}
-
-/* #endif */
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list/uni-refresh.vue b/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list/uni-refresh.vue
deleted file mode 100644
index 3b4c5a23..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list/uni-refresh.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<template>
-    <!-- #ifdef APP-NVUE -->
-    <refresh :display="display" @refresh="onrefresh" @pullingdown="onpullingdown">
-        <slot />
-    </refresh>
-    <!-- #endif -->
-    <!-- #ifndef APP-NVUE -->
-    <view ref="uni-refresh" class="uni-refresh" v-show="isShow">
-        <slot />
-    </view>
-    <!-- #endif -->
-</template>
-
-<script>
-    export default {
-        name: 'UniRefresh',
-        props: {
-            display: {
-                type: [String],
-                default: "hide"
-            }
-        },
-        data() {
-            return {
-                pulling: false
-            }
-        },
-        computed: {
-            isShow() {
-                if (this.display === "show" || this.pulling === true) {
-                    return true;
-                }
-                return false;
-            }
-        },
-        created() {},
-        methods: {
-            onchange(value) {
-                this.pulling = value;
-            },
-            onrefresh(e) {
-                this.$emit("refresh", e);
-            },
-            onpullingdown(e) {
-                // #ifdef APP-NVUE
-                this.$emit("pullingdown", e);
-                // #endif
-                // #ifndef APP-NVUE
-                var detail = {
-                    viewHeight: 90,
-                    pullingDistance: e.height
-                }
-                this.$emit("pullingdown", detail);
-                // #endif
-            }
-        }
-    }
-</script>
-
-<style>
-    .uni-refresh {
-        height: 0;
-        overflow: hidden;
-    }
-</style>
diff --git a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list/uni-refresh.wxs b/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
deleted file mode 100644
index 818a6b72..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
+++ /dev/null
@@ -1,87 +0,0 @@
-var pullDown = {
-    threshold: 95,
-    maxHeight: 200,
-    callRefresh: 'onrefresh',
-    callPullingDown: 'onpullingdown',
-    refreshSelector: '.uni-refresh'
-};
-
-function ready(newValue, oldValue, ownerInstance, instance) {
-    var state = instance.getState()
-    state.canPullDown = newValue;
-    // console.log(newValue);
-}
-
-function touchStart(e, instance) {
-    var state = instance.getState();
-    state.refreshInstance = instance.selectComponent(pullDown.refreshSelector);
-    state.canPullDown = (state.refreshInstance != null && state.refreshInstance != undefined);
-    if (!state.canPullDown) {
-        return
-    }
-
-    // console.log("touchStart");
-
-    state.height = 0;
-    state.touchStartY = e.touches[0].pageY || e.changedTouches[0].pageY;
-    state.refreshInstance.setStyle({
-        'height': 0
-    });
-    state.refreshInstance.callMethod("onchange", true);
-}
-
-function touchMove(e, ownerInstance) {
-    var instance = e.instance;
-    var state = instance.getState();
-    if (!state.canPullDown) {
-        return
-    }
-
-    var oldHeight = state.height;
-    var endY = e.touches[0].pageY || e.changedTouches[0].pageY;
-    var height = endY - state.touchStartY;
-    if (height > pullDown.maxHeight) {
-        return;
-    }
-
-    var refreshInstance = state.refreshInstance;
-    refreshInstance.setStyle({
-        'height': height + 'px'
-    });
-
-    height = height < pullDown.maxHeight ? height : pullDown.maxHeight;
-    state.height = height;
-    refreshInstance.callMethod(pullDown.callPullingDown, {
-        height: height
-    });
-}
-
-function touchEnd(e, ownerInstance) {
-    var state = e.instance.getState();
-    if (!state.canPullDown) {
-        return
-    }
-
-    state.refreshInstance.callMethod("onchange", false);
-
-    var refreshInstance = state.refreshInstance;
-    if (state.height > pullDown.threshold) {
-        refreshInstance.callMethod(pullDown.callRefresh);
-        return;
-    }
-
-    refreshInstance.setStyle({
-        'height': 0
-    });
-}
-
-function propObserver(newValue, oldValue, instance) {
-    pullDown = newValue;
-}
-
-module.exports = {
-    touchmove: touchMove,
-    touchstart: touchStart,
-    touchend: touchEnd,
-    propObserver: propObserver
-}
diff --git a/uni_modules/uni-feedback/uni_modules/uni-list/package.json b/uni_modules/uni-feedback/uni_modules/uni-list/package.json
deleted file mode 100644
index cb108b1f..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-list/package.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "id": "uni-list",
-  "displayName": "List 列表",
-  "version": "1.0.16",
-  "description": "List 组件 ，帮助使用者快速构建列表。",
-  "keywords": [
-    "",
-    "列表",
-    "uni-list",
-    "list"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [
-      "uni-badge",
-      "uni-icons"
-    ],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-list/readme.md b/uni_modules/uni-feedback/uni_modules/uni-list/readme.md
deleted file mode 100644
index 3dca899a..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-list/readme.md
+++ /dev/null
@@ -1,340 +0,0 @@
-
-
-## List 列表
-> 代码块： `uList`、`uListItem`
-> 关联组件：`uni-list-item`、`uni-badge`、`uni-icons`、`uni-list-chat`、`uni-list-ad`
-
-
-List 列表组件，包含基本列表样式、可扩展插槽机制、长列表性能优化、多端兼容。
-
-在vue页面里，它默认使用页面级滚动。在app-nvue页面里，它默认使用原生list组件滚动。这样的长列表，在滚动出屏幕外后，系统会回收不可见区域的渲染内存资源，不会造成滚动越长手机越卡的问题。
-
-uni-list组件是父容器，里面的核心是uni-list-item子组件，它代表列表中的一个可重复行，子组件可以无限循环。
-
-uni-list-item有很多风格，uni-list-item组件通过内置的属性，满足一些常用的场景。当内置属性不满足需求时，可以通过扩展插槽来自定义列表内容。
-
-内置属性可以覆盖的场景包括：导航列表、设置列表、小图标列表、通信录列表、聊天记录列表。
-
-涉及很多大图或丰富内容的列表，比如类今日头条的新闻列表、类淘宝的电商列表，需要通过扩展插槽实现。
-
-下文均有样例给出。
-
-uni-list不包含下拉刷新和上拉翻页。上拉翻页另见组件：[uni-load-more](https://ext.dcloud.net.cn/plugin?id=29)
-
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
-> - 组件需要依赖 `sass` 插件 ，请自行手动安装
-> - 组件内部依赖 `'uni-icons'` 、`uni-badge` 组件
-> - `uni-list` 和 `uni-list-item` 需要配套使用，暂不支持单独使用 `uni-list-item`
-> - 只有开启点击反馈后，会有点击选中效果
-> - 使用插槽时，可以完全自定义内容
-> - note 、rightText 属性暂时没做限制，不支持文字溢出隐藏，使用时应该控制长度显示或通过默认插槽自行扩展
-> - 支付宝小程序平台需要在支付宝小程序开发者工具里开启 component2 编译模式，开启方式： 详情 --> 项目配置 --> 启用 component2 编译
-> - 如果需要修改 `switch`、`badge` 样式，请使用插槽自定义
-> - 在 `HBuilderX` 低版本中，可能会出现组件显示 `undefined` 的问题，请升级最新的 `HBuilderX` 或者 `cli`
-> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
- 
-
-### 基本用法 
-
-- 设置 `title` 属性，可以显示列表标题
-- 设置 `disabled` 属性，可以禁用当前项
-
-```html
-<uni-list>
-	<uni-list-item  title="列表文字" ></uni-list-item>
-	<uni-list-item :disabled="true" title="列表禁用状态" ></uni-list-item>
-</uni-list>
-			 
-```
-
-### 多行内容显示
-
-- 设置 `note` 属性 ，可以在第二行显示描述文本信息
-
-```html
-<uni-list>
-	<uni-list-item title="列表文字" note="列表描述信息"></uni-list-item>
-	<uni-list-item :disabled="true" title="列表文字" note="列表禁用状态"></uni-list-item>
-</uni-list>
-
-```
-
-### 右侧显示角标、switch
-
-- 设置 `show-badge` 属性 ，可以显示角标内容
-- 设置 `show-switch` 属性，可以显示 switch 开关
-
-```html
-<uni-list>
-	<uni-list-item  title="列表右侧显示角标" :show-badge="true" badge-text="12" ></uni-list-item>
-	<uni-list-item title="列表右侧显示 switch"  :show-switch="true"  @switchChange="switchChange" ></uni-list-item>
-</uni-list>
-
-```
-
-### 左侧显示略缩图、图标  
-
-- 设置 `thumb` 属性 ，可以在列表左侧显示略缩图
-- 设置 `show-extra-icon` 属性，并指定 `extra-icon` 可以在左侧显示图标
-
-```html
- <uni-list>
- 	<uni-list-item title="列表左侧带略缩图" note="列表描述信息" thumb="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png"
- 	 thumb-size="lg" rightText="右侧文字"></uni-list-item>
- 	<uni-list-item :show-extra-icon="true" :extra-icon="extraIcon1" title="列表左侧带扩展图标" ></uni-list-item>
-</uni-list>
-```
-
-### 开启点击反馈和右侧箭头
-- 设置 `clickable` 为 `true` ，则表示这是一个可点击的列表，会默认给一个点击效果，并可以监听 `click` 事件
-- 设置 `link` 属性，会自动开启点击反馈，并给列表右侧添加一个箭头
-- 设置 `to` 属性，可以跳转页面，`link` 的值表示跳转方式，如果不指定，默认为 `navigateTo`
-
-```html
-
-<uni-list>
-	<uni-list-item title="开启点击反馈" clickable  @click="onClick" ></uni-list-item>
-	<uni-list-item title="默认 navigateTo 方式跳转页面" link to="/pages/vue/index/index" @click="onClick($event,1)" ></uni-list-item>
-	<uni-list-item title="reLaunch 方式跳转页面" link="reLaunch" to="/pages/vue/index/index" @click="onClick($event,1)" ></uni-list-item>
-</uni-list>
-
-```
-
-
-### 聊天列表示例
-- 设置 `clickable` 为 `true` ，则表示这是一个可点击的列表，会默认给一个点击效果，并可以监听 `click` 事件
-- 设置 `link` 属性，会自动开启点击反馈，`link` 的值表示跳转方式，如果不指定，默认为 `navigateTo`
-- 设置 `to` 属性，可以跳转页面
-- `time` 属性，通常会设置成时间显示，但是这个属性不仅仅可以设置时间，你可以传入任何文本，注意文本长度可能会影响显示
-- `avatar` 和 `avatarList` 属性同时只会有一个生效，同时设置的话，`avatarList` 属性的长度大于1 ，`avatar` 属性将失效
-- 可以通过默认插槽自定义列表右侧内容
-
-```html
-
-<uni-list>
-	<uni-list :border="true">
-		<!-- 显示圆形头像 -->
-		<uni-list-chat :avatar-circle="true" title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" ></uni-list-chat>
-		<!-- 右侧带角标 -->
-		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-text="12"></uni-list-chat>
-		<!-- 头像显示圆点 -->
-		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
-		<!-- 头像显示角标 -->
-		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="99"></uni-list-chat>
-		<!-- 显示多头像 -->
-		<uni-list-chat title="uni-app" :avatar-list="avatarList" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
-		<!-- 自定义右侧内容 -->
-		<uni-list-chat title="uni-app" :avatar-list="avatarList" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot">
-			<view class="chat-custom-right">
-				<text class="chat-custom-text">刚刚</text>
-				<!-- 需要使用 uni-icons 请自行引入 -->
-				<uni-icons type="star-filled" color="#999" size="18"></uni-icons>
-			</view>
-		</uni-list-chat>
-	</uni-list>
-</uni-list>
-
-```
-
-```javascript
-
-export default {
-	components: {},
-	data() {
-		return {
-			avatarList: [{
-				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
-			}, {
-				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
-			}, {
-				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
-			}]
-		}
-	}
-}
-
-```
-
-
-```css
-
-.chat-custom-right {
-	flex: 1;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: column;
-	justify-content: space-between;
-	align-items: flex-end;
-}
-
-.chat-custom-text {
-	font-size: 12px;
-	color: #999;
-}
-
-```
-
-## API
-
-### List Props
-
-属性名			|类型		|默认值		|	说明																									
-:-:				|:-:		|:-:		|	:-:	
-border			|Boolean	|true		|	是否显示边框
-
-
-### ListItem Props
-
-属性名			|类型		|默认值		|	说明																					
-:-:				|:-:		|:-:		|	:-:	
-title			|String		|-			|	标题
-note			|String		|-			|	描述
-ellipsis		|Number		|0			|	title 是否溢出隐藏，可选值，0:默认;  1:显示一行;	2:显示两行;【nvue 暂不支持】
-thumb			|String		|-			|	左侧缩略图，若thumb有值，则不会显示扩展图标
-thumbSize		|String 	|medium 	|	略缩图尺寸，可选值，lg:大图;  medium:一般;	sm:小图;
-showBadge		|Boolean	|false		|	是否显示数字角标	
-badgeText		|String		|-			|	数字角标内容
-badgeType		|String		|-			|	数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)					
-rightText		|String		|-			|	右侧文字内容
-disabled		|Boolean	|false		|	是否禁用	
-showArrow 		|Boolean	|true		|	是否显示箭头图标			
-link			|String 	|navigateTo	|	新页面跳转方式，可选值见下表
-to				|String		|-			|	新页面跳转地址，如填写此属性，click 会返回页面是否跳转成功			
-clickable		|Boolean	|false		|	是否开启点击反馈
-showSwitch	    |Boolean	|false		|	是否显示Switch																			
-switchChecked	|Boolean	|false		|	Switch是否被选中																			
-showExtraIcon   |Boolean	|false		|	左侧是否显示扩展图标																		
-extraIcon		|Object		|-			|	扩展图标参数，格式为 ``{color: '#4cd964',size: '22',type: 'spinner'}``，参考 [uni-icons](https://ext.dcloud.net.cn/plugin?id=28)	
-direction		| String	|row		|	排版方向，可选值，row:水平排列;  column:垂直排列; 3个插槽是水平排还是垂直排，也受此属性控制
-
-
-#### Link Options
-
-属性名				|	说明
-:-:					|	:-:
-navigateTo 	| 	同 uni.navigateTo()
-redirectTo 	|	同 uni.reLaunch()
-reLaunch		|	同 uni.reLaunch()
-switchTab  	|	同 uni.switchTab()
-
-### ListItem Events
-
-事件称名			|说明									|返回参数			
-:-:				|:-:									|:-:				
-click			|点击 uniListItem 触发事件，需开启点击反馈	|-					
-switchChange	|点击切换 Switch 时触发，需显示 switch		|e={value:checked}	
-
-
-
-### ListItem Slots
-
-名称	 	|	说明					
-:-:		|	:-:						
-header	|	左/上内容插槽，可完全自定义默认显示
-body	|	中间内容插槽，可完全自定义中间内容				
-footer	|	右/下内容插槽，可完全自定义右侧内容		
-
-
-> 需要注意的是当使用插槽时，内置样式将会失效，只保留排版样式，此时的样式需要开发者自己实现
-> 如果	`uni-list-item` 组件内置属性样式无法满足需求，可以使用插槽来自定义uni-list-item里的内容。
-> uni-list-item提供了3个可扩展的插槽：`header`、`body`、`footer`
-> - 当 `direction` 属性为 `row` 时表示水平排列，此时 `header` 表示列表的左边部分，`body` 表示列表的中间部分，`footer` 表示列表的右边部分
-> - 当 `direction` 属性为 `column` 时表示垂直排列，此时 `header` 表示列表的上边部分，`body` 表示列表的中间部分，`footer` 表示列表的下边部分
-> 开发者可以只用1个插槽，也可以3个一起使用。在插槽中可自主编写view标签，实现自己所需的效果。
-
-	
-**示例**
-
-```html
-<uni-list>
-	<uni-list-item title="自定义右侧插槽" note="列表描述信息" link>
-		<template slot="header">
-			<image class="slot-image" src="/static/logo.png" mode="widthFix"></image>
-		</template>
-	</uni-list-item>
-	<uni-list-item>
-		<!-- 自定义 header -->
-		<view slot="header" class="slot-box"><image class="slot-image" src="/static/logo.png" mode="widthFix"></image></view>
-		<!-- 自定义 body -->
-		<text slot="body" class="slot-box slot-text">自定义插槽</text>
-		<!-- 自定义 footer-->
-		<template slot="footer">
-			<image class="slot-image" src="/static/logo.png" mode="widthFix"></image>
-		</template>
-	</uni-list-item>
-</uni-list>
-```
-
-
-
-
-
-### ListItemChat Props
-
-属性名			|类型		|默认值		|	说明																		
-:-:				|:-:		|:-:		|	:-:	
-title 			|String		|-			|	标题
-note 			|String		|-			|	描述
-clickable		|Boolean	|false		|	是否开启点击反馈
-badgeText		|String		|-			|	数字角标内容，设置为 `dot` 将显示圆点
-badgePositon 	|String		|right		|	角标位置
-link			|String 	|navigateTo	|	是否展示右侧箭头并开启点击反馈，可选值见下表
-clickable		|Boolean	|false		|	是否开启点击反馈
-to				|String		|-			|	跳转页面地址，如填写此属性，click 会返回页面是否跳转成功	
-time			|String 	|-			|	右侧时间显示
-avatarCircle 	|Boolean 	|false		|	是否显示圆形头像
-avatar			|String 	|-			|	头像地址，avatarCircle 不填时生效
-avatarList 		|Array	 	|-			|	头像组，格式为 [{url:''}]
-
-#### Link Options
-
-属性名		|	说明
-:-:			|	:-:
-navigateTo 	| 	同 uni.navigateTo()
-redirectTo 	|	同 uni.reLaunch()
-reLaunch	|	同 uni.reLaunch()
-switchTab  	|	同 uni.switchTab()
-
-### ListItemChat Slots
-
-名称	 	|	说明					
-:-		|	:-						
-default	|	自定义列表右侧内容（包括时间和角标显示）
-
-### ListItemChat Events
-事件称名			|	说明						|	返回参数			
-:-:				|	:-:						|	:-:	
-@click			|	点击 uniListChat 触发事件	|	{data:{}}	，如有 to 属性，会返回页面跳转信息	
-
-
-
-
-
-
-## 基于uni-list扩展的页面模板
-
-通过扩展插槽，可实现多种常见样式的列表
-
-**新闻列表类**
-
-1. 云端一体混合布局：[https://ext.dcloud.net.cn/plugin?id=2546](https://ext.dcloud.net.cn/plugin?id=2546)
-2. 云端一体垂直布局，大图模式：[https://ext.dcloud.net.cn/plugin?id=2583](https://ext.dcloud.net.cn/plugin?id=2583)
-3. 云端一体垂直布局，多行图文混排：[https://ext.dcloud.net.cn/plugin?id=2584](https://ext.dcloud.net.cn/plugin?id=2584)
-4. 云端一体垂直布局，多图模式：[https://ext.dcloud.net.cn/plugin?id=2585](https://ext.dcloud.net.cn/plugin?id=2585)
-5. 云端一体水平布局，左图右文：[https://ext.dcloud.net.cn/plugin?id=2586](https://ext.dcloud.net.cn/plugin?id=2586)
-6. 云端一体水平布局，左文右图：[https://ext.dcloud.net.cn/plugin?id=2587](https://ext.dcloud.net.cn/plugin?id=2587)
-7. 云端一体垂直布局，无图模式，主标题+副标题：[https://ext.dcloud.net.cn/plugin?id=2588](https://ext.dcloud.net.cn/plugin?id=2588)
-
-**商品列表类**
-
-1. 云端一体列表/宫格视图互切：[https://ext.dcloud.net.cn/plugin?id=2651](https://ext.dcloud.net.cn/plugin?id=2651)
-2. 云端一体列表（宫格模式）：[https://ext.dcloud.net.cn/plugin?id=2671](https://ext.dcloud.net.cn/plugin?id=2671)
-3. 云端一体列表（列表模式）：[https://ext.dcloud.net.cn/plugin?id=2672](https://ext.dcloud.net.cn/plugin?id=2672)
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-load-more/changelog.md b/uni_modules/uni-feedback/uni_modules/uni-load-more/changelog.md
deleted file mode 100644
index 7ed3afeb..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-load-more/changelog.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## 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-feedback/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue b/uni_modules/uni-feedback/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
deleted file mode 100644
index 6e6f4263..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
+++ /dev/null
@@ -1,362 +0,0 @@
-<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 :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
-			<view :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
-			<view :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
-		</view>
-		<!-- #endif -->
-		<!-- #ifndef APP-NVUE -->
-		<view v-else-if="!webviewHide && status === 'loading' && showIcon" :style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--ios-H5">
-			<image src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzlBMzU3OTlEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzlBMzU3OUFEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDOUEzNTc5N0Q5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDOUEzNTc5OEQ5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt+ALSwAAA6CSURBVHja1FsLkFZV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"
-						 mode="widthFix"></image>
-		</view>
-		<!-- #endif -->
-		<text class="uni-load-more__text" :style="{color: color}">{{ status === 'more' ? contentText.contentdown : status === 'loading' ? contentText.contentrefresh : contentText.contentnomore }}</text>
-	</view>
-</template>
-
-<script>
-	let platform
-	setTimeout(() => {
-			platform = uni.getSystemInfoSync().platform
-	}, 16)
-
-	/**
-	 * 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',
-		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: '没有更多数据了'
-					}
-				}
-			}
-		},
-		data() {
-			return {
-                webviewHide: false,
-				platform: platform
-			}
-		},
-		// #ifndef APP-NVUE
-		computed:{
-			iconSnowWidth(){
-				return (Math.floor(this.iconSize/24)||1)*2
-			}
-		},
-		// #endif
-		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" scoped>
-
-	.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: 15px;
-	}
-
-	.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>view {
-		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>view:nth-child(1){
-		animation: loading-android-MP-1 1s 0s linear infinite;
-	}
-
-	.uni-load-more__img--android-MP>view:nth-child(2){
-		animation: loading-android-MP-2 1s 0s linear infinite;
-	}
-
-	.uni-load-more__img--android-MP>view: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-feedback/uni_modules/uni-load-more/package.json b/uni_modules/uni-feedback/uni_modules/uni-load-more/package.json
deleted file mode 100644
index 492ee795..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-load-more/package.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "id": "uni-load-more",
-  "displayName": "LoadMore 加载更多",
-  "version": "1.1.7",
-  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
-  "keywords": [
-    "loadmore",
-    "uni-ui",
-    "加载更多",
-    "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": [],
-    "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"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/uni-feedback/uni_modules/uni-load-more/readme.md b/uni_modules/uni-feedback/uni_modules/uni-load-more/readme.md
deleted file mode 100644
index af17c9ab..00000000
--- a/uni_modules/uni-feedback/uni_modules/uni-load-more/readme.md
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-### LoadMore 加载更多
-> **组件名：uni-load-more**
-> 代码块： `uLoadMore`
-
-
-用于列表中，做滚动加载使用，展示 loading 的各种状态。
-
-### 安装方式
-
-本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
-
-如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
-
-### 使用方式
-
-在 ``template`` 中使用组件
-
-```html
-<uni-load-more :status="more"></uni-load-more>
-```
-
-## API
-
-### LoadMore Props
-
-|属性名			|类型		|	可选值											|默认值	|说明	|
-|:-:				|:-:		|:-:												|:-:		|:-:														|
-|iconSize		|Number	|-													|24			|指定图标大小			|
-|status			|String	|more/loading/noMore				|more		|loading 的状态		|
-|showIcon		|Boolean|-													|true		|是否显示 loading 图标				|
-|iconType		|String	|snow/circle/auto						|auto		|指定图标样式|
-|color			|String	|-													|#777777	|图标和文字颜色		|
-|contentText|Object|-	|{contentdown: "上拉显示更多",contentrefresh: "正在加载...",contentnomore: "没有更多数据了"}|各状态文字说明	|
-
-
-#### Status Options
-|参数名称	|说明				|
-|:-:		|:-:				|
-|more		|loading前		|
-|loading|loading前中	|
-|more		|没有更多数据	|
-
-#### IconType Options
-|参数名称	|说明									|
-|:-:		|:-:									|
-|snow		|ios雪花加载样式				|
-|circle	|安卓环形加载样式				|
-|auto		|根据平台自动选择加载样式	|
-
-
-
-
-> **说明**
-> `iconType`为`snow`时，在`APP-NVUE`平台不可设置大小，在非`APP-NVUE`平台不可设置颜色
-
-
-
-### 事件说明
-
-|事件名					|说明				|返回值						|
-|:-:						|:-:				|:-:						|
-|clickLoadMore	|点击加载更多时触发	|e.detail={status:'loading'}|
-
diff --git a/uni_modules/uni-file-picker/changelog.md b/uni_modules/uni-file-picker/changelog.md
index 758e9c20..31a66036 100644
--- a/uni_modules/uni-file-picker/changelog.md
+++ b/uni_modules/uni-file-picker/changelog.md
@@ -1,5 +1,7 @@
-## 0.2.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.2.1（2021-07-26）
+- 修复 vue3下双向绑定失效的Bug
+## 0.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 0.1.1（2021-07-02）
 - 修复 sourceType 缺少默认值导致 ios 无法选择文件
 ## 0.1.0（2021-06-30）
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js b/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js
index 502f0477..4efc5f54 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js
@@ -5,7 +5,7 @@
 const ERR_MSG_OK = 'chooseAndUploadFile:ok';
 const ERR_MSG_FAIL = 'chooseAndUploadFile:fail';
 function chooseImage(opts) {
-		const { count, sizeType, sourceType = ['album', 'camera'], extension } = opts
+		const { count, sizeType = ['original','compressed'], sourceType = ['album', 'camera'], extension } = opts
     return new Promise((resolve, reject) => {
         uni.chooseImage({
             count,
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
index edbbc851..e60ecec0 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
@@ -3,7 +3,7 @@
 		<view v-if="title" class="uni-file-picker__header">
 			<text class="file-title">{{ title }}</text>
 			<text class="file-count">{{ filesList.length }}/{{ limitLength }}</text>
-		</view>
+		</view>
 		<upload-image
 			v-if="fileMediatype === 'image' && showType === 'grid'"
 			:readonly="readonly"
@@ -190,7 +190,7 @@ export default {
 	},
 	watch: {
 		value: {
-			handler(newVal) {
+			handler(newVal) {
 				this.setValue(newVal)
 			},
 			immediate: true
@@ -243,7 +243,7 @@ export default {
 			return []
 		}
 	},
-	created() {
+	created() {
 		// TODO 兼容不开通服务空间的情况
 		if(!(uniCloud.config && uniCloud.config.provider)){
 			this.noSpace = true
@@ -251,13 +251,13 @@ export default {
 		}
 		this.tempData = {}
 		this.form = this.getForm('uniForms')
-		this.formItem = this.getForm('uniFormsItem')
+		this.formItem = this.getForm('uniFormsItem')
 		if (this.form && this.formItem) {
 			if (this.formItem.name) {
 				this.rename = this.formItem.name
 				this.form.inputChildrens.push(this)
 			}
-		}
+		}
 	},
 	methods: {
 		setValue(newVal){
@@ -281,7 +281,7 @@ export default {
 				data = this.backObject(newFils)
 			}
 			this.formItem && this.formItem.setValue(data)
-			this.files = newFils
+			if(newFils.length) 			this.files = newFils
 		},
 		/**
 		 * 获取父元素实例
diff --git a/uni_modules/uni-file-picker/package.json b/uni_modules/uni-file-picker/package.json
index e7a7247b..060c5842 100644
--- a/uni_modules/uni-file-picker/package.json
+++ b/uni_modules/uni-file-picker/package.json
@@ -1,82 +1,81 @@
 {
-  "id": "uni-file-picker",
-  "displayName": "uni-file-picker 文件选择上传",
-  "version": "0.2.0",
-  "description": "文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "图片上传",
-    "文件上传"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
+	"id": "uni-file-picker",
+	"displayName": "uni-file-picker 文件选择上传",
+	"version": "0.2.1",
+	"description": "文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间",
+	"keywords": [
+        "uni-ui",
+        "图片上传",
+        "上传"
     ],
-    "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": "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"
-        }
-      }
-    }
-  }
-}
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+	"dcloudext": {
+		"category": [
+			"前端组件",
+			"通用组件"
+		],
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+		"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+	},
+	"uni_modules": {
+		"dependencies": [],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "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"
+				}
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-file-picker/readme.md b/uni_modules/uni-file-picker/readme.md
index 21b7ab55..fb449803 100644
--- a/uni_modules/uni-file-picker/readme.md
+++ b/uni_modules/uni-file-picker/readme.md
@@ -152,7 +152,7 @@ export default {
 			// 获取上传状态
 			select(e){
 				console.log('选择文件：',e)
-			}
+			},
 			// 获取上传进度
 			progress(e){
 				console.log('上传进度：',e)
diff --git a/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/package-lock.json b/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/package-lock.json
index 83ab46e5..542ae6b9 100644
--- a/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/package-lock.json
+++ b/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/package-lock.json
@@ -13,7 +13,6 @@
 		"uni-id": {
 			"version": "file:../../../../uni-id/uniCloud/cloudfunctions/common/uni-id",
 			"requires": {
-				"uni-captcha": "file:../../../../uni-captcha/uniCloud/cloudfunctions/common/uni-captcha",
 				"uni-config-center": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
 			},
 			"dependencies": {
diff --git a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package-lock.json b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package-lock.json
index ce629556..3b394938 100644
--- a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package-lock.json
+++ b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package-lock.json
@@ -1,25 +1,8 @@
 {
 	"name": "uni-id",
 	"version": "3.1.0",
-	"lockfileVersion": 2,
+	"lockfileVersion": 1,
 	"requires": true,
-	"packages": {
-		"": {
-			"version": "3.1.0",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
-			}
-		},
-		"../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center": {
-			"version": "0.0.2",
-			"license": "Apache-2.0"
-		},
-		"node_modules/uni-config-center": {
-			"resolved": "../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
-			"link": true
-		}
-	},
 	"dependencies": {
 		"uni-config-center": {
 			"version": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
-- 
GitLab