1 bulan lalu · a65433e840
--- a/App.vue
+++ b/App.vue
@@ -0,0 +1,39 @@
 
				+<script>
			
 
				+	export default {
			
 
				+		onLaunch: function() {
			
 
				+			console.log('App Launch')
			
 
				+		},
			
 
				+		onShow: function() {
			
 
				+			console.log('App Show')
			
 
				+		},
			
 
				+		onHide: function() {
			
 
				+			console.log('App Hide')
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+
			
 
				+<style>
			
 
				+	@font-face {
			
 
				+	  font-family: "阿里妈妈数黑体 Bold";font-weight: 700;src: url("//at.alicdn.com/wf/webfont/XTsgMlj9pFv4/4xmVnd17Qd56.woff2") format("woff2"),
			
 
				+	  url("//at.alicdn.com/wf/webfont/XTsgMlj9pFv4/u8DVI7cHBMJC.woff") format("woff");
			
 
				+	  font-display: swap;
			
 
				+	}
			
 
				+	page {
			
 
				+		height: auto;
			
 
				+	}
			
 
				+	/*每个页面公共css */
			
 
				+	.logo {
			
 
				+		background-image: linear-gradient(rgba(54, 130, 234, 0.3), #fff);
			
 
				+		width: 100%;
			
 
				+		/* height: 500rpx; */
			
 
				+		display: flex;
			
 
				+		justify-content: center;
			
 
				+		padding-top: 90rpx;
			
 
				+		padding-bottom: 90rpx;
			
 
				+	
			
 
				+		image {
			
 
				+			width: 200rpx;
			
 
				+			height: 264rpx;
			
 
				+		}
			
 
				+	}
			
 
				+</style>
			
--- a/api/h5.js
+++ b/api/h5.js
@@ -0,0 +1,26 @@
 
				+import { baseRequest } from "./request.js";
			
 
				+
			
 
				+// 手机号码是否注册
			
 
				+export const mobilephoneRegister = (data, type) => {
			
 
				+	return baseRequest("/v1/user/mobilephone-test", 'post', data, type)
			
 
				+}
			
 
				+// 发送验证码
			
 
				+export const sendSmsCode = (data, type) => {
			
 
				+	return baseRequest("/v1/user/send-verify-code", 'post', data, type)
			
 
				+}
			
 
				+// 省份列表
			
 
				+export const provincesList = (data, type) => {
			
 
				+	return baseRequest("/v1/user/list-provinces", 'post', data, type)
			
 
				+}
			
 
				+// 验证码验证
			
 
				+export const verifyCode = (data, type) => {
			
 
				+	return baseRequest("/v1/user/verify-code", 'post', data, type)
			
 
				+}
			
 
				+// 设置用户推荐人
			
 
				+export const prefUser = (data, type) => {
			
 
				+	return baseRequest("/v1/user/pref-user", 'post', data, type)
			
 
				+}
			
 
				+// 注册
			
 
				+export const registerUser = (data, type) => {
			
 
				+	return baseRequest("/v1/user/register", 'post', data, type)
			
 
				+}
			
--- a/api/request.js
+++ b/api/request.js
@@ -0,0 +1,66 @@
 
				+import { DEV_BASE_URL, BASE_URL } from '@/config'
			
 
				+
			
 
				+const baseRequest = async (url, method, data = {}, type = 1) => {
			
 
				+	const header = {
			
 
				+		'content-type': 'application/json',
			
 
				+	}
			
 
				+	return new Promise((reslove, reject) => {
			
 
				+		uni.showLoading({
			
 
				+			title: '',
			
 
				+			mask: true
			
 
				+		})
			
 
				+		const baseUrl = type == 1 ? DEV_BASE_URL : BASE_URL
			
 
				+		uni.request({
			
 
				+			url: baseUrl + url,
			
 
				+			method: method || 'GET',
			
 
				+			header,
			
 
				+			timeout: 10000,
			
 
				+			data: data || {},
			
 
				+			success: (successData) => {
			
 
				+				uni.hideLoading();
			
 
				+				const res = successData.data
			
 
				+				if (successData.statusCode == 200) {
			
 
				+					// 业务逻辑，自行修改
			
 
				+					if (res.code === 499) {
			
 
				+						setTimeout(() => {
			
 
				+							uni.clearStorageSync();
			
 
				+							uni.reLaunch({
			
 
				+								url: '/pages/index/index'
			
 
				+							})
			
 
				+						}, 1500)
			
 
				+					} else if (res.code === 200 || res.code === 0 || res.status === 200) {
			
 
				+						reslove(res)
			
 
				+					} else {
			
 
				+						uni.showToast({
			
 
				+							title: res.message,
			
 
				+							icon: 'none'
			
 
				+						})
			
 
				+						reject(res)
			
 
				+					}
			
 
				+				} else {
			
 
				+					uni.showToast({
			
 
				+						title: res.message || '网络连接失败，请稍后重试',
			
 
				+						icon: 'none'
			
 
				+					})
			
 
				+					reject(res)
			
 
				+				}
			
 
				+			},
			
 
				+			fail: (msg) => {
			
 
				+				uni.hideLoading();
			
 
				+				uni.showToast({
			
 
				+					title: res.message || '网络连接失败，请稍后重试',
			
 
				+					icon: 'none'
			
 
				+				})
			
 
				+				reject(message)
			
 
				+			},
			
 
				+			complete() {
			
 
				+
			
 
				+			}
			
 
				+		})
			
 
				+	})
			
 
				+}
			
 
				+
			
 
				+
			
 
				+export {
			
 
				+	baseRequest
			
 
				+}
			
--- a/config/index.js
+++ b/config/index.js
@@ -0,0 +1,6 @@
 
				+// export const DEV_BASE_URL  = 'https://api.dlxgk.com'
			
 
				+// export const BASE_URL  = 'https://api.dlxgk.com'
			
 
				+export const DEV_BASE_URL  = 'https://education-manage-backend.lastbs.com'
			
 
				+export const BASE_URL  = 'https://education-manage-backend.lastbs.com'
			
 
				+
			
 
				+
			
--- a/index.html
+++ b/index.html
@@ -0,0 +1,20 @@
 
				+<!DOCTYPE html>
			
 
				+<html lang="en">
			
 
				+  <head>
			
 
				+    <meta charset="UTF-8" />
			
 
				+    <script>
			
 
				+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
			
 
				+        CSS.supports('top: constant(a)'))
			
 
				+      document.write(
			
 
				+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
			
 
				+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
			
 
				+    </script>
			
 
				+    <title></title>
			
 
				+    <!--preload-links-->
			
 
				+    <!--app-context-->
			
 
				+  </head>
			
 
				+  <body>
			
 
				+    <div id="app"><!--app-html--></div>
			
 
				+    <script type="module" src="/main.js"></script>
			
 
				+  </body>
			
 
				+</html>
			
--- a/main.js
+++ b/main.js
@@ -0,0 +1,22 @@
 
				+import App from './App'
			
 
				+
			
 
				+// #ifndef VUE3
			
 
				+import Vue from 'vue'
			
 
				+import './uni.promisify.adaptor'
			
 
				+Vue.config.productionTip = false
			
 
				+App.mpType = 'app'
			
 
				+const app = new Vue({
			
 
				+  ...App
			
 
				+})
			
 
				+app.$mount()
			
 
				+// #endif
			
 
				+
			
 
				+// #ifdef VUE3
			
 
				+import { createSSRApp } from 'vue'
			
 
				+export function createApp() {
			
 
				+  const app = createSSRApp(App)
			
 
				+  return {
			
 
				+    app
			
 
				+  }
			
 
				+}
			
 
				+// #endif
			
--- a/manifest.json
+++ b/manifest.json
@@ -0,0 +1,77 @@
 
				+{
			
 
				+    "name" : "dlx-app",
			
 
				+    "appid" : "__UNI__5D58372",
			
 
				+    "description" : "",
			
 
				+    "versionName" : "1.0.0",
			
 
				+    "versionCode" : "100",
			
 
				+    "transformPx" : false,
			
 
				+    /* 5+App特有相关 */
			
 
				+    "app-plus" : {
			
 
				+        "usingComponents" : true,
			
 
				+        "nvueStyleCompiler" : "uni-app",
			
 
				+        "compilerVersion" : 3,
			
 
				+        "splashscreen" : {
			
 
				+            "alwaysShowBeforeRender" : true,
			
 
				+            "waiting" : true,
			
 
				+            "autoclose" : true,
			
 
				+            "delay" : 0
			
 
				+        },
			
 
				+        /* 模块配置 */
			
 
				+        "modules" : {},
			
 
				+        /* 应用发布信息 */
			
 
				+        "distribute" : {
			
 
				+            /* android打包配置 */
			
 
				+            "android" : {
			
 
				+                "permissions" : [
			
 
				+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
			
 
				+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
			
 
				+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
			
 
				+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
			
 
				+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
			
 
				+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
			
 
				+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
			
 
				+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
			
 
				+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
			
 
				+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
			
 
				+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
			
 
				+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
			
 
				+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
			
 
				+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
			
 
				+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
			
 
				+                ]
			
 
				+            },
			
 
				+            /* ios打包配置 */
			
 
				+            "ios" : {},
			
 
				+            /* SDK配置 */
			
 
				+            "sdkConfigs" : {}
			
 
				+        }
			
 
				+    },
			
 
				+    /* 快应用特有相关 */
			
 
				+    "quickapp" : {},
			
 
				+    /* 小程序特有相关 */
			
 
				+    "mp-weixin" : {
			
 
				+        "appid" : "",
			
 
				+        "setting" : {
			
 
				+            "urlCheck" : false
			
 
				+        },
			
 
				+        "usingComponents" : true
			
 
				+    },
			
 
				+    "mp-alipay" : {
			
 
				+        "usingComponents" : true
			
 
				+    },
			
 
				+    "mp-baidu" : {
			
 
				+        "usingComponents" : true
			
 
				+    },
			
 
				+    "mp-toutiao" : {
			
 
				+        "usingComponents" : true
			
 
				+    },
			
 
				+    "uniStatistics" : {
			
 
				+        "enable" : false
			
 
				+    },
			
 
				+    "vueVersion" : "3",
			
 
				+    "h5" : {
			
 
				+        "router" : {
			
 
				+            "base" : ""
			
 
				+        }
			
 
				+    }
			
 
				+}
			
--- a/pages.json
+++ b/pages.json
@@ -0,0 +1,41 @@
 
				+{
			
 
				+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
			
 
				+		{
			
 
				+			"path": "pages/index/index",
			
 
				+			"style": {
			
 
				+				"navigationBarTitleText": "德立信志愿",
			
 
				+				"navigationStyle": "custom"
			
 
				+			}
			
 
				+		}, {
			
 
				+			"path": "pages/result/result",
			
 
				+			"style": {
			
 
				+				"navigationBarTitleText": "德立信志愿",
			
 
				+				"navigationStyle": "custom",
			
 
				+				"enablePullDownRefresh": false
			
 
				+			}
			
 
				+		}, {
			
 
				+			"path": "pages/register/register",
			
 
				+			"style": {
			
 
				+				"navigationBarTitleText": "德立信志愿",
			
 
				+				"navigationStyle": "custom",
			
 
				+				"enablePullDownRefresh": false
			
 
				+			}
			
 
				+		},
			
 
				+		{
			
 
				+			"path": "pages/password/password",
			
 
				+			"style": {
			
 
				+				"navigationBarTitleText": "德立信志愿",
			
 
				+				"navigationStyle": "custom",
			
 
				+				"enablePullDownRefresh": false
			
 
				+			}
			
 
				+
			
 
				+		}
			
 
				+	],
			
 
				+	"globalStyle": {
			
 
				+		"navigationBarTextStyle": "black",
			
 
				+		"navigationBarTitleText": "德立信",
			
 
				+		"navigationBarBackgroundColor": "#F8F8F8",
			
 
				+		"backgroundColor": "#F8F8F8"
			
 
				+	},
			
 
				+	"uniIdRouter": {}
			
 
				+}
			
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -0,0 +1,222 @@
 
				+<template>
			
 
				+	<view>
			
 
				+		<view class="logo">
			
 
				+			<image src="../../static/logo.png" mode="aspectFit"></image>
			
 
				+		</view>
			
 
				+		<view class="form">
			
 
				+			<uni-forms ref="form" :modelValue="formData" :rules="rules" :label-width="0">
			
 
				+				<uni-forms-item name="mobilePhone">
			
 
				+					<uni-easyinput type="number" maxlength="11" :clearable="false" v-model="formData.mobilePhone" placeholder="请输入手机号" />
			
 
				+				</uni-forms-item>
			
 
				+				<uni-forms-item name="code">
			
 
				+					<view class="form-code">
			
 
				+						<uni-easyinput type="number" :clearable="false" v-model="formData.code" placeholder="请输入验证码" />
			
 
				+						<view class="code" :class="{'code-disabled': isCanGetCode}" @click="getCode">
			
 
				+							{{codeTips}}
			
 
				+						</view>
			
 
				+					</view>
			
 
				+				</uni-forms-item>
			
 
				+			</uni-forms>
			
 
				+			<button class="submit" :class="{'submit-disabled': !formData.code || !formData.mobilePhone}" @click="submit">登录</button>
			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script lang="ts" setup>
			
 
				+	import { reactive, ref, watch } from 'vue'
			
 
				+	import { onLoad } from '@dcloudio/uni-app'
			
 
				+	import { sendSmsCode, verifyCode, mobilephoneRegister, prefUser } from '@/api/h5.js'
			
 
				+
			
 
				+	const unitCode = ref('')
			
 
				+	const formData = reactive({
			
 
				+		code: '',
			
 
				+		mobilePhone: '',
			
 
				+	})
			
 
				+
			
 
				+	const rules = reactive({
			
 
				+		mobilePhone: {
			
 
				+			rules: [{
			
 
				+				required: true,
			
 
				+				errorMessage: '请输入手机号',
			
 
				+			}]
			
 
				+		},
			
 
				+		code: {
			
 
				+			rules: [{
			
 
				+				required: true,
			
 
				+				errorMessage: '请输入验证码',
			
 
				+			}]
			
 
				+		},
			
 
				+	})
			
 
				+	const codeTips = ref("获取验证码")
			
 
				+	const isCanGetCode = ref(false)
			
 
				+	const countDownNumber = ref(60)
			
 
				+	const interval = ref(null)
			
 
				+	const countDown = () => {
			
 
				+		isCanGetCode.value = true
			
 
				+		interval.value = setInterval(() => {
			
 
				+			countDownNumber.value = countDownNumber.value - 1
			
 
				+			codeTips.value = `${countDownNumber.value}秒重新获取`
			
 
				+		}, 1000)
			
 
				+	}
			
 
				+	watch(() => countDownNumber.value, (value) => {
			
 
				+		if (value == 0) {
			
 
				+			clearInterval(interval.value)
			
 
				+			isCanGetCode.value = false
			
 
				+			codeTips.value = "重新获取"
			
 
				+			countDownNumber.value = 60
			
 
				+		}
			
 
				+	
			
 
				+	})
			
 
				+	const getCode = async () => {
			
 
				+		if (!formData.mobilePhone) {
			
 
				+			uni.showToast({
			
 
				+				title: "请输入手机号",
			
 
				+				icon: 'none'
			
 
				+			})
			
 
				+			return
			
 
				+		};
			
 
				+		if (!isCanGetCode.value) {
			
 
				+			uni.showLoading({
			
 
				+				title: '正在获取验证码',
			
 
				+				mask: true
			
 
				+			})
			
 
				+			const res = await sendSmsCode({
			
 
				+				"mobilePhone": formData.mobilePhone
			
 
				+			})
			
 
				+			if (res.code === 200) {
			
 
				+				uni.hideLoading();
			
 
				+				codeTips.value = `${countDownNumber.value}S`
			
 
				+				countDown()
			
 
				+				uni.showToast({
			
 
				+					title: '发送成功',
			
 
				+					icon: 'none'
			
 
				+				})
			
 
				+			}
			
 
				+		} else {
			
 
				+			uni.showToast({
			
 
				+				title: "倒计时结束后再发送",
			
 
				+				icon: 'none'
			
 
				+			})
			
 
				+		}
			
 
				+	}
			
 
				+	const handlePrefUser = async () => {
			
 
				+		const res = await prefUser({
			
 
				+			mobilePhone: formData.mobilePhone,
			
 
				+			prefUnitCode: unitCode.value
			
 
				+		})
			
 
				+		if(res.code === 200) {
			
 
				+			uni.showToast({
			
 
				+				title: res.message,
			
 
				+				icon: 'none'
			
 
				+			})
			
 
				+			if(res.data) {
			
 
				+				const { userCode } = res.data
			
 
				+				setTimeout(() => {
			
 
				+					uni.reLaunch({
			
 
				+						url: `/pages/result/result?provinceCode=${userCode?.slice(0, 2)}`
			
 
				+					})
			
 
				+				}, 800)
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+	const getMobilephoneRegister = async () => {
			
 
				+		const res = await mobilephoneRegister({mobilePhone: formData.mobilePhone})
			
 
				+		if(res.data) {
			
 
				+			const parameter = encodeURIComponent(JSON.stringify({
			
 
				+				unitCode: unitCode.value,
			
 
				+				mobilePhone: formData.mobilePhone
			
 
				+			}))
			
 
				+			uni.navigateTo({
			
 
				+				url: `/pages/password/password?parameter=${parameter}`
			
 
				+			})
			
 
				+		}else {
			
 
				+			handlePrefUser()
			
 
				+		}
			
 
				+	}
			
 
				+	const form = ref()
			
 
				+	const submit = () => {
			
 
				+		if(formData.code && formData.mobilePhone) {
			
 
				+			form.value.validate().then(async data => {
			
 
				+				const res = await verifyCode(data)
			
 
				+				if(res.code === 200) {
			
 
				+					if(res.data) {
			
 
				+						getMobilephoneRegister()
			
 
				+					}else {
			
 
				+						uni.showToast({
			
 
				+							title: "验证码错误",
			
 
				+							icon: 'none'
			
 
				+						})
			
 
				+					}
			
 
				+				}
			
 
				+			})
			
 
				+		}
			
 
				+	}
			
 
				+	onLoad((options) => {
			
 
				+		unitCode.value = options.unitCode
			
 
				+	})
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+	.form {
			
 
				+		padding: 0 40rpx;
			
 
				+
			
 
				+		:deep(.uni-easyinput__content) {
			
 
				+			border: none;
			
 
				+		}
			
 
				+
			
 
				+		:deep(.uni-easyinput__content-input) {
			
 
				+			background: #F1F5FE;
			
 
				+			height: 112rpx;
			
 
				+			border-radius: 24rpx;
			
 
				+			font-weight: 500;
			
 
				+			font-size: 32rpx;
			
 
				+			color: #1D2129;
			
 
				+			line-height: 38rpx;
			
 
				+		}
			
 
				+
			
 
				+		:deep(.uni-input-placeholder) {
			
 
				+			font-weight: 400;
			
 
				+			font-size: 32rpx;
			
 
				+			color: #86909C;
			
 
				+			line-height: 38rpx;
			
 
				+		}
			
 
				+		.form-code {
			
 
				+			display: flex;
			
 
				+			align-items: center;
			
 
				+			background: #F1F5FE;
			
 
				+			border-top-right-radius: 24rpx;
			
 
				+			border-bottom-right-radius: 24rpx;
			
 
				+			:deep(.uni-easyinput__content-input){
			
 
				+				border-top-right-radius: 0;
			
 
				+				border-bottom-right-radius: 0;
			
 
				+			}
			
 
				+			.code {
			
 
				+				font-weight: 400;
			
 
				+				font-size: 32rpx;
			
 
				+				color: #3682EA;
			
 
				+				border-radius: 8rpx;
			
 
				+				line-height: 38rpx;
			
 
				+				padding: 0 24rpx;
			
 
				+			}
			
 
				+			
			
 
				+			.code-disabled {
			
 
				+				color: #86909C;
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+	.submit {
			
 
				+		height: 112rpx;
			
 
				+		background: #3682EA;
			
 
				+		border-radius: 24rpx;
			
 
				+		font-weight: 500;
			
 
				+		font-size: 36rpx;
			
 
				+		color: #FFFFFF;
			
 
				+		display: flex;
			
 
				+		align-items: center;
			
 
				+		justify-content: center;
			
 
				+		margin-top: 128rpx;
			
 
				+	}
			
 
				+	.submit-disabled {
			
 
				+		background: #B0CDFF;
			
 
				+	}
			
 
				+</style>
			
--- a/pages/password/password.vue
+++ b/pages/password/password.vue
@@ -0,0 +1,142 @@
 
				+<template>
			
 
				+	<view>
			
 
				+		<view class="logo">
			
 
				+			<image src="../../static/logo.png" mode="aspectFit"></image>
			
 
				+		</view>
			
 
				+		<view class="form">
			
 
				+			<!-- <view class="prompt">
			
 
				+				注意：密码需8位以上，包含英文大小写、字母。
			
 
				+			</view> -->
			
 
				+			<uni-forms ref="form" :modelValue="formData" :rules="rules" label-align="right" :label-width="90">
			
 
				+				<uni-forms-item label="密码" name="password">
			
 
				+					<uni-easyinput type="password" maxlength="20" :clearable="false" v-model="formData.password"
			
 
				+						placeholder="请输入新密码" />
			
 
				+				</uni-forms-item>
			
 
				+				<uni-forms-item label="确认密码" name="confirmPassword">
			
 
				+					<uni-easyinput type="password" maxlength="20" :clearable="false" v-model="formData.confirmPassword"
			
 
				+						placeholder="请再次确认新密码" />
			
 
				+				</uni-forms-item>
			
 
				+			</uni-forms>
			
 
				+			<button class="submit" :class="{'submit-disabled': !formData.password || !formData.confirmPassword}"
			
 
				+				@click="submit">确认</button>
			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script lang="ts" setup>
			
 
				+	import { ref, reactive } from 'vue'
			
 
				+	import { onLoad } from '@dcloudio/uni-app'
			
 
				+	
			
 
				+	const formData = reactive({
			
 
				+		password: '',
			
 
				+		confirmPassword: '',
			
 
				+	})
			
 
				+	const rules = reactive({
			
 
				+		password: {
			
 
				+			rules: [{
			
 
				+				required: true,
			
 
				+				errorMessage: '请输入密码',
			
 
				+			}, {
			
 
				+				validateFunction: (rule, value, data, callback) => {
			
 
				+					const passwordRegex = /^(?=.*[a-zA-Z])(.{8,})$/;
			
 
				+					if (value?.length >= 6 && value?.length <= 20) {
			
 
				+						return true
			
 
				+					}
			
 
				+					
			
 
				+					callback('密码必须为6至20位字符')
			
 
				+				}
			
 
				+			}]
			
 
				+		},
			
 
				+		confirmPassword: {
			
 
				+			rules: [{
			
 
				+				required: true,
			
 
				+				errorMessage: '请输入密码',
			
 
				+			}, {
			
 
				+				validateFunction: (rule, value, data, callback) => {
			
 
				+					if (value == formData.password) {
			
 
				+						return true
			
 
				+					}
			
 
				+					callback('两次密码不一致')
			
 
				+				}
			
 
				+			}]
			
 
				+		}
			
 
				+	})
			
 
				+	const form = ref()
			
 
				+	const parameter = ref({})
			
 
				+	const submit = () => {
			
 
				+		if (formData.password && formData.confirmPassword) {
			
 
				+			form.value.validate().then(async data => {
			
 
				+				const res = encodeURIComponent(JSON.stringify({
			
 
				+					...parameter.value,
			
 
				+					password: formData.password
			
 
				+				}))
			
 
				+				uni.navigateTo({
			
 
				+					url: `/pages/register/register?parameter=${res}`
			
 
				+				})
			
 
				+			})
			
 
				+		}
			
 
				+	}
			
 
				+	onLoad((options) => {
			
 
				+		parameter.value = JSON.parse(decodeURIComponent(options.parameter));
			
 
				+	})
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss">
			
 
				+	.form {
			
 
				+		padding: 0 40rpx;
			
 
				+
			
 
				+		.prompt {
			
 
				+			font-weight: 400;
			
 
				+			font-size: 24rpx;
			
 
				+			color: #F53F3F;
			
 
				+			line-height: 28rpx;
			
 
				+			margin-bottom: 20px;
			
 
				+		}
			
 
				+
			
 
				+		:deep(.uni-forms-item__label) {
			
 
				+			height: 88rpx;
			
 
				+			font-weight: 500;
			
 
				+			font-size: 32rpx;
			
 
				+			color: #1D2129;
			
 
				+			line-height: 38rpx;
			
 
				+		}
			
 
				+
			
 
				+		:deep(.uni-easyinput__content) {
			
 
				+			border: none;
			
 
				+		}
			
 
				+
			
 
				+		:deep(.uni-easyinput__content-input) {
			
 
				+			background: #F1F5FE;
			
 
				+			height: 88rpx;
			
 
				+			border-radius: 24rpx;
			
 
				+			font-weight: 500;
			
 
				+			font-size: 32rpx;
			
 
				+			color: #1D2129;
			
 
				+			line-height: 38rpx;
			
 
				+		}
			
 
				+
			
 
				+		:deep(.uni-input-placeholder) {
			
 
				+			font-weight: 400;
			
 
				+			font-size: 32rpx;
			
 
				+			color: #86909C;
			
 
				+			line-height: 38rpx;
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	.submit {
			
 
				+		height: 112rpx;
			
 
				+		background: #3682EA;
			
 
				+		border-radius: 24rpx;
			
 
				+		font-weight: 500;
			
 
				+		font-size: 36rpx;
			
 
				+		color: #FFFFFF;
			
 
				+		display: flex;
			
 
				+		align-items: center;
			
 
				+		justify-content: center;
			
 
				+		margin-top: 128rpx;
			
 
				+	}
			
 
				+
			
 
				+	.submit-disabled {
			
 
				+		background: #B0CDFF;
			
 
				+	}
			
 
				+</style>
			
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -0,0 +1,280 @@
 
				+<template>
			
 
				+	<view>
			
 
				+		<view class="logo">
			
 
				+			<image src="../../static/logo.png" mode="aspectFit"></image>
			
 
				+		</view>
			
 
				+		<view class="form">
			
 
				+			<uni-forms ref="form" :modelValue="formData" :rules="rules" :label-width="90" label-align="right">
			
 
				+				<uni-forms-item label="所在地" name="provinceCode">
			
 
				+					<view class="form-item">
			
 
				+						<uni-data-select :clear="false" v-model="formData.provinceCode" placeholder="请选择您所在的省市"
			
 
				+							:localdata="provinces"></uni-data-select>
			
 
				+						<view class="des-text">省/市</view>
			
 
				+					</view>
			
 
				+				</uni-forms-item>
			
 
				+				<!-- <uni-forms-item label="学校" name="name">
			
 
				+					<uni-easyinput type="text" :clearable="false" v-model="formData.mobile" placeholder="请输入所在学校" />
			
 
				+				</uni-forms-item> -->
			
 
				+				<uni-forms-item label="高考年份" name="enrollYear">
			
 
				+					<view class="form-item">
			
 
				+						<uni-data-select :clear="false" v-model="formData.enrollYear" placeholder="请选择您的高考年份"
			
 
				+							:localdata="years"></uni-data-select>
			
 
				+						<view class="des-text"></view>
			
 
				+					</view>
			
 
				+				</uni-forms-item>
			
 
				+				<uni-forms-item label="姓名" name="name">
			
 
				+					<view class="form-item">
			
 
				+						<uni-easyinput type="text" :clearable="false" v-model="formData.name" placeholder="请输入姓名" />
			
 
				+						<view class="des-text"></view>
			
 
				+					</view>
			
 
				+				</uni-forms-item>
			
 
				+				<uni-forms-item label="性别" name="gender">
			
 
				+					<view class="form-item">
			
 
				+						<uni-data-checkbox v-model="formData.gender" :localdata="genders"></uni-data-checkbox>
			
 
				+						<view class="des-text"></view>
			
 
				+					</view>
			
 
				+				</uni-forms-item>
			
 
				+			</uni-forms>
			
 
				+			<button class="submit" :class="{'submit-disabled': !isDisabled}" @click="submit">提交</button>
			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script lang="ts" setup>
			
 
				+	import { ref, reactive, computed } from 'vue'
			
 
				+	import { onLoad } from '@dcloudio/uni-app'
			
 
				+	import { getFutureYears } from '@/utils/index'
			
 
				+	import { provincesList, registerUser, prefUser } from '@/api/h5.js'
			
 
				+
			
 
				+	const unitCode = ref('')
			
 
				+	const isDisabled = computed(() => {
			
 
				+		return formData.enrollYear && formData.gender && formData.name && formData.provinceCode
			
 
				+	})
			
 
				+	const formData = reactive({
			
 
				+		enrollYear: '',
			
 
				+		mobilePhone: '',
			
 
				+		gender: '',
			
 
				+		name: '',
			
 
				+		password: '',
			
 
				+		provinceCode: '',
			
 
				+	})
			
 
				+
			
 
				+	const rules = reactive({
			
 
				+		enrollYear: {
			
 
				+			rules: [{
			
 
				+				required: true,
			
 
				+				errorMessage: '请选择您的高考年份',
			
 
				+			}]
			
 
				+		},
			
 
				+		gender: {
			
 
				+			rules: [{
			
 
				+				required: true,
			
 
				+				errorMessage: '请选择性别',
			
 
				+			}]
			
 
				+		},
			
 
				+		name: {
			
 
				+			rules: [{
			
 
				+				required: true,
			
 
				+				errorMessage: '请输入姓名',
			
 
				+			}]
			
 
				+		},
			
 
				+		provinceCode: {
			
 
				+			rules: [{
			
 
				+				required: true,
			
 
				+				errorMessage: '请选择您所在的省市',
			
 
				+			}]
			
 
				+		},
			
 
				+	})
			
 
				+	const genders = ref([
			
 
				+		{ "value": '男', "text": "男" },
			
 
				+		{ "value": '女', "text": "女" }
			
 
				+	])
			
 
				+	const years = ref([])
			
 
				+	const provinces = ref([])
			
 
				+	const getProvincesList = async () => {
			
 
				+		const res = await provincesList({})
			
 
				+		if (res.code === 200) {
			
 
				+			provinces.value = Object.keys(res.data)?.map((item, index) => {
			
 
				+				return {
			
 
				+					value: item,
			
 
				+					text: res.data[item]
			
 
				+				}
			
 
				+			})?.filter(item => item.value != '65')
			
 
				+		}
			
 
				+	}
			
 
				+	const handlePrefUser = async () => {
			
 
				+		const res = await prefUser({
			
 
				+			mobilePhone: formData.mobilePhone,
			
 
				+			prefUnitCode: unitCode.value
			
 
				+		})
			
 
				+		if(res.code === 200) {
			
 
				+			// uni.showToast({
			
 
				+			// 	title: res.message,
			
 
				+			// 	icon: 'none'
			
 
				+			// })
			
 
				+			setTimeout(() => {
			
 
				+				uni.reLaunch({
			
 
				+					url: `/pages/result/result?provinceCode=${formData.provinceCode}`
			
 
				+				})
			
 
				+			}, 800)
			
 
				+		}
			
 
				+	}
			
 
				+	const form = ref()
			
 
				+	const submit = () => {
			
 
				+		if(isDisabled.value) {
			
 
				+			form.value.validate().then(async data => {
			
 
				+				const res = await registerUser(formData)
			
 
				+				if(res.code === 200) {
			
 
				+					handlePrefUser()
			
 
				+				}
			
 
				+			})
			
 
				+		}
			
 
				+	}
			
 
				+	onLoad((options) => {
			
 
				+		const parameter = JSON.parse(decodeURIComponent(options.parameter));
			
 
				+		unitCode.value = parameter.unitCode
			
 
				+		formData.mobilePhone = parameter.mobilePhone
			
 
				+		formData.password = parameter.password
			
 
				+		years.value = getFutureYears(3)?.map(item => {
			
 
				+			return {
			
 
				+				value: item,
			
 
				+				text: item
			
 
				+			}
			
 
				+		})
			
 
				+		getProvincesList()
			
 
				+	})
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+
			
 
				+	.form {
			
 
				+		padding: 0 40rpx;
			
 
				+
			
 
				+		:deep(.uni-easyinput__content) {
			
 
				+			border: none;
			
 
				+		}
			
 
				+
			
 
				+		:deep(.uni-forms-item__label) {
			
 
				+			height: 88rpx;
			
 
				+			font-weight: 500;
			
 
				+			font-size: 32rpx;
			
 
				+			color: #1D2129;
			
 
				+			line-height: 38rpx;
			
 
				+		}
			
 
				+
			
 
				+		:deep(.uni-stat__select) {
			
 
				+			height: 88rpx;
			
 
				+			border-radius: 24rpx;
			
 
				+			background: #F1F5FE;
			
 
				+
			
 
				+			.uni-stat-box {
			
 
				+				height: 88rpx;
			
 
				+
			
 
				+				.uni-select {
			
 
				+					height: 100%;
			
 
				+					border: none;
			
 
				+
			
 
				+					.uni-select__input-text {
			
 
				+						font-weight: 500;
			
 
				+						font-size: 32rpx;
			
 
				+						color: #1D2129;
			
 
				+					}
			
 
				+
			
 
				+					.uni-select__input-placeholder {
			
 
				+						font-weight: 400;
			
 
				+						font-size: 32rpx;
			
 
				+						color: #86909C;
			
 
				+						line-height: 38rpx;
			
 
				+					}
			
 
				+
			
 
				+					.uni-icons {
			
 
				+						font-size: 32rpx !important;
			
 
				+						margin-right: 10rpx;
			
 
				+					}
			
 
				+				}
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		:deep(.uni-data-checklist) {
			
 
				+			height: 88rpx;
			
 
				+			display: flex;
			
 
				+			align-items: center;
			
 
				+
			
 
				+			.radio__inner {
			
 
				+				width: 32rpx !important;
			
 
				+				height: 32rpx !important;
			
 
				+			}
			
 
				+
			
 
				+			.radio__inner-icon {
			
 
				+				width: 16rpx !important;
			
 
				+				height: 16rpx !important;
			
 
				+			}
			
 
				+
			
 
				+			.checklist-text {
			
 
				+				font-weight: 400;
			
 
				+				font-size: 36rpx !important;
			
 
				+				color: #1D2129;
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		:deep(.uni-easyinput__content-input) {
			
 
				+			background: #F1F5FE;
			
 
				+			height: 88rpx;
			
 
				+			border-radius: 24rpx;
			
 
				+			font-weight: 500;
			
 
				+			font-size: 32rpx;
			
 
				+			color: #1D2129;
			
 
				+			line-height: 38rpx;
			
 
				+		}
			
 
				+
			
 
				+		:deep(.uni-input-placeholder) {
			
 
				+			font-weight: 400;
			
 
				+			font-size: 32rpx;
			
 
				+			color: #86909C;
			
 
				+			line-height: 38rpx;
			
 
				+		}
			
 
				+
			
 
				+		.form-area {
			
 
				+			width: 100%;
			
 
				+			background: #F1F5FE;
			
 
				+			border-radius: 24rpx;
			
 
				+			height: 88rpx;
			
 
				+
			
 
				+			:deep(.input-block) {
			
 
				+				width: calc(100% - 10px);
			
 
				+				height: 88rpx;
			
 
				+				padding-left: 10px;
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		.submit {
			
 
				+			height: 112rpx;
			
 
				+			background: #3682EA;
			
 
				+			border-radius: 24rpx;
			
 
				+			font-weight: 500;
			
 
				+			font-size: 36rpx;
			
 
				+			color: #FFFFFF;
			
 
				+			display: flex;
			
 
				+			align-items: center;
			
 
				+			justify-content: center;
			
 
				+			margin-top: 128rpx;
			
 
				+		}
			
 
				+
			
 
				+		.submit-disabled {
			
 
				+			background: #B0CDFF;
			
 
				+		}
			
 
				+
			
 
				+		.form-item {
			
 
				+			display: flex;
			
 
				+			align-items: center;
			
 
				+
			
 
				+			.des-text {
			
 
				+				width: 80rpx;
			
 
				+				font-weight: 400;
			
 
				+				font-size: 32rpx;
			
 
				+				color: #4E5969;
			
 
				+				margin-left: 20rpx;
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</style>
			
--- a/pages/result/result.vue
+++ b/pages/result/result.vue
@@ -0,0 +1,445 @@
 
				+<template>
			
 
				+	<view class="result">
			
 
				+		<view class="desc">使用操作视频</view>
			
 
				+		<view class="video">
			
 
				+			<video id="myVideo" src="https://resources.delesson.cn/operate.mp4" controls></video>
			
 
				+		</view>
			
 
				+		<view class="bless">
			
 
				+			<image src="../../static/bless.png" mode="aspectFit"></image>
			
 
				+		</view>
			
 
				+		<view class="diannao">
			
 
				+			<view class="text">电脑端</view>
			
 
				+			<image class="maozi" src="../../static/maozi.png" mode="aspectFit"></image>
			
 
				+			<view class="piece">
			
 
				+				<view @click="copy" class="url">www.dlxgk.com</view>
			
 
				+				<view class="rubric">请前往德立信志愿官网使用</view>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+		<view class="diannao xiaochengxu">
			
 
				+			<view class="text">小程序</view>
			
 
				+			<image class="zhi" src="../../static/zhi.png" mode="aspectFit"></image>
			
 
				+			<view class="piece">
			
 
				+				<image :show-menu-by-longpress="true" class="code" src="../../static/code.jpg" mode="aspectFit"
			
 
				+					@click="previewImage"></image>
			
 
				+				<view class="rubric">长按识别二维码，前往微信小程序</view>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+		<view class="diannao downloadApp">
			
 
				+			<view class="text">下载app</view>
			
 
				+			<image src="../../static/shu.png" class="shu" mode="aspectFit"></image>
			
 
				+			<view class="piece">
			
 
				+				<image :show-menu-by-longpress="true" class="code" src="../../static/code.jpg" mode="aspectFit"
			
 
				+					@click="previewImage"></image>
			
 
				+				<view class="rubric" >长按识别二维码，下载APP</view>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+		<view class="bless-text">
			
 
				+			<view>高分不滑档，低分有选择!</view>
			
 
				+			<view>德立信志愿祝您金榜题名!</view>
			
 
				+		</view>
			
 
				+	</view>
			
 
				+	<uni-popup ref="message" type="dialog">
			
 
				+		<uni-popup-dialog type="info" before-close cancelText="取消" confirmText="复制" :title="title"
			
 
				+			@confirm="dialogConfirm" @close="message.close()">
			
 
				+			<view>
			
 
				+				<view>账号：{{myAccount}}</view>
			
 
				+				<view>密码：123456</view>
			
 
				+			</view>
			
 
				+		</uni-popup-dialog>
			
 
				+	</uni-popup>
			
 
				+</template>
			
 
				+
			
 
				+<script lang="ts" setup>
			
 
				+	import { computed, ref } from 'vue'
			
 
				+	import { onLoad } from '@dcloudio/uni-app'
			
 
				+	
			
 
				+	const accountList = ref([
			
 
				+		{
			
 
				+			"value": "11",
			
 
				+			"text": "北京市",
			
 
				+			account: 16666666026
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "12",
			
 
				+			"text": "天津市",
			
 
				+			account: 16666666027
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "13",
			
 
				+			"text": "河北省",
			
 
				+			account: 16666666099
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "14",
			
 
				+			"text": "山西省",
			
 
				+			account: 16666666098
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "15",
			
 
				+			"text": "内蒙古",
			
 
				+			account: 16666666023
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "21",
			
 
				+			"text": "辽宁省",
			
 
				+			account: 16666666097
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "22",
			
 
				+			"text": "吉林省",
			
 
				+			account: 16666666096
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "23",
			
 
				+			"text": "黑龙江",
			
 
				+			account: 16666666005
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "31",
			
 
				+			"text": "上海市",
			
 
				+			account: 16666666028
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "32",
			
 
				+			"text": "江苏省",
			
 
				+			account: 16666666006
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "33",
			
 
				+			"text": "浙江省",
			
 
				+			account: 16666666007
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "34",
			
 
				+			"text": "安徽省",
			
 
				+			account: 16666666008
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "35",
			
 
				+			"text": "福建省",
			
 
				+			account: 16666666009
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "36",
			
 
				+			"text": "江西省",
			
 
				+			account: 16666666010
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "37",
			
 
				+			"text": "山东省",
			
 
				+			account: 16666666011
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "41",
			
 
				+			"text": "河南省",
			
 
				+			account: 16666666012
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "42",
			
 
				+			"text": "湖北省",
			
 
				+			account: 16666666013
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "43",
			
 
				+			"text": "湖南省",
			
 
				+			account: 16666666014
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "44",
			
 
				+			"text": "广东省",
			
 
				+			account: 16666666015
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "45",
			
 
				+			"text": "广西省",
			
 
				+			account: 16666666094
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "46",
			
 
				+			"text": "海南省",
			
 
				+			account: 16666666016
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "50",
			
 
				+			"text": "重庆市",
			
 
				+			account: 16666666029
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "51",
			
 
				+			"text": "四川省",
			
 
				+			account: 16666666017
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "52",
			
 
				+			"text": "贵州省",
			
 
				+			account: 16666666018
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "53",
			
 
				+			"text": "云南省",
			
 
				+			account: 16666666019
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "61",
			
 
				+			"text": "陕西省",
			
 
				+			account: 16666666020
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "62",
			
 
				+			"text": "甘肃省",
			
 
				+			account: 16666666021
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "63",
			
 
				+			"text": "青海省",
			
 
				+			account: 16666666022
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "64",
			
 
				+			"text": "宁夏",
			
 
				+			account: 16666666025
			
 
				+		},
			
 
				+		{
			
 
				+			"value": "65",
			
 
				+			"text": "新疆",
			
 
				+			account: 16666666028
			
 
				+		}
			
 
				+	])
			
 
				+	const copy = () => {
			
 
				+		uni.setClipboardData({
			
 
				+			data: 'https://www.dlxgk.com',
			
 
				+			success: () => {
			
 
				+				uni.showToast({
			
 
				+					title: '复制成功',
			
 
				+					icon: 'none'
			
 
				+				});
			
 
				+			}
			
 
				+		});
			
 
				+	}
			
 
				+	const dialogConfirm = () => {
			
 
				+		uni.setClipboardData({
			
 
				+			data: `账号：${myAccount.value} 密码：123456`,
			
 
				+			success: () => {
			
 
				+				uni.showToast({
			
 
				+					title: '复制成功',
			
 
				+					icon: 'none'
			
 
				+				});
			
 
				+			}
			
 
				+		})
			
 
				+		message.value.close()
			
 
				+	}
			
 
				+	const previewImage = (e) => {
			
 
				+		uni.previewImage({
			
 
				+			urls: ['/static/code.jpg'],
			
 
				+			indicator: 'default',
			
 
				+			loop: false,
			
 
				+		});
			
 
				+	}
			
 
				+	const message = ref()
			
 
				+	const provinceCode = ref()
			
 
				+	const title = computed(() => {
			
 
				+		const str = accountList.value.find(item => item.value == provinceCode.value)?.text?.replace('省', '')?.replace('市', '')
			
 
				+		return str + '试用账号'
			
 
				+	})
			
 
				+	const myAccount = computed(() => {
			
 
				+		return accountList.value.find(item => item.value == provinceCode.value)?.account
			
 
				+	})
			
 
				+	onLoad((options) => {
			
 
				+		provinceCode.value = options.provinceCode
			
 
				+	})
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+	.result {
			
 
				+		background: url('../../static/newbejing.png') no-repeat;
			
 
				+		width: 100%;
			
 
				+		height: 100%;
			
 
				+		background-size: 100% 100%;
			
 
				+
			
 
				+		.desc {
			
 
				+			font-family: Alimama ShuHeiTi, Alimama ShuHeiTi;
			
 
				+			font-weight: bold;
			
 
				+			font-size: 20px;
			
 
				+			color: #FFFFFF;
			
 
				+			line-height: 23px;
			
 
				+			letter-spacing: 4px;
			
 
				+			text-align: left;
			
 
				+			font-style: normal;
			
 
				+			text-transform: none;
			
 
				+			padding: 30rpx 0;
			
 
				+			text-align: center;
			
 
				+		}
			
 
				+
			
 
				+		.video {
			
 
				+			width: 80%;
			
 
				+			height: 400rpx;
			
 
				+			background: url('../../static/videokuang.png') no-repeat;
			
 
				+			background-size: 100% 100%;
			
 
				+			margin: 0 auto;
			
 
				+			display: flex;
			
 
				+			align-items: center;
			
 
				+			justify-content: center;
			
 
				+			margin-bottom: 20rpx;
			
 
				+
			
 
				+			video {
			
 
				+				width: 100%;
			
 
				+				height: 100%;
			
 
				+				border-radius: 5rpx;
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		.bless {
			
 
				+			width: 80%;
			
 
				+			height: 300rpx;
			
 
				+			display: flex;
			
 
				+			align-items: center;
			
 
				+			justify-content: center;
			
 
				+			margin: 0 auto 20rpx;
			
 
				+
			
 
				+			image {
			
 
				+				width: 100%;
			
 
				+				height: 300rpx;
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		.diannao {
			
 
				+			background: url('../../static/beijingkuang.png') no-repeat;
			
 
				+			background-size: 100% 100%;
			
 
				+			width: 80%;
			
 
				+			height: 300rpx;
			
 
				+			margin: 0 auto 20rpx;
			
 
				+			position: relative;
			
 
				+
			
 
				+			.text {
			
 
				+				font-family: Alimama ShuHeiTi, Alimama ShuHeiTi;
			
 
				+				font-weight: bold;
			
 
				+				font-size: 16px;
			
 
				+				color: #FFFFFF;
			
 
				+				height: 92rpx;
			
 
				+				line-height: 92rpx;
			
 
				+				letter-spacing: 3px;
			
 
				+				text-align: left;
			
 
				+				font-style: normal;
			
 
				+				text-transform: none;
			
 
				+				text-align: center;
			
 
				+			}
			
 
				+
			
 
				+			.maozi {
			
 
				+				width: 208rpx;
			
 
				+				height: 96rpx;
			
 
				+				position: absolute;
			
 
				+				right: -50rpx;
			
 
				+				top: 10rpx;
			
 
				+			}
			
 
				+
			
 
				+			.shu {
			
 
				+				width: 114rpx;
			
 
				+				height: 82rpx;
			
 
				+				position: absolute;
			
 
				+				right: -40rpx;
			
 
				+				top: 20rpx;
			
 
				+			}
			
 
				+
			
 
				+			.piece {
			
 
				+				position: absolute;
			
 
				+				top: 60%;
			
 
				+				left: 0;
			
 
				+				transform: translateY(-50%);
			
 
				+				width: 100%;
			
 
				+				text-align: center;
			
 
				+
			
 
				+				.url {
			
 
				+					font-family: Alimama ShuHeiTi, Alimama ShuHeiTi;
			
 
				+					font-weight: bold;
			
 
				+					font-size: 56rpx;
			
 
				+					color: #1A7DF1;
			
 
				+					line-height: 66rpx;
			
 
				+					text-align: left;
			
 
				+					font-style: normal;
			
 
				+					text-transform: none;
			
 
				+					text-align: center;
			
 
				+					margin-bottom: 20rpx;
			
 
				+				}
			
 
				+
			
 
				+				.rubric {
			
 
				+					font-family: Alimama ShuHeiTi, Alimama ShuHeiTi;
			
 
				+					font-weight: bold;
			
 
				+					font-size: 28rpx;
			
 
				+					color: #1A7DF1;
			
 
				+					line-height: 33rpx;
			
 
				+					text-align: left;
			
 
				+					font-style: normal;
			
 
				+					text-transform: none;
			
 
				+					text-align: center;
			
 
				+				}
			
 
				+
			
 
				+				.advert {
			
 
				+					font-family: Alimama ShuHeiTi, Alimama ShuHeiTi;
			
 
				+					font-weight: bold;
			
 
				+					font-size: 24rpx;
			
 
				+					color: #1A7DF1;
			
 
				+					line-height: 36rpx;
			
 
				+					letter-spacing: 1px;
			
 
				+					text-align: left;
			
 
				+					font-style: normal;
			
 
				+					text-transform: none;
			
 
				+					margin: 0 32rpx 20rpx;
			
 
				+				}
			
 
				+
			
 
				+				.receive {
			
 
				+					width: 80%;
			
 
				+					height: 62rpx;
			
 
				+					margin: 0 auto;
			
 
				+					background: #1A7DF1;
			
 
				+					border-radius: 64rpx;
			
 
				+					text-align: center;
			
 
				+					line-height: 62rpx;
			
 
				+					font-family: Alimama ShuHeiTi, Alimama ShuHeiTi;
			
 
				+					font-weight: bold;
			
 
				+					font-size: 32rpx;
			
 
				+					color: #FFFFFF;
			
 
				+					letter-spacing: 3px;
			
 
				+					font-style: normal;
			
 
				+					text-transform: none;
			
 
				+				}
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		.xiaochengxu,.downloadApp {
			
 
				+			.zhi {
			
 
				+				width: 122rpx;
			
 
				+				height: 98rpx;
			
 
				+				position: absolute;
			
 
				+				left: -50rpx;
			
 
				+				top: 10rpx;
			
 
				+			}
			
 
				+
			
 
				+			.piece {
			
 
				+				.code {
			
 
				+					width: 136rpx;
			
 
				+					height: 136rpx;
			
 
				+					margin-bottom: 10rpx;
			
 
				+				}
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		.bless-text {
			
 
				+			padding-bottom: 42rpx;
			
 
				+			font-family: Alimama ShuHeiTi, Alimama ShuHeiTi;
			
 
				+			font-weight: bold;
			
 
				+			font-size: 40rpx;
			
 
				+			color: #FFFFFF;
			
 
				+			line-height: 47rpx;
			
 
				+			letter-spacing: 4px;
			
 
				+			text-shadow: 0px 4px 8px #1A7DF1;
			
 
				+			text-align: center;
			
 
				+			font-style: normal;
			
 
				+			text-transform: none;
			
 
				+			padding-top: 20rpx;
			
 
				+
			
 
				+			view {
			
 
				+				margin-bottom: 20rpx;
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</style>
			
--- a/pages/result/result1.vue
+++ b/pages/result/result1.vue
@@ -0,0 +1,156 @@
 
				+<template>
			
 
				+	<view class="result">
			
 
				+		<view class="bless">
			
 
				+			<image src="../../static/bless.png" mode="aspectFit"></image>
			
 
				+			<!-- <view>以梦为马</view>
			
 
				+			<view>不负韶华</view> -->
			
 
				+		</view>
			
 
				+		<view class="link">
			
 
				+			<view class="type">
			
 
				+				<image class="dn" src="../../static/diannao.png" mode="aspectFit"></image>
			
 
				+				<image class="copy" src="../../static/copy.png" mode="aspectFit" @click="copy"></image>
			
 
				+			</view>
			
 
				+			<view class="address">
			
 
				+				<image src="../../static/address.png" mode="aspectFit"></image>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+		<view class="prompt">
			
 
				+			<view>努力，是最好的答案！</view>
			
 
				+			<view>德立信志愿祝您金榜题名！</view>
			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script lang="ts" setup>
			
 
				+	const copy = () => {
			
 
				+		uni.setClipboardData({
			
 
				+			data: 'https://www.dlxgk.com',
			
 
				+			success: () => {
			
 
				+				uni.showToast({
			
 
				+					title: '复制成功',
			
 
				+					icon: 'none'
			
 
				+				});
			
 
				+			}
			
 
				+		});
			
 
				+
			
 
				+	}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+	@media screen and (min-width: 500px) {
			
 
				+		.bless {
			
 
				+			padding-top: 20rpx !important;
			
 
				+		}
			
 
				+		.prompt {
			
 
				+			bottom: 20rpx !important;
			
 
				+		}
			
 
				+	}
			
 
				+	@media screen and (max-width: 430px) {
			
 
				+		.bless {
			
 
				+			padding-top: 30% !important;
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	@media screen and (max-width: 375px) {
			
 
				+		.bless {
			
 
				+			padding-top: 26% !important;
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	@media screen and (max-width: 360px) {
			
 
				+		.bless {
			
 
				+			padding-top: 30% !important;
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	.result {
			
 
				+		width: 100vw;
			
 
				+		height: auto;
			
 
				+		min-height: 100vh;
			
 
				+		background: url('../../static/beijing.png') no-repeat;
			
 
				+		background-size: 100% 100%;
			
 
				+
			
 
				+		.bless {
			
 
				+			display: flex;
			
 
				+			align-items: center;
			
 
				+			flex-direction: column;
			
 
				+			padding-top: 30%;
			
 
				+
			
 
				+			image {
			
 
				+				width: 448rpx;
			
 
				+				height: 268rpx;
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		.link {
			
 
				+			width: 356rpx;
			
 
				+			margin: 32rpx auto;
			
 
				+			padding-bottom: 140rpx;
			
 
				+
			
 
				+			.type {
			
 
				+				display: flex;
			
 
				+				align-items: center;
			
 
				+				justify-content: space-between;
			
 
				+
			
 
				+				.dn {
			
 
				+					width: 130rpx;
			
 
				+					height: 34rpx;
			
 
				+				}
			
 
				+
			
 
				+				.copy {
			
 
				+					width: 130rpx;
			
 
				+					height: 34rpx;
			
 
				+				}
			
 
				+			}
			
 
				+
			
 
				+			.address {
			
 
				+				margin: 16rpx auto;
			
 
				+				width: 356rpx;
			
 
				+
			
 
				+				image {
			
 
				+					width: 356rpx;
			
 
				+					height: 96rpx;
			
 
				+				}
			
 
				+			}
			
 
				+
			
 
				+			.desc {
			
 
				+				font-family: Alimama ShuHeiTi, Alimama ShuHeiTi;
			
 
				+				font-weight: bold;
			
 
				+				font-size: 24rpx;
			
 
				+				color: #FFFFFF;
			
 
				+				line-height: 28rpx;
			
 
				+				text-stroke: 2px #35A5FF;
			
 
				+				text-align: left;
			
 
				+				font-style: normal;
			
 
				+				text-transform: none;
			
 
				+				-webkit-text-stroke: .5px #35A5FF;
			
 
				+				text-align: center;
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		.prompt {
			
 
				+			width: 100%;
			
 
				+			display: flex;
			
 
				+			flex-direction: column;
			
 
				+			align-items: center;
			
 
				+			justify-content: center;
			
 
				+			position: fixed;
			
 
				+			bottom: 104rpx;
			
 
				+			left: 50%;
			
 
				+			transform: translateX(-50%);
			
 
				+
			
 
				+			view {
			
 
				+				font-family: Alimama ShuHeiTi, Alimama ShuHeiTi;
			
 
				+				font-weight: bold;
			
 
				+				font-size: 32rpx;
			
 
				+				color: #FFFFFF;
			
 
				+				line-height: 38rpx;
			
 
				+				letter-spacing: 3px;
			
 
				+				text-align: left;
			
 
				+				font-style: normal;
			
 
				+				text-transform: none;
			
 
				+				margin-bottom: 20rpx;
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</style>
			
--- a/static/address.png
+++ b/static/address.png
--- a/static/beijing.png
+++ b/static/beijing.png
--- a/static/beijingkuang.png
+++ b/static/beijingkuang.png
--- a/static/bless.png
+++ b/static/bless.png
--- a/static/code.jpg
+++ b/static/code.jpg
--- a/static/copy.png
+++ b/static/copy.png
--- a/static/diannao.png
+++ b/static/diannao.png
--- a/static/logo.png
+++ b/static/logo.png
--- a/static/maozi.png
+++ b/static/maozi.png
--- a/static/newbejing.png
+++ b/static/newbejing.png
--- a/static/shu.png
+++ b/static/shu.png
--- a/static/videokuang.png
+++ b/static/videokuang.png
--- a/static/zhi.png
+++ b/static/zhi.png
--- a/uni.promisify.adaptor.js
+++ b/uni.promisify.adaptor.js
@@ -0,0 +1,10 @@
 
				+uni.addInterceptor({
			
 
				+  returnValue (res) {
			
 
				+    if (!(!!res && (typeof res === "object" || typeof res === "function") && typeof res.then === "function")) {
			
 
				+      return res;
			
 
				+    }
			
 
				+    return new Promise((resolve, reject) => {
			
 
				+      res.then((res) => res[0] ? reject(res[0]) : resolve(res[1]));
			
 
				+    });
			
 
				+  },
			
 
				+});
			
--- a/uni.scss
+++ b/uni.scss
@@ -0,0 +1,76 @@
 
				+/**
			
 
				+ * 这里是uni-app内置的常用样式变量
			
 
				+ *
			
 
				+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
			
 
				+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
			
 
				+ *
			
 
				+ */
			
 
				+
			
 
				+/**
			
 
				+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
			
 
				+ *
			
 
				+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
			
 
				+ */
			
 
				+
			
 
				+/* 颜色变量 */
			
 
				+
			
 
				+/* 行为相关颜色 */
			
 
				+$uni-color-primary: #007aff;
			
 
				+$uni-color-success: #4cd964;
			
 
				+$uni-color-warning: #f0ad4e;
			
 
				+$uni-color-error: #dd524d;
			
 
				+
			
 
				+/* 文字基本颜色 */
			
 
				+$uni-text-color:#333;//基本色
			
 
				+$uni-text-color-inverse:#fff;//反色
			
 
				+$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
			
 
				+$uni-text-color-placeholder: #808080;
			
 
				+$uni-text-color-disable:#c0c0c0;
			
 
				+
			
 
				+/* 背景颜色 */
			
 
				+$uni-bg-color:#ffffff;
			
 
				+$uni-bg-color-grey:#f8f8f8;
			
 
				+$uni-bg-color-hover:#f1f1f1;//点击状态颜色
			
 
				+$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
			
 
				+
			
 
				+/* 边框颜色 */
			
 
				+$uni-border-color:#c8c7cc;
			
 
				+
			
 
				+/* 尺寸变量 */
			
 
				+
			
 
				+/* 文字尺寸 */
			
 
				+$uni-font-size-sm:12px;
			
 
				+$uni-font-size-base:14px;
			
 
				+$uni-font-size-lg:16;
			
 
				+
			
 
				+/* 图片尺寸 */
			
 
				+$uni-img-size-sm:20px;
			
 
				+$uni-img-size-base:26px;
			
 
				+$uni-img-size-lg:40px;
			
 
				+
			
 
				+/* Border Radius */
			
 
				+$uni-border-radius-sm: 2px;
			
 
				+$uni-border-radius-base: 3px;
			
 
				+$uni-border-radius-lg: 6px;
			
 
				+$uni-border-radius-circle: 50%;
			
 
				+
			
 
				+/* 水平间距 */
			
 
				+$uni-spacing-row-sm: 5px;
			
 
				+$uni-spacing-row-base: 10px;
			
 
				+$uni-spacing-row-lg: 15px;
			
 
				+
			
 
				+/* 垂直间距 */
			
 
				+$uni-spacing-col-sm: 4px;
			
 
				+$uni-spacing-col-base: 8px;
			
 
				+$uni-spacing-col-lg: 12px;
			
 
				+
			
 
				+/* 透明度 */
			
 
				+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
			
 
				+
			
 
				+/* 文章场景相关 */
			
 
				+$uni-color-title: #2C405A; // 文章标题颜色
			
 
				+$uni-font-size-title:20px;
			
 
				+$uni-color-subtitle: #555555; // 二级标题颜色
			
 
				+$uni-font-size-subtitle:26px;
			
 
				+$uni-color-paragraph: #3F536E; // 文章段落颜色
			
 
				+$uni-font-size-paragraph:15px;
			
--- a/uni_modules/next-xcascader/changelog.md
+++ b/uni_modules/next-xcascader/changelog.md
@@ -0,0 +1,14 @@
 
				+## 1.0.6（2023-12-08）
			
 
				+修复bug:  选到第三级，再从tab切到第二级，再选没下级的就会出现bug
			
 
				+## 1.0.5（2023-11-08）
			
 
				+修复h5的input控件事件穿透
			
 
				+## 1.0.4（2023-11-08）
			
 
				+修复h5的input控件事件穿透
			
 
				+## 1.0.3（2023-11-02）
			
 
				+增加customRenderLabelFunc属性，支持自定义渲染label
			
 
				+## 1.0.2（2023-08-30）
			
 
				+优化组件
			
 
				+## 1.0.1（2023-08-29）
			
 
				+更新说明
			
 
				+## 1.0.0（2023-08-29）
			
 
				+初始化next-xcascader
			
--- a/uni_modules/next-xcascader/components/next-xcascader/next-xcascader.vue
+++ b/uni_modules/next-xcascader/components/next-xcascader/next-xcascader.vue
@@ -0,0 +1,444 @@
 
				+<template>
			
 
				+	<view>
			
 
				+			<view class="input-block" @click="inputClick">
			
 
				+				<input
			
 
				+					v-model="_lable"
			
 
				+					:style="`text-align:${inputAlign};${disabled ? 'color:#c0c4cc;' : ''}`"
			
 
				+					:placeholder="placeholder"
			
 
				+					placeholder-style="color: #86909C;font-size: 32rpx;font-weight: none"
			
 
				+					disabled
			
 
				+				/>
			
 
				+				<uni-icons v-if="showArrow" type="bottom" size="16" color="#AAAAAA" style="margin-right: 10px;"></uni-icons>
			
 
				+				<!-- <text v-if="showArrow" style="font-size: 14px;font-weight: bold" class="icon">&#xe615;</text> -->
			
 
				+			</view>
			
 
				+		<!-- 弹出层 -->
			
 
				+		<view :class="['next-scroll-popup', isShow ? 'next-scroll-open' : '', animation ? 'next-scroll-animation' : '']">
			
 
				+			<view class="next-scroll-box">
			
 
				+				<view class="next-scroll-top">
			
 
				+					<view class="next-scroll-top-left" @click="getResult('cancel')">取消</view>
			
 
				+					<view class="next-scroll-top-right" v-if="checkList.length == tabList.length"
			
 
				+						@click="getResult('confirm')">确定</view>
			
 
				+				</view>
			
 
				+				<scroll-view class="next-scroll-title" croll-x="true" :scroll-left="scrollViewWidth" scroll-with-animation>
			
 
				+					<view class="next-scroll-title-item-box" v-for="(i, e) in tabList" @click="checkTab(e)" :key="e">
			
 
				+						<view v-if="tabId >= e" :id="'next-' + e"
			
 
				+							:class="['next-scroll-title-item', tabId == e ? ' next-scroll-title-item-true' : '']">
			
 
				+							{{ checkList[e] ? checkList[e][labelKey] : i.title }}
			
 
				+							<text v-if="tabId > e" style="font-size: 12px;font-weight: bold;color: #3682EA" class="icon">&#xe615;</text>
			
 
				+						</view>
			
 
				+					</view>
			
 
				+				</scroll-view>
			
 
				+				<scroll-view class="next-scroll-view_H" scroll-y="true">
			
 
				+					<view class="next-scroll-view-grid-box"
			
 
				+						v-if="checkBox && checkBox.length && checkBox[tabId] && checkBox[tabId].length">
			
 
				+						<view v-for="(item, index) in checkBox[tabId]" :key="index" @click="check(index)"
			
 
				+							:class="checkList && checkList[tabId] && checkList[tabId][labelKey] == item[labelKey] ? 'next-scroll-view-item-true' : 'next-scroll-view-item'">
			
 
				+							{{ item[labelKey] || '' }}
			
 
				+						</view>
			
 
				+					</view>
			
 
				+					<view class="next-scroll-view-noBox" v-else>
			
 
				+						<text style="font-size: 60px;color: #3682EA" class="icon">&#xe624;</text>
			
 
				+						<view class="text">暂无数据</view>
			
 
				+					</view>
			
 
				+				</scroll-view>
			
 
				+				<view v-show="safeArea" class="next-scroll-temp"></view>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+		<!-- 遮罩层 -->
			
 
				+		<view v-show="isShow" class="next-scroll-mask" @click.stop="isMask ? close() : ''"></view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	export default {
			
 
				+		props: {
			
 
				+			value: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			//是否点击阴影关闭
			
 
				+			isMask: {
			
 
				+				type: Boolean,
			
 
				+				default: true,
			
 
				+			},
			
 
				+			//是否开启动画
			
 
				+			animation: {
			
 
				+				type: Boolean,
			
 
				+				default: true,
			
 
				+			},
			
 
				+			//是否开启安全条
			
 
				+			safeArea: {
			
 
				+				type: Boolean,
			
 
				+				default: true,
			
 
				+			},
			
 
				+			options: {
			
 
				+				type: Array,
			
 
				+				default: () => ([])
			
 
				+			},
			
 
				+			valueKey: {
			
 
				+				type: String,
			
 
				+				default: 'value'
			
 
				+			},
			
 
				+			labelKey: {
			
 
				+				type: String,
			
 
				+				default: 'label'
			
 
				+			},
			
 
				+			childrenKey: {
			
 
				+				type: String,
			
 
				+				default: 'children'
			
 
				+			},
			
 
				+			showArrow: {
			
 
				+				type: Boolean,
			
 
				+				default: true
			
 
				+			},
			
 
				+			placeholder: {
			
 
				+				type: String,
			
 
				+				default: '请选择'
			
 
				+			},
			
 
				+			disabled: {
			
 
				+				type: Boolean,
			
 
				+				default: false
			
 
				+			},
			
 
				+			inputAlign:{
			
 
				+				type: String,
			
 
				+				default: 'right'
			
 
				+			},
			
 
				+			customRenderLabelFunc: {
			
 
				+				type: Function
			
 
				+			}
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {
			
 
				+				isShow: false,
			
 
				+				checkBox: [],
			
 
				+				tabId: 0,
			
 
				+				checkList: [],
			
 
				+				checkListModel: [],
			
 
				+				id: 0,
			
 
				+				tabList: [{
			
 
				+						title: '请选择',
			
 
				+						id: 0
			
 
				+					}
			
 
				+				],
			
 
				+				scrollViewWidth: 0,
			
 
				+				elWidth: 0,
			
 
				+			};
			
 
				+		},
			
 
				+		created() {
			
 
				+			this.$watch(() => this.value, (val) => {
			
 
				+				let arr = [];
			
 
				+				(val || '').split(',').map((val, index) => {
			
 
				+					if(index === 0) {
			
 
				+						arr[0] = this.options.find(item => item[this.valueKey] === val) || {};
			
 
				+					} else {
			
 
				+						const children = arr[index - 1][this.childrenKey] || [];
			
 
				+						arr[index] = children.find(item => item[this.valueKey] === val) || {};
			
 
				+					}
			
 
				+				});
			
 
				+				this.checkListModel = arr;
			
 
				+			})
			
 
				+		},
			
 
				+		mounted() {
			
 
				+			console.log("----------插件挂载完毕------------");
			
 
				+		},
			
 
				+		computed: {
			
 
				+			_lable() {
			
 
				+				const label = (this.checkListModel || []).map(item => item[this.labelKey]).join('/');
			
 
				+				return this.customRenderLabelFunc && (typeof this.customRenderLabelFunc === 'function') ? this.customRenderLabelFunc(label) : label
			
 
				+			},
			
 
				+			_value() {
			
 
				+				return (this.checkListModel || []).map(item => item[this.valueKey]).join(',')
			
 
				+			}
			
 
				+		},
			
 
				+		methods: {
			
 
				+			inputClick() {
			
 
				+				if(!this.disabled) {
			
 
				+					this.open()
			
 
				+				}
			
 
				+			},
			
 
				+			open() {
			
 
				+				this.isShow = true;
			
 
				+				this.init();
			
 
				+			},
			
 
				+			close() {
			
 
				+				this.isShow = false;
			
 
				+				this.$emit('close')
			
 
				+			},
			
 
				+			init() {
			
 
				+				this.id = 0;
			
 
				+				this.tabId = 0;
			
 
				+				this.checkBox = [];
			
 
				+				this.checkList = [];
			
 
				+				//初始化求出滚动的宽度
			
 
				+				let view = uni.createSelectorQuery().in(this).select(".next-scroll-title")
			
 
				+				view.boundingClientRect(rect => {
			
 
				+					this.scrollViewWidth = Math.round(rect.width)
			
 
				+				}).exec()
			
 
				+				this.getData();
			
 
				+			},
			
 
				+			async check(index) {
			
 
				+				this.$set(this.checkList, this.id, this.checkBox[this.id][index]);
			
 
				+				const children = this.checkBox[this.id][index][this.childrenKey];
			
 
				+				let n = 0;
			
 
				+				if(children && children.length) {
			
 
				+					n = this.id + 1;	
			
 
				+				} else {
			
 
				+					n = this.id;
			
 
				+				}
			
 
				+				
			
 
				+				let arr = [];
			
 
				+				for(let i=0; i<=n; i++) {
			
 
				+					arr.push({
			
 
				+						title: '请选择',
			
 
				+						id: i
			
 
				+					})
			
 
				+				}
			
 
				+				this.tabList = arr;
			
 
				+				
			
 
				+				if (this.id < this.tabList.length - 1) this.id = this.id + 1;
			
 
				+				await this.getData();
			
 
				+				let view = uni.createSelectorQuery().in(this).select('#next-' + this.tabId)
			
 
				+				view.boundingClientRect(rect => {
			
 
				+					this.elWidth = Math.round(rect.width);
			
 
				+				}).exec()
			
 
				+				setTimeout(() => {
			
 
				+					this.scrollViewWidth = this.scrollViewWidth + this.elWidth;
			
 
				+				});
			
 
				+				if (this.tabId < this.tabList.length - 1) this.tabId = this.tabId + 1;
			
 
				+				
			
 
				+			},
			
 
				+			checkTab(e) {
			
 
				+				if (e == this.id) return;
			
 
				+				this.id = e;
			
 
				+				this.tabId = e;
			
 
				+				this.checkList = this.checkList.splice(0, e);
			
 
				+			},
			
 
				+			getResult(event) {
			
 
				+				if (event == 'confirm') {
			
 
				+					if (this.checkList.length != this.tabList.length) return;
			
 
				+					let result = this.checkList;
			
 
				+					this.checkListModel = result;
			
 
				+					// #ifdef VUE2
			
 
				+						this.$emit('input', this._value)
			
 
				+					// #endif
			
 
				+					// #ifdef VUE3
			
 
				+						this.$emit('update:value', this._value)
			
 
				+					// #endif
			
 
				+					this.$emit('confirm', {
			
 
				+						value: result
			
 
				+					})
			
 
				+				}
			
 
				+				this.close();
			
 
				+			},
			
 
				+			//使用本地假数据进行加载
			
 
				+			async getData() {
			
 
				+				if (this.checkList.length === this.tabList.length) return;
			
 
				+				uni.showLoading({
			
 
				+					title: '加载中...'
			
 
				+				});
			
 
				+				let list = [];
			
 
				+				if (this.checkList.length) {
			
 
				+					var id = this.checkList[this.id - 1][this.valueKey]
			
 
				+					const item = this.checkBox[this.id - 1].find(item => {
			
 
				+						return item[this.valueKey] == id;
			
 
				+					});
			
 
				+					(item[this.childrenKey] ? item[this.childrenKey] : []).map(e => {
			
 
				+						list.push(e);
			
 
				+					});
			
 
				+					uni.hideLoading();
			
 
				+					this.$set(this.checkBox, this.id, list)
			
 
				+				} else {
			
 
				+					this.options.map(e => {
			
 
				+						list.push(e);
			
 
				+					});
			
 
				+					uni.hideLoading()
			
 
				+					this.$set(this.checkBox, this.id, list)
			
 
				+				}
			
 
				+			},
			
 
				+		},
			
 
				+	};
			
 
				+</script>
			
 
				+
			
 
				+<style>
			
 
				+	@font-face {
			
 
				+		font-family: 'iconfont';
			
 
				+		src: url('//at.alicdn.com/t/c/font_4110624_inol5z6r1x.ttf?t=1692936143981') format('truetype');
			
 
				+	}
			
 
				+	.icon {
			
 
				+		font-family: iconfont;
			
 
				+		font-size: 32upx;
			
 
				+		font-style: normal;
			
 
				+		color: #999;
			
 
				+	}
			
 
				+	/deep/ ::-webkit-scrollbar {
			
 
				+		width: 0;
			
 
				+		height: 0;
			
 
				+		color: transparent;
			
 
				+		display: none;
			
 
				+	}
			
 
				+</style>
			
 
				+<style lang="scss" scoped>
			
 
				+	.input-block {
			
 
				+	  display: flex;
			
 
				+	  align-items: center;
			
 
				+		justify-content: center;
			
 
				+	  input {
			
 
				+	    flex: 1;
			
 
				+	    color: #333333;
			
 
				+			pointer-events: none;
			
 
				+	  }
			
 
				+	}
			
 
				+	
			
 
				+	.next-scroll-popup {
			
 
				+		width: 100%;
			
 
				+		position: fixed;
			
 
				+		left:0;
			
 
				+		bottom: -100%;
			
 
				+		z-index: 999;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-open {
			
 
				+		bottom: 0px !important;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-animation {
			
 
				+		transition: all 0.25s linear;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-mask {
			
 
				+		position: fixed;
			
 
				+		top: 0;
			
 
				+		left: 0;
			
 
				+		right: 0;
			
 
				+		bottom: 0;
			
 
				+		background: rgba(0, 0, 0, 0.3);
			
 
				+		z-index: 998;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-box {
			
 
				+		position: absolute;
			
 
				+		bottom: 0;
			
 
				+		width: 100%;
			
 
				+		background: #ffff;
			
 
				+		border-radius: 24rpx 24rpx 0 0;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-temp {
			
 
				+		padding-bottom: env(safe-area-inset-bottom);
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-top {
			
 
				+		height: 88rpx;
			
 
				+		line-height: 88rpx;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-top-left {
			
 
				+		float: left;
			
 
				+		padding-left: 24rpx;
			
 
				+		font-size: 28rpx;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-top-right {
			
 
				+		float: right;
			
 
				+		padding-right: 24rpx;
			
 
				+		color: #3682EA;
			
 
				+		font-size: 28rpx;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-title {
			
 
				+		white-space: nowrap;
			
 
				+		width: 100%;
			
 
				+		height: 88rpx;
			
 
				+		line-height: 88rpx;
			
 
				+		background-color: #fafafa;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-view_H {
			
 
				+		white-space: nowrap;
			
 
				+		width: 100%;
			
 
				+		height: 400rpx;
			
 
				+		line-height: 100rpx;
			
 
				+		background-color: #ffffff;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-title-item {
			
 
				+		position: relative;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-title-item-box {
			
 
				+		display: inline-block;
			
 
				+		margin: 0 10rpx;
			
 
				+		font-size: 28rpx;
			
 
				+		color: #333333;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-title-item-true {
			
 
				+		font-size: 28rpx;
			
 
				+		font-weight: 700;
			
 
				+		color: #3682EA;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-view-box {
			
 
				+		display: flex;
			
 
				+		flex-wrap: wrap;
			
 
				+		justify-content: center;
			
 
				+		margin: 16rpx;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-view-grid-box {
			
 
				+		width: calc(100% - 20rpx);
			
 
				+		margin: 10rpx;
			
 
				+		padding-bottom: 10rpx;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-view-noBox {
			
 
				+		width: 100%;
			
 
				+		height: 400rpx;
			
 
				+		padding-top: 20px;
			
 
				+		text-align: center;
			
 
				+
			
 
				+		image {
			
 
				+			width: 200rpx;
			
 
				+			height: 200rpx;
			
 
				+			margin-top: 32rpx;
			
 
				+		}
			
 
				+
			
 
				+		.text {
			
 
				+			width: 100%;
			
 
				+			text-align: center;
			
 
				+			color: #888;
			
 
				+			font-size: 28rpx;
			
 
				+			margin-top: -40rpx;
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-view-item {
			
 
				+		padding: 0rpx 24rpx;
			
 
				+		text-align: left;
			
 
				+		border-radius: 6rpx;
			
 
				+		background: #f7f7f7;
			
 
				+		color: #333333;
			
 
				+		font-size: 28rpx;
			
 
				+		margin: 12rpx 4rpx;
			
 
				+		height: 66rpx;
			
 
				+		line-height: 66rpx;
			
 
				+		overflow: hidden;
			
 
				+		text-overflow: ellipsis;
			
 
				+		white-space: nowrap;
			
 
				+	}
			
 
				+
			
 
				+	.next-scroll-view-item-true {
			
 
				+		padding: 0rpx 24rpx;
			
 
				+		text-align: left;
			
 
				+		border-radius: 6rpx;
			
 
				+		background-color: #3682EA;
			
 
				+		color: #ffffff;
			
 
				+		font-size: 28rpx;
			
 
				+		margin: 12rpx 4rpx;
			
 
				+		height: 66rpx;
			
 
				+		line-height: 66rpx;
			
 
				+		overflow: hidden;
			
 
				+		text-overflow: ellipsis;
			
 
				+		white-space: nowrap;
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/next-xcascader/package.json
+++ b/uni_modules/next-xcascader/package.json
@@ -0,0 +1,84 @@
 
				+{
			
 
				+  "id": "next-xcascader",
			
 
				+  "displayName": "next-xcascader（vue2、vue3通用，多端适用）自定义多级选择；无限级联",
			
 
				+  "version": "1.0.6",
			
 
				+  "description": "简单好用的多级选择器，省市区多级级联选择，可自定义选择级别和内容，无限级联",
			
 
				+  "keywords": [
			
 
				+    "级联选择器",
			
 
				+    "cascader",
			
 
				+    "无限级联选择器",
			
 
				+    "自定义多级选择",
			
 
				+    "省市区级联"
			
 
				+],
			
 
				+  "engines": {
			
 
				+    "HBuilderX": "^3.1.0"
			
 
				+  },
			
 
				+  "dcloudext": {
			
 
				+    "type": "component-vue",
			
 
				+    "sale": {
			
 
				+      "regular": {
			
 
				+        "price": "0.00"
			
 
				+      },
			
 
				+      "sourcecode": {
			
 
				+        "price": "0.00"
			
 
				+      }
			
 
				+    },
			
 
				+    "contact": {
			
 
				+      "qq": "1207791534"
			
 
				+    },
			
 
				+    "declaration": {
			
 
				+      "ads": "无",
			
 
				+      "data": "无",
			
 
				+      "permissions": "无"
			
 
				+    },
			
 
				+    "npmurl": ""
			
 
				+  },
			
 
				+  "uni_modules": {
			
 
				+    "dependencies": [],
			
 
				+    "encrypt": [],
			
 
				+    "platforms": {
			
 
				+      "cloud": {
			
 
				+        "tcb": "y",
			
 
				+        "aliyun": "y"
			
 
				+      },
			
 
				+      "client": {
			
 
				+        "Vue": {
			
 
				+          "vue2": "y",
			
 
				+          "vue3": "y"
			
 
				+        },
			
 
				+        "App": {
			
 
				+          "app-vue": "y",
			
 
				+          "app-nvue": "n"
			
 
				+        },
			
 
				+        "H5-mobile": {
			
 
				+          "Safari": "y",
			
 
				+          "Android Browser": "y",
			
 
				+          "微信浏览器(Android)": "y",
			
 
				+          "QQ浏览器(Android)": "y"
			
 
				+        },
			
 
				+        "H5-pc": {
			
 
				+          "Chrome": "y",
			
 
				+          "IE": "n",
			
 
				+          "Edge": "y",
			
 
				+          "Firefox": "y",
			
 
				+          "Safari": "y"
			
 
				+        },
			
 
				+        "小程序": {
			
 
				+          "微信": "y",
			
 
				+          "阿里": "y",
			
 
				+          "百度": "y",
			
 
				+          "字节跳动": "y",
			
 
				+          "QQ": "y",
			
 
				+          "钉钉": "y",
			
 
				+          "快手": "y",
			
 
				+          "飞书": "y",
			
 
				+          "京东": "y"
			
 
				+        },
			
 
				+        "快应用": {
			
 
				+          "华为": "u",
			
 
				+          "联盟": "u"
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
--- a/uni_modules/next-xcascader/readme.md
+++ b/uni_modules/next-xcascader/readme.md
@@ -0,0 +1,275 @@
 
				+### next-xcascader适用于uni-app项目的多级选择组件
			
 
				+### 本组件目前兼容微信小程序、H5、APP端
			
 
				+### 本组件支持省市区选择、多级选择、自定义选择级数据自定义选择项、无限级联、通过接口异步加载选择项
			
 
				+### 本组件可以轻松结合第三方ui组件使用，已经实现双向绑定，同时支持vue3 vue2语法
			
 
				+>[从uniapp插件市场导入](https://ext.dcloud.net.cn/plugin?name=next-xcascader)
			
 
				+> 遇到问题或有建议可以加入QQ群(455948571)反馈  
			
 
				+> 如果觉得组件不错，<font color=#f00>给五星鼓励鼓励</font>咯！
			
 
				+
			
 
				+## 注意
			
 
				+	
			
 
				+### 作者不介意你对组件源码进行改造使用，为了开源更加高效，谢谢你的配合；为了节省不必要的沟通浪费，以下情况请不要再反馈给作者，请自行解决；
			
 
				+### 在这感各位的理解，我支持开源，但是作者时间有限；谢谢各位的配合；在这里期望我写的小小插件能为你提供便捷；
			
 
				+	
			
 
				+ >  1.如果你对源码进行了修改使用，请不需要对作者做任何的反馈，作者确实没有空陪你做技术分析解答；  
			
 
				+ >  2.如果你引入插件，连插件是否有正常被uniapp框架识别解析都不清楚，请你换个插件使用；  
			
 
				+ >  3.如果你引入插件，针对自己项目进行功能改造的，请自行仔细阅读源码并了解其原理，自行改造；这里作者不愿意浪费过多时间进行技术解答；  
			
 
				+ >  4.理论上作者不再解决由于本地开发环境问题所导致的插件使用问题，请自行到uniapp官网学习解决；	
			
 
				+
			
 
				+
			
 
				+### 使用方式（vue3 + uview-plus demo）	
			
 
				+### vue2同样适用，在这里不再写demo，如果有使用问题请加QQ群(455948571)反馈
			
 
				+``` html
			
 
				+<template>
			
 
				+	<view>
			
 
				+		<view style="font-size: 14px;color:#fff;background-color: #f9ae3d;padding: 20rpx;margin-bottom: 30px;">
			
 
				+			<text>结合(uview-plus)框架使用实例：</text>
			
 
				+		</view>
			
 
				+		<u--form labelWidth="80" labelAlign="right">
			
 
				+			<u-form-item borderBottom label="文本输入">
			
 
				+				<u-input input-align="right" placeholder="请输入文本" v-model="form.text" />
			
 
				+			</u-form-item>
			
 
				+			<u-form-item borderBottom label="级联选择1">
			
 
				+				<next-xcascader inputAlign="right" placeholder="请选择" v-model="form.cascader" :options="options" />
			
 
				+			</u-form-item>
			
 
				+			<u-form-item borderBottom label="级联选择2">
			
 
				+				<next-xcascader inputAlign="center" placeholder="请选择" v-model="form.cascader" :options="options" />
			
 
				+			</u-form-item>
			
 
				+			<u-form-item borderBottom label="级联选择3">
			
 
				+				<next-xcascader inputAlign="left" placeholder="请选择" v-model="form.cascader" :options="options" />
			
 
				+			</u-form-item>
			
 
				+			<u-form-item borderBottom label="级联选择4">
			
 
				+				<next-xcascader :showArrow="false" inputAlign="right" placeholder="请选择" v-model="form.cascader" :options="options" />
			
 
				+			</u-form-item>
			
 
				+		</u--form>
			
 
				+	</view>
			
 
				+	<view style="padding:0 20px;border:1rpx solid #ccc;margin-top: 30px;">
			
 
				+		<view style="font-size: 16px;color: #666;padding: 10px;text-align: center;"><text>自定义级联选择器</text></view>
			
 
				+		<next-xcascader :customRenderLabelFunc="customLabelRender" :showArrow="false" inputAlign="center" v-model:value="valueModel" @confirm="onconfirm" :options="options"></next-xcascader>
			
 
				+	</view>
			
 
				+</template>
			
 
				+```
			
 
				+##options数据格式(city.js)(注意：组件自动检查数据源options的子集关键key，有多少层的子集关键key存在，就是多少级级联)：
			
 
				+``` javascript
			
 
				+export default [
			
 
				+	{
			
 
				+	  value: '110000',
			
 
				+	  label: '北京市',
			
 
				+	  children: [
			
 
				+	    {
			
 
				+	      value: '110100',
			
 
				+	      label: '北京市',
			
 
				+	      children: [
			
 
				+	        {
			
 
				+	          value: '110101',
			
 
				+	          label: '东城区',
			
 
				+						children: [
			
 
				+							{
			
 
				+								value: '11010101',
			
 
				+								label: '东城区-测试1',
			
 
				+							},
			
 
				+							{
			
 
				+								value: '11010102',
			
 
				+								label: '东城区-测试2',
			
 
				+							}
			
 
				+						],
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110102',
			
 
				+	          label: '西城区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110105',
			
 
				+	          label: '朝阳区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110106',
			
 
				+	          label: '丰台区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110107',
			
 
				+	          label: '石景山区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110108',
			
 
				+	          label: '海淀区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110109',
			
 
				+	          label: '门头沟区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110111',
			
 
				+	          label: '房山区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110112',
			
 
				+	          label: '通州区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110113',
			
 
				+	          label: '顺义区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110114',
			
 
				+	          label: '昌平区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110115',
			
 
				+	          label: '大兴区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110116',
			
 
				+	          label: '怀柔区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110117',
			
 
				+	          label: '平谷区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110118',
			
 
				+	          label: '密云区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '110119',
			
 
				+	          label: '延庆区',
			
 
				+	        },
			
 
				+	      ],
			
 
				+	    },
			
 
				+	  ],
			
 
				+	},
			
 
				+	{
			
 
				+	  value: '120000',
			
 
				+	  label: '天津市',
			
 
				+	  children: [
			
 
				+	    {
			
 
				+	      value: '120100',
			
 
				+	      label: '天津市',
			
 
				+	      children: [
			
 
				+	        {
			
 
				+	          value: '120101',
			
 
				+	          label: '和平区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120102',
			
 
				+	          label: '河东区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120103',
			
 
				+	          label: '河西区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120104',
			
 
				+	          label: '南开区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120105',
			
 
				+	          label: '河北区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120106',
			
 
				+	          label: '红桥区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120110',
			
 
				+	          label: '东丽区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120111',
			
 
				+	          label: '西青区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120112',
			
 
				+	          label: '津南区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120113',
			
 
				+	          label: '北辰区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120114',
			
 
				+	          label: '武清区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120115',
			
 
				+	          label: '宝坻区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120116',
			
 
				+	          label: '滨海新区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120117',
			
 
				+	          label: '宁河区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120118',
			
 
				+	          label: '静海区',
			
 
				+	        },
			
 
				+	        {
			
 
				+	          value: '120119',
			
 
				+	          label: '蓟州区',
			
 
				+	        },
			
 
				+	      ],
			
 
				+	    },
			
 
				+	  ],
			
 
				+	},
			
 
				+]
			
 
				+```
			
 
				+``` javascript
			
 
				+<script setup lang="ts">
			
 
				+import {ref} from 'vue'
			
 
				+import data from './city.js'
			
 
				+
			
 
				+const form = ref({
			
 
				+	text: '',
			
 
				+	cascader1: '',
			
 
				+	cascader2: '',
			
 
				+	cascader3: '',
			
 
				+	cascader4: ''
			
 
				+})
			
 
				+const options = ref(data)
			
 
				+const valueModel = ref('')
			
 
				+function onconfirm(res) {
			
 
				+	console.log('---------confirm----------', res)
			
 
				+	console.log('--------v-model-----------', valueModel.value)
			
 
				+}
			
 
				+function customLabelRender(label) {
			
 
				+	return label ? ('自定义：' + label) : label
			
 
				+}
			
 
				+</script>
			
 
				+```
			
 
				+### 属性说明
			
 
				+| 名称                        | 类型           | 默认值                  | 描述           				                               |
			
 
				+| ----------------------------|--------------- | ---------------------- | -----------------------------------------------------|
			
 
				+| value                    		| String         | ''                     | v-model（vue2） / v-model:value（vue3） 绑定值	       |
			
 
				+| isMask                      | Boolean        | true                   | 是否点击阴影关闭			                                 |
			
 
				+| animation                   | Boolean        | true                   | 是否开启动画                                          |
			
 
				+| safeArea                    | Boolean        | true                   | 是否开启安全条			                                   |
			
 
				+| options                     | Array          | []                    	| 数据源	（详细请看city.jsdemo）												 |
			
 
				+| valueKey                    | String         | 'value'                | 数据源	中绑定value属性的关键key(用于做选中值的绑定) 		 |
			
 
				+| labelKey                    | String         | 'label'                | 数据源	中绑定label属性的关键key(用于做选中值的显示) 		 |
			
 
				+| childrenKey                 | String         | 'children'             | 数据源	绑定子集关键key 		                             |
			
 
				+| showArrow                   | Boolean        | true             			| 是否展示右侧箭头		                                   |
			
 
				+| placeholder                 | String         | '请选择'             	  | placeholder		                                       |
			
 
				+| disabled                 		| Boolean        | false             			| disabled是否禁用		                                   |
			
 
				+| inputAlign                  | String         | 'right'             		| 对齐方式		                                           |
			
 
				+| customRenderLabelFunc       | Function       |             						| 自定义显示label渲染函数，返回要显示的内容		             |
			
 
				+
			
 
				+
			
 
				+## Event 事件
			
 
				+|事件名	|说明																										|类型	|回调参数	  |
			
 
				+|----		|----																										|----	|----			  |
			
 
				+|confirm|点击确定的回调事件																		  |emit	|[Object]		|
			
 
				+|close  |关闭控件的回调事件																		  |emit	|---		    |
			
 
				+
			
 
				+### 预览
			
 
				+
			
 
				+***
			
 
				+
			
 
				+|                    (next-xcascader演示效果展示)                  			 					|
			
 
				+| :-----------------------------------------------------------------------------: |
			
 
				+| ![](https://lixueshiaa.github.io/webtest/www/static/next-xcascader.gif) 	     	|
			
 
				+
			
 
				+
			
 
				+
			
--- a/uni_modules/uni-data-checkbox/changelog.md
+++ b/uni_modules/uni-data-checkbox/changelog.md
@@ -0,0 +1,49 @@
 
				+## 1.0.5（2024-03-20）
			
 
				+- 修复 单选模式下选中样式不生效的bug
			
 
				+## 1.0.4（2024-01-27）
			
 
				+- 修复 修复错别字chagne为change
			
 
				+## 1.0.3（2022-09-16）
			
 
				+- 可以使用 uni-scss 控制主题色
			
 
				+## 1.0.2（2022-06-30）
			
 
				+- 优化 在 uni-forms 中的依赖注入方式
			
 
				+## 1.0.1（2022-02-07）
			
 
				+- 修复 multiple 为 true 时，v-model 的值为 null 报错的 bug
			
 
				+## 1.0.0（2021-11-19）
			
 
				+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
			
 
				+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-data-checkbox](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox)
			
 
				+## 0.2.5（2021-08-23）
			
 
				+- 修复 在uni-forms中 modelValue 中不存在当前字段，当前字段必填写也不参与校验的问题
			
 
				+## 0.2.4（2021-08-17）
			
 
				+- 修复 单选 list 模式下 ，icon 为 left 时，选中图标不显示的问题
			
 
				+## 0.2.3（2021-08-11）
			
 
				+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
			
 
				+## 0.2.2（2021-07-30）
			
 
				+- 优化 在uni-forms组件，与label不对齐的问题
			
 
				+## 0.2.1（2021-07-27）
			
 
				+- 修复 单选默认值为0不能选中的Bug
			
 
				+## 0.2.0（2021-07-13）
			
 
				+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
			
 
				+## 0.1.11（2021-07-06）
			
 
				+- 优化 删除无用日志
			
 
				+## 0.1.10（2021-07-05）
			
 
				+- 修复 由 0.1.9 引起的非 nvue 端图标不显示的问题
			
 
				+## 0.1.9（2021-07-05）
			
 
				+- 修复 nvue 黑框样式问题
			
 
				+## 0.1.8（2021-06-28）
			
 
				+- 修复 selectedTextColor 属性不生效的Bug
			
 
				+## 0.1.7（2021-06-02）
			
 
				+- 新增 map 属性，可以方便映射text/value属性
			
 
				+## 0.1.6（2021-05-26）
			
 
				+- 修复 不关联服务空间的情况下组件报错的Bug
			
 
				+## 0.1.5（2021-05-12）
			
 
				+- 新增 组件示例地址
			
 
				+## 0.1.4（2021-04-09）
			
 
				+- 修复 nvue 下无法选中的问题
			
 
				+## 0.1.3（2021-03-22）
			
 
				+- 新增 disabled属性
			
 
				+## 0.1.2（2021-02-24）
			
 
				+- 优化 默认颜色显示
			
 
				+## 0.1.1（2021-02-24）
			
 
				+- 新增 支持nvue
			
 
				+## 0.1.0（2021-02-18）
			
 
				+- “暂无数据”显示居中
			
--- a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
+++ b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
@@ -0,0 +1,849 @@
 
				+<template>
			
 
				+	<view class="uni-data-checklist" :style="{'margin-top':isTop+'px'}">
			
 
				+		<template v-if="!isLocal">
			
 
				+			<view class="uni-data-loading">
			
 
				+				<uni-load-more v-if="!mixinDatacomErrorMessage" status="loading" iconType="snow" :iconSize="18"
			
 
				+					:content-text="contentText"></uni-load-more>
			
 
				+				<text v-else>{{mixinDatacomErrorMessage}}</text>
			
 
				+			</view>
			
 
				+		</template>
			
 
				+		<template v-else>
			
 
				+			<checkbox-group v-if="multiple" class="checklist-group" :class="{'is-list':mode==='list' || wrap}"
			
 
				+				@change="change">
			
 
				+				<label class="checklist-box"
			
 
				+					:class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
			
 
				+					:style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
			
 
				+					<checkbox class="hidden" hidden :disabled="disabled || !!item.disabled" :value="item[map.value]+''"
			
 
				+						:checked="item.selected" />
			
 
				+					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')"
			
 
				+						class="checkbox__inner" :style="item.styleIcon">
			
 
				+						<view class="checkbox__inner-icon"></view>
			
 
				+					</view>
			
 
				+					<view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
			
 
				+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
			
 
				+						<view v-if="mode === 'list' && icon === 'right'" class="checkobx__list" :style="item.styleBackgroud"></view>
			
 
				+					</view>
			
 
				+				</label>
			
 
				+			</checkbox-group>
			
 
				+			<radio-group v-else class="checklist-group" :class="{'is-list':mode==='list','is-wrap':wrap}" @change="change">
			
 
				+				<label class="checklist-box"
			
 
				+					:class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
			
 
				+					:style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
			
 
				+					<radio class="hidden" hidden :disabled="disabled || item.disabled" :value="item[map.value]+''"
			
 
				+						:checked="item.selected" />
			
 
				+					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="radio__inner"
			
 
				+						:style="item.styleBackgroud">
			
 
				+						<view class="radio__inner-icon" :style="item.styleIcon"></view>
			
 
				+					</view>
			
 
				+					<view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
			
 
				+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
			
 
				+						<view v-if="mode === 'list' && icon === 'right'" :style="item.styleRightIcon" class="checkobx__list"></view>
			
 
				+					</view>
			
 
				+				</label>
			
 
				+			</radio-group>
			
 
				+		</template>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	/**
			
 
				+	 * DataChecklist 数据选择器
			
 
				+	 * @description 通过数据渲染 checkbox 和 radio
			
 
				+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
			
 
				+	 * @property {String} mode = [default| list | button | tag] 显示模式
			
 
				+	 * @value default  	默认横排模式
			
 
				+	 * @value list		列表模式
			
 
				+	 * @value button	按钮模式
			
 
				+	 * @value tag 		标签模式
			
 
				+	 * @property {Boolean} multiple = [true|false] 是否多选
			
 
				+	 * @property {Array|String|Number} value 默认值
			
 
				+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
			
 
				+	 * @property {Number|String} min 最小选择个数 ，multiple为true时生效
			
 
				+	 * @property {Number|String} max 最大选择个数 ，multiple为true时生效
			
 
				+	 * @property {Boolean} wrap 是否换行显示
			
 
				+	 * @property {String} icon = [left|right]  list 列表模式下icon显示位置
			
 
				+	 * @property {Boolean} selectedColor 选中颜色
			
 
				+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
			
 
				+	 * @property {Boolean} selectedTextColor 选中文本颜色，如不填写则自动显示
			
 
				+	 * @property {Object} map 字段映射， 默认 map={text:'text',value:'value'}
			
 
				+	 * @value left 左侧显示
			
 
				+	 * @value right 右侧显示
			
 
				+	 * @event {Function} change  选中发生变化触发
			
 
				+	 */
			
 
				+
			
 
				+	export default {
			
 
				+		name: 'uniDataChecklist',
			
 
				+		mixins: [uniCloud.mixinDatacom || {}],
			
 
				+		emits: ['input', 'update:modelValue', 'change'],
			
 
				+		props: {
			
 
				+			mode: {
			
 
				+				type: String,
			
 
				+				default: 'default'
			
 
				+			},
			
 
				+
			
 
				+			multiple: {
			
 
				+				type: Boolean,
			
 
				+				default: false
			
 
				+			},
			
 
				+			value: {
			
 
				+				type: [Array, String, Number],
			
 
				+				default () {
			
 
				+					return ''
			
 
				+				}
			
 
				+			},
			
 
				+			// TODO vue3
			
 
				+			modelValue: {
			
 
				+				type: [Array, String, Number],
			
 
				+				default () {
			
 
				+					return '';
			
 
				+				}
			
 
				+			},
			
 
				+			localdata: {
			
 
				+				type: Array,
			
 
				+				default () {
			
 
				+					return []
			
 
				+				}
			
 
				+			},
			
 
				+			min: {
			
 
				+				type: [Number, String],
			
 
				+				default: ''
			
 
				+			},
			
 
				+			max: {
			
 
				+				type: [Number, String],
			
 
				+				default: ''
			
 
				+			},
			
 
				+			wrap: {
			
 
				+				type: Boolean,
			
 
				+				default: false
			
 
				+			},
			
 
				+			icon: {
			
 
				+				type: String,
			
 
				+				default: 'left'
			
 
				+			},
			
 
				+			selectedColor: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			selectedTextColor: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			emptyText: {
			
 
				+				type: String,
			
 
				+				default: '暂无数据'
			
 
				+			},
			
 
				+			disabled: {
			
 
				+				type: Boolean,
			
 
				+				default: false
			
 
				+			},
			
 
				+			map: {
			
 
				+				type: Object,
			
 
				+				default () {
			
 
				+					return {
			
 
				+						text: 'text',
			
 
				+						value: 'value'
			
 
				+					}
			
 
				+				}
			
 
				+			}
			
 
				+		},
			
 
				+		watch: {
			
 
				+			localdata: {
			
 
				+				handler(newVal) {
			
 
				+					this.range = newVal
			
 
				+					this.dataList = this.getDataList(this.getSelectedValue(newVal))
			
 
				+				},
			
 
				+				deep: true
			
 
				+			},
			
 
				+			mixinDatacomResData(newVal) {
			
 
				+				this.range = newVal
			
 
				+				this.dataList = this.getDataList(this.getSelectedValue(newVal))
			
 
				+			},
			
 
				+			value(newVal) {
			
 
				+				this.dataList = this.getDataList(newVal)
			
 
				+				// fix by mehaotian is_reset 在 uni-forms 中定义
			
 
				+				// if(!this.is_reset){
			
 
				+				// 	this.is_reset = false
			
 
				+				// 	this.formItem && this.formItem.setValue(newVal)
			
 
				+				// }
			
 
				+			},
			
 
				+			modelValue(newVal) {
			
 
				+				this.dataList = this.getDataList(newVal);
			
 
				+				// if(!this.is_reset){
			
 
				+				// 	this.is_reset = false
			
 
				+				// 	this.formItem && this.formItem.setValue(newVal)
			
 
				+				// }
			
 
				+			}
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {
			
 
				+				dataList: [],
			
 
				+				range: [],
			
 
				+				contentText: {
			
 
				+					contentdown: '查看更多',
			
 
				+					contentrefresh: '加载中',
			
 
				+					contentnomore: '没有更多'
			
 
				+				},
			
 
				+				isLocal: true,
			
 
				+				styles: {
			
 
				+					selectedColor: '#2979ff',
			
 
				+					selectedTextColor: '#666',
			
 
				+				},
			
 
				+				isTop: 0
			
 
				+			};
			
 
				+		},
			
 
				+		computed: {
			
 
				+			dataValue() {
			
 
				+				if (this.value === '') return this.modelValue
			
 
				+				if (this.modelValue === '') return this.value
			
 
				+				return this.value
			
 
				+			}
			
 
				+		},
			
 
				+		created() {
			
 
				+			// this.form = this.getForm('uniForms')
			
 
				+			// this.formItem = this.getForm('uniFormsItem')
			
 
				+			// this.formItem && this.formItem.setValue(this.value)
			
 
				+
			
 
				+			// if (this.formItem) {
			
 
				+			// 	this.isTop = 6
			
 
				+			// 	if (this.formItem.name) {
			
 
				+			// 		// 如果存在name添加默认值,否则formData 中不存在这个字段不校验
			
 
				+			// 		if(!this.is_reset){
			
 
				+			// 			this.is_reset = false
			
 
				+			// 			this.formItem.setValue(this.dataValue)
			
 
				+			// 		}
			
 
				+			// 		this.rename = this.formItem.name
			
 
				+			// 		this.form.inputChildrens.push(this)
			
 
				+			// 	}
			
 
				+			// }
			
 
				+
			
 
				+			if (this.localdata && this.localdata.length !== 0) {
			
 
				+				this.isLocal = true
			
 
				+				this.range = this.localdata
			
 
				+				this.dataList = this.getDataList(this.getSelectedValue(this.range))
			
 
				+			} else {
			
 
				+				if (this.collection) {
			
 
				+					this.isLocal = false
			
 
				+					this.loadData()
			
 
				+				}
			
 
				+			}
			
 
				+		},
			
 
				+		methods: {
			
 
				+			loadData() {
			
 
				+				this.mixinDatacomGet().then(res => {
			
 
				+					this.mixinDatacomResData = res.result.data
			
 
				+					if (this.mixinDatacomResData.length === 0) {
			
 
				+						this.isLocal = false
			
 
				+						this.mixinDatacomErrorMessage = this.emptyText
			
 
				+					} else {
			
 
				+						this.isLocal = true
			
 
				+					}
			
 
				+				}).catch(err => {
			
 
				+					this.mixinDatacomErrorMessage = err.message
			
 
				+				})
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 获取父元素实例
			
 
				+			 */
			
 
				+			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;
			
 
				+			},
			
 
				+			change(e) {
			
 
				+				const values = e.detail.value
			
 
				+
			
 
				+				let detail = {
			
 
				+					value: [],
			
 
				+					data: []
			
 
				+				}
			
 
				+
			
 
				+				if (this.multiple) {
			
 
				+					this.range.forEach(item => {
			
 
				+
			
 
				+						if (values.includes(item[this.map.value] + '')) {
			
 
				+							detail.value.push(item[this.map.value])
			
 
				+							detail.data.push(item)
			
 
				+						}
			
 
				+					})
			
 
				+				} else {
			
 
				+					const range = this.range.find(item => (item[this.map.value] + '') === values)
			
 
				+					if (range) {
			
 
				+						detail = {
			
 
				+							value: range[this.map.value],
			
 
				+							data: range
			
 
				+						}
			
 
				+					}
			
 
				+				}
			
 
				+				// this.formItem && this.formItem.setValue(detail.value)
			
 
				+				// TODO 兼容 vue2
			
 
				+				this.$emit('input', detail.value);
			
 
				+				// // TOTO 兼容 vue3
			
 
				+				this.$emit('update:modelValue', detail.value);
			
 
				+				this.$emit('change', {
			
 
				+					detail
			
 
				+				})
			
 
				+				if (this.multiple) {
			
 
				+					// 如果 v-model 没有绑定 ，则走内部逻辑
			
 
				+					// if (this.value.length === 0) {
			
 
				+					this.dataList = this.getDataList(detail.value, true)
			
 
				+					// }
			
 
				+				} else {
			
 
				+					this.dataList = this.getDataList(detail.value)
			
 
				+				}
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 获取渲染的新数组
			
 
				+			 * @param {Object} value 选中内容
			
 
				+			 */
			
 
				+			getDataList(value) {
			
 
				+				// 解除引用关系，破坏原引用关系，避免污染源数据
			
 
				+				let dataList = JSON.parse(JSON.stringify(this.range))
			
 
				+				let list = []
			
 
				+				if (this.multiple) {
			
 
				+					if (!Array.isArray(value)) {
			
 
				+						value = []
			
 
				+					}
			
 
				+				}
			
 
				+				dataList.forEach((item, index) => {
			
 
				+					item.disabled = item.disable || item.disabled || false
			
 
				+					if (this.multiple) {
			
 
				+						if (value.length > 0) {
			
 
				+							let have = value.find(val => val === item[this.map.value])
			
 
				+							item.selected = have !== undefined
			
 
				+						} else {
			
 
				+							item.selected = false
			
 
				+						}
			
 
				+					} else {
			
 
				+						item.selected = value === item[this.map.value]
			
 
				+					}
			
 
				+
			
 
				+					list.push(item)
			
 
				+				})
			
 
				+				return this.setRange(list)
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 处理最大最小值
			
 
				+			 * @param {Object} list
			
 
				+			 */
			
 
				+			setRange(list) {
			
 
				+				let selectList = list.filter(item => item.selected)
			
 
				+				let min = Number(this.min) || 0
			
 
				+				let max = Number(this.max) || ''
			
 
				+				list.forEach((item, index) => {
			
 
				+					if (this.multiple) {
			
 
				+						if (selectList.length <= min) {
			
 
				+							let have = selectList.find(val => val[this.map.value] === item[this.map.value])
			
 
				+							if (have !== undefined) {
			
 
				+								item.disabled = true
			
 
				+							}
			
 
				+						}
			
 
				+
			
 
				+						if (selectList.length >= max && max !== '') {
			
 
				+							let have = selectList.find(val => val[this.map.value] === item[this.map.value])
			
 
				+							if (have === undefined) {
			
 
				+								item.disabled = true
			
 
				+							}
			
 
				+						}
			
 
				+					}
			
 
				+					this.setStyles(item, index)
			
 
				+					list[index] = item
			
 
				+				})
			
 
				+				return list
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 设置 class
			
 
				+			 * @param {Object} item
			
 
				+			 * @param {Object} index
			
 
				+			 */
			
 
				+			setStyles(item, index) {
			
 
				+				//  设置自定义样式
			
 
				+				item.styleBackgroud = this.setStyleBackgroud(item)
			
 
				+				item.styleIcon = this.setStyleIcon(item)
			
 
				+				item.styleIconText = this.setStyleIconText(item)
			
 
				+				item.styleRightIcon = this.setStyleRightIcon(item)
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 获取选中值
			
 
				+			 * @param {Object} range
			
 
				+			 */
			
 
				+			getSelectedValue(range) {
			
 
				+				if (!this.multiple) return this.dataValue
			
 
				+				let selectedArr = []
			
 
				+				range.forEach((item) => {
			
 
				+					if (item.selected) {
			
 
				+						selectedArr.push(item[this.map.value])
			
 
				+					}
			
 
				+				})
			
 
				+				return this.dataValue.length > 0 ? this.dataValue : selectedArr
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 设置背景样式
			
 
				+			 */
			
 
				+			setStyleBackgroud(item) {
			
 
				+				let styles = {}
			
 
				+				let selectedColor = this.selectedColor ? this.selectedColor : '#2979ff'
			
 
				+				if (this.selectedColor) {
			
 
				+					if (this.mode !== 'list') {
			
 
				+						styles['border-color'] = item.selected ? selectedColor : '#DCDFE6'
			
 
				+					}
			
 
				+					if (this.mode === 'tag') {
			
 
				+						styles['background-color'] = item.selected ? selectedColor : '#f5f5f5'
			
 
				+					}
			
 
				+				}
			
 
				+				let classles = ''
			
 
				+				for (let i in styles) {
			
 
				+					classles += `${i}:${styles[i]};`
			
 
				+				}
			
 
				+				return classles
			
 
				+			},
			
 
				+			setStyleIcon(item) {
			
 
				+				let styles = {}
			
 
				+				let classles = ''
			
 
				+				if (this.selectedColor) {
			
 
				+					let selectedColor = this.selectedColor ? this.selectedColor : '#2979ff'
			
 
				+					styles['background-color'] = item.selected ? selectedColor : '#fff'
			
 
				+					styles['border-color'] = item.selected ? selectedColor : '#DCDFE6'
			
 
				+
			
 
				+					if (!item.selected && item.disabled) {
			
 
				+						styles['background-color'] = '#F2F6FC'
			
 
				+						styles['border-color'] = item.selected ? selectedColor : '#DCDFE6'
			
 
				+					}
			
 
				+				}
			
 
				+				for (let i in styles) {
			
 
				+					classles += `${i}:${styles[i]};`
			
 
				+				}
			
 
				+				return classles
			
 
				+			},
			
 
				+			setStyleIconText(item) {
			
 
				+				let styles = {}
			
 
				+				let classles = ''
			
 
				+				if (this.selectedColor) {
			
 
				+					let selectedColor = this.selectedColor ? this.selectedColor : '#2979ff'
			
 
				+					if (this.mode === 'tag') {
			
 
				+						styles.color = item.selected ? (this.selectedTextColor ? this.selectedTextColor : '#fff') : '#666'
			
 
				+					} else {
			
 
				+						styles.color = item.selected ? (this.selectedTextColor ? this.selectedTextColor : selectedColor) : '#666'
			
 
				+					}
			
 
				+					if (!item.selected && item.disabled) {
			
 
				+						styles.color = '#999'
			
 
				+					}
			
 
				+				}
			
 
				+				for (let i in styles) {
			
 
				+					classles += `${i}:${styles[i]};`
			
 
				+				}
			
 
				+				return classles
			
 
				+			},
			
 
				+			setStyleRightIcon(item) {
			
 
				+				let styles = {}
			
 
				+				let classles = ''
			
 
				+				if (this.mode === 'list') {
			
 
				+					styles['border-color'] = item.selected ? this.styles.selectedColor : '#DCDFE6'
			
 
				+				}
			
 
				+				for (let i in styles) {
			
 
				+					classles += `${i}:${styles[i]};`
			
 
				+				}
			
 
				+
			
 
				+				return classles
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss">
			
 
				+	$uni-primary: #2979ff !default;
			
 
				+	$border-color: #DCDFE6;
			
 
				+	$disable: 0.4;
			
 
				+
			
 
				+	@mixin flex {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		/* #endif */
			
 
				+	}
			
 
				+
			
 
				+	.uni-data-loading {
			
 
				+		@include flex;
			
 
				+		flex-direction: row;
			
 
				+		justify-content: center;
			
 
				+		align-items: center;
			
 
				+		height: 36px;
			
 
				+		padding-left: 10px;
			
 
				+		color: #999;
			
 
				+	}
			
 
				+
			
 
				+	.uni-data-checklist {
			
 
				+		position: relative;
			
 
				+		z-index: 0;
			
 
				+		flex: 1;
			
 
				+
			
 
				+		// 多选样式
			
 
				+		.checklist-group {
			
 
				+			@include flex;
			
 
				+			flex-direction: row;
			
 
				+			flex-wrap: wrap;
			
 
				+
			
 
				+			&.is-list {
			
 
				+				flex-direction: column;
			
 
				+			}
			
 
				+
			
 
				+			.checklist-box {
			
 
				+				@include flex;
			
 
				+				flex-direction: row;
			
 
				+				align-items: center;
			
 
				+				position: relative;
			
 
				+				margin: 5px 0;
			
 
				+				margin-right: 25px;
			
 
				+
			
 
				+				.hidden {
			
 
				+					position: absolute;
			
 
				+					opacity: 0;
			
 
				+				}
			
 
				+
			
 
				+				// 文字样式
			
 
				+				.checklist-content {
			
 
				+					@include flex;
			
 
				+					flex: 1;
			
 
				+					flex-direction: row;
			
 
				+					align-items: center;
			
 
				+					justify-content: space-between;
			
 
				+
			
 
				+					.checklist-text {
			
 
				+						font-size: 14px;
			
 
				+						color: #666;
			
 
				+						margin-left: 5px;
			
 
				+						line-height: 14px;
			
 
				+					}
			
 
				+
			
 
				+					.checkobx__list {
			
 
				+						border-right-width: 1px;
			
 
				+						border-right-color: #007aff;
			
 
				+						border-right-style: solid;
			
 
				+						border-bottom-width: 1px;
			
 
				+						border-bottom-color: #007aff;
			
 
				+						border-bottom-style: solid;
			
 
				+						height: 12px;
			
 
				+						width: 6px;
			
 
				+						left: -5px;
			
 
				+						transform-origin: center;
			
 
				+						transform: rotate(45deg);
			
 
				+						opacity: 0;
			
 
				+					}
			
 
				+				}
			
 
				+
			
 
				+				// 多选样式
			
 
				+				.checkbox__inner {
			
 
				+					/* #ifndef APP-NVUE */
			
 
				+					flex-shrink: 0;
			
 
				+					box-sizing: border-box;
			
 
				+					/* #endif */
			
 
				+					position: relative;
			
 
				+					width: 16px;
			
 
				+					height: 16px;
			
 
				+					border: 1px solid $border-color;
			
 
				+					border-radius: 4px;
			
 
				+					background-color: #fff;
			
 
				+					z-index: 1;
			
 
				+
			
 
				+					.checkbox__inner-icon {
			
 
				+						position: absolute;
			
 
				+						/* #ifdef APP-NVUE */
			
 
				+						top: 2px;
			
 
				+						/* #endif */
			
 
				+						/* #ifndef APP-NVUE */
			
 
				+						top: 1px;
			
 
				+						/* #endif */
			
 
				+						left: 5px;
			
 
				+						height: 8px;
			
 
				+						width: 4px;
			
 
				+						border-right-width: 1px;
			
 
				+						border-right-color: #fff;
			
 
				+						border-right-style: solid;
			
 
				+						border-bottom-width: 1px;
			
 
				+						border-bottom-color: #fff;
			
 
				+						border-bottom-style: solid;
			
 
				+						opacity: 0;
			
 
				+						transform-origin: center;
			
 
				+						transform: rotate(40deg);
			
 
				+					}
			
 
				+				}
			
 
				+
			
 
				+				// 单选样式
			
 
				+				.radio__inner {
			
 
				+					@include flex;
			
 
				+					/* #ifndef APP-NVUE */
			
 
				+					flex-shrink: 0;
			
 
				+					box-sizing: border-box;
			
 
				+					/* #endif */
			
 
				+					justify-content: center;
			
 
				+					align-items: center;
			
 
				+					position: relative;
			
 
				+					width: 16px;
			
 
				+					height: 16px;
			
 
				+					border: 1px solid $border-color;
			
 
				+					border-radius: 16px;
			
 
				+					background-color: #fff;
			
 
				+					z-index: 1;
			
 
				+
			
 
				+					.radio__inner-icon {
			
 
				+						width: 8px;
			
 
				+						height: 8px;
			
 
				+						border-radius: 10px;
			
 
				+						opacity: 0;
			
 
				+					}
			
 
				+				}
			
 
				+
			
 
				+				// 默认样式
			
 
				+				&.is--default {
			
 
				+
			
 
				+					// 禁用
			
 
				+					&.is-disable {
			
 
				+						/* #ifdef H5 */
			
 
				+						cursor: not-allowed;
			
 
				+
			
 
				+						/* #endif */
			
 
				+						.checkbox__inner {
			
 
				+							background-color: #F2F6FC;
			
 
				+							border-color: $border-color;
			
 
				+							/* #ifdef H5 */
			
 
				+							cursor: not-allowed;
			
 
				+							/* #endif */
			
 
				+						}
			
 
				+
			
 
				+						.radio__inner {
			
 
				+							background-color: #F2F6FC;
			
 
				+							border-color: $border-color;
			
 
				+						}
			
 
				+
			
 
				+						.checklist-text {
			
 
				+							color: #999;
			
 
				+						}
			
 
				+					}
			
 
				+
			
 
				+					// 选中
			
 
				+					&.is-checked {
			
 
				+						.checkbox__inner {
			
 
				+							border-color: $uni-primary;
			
 
				+							background-color: $uni-primary;
			
 
				+
			
 
				+							.checkbox__inner-icon {
			
 
				+								opacity: 1;
			
 
				+								transform: rotate(45deg);
			
 
				+							}
			
 
				+						}
			
 
				+
			
 
				+						.radio__inner {
			
 
				+							border-color: $uni-primary;
			
 
				+
			
 
				+							.radio__inner-icon {
			
 
				+								opacity: 1;
			
 
				+								background-color: $uni-primary;
			
 
				+							}
			
 
				+						}
			
 
				+
			
 
				+						.checklist-text {
			
 
				+							color: $uni-primary;
			
 
				+						}
			
 
				+
			
 
				+						// 选中禁用
			
 
				+						&.is-disable {
			
 
				+							.checkbox__inner {
			
 
				+								opacity: $disable;
			
 
				+							}
			
 
				+
			
 
				+							.checklist-text {
			
 
				+								opacity: $disable;
			
 
				+							}
			
 
				+
			
 
				+							.radio__inner {
			
 
				+								opacity: $disable;
			
 
				+							}
			
 
				+						}
			
 
				+					}
			
 
				+				}
			
 
				+
			
 
				+				// 按钮样式
			
 
				+				&.is--button {
			
 
				+					margin-right: 10px;
			
 
				+					padding: 5px 10px;
			
 
				+					border: 1px $border-color solid;
			
 
				+					border-radius: 3px;
			
 
				+					transition: border-color 0.2s;
			
 
				+
			
 
				+					// 禁用
			
 
				+					&.is-disable {
			
 
				+						/* #ifdef H5 */
			
 
				+						cursor: not-allowed;
			
 
				+						/* #endif */
			
 
				+						border: 1px #eee solid;
			
 
				+						opacity: $disable;
			
 
				+
			
 
				+						.checkbox__inner {
			
 
				+							background-color: #F2F6FC;
			
 
				+							border-color: $border-color;
			
 
				+							/* #ifdef H5 */
			
 
				+							cursor: not-allowed;
			
 
				+							/* #endif */
			
 
				+						}
			
 
				+
			
 
				+						.radio__inner {
			
 
				+							background-color: #F2F6FC;
			
 
				+							border-color: $border-color;
			
 
				+							/* #ifdef H5 */
			
 
				+							cursor: not-allowed;
			
 
				+							/* #endif */
			
 
				+						}
			
 
				+
			
 
				+						.checklist-text {
			
 
				+							color: #999;
			
 
				+						}
			
 
				+					}
			
 
				+
			
 
				+					&.is-checked {
			
 
				+						border-color: $uni-primary;
			
 
				+
			
 
				+						.checkbox__inner {
			
 
				+							border-color: $uni-primary;
			
 
				+							background-color: $uni-primary;
			
 
				+
			
 
				+							.checkbox__inner-icon {
			
 
				+								opacity: 1;
			
 
				+								transform: rotate(45deg);
			
 
				+							}
			
 
				+						}
			
 
				+
			
 
				+						.radio__inner {
			
 
				+							border-color: $uni-primary;
			
 
				+
			
 
				+							.radio__inner-icon {
			
 
				+								opacity: 1;
			
 
				+								background-color: $uni-primary;
			
 
				+							}
			
 
				+						}
			
 
				+
			
 
				+						.checklist-text {
			
 
				+							color: $uni-primary;
			
 
				+						}
			
 
				+
			
 
				+						// 选中禁用
			
 
				+						&.is-disable {
			
 
				+							opacity: $disable;
			
 
				+						}
			
 
				+					}
			
 
				+				}
			
 
				+
			
 
				+				// 标签样式
			
 
				+				&.is--tag {
			
 
				+					margin-right: 10px;
			
 
				+					padding: 5px 10px;
			
 
				+					border: 1px $border-color solid;
			
 
				+					border-radius: 3px;
			
 
				+					background-color: #f5f5f5;
			
 
				+
			
 
				+					.checklist-text {
			
 
				+						margin: 0;
			
 
				+						color: #666;
			
 
				+					}
			
 
				+
			
 
				+					// 禁用
			
 
				+					&.is-disable {
			
 
				+						/* #ifdef H5 */
			
 
				+						cursor: not-allowed;
			
 
				+						/* #endif */
			
 
				+						opacity: $disable;
			
 
				+					}
			
 
				+
			
 
				+					&.is-checked {
			
 
				+						background-color: $uni-primary;
			
 
				+						border-color: $uni-primary;
			
 
				+
			
 
				+						.checklist-text {
			
 
				+							color: #fff;
			
 
				+						}
			
 
				+					}
			
 
				+				}
			
 
				+
			
 
				+				// 列表样式
			
 
				+				&.is--list {
			
 
				+					/* #ifndef APP-NVUE */
			
 
				+					display: flex;
			
 
				+					/* #endif */
			
 
				+					padding: 10px 15px;
			
 
				+					padding-left: 0;
			
 
				+					margin: 0;
			
 
				+
			
 
				+					&.is-list-border {
			
 
				+						border-top: 1px #eee solid;
			
 
				+					}
			
 
				+
			
 
				+					// 禁用
			
 
				+					&.is-disable {
			
 
				+						/* #ifdef H5 */
			
 
				+						cursor: not-allowed;
			
 
				+
			
 
				+						/* #endif */
			
 
				+						.checkbox__inner {
			
 
				+							background-color: #F2F6FC;
			
 
				+							border-color: $border-color;
			
 
				+							/* #ifdef H5 */
			
 
				+							cursor: not-allowed;
			
 
				+							/* #endif */
			
 
				+						}
			
 
				+
			
 
				+						.checklist-text {
			
 
				+							color: #999;
			
 
				+						}
			
 
				+					}
			
 
				+
			
 
				+					&.is-checked {
			
 
				+						.checkbox__inner {
			
 
				+							border-color: $uni-primary;
			
 
				+							background-color: $uni-primary;
			
 
				+
			
 
				+							.checkbox__inner-icon {
			
 
				+								opacity: 1;
			
 
				+								transform: rotate(45deg);
			
 
				+							}
			
 
				+						}
			
 
				+
			
 
				+						.radio__inner {
			
 
				+							border-color: $uni-primary;
			
 
				+							.radio__inner-icon {
			
 
				+								opacity: 1;
			
 
				+								background-color: $uni-primary;
			
 
				+							}
			
 
				+						}
			
 
				+
			
 
				+						.checklist-text {
			
 
				+							color: $uni-primary;
			
 
				+						}
			
 
				+
			
 
				+						.checklist-content {
			
 
				+							.checkobx__list {
			
 
				+								opacity: 1;
			
 
				+								border-color: $uni-primary;
			
 
				+							}
			
 
				+						}
			
 
				+
			
 
				+						// 选中禁用
			
 
				+						&.is-disable {
			
 
				+							.checkbox__inner {
			
 
				+								opacity: $disable;
			
 
				+							}
			
 
				+
			
 
				+							.checklist-text {
			
 
				+								opacity: $disable;
			
 
				+							}
			
 
				+						}
			
 
				+					}
			
 
				+				}
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uni-data-checkbox/package.json
+++ b/uni_modules/uni-data-checkbox/package.json
@@ -0,0 +1,84 @@
 
				+{
			
 
				+  "id": "uni-data-checkbox",
			
 
				+  "displayName": "uni-data-checkbox 数据选择器",
			
 
				+  "version": "1.0.5",
			
 
				+  "description": "通过数据驱动的单选框和复选框",
			
 
				+  "keywords": [
			
 
				+    "uni-ui",
			
 
				+    "checkbox",
			
 
				+    "单选",
			
 
				+    "多选",
			
 
				+    "单选多选"
			
 
				+],
			
 
				+  "repository": "https://github.com/dcloudio/uni-ui",
			
 
				+  "engines": {
			
 
				+    "HBuilderX": "^3.1.1"
			
 
				+  },
			
 
				+  "directories": {
			
 
				+    "example": "../../temps/example_temps"
			
 
				+  },
			
 
				+"dcloudext": {
			
 
				+    "sale": {
			
 
				+      "regular": {
			
 
				+        "price": "0.00"
			
 
				+      },
			
 
				+      "sourcecode": {
			
 
				+        "price": "0.00"
			
 
				+      }
			
 
				+    },
			
 
				+    "contact": {
			
 
				+      "qq": ""
			
 
				+    },
			
 
				+    "declaration": {
			
 
				+      "ads": "无",
			
 
				+      "data": "无",
			
 
				+      "permissions": "无"
			
 
				+    },
			
 
				+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
			
 
				+    "type": "component-vue"
			
 
				+  },
			
 
				+  "uni_modules": {
			
 
				+    "dependencies": ["uni-load-more","uni-scss"],
			
 
				+    "encrypt": [],
			
 
				+    "platforms": {
			
 
				+      "cloud": {
			
 
				+        "tcb": "y",
			
 
				+        "aliyun": "y"
			
 
				+      },
			
 
				+      "client": {
			
 
				+        "App": {
			
 
				+          "app-vue": "y",
			
 
				+          "app-nvue": "y"
			
 
				+        },
			
 
				+        "H5-mobile": {
			
 
				+          "Safari": "y",
			
 
				+          "Android Browser": "y",
			
 
				+          "微信浏览器(Android)": "y",
			
 
				+          "QQ浏览器(Android)": "y"
			
 
				+        },
			
 
				+        "H5-pc": {
			
 
				+          "Chrome": "y",
			
 
				+          "IE": "y",
			
 
				+          "Edge": "y",
			
 
				+          "Firefox": "y",
			
 
				+          "Safari": "y"
			
 
				+        },
			
 
				+        "小程序": {
			
 
				+          "微信": "y",
			
 
				+          "阿里": "y",
			
 
				+          "百度": "y",
			
 
				+          "字节跳动": "y",
			
 
				+          "QQ": "y"
			
 
				+        },
			
 
				+        "快应用": {
			
 
				+          "华为": "u",
			
 
				+          "联盟": "u"
			
 
				+        },
			
 
				+        "Vue": {
			
 
				+            "vue2": "y",
			
 
				+            "vue3": "y"
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
--- a/uni_modules/uni-data-checkbox/readme.md
+++ b/uni_modules/uni-data-checkbox/readme.md
@@ -0,0 +1,18 @@
 
				+
			
 
				+
			
 
				+## DataCheckbox 数据驱动的单选复选框
			
 
				+> **组件名：uni-data-checkbox**
			
 
				+> 代码块： `uDataCheckbox`
			
 
				+
			
 
				+
			
 
				+本组件是基于uni-app基础组件checkbox的封装。本组件要解决问题包括：
			
 
				+
			
 
				+1. 数据绑定型组件：给本组件绑定一个data，会自动渲染一组候选内容。再以往，开发者需要编写不少代码实现类似功能
			
 
				+2. 自动的表单校验：组件绑定了data，且符合[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)组件的表单校验规范，搭配使用会自动实现表单校验
			
 
				+3. 本组件合并了单选多选
			
 
				+4. 本组件有若干风格选择，如普通的单选多选框、并列button风格、tag风格。开发者可以快速选择需要的风格。但作为一个封装组件，样式代码虽然不用自己写了，却会牺牲一定的样式自定义性
			
 
				+
			
 
				+在uniCloud开发中，`DB Schema`中配置了enum枚举等类型后，在web控制台的[自动生成表单](https://uniapp.dcloud.io/uniCloud/schema?id=autocode)功能中，会自动生成``uni-data-checkbox``组件并绑定好data
			
 
				+
			
 
				+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox)
			
 
				+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
			
--- a/uni_modules/uni-data-select/changelog.md
+++ b/uni_modules/uni-data-select/changelog.md
@@ -0,0 +1,39 @@
 
				+## 1.0.8（2024-03-28）
			
 
				+- 修复 在vue2下:style动态绑定导致编译失败的bug
			
 
				+## 1.0.7（2024-01-20）
			
 
				+- 修复 长文本回显超过容器的bug，超过容器部分显示省略号
			
 
				+## 1.0.6（2023-04-12）
			
 
				+- 修复 微信小程序点击时会改变背景颜色的 bug
			
 
				+## 1.0.5（2023-02-03）
			
 
				+- 修复 禁用时会显示清空按钮
			
 
				+## 1.0.4（2023-02-02）
			
 
				+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
			
 
				+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
			
 
				+## 1.0.3（2023-01-16）
			
 
				+- 修复 不关联服务空间报错的问题
			
 
				+## 1.0.2（2023-01-14）
			
 
				+- 新增  属性 `format` 可用于格式化显示选项内容
			
 
				+## 1.0.1（2022-12-06）
			
 
				+- 修复  当where变化时，数据不会自动更新的问题
			
 
				+## 0.1.9（2022-09-05）
			
 
				+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
			
 
				+## 0.1.8（2022-08-29）
			
 
				+- 修复 点击的位置不准确
			
 
				+## 0.1.7（2022-08-12）
			
 
				+- 新增 支持 disabled 属性
			
 
				+## 0.1.6（2022-07-06）
			
 
				+- 修复 pc端宽度异常的bug
			
 
				+## 0.1.5
			
 
				+- 修复 pc端宽度异常的bug
			
 
				+## 0.1.4（2022-07-05）
			
 
				+- 优化 显示样式
			
 
				+## 0.1.3（2022-06-02）
			
 
				+- 修复 localdata 赋值不生效的 bug
			
 
				+- 新增 支持  uni.scss 修改颜色
			
 
				+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
			
 
				+## 0.1.2（2022-05-08）
			
 
				+- 修复 当 value 为 0 时选择不生效的 bug
			
 
				+## 0.1.1（2022-05-07）
			
 
				+- 新增 记住上次的选项（仅 collection 存在时有效）
			
 
				+## 0.1.0（2022-04-22）
			
 
				+- 初始化
			
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -0,0 +1,562 @@
 
				+<template>
			
 
				+	<view class="uni-stat__select">
			
 
				+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
			
 
				+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
			
 
				+			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
			
 
				+				<view class="uni-select__input-box" @click="toggleSelector">
			
 
				+					<view v-if="current" class="uni-select__input-text">{{textShow}}</view>
			
 
				+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
			
 
				+					<view v-if="current && clear && !disabled" @click.stop="clearVal">
			
 
				+						<uni-icons type="clear" color="#c0c4cc" size="24" />
			
 
				+					</view>
			
 
				+					<view v-else>
			
 
				+						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
			
 
				+					</view>
			
 
				+				</view>
			
 
				+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
			
 
				+				<view class="uni-select__selector" :style="getOffsetByPlacement" v-if="showSelector">
			
 
				+					<view :class="placement=='bottom'?'uni-popper__arrow_bottom':'uni-popper__arrow_top'"></view>
			
 
				+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
			
 
				+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
			
 
				+							<text>{{emptyTips}}</text>
			
 
				+						</view>
			
 
				+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
			
 
				+							@click="change(item)">
			
 
				+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
			
 
				+						</view>
			
 
				+					</scroll-view>
			
 
				+				</view>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	/**
			
 
				+	 * DataChecklist 数据选择器
			
 
				+	 * @description 通过数据渲染的下拉框组件
			
 
				+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
			
 
				+	 * @property {String} value 默认值
			
 
				+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
			
 
				+	 * @property {Boolean} clear 是否可以清空已选项
			
 
				+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
			
 
				+	 * @property {String} label 左侧标题
			
 
				+	 * @property {String} placeholder 输入框的提示文字
			
 
				+	 * @property {Boolean} disabled 是否禁用
			
 
				+	 * @property {String} placement 弹出位置
			
 
				+	 * 	@value top   		顶部弹出
			
 
				+	 * 	@value bottom		底部弹出（default)
			
 
				+	 * @event {Function} change  选中发生变化触发
			
 
				+	 */
			
 
				+
			
 
				+	export default {
			
 
				+		name: "uni-data-select",
			
 
				+		mixins: [uniCloud.mixinDatacom || {}],
			
 
				+		props: {
			
 
				+			localdata: {
			
 
				+				type: Array,
			
 
				+				default () {
			
 
				+					return []
			
 
				+				}
			
 
				+			},
			
 
				+			value: {
			
 
				+				type: [String, Number],
			
 
				+				default: ''
			
 
				+			},
			
 
				+			modelValue: {
			
 
				+				type: [String, Number],
			
 
				+				default: ''
			
 
				+			},
			
 
				+			label: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			placeholder: {
			
 
				+				type: String,
			
 
				+				default: '请选择'
			
 
				+			},
			
 
				+			emptyTips: {
			
 
				+				type: String,
			
 
				+				default: '无选项'
			
 
				+			},
			
 
				+			clear: {
			
 
				+				type: Boolean,
			
 
				+				default: true
			
 
				+			},
			
 
				+			defItem: {
			
 
				+				type: Number,
			
 
				+				default: 0
			
 
				+			},
			
 
				+			disabled: {
			
 
				+				type: Boolean,
			
 
				+				default: false
			
 
				+			},
			
 
				+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
			
 
				+			format: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			placement: {
			
 
				+				type: String,
			
 
				+				default: 'bottom'
			
 
				+			}
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {
			
 
				+				showSelector: false,
			
 
				+				current: '',
			
 
				+				mixinDatacomResData: [],
			
 
				+				apps: [],
			
 
				+				channels: [],
			
 
				+				cacheKey: "uni-data-select-lastSelectedValue",
			
 
				+			};
			
 
				+		},
			
 
				+		created() {
			
 
				+			this.debounceGet = this.debounce(() => {
			
 
				+				this.query();
			
 
				+			}, 300);
			
 
				+			if (this.collection && !this.localdata.length) {
			
 
				+				this.debounceGet();
			
 
				+			}
			
 
				+		},
			
 
				+		computed: {
			
 
				+			typePlaceholder() {
			
 
				+				const text = {
			
 
				+					'opendb-stat-app-versions': '版本',
			
 
				+					'opendb-app-channels': '渠道',
			
 
				+					'opendb-app-list': '应用'
			
 
				+				}
			
 
				+				const common = this.placeholder
			
 
				+				const placeholder = text[this.collection]
			
 
				+				return placeholder ?
			
 
				+					common + placeholder :
			
 
				+					common
			
 
				+			},
			
 
				+			valueCom() {
			
 
				+				// #ifdef VUE3
			
 
				+				return this.modelValue;
			
 
				+				// #endif
			
 
				+				// #ifndef VUE3
			
 
				+				return this.value;
			
 
				+				// #endif
			
 
				+			},
			
 
				+			textShow() {
			
 
				+				// 长文本显示
			
 
				+				let text = this.current;
			
 
				+				if (text.length > 10) {
			
 
				+					return text.slice(0, 25) + '...';
			
 
				+				}
			
 
				+				return text;
			
 
				+			},
			
 
				+			getOffsetByPlacement() {
			
 
				+				switch (this.placement) {
			
 
				+					case 'top':
			
 
				+						return "bottom:calc(100% + 12px);";
			
 
				+					case 'bottom':
			
 
				+						return "top:calc(100% + 12px);";
			
 
				+				}
			
 
				+			}
			
 
				+		},
			
 
				+
			
 
				+		watch: {
			
 
				+			localdata: {
			
 
				+				immediate: true,
			
 
				+				handler(val, old) {
			
 
				+					if (Array.isArray(val) && old !== val) {
			
 
				+						this.mixinDatacomResData = val
			
 
				+					}
			
 
				+				}
			
 
				+			},
			
 
				+			valueCom(val, old) {
			
 
				+				this.initDefVal()
			
 
				+			},
			
 
				+			mixinDatacomResData: {
			
 
				+				immediate: true,
			
 
				+				handler(val) {
			
 
				+					if (val.length) {
			
 
				+						this.initDefVal()
			
 
				+					}
			
 
				+				}
			
 
				+			},
			
 
				+
			
 
				+		},
			
 
				+		methods: {
			
 
				+			debounce(fn, time = 100) {
			
 
				+				let timer = null
			
 
				+				return function(...args) {
			
 
				+					if (timer) clearTimeout(timer)
			
 
				+					timer = setTimeout(() => {
			
 
				+						fn.apply(this, args)
			
 
				+					}, time)
			
 
				+				}
			
 
				+			},
			
 
				+			// 执行数据库查询
			
 
				+			query() {
			
 
				+				this.mixinDatacomEasyGet();
			
 
				+			},
			
 
				+			// 监听查询条件变更事件
			
 
				+			onMixinDatacomPropsChange() {
			
 
				+				if (this.collection) {
			
 
				+					this.debounceGet();
			
 
				+				}
			
 
				+			},
			
 
				+			initDefVal() {
			
 
				+				let defValue = ''
			
 
				+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
			
 
				+					defValue = this.valueCom
			
 
				+				} else {
			
 
				+					let strogeValue
			
 
				+					if (this.collection) {
			
 
				+						strogeValue = this.getCache()
			
 
				+					}
			
 
				+					if (strogeValue || strogeValue === 0) {
			
 
				+						defValue = strogeValue
			
 
				+					} else {
			
 
				+						let defItem = ''
			
 
				+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
			
 
				+							defItem = this.mixinDatacomResData[this.defItem - 1].value
			
 
				+						}
			
 
				+						defValue = defItem
			
 
				+					}
			
 
				+					if (defValue || defValue === 0) {
			
 
				+						this.emit(defValue)
			
 
				+					}
			
 
				+				}
			
 
				+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
			
 
				+				this.current = def ? this.formatItemName(def) : ''
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * @param {[String, Number]} value
			
 
				+			 * 判断用户给的 value 是否同时为禁用状态
			
 
				+			 */
			
 
				+			isDisabled(value) {
			
 
				+				let isDisabled = false;
			
 
				+
			
 
				+				this.mixinDatacomResData.forEach(item => {
			
 
				+					if (item.value === value) {
			
 
				+						isDisabled = item.disable
			
 
				+					}
			
 
				+				})
			
 
				+
			
 
				+				return isDisabled;
			
 
				+			},
			
 
				+
			
 
				+			clearVal() {
			
 
				+				this.emit('')
			
 
				+				if (this.collection) {
			
 
				+					this.removeCache()
			
 
				+				}
			
 
				+			},
			
 
				+			change(item) {
			
 
				+				if (!item.disable) {
			
 
				+					this.showSelector = false
			
 
				+					this.current = this.formatItemName(item)
			
 
				+					this.emit(item.value)
			
 
				+				}
			
 
				+			},
			
 
				+			emit(val) {
			
 
				+				this.$emit('input', val)
			
 
				+				this.$emit('update:modelValue', val)
			
 
				+				this.$emit('change', val)
			
 
				+				if (this.collection) {
			
 
				+					this.setCache(val);
			
 
				+				}
			
 
				+			},
			
 
				+			toggleSelector() {
			
 
				+				if (this.disabled) {
			
 
				+					return
			
 
				+				}
			
 
				+
			
 
				+				this.showSelector = !this.showSelector
			
 
				+			},
			
 
				+			formatItemName(item) {
			
 
				+				let {
			
 
				+					text,
			
 
				+					value,
			
 
				+					channel_code
			
 
				+				} = item
			
 
				+				channel_code = channel_code ? `(${channel_code})` : ''
			
 
				+
			
 
				+				if (this.format) {
			
 
				+					// 格式化输出
			
 
				+					let str = "";
			
 
				+					str = this.format;
			
 
				+					for (let key in item) {
			
 
				+						str = str.replace(new RegExp(`{${key}}`, "g"), item[key]);
			
 
				+					}
			
 
				+					return str;
			
 
				+				} else {
			
 
				+					return this.collection.indexOf('app-list') > 0 ?
			
 
				+						`${text}(${value})` :
			
 
				+						(
			
 
				+							text ?
			
 
				+							text :
			
 
				+							`未命名${channel_code}`
			
 
				+						)
			
 
				+				}
			
 
				+			},
			
 
				+			// 获取当前加载的数据
			
 
				+			getLoadData() {
			
 
				+				return this.mixinDatacomResData;
			
 
				+			},
			
 
				+			// 获取当前缓存key
			
 
				+			getCurrentCacheKey() {
			
 
				+				return this.collection;
			
 
				+			},
			
 
				+			// 获取缓存
			
 
				+			getCache(name = this.getCurrentCacheKey()) {
			
 
				+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
			
 
				+				return cacheData[name];
			
 
				+			},
			
 
				+			// 设置缓存
			
 
				+			setCache(value, name = this.getCurrentCacheKey()) {
			
 
				+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
			
 
				+				cacheData[name] = value;
			
 
				+				uni.setStorageSync(this.cacheKey, cacheData);
			
 
				+			},
			
 
				+			// 删除缓存
			
 
				+			removeCache(name = this.getCurrentCacheKey()) {
			
 
				+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
			
 
				+				delete cacheData[name];
			
 
				+				uni.setStorageSync(this.cacheKey, cacheData);
			
 
				+			},
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss">
			
 
				+	$uni-base-color: #6a6a6a !default;
			
 
				+	$uni-main-color: #333 !default;
			
 
				+	$uni-secondary-color: #909399 !default;
			
 
				+	$uni-border-3: #e5e5e5;
			
 
				+
			
 
				+	/* #ifndef APP-NVUE */
			
 
				+	@media screen and (max-width: 500px) {
			
 
				+		.hide-on-phone {
			
 
				+			display: none;
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	/* #endif */
			
 
				+	.uni-stat__select {
			
 
				+		display: flex;
			
 
				+		align-items: center;
			
 
				+		// padding: 15px;
			
 
				+		/* #ifdef H5 */
			
 
				+		cursor: pointer;
			
 
				+		/* #endif */
			
 
				+		width: 100%;
			
 
				+		flex: 1;
			
 
				+		box-sizing: border-box;
			
 
				+	}
			
 
				+
			
 
				+	.uni-stat-box {
			
 
				+		width: 100%;
			
 
				+		flex: 1;
			
 
				+	}
			
 
				+
			
 
				+	.uni-stat__actived {
			
 
				+		width: 100%;
			
 
				+		flex: 1;
			
 
				+		// outline: 1px solid #2979ff;
			
 
				+	}
			
 
				+
			
 
				+	.uni-label-text {
			
 
				+		font-size: 14px;
			
 
				+		font-weight: bold;
			
 
				+		color: $uni-base-color;
			
 
				+		margin: auto 0;
			
 
				+		margin-right: 5px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-select {
			
 
				+		font-size: 14px;
			
 
				+		border: 1px solid $uni-border-3;
			
 
				+		box-sizing: border-box;
			
 
				+		border-radius: 4px;
			
 
				+		padding: 0 5px;
			
 
				+		padding-left: 10px;
			
 
				+		position: relative;
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		user-select: none;
			
 
				+		/* #endif */
			
 
				+		flex-direction: row;
			
 
				+		align-items: center;
			
 
				+		border-bottom: solid 1px $uni-border-3;
			
 
				+		width: 100%;
			
 
				+		flex: 1;
			
 
				+		height: 35px;
			
 
				+
			
 
				+		&--disabled {
			
 
				+			background-color: #f5f7fa;
			
 
				+			cursor: not-allowed;
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	.uni-select__label {
			
 
				+		font-size: 16px;
			
 
				+		// line-height: 22px;
			
 
				+		height: 35px;
			
 
				+		padding-right: 10px;
			
 
				+		color: $uni-secondary-color;
			
 
				+	}
			
 
				+
			
 
				+	.uni-select__input-box {
			
 
				+		height: 35px;
			
 
				+		position: relative;
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		/* #endif */
			
 
				+		flex: 1;
			
 
				+		flex-direction: row;
			
 
				+		align-items: center;
			
 
				+	}
			
 
				+
			
 
				+	.uni-select__input {
			
 
				+		flex: 1;
			
 
				+		font-size: 14px;
			
 
				+		height: 22px;
			
 
				+		line-height: 22px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-select__input-plac {
			
 
				+		font-size: 14px;
			
 
				+		color: $uni-secondary-color;
			
 
				+	}
			
 
				+
			
 
				+	.uni-select__selector {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		box-sizing: border-box;
			
 
				+		/* #endif */
			
 
				+		position: absolute;
			
 
				+		left: 0;
			
 
				+		width: 100%;
			
 
				+		background-color: #FFFFFF;
			
 
				+		border: 1px solid #EBEEF5;
			
 
				+		border-radius: 6px;
			
 
				+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
			
 
				+		z-index: 3;
			
 
				+		padding: 4px 0;
			
 
				+	}
			
 
				+
			
 
				+	.uni-select__selector-scroll {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		max-height: 200px;
			
 
				+		box-sizing: border-box;
			
 
				+		/* #endif */
			
 
				+	}
			
 
				+
			
 
				+	/* #ifdef H5 */
			
 
				+	@media (min-width: 768px) {
			
 
				+		.uni-select__selector-scroll {
			
 
				+			max-height: 600px;
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	/* #endif */
			
 
				+
			
 
				+	.uni-select__selector-empty,
			
 
				+	.uni-select__selector-item {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		cursor: pointer;
			
 
				+		/* #endif */
			
 
				+		line-height: 35px;
			
 
				+		font-size: 14px;
			
 
				+		text-align: center;
			
 
				+		/* border-bottom: solid 1px $uni-border-3; */
			
 
				+		padding: 0px 10px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-select__selector-item:hover {
			
 
				+		background-color: #f9f9f9;
			
 
				+	}
			
 
				+
			
 
				+	.uni-select__selector-empty:last-child,
			
 
				+	.uni-select__selector-item:last-child {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		border-bottom: none;
			
 
				+		/* #endif */
			
 
				+	}
			
 
				+
			
 
				+	.uni-select__selector__disabled {
			
 
				+		opacity: 0.4;
			
 
				+		cursor: default;
			
 
				+	}
			
 
				+
			
 
				+	/* picker 弹出层通用的指示小三角 */
			
 
				+	.uni-popper__arrow_bottom,
			
 
				+	.uni-popper__arrow_bottom::after,
			
 
				+	.uni-popper__arrow_top,
			
 
				+	.uni-popper__arrow_top::after,
			
 
				+	{
			
 
				+	position: absolute;
			
 
				+	display: block;
			
 
				+	width: 0;
			
 
				+	height: 0;
			
 
				+	border-color: transparent;
			
 
				+	border-style: solid;
			
 
				+	border-width: 6px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popper__arrow_bottom {
			
 
				+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
			
 
				+		top: -6px;
			
 
				+		left: 10%;
			
 
				+		margin-right: 3px;
			
 
				+		border-top-width: 0;
			
 
				+		border-bottom-color: #EBEEF5;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popper__arrow_bottom::after {
			
 
				+		content: " ";
			
 
				+		top: 1px;
			
 
				+		margin-left: -6px;
			
 
				+		border-top-width: 0;
			
 
				+		border-bottom-color: #fff;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popper__arrow_top {
			
 
				+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
			
 
				+		bottom: -6px;
			
 
				+		left: 10%;
			
 
				+		margin-right: 3px;
			
 
				+		border-bottom-width: 0;
			
 
				+		border-top-color: #EBEEF5;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popper__arrow_top::after {
			
 
				+		content: " ";
			
 
				+		bottom: 1px;
			
 
				+		margin-left: -6px;
			
 
				+		border-bottom-width: 0;
			
 
				+		border-top-color: #fff;
			
 
				+	}
			
 
				+
			
 
				+
			
 
				+	.uni-select__input-text {
			
 
				+		// width: 280px;
			
 
				+		width: 100%;
			
 
				+		color: $uni-main-color;
			
 
				+		white-space: nowrap;
			
 
				+		text-overflow: ellipsis;
			
 
				+		-o-text-overflow: ellipsis;
			
 
				+		overflow: hidden;
			
 
				+	}
			
 
				+
			
 
				+	.uni-select__input-placeholder {
			
 
				+		color: $uni-base-color;
			
 
				+		font-size: 12px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-select--mask {
			
 
				+		position: fixed;
			
 
				+		top: 0;
			
 
				+		bottom: 0;
			
 
				+		right: 0;
			
 
				+		left: 0;
			
 
				+		z-index: 2;
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uni-data-select/package.json
+++ b/uni_modules/uni-data-select/package.json
@@ -0,0 +1,86 @@
 
				+{
			
 
				+  "id": "uni-data-select",
			
 
				+  "displayName": "uni-data-select 下拉框选择器",
			
 
				+  "version": "1.0.8",
			
 
				+  "description": "通过数据驱动的下拉框选择器",
			
 
				+  "keywords": [
			
 
				+    "uni-ui",
			
 
				+    "select",
			
 
				+    "uni-data-select",
			
 
				+    "下拉框",
			
 
				+    "下拉选"
			
 
				+],
			
 
				+  "repository": "https://github.com/dcloudio/uni-ui",
			
 
				+  "engines": {
			
 
				+    "HBuilderX": "^3.1.1"
			
 
				+  },
			
 
				+  "directories": {
			
 
				+    "example": "../../temps/example_temps"
			
 
				+  },
			
 
				+"dcloudext": {
			
 
				+    "sale": {
			
 
				+      "regular": {
			
 
				+        "price": "0.00"
			
 
				+      },
			
 
				+      "sourcecode": {
			
 
				+        "price": "0.00"
			
 
				+      }
			
 
				+    },
			
 
				+    "contact": {
			
 
				+      "qq": ""
			
 
				+    },
			
 
				+    "declaration": {
			
 
				+      "ads": "无",
			
 
				+      "data": "无",
			
 
				+      "permissions": "无"
			
 
				+    },
			
 
				+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
			
 
				+    "type": "component-vue"
			
 
				+  },
			
 
				+  "uni_modules": {
			
 
				+    "dependencies": ["uni-load-more"],
			
 
				+    "encrypt": [],
			
 
				+    "platforms": {
			
 
				+      "cloud": {
			
 
				+        "tcb": "y",
			
 
				+        "aliyun": "y",
			
 
				+        "alipay": "n"
			
 
				+      },
			
 
				+      "client": {
			
 
				+        "App": {
			
 
				+          "app-vue": "u",
			
 
				+          "app-nvue": "n"
			
 
				+        },
			
 
				+        "H5-mobile": {
			
 
				+          "Safari": "y",
			
 
				+          "Android Browser": "y",
			
 
				+          "微信浏览器(Android)": "y",
			
 
				+          "QQ浏览器(Android)": "y"
			
 
				+        },
			
 
				+        "H5-pc": {
			
 
				+          "Chrome": "y",
			
 
				+          "IE": "y",
			
 
				+          "Edge": "y",
			
 
				+          "Firefox": "y",
			
 
				+          "Safari": "y"
			
 
				+        },
			
 
				+        "小程序": {
			
 
				+          "微信": "y",
			
 
				+          "阿里": "u",
			
 
				+          "百度": "u",
			
 
				+          "字节跳动": "u",
			
 
				+        "QQ": "u",
			
 
				+        "京东": "u"
			
 
				+        },
			
 
				+        "快应用": {
			
 
				+          "华为": "u",
			
 
				+          "联盟": "u"
			
 
				+        },
			
 
				+        "Vue": {
			
 
				+            "vue2": "y",
			
 
				+            "vue3": "y"
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
--- a/uni_modules/uni-data-select/readme.md
+++ b/uni_modules/uni-data-select/readme.md
@@ -0,0 +1,8 @@
 
				+## DataSelect 下拉框选择器
			
 
				+> **组件名：uni-data-select**
			
 
				+> 代码块： `uDataSelect`
			
 
				+
			
 
				+当选项过多时，使用下拉菜单展示并选择内容
			
 
				+
			
 
				+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
			
 
				+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
			
--- a/uni_modules/uni-easyinput/changelog.md
+++ b/uni_modules/uni-easyinput/changelog.md
@@ -0,0 +1,113 @@
 
				+## 1.1.18（2024-04-11）
			
 
				+- 修复 easyinput组件双向绑定问题
			
 
				+## 1.1.17（2024-03-28）
			
 
				+- 修复 在头条小程序下丢失事件绑定的问题
			
 
				+## 1.1.16（2024-03-20）
			
 
				+- 修复 在密码输入情况下 清除和小眼睛覆盖bug 在edge浏览器下显示双眼睛bug
			
 
				+## 1.1.15（2024-02-21）
			
 
				+- 新增 左侧插槽：left
			
 
				+## 1.1.14（2024-02-19）
			
 
				+- 修复 onBlur的emit传值错误
			
 
				+## 1.1.12（2024-01-29）
			
 
				+- 补充 adjust-position文档属性补充
			
 
				+## 1.1.11（2024-01-29）
			
 
				+- 补充 adjust-position属性传递值：（Boolean）当键盘弹起时，是否自动上推页面
			
 
				+## 1.1.10（2024-01-22）
			
 
				+- 去除 移除无用的log输出
			
 
				+## 1.1.9（2023-04-11）
			
 
				+- 修复 vue3 下 keyboardheightchange 事件报错的bug
			
 
				+## 1.1.8（2023-03-29）
			
 
				+- 优化 trim 属性默认值
			
 
				+## 1.1.7（2023-03-29）
			
 
				+- 新增 cursor-spacing 属性
			
 
				+## 1.1.6（2023-01-28）
			
 
				+- 新增 keyboardheightchange 事件，可监听键盘高度变化
			
 
				+## 1.1.5（2022-11-29）
			
 
				+- 优化 主题样式
			
 
				+## 1.1.4（2022-10-27）
			
 
				+- 修复 props 中背景颜色无默认值的bug
			
 
				+## 1.1.0（2022-06-30）
			
 
				+
			
 
				+- 新增 在 uni-forms 1.4.0 中使用可以在 blur 时校验内容
			
 
				+- 新增 clear 事件，点击右侧叉号图标触发
			
 
				+- 新增 change 事件 ，仅在输入框失去焦点或用户按下回车时触发
			
 
				+- 优化 组件样式，组件获取焦点时高亮显示，图标颜色调整等
			
 
				+
			
 
				+## 1.0.5（2022-06-07）
			
 
				+
			
 
				+- 优化 clearable 显示策略
			
 
				+
			
 
				+## 1.0.4（2022-06-07）
			
 
				+
			
 
				+- 优化 clearable 显示策略
			
 
				+
			
 
				+## 1.0.3（2022-05-20）
			
 
				+
			
 
				+- 修复 关闭图标某些情况下无法取消的 bug
			
 
				+
			
 
				+## 1.0.2（2022-04-12）
			
 
				+
			
 
				+- 修复 默认值不生效的 bug
			
 
				+
			
 
				+## 1.0.1（2022-04-02）
			
 
				+
			
 
				+- 修复 value 不能为 0 的 bug
			
 
				+
			
 
				+## 1.0.0（2021-11-19）
			
 
				+
			
 
				+- 优化 组件 UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
			
 
				+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-easyinput](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
			
 
				+
			
 
				+## 0.1.4（2021-08-20）
			
 
				+
			
 
				+- 修复 在 uni-forms 的动态表单中默认值校验不通过的 bug
			
 
				+
			
 
				+## 0.1.3（2021-08-11）
			
 
				+
			
 
				+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
			
 
				+
			
 
				+## 0.1.2（2021-07-30）
			
 
				+
			
 
				+- 优化 vue3 下事件警告的问题
			
 
				+
			
 
				+## 0.1.1
			
 
				+
			
 
				+- 优化 errorMessage 属性支持 Boolean 类型
			
 
				+
			
 
				+## 0.1.0（2021-07-13）
			
 
				+
			
 
				+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
			
 
				+
			
 
				+## 0.0.16（2021-06-29）
			
 
				+
			
 
				+- 修复 confirmType 属性（仅 type="text" 生效）导致多行文本框无法换行的 bug
			
 
				+
			
 
				+## 0.0.15（2021-06-21）
			
 
				+
			
 
				+- 修复 passwordIcon 属性拼写错误的 bug
			
 
				+
			
 
				+## 0.0.14（2021-06-18）
			
 
				+
			
 
				+- 新增 passwordIcon 属性，当 type=password 时是否显示小眼睛图标
			
 
				+- 修复 confirmType 属性不生效的问题
			
 
				+
			
 
				+## 0.0.13（2021-06-04）
			
 
				+
			
 
				+- 修复 disabled 状态可清出内容的 bug
			
 
				+
			
 
				+## 0.0.12（2021-05-12）
			
 
				+
			
 
				+- 新增 组件示例地址
			
 
				+
			
 
				+## 0.0.11（2021-05-07）
			
 
				+
			
 
				+- 修复 input-border 属性不生效的问题
			
 
				+
			
 
				+## 0.0.10（2021-04-30）
			
 
				+
			
 
				+- 修复 ios 遮挡文字、显示一半的问题
			
 
				+
			
 
				+## 0.0.9（2021-02-05）
			
 
				+
			
 
				+- 调整为 uni_modules 目录规范
			
 
				+- 优化 兼容 nvue 页面
			
--- a/uni_modules/uni-easyinput/components/uni-easyinput/common.js
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/common.js
@@ -0,0 +1,54 @@
 
				+/**
			
 
				+ * @desc 函数防抖
			
 
				+ * @param func 目标函数
			
 
				+ * @param wait 延迟执行毫秒数
			
 
				+ * @param immediate true - 立即执行， false - 延迟执行
			
 
				+ */
			
 
				+export const debounce = function(func, wait = 1000, immediate = true) {
			
 
				+	let timer;
			
 
				+	return function() {
			
 
				+		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)
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+}
			
--- a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -0,0 +1,693 @@
 
				+<template>
			
 
				+	<view class="uni-easyinput" :class="{ 'uni-easyinput-error': msg }" :style="boxStyle">
			
 
				+		<view class="uni-easyinput__content" :class="inputContentClass" :style="inputContentStyle">
			
 
				+			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc"
			
 
				+				@click="onClickIcon('prefix')" size="22"></uni-icons>
			
 
				+			<slot name="left">
			
 
				+			</slot>
			
 
				+			<!-- #ifdef MP-ALIPAY -->
			
 
				+			<textarea :enableNative="enableNative" v-if="type === 'textarea'" class="uni-easyinput__content-textarea"
			
 
				+				:class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="placeholder"
			
 
				+				:placeholderStyle="placeholderStyle" :disabled="disabled" placeholder-class="uni-easyinput__placeholder-class"
			
 
				+				:maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" :cursor-spacing="cursorSpacing"
			
 
				+				:adjust-position="adjustPosition" @input="onInput" @blur="_Blur" @focus="_Focus" @confirm="onConfirm"
			
 
				+				@keyboardheightchange="onkeyboardheightchange"></textarea>
			
 
				+			<input :enableNative="enableNative" v-else :type="type === 'password' ? 'text' : type"
			
 
				+				class="uni-easyinput__content-input" :style="inputStyle" :name="name" :value="val"
			
 
				+				:password="!showPassword && type === 'password'" :placeholder="placeholder" :placeholderStyle="placeholderStyle"
			
 
				+				placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :maxlength="inputMaxlength"
			
 
				+				:focus="focused" :confirmType="confirmType" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition"
			
 
				+				@focus="_Focus" @blur="_Blur" @input="onInput" @confirm="onConfirm"
			
 
				+				@keyboardheightchange="onkeyboardheightchange" />
			
 
				+			<!-- #endif -->
			
 
				+			<!-- #ifndef MP-ALIPAY -->
			
 
				+			<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea"
			
 
				+				:class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="placeholder"
			
 
				+				:placeholderStyle="placeholderStyle" :disabled="disabled" placeholder-class="uni-easyinput__placeholder-class"
			
 
				+				:maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" :cursor-spacing="cursorSpacing"
			
 
				+				:adjust-position="adjustPosition" @input="onInput" @blur="_Blur" @focus="_Focus" @confirm="onConfirm"
			
 
				+				@keyboardheightchange="onkeyboardheightchange"></textarea>
			
 
				+			<input v-else :type="type === 'password' ? 'text' : type" class="uni-easyinput__content-input" :style="inputStyle"
			
 
				+				:name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder"
			
 
				+				:placeholderStyle="placeholderStyle" placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled"
			
 
				+				:maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType" :cursor-spacing="cursorSpacing"
			
 
				+				:adjust-position="adjustPosition" @focus="_Focus" @blur="_Blur" @input="onInput" @confirm="onConfirm"
			
 
				+				@keyboardheightchange="onkeyboardheightchange" />
			
 
				+			<!-- #endif -->
			
 
				+
			
 
				+			<template v-if="type === 'password' && passwordIcon">
			
 
				+				<!-- 开启密码时显示小眼睛 -->
			
 
				+				<uni-icons v-if="isVal" class="content-clear-icon" :class="{ 'is-textarea-icon': type === 'textarea' }"
			
 
				+					:type="showPassword ? 'eye-slash-filled' : 'eye-filled'" :size="22"
			
 
				+					:color="focusShow ? primaryColor : '#c0c4cc'" @click="onEyes"></uni-icons>
			
 
				+			</template>
			
 
				+			<template v-if="suffixIcon">
			
 
				+				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc"
			
 
				+					@click="onClickIcon('suffix')" size="22"></uni-icons>
			
 
				+			</template>
			
 
				+			<template v-else>
			
 
				+				<uni-icons v-if="clearable && isVal && !disabled && type !== 'textarea'" class="content-clear-icon"
			
 
				+					:class="{ 'is-textarea-icon': type === 'textarea' }" type="clear" :size="clearSize"
			
 
				+					:color="msg ? '#dd524d' : focusShow ? primaryColor : '#c0c4cc'" @click="onClear"></uni-icons>
			
 
				+			</template>
			
 
				+			<slot name="right"></slot>
			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	/**
			
 
				+	 * Easyinput 输入框
			
 
				+	 * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
			
 
				+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3455
			
 
				+	 * @property {String}	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 {String}	primaryColor	设置主题色（默认#2979ff）
			
 
				+	 * @property {Boolean}	trim	是否自动去除两端的空格
			
 
				+	 * @property {Boolean}	cursorSpacing	指定光标与键盘的距离，单位 px
			
 
				+	 * @property {Boolean}  ajust-position 当键盘弹起时，是否上推内容，默认值：true
			
 
				+	 * @value both	去除两端空格
			
 
				+	 * @value left	去除左侧空格
			
 
				+	 * @value right	去除右侧空格
			
 
				+	 * @value start	去除左侧空格
			
 
				+	 * @value end		去除右侧空格
			
 
				+	 * @value all		去除全部空格
			
 
				+	 * @value none	不去除空格
			
 
				+	 * @property {Boolean}	inputBorder	是否显示input输入框的边框（默认true）
			
 
				+	 * @property {Boolean}	passwordIcon	type=password时是否显示小眼睛图标
			
 
				+	 * @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>
			
 
				+	 */
			
 
				+	function obj2strClass(obj) {
			
 
				+		let classess = '';
			
 
				+		for (let key in obj) {
			
 
				+			const val = obj[key];
			
 
				+			if (val) {
			
 
				+				classess += `${key} `;
			
 
				+			}
			
 
				+		}
			
 
				+		return classess;
			
 
				+	}
			
 
				+
			
 
				+	function obj2strStyle(obj) {
			
 
				+		let style = '';
			
 
				+		for (let key in obj) {
			
 
				+			const val = obj[key];
			
 
				+			style += `${key}:${val};`;
			
 
				+		}
			
 
				+		return style;
			
 
				+	}
			
 
				+	export default {
			
 
				+		name: 'uni-easyinput',
			
 
				+		emits: [
			
 
				+			'click',
			
 
				+			'iconClick',
			
 
				+			'update:modelValue',
			
 
				+			'input',
			
 
				+			'focus',
			
 
				+			'blur',
			
 
				+			'confirm',
			
 
				+			'clear',
			
 
				+			'eyes',
			
 
				+			'change',
			
 
				+			'keyboardheightchange'
			
 
				+		],
			
 
				+		model: {
			
 
				+			prop: 'modelValue',
			
 
				+			event: 'update:modelValue'
			
 
				+		},
			
 
				+		options: {
			
 
				+			// #ifdef MP-TOUTIAO
			
 
				+			virtualHost: false,
			
 
				+			// #endif
			
 
				+			// #ifndef MP-TOUTIAO
			
 
				+			virtualHost: true
			
 
				+			// #endif
			
 
				+		},
			
 
				+		inject: {
			
 
				+			form: {
			
 
				+				from: 'uniForm',
			
 
				+				default: null
			
 
				+			},
			
 
				+			formItem: {
			
 
				+				from: 'uniFormItem',
			
 
				+				default: null
			
 
				+			}
			
 
				+		},
			
 
				+		props: {
			
 
				+			name: String,
			
 
				+			value: [Number, String],
			
 
				+			modelValue: [Number, String],
			
 
				+			type: {
			
 
				+				type: String,
			
 
				+				default: 'text'
			
 
				+			},
			
 
				+			clearable: {
			
 
				+				type: Boolean,
			
 
				+				default: true
			
 
				+			},
			
 
				+			autoHeight: {
			
 
				+				type: Boolean,
			
 
				+				default: false
			
 
				+			},
			
 
				+			placeholder: {
			
 
				+				type: String,
			
 
				+				default: ' '
			
 
				+			},
			
 
				+			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: 24
			
 
				+			},
			
 
				+			inputBorder: {
			
 
				+				type: Boolean,
			
 
				+				default: true
			
 
				+			},
			
 
				+			prefixIcon: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			suffixIcon: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			trim: {
			
 
				+				type: [Boolean, String],
			
 
				+				default: false
			
 
				+			},
			
 
				+			cursorSpacing: {
			
 
				+				type: Number,
			
 
				+				default: 0
			
 
				+			},
			
 
				+			passwordIcon: {
			
 
				+				type: Boolean,
			
 
				+				default: true
			
 
				+			},
			
 
				+			adjustPosition: {
			
 
				+				type: Boolean,
			
 
				+				default: true
			
 
				+			},
			
 
				+			primaryColor: {
			
 
				+				type: String,
			
 
				+				default: '#2979ff'
			
 
				+			},
			
 
				+			styles: {
			
 
				+				type: Object,
			
 
				+				default() {
			
 
				+					return {
			
 
				+						color: '#333',
			
 
				+						backgroundColor: '#fff',
			
 
				+						disableColor: '#F7F6F6',
			
 
				+						borderColor: '#e5e5e5'
			
 
				+					};
			
 
				+				}
			
 
				+			},
			
 
				+			errorMessage: {
			
 
				+				type: [String, Boolean],
			
 
				+				default: ''
			
 
				+			},
			
 
				+			// #ifdef MP-ALIPAY
			
 
				+			enableNative: {
			
 
				+				type: Boolean,
			
 
				+				default: false
			
 
				+			}
			
 
				+			// #endif
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {
			
 
				+				focused: false,
			
 
				+				val: '',
			
 
				+				showMsg: '',
			
 
				+				border: false,
			
 
				+				isFirstBorder: false,
			
 
				+				showClearIcon: false,
			
 
				+				showPassword: false,
			
 
				+				focusShow: false,
			
 
				+				localMsg: '',
			
 
				+				isEnter: false // 用于判断当前是否是使用回车操作
			
 
				+			};
			
 
				+		},
			
 
				+		computed: {
			
 
				+			// 输入框内是否有值
			
 
				+			isVal() {
			
 
				+				const val = this.val;
			
 
				+				// fixed by mehaotian 处理值为0的情况，字符串0不在处理范围
			
 
				+				if (val || val === 0) {
			
 
				+					return true;
			
 
				+				}
			
 
				+				return false;
			
 
				+			},
			
 
				+
			
 
				+			msg() {
			
 
				+				// console.log('computed', this.form, this.formItem);
			
 
				+				// if (this.form) {
			
 
				+				// 	return this.errorMessage || this.formItem.errMsg;
			
 
				+				// }
			
 
				+				// TODO 处理头条 formItem 中 errMsg 不更新的问题
			
 
				+				return this.localMsg || this.errorMessage;
			
 
				+			},
			
 
				+			// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，用户可以传入字符串数值
			
 
				+			inputMaxlength() {
			
 
				+				return Number(this.maxlength);
			
 
				+			},
			
 
				+
			
 
				+			// 处理外层样式的style
			
 
				+			boxStyle() {
			
 
				+				return `color:${
			
 
				+					this.inputBorder && this.msg ? '#e43d33' : this.styles.color
			
 
				+				};`;
			
 
				+			},
			
 
				+			// input 内容的类和样式处理
			
 
				+			inputContentClass() {
			
 
				+				return obj2strClass({
			
 
				+					'is-input-border': this.inputBorder,
			
 
				+					'is-input-error-border': this.inputBorder && this.msg,
			
 
				+					'is-textarea': this.type === 'textarea',
			
 
				+					'is-disabled': this.disabled,
			
 
				+					'is-focused': this.focusShow
			
 
				+				});
			
 
				+			},
			
 
				+			inputContentStyle() {
			
 
				+				const focusColor = this.focusShow
			
 
				+					? this.primaryColor
			
 
				+					: this.styles.borderColor;
			
 
				+				const borderColor =
			
 
				+					this.inputBorder && this.msg ? '#dd524d' : focusColor;
			
 
				+				return obj2strStyle({
			
 
				+					'border-color': borderColor || '#e5e5e5',
			
 
				+					'background-color': this.disabled
			
 
				+						? this.styles.disableColor
			
 
				+						: this.styles.backgroundColor
			
 
				+				});
			
 
				+			},
			
 
				+			// input右侧样式
			
 
				+			inputStyle() {
			
 
				+				const paddingRight =
			
 
				+					this.type === 'password' || this.clearable || this.prefixIcon
			
 
				+						? ''
			
 
				+						: '10px';
			
 
				+				return obj2strStyle({
			
 
				+					'padding-right': paddingRight,
			
 
				+					'padding-left': this.prefixIcon ? '' : '10px'
			
 
				+				});
			
 
				+			}
			
 
				+		},
			
 
				+		watch: {
			
 
				+			value(newVal) {
			
 
				+				this.val = newVal;
			
 
				+			},
			
 
				+			modelValue(newVal) {
			
 
				+				this.val = newVal;
			
 
				+			},
			
 
				+			focus(newVal) {
			
 
				+				this.$nextTick(() => {
			
 
				+					this.focused = this.focus;
			
 
				+					this.focusShow = this.focus;
			
 
				+				});
			
 
				+			}
			
 
				+		},
			
 
				+		created() {
			
 
				+			this.init();
			
 
				+			// TODO 处理头条vue3 computed 不监听 inject 更改的问题（formItem.errMsg）
			
 
				+			if (this.form && this.formItem) {
			
 
				+				this.$watch('formItem.errMsg', newVal => {
			
 
				+					this.localMsg = newVal;
			
 
				+				});
			
 
				+			}
			
 
				+		},
			
 
				+		mounted() {
			
 
				+			this.$nextTick(() => {
			
 
				+				this.focused = this.focus;
			
 
				+				this.focusShow = this.focus;
			
 
				+			});
			
 
				+		},
			
 
				+		methods: {
			
 
				+			/**
			
 
				+			 * 初始化变量值
			
 
				+			 */
			
 
				+			init() {
			
 
				+				if (this.value || this.value === 0) {
			
 
				+					this.val = this.value;
			
 
				+				} else if (
			
 
				+					this.modelValue ||
			
 
				+					this.modelValue === 0 ||
			
 
				+					this.modelValue === ''
			
 
				+				) {
			
 
				+					this.val = this.modelValue;
			
 
				+				} else {
			
 
				+					this.val = null;
			
 
				+				}
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 点击图标时触发
			
 
				+			 * @param {Object} type
			
 
				+			 */
			
 
				+			onClickIcon(type) {
			
 
				+				this.$emit('iconClick', type);
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 显示隐藏内容，密码框时生效
			
 
				+			 */
			
 
				+			onEyes() {
			
 
				+				this.showPassword = !this.showPassword;
			
 
				+				this.$emit('eyes', this.showPassword);
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 输入时触发
			
 
				+			 * @param {Object} event
			
 
				+			 */
			
 
				+			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;
			
 
				+				// TODO 兼容 vue2
			
 
				+				this.$emit('input', value);
			
 
				+				// TODO　兼容　vue3
			
 
				+				this.$emit('update:modelValue', value);
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 外部调用方法
			
 
				+			 * 获取焦点时触发
			
 
				+			 * @param {Object} event
			
 
				+			 */
			
 
				+			onFocus() {
			
 
				+				this.$nextTick(() => {
			
 
				+					this.focused = true;
			
 
				+				});
			
 
				+				this.$emit('focus', null);
			
 
				+			},
			
 
				+
			
 
				+			_Focus(event) {
			
 
				+				this.focusShow = true;
			
 
				+				this.$emit('focus', event);
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 外部调用方法
			
 
				+			 * 失去焦点时触发
			
 
				+			 * @param {Object} event
			
 
				+			 */
			
 
				+			onBlur() {
			
 
				+				this.focused = false;
			
 
				+				this.$emit('blur', null);
			
 
				+			},
			
 
				+			_Blur(event) {
			
 
				+				let value = event.detail.value;
			
 
				+				this.focusShow = false;
			
 
				+				this.$emit('blur', event);
			
 
				+				// 根据类型返回值，在event中获取的值理论上讲都是string
			
 
				+				if (this.isEnter === false) {
			
 
				+					this.$emit('change', this.val);
			
 
				+				}
			
 
				+				// 失去焦点时参与表单校验
			
 
				+				if (this.form && this.formItem) {
			
 
				+					const { validateTrigger } = this.form;
			
 
				+					if (validateTrigger === 'blur') {
			
 
				+						this.formItem.onFieldChange();
			
 
				+					}
			
 
				+				}
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 按下键盘的发送键
			
 
				+			 * @param {Object} e
			
 
				+			 */
			
 
				+			onConfirm(e) {
			
 
				+				this.$emit('confirm', this.val);
			
 
				+				this.isEnter = true;
			
 
				+				this.$emit('change', this.val);
			
 
				+				this.$nextTick(() => {
			
 
				+					this.isEnter = false;
			
 
				+				});
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 清理内容
			
 
				+			 * @param {Object} event
			
 
				+			 */
			
 
				+			onClear(event) {
			
 
				+				this.val = '';
			
 
				+				// TODO 兼容 vue2
			
 
				+				this.$emit('input', '');
			
 
				+				// TODO 兼容 vue2
			
 
				+				// TODO　兼容　vue3
			
 
				+				this.$emit('update:modelValue', '');
			
 
				+				// 点击叉号触发
			
 
				+				this.$emit('clear');
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 键盘高度发生变化的时候触发此事件
			
 
				+			 * 兼容性：微信小程序2.7.0+、App 3.1.0+
			
 
				+			 * @param {Object} event
			
 
				+			 */
			
 
				+			onkeyboardheightchange(event) {
			
 
				+				this.$emit('keyboardheightchange', event);
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 去除空格
			
 
				+			 */
			
 
				+			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">
			
 
				+	$uni-error: #e43d33;
			
 
				+	$uni-border-1: #dcdfe6 !default;
			
 
				+
			
 
				+	.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;
			
 
				+		// min-height: 36px;
			
 
				+		/* #endif */
			
 
				+		flex-direction: row;
			
 
				+		align-items: center;
			
 
				+		// 处理border动画刚开始显示黑色的问题
			
 
				+		border-color: #fff;
			
 
				+		transition-property: border-color;
			
 
				+		transition-duration: 0.3s;
			
 
				+	}
			
 
				+
			
 
				+	.uni-easyinput__content-input {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		width: auto;
			
 
				+		/* #endif */
			
 
				+		position: relative;
			
 
				+		overflow: hidden;
			
 
				+		flex: 1;
			
 
				+		line-height: 1;
			
 
				+		font-size: 14px;
			
 
				+		height: 35px;
			
 
				+		// min-height: 36px;
			
 
				+
			
 
				+		/*ifdef H5*/
			
 
				+		& ::-ms-reveal {
			
 
				+			display: none;
			
 
				+		}
			
 
				+
			
 
				+		& ::-ms-clear {
			
 
				+			display: none;
			
 
				+		}
			
 
				+
			
 
				+		& ::-o-clear {
			
 
				+			display: none;
			
 
				+		}
			
 
				+		/*endif*/
			
 
				+	}
			
 
				+
			
 
				+	.uni-easyinput__placeholder-class {
			
 
				+		color: #999;
			
 
				+		font-size: 12px;
			
 
				+		// font-weight: 200;
			
 
				+	}
			
 
				+
			
 
				+	.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;
			
 
				+		margin: 6px;
			
 
				+		margin-left: 0;
			
 
				+		height: 80px;
			
 
				+		min-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-1;
			
 
				+		border-radius: 4px;
			
 
				+		/* #ifdef MP-ALIPAY */
			
 
				+		overflow: hidden;
			
 
				+		/* #endif */
			
 
				+	}
			
 
				+
			
 
				+	.uni-error-message {
			
 
				+		position: absolute;
			
 
				+		bottom: -17px;
			
 
				+		left: 0;
			
 
				+		line-height: 12px;
			
 
				+		color: $uni-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-error;
			
 
				+
			
 
				+		.uni-easyinput__placeholder-class {
			
 
				+			color: mix(#fff, $uni-error, 50%);
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	.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: #f7f6f6;
			
 
				+		color: #d5d5d5;
			
 
				+
			
 
				+		.uni-easyinput__placeholder-class {
			
 
				+			color: #d5d5d5;
			
 
				+			font-size: 12px;
			
 
				+		}
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uni-easyinput/package.json
+++ b/uni_modules/uni-easyinput/package.json
@@ -0,0 +1,88 @@
 
				+{
			
 
				+  "id": "uni-easyinput",
			
 
				+  "displayName": "uni-easyinput 增强输入框",
			
 
				+  "version": "1.1.18",
			
 
				+  "description": "Easyinput 组件是对原生input组件的增强",
			
 
				+  "keywords": [
			
 
				+    "uni-ui",
			
 
				+    "uniui",
			
 
				+    "input",
			
 
				+    "uni-easyinput",
			
 
				+    "输入框"
			
 
				+],
			
 
				+  "repository": "https://github.com/dcloudio/uni-ui",
			
 
				+  "engines": {
			
 
				+    "HBuilderX": ""
			
 
				+  },
			
 
				+  "directories": {
			
 
				+    "example": "../../temps/example_temps"
			
 
				+  },
			
 
				+"dcloudext": {
			
 
				+    "sale": {
			
 
				+      "regular": {
			
 
				+        "price": "0.00"
			
 
				+      },
			
 
				+      "sourcecode": {
			
 
				+        "price": "0.00"
			
 
				+      }
			
 
				+    },
			
 
				+    "contact": {
			
 
				+      "qq": ""
			
 
				+    },
			
 
				+    "declaration": {
			
 
				+      "ads": "无",
			
 
				+      "data": "无",
			
 
				+      "permissions": "无"
			
 
				+    },
			
 
				+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
			
 
				+    "type": "component-vue"
			
 
				+  },
			
 
				+  "uni_modules": {
			
 
				+    "dependencies": [
			
 
				+			"uni-scss",
			
 
				+      "uni-icons"
			
 
				+    ],
			
 
				+    "encrypt": [],
			
 
				+    "platforms": {
			
 
				+      "cloud": {
			
 
				+        "tcb": "y",
			
 
				+        "aliyun": "y",
			
 
				+        "alipay": "n"
			
 
				+      },
			
 
				+      "client": {
			
 
				+        "App": {
			
 
				+          "app-vue": "y",
			
 
				+          "app-nvue": "y"
			
 
				+        },
			
 
				+        "H5-mobile": {
			
 
				+          "Safari": "y",
			
 
				+          "Android Browser": "y",
			
 
				+          "微信浏览器(Android)": "y",
			
 
				+          "QQ浏览器(Android)": "y"
			
 
				+        },
			
 
				+        "H5-pc": {
			
 
				+          "Chrome": "y",
			
 
				+          "IE": "y",
			
 
				+          "Edge": "y",
			
 
				+          "Firefox": "y",
			
 
				+          "Safari": "y"
			
 
				+        },
			
 
				+        "小程序": {
			
 
				+          "微信": "y",
			
 
				+          "阿里": "y",
			
 
				+          "百度": "y",
			
 
				+          "字节跳动": "y",
			
 
				+          "QQ": "y"
			
 
				+        },
			
 
				+        "快应用": {
			
 
				+          "华为": "u",
			
 
				+          "联盟": "u"
			
 
				+        },
			
 
				+        "Vue": {
			
 
				+            "vue2": "y",
			
 
				+            "vue3": "y"
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
--- a/uni_modules/uni-easyinput/readme.md
+++ b/uni_modules/uni-easyinput/readme.md
@@ -0,0 +1,11 @@
 
				+
			
 
				+
			
 
				+### Easyinput 增强输入框
			
 
				+> **组件名：uni-easyinput**
			
 
				+> 代码块： `uEasyinput`
			
 
				+
			
 
				+
			
 
				+easyinput 组件是对原生input组件的增强 ，是专门为配合表单组件[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)而设计的，easyinput 内置了边框，图标等，同时包含 input 所有功能
			
 
				+
			
 
				+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
			
 
				+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
			
--- a/uni_modules/uni-forms/changelog.md
+++ b/uni_modules/uni-forms/changelog.md
@@ -0,0 +1,94 @@
 
				+## 1.4.10（2023-11-03）
			
 
				+- 优化 labelWidth 描述错误
			
 
				+## 1.4.9（2023-02-10）
			
 
				+- 修复 required 参数无法动态绑定
			
 
				+## 1.4.8（2022-08-23）
			
 
				+- 优化 根据 rules 自动添加 required 的问题
			
 
				+## 1.4.7（2022-08-22）
			
 
				+- 修复 item 未设置 require 属性，rules 设置 require 后，星号也显示的 bug，详见：[https://ask.dcloud.net.cn/question/151540](https://ask.dcloud.net.cn/question/151540)
			
 
				+## 1.4.6（2022-07-13）
			
 
				+- 修复 model 需要校验的值没有声明对应字段时，导致第一次不触发校验的bug
			
 
				+## 1.4.5（2022-07-05）
			
 
				+- 新增 更多表单示例
			
 
				+- 优化 子表单组件过期提示的问题
			
 
				+- 优化 子表单组件uni-datetime-picker、uni-data-select、uni-data-picker的显示样式
			
 
				+## 1.4.4（2022-07-04）
			
 
				+- 更新 删除组件日志
			
 
				+## 1.4.3（2022-07-04）
			
 
				+- 修复 由 1.4.0 引发的 label 插槽不生效的bug
			
 
				+## 1.4.2（2022-07-04）
			
 
				+- 修复 子组件找不到 setValue 报错的bug
			
 
				+## 1.4.1（2022-07-04）
			
 
				+- 修复 uni-data-picker 在 uni-forms-item 中报错的bug
			
 
				+- 修复 uni-data-picker 在 uni-forms-item 中宽度不正确的bug
			
 
				+## 1.4.0（2022-06-30）
			
 
				+- 【重要】组件逻辑重构，部分用法用旧版本不兼容，请注意兼容问题
			
 
				+- 【重要】组件使用 Provide/Inject 方式注入依赖，提供了自定义表单组件调用 uni-forms 校验表单的能力
			
 
				+- 新增 model 属性，等同于原 value/modelValue 属性，旧属性即将废弃
			
 
				+- 新增 validateTrigger 属性的 blur 值，仅 uni-easyinput 生效
			
 
				+- 新增 onFieldChange 方法，可以对子表单进行校验，可替代binddata方法
			
 
				+- 新增 子表单的 setRules 方法，配合自定义校验函数使用
			
 
				+- 新增 uni-forms-item 的 setRules 方法，配置动态表单使用可动态更新校验规则
			
 
				+- 优化 动态表单校验方式，废弃拼接name的方式
			
 
				+## 1.3.3（2022-06-22）
			
 
				+- 修复 表单校验顺序无序问题
			
 
				+## 1.3.2（2021-12-09）
			
 
				+-
			
 
				+## 1.3.1（2021-11-19）
			
 
				+- 修复 label 插槽不生效的bug
			
 
				+## 1.3.0（2021-11-19）
			
 
				+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
			
 
				+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-forms](https://uniapp.dcloud.io/component/uniui/uni-forms)
			
 
				+## 1.2.7（2021-08-13）
			
 
				+- 修复 没有添加校验规则的字段依然报错的Bug
			
 
				+## 1.2.6（2021-08-11）
			
 
				+- 修复 重置表单错误信息无法清除的问题
			
 
				+## 1.2.5（2021-08-11）
			
 
				+- 优化 组件文档
			
 
				+## 1.2.4（2021-08-11）
			
 
				+- 修复 表单验证只生效一次的问题
			
 
				+## 1.2.3（2021-07-30）
			
 
				+- 优化 vue3下事件警告的问题
			
 
				+## 1.2.2（2021-07-26）
			
 
				+- 修复 vue2 下条件编译导致destroyed生命周期失效的Bug
			
 
				+- 修复 1.2.1 引起的示例在小程序平台报错的Bug
			
 
				+## 1.2.1（2021-07-22）
			
 
				+- 修复 动态校验表单，默认值为空的情况下校验失效的Bug
			
 
				+- 修复 不指定name属性时，运行报错的Bug
			
 
				+- 优化 label默认宽度从65调整至70，使required为true且四字时不换行
			
 
				+- 优化 组件示例，新增动态校验示例代码
			
 
				+- 优化 组件文档，使用方式更清晰
			
 
				+## 1.2.0（2021-07-13）
			
 
				+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
			
 
				+## 1.1.2（2021-06-25）
			
 
				+- 修复 pattern 属性在微信小程序平台无效的问题
			
 
				+## 1.1.1（2021-06-22）
			
 
				+- 修复 validate-trigger属性为submit且err-show-type属性为toast时不能弹出的Bug
			
 
				+## 1.1.0（2021-06-22）
			
 
				+- 修复 只写setRules方法而导致校验不生效的Bug
			
 
				+- 修复 由上个办法引发的错误提示文字错位的Bug
			
 
				+## 1.0.48（2021-06-21）
			
 
				+- 修复 不设置 label 属性 ，无法设置label插槽的问题
			
 
				+## 1.0.47（2021-06-21）
			
 
				+- 修复 不设置label属性，label-width属性不生效的bug
			
 
				+- 修复 setRules 方法与rules属性冲突的问题
			
 
				+## 1.0.46（2021-06-04）
			
 
				+- 修复 动态删减数据导致报错的问题
			
 
				+## 1.0.45（2021-06-04）
			
 
				+- 新增 modelValue 属性 ，value 即将废弃
			
 
				+## 1.0.44（2021-06-02）
			
 
				+- 新增 uni-forms-item 可以设置单独的 rules
			
 
				+- 新增 validate 事件增加 keepitem 参数，可以选择那些字段不过滤
			
 
				+- 优化 submit 事件重命名为 validate
			
 
				+## 1.0.43（2021-05-12）
			
 
				+- 新增 组件示例地址
			
 
				+## 1.0.42（2021-04-30）
			
 
				+- 修复 自定义检验器失效的问题
			
 
				+## 1.0.41（2021-03-05）
			
 
				+- 更新 校验器
			
 
				+- 修复 表单规则设置类型为 number 的情况下，值为0校验失败的Bug
			
 
				+## 1.0.40（2021-03-04）
			
 
				+- 修复 动态显示uni-forms-item的情况下，submit 方法获取值错误的Bug
			
 
				+## 1.0.39（2021-02-05）
			
 
				+- 调整为uni_modules目录规范
			
 
				+- 修复 校验器传入 int 等类型 ，返回String类型的Bug
			
--- a/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
+++ b/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
@@ -0,0 +1,627 @@
 
				+<template>
			
 
				+	<view class="uni-forms-item"
			
 
				+		:class="['is-direction-' + localLabelPos ,border?'uni-forms-item--border':'' ,border && isFirstBorder?'is-first-border':'']">
			
 
				+		<slot name="label">
			
 
				+			<view class="uni-forms-item__label" :class="{'no-label':!label && !required}"
			
 
				+				:style="{width:localLabelWidth,justifyContent: localLabelAlign}">
			
 
				+				<text v-if="required" class="is-required">*</text>
			
 
				+				<text>{{label}}</text>
			
 
				+			</view>
			
 
				+		</slot>
			
 
				+		<!-- #ifndef APP-NVUE -->
			
 
				+		<view class="uni-forms-item__content">
			
 
				+			<slot></slot>
			
 
				+			<view class="uni-forms-item__error" :class="{'msg--active':msg}">
			
 
				+				<text>{{msg}}</text>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+		<!-- #endif -->
			
 
				+		<!-- #ifdef APP-NVUE -->
			
 
				+		<view class="uni-forms-item__nuve-content">
			
 
				+			<view class="uni-forms-item__content">
			
 
				+				<slot></slot>
			
 
				+			</view>
			
 
				+			<view class="uni-forms-item__error" :class="{'msg--active':msg}">
			
 
				+				<text class="error-text">{{msg}}</text>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+		<!-- #endif -->
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	/**
			
 
				+	 * uni-fomrs-item 表单子组件
			
 
				+	 * @description uni-fomrs-item 表单子组件，提供了基础布局已经校验能力
			
 
				+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=2773
			
 
				+	 * @property {Boolean} required 是否必填，左边显示红色"*"号
			
 
				+	 * @property {String } 	label 				输入框左边的文字提示
			
 
				+	 * @property {Number } 	labelWidth 			label的宽度，单位px（默认70）
			
 
				+	 * @property {String } 	labelAlign = [left|center|right] label的文字对齐方式（默认left）
			
 
				+	 * 	@value left		label 左侧显示
			
 
				+	 * 	@value center	label 居中
			
 
				+	 * 	@value right	label 右侧对齐
			
 
				+	 * @property {String } 	errorMessage 		显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
			
 
				+	 * @property {String } 	name 				表单域的属性名，在使用校验规则时必填
			
 
				+	 * @property {String } 	leftIcon 			【1.4.0废弃】label左边的图标，限 uni-ui 的图标名称
			
 
				+	 * @property {String } 	iconColor 		【1.4.0废弃】左边通过icon配置的图标的颜色（默认#606266）
			
 
				+	 * @property {String} validateTrigger = [bind|submit|blur]	【1.4.0废弃】校验触发器方式 默认 submit
			
 
				+	 * 	@value bind 	发生变化时触发
			
 
				+	 * 	@value submit 提交时触发
			
 
				+	 * 	@value blur 	失去焦点触发
			
 
				+	 * @property {String } 	labelPosition = [top|left] 【1.4.0废弃】label的文字的位置（默认left）
			
 
				+	 * 	@value top	顶部显示 label
			
 
				+	 * 	@value left	左侧显示 label
			
 
				+	 */
			
 
				+
			
 
				+	export default {
			
 
				+		name: 'uniFormsItem',
			
 
				+		options: {
			
 
				+			virtualHost: true
			
 
				+		},
			
 
				+		provide() {
			
 
				+			return {
			
 
				+				uniFormItem: this
			
 
				+			}
			
 
				+		},
			
 
				+		inject: {
			
 
				+			form: {
			
 
				+				from: 'uniForm',
			
 
				+				default: null
			
 
				+			},
			
 
				+		},
			
 
				+		props: {
			
 
				+			// 表单校验规则
			
 
				+			rules: {
			
 
				+				type: Array,
			
 
				+				default () {
			
 
				+					return null;
			
 
				+				}
			
 
				+			},
			
 
				+			// 表单域的属性名，在使用校验规则时必填
			
 
				+			name: {
			
 
				+				type: [String, Array],
			
 
				+				default: ''
			
 
				+			},
			
 
				+			required: {
			
 
				+				type: Boolean,
			
 
				+				default: false
			
 
				+			},
			
 
				+			label: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			// label的宽度
			
 
				+			labelWidth: {
			
 
				+				type: [String, Number],
			
 
				+				default: ''
			
 
				+			},
			
 
				+			// label 居中方式，默认 left 取值 left/center/right
			
 
				+			labelAlign: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			// 强制显示错误信息
			
 
				+			errorMessage: {
			
 
				+				type: [String, Boolean],
			
 
				+				default: ''
			
 
				+			},
			
 
				+			// 1.4.0 弃用，统一使用 form 的校验时机
			
 
				+			// validateTrigger: {
			
 
				+			// 	type: String,
			
 
				+			// 	default: ''
			
 
				+			// },
			
 
				+			// 1.4.0 弃用，统一使用 form 的label 位置
			
 
				+			// labelPosition: {
			
 
				+			// 	type: String,
			
 
				+			// 	default: ''
			
 
				+			// },
			
 
				+			// 1.4.0 以下属性已经废弃，请使用  #label 插槽代替
			
 
				+			leftIcon: String,
			
 
				+			iconColor: {
			
 
				+				type: String,
			
 
				+				default: '#606266'
			
 
				+			},
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {
			
 
				+				errMsg: '',
			
 
				+				userRules: null,
			
 
				+				localLabelAlign: 'left',
			
 
				+				localLabelWidth: '70px',
			
 
				+				localLabelPos: 'left',
			
 
				+				border: false,
			
 
				+				isFirstBorder: false,
			
 
				+			};
			
 
				+		},
			
 
				+		computed: {
			
 
				+			// 处理错误信息
			
 
				+			msg() {
			
 
				+				return this.errorMessage || this.errMsg;
			
 
				+			}
			
 
				+		},
			
 
				+		watch: {
			
 
				+			// 规则发生变化通知子组件更新
			
 
				+			'form.formRules'(val) {
			
 
				+				// TODO 处理头条vue3 watch不生效的问题
			
 
				+				// #ifndef MP-TOUTIAO
			
 
				+				this.init()
			
 
				+				// #endif
			
 
				+			},
			
 
				+			'form.labelWidth'(val) {
			
 
				+				// 宽度
			
 
				+				this.localLabelWidth = this._labelWidthUnit(val)
			
 
				+
			
 
				+			},
			
 
				+			'form.labelPosition'(val) {
			
 
				+				// 标签位置
			
 
				+				this.localLabelPos = this._labelPosition()
			
 
				+			},
			
 
				+			'form.labelAlign'(val) {
			
 
				+
			
 
				+			}
			
 
				+		},
			
 
				+		created() {
			
 
				+			this.init(true)
			
 
				+			if (this.name && this.form) {
			
 
				+				// TODO 处理头条vue3 watch不生效的问题
			
 
				+				// #ifdef MP-TOUTIAO
			
 
				+				this.$watch('form.formRules', () => {
			
 
				+					this.init()
			
 
				+				})
			
 
				+				// #endif
			
 
				+
			
 
				+				// 监听变化
			
 
				+				this.$watch(
			
 
				+					() => {
			
 
				+						const val = this.form._getDataValue(this.name, this.form.localData)
			
 
				+						return val
			
 
				+					},
			
 
				+					(value, oldVal) => {
			
 
				+						const isEqual = this.form._isEqual(value, oldVal)
			
 
				+						// 简单判断前后值的变化，只有发生变化才会发生校验
			
 
				+						// TODO  如果 oldVal = undefined ，那么大概率是源数据里没有值导致 ，这个情况不哦校验 ,可能不严谨 ，需要在做观察
			
 
				+						// fix by mehaotian 暂时取消 && oldVal !== undefined ，如果formData 中不存在，可能会不校验
			
 
				+						if (!isEqual) {
			
 
				+							const val = this.itemSetValue(value)
			
 
				+							this.onFieldChange(val, false)
			
 
				+						}
			
 
				+					}, {
			
 
				+						immediate: false
			
 
				+					}
			
 
				+				);
			
 
				+			}
			
 
				+
			
 
				+		},
			
 
				+		// #ifndef VUE3
			
 
				+		destroyed() {
			
 
				+			if (this.__isUnmounted) return
			
 
				+			this.unInit()
			
 
				+		},
			
 
				+		// #endif
			
 
				+		// #ifdef VUE3
			
 
				+		unmounted() {
			
 
				+			this.__isUnmounted = true
			
 
				+			this.unInit()
			
 
				+		},
			
 
				+		// #endif
			
 
				+		methods: {
			
 
				+			/**
			
 
				+			 * 外部调用方法
			
 
				+			 * 设置规则 ，主要用于小程序自定义检验规则
			
 
				+			 * @param {Array} rules 规则源数据
			
 
				+			 */
			
 
				+			setRules(rules = null) {
			
 
				+				this.userRules = rules
			
 
				+				this.init(false)
			
 
				+			},
			
 
				+			// 兼容老版本表单组件
			
 
				+			setValue() {
			
 
				+				// console.log('setValue 方法已经弃用，请使用最新版本的 uni-forms 表单组件以及其他关联组件。');
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 外部调用方法
			
 
				+			 * 校验数据
			
 
				+			 * @param {any} value 需要校验的数据
			
 
				+			 * @param {boolean} 是否立即校验
			
 
				+			 * @return {Array|null} 校验内容
			
 
				+			 */
			
 
				+			async onFieldChange(value, formtrigger = true) {
			
 
				+				const {
			
 
				+					formData,
			
 
				+					localData,
			
 
				+					errShowType,
			
 
				+					validateCheck,
			
 
				+					validateTrigger,
			
 
				+					_isRequiredField,
			
 
				+					_realName
			
 
				+				} = this.form
			
 
				+				const name = _realName(this.name)
			
 
				+				if (!value) {
			
 
				+					value = this.form.formData[name]
			
 
				+				}
			
 
				+				// fixd by mehaotian 不在校验前清空信息，解决闪屏的问题
			
 
				+				// this.errMsg = '';
			
 
				+
			
 
				+				// fix by mehaotian 解决没有检验规则的情况下，抛出错误的问题
			
 
				+				const ruleLen = this.itemRules.rules && this.itemRules.rules.length
			
 
				+				if (!this.validator || !ruleLen || ruleLen === 0) return;
			
 
				+
			
 
				+				// 检验时机
			
 
				+				// let trigger = this.isTrigger(this.itemRules.validateTrigger, this.validateTrigger, validateTrigger);
			
 
				+				const isRequiredField = _isRequiredField(this.itemRules.rules || []);
			
 
				+				let result = null;
			
 
				+				// 只有等于 bind 时 ，才能开启时实校验
			
 
				+				if (validateTrigger === 'bind' || formtrigger) {
			
 
				+					// 校验当前表单项
			
 
				+					result = await this.validator.validateUpdate({
			
 
				+							[name]: value
			
 
				+						},
			
 
				+						formData
			
 
				+					);
			
 
				+
			
 
				+					// 判断是否必填,非必填，不填不校验，填写才校验 ,暂时只处理 undefined  和空的情况
			
 
				+					if (!isRequiredField && (value === undefined || value === '')) {
			
 
				+						result = null;
			
 
				+					}
			
 
				+
			
 
				+					// 判断错误信息显示类型
			
 
				+					if (result && result.errorMessage) {
			
 
				+						if (errShowType === 'undertext') {
			
 
				+							// 获取错误信息
			
 
				+							this.errMsg = !result ? '' : result.errorMessage;
			
 
				+						}
			
 
				+						if (errShowType === 'toast') {
			
 
				+							uni.showToast({
			
 
				+								title: result.errorMessage || '校验错误',
			
 
				+								icon: 'none'
			
 
				+							});
			
 
				+						}
			
 
				+						if (errShowType === 'modal') {
			
 
				+							uni.showModal({
			
 
				+								title: '提示',
			
 
				+								content: result.errorMessage || '校验错误'
			
 
				+							});
			
 
				+						}
			
 
				+					} else {
			
 
				+						this.errMsg = ''
			
 
				+					}
			
 
				+					// 通知 form 组件更新事件
			
 
				+					validateCheck(result ? result : null)
			
 
				+				} else {
			
 
				+					this.errMsg = ''
			
 
				+				}
			
 
				+				return result ? result : null;
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 初始组件数据
			
 
				+			 */
			
 
				+			init(type = false) {
			
 
				+				const {
			
 
				+					validator,
			
 
				+					formRules,
			
 
				+					childrens,
			
 
				+					formData,
			
 
				+					localData,
			
 
				+					_realName,
			
 
				+					labelWidth,
			
 
				+					_getDataValue,
			
 
				+					_setDataValue
			
 
				+				} = this.form || {}
			
 
				+				// 对齐方式
			
 
				+				this.localLabelAlign = this._justifyContent()
			
 
				+				// 宽度
			
 
				+				this.localLabelWidth = this._labelWidthUnit(labelWidth)
			
 
				+				// 标签位置
			
 
				+				this.localLabelPos = this._labelPosition()
			
 
				+				// 将需要校验的子组件加入form 队列
			
 
				+				this.form && type && childrens.push(this)
			
 
				+
			
 
				+				if (!validator || !formRules) return
			
 
				+				// 判断第一个 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;
			
 
				+				// 获取子域的真实名称
			
 
				+				const name = _realName(this.name)
			
 
				+				const itemRule = this.userRules || this.rules
			
 
				+				if (typeof formRules === 'object' && itemRule) {
			
 
				+					// 子规则替换父规则
			
 
				+					formRules[name] = {
			
 
				+						rules: itemRule
			
 
				+					}
			
 
				+					validator.updateSchema(formRules);
			
 
				+				}
			
 
				+				// 注册校验规则
			
 
				+				const itemRules = formRules[name] || {}
			
 
				+				this.itemRules = itemRules
			
 
				+				// 注册校验函数
			
 
				+				this.validator = validator
			
 
				+				// 默认值赋予
			
 
				+				this.itemSetValue(_getDataValue(this.name, localData))
			
 
				+			},
			
 
				+			unInit() {
			
 
				+				if (this.form) {
			
 
				+					const {
			
 
				+						childrens,
			
 
				+						formData,
			
 
				+						_realName
			
 
				+					} = this.form
			
 
				+					childrens.forEach((item, index) => {
			
 
				+						if (item === this) {
			
 
				+							this.form.childrens.splice(index, 1)
			
 
				+							delete formData[_realName(item.name)]
			
 
				+						}
			
 
				+					})
			
 
				+				}
			
 
				+			},
			
 
				+			// 设置item 的值
			
 
				+			itemSetValue(value) {
			
 
				+				const name = this.form._realName(this.name)
			
 
				+				const rules = this.itemRules.rules || []
			
 
				+				const val = this.form._getValue(name, value, rules)
			
 
				+				this.form._setDataValue(name, this.form.formData, val)
			
 
				+				return val
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 移除该表单项的校验结果
			
 
				+			 */
			
 
				+			clearValidate() {
			
 
				+				this.errMsg = '';
			
 
				+			},
			
 
				+
			
 
				+			// 是否显示星号
			
 
				+			_isRequired() {
			
 
				+				// TODO 不根据规则显示 星号，考虑后续兼容
			
 
				+				// if (this.form) {
			
 
				+				// 	if (this.form._isRequiredField(this.itemRules.rules || []) && this.required) {
			
 
				+				// 		return true
			
 
				+				// 	}
			
 
				+				// 	return false
			
 
				+				// }
			
 
				+				return this.required
			
 
				+			},
			
 
				+
			
 
				+			// 处理对齐方式
			
 
				+			_justifyContent() {
			
 
				+				if (this.form) {
			
 
				+					const {
			
 
				+						labelAlign
			
 
				+					} = this.form
			
 
				+					let labelAli = this.labelAlign ? this.labelAlign : labelAlign;
			
 
				+					if (labelAli === 'left') return 'flex-start';
			
 
				+					if (labelAli === 'center') return 'center';
			
 
				+					if (labelAli === 'right') return 'flex-end';
			
 
				+				}
			
 
				+				return 'flex-start';
			
 
				+			},
			
 
				+			// 处理 label宽度单位 ,继承父元素的值
			
 
				+			_labelWidthUnit(labelWidth) {
			
 
				+
			
 
				+				// if (this.form) {
			
 
				+				// 	const {
			
 
				+				// 		labelWidth
			
 
				+				// 	} = this.form
			
 
				+				return this.num2px(this.labelWidth ? this.labelWidth : (labelWidth || (this.label ? 70 : 'auto')))
			
 
				+				// }
			
 
				+				// return '70px'
			
 
				+			},
			
 
				+			// 处理 label 位置
			
 
				+			_labelPosition() {
			
 
				+				if (this.form) return this.form.labelPosition || 'left'
			
 
				+				return 'left'
			
 
				+
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 触发时机
			
 
				+			 * @param {Object} rule 当前规则内时机
			
 
				+			 * @param {Object} itemRlue 当前组件时机
			
 
				+			 * @param {Object} parentRule 父组件时机
			
 
				+			 */
			
 
				+			isTrigger(rule, itemRlue, parentRule) {
			
 
				+				//  bind  submit
			
 
				+				if (rule === 'submit' || !rule) {
			
 
				+					if (rule === undefined) {
			
 
				+						if (itemRlue !== 'bind') {
			
 
				+							if (!itemRlue) {
			
 
				+								return parentRule === '' ? 'bind' : 'submit';
			
 
				+							}
			
 
				+							return 'submit';
			
 
				+						}
			
 
				+						return 'bind';
			
 
				+					}
			
 
				+					return 'submit';
			
 
				+				}
			
 
				+				return 'bind';
			
 
				+			},
			
 
				+			num2px(num) {
			
 
				+				if (typeof num === 'number') {
			
 
				+					return `${num}px`
			
 
				+				}
			
 
				+				return num
			
 
				+			}
			
 
				+		}
			
 
				+	};
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss">
			
 
				+	.uni-forms-item {
			
 
				+		position: relative;
			
 
				+		display: flex;
			
 
				+		/* #ifdef APP-NVUE */
			
 
				+		// 在 nvue 中，使用 margin-bottom error 信息会被隐藏
			
 
				+		padding-bottom: 22px;
			
 
				+		/* #endif */
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		margin-bottom: 22px;
			
 
				+		/* #endif */
			
 
				+		flex-direction: row;
			
 
				+
			
 
				+		&__label {
			
 
				+			display: flex;
			
 
				+			flex-direction: row;
			
 
				+			align-items: center;
			
 
				+			text-align: left;
			
 
				+			font-size: 14px;
			
 
				+			color: #606266;
			
 
				+			height: 36px;
			
 
				+			padding: 0 12px 0 0;
			
 
				+			/* #ifndef APP-NVUE */
			
 
				+			vertical-align: middle;
			
 
				+			flex-shrink: 0;
			
 
				+			/* #endif */
			
 
				+
			
 
				+			/* #ifndef APP-NVUE */
			
 
				+			box-sizing: border-box;
			
 
				+
			
 
				+			/* #endif */
			
 
				+			&.no-label {
			
 
				+				padding: 0;
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		&__content {
			
 
				+			/* #ifndef MP-TOUTIAO */
			
 
				+			// display: flex;
			
 
				+			// align-items: center;
			
 
				+			/* #endif */
			
 
				+			position: relative;
			
 
				+			font-size: 14px;
			
 
				+			flex: 1;
			
 
				+			/* #ifndef APP-NVUE */
			
 
				+			box-sizing: border-box;
			
 
				+			/* #endif */
			
 
				+			flex-direction: row;
			
 
				+
			
 
				+			/* #ifndef APP || H5 || MP-WEIXIN || APP-NVUE */
			
 
				+			// TODO 因为小程序平台会多一层标签节点 ，所以需要在多余节点继承当前样式
			
 
				+			&>uni-easyinput,
			
 
				+			&>uni-data-picker {
			
 
				+				width: 100%;
			
 
				+			}
			
 
				+
			
 
				+			/* #endif */
			
 
				+
			
 
				+		}
			
 
				+
			
 
				+		& .uni-forms-item__nuve-content {
			
 
				+			display: flex;
			
 
				+			flex-direction: column;
			
 
				+			flex: 1;
			
 
				+		}
			
 
				+
			
 
				+		&__error {
			
 
				+			color: #f56c6c;
			
 
				+			font-size: 12px;
			
 
				+			line-height: 1;
			
 
				+			padding-top: 4px;
			
 
				+			position: absolute;
			
 
				+			/* #ifndef APP-NVUE */
			
 
				+			top: 100%;
			
 
				+			left: 0;
			
 
				+			transition: transform 0.3s;
			
 
				+			transform: translateY(-100%);
			
 
				+			/* #endif */
			
 
				+			/* #ifdef APP-NVUE */
			
 
				+			bottom: 5px;
			
 
				+			/* #endif */
			
 
				+
			
 
				+			opacity: 0;
			
 
				+
			
 
				+			.error-text {
			
 
				+				// 只有 nvue 下这个样式才生效
			
 
				+				color: #f56c6c;
			
 
				+				font-size: 12px;
			
 
				+			}
			
 
				+
			
 
				+			&.msg--active {
			
 
				+				opacity: 1;
			
 
				+				transform: translateY(0%);
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		// 位置修饰样式
			
 
				+		&.is-direction-left {
			
 
				+			flex-direction: row;
			
 
				+		}
			
 
				+
			
 
				+		&.is-direction-top {
			
 
				+			flex-direction: column;
			
 
				+
			
 
				+			.uni-forms-item__label {
			
 
				+				padding: 0 0 8px;
			
 
				+				line-height: 1.5715;
			
 
				+				text-align: left;
			
 
				+				/* #ifndef APP-NVUE */
			
 
				+				white-space: initial;
			
 
				+				/* #endif */
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		.is-required {
			
 
				+			// color: $uni-color-error;
			
 
				+			color: #dd524d;
			
 
				+			font-weight: bold;
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+
			
 
				+	.uni-forms-item--border {
			
 
				+		margin-bottom: 0;
			
 
				+		padding: 10px 0;
			
 
				+		// padding-bottom: 0;
			
 
				+		border-top: 1px #eee solid;
			
 
				+
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		.uni-forms-item__content {
			
 
				+			flex-direction: column;
			
 
				+			justify-content: flex-start;
			
 
				+			align-items: flex-start;
			
 
				+
			
 
				+			.uni-forms-item__error {
			
 
				+				position: relative;
			
 
				+				top: 5px;
			
 
				+				left: 0;
			
 
				+				padding-top: 0;
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		/* #endif */
			
 
				+
			
 
				+		/* #ifdef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		flex-direction: column;
			
 
				+
			
 
				+		.uni-forms-item__error {
			
 
				+			position: relative;
			
 
				+			top: 0px;
			
 
				+			left: 0;
			
 
				+			padding-top: 0;
			
 
				+			margin-top: 5px;
			
 
				+		}
			
 
				+
			
 
				+		/* #endif */
			
 
				+
			
 
				+	}
			
 
				+
			
 
				+	.is-first-border {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		border: none;
			
 
				+		/* #endif */
			
 
				+		/* #ifdef APP-NVUE */
			
 
				+		border-width: 0;
			
 
				+		/* #endif */
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
+++ b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
@@ -0,0 +1,397 @@
 
				+<template>
			
 
				+	<view class="uni-forms">
			
 
				+		<form>
			
 
				+			<slot></slot>
			
 
				+		</form>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import Validator from './validate.js';
			
 
				+	import {
			
 
				+		deepCopy,
			
 
				+		getValue,
			
 
				+		isRequiredField,
			
 
				+		setDataValue,
			
 
				+		getDataValue,
			
 
				+		realName,
			
 
				+		isRealName,
			
 
				+		rawData,
			
 
				+		isEqual
			
 
				+	} from './utils.js'
			
 
				+
			
 
				+	// #ifndef VUE3
			
 
				+	// 后续会慢慢废弃这个方法
			
 
				+	import Vue from 'vue';
			
 
				+	Vue.prototype.binddata = function(name, value, formName) {
			
 
				+		if (formName) {
			
 
				+			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);
			
 
				+		}
			
 
				+	};
			
 
				+	// #endif
			
 
				+	/**
			
 
				+	 * Forms 表单
			
 
				+	 * @description 由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据
			
 
				+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=2773
			
 
				+	 * @property {Object} rules	表单校验规则
			
 
				+	 * @property {String} validateTrigger = [bind|submit|blur]	校验触发器方式 默认 submit
			
 
				+	 * @value bind		发生变化时触发
			
 
				+	 * @value submit	提交时触发
			
 
				+	 * @value blur	  失去焦点时触发
			
 
				+	 * @property {String} labelPosition = [top|left]	label 位置 默认 left
			
 
				+	 * @value top		顶部显示 label
			
 
				+	 * @value left	左侧显示 label
			
 
				+	 * @property {String} labelWidth	label 宽度，默认 70px
			
 
				+	 * @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	提交时触发
			
 
				+	 * @event {Function} validate	校验结果发生变化触发
			
 
				+	 */
			
 
				+	export default {
			
 
				+		name: 'uniForms',
			
 
				+		emits: ['validate', 'submit'],
			
 
				+		options: {
			
 
				+			virtualHost: true
			
 
				+		},
			
 
				+		props: {
			
 
				+			// 即将弃用
			
 
				+			value: {
			
 
				+				type: Object,
			
 
				+				default () {
			
 
				+					return null;
			
 
				+				}
			
 
				+			},
			
 
				+			// vue3 替换 value 属性
			
 
				+			modelValue: {
			
 
				+				type: Object,
			
 
				+				default () {
			
 
				+					return null;
			
 
				+				}
			
 
				+			},
			
 
				+			// 1.4.0 开始将不支持 v-model ，且废弃 value 和 modelValue
			
 
				+			model: {
			
 
				+				type: Object,
			
 
				+				default () {
			
 
				+					return null;
			
 
				+				}
			
 
				+			},
			
 
				+			// 表单校验规则
			
 
				+			rules: {
			
 
				+				type: Object,
			
 
				+				default () {
			
 
				+					return {};
			
 
				+				}
			
 
				+			},
			
 
				+			//校验错误信息提示方式 默认 undertext 取值 [undertext|toast|modal]
			
 
				+			errShowType: {
			
 
				+				type: String,
			
 
				+				default: 'undertext'
			
 
				+			},
			
 
				+			// 校验触发器方式 默认 bind 取值 [bind|submit]
			
 
				+			validateTrigger: {
			
 
				+				type: String,
			
 
				+				default: 'submit'
			
 
				+			},
			
 
				+			// label 位置，默认 left 取值  top/left
			
 
				+			labelPosition: {
			
 
				+				type: String,
			
 
				+				default: 'left'
			
 
				+			},
			
 
				+			// label 宽度
			
 
				+			labelWidth: {
			
 
				+				type: [String, Number],
			
 
				+				default: ''
			
 
				+			},
			
 
				+			// label 居中方式，默认 left 取值 left/center/right
			
 
				+			labelAlign: {
			
 
				+				type: String,
			
 
				+				default: 'left'
			
 
				+			},
			
 
				+			border: {
			
 
				+				type: Boolean,
			
 
				+				default: false
			
 
				+			}
			
 
				+		},
			
 
				+		provide() {
			
 
				+			return {
			
 
				+				uniForm: this
			
 
				+			}
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {
			
 
				+				// 表单本地值的记录，不应该与传如的值进行关联
			
 
				+				formData: {},
			
 
				+				formRules: {}
			
 
				+			};
			
 
				+		},
			
 
				+		computed: {
			
 
				+			// 计算数据源变化的
			
 
				+			localData() {
			
 
				+				const localVal = this.model || this.modelValue || this.value
			
 
				+				if (localVal) {
			
 
				+					return deepCopy(localVal)
			
 
				+				}
			
 
				+				return {}
			
 
				+			}
			
 
				+		},
			
 
				+		watch: {
			
 
				+			// 监听数据变化 ,暂时不使用，需要单独赋值
			
 
				+			// localData: {},
			
 
				+			// 监听规则变化
			
 
				+			rules: {
			
 
				+				handler: function(val, oldVal) {
			
 
				+					this.setRules(val)
			
 
				+				},
			
 
				+				deep: true,
			
 
				+				immediate: true
			
 
				+			}
			
 
				+		},
			
 
				+		created() {
			
 
				+			// #ifdef VUE3
			
 
				+			let getbinddata = getApp().$vm.$.appContext.config.globalProperties.binddata
			
 
				+			if (!getbinddata) {
			
 
				+				getApp().$vm.$.appContext.config.globalProperties.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);
			
 
				+					}
			
 
				+				}
			
 
				+			}
			
 
				+			// #endif
			
 
				+
			
 
				+			// 子组件实例数组
			
 
				+			this.childrens = []
			
 
				+			// TODO 兼容旧版 uni-data-picker ,新版本中无效，只是避免报错
			
 
				+			this.inputChildrens = []
			
 
				+			this.setRules(this.rules)
			
 
				+		},
			
 
				+		methods: {
			
 
				+			/**
			
 
				+			 * 外部调用方法
			
 
				+			 * 设置规则 ，主要用于小程序自定义检验规则
			
 
				+			 * @param {Array} rules 规则源数据
			
 
				+			 */
			
 
				+			setRules(rules) {
			
 
				+				// TODO 有可能子组件合并规则的时机比这个要早，所以需要合并对象 ，而不是直接赋值，可能会被覆盖
			
 
				+				this.formRules = Object.assign({}, this.formRules, rules)
			
 
				+				// 初始化校验函数
			
 
				+				this.validator = new Validator(rules);
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 外部调用方法
			
 
				+			 * 设置数据，用于设置表单数据，公开给用户使用 ， 不支持在动态表单中使用
			
 
				+			 * @param {Object} key
			
 
				+			 * @param {Object} value
			
 
				+			 */
			
 
				+			setValue(key, value) {
			
 
				+				let example = this.childrens.find(child => child.name === key);
			
 
				+				if (!example) return null;
			
 
				+				this.formData[key] = getValue(key, value, (this.formRules[key] && this.formRules[key].rules) || [])
			
 
				+				return example.onFieldChange(this.formData[key]);
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 外部调用方法
			
 
				+			 * 手动提交校验表单
			
 
				+			 * 对整个表单进行校验的方法，参数为一个回调函数。
			
 
				+			 * @param {Array} keepitem 保留不参与校验的字段
			
 
				+			 * @param {type} callback 方法回调
			
 
				+			 */
			
 
				+			validate(keepitem, callback) {
			
 
				+				return this.checkAll(this.formData, keepitem, callback);
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 外部调用方法
			
 
				+			 * 部分表单校验
			
 
				+			 * @param {Array|String} props 需要校验的字段
			
 
				+			 * @param {Function} 回调函数
			
 
				+			 */
			
 
				+			validateField(props = [], callback) {
			
 
				+				props = [].concat(props);
			
 
				+				let invalidFields = {};
			
 
				+				this.childrens.forEach(item => {
			
 
				+					const name = realName(item.name)
			
 
				+					if (props.indexOf(name) !== -1) {
			
 
				+						invalidFields = Object.assign({}, invalidFields, {
			
 
				+							[name]: this.formData[name]
			
 
				+						});
			
 
				+					}
			
 
				+				});
			
 
				+				return this.checkAll(invalidFields, [], callback);
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 外部调用方法
			
 
				+			 * 移除表单项的校验结果。传入待移除的表单项的 prop 属性或者 prop 组成的数组，如不传则移除整个表单的校验结果
			
 
				+			 * @param {Array|String} props 需要移除校验的字段 ，不填为所有
			
 
				+			 */
			
 
				+			clearValidate(props = []) {
			
 
				+				props = [].concat(props);
			
 
				+				this.childrens.forEach(item => {
			
 
				+					if (props.length === 0) {
			
 
				+						item.errMsg = '';
			
 
				+					} else {
			
 
				+						const name = realName(item.name)
			
 
				+						if (props.indexOf(name) !== -1) {
			
 
				+							item.errMsg = '';
			
 
				+						}
			
 
				+					}
			
 
				+				});
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 外部调用方法 ，即将废弃
			
 
				+			 * 手动提交校验表单
			
 
				+			 * 对整个表单进行校验的方法，参数为一个回调函数。
			
 
				+			 * @param {Array} keepitem 保留不参与校验的字段
			
 
				+			 * @param {type} callback 方法回调
			
 
				+			 */
			
 
				+			submit(keepitem, callback, type) {
			
 
				+				for (let i in this.dataValue) {
			
 
				+					const itemData = this.childrens.find(v => v.name === i);
			
 
				+					if (itemData) {
			
 
				+						if (this.formData[i] === undefined) {
			
 
				+							this.formData[i] = this._getValue(i, this.dataValue[i]);
			
 
				+						}
			
 
				+					}
			
 
				+				}
			
 
				+
			
 
				+				if (!type) {
			
 
				+					console.warn('submit 方法即将废弃，请使用validate方法代替！');
			
 
				+				}
			
 
				+
			
 
				+				return this.checkAll(this.formData, keepitem, callback, 'submit');
			
 
				+			},
			
 
				+
			
 
				+			// 校验所有
			
 
				+			async checkAll(invalidFields, keepitem, callback, type) {
			
 
				+				// 不存在校验规则 ，则停止校验流程
			
 
				+				if (!this.validator) return
			
 
				+				let childrens = []
			
 
				+				// 处理参与校验的item实例
			
 
				+				for (let i in invalidFields) {
			
 
				+					const item = this.childrens.find(v => realName(v.name) === i)
			
 
				+					if (item) {
			
 
				+						childrens.push(item)
			
 
				+					}
			
 
				+				}
			
 
				+
			
 
				+				// 如果validate第一个参数是funciont ,那就走回调
			
 
				+				if (!callback && typeof keepitem === 'function') {
			
 
				+					callback = keepitem;
			
 
				+				}
			
 
				+
			
 
				+				let promise;
			
 
				+				// 如果不存在回调，那么使用 Promise 方式返回
			
 
				+				if (!callback && typeof callback !== 'function' && Promise) {
			
 
				+					promise = new Promise((resolve, reject) => {
			
 
				+						callback = function(valid, invalidFields) {
			
 
				+							!valid ? resolve(invalidFields) : reject(valid);
			
 
				+						};
			
 
				+					});
			
 
				+				}
			
 
				+
			
 
				+				let results = [];
			
 
				+				// 避免引用错乱 ，建议拷贝对象处理
			
 
				+				let tempFormData = JSON.parse(JSON.stringify(invalidFields))
			
 
				+				// 所有子组件参与校验,使用 for 可以使用  awiat
			
 
				+				for (let i in childrens) {
			
 
				+					const child = childrens[i]
			
 
				+					let name = realName(child.name);
			
 
				+					const result = await child.onFieldChange(tempFormData[name]);
			
 
				+					if (result) {
			
 
				+						results.push(result);
			
 
				+						// toast ,modal 只需要执行第一次就可以
			
 
				+						if (this.errShowType === 'toast' || this.errShowType === 'modal') break;
			
 
				+					}
			
 
				+				}
			
 
				+
			
 
				+
			
 
				+				if (Array.isArray(results)) {
			
 
				+					if (results.length === 0) results = null;
			
 
				+				}
			
 
				+				if (Array.isArray(keepitem)) {
			
 
				+					keepitem.forEach(v => {
			
 
				+						let vName = realName(v);
			
 
				+						let value = getDataValue(v, this.localData)
			
 
				+						if (value !== undefined) {
			
 
				+							tempFormData[vName] = value
			
 
				+						}
			
 
				+					});
			
 
				+				}
			
 
				+
			
 
				+				// TODO submit 即将废弃
			
 
				+				if (type === 'submit') {
			
 
				+					this.$emit('submit', {
			
 
				+						detail: {
			
 
				+							value: tempFormData,
			
 
				+							errors: results
			
 
				+						}
			
 
				+					});
			
 
				+				} else {
			
 
				+					this.$emit('validate', results);
			
 
				+				}
			
 
				+
			
 
				+				// const resetFormData = rawData(tempFormData, this.localData, this.name)
			
 
				+				let resetFormData = {}
			
 
				+				resetFormData = rawData(tempFormData, this.name)
			
 
				+				callback && typeof callback === 'function' && callback(results, resetFormData);
			
 
				+
			
 
				+				if (promise && callback) {
			
 
				+					return promise;
			
 
				+				} else {
			
 
				+					return null;
			
 
				+				}
			
 
				+
			
 
				+			},
			
 
				+
			
 
				+			/**
			
 
				+			 * 返回validate事件
			
 
				+			 * @param {Object} result
			
 
				+			 */
			
 
				+			validateCheck(result) {
			
 
				+				this.$emit('validate', result);
			
 
				+			},
			
 
				+			_getValue: getValue,
			
 
				+			_isRequiredField: isRequiredField,
			
 
				+			_setDataValue: setDataValue,
			
 
				+			_getDataValue: getDataValue,
			
 
				+			_realName: realName,
			
 
				+			_isRealName: isRealName,
			
 
				+			_isEqual: isEqual
			
 
				+		}
			
 
				+	};
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss">
			
 
				+	.uni-forms {}
			
 
				+</style>
			
--- a/uni_modules/uni-forms/components/uni-forms/utils.js
+++ b/uni_modules/uni-forms/components/uni-forms/utils.js
@@ -0,0 +1,293 @@
 
				+/**
			
 
				+ * 简单处理对象拷贝
			
 
				+ * @param {Obejct} 被拷贝对象
			
 
				+ * @@return {Object} 拷贝对象
			
 
				+ */
			
 
				+export const deepCopy = (val) => {
			
 
				+	return JSON.parse(JSON.stringify(val))
			
 
				+}
			
 
				+/**
			
 
				+ * 过滤数字类型
			
 
				+ * @param {String} format 数字类型
			
 
				+ * @@return {Boolean} 返回是否为数字类型
			
 
				+ */
			
 
				+export const typeFilter = (format) => {
			
 
				+	return format === 'int' || format === 'double' || format === 'number' || format === 'timestamp';
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+ * 把 value 转换成指定的类型，用于处理初始值，原因是初始值需要入库不能为 undefined
			
 
				+ * @param {String} key 字段名
			
 
				+ * @param {any} value 字段值
			
 
				+ * @param {Object} rules 表单校验规则
			
 
				+ */
			
 
				+export const getValue = (key, value, rules) => {
			
 
				+	const isRuleNumType = rules.find(val => val.format && typeFilter(val.format));
			
 
				+	const isRuleBoolType = rules.find(val => (val.format && val.format === 'boolean') || val.format === 'bool');
			
 
				+	// 输入类型为 number
			
 
				+	if (!!isRuleNumType) {
			
 
				+		if (!value && value !== 0) {
			
 
				+			value = null
			
 
				+		} else {
			
 
				+			value = isNumber(Number(value)) ? Number(value) : value
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	// 输入类型为 boolean
			
 
				+	if (!!isRuleBoolType) {
			
 
				+		value = isBoolean(value) ? value : false
			
 
				+	}
			
 
				+
			
 
				+	return value;
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+ * 获取表单数据
			
 
				+ * @param {String|Array} name 真实名称，需要使用 realName 获取
			
 
				+ * @param {Object} data 原始数据
			
 
				+ * @param {any} value  需要设置的值
			
 
				+ */
			
 
				+export const setDataValue = (field, formdata, value) => {
			
 
				+	formdata[field] = value
			
 
				+	return value || ''
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+ * 获取表单数据
			
 
				+ * @param {String|Array} field 真实名称，需要使用 realName 获取
			
 
				+ * @param {Object} data 原始数据
			
 
				+ */
			
 
				+export const getDataValue = (field, data) => {
			
 
				+	return objGet(data, field)
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+ * 获取表单类型
			
 
				+ * @param {String|Array} field 真实名称，需要使用 realName 获取
			
 
				+ */
			
 
				+export const getDataValueType = (field, data) => {
			
 
				+	const value = getDataValue(field, data)
			
 
				+	return {
			
 
				+		type: type(value),
			
 
				+		value
			
 
				+	}
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+ * 获取表单可用的真实name
			
 
				+ * @param {String|Array} name 表单name
			
 
				+ * @@return {String} 表单可用的真实name
			
 
				+ */
			
 
				+export const realName = (name, data = {}) => {
			
 
				+	const base_name = _basePath(name)
			
 
				+	if (typeof base_name === 'object' && Array.isArray(base_name) && base_name.length > 1) {
			
 
				+		const realname = base_name.reduce((a, b) => a += `#${b}`, '_formdata_')
			
 
				+		return realname
			
 
				+	}
			
 
				+	return base_name[0] || name
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+ * 判断是否表单可用的真实name
			
 
				+ * @param {String|Array} name 表单name
			
 
				+ * @@return {String} 表单可用的真实name
			
 
				+ */
			
 
				+export const isRealName = (name) => {
			
 
				+	const reg = /^_formdata_#*/
			
 
				+	return reg.test(name)
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+ * 获取表单数据的原始格式
			
 
				+ * @@return {Object|Array} object 需要解析的数据
			
 
				+ */
			
 
				+export const rawData = (object = {}, name) => {
			
 
				+	let newData = JSON.parse(JSON.stringify(object))
			
 
				+	let formData = {}
			
 
				+	for(let i in newData){
			
 
				+		let path = name2arr(i)
			
 
				+		objSet(formData,path,newData[i])
			
 
				+	}
			
 
				+	return formData
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+ * 真实name还原为 array
			
 
				+ * @param {*} name 
			
 
				+ */
			
 
				+export const name2arr = (name) => {
			
 
				+	let field = name.replace('_formdata_#', '')
			
 
				+	field = field.split('#').map(v => (isNumber(v) ? Number(v) : v))
			
 
				+	return field
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+ * 对象中设置值
			
 
				+ * @param {Object|Array} object 源数据
			
 
				+ * @param {String| Array} path 'a.b.c' 或 ['a',0,'b','c']
			
 
				+ * @param {String} value 需要设置的值
			
 
				+ */
			
 
				+export const objSet = (object, path, value) => {
			
 
				+	if (typeof object !== 'object') return object;
			
 
				+	_basePath(path).reduce((o, k, i, _) => {
			
 
				+		if (i === _.length - 1) { 
			
 
				+			// 若遍历结束直接赋值
			
 
				+			o[k] = value
			
 
				+			return null
			
 
				+		} else if (k in o) { 
			
 
				+			// 若存在对应路径，则返回找到的对象，进行下一次遍历
			
 
				+			return o[k]
			
 
				+		} else { 
			
 
				+			// 若不存在对应路径，则创建对应对象，若下一路径是数字，新对象赋值为空数组，否则赋值为空对象
			
 
				+			o[k] = /^[0-9]{1,}$/.test(_[i + 1]) ? [] : {}
			
 
				+			return o[k]
			
 
				+		}
			
 
				+	}, object)
			
 
				+	// 返回object
			
 
				+	return object;
			
 
				+}
			
 
				+
			
 
				+// 处理 path， path有三种形式：'a[0].b.c'、'a.0.b.c' 和 ['a','0','b','c']，需要统一处理成数组，便于后续使用
			
 
				+function _basePath(path) {
			
 
				+	// 若是数组，则直接返回
			
 
				+	if (Array.isArray(path)) return path
			
 
				+	// 若有 '[',']'，则替换成将 '[' 替换成 '.',去掉 ']'
			
 
				+	return path.replace(/\[/g, '.').replace(/\]/g, '').split('.')
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+ * 从对象中获取值
			
 
				+ * @param {Object|Array} object 源数据
			
 
				+ * @param {String| Array} path 'a.b.c' 或 ['a',0,'b','c']
			
 
				+ * @param {String} defaultVal 如果无法从调用链中获取值的默认值
			
 
				+ */
			
 
				+export const objGet = (object, path, defaultVal = 'undefined') => {
			
 
				+	// 先将path处理成统一格式
			
 
				+	let newPath = _basePath(path)
			
 
				+	// 递归处理，返回最后结果
			
 
				+	let val = newPath.reduce((o, k) => {
			
 
				+		return (o || {})[k]
			
 
				+	}, object);
			
 
				+	return !val || val !== undefined ? val : defaultVal
			
 
				+}
			
 
				+
			
 
				+
			
 
				+/**
			
 
				+ * 是否为 number 类型 
			
 
				+ * @param {any} num 需要判断的值
			
 
				+ * @return {Boolean} 是否为 number
			
 
				+ */
			
 
				+export const isNumber = (num) => {
			
 
				+	return !isNaN(Number(num))
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+ * 是否为 boolean 类型 
			
 
				+ * @param {any} bool 需要判断的值
			
 
				+ * @return {Boolean} 是否为 boolean
			
 
				+ */
			
 
				+export const isBoolean = (bool) => {
			
 
				+	return (typeof bool === 'boolean')
			
 
				+}
			
 
				+/**
			
 
				+ * 是否有必填字段
			
 
				+ * @param {Object} rules 规则
			
 
				+ * @return {Boolean} 是否有必填字段
			
 
				+ */
			
 
				+export const isRequiredField = (rules) => {
			
 
				+	let isNoField = false;
			
 
				+	for (let i = 0; i < rules.length; i++) {
			
 
				+		const ruleData = rules[i];
			
 
				+		if (ruleData.required) {
			
 
				+			isNoField = true;
			
 
				+			break;
			
 
				+		}
			
 
				+	}
			
 
				+	return isNoField;
			
 
				+}
			
 
				+
			
 
				+
			
 
				+/**
			
 
				+ * 获取数据类型
			
 
				+ * @param {Any} obj 需要获取数据类型的值
			
 
				+ */
			
 
				+export const type = (obj) => {
			
 
				+	var class2type = {};
			
 
				+
			
 
				+	// 生成class2type映射
			
 
				+	"Boolean Number String Function Array Date RegExp Object Error".split(" ").map(function(item, index) {
			
 
				+		class2type["[object " + item + "]"] = item.toLowerCase();
			
 
				+	})
			
 
				+	if (obj == null) {
			
 
				+		return obj + "";
			
 
				+	}
			
 
				+	return typeof obj === "object" || typeof obj === "function" ?
			
 
				+		class2type[Object.prototype.toString.call(obj)] || "object" :
			
 
				+		typeof obj;
			
 
				+}
			
 
				+
			
 
				+/**
			
 
				+ * 判断两个值是否相等
			
 
				+ * @param {any} a 值  
			
 
				+ * @param {any} b 值  
			
 
				+ * @return {Boolean} 是否相等
			
 
				+ */
			
 
				+export const isEqual = (a, b) => {
			
 
				+	//如果a和b本来就全等
			
 
				+	if (a === b) {
			
 
				+		//判断是否为0和-0
			
 
				+		return a !== 0 || 1 / a === 1 / b;
			
 
				+	}
			
 
				+	//判断是否为null和undefined
			
 
				+	if (a == null || b == null) {
			
 
				+		return a === b;
			
 
				+	}
			
 
				+	//接下来判断a和b的数据类型
			
 
				+	var classNameA = toString.call(a),
			
 
				+		classNameB = toString.call(b);
			
 
				+	//如果数据类型不相等，则返回false
			
 
				+	if (classNameA !== classNameB) {
			
 
				+		return false;
			
 
				+	}
			
 
				+	//如果数据类型相等，再根据不同数据类型分别判断
			
 
				+	switch (classNameA) {
			
 
				+		case '[object RegExp]':
			
 
				+		case '[object String]':
			
 
				+			//进行字符串转换比较
			
 
				+			return '' + a === '' + b;
			
 
				+		case '[object Number]':
			
 
				+			//进行数字转换比较,判断是否为NaN
			
 
				+			if (+a !== +a) {
			
 
				+				return +b !== +b;
			
 
				+			}
			
 
				+			//判断是否为0或-0
			
 
				+			return +a === 0 ? 1 / +a === 1 / b : +a === +b;
			
 
				+		case '[object Date]':
			
 
				+		case '[object Boolean]':
			
 
				+			return +a === +b;
			
 
				+	}
			
 
				+	//如果是对象类型
			
 
				+	if (classNameA == '[object Object]') {
			
 
				+		//获取a和b的属性长度
			
 
				+		var propsA = Object.getOwnPropertyNames(a),
			
 
				+			propsB = Object.getOwnPropertyNames(b);
			
 
				+		if (propsA.length != propsB.length) {
			
 
				+			return false;
			
 
				+		}
			
 
				+		for (var i = 0; i < propsA.length; i++) {
			
 
				+			var propName = propsA[i];
			
 
				+			//如果对应属性对应值不相等，则返回false
			
 
				+			if (a[propName] !== b[propName]) {
			
 
				+				return false;
			
 
				+			}
			
 
				+		}
			
 
				+		return true;
			
 
				+	}
			
 
				+	//如果是数组类型
			
 
				+	if (classNameA == '[object Array]') {
			
 
				+		if (a.toString() == b.toString()) {
			
 
				+			return true;
			
 
				+		}
			
 
				+		return false;
			
 
				+	}
			
 
				+}
			
--- a/uni_modules/uni-forms/components/uni-forms/validate.js
+++ b/uni_modules/uni-forms/components/uni-forms/validate.js
@@ -0,0 +1,486 @@
 
				+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) {
			
 
				+		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 !== undefined || rule.minimum !== undefined) {
			
 
				+			result = 'rangeNumber'
			
 
				+		} else if (rule.maxLength !== undefined || rule.minLength !== undefined) {
			
 
				+			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
			
--- a/uni_modules/uni-forms/package.json
+++ b/uni_modules/uni-forms/package.json
@@ -0,0 +1,88 @@
 
				+{
			
 
				+  "id": "uni-forms",
			
 
				+  "displayName": "uni-forms 表单",
			
 
				+  "version": "1.4.10",
			
 
				+  "description": "由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据",
			
 
				+  "keywords": [
			
 
				+    "uni-ui",
			
 
				+    "表单",
			
 
				+    "校验",
			
 
				+    "表单校验",
			
 
				+    "表单验证"
			
 
				+],
			
 
				+  "repository": "https://github.com/dcloudio/uni-ui",
			
 
				+  "engines": {
			
 
				+    "HBuilderX": ""
			
 
				+  },
			
 
				+  "directories": {
			
 
				+    "example": "../../temps/example_temps"
			
 
				+  },
			
 
				+"dcloudext": {
			
 
				+    "sale": {
			
 
				+      "regular": {
			
 
				+        "price": "0.00"
			
 
				+      },
			
 
				+      "sourcecode": {
			
 
				+        "price": "0.00"
			
 
				+      }
			
 
				+    },
			
 
				+    "contact": {
			
 
				+      "qq": ""
			
 
				+    },
			
 
				+    "declaration": {
			
 
				+      "ads": "无",
			
 
				+      "data": "无",
			
 
				+      "permissions": "无"
			
 
				+    },
			
 
				+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
			
 
				+    "type": "component-vue"
			
 
				+  },
			
 
				+  "uni_modules": {
			
 
				+    "dependencies": [
			
 
				+			"uni-scss",
			
 
				+      "uni-icons"
			
 
				+    ],
			
 
				+    "encrypt": [],
			
 
				+    "platforms": {
			
 
				+      "cloud": {
			
 
				+        "tcb": "y",
			
 
				+        "aliyun": "y"
			
 
				+      },
			
 
				+      "client": {
			
 
				+        "App": {
			
 
				+          "app-vue": "y",
			
 
				+          "app-nvue": "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",
			
 
				+          "联盟": "u"
			
 
				+        },
			
 
				+        "Vue": {
			
 
				+            "vue2": "y",
			
 
				+            "vue3": "y"
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
--- a/uni_modules/uni-forms/readme.md
+++ b/uni_modules/uni-forms/readme.md
@@ -0,0 +1,23 @@
 
				+
			
 
				+
			
 
				+## 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>`仅影响视觉效果。
			
 
				+
			
 
				+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-forms)
			
 
				+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
			
--- a/uni_modules/uni-icons/changelog.md
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,40 @@
 
				+## 2.0.9（2024-01-12）
			
 
				+fix: 修复图标大小默认值错误的问题
			
 
				+## 2.0.8（2023-12-14）
			
 
				+- 修复 项目未使用 ts 情况下，打包报错的bug
			
 
				+## 2.0.7（2023-12-14）
			
 
				+- 修复 size 属性为 string 时，不加单位导致尺寸异常的bug
			
 
				+## 2.0.6（2023-12-11）
			
 
				+- 优化 兼容老版本icon类型，如 top ，bottom 等
			
 
				+## 2.0.5（2023-12-11）
			
 
				+- 优化 兼容老版本icon类型，如 top ，bottom 等
			
 
				+## 2.0.4（2023-12-06）
			
 
				+- 优化 uni-app x 下示例项目图标排序
			
 
				+## 2.0.3（2023-12-06）
			
 
				+- 修复 nvue下引入组件报错的bug
			
 
				+## 2.0.2（2023-12-05）
			
 
				+-优化 size 属性支持单位
			
 
				+## 2.0.1（2023-12-05）
			
 
				+- 新增 uni-app x 支持定义图标
			
 
				+## 1.3.5（2022-01-24）
			
 
				+- 优化 size 属性可以传入不带单位的字符串数值
			
 
				+## 1.3.4（2022-01-24）
			
 
				+- 优化 size 支持其他单位
			
 
				+## 1.3.3（2022-01-17）
			
 
				+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
			
 
				+## 1.3.2（2021-12-01）
			
 
				+- 优化 示例可复制图标名称
			
 
				+## 1.3.1（2021-11-23）
			
 
				+- 优化 兼容旧组件 type 值
			
 
				+## 1.3.0（2021-11-19）
			
 
				+- 新增 更多图标
			
 
				+- 优化 自定义图标使用方式
			
 
				+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
			
 
				+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
			
 
				+## 1.1.7（2021-11-08）
			
 
				+## 1.2.0（2021-07-30）
			
 
				+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
			
 
				+## 1.1.5（2021-05-12）
			
 
				+- 新增 组件示例地址
			
 
				+## 1.1.4（2021-02-05）
			
 
				+- 调整为uni_modules目录规范
			
--- a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
@@ -0,0 +1,91 @@
 
				+<template>
			
 
				+	<text class="uni-icons" :style="styleObj">
			
 
				+		<slot>{{unicode}}</slot>
			
 
				+	</text>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import { fontData, IconsDataItem } from './uniicons_file'
			
 
				+
			
 
				+	/**
			
 
				+	 * Icons 图标
			
 
				+	 * @description 用于展示 icon 图标
			
 
				+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
			
 
				+	 * @property {Number} size 图标大小
			
 
				+	 * @property {String} type 图标图案，参考示例
			
 
				+	 * @property {String} color 图标颜色
			
 
				+	 * @property {String} customPrefix 自定义图标
			
 
				+	 * @event {Function} click 点击 Icon 触发事件
			
 
				+	 */
			
 
				+	export default {
			
 
				+		name: "uni-icons",
			
 
				+		props: {
			
 
				+			type: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			color: {
			
 
				+				type: String,
			
 
				+				default: '#333333'
			
 
				+			},
			
 
				+			size: {
			
 
				+				type: Object,
			
 
				+				default: 16
			
 
				+			},
			
 
				+			fontFamily: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			}
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {};
			
 
				+		},
			
 
				+		computed: {
			
 
				+			unicode() : string {
			
 
				+				let codes = fontData.find((item : IconsDataItem) : boolean => { return item.font_class == this.type })
			
 
				+				if (codes !== null) {
			
 
				+					return codes.unicode
			
 
				+				}
			
 
				+				return ''
			
 
				+			},
			
 
				+			iconSize() : string {
			
 
				+				const size = this.size
			
 
				+				if (typeof size == 'string') {
			
 
				+					const reg = /^[0-9]*$/g
			
 
				+					return reg.test(size as string) ? '' + size + 'px' : '' + size;
			
 
				+					// return '' + this.size
			
 
				+				}
			
 
				+				return this.getFontSize(size as number)
			
 
				+			},
			
 
				+			styleObj() : UTSJSONObject {
			
 
				+				if (this.fontFamily !== '') {
			
 
				+					return { color: this.color, fontSize: this.iconSize, fontFamily: this.fontFamily }
			
 
				+				}
			
 
				+				return { color: this.color, fontSize: this.iconSize }
			
 
				+			}
			
 
				+		},
			
 
				+		created() { },
			
 
				+		methods: {
			
 
				+			/**
			
 
				+			 * 字体大小
			
 
				+			 */
			
 
				+			getFontSize(size : number) : string {
			
 
				+				return size + 'px';
			
 
				+			},
			
 
				+		},
			
 
				+	}
			
 
				+</script>
			
 
				+
			
 
				+<style scoped>
			
 
				+	@font-face {
			
 
				+		font-family: UniIconsFontFamily;
			
 
				+		src: url('./uniicons.ttf');
			
 
				+	}
			
 
				+
			
 
				+	.uni-icons {
			
 
				+		font-family: UniIconsFontFamily;
			
 
				+		font-size: 18px;
			
 
				+		font-style: normal;
			
 
				+		color: #333;
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,110 @@
 
				+<template>
			
 
				+	<!-- #ifdef APP-NVUE -->
			
 
				+	<text :style="styleObj" class="uni-icons" @click="_onClick">{{unicode}}</text>
			
 
				+	<!-- #endif -->
			
 
				+	<!-- #ifndef APP-NVUE -->
			
 
				+	<text :style="styleObj" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick">
			
 
				+		<slot></slot>
			
 
				+	</text>
			
 
				+	<!-- #endif -->
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import { fontData } from './uniicons_file_vue.js';
			
 
				+
			
 
				+	const getVal = (val) => {
			
 
				+		const reg = /^[0-9]*$/g
			
 
				+		return (typeof val === 'number' || reg.test(val)) ? val + 'px' : val;
			
 
				+	}
			
 
				+
			
 
				+	// #ifdef APP-NVUE
			
 
				+	var domModule = weex.requireModule('dom');
			
 
				+	import iconUrl from './uniicons.ttf'
			
 
				+	domModule.addRule('fontFace', {
			
 
				+		'fontFamily': "uniicons",
			
 
				+		'src': "url('" + iconUrl + "')"
			
 
				+	});
			
 
				+	// #endif
			
 
				+
			
 
				+	/**
			
 
				+	 * Icons 图标
			
 
				+	 * @description 用于展示 icons 图标
			
 
				+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
			
 
				+	 * @property {Number} size 图标大小
			
 
				+	 * @property {String} type 图标图案，参考示例
			
 
				+	 * @property {String} color 图标颜色
			
 
				+	 * @property {String} customPrefix 自定义图标
			
 
				+	 * @event {Function} click 点击 Icon 触发事件
			
 
				+	 */
			
 
				+	export default {
			
 
				+		name: 'UniIcons',
			
 
				+		emits: ['click'],
			
 
				+		props: {
			
 
				+			type: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			color: {
			
 
				+				type: String,
			
 
				+				default: '#333333'
			
 
				+			},
			
 
				+			size: {
			
 
				+				type: [Number, String],
			
 
				+				default: 16
			
 
				+			},
			
 
				+			customPrefix: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			fontFamily: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			}
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {
			
 
				+				icons: fontData
			
 
				+			}
			
 
				+		},
			
 
				+		computed: {
			
 
				+			unicode() {
			
 
				+				let code = this.icons.find(v => v.font_class === this.type)
			
 
				+				if (code) {
			
 
				+					return code.unicode
			
 
				+				}
			
 
				+				return ''
			
 
				+			},
			
 
				+			iconSize() {
			
 
				+				return getVal(this.size)
			
 
				+			},
			
 
				+			styleObj() {
			
 
				+				if (this.fontFamily !== '') {
			
 
				+					return `color: ${this.color}; font-size: ${this.iconSize}; font-family: ${this.fontFamily};`
			
 
				+				}
			
 
				+				return `color: ${this.color}; font-size: ${this.iconSize};`
			
 
				+			}
			
 
				+		},
			
 
				+		methods: {
			
 
				+			_onClick() {
			
 
				+				this.$emit('click')
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss">
			
 
				+	/* #ifndef APP-NVUE */
			
 
				+	@import './uniicons.css';
			
 
				+
			
 
				+	@font-face {
			
 
				+		font-family: uniicons;
			
 
				+		src: url('./uniicons.ttf');
			
 
				+	}
			
 
				+
			
 
				+	/* #endif */
			
 
				+	.uni-icons {
			
 
				+		font-family: uniicons;
			
 
				+		text-decoration: none;
			
 
				+		text-align: center;
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uni-icons/components/uni-icons/uniicons.css
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -0,0 +1,664 @@
 
				+
			
 
				+.uniui-cart-filled:before {
			
 
				+  content: "\e6d0";
			
 
				+}
			
 
				+
			
 
				+.uniui-gift-filled:before {
			
 
				+  content: "\e6c4";
			
 
				+}
			
 
				+
			
 
				+.uniui-color:before {
			
 
				+  content: "\e6cf";
			
 
				+}
			
 
				+
			
 
				+.uniui-wallet:before {
			
 
				+  content: "\e6b1";
			
 
				+}
			
 
				+
			
 
				+.uniui-settings-filled:before {
			
 
				+  content: "\e6ce";
			
 
				+}
			
 
				+
			
 
				+.uniui-auth-filled:before {
			
 
				+  content: "\e6cc";
			
 
				+}
			
 
				+
			
 
				+.uniui-shop-filled:before {
			
 
				+  content: "\e6cd";
			
 
				+}
			
 
				+
			
 
				+.uniui-staff-filled:before {
			
 
				+  content: "\e6cb";
			
 
				+}
			
 
				+
			
 
				+.uniui-vip-filled:before {
			
 
				+  content: "\e6c6";
			
 
				+}
			
 
				+
			
 
				+.uniui-plus-filled:before {
			
 
				+  content: "\e6c7";
			
 
				+}
			
 
				+
			
 
				+.uniui-folder-add-filled:before {
			
 
				+  content: "\e6c8";
			
 
				+}
			
 
				+
			
 
				+.uniui-color-filled:before {
			
 
				+  content: "\e6c9";
			
 
				+}
			
 
				+
			
 
				+.uniui-tune-filled:before {
			
 
				+  content: "\e6ca";
			
 
				+}
			
 
				+
			
 
				+.uniui-calendar-filled:before {
			
 
				+  content: "\e6c0";
			
 
				+}
			
 
				+
			
 
				+.uniui-notification-filled:before {
			
 
				+  content: "\e6c1";
			
 
				+}
			
 
				+
			
 
				+.uniui-wallet-filled:before {
			
 
				+  content: "\e6c2";
			
 
				+}
			
 
				+
			
 
				+.uniui-medal-filled:before {
			
 
				+  content: "\e6c3";
			
 
				+}
			
 
				+
			
 
				+.uniui-fire-filled:before {
			
 
				+  content: "\e6c5";
			
 
				+}
			
 
				+
			
 
				+.uniui-refreshempty:before {
			
 
				+  content: "\e6bf";
			
 
				+}
			
 
				+
			
 
				+.uniui-location-filled:before {
			
 
				+  content: "\e6af";
			
 
				+}
			
 
				+
			
 
				+.uniui-person-filled:before {
			
 
				+  content: "\e69d";
			
 
				+}
			
 
				+
			
 
				+.uniui-personadd-filled:before {
			
 
				+  content: "\e698";
			
 
				+}
			
 
				+
			
 
				+.uniui-arrowthinleft:before {
			
 
				+  content: "\e6d2";
			
 
				+}
			
 
				+
			
 
				+.uniui-arrowthinup:before {
			
 
				+  content: "\e6d3";
			
 
				+}
			
 
				+
			
 
				+.uniui-arrowthindown:before {
			
 
				+  content: "\e6d4";
			
 
				+}
			
 
				+
			
 
				+.uniui-back:before {
			
 
				+  content: "\e6b9";
			
 
				+}
			
 
				+
			
 
				+.uniui-forward:before {
			
 
				+  content: "\e6ba";
			
 
				+}
			
 
				+
			
 
				+.uniui-arrow-right:before {
			
 
				+  content: "\e6bb";
			
 
				+}
			
 
				+
			
 
				+.uniui-arrow-left:before {
			
 
				+  content: "\e6bc";
			
 
				+}
			
 
				+
			
 
				+.uniui-arrow-up:before {
			
 
				+  content: "\e6bd";
			
 
				+}
			
 
				+
			
 
				+.uniui-arrow-down:before {
			
 
				+  content: "\e6be";
			
 
				+}
			
 
				+
			
 
				+.uniui-arrowthinright:before {
			
 
				+  content: "\e6d1";
			
 
				+}
			
 
				+
			
 
				+.uniui-down:before {
			
 
				+  content: "\e6b8";
			
 
				+}
			
 
				+
			
 
				+.uniui-bottom:before {
			
 
				+  content: "\e6b8";
			
 
				+}
			
 
				+
			
 
				+.uniui-arrowright:before {
			
 
				+  content: "\e6d5";
			
 
				+}
			
 
				+
			
 
				+.uniui-right:before {
			
 
				+  content: "\e6b5";
			
 
				+}
			
 
				+
			
 
				+.uniui-up:before {
			
 
				+  content: "\e6b6";
			
 
				+}
			
 
				+
			
 
				+.uniui-top:before {
			
 
				+  content: "\e6b6";
			
 
				+}
			
 
				+
			
 
				+.uniui-left:before {
			
 
				+  content: "\e6b7";
			
 
				+}
			
 
				+
			
 
				+.uniui-arrowup:before {
			
 
				+  content: "\e6d6";
			
 
				+}
			
 
				+
			
 
				+.uniui-eye:before {
			
 
				+  content: "\e651";
			
 
				+}
			
 
				+
			
 
				+.uniui-eye-filled:before {
			
 
				+  content: "\e66a";
			
 
				+}
			
 
				+
			
 
				+.uniui-eye-slash:before {
			
 
				+  content: "\e6b3";
			
 
				+}
			
 
				+
			
 
				+.uniui-eye-slash-filled:before {
			
 
				+  content: "\e6b4";
			
 
				+}
			
 
				+
			
 
				+.uniui-info-filled:before {
			
 
				+  content: "\e649";
			
 
				+}
			
 
				+
			
 
				+.uniui-reload:before {
			
 
				+  content: "\e6b2";
			
 
				+}
			
 
				+
			
 
				+.uniui-micoff-filled:before {
			
 
				+  content: "\e6b0";
			
 
				+}
			
 
				+
			
 
				+.uniui-map-pin-ellipse:before {
			
 
				+  content: "\e6ac";
			
 
				+}
			
 
				+
			
 
				+.uniui-map-pin:before {
			
 
				+  content: "\e6ad";
			
 
				+}
			
 
				+
			
 
				+.uniui-location:before {
			
 
				+  content: "\e6ae";
			
 
				+}
			
 
				+
			
 
				+.uniui-starhalf:before {
			
 
				+  content: "\e683";
			
 
				+}
			
 
				+
			
 
				+.uniui-star:before {
			
 
				+  content: "\e688";
			
 
				+}
			
 
				+
			
 
				+.uniui-star-filled:before {
			
 
				+  content: "\e68f";
			
 
				+}
			
 
				+
			
 
				+.uniui-calendar:before {
			
 
				+  content: "\e6a0";
			
 
				+}
			
 
				+
			
 
				+.uniui-fire:before {
			
 
				+  content: "\e6a1";
			
 
				+}
			
 
				+
			
 
				+.uniui-medal:before {
			
 
				+  content: "\e6a2";
			
 
				+}
			
 
				+
			
 
				+.uniui-font:before {
			
 
				+  content: "\e6a3";
			
 
				+}
			
 
				+
			
 
				+.uniui-gift:before {
			
 
				+  content: "\e6a4";
			
 
				+}
			
 
				+
			
 
				+.uniui-link:before {
			
 
				+  content: "\e6a5";
			
 
				+}
			
 
				+
			
 
				+.uniui-notification:before {
			
 
				+  content: "\e6a6";
			
 
				+}
			
 
				+
			
 
				+.uniui-staff:before {
			
 
				+  content: "\e6a7";
			
 
				+}
			
 
				+
			
 
				+.uniui-vip:before {
			
 
				+  content: "\e6a8";
			
 
				+}
			
 
				+
			
 
				+.uniui-folder-add:before {
			
 
				+  content: "\e6a9";
			
 
				+}
			
 
				+
			
 
				+.uniui-tune:before {
			
 
				+  content: "\e6aa";
			
 
				+}
			
 
				+
			
 
				+.uniui-auth:before {
			
 
				+  content: "\e6ab";
			
 
				+}
			
 
				+
			
 
				+.uniui-person:before {
			
 
				+  content: "\e699";
			
 
				+}
			
 
				+
			
 
				+.uniui-email-filled:before {
			
 
				+  content: "\e69a";
			
 
				+}
			
 
				+
			
 
				+.uniui-phone-filled:before {
			
 
				+  content: "\e69b";
			
 
				+}
			
 
				+
			
 
				+.uniui-phone:before {
			
 
				+  content: "\e69c";
			
 
				+}
			
 
				+
			
 
				+.uniui-email:before {
			
 
				+  content: "\e69e";
			
 
				+}
			
 
				+
			
 
				+.uniui-personadd:before {
			
 
				+  content: "\e69f";
			
 
				+}
			
 
				+
			
 
				+.uniui-chatboxes-filled:before {
			
 
				+  content: "\e692";
			
 
				+}
			
 
				+
			
 
				+.uniui-contact:before {
			
 
				+  content: "\e693";
			
 
				+}
			
 
				+
			
 
				+.uniui-chatbubble-filled:before {
			
 
				+  content: "\e694";
			
 
				+}
			
 
				+
			
 
				+.uniui-contact-filled:before {
			
 
				+  content: "\e695";
			
 
				+}
			
 
				+
			
 
				+.uniui-chatboxes:before {
			
 
				+  content: "\e696";
			
 
				+}
			
 
				+
			
 
				+.uniui-chatbubble:before {
			
 
				+  content: "\e697";
			
 
				+}
			
 
				+
			
 
				+.uniui-upload-filled:before {
			
 
				+  content: "\e68e";
			
 
				+}
			
 
				+
			
 
				+.uniui-upload:before {
			
 
				+  content: "\e690";
			
 
				+}
			
 
				+
			
 
				+.uniui-weixin:before {
			
 
				+  content: "\e691";
			
 
				+}
			
 
				+
			
 
				+.uniui-compose:before {
			
 
				+  content: "\e67f";
			
 
				+}
			
 
				+
			
 
				+.uniui-qq:before {
			
 
				+  content: "\e680";
			
 
				+}
			
 
				+
			
 
				+.uniui-download-filled:before {
			
 
				+  content: "\e681";
			
 
				+}
			
 
				+
			
 
				+.uniui-pyq:before {
			
 
				+  content: "\e682";
			
 
				+}
			
 
				+
			
 
				+.uniui-sound:before {
			
 
				+  content: "\e684";
			
 
				+}
			
 
				+
			
 
				+.uniui-trash-filled:before {
			
 
				+  content: "\e685";
			
 
				+}
			
 
				+
			
 
				+.uniui-sound-filled:before {
			
 
				+  content: "\e686";
			
 
				+}
			
 
				+
			
 
				+.uniui-trash:before {
			
 
				+  content: "\e687";
			
 
				+}
			
 
				+
			
 
				+.uniui-videocam-filled:before {
			
 
				+  content: "\e689";
			
 
				+}
			
 
				+
			
 
				+.uniui-spinner-cycle:before {
			
 
				+  content: "\e68a";
			
 
				+}
			
 
				+
			
 
				+.uniui-weibo:before {
			
 
				+  content: "\e68b";
			
 
				+}
			
 
				+
			
 
				+.uniui-videocam:before {
			
 
				+  content: "\e68c";
			
 
				+}
			
 
				+
			
 
				+.uniui-download:before {
			
 
				+  content: "\e68d";
			
 
				+}
			
 
				+
			
 
				+.uniui-help:before {
			
 
				+  content: "\e679";
			
 
				+}
			
 
				+
			
 
				+.uniui-navigate-filled:before {
			
 
				+  content: "\e67a";
			
 
				+}
			
 
				+
			
 
				+.uniui-plusempty:before {
			
 
				+  content: "\e67b";
			
 
				+}
			
 
				+
			
 
				+.uniui-smallcircle:before {
			
 
				+  content: "\e67c";
			
 
				+}
			
 
				+
			
 
				+.uniui-minus-filled:before {
			
 
				+  content: "\e67d";
			
 
				+}
			
 
				+
			
 
				+.uniui-micoff:before {
			
 
				+  content: "\e67e";
			
 
				+}
			
 
				+
			
 
				+.uniui-closeempty:before {
			
 
				+  content: "\e66c";
			
 
				+}
			
 
				+
			
 
				+.uniui-clear:before {
			
 
				+  content: "\e66d";
			
 
				+}
			
 
				+
			
 
				+.uniui-navigate:before {
			
 
				+  content: "\e66e";
			
 
				+}
			
 
				+
			
 
				+.uniui-minus:before {
			
 
				+  content: "\e66f";
			
 
				+}
			
 
				+
			
 
				+.uniui-image:before {
			
 
				+  content: "\e670";
			
 
				+}
			
 
				+
			
 
				+.uniui-mic:before {
			
 
				+  content: "\e671";
			
 
				+}
			
 
				+
			
 
				+.uniui-paperplane:before {
			
 
				+  content: "\e672";
			
 
				+}
			
 
				+
			
 
				+.uniui-close:before {
			
 
				+  content: "\e673";
			
 
				+}
			
 
				+
			
 
				+.uniui-help-filled:before {
			
 
				+  content: "\e674";
			
 
				+}
			
 
				+
			
 
				+.uniui-paperplane-filled:before {
			
 
				+  content: "\e675";
			
 
				+}
			
 
				+
			
 
				+.uniui-plus:before {
			
 
				+  content: "\e676";
			
 
				+}
			
 
				+
			
 
				+.uniui-mic-filled:before {
			
 
				+  content: "\e677";
			
 
				+}
			
 
				+
			
 
				+.uniui-image-filled:before {
			
 
				+  content: "\e678";
			
 
				+}
			
 
				+
			
 
				+.uniui-locked-filled:before {
			
 
				+  content: "\e668";
			
 
				+}
			
 
				+
			
 
				+.uniui-info:before {
			
 
				+  content: "\e669";
			
 
				+}
			
 
				+
			
 
				+.uniui-locked:before {
			
 
				+  content: "\e66b";
			
 
				+}
			
 
				+
			
 
				+.uniui-camera-filled:before {
			
 
				+  content: "\e658";
			
 
				+}
			
 
				+
			
 
				+.uniui-chat-filled:before {
			
 
				+  content: "\e659";
			
 
				+}
			
 
				+
			
 
				+.uniui-camera:before {
			
 
				+  content: "\e65a";
			
 
				+}
			
 
				+
			
 
				+.uniui-circle:before {
			
 
				+  content: "\e65b";
			
 
				+}
			
 
				+
			
 
				+.uniui-checkmarkempty:before {
			
 
				+  content: "\e65c";
			
 
				+}
			
 
				+
			
 
				+.uniui-chat:before {
			
 
				+  content: "\e65d";
			
 
				+}
			
 
				+
			
 
				+.uniui-circle-filled:before {
			
 
				+  content: "\e65e";
			
 
				+}
			
 
				+
			
 
				+.uniui-flag:before {
			
 
				+  content: "\e65f";
			
 
				+}
			
 
				+
			
 
				+.uniui-flag-filled:before {
			
 
				+  content: "\e660";
			
 
				+}
			
 
				+
			
 
				+.uniui-gear-filled:before {
			
 
				+  content: "\e661";
			
 
				+}
			
 
				+
			
 
				+.uniui-home:before {
			
 
				+  content: "\e662";
			
 
				+}
			
 
				+
			
 
				+.uniui-home-filled:before {
			
 
				+  content: "\e663";
			
 
				+}
			
 
				+
			
 
				+.uniui-gear:before {
			
 
				+  content: "\e664";
			
 
				+}
			
 
				+
			
 
				+.uniui-smallcircle-filled:before {
			
 
				+  content: "\e665";
			
 
				+}
			
 
				+
			
 
				+.uniui-map-filled:before {
			
 
				+  content: "\e666";
			
 
				+}
			
 
				+
			
 
				+.uniui-map:before {
			
 
				+  content: "\e667";
			
 
				+}
			
 
				+
			
 
				+.uniui-refresh-filled:before {
			
 
				+  content: "\e656";
			
 
				+}
			
 
				+
			
 
				+.uniui-refresh:before {
			
 
				+  content: "\e657";
			
 
				+}
			
 
				+
			
 
				+.uniui-cloud-upload:before {
			
 
				+  content: "\e645";
			
 
				+}
			
 
				+
			
 
				+.uniui-cloud-download-filled:before {
			
 
				+  content: "\e646";
			
 
				+}
			
 
				+
			
 
				+.uniui-cloud-download:before {
			
 
				+  content: "\e647";
			
 
				+}
			
 
				+
			
 
				+.uniui-cloud-upload-filled:before {
			
 
				+  content: "\e648";
			
 
				+}
			
 
				+
			
 
				+.uniui-redo:before {
			
 
				+  content: "\e64a";
			
 
				+}
			
 
				+
			
 
				+.uniui-images-filled:before {
			
 
				+  content: "\e64b";
			
 
				+}
			
 
				+
			
 
				+.uniui-undo-filled:before {
			
 
				+  content: "\e64c";
			
 
				+}
			
 
				+
			
 
				+.uniui-more:before {
			
 
				+  content: "\e64d";
			
 
				+}
			
 
				+
			
 
				+.uniui-more-filled:before {
			
 
				+  content: "\e64e";
			
 
				+}
			
 
				+
			
 
				+.uniui-undo:before {
			
 
				+  content: "\e64f";
			
 
				+}
			
 
				+
			
 
				+.uniui-images:before {
			
 
				+  content: "\e650";
			
 
				+}
			
 
				+
			
 
				+.uniui-paperclip:before {
			
 
				+  content: "\e652";
			
 
				+}
			
 
				+
			
 
				+.uniui-settings:before {
			
 
				+  content: "\e653";
			
 
				+}
			
 
				+
			
 
				+.uniui-search:before {
			
 
				+  content: "\e654";
			
 
				+}
			
 
				+
			
 
				+.uniui-redo-filled:before {
			
 
				+  content: "\e655";
			
 
				+}
			
 
				+
			
 
				+.uniui-list:before {
			
 
				+  content: "\e644";
			
 
				+}
			
 
				+
			
 
				+.uniui-mail-open-filled:before {
			
 
				+  content: "\e63a";
			
 
				+}
			
 
				+
			
 
				+.uniui-hand-down-filled:before {
			
 
				+  content: "\e63c";
			
 
				+}
			
 
				+
			
 
				+.uniui-hand-down:before {
			
 
				+  content: "\e63d";
			
 
				+}
			
 
				+
			
 
				+.uniui-hand-up-filled:before {
			
 
				+  content: "\e63e";
			
 
				+}
			
 
				+
			
 
				+.uniui-hand-up:before {
			
 
				+  content: "\e63f";
			
 
				+}
			
 
				+
			
 
				+.uniui-heart-filled:before {
			
 
				+  content: "\e641";
			
 
				+}
			
 
				+
			
 
				+.uniui-mail-open:before {
			
 
				+  content: "\e643";
			
 
				+}
			
 
				+
			
 
				+.uniui-heart:before {
			
 
				+  content: "\e639";
			
 
				+}
			
 
				+
			
 
				+.uniui-loop:before {
			
 
				+  content: "\e633";
			
 
				+}
			
 
				+
			
 
				+.uniui-pulldown:before {
			
 
				+  content: "\e632";
			
 
				+}
			
 
				+
			
 
				+.uniui-scan:before {
			
 
				+  content: "\e62a";
			
 
				+}
			
 
				+
			
 
				+.uniui-bars:before {
			
 
				+  content: "\e627";
			
 
				+}
			
 
				+
			
 
				+.uniui-checkbox:before {
			
 
				+  content: "\e62b";
			
 
				+}
			
 
				+
			
 
				+.uniui-checkbox-filled:before {
			
 
				+  content: "\e62c";
			
 
				+}
			
 
				+
			
 
				+.uniui-shop:before {
			
 
				+  content: "\e62f";
			
 
				+}
			
 
				+
			
 
				+.uniui-headphones:before {
			
 
				+  content: "\e630";
			
 
				+}
			
 
				+
			
 
				+.uniui-cart:before {
			
 
				+  content: "\e631";
			
 
				+}
			
--- a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
--- a/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
@@ -0,0 +1,664 @@
 
				+
			
 
				+export type IconsData = {
			
 
				+	id : string
			
 
				+	name : string
			
 
				+	font_family : string
			
 
				+	css_prefix_text : string
			
 
				+	description : string
			
 
				+	glyphs : Array<IconsDataItem>
			
 
				+}
			
 
				+
			
 
				+export type IconsDataItem = {
			
 
				+	font_class : string
			
 
				+	unicode : string
			
 
				+}
			
 
				+
			
 
				+
			
 
				+export const fontData = [
			
 
				+  {
			
 
				+    "font_class": "arrow-down",
			
 
				+    "unicode": "\ue6be"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "arrow-left",
			
 
				+    "unicode": "\ue6bc"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "arrow-right",
			
 
				+    "unicode": "\ue6bb"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "arrow-up",
			
 
				+    "unicode": "\ue6bd"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "auth",
			
 
				+    "unicode": "\ue6ab"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "auth-filled",
			
 
				+    "unicode": "\ue6cc"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "back",
			
 
				+    "unicode": "\ue6b9"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "bars",
			
 
				+    "unicode": "\ue627"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "calendar",
			
 
				+    "unicode": "\ue6a0"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "calendar-filled",
			
 
				+    "unicode": "\ue6c0"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "camera",
			
 
				+    "unicode": "\ue65a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "camera-filled",
			
 
				+    "unicode": "\ue658"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "cart",
			
 
				+    "unicode": "\ue631"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "cart-filled",
			
 
				+    "unicode": "\ue6d0"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "chat",
			
 
				+    "unicode": "\ue65d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "chat-filled",
			
 
				+    "unicode": "\ue659"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "chatboxes",
			
 
				+    "unicode": "\ue696"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "chatboxes-filled",
			
 
				+    "unicode": "\ue692"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "chatbubble",
			
 
				+    "unicode": "\ue697"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "chatbubble-filled",
			
 
				+    "unicode": "\ue694"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "checkbox",
			
 
				+    "unicode": "\ue62b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "checkbox-filled",
			
 
				+    "unicode": "\ue62c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "checkmarkempty",
			
 
				+    "unicode": "\ue65c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "circle",
			
 
				+    "unicode": "\ue65b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "circle-filled",
			
 
				+    "unicode": "\ue65e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "clear",
			
 
				+    "unicode": "\ue66d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "close",
			
 
				+    "unicode": "\ue673"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "closeempty",
			
 
				+    "unicode": "\ue66c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "cloud-download",
			
 
				+    "unicode": "\ue647"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "cloud-download-filled",
			
 
				+    "unicode": "\ue646"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "cloud-upload",
			
 
				+    "unicode": "\ue645"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "cloud-upload-filled",
			
 
				+    "unicode": "\ue648"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "color",
			
 
				+    "unicode": "\ue6cf"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "color-filled",
			
 
				+    "unicode": "\ue6c9"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "compose",
			
 
				+    "unicode": "\ue67f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "contact",
			
 
				+    "unicode": "\ue693"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "contact-filled",
			
 
				+    "unicode": "\ue695"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "down",
			
 
				+    "unicode": "\ue6b8"
			
 
				+  },
			
 
				+	{
			
 
				+	  "font_class": "bottom",
			
 
				+	  "unicode": "\ue6b8"
			
 
				+	},
			
 
				+  {
			
 
				+    "font_class": "download",
			
 
				+    "unicode": "\ue68d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "download-filled",
			
 
				+    "unicode": "\ue681"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "email",
			
 
				+    "unicode": "\ue69e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "email-filled",
			
 
				+    "unicode": "\ue69a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "eye",
			
 
				+    "unicode": "\ue651"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "eye-filled",
			
 
				+    "unicode": "\ue66a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "eye-slash",
			
 
				+    "unicode": "\ue6b3"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "eye-slash-filled",
			
 
				+    "unicode": "\ue6b4"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "fire",
			
 
				+    "unicode": "\ue6a1"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "fire-filled",
			
 
				+    "unicode": "\ue6c5"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "flag",
			
 
				+    "unicode": "\ue65f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "flag-filled",
			
 
				+    "unicode": "\ue660"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "folder-add",
			
 
				+    "unicode": "\ue6a9"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "folder-add-filled",
			
 
				+    "unicode": "\ue6c8"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "font",
			
 
				+    "unicode": "\ue6a3"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "forward",
			
 
				+    "unicode": "\ue6ba"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "gear",
			
 
				+    "unicode": "\ue664"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "gear-filled",
			
 
				+    "unicode": "\ue661"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "gift",
			
 
				+    "unicode": "\ue6a4"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "gift-filled",
			
 
				+    "unicode": "\ue6c4"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "hand-down",
			
 
				+    "unicode": "\ue63d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "hand-down-filled",
			
 
				+    "unicode": "\ue63c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "hand-up",
			
 
				+    "unicode": "\ue63f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "hand-up-filled",
			
 
				+    "unicode": "\ue63e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "headphones",
			
 
				+    "unicode": "\ue630"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "heart",
			
 
				+    "unicode": "\ue639"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "heart-filled",
			
 
				+    "unicode": "\ue641"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "help",
			
 
				+    "unicode": "\ue679"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "help-filled",
			
 
				+    "unicode": "\ue674"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "home",
			
 
				+    "unicode": "\ue662"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "home-filled",
			
 
				+    "unicode": "\ue663"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "image",
			
 
				+    "unicode": "\ue670"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "image-filled",
			
 
				+    "unicode": "\ue678"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "images",
			
 
				+    "unicode": "\ue650"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "images-filled",
			
 
				+    "unicode": "\ue64b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "info",
			
 
				+    "unicode": "\ue669"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "info-filled",
			
 
				+    "unicode": "\ue649"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "left",
			
 
				+    "unicode": "\ue6b7"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "link",
			
 
				+    "unicode": "\ue6a5"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "list",
			
 
				+    "unicode": "\ue644"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "location",
			
 
				+    "unicode": "\ue6ae"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "location-filled",
			
 
				+    "unicode": "\ue6af"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "locked",
			
 
				+    "unicode": "\ue66b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "locked-filled",
			
 
				+    "unicode": "\ue668"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "loop",
			
 
				+    "unicode": "\ue633"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "mail-open",
			
 
				+    "unicode": "\ue643"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "mail-open-filled",
			
 
				+    "unicode": "\ue63a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "map",
			
 
				+    "unicode": "\ue667"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "map-filled",
			
 
				+    "unicode": "\ue666"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "map-pin",
			
 
				+    "unicode": "\ue6ad"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "map-pin-ellipse",
			
 
				+    "unicode": "\ue6ac"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "medal",
			
 
				+    "unicode": "\ue6a2"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "medal-filled",
			
 
				+    "unicode": "\ue6c3"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "mic",
			
 
				+    "unicode": "\ue671"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "mic-filled",
			
 
				+    "unicode": "\ue677"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "micoff",
			
 
				+    "unicode": "\ue67e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "micoff-filled",
			
 
				+    "unicode": "\ue6b0"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "minus",
			
 
				+    "unicode": "\ue66f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "minus-filled",
			
 
				+    "unicode": "\ue67d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "more",
			
 
				+    "unicode": "\ue64d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "more-filled",
			
 
				+    "unicode": "\ue64e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "navigate",
			
 
				+    "unicode": "\ue66e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "navigate-filled",
			
 
				+    "unicode": "\ue67a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "notification",
			
 
				+    "unicode": "\ue6a6"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "notification-filled",
			
 
				+    "unicode": "\ue6c1"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "paperclip",
			
 
				+    "unicode": "\ue652"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "paperplane",
			
 
				+    "unicode": "\ue672"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "paperplane-filled",
			
 
				+    "unicode": "\ue675"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "person",
			
 
				+    "unicode": "\ue699"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "person-filled",
			
 
				+    "unicode": "\ue69d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "personadd",
			
 
				+    "unicode": "\ue69f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "personadd-filled",
			
 
				+    "unicode": "\ue698"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "personadd-filled-copy",
			
 
				+    "unicode": "\ue6d1"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "phone",
			
 
				+    "unicode": "\ue69c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "phone-filled",
			
 
				+    "unicode": "\ue69b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "plus",
			
 
				+    "unicode": "\ue676"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "plus-filled",
			
 
				+    "unicode": "\ue6c7"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "plusempty",
			
 
				+    "unicode": "\ue67b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "pulldown",
			
 
				+    "unicode": "\ue632"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "pyq",
			
 
				+    "unicode": "\ue682"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "qq",
			
 
				+    "unicode": "\ue680"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "redo",
			
 
				+    "unicode": "\ue64a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "redo-filled",
			
 
				+    "unicode": "\ue655"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "refresh",
			
 
				+    "unicode": "\ue657"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "refresh-filled",
			
 
				+    "unicode": "\ue656"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "refreshempty",
			
 
				+    "unicode": "\ue6bf"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "reload",
			
 
				+    "unicode": "\ue6b2"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "right",
			
 
				+    "unicode": "\ue6b5"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "scan",
			
 
				+    "unicode": "\ue62a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "search",
			
 
				+    "unicode": "\ue654"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "settings",
			
 
				+    "unicode": "\ue653"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "settings-filled",
			
 
				+    "unicode": "\ue6ce"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "shop",
			
 
				+    "unicode": "\ue62f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "shop-filled",
			
 
				+    "unicode": "\ue6cd"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "smallcircle",
			
 
				+    "unicode": "\ue67c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "smallcircle-filled",
			
 
				+    "unicode": "\ue665"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "sound",
			
 
				+    "unicode": "\ue684"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "sound-filled",
			
 
				+    "unicode": "\ue686"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "spinner-cycle",
			
 
				+    "unicode": "\ue68a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "staff",
			
 
				+    "unicode": "\ue6a7"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "staff-filled",
			
 
				+    "unicode": "\ue6cb"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "star",
			
 
				+    "unicode": "\ue688"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "star-filled",
			
 
				+    "unicode": "\ue68f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "starhalf",
			
 
				+    "unicode": "\ue683"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "trash",
			
 
				+    "unicode": "\ue687"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "trash-filled",
			
 
				+    "unicode": "\ue685"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "tune",
			
 
				+    "unicode": "\ue6aa"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "tune-filled",
			
 
				+    "unicode": "\ue6ca"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "undo",
			
 
				+    "unicode": "\ue64f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "undo-filled",
			
 
				+    "unicode": "\ue64c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "up",
			
 
				+    "unicode": "\ue6b6"
			
 
				+  },
			
 
				+	{
			
 
				+	  "font_class": "top",
			
 
				+	  "unicode": "\ue6b6"
			
 
				+	},
			
 
				+  {
			
 
				+    "font_class": "upload",
			
 
				+    "unicode": "\ue690"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "upload-filled",
			
 
				+    "unicode": "\ue68e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "videocam",
			
 
				+    "unicode": "\ue68c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "videocam-filled",
			
 
				+    "unicode": "\ue689"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "vip",
			
 
				+    "unicode": "\ue6a8"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "vip-filled",
			
 
				+    "unicode": "\ue6c6"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "wallet",
			
 
				+    "unicode": "\ue6b1"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "wallet-filled",
			
 
				+    "unicode": "\ue6c2"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "weibo",
			
 
				+    "unicode": "\ue68b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "weixin",
			
 
				+    "unicode": "\ue691"
			
 
				+  }
			
 
				+] as IconsDataItem[]
			
 
				+
			
 
				+// export const fontData = JSON.parse<IconsDataItem>(fontDataJson)
			
--- a/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js
@@ -0,0 +1,649 @@
 
				+
			
 
				+export const fontData = [
			
 
				+  {
			
 
				+    "font_class": "arrow-down",
			
 
				+    "unicode": "\ue6be"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "arrow-left",
			
 
				+    "unicode": "\ue6bc"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "arrow-right",
			
 
				+    "unicode": "\ue6bb"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "arrow-up",
			
 
				+    "unicode": "\ue6bd"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "auth",
			
 
				+    "unicode": "\ue6ab"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "auth-filled",
			
 
				+    "unicode": "\ue6cc"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "back",
			
 
				+    "unicode": "\ue6b9"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "bars",
			
 
				+    "unicode": "\ue627"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "calendar",
			
 
				+    "unicode": "\ue6a0"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "calendar-filled",
			
 
				+    "unicode": "\ue6c0"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "camera",
			
 
				+    "unicode": "\ue65a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "camera-filled",
			
 
				+    "unicode": "\ue658"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "cart",
			
 
				+    "unicode": "\ue631"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "cart-filled",
			
 
				+    "unicode": "\ue6d0"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "chat",
			
 
				+    "unicode": "\ue65d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "chat-filled",
			
 
				+    "unicode": "\ue659"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "chatboxes",
			
 
				+    "unicode": "\ue696"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "chatboxes-filled",
			
 
				+    "unicode": "\ue692"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "chatbubble",
			
 
				+    "unicode": "\ue697"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "chatbubble-filled",
			
 
				+    "unicode": "\ue694"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "checkbox",
			
 
				+    "unicode": "\ue62b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "checkbox-filled",
			
 
				+    "unicode": "\ue62c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "checkmarkempty",
			
 
				+    "unicode": "\ue65c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "circle",
			
 
				+    "unicode": "\ue65b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "circle-filled",
			
 
				+    "unicode": "\ue65e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "clear",
			
 
				+    "unicode": "\ue66d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "close",
			
 
				+    "unicode": "\ue673"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "closeempty",
			
 
				+    "unicode": "\ue66c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "cloud-download",
			
 
				+    "unicode": "\ue647"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "cloud-download-filled",
			
 
				+    "unicode": "\ue646"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "cloud-upload",
			
 
				+    "unicode": "\ue645"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "cloud-upload-filled",
			
 
				+    "unicode": "\ue648"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "color",
			
 
				+    "unicode": "\ue6cf"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "color-filled",
			
 
				+    "unicode": "\ue6c9"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "compose",
			
 
				+    "unicode": "\ue67f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "contact",
			
 
				+    "unicode": "\ue693"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "contact-filled",
			
 
				+    "unicode": "\ue695"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "down",
			
 
				+    "unicode": "\ue6b8"
			
 
				+  },
			
 
				+	{
			
 
				+	  "font_class": "bottom",
			
 
				+	  "unicode": "\ue6b8"
			
 
				+	},
			
 
				+  {
			
 
				+    "font_class": "download",
			
 
				+    "unicode": "\ue68d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "download-filled",
			
 
				+    "unicode": "\ue681"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "email",
			
 
				+    "unicode": "\ue69e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "email-filled",
			
 
				+    "unicode": "\ue69a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "eye",
			
 
				+    "unicode": "\ue651"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "eye-filled",
			
 
				+    "unicode": "\ue66a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "eye-slash",
			
 
				+    "unicode": "\ue6b3"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "eye-slash-filled",
			
 
				+    "unicode": "\ue6b4"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "fire",
			
 
				+    "unicode": "\ue6a1"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "fire-filled",
			
 
				+    "unicode": "\ue6c5"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "flag",
			
 
				+    "unicode": "\ue65f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "flag-filled",
			
 
				+    "unicode": "\ue660"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "folder-add",
			
 
				+    "unicode": "\ue6a9"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "folder-add-filled",
			
 
				+    "unicode": "\ue6c8"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "font",
			
 
				+    "unicode": "\ue6a3"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "forward",
			
 
				+    "unicode": "\ue6ba"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "gear",
			
 
				+    "unicode": "\ue664"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "gear-filled",
			
 
				+    "unicode": "\ue661"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "gift",
			
 
				+    "unicode": "\ue6a4"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "gift-filled",
			
 
				+    "unicode": "\ue6c4"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "hand-down",
			
 
				+    "unicode": "\ue63d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "hand-down-filled",
			
 
				+    "unicode": "\ue63c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "hand-up",
			
 
				+    "unicode": "\ue63f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "hand-up-filled",
			
 
				+    "unicode": "\ue63e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "headphones",
			
 
				+    "unicode": "\ue630"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "heart",
			
 
				+    "unicode": "\ue639"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "heart-filled",
			
 
				+    "unicode": "\ue641"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "help",
			
 
				+    "unicode": "\ue679"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "help-filled",
			
 
				+    "unicode": "\ue674"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "home",
			
 
				+    "unicode": "\ue662"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "home-filled",
			
 
				+    "unicode": "\ue663"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "image",
			
 
				+    "unicode": "\ue670"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "image-filled",
			
 
				+    "unicode": "\ue678"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "images",
			
 
				+    "unicode": "\ue650"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "images-filled",
			
 
				+    "unicode": "\ue64b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "info",
			
 
				+    "unicode": "\ue669"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "info-filled",
			
 
				+    "unicode": "\ue649"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "left",
			
 
				+    "unicode": "\ue6b7"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "link",
			
 
				+    "unicode": "\ue6a5"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "list",
			
 
				+    "unicode": "\ue644"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "location",
			
 
				+    "unicode": "\ue6ae"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "location-filled",
			
 
				+    "unicode": "\ue6af"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "locked",
			
 
				+    "unicode": "\ue66b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "locked-filled",
			
 
				+    "unicode": "\ue668"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "loop",
			
 
				+    "unicode": "\ue633"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "mail-open",
			
 
				+    "unicode": "\ue643"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "mail-open-filled",
			
 
				+    "unicode": "\ue63a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "map",
			
 
				+    "unicode": "\ue667"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "map-filled",
			
 
				+    "unicode": "\ue666"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "map-pin",
			
 
				+    "unicode": "\ue6ad"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "map-pin-ellipse",
			
 
				+    "unicode": "\ue6ac"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "medal",
			
 
				+    "unicode": "\ue6a2"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "medal-filled",
			
 
				+    "unicode": "\ue6c3"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "mic",
			
 
				+    "unicode": "\ue671"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "mic-filled",
			
 
				+    "unicode": "\ue677"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "micoff",
			
 
				+    "unicode": "\ue67e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "micoff-filled",
			
 
				+    "unicode": "\ue6b0"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "minus",
			
 
				+    "unicode": "\ue66f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "minus-filled",
			
 
				+    "unicode": "\ue67d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "more",
			
 
				+    "unicode": "\ue64d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "more-filled",
			
 
				+    "unicode": "\ue64e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "navigate",
			
 
				+    "unicode": "\ue66e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "navigate-filled",
			
 
				+    "unicode": "\ue67a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "notification",
			
 
				+    "unicode": "\ue6a6"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "notification-filled",
			
 
				+    "unicode": "\ue6c1"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "paperclip",
			
 
				+    "unicode": "\ue652"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "paperplane",
			
 
				+    "unicode": "\ue672"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "paperplane-filled",
			
 
				+    "unicode": "\ue675"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "person",
			
 
				+    "unicode": "\ue699"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "person-filled",
			
 
				+    "unicode": "\ue69d"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "personadd",
			
 
				+    "unicode": "\ue69f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "personadd-filled",
			
 
				+    "unicode": "\ue698"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "personadd-filled-copy",
			
 
				+    "unicode": "\ue6d1"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "phone",
			
 
				+    "unicode": "\ue69c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "phone-filled",
			
 
				+    "unicode": "\ue69b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "plus",
			
 
				+    "unicode": "\ue676"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "plus-filled",
			
 
				+    "unicode": "\ue6c7"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "plusempty",
			
 
				+    "unicode": "\ue67b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "pulldown",
			
 
				+    "unicode": "\ue632"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "pyq",
			
 
				+    "unicode": "\ue682"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "qq",
			
 
				+    "unicode": "\ue680"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "redo",
			
 
				+    "unicode": "\ue64a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "redo-filled",
			
 
				+    "unicode": "\ue655"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "refresh",
			
 
				+    "unicode": "\ue657"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "refresh-filled",
			
 
				+    "unicode": "\ue656"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "refreshempty",
			
 
				+    "unicode": "\ue6bf"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "reload",
			
 
				+    "unicode": "\ue6b2"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "right",
			
 
				+    "unicode": "\ue6b5"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "scan",
			
 
				+    "unicode": "\ue62a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "search",
			
 
				+    "unicode": "\ue654"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "settings",
			
 
				+    "unicode": "\ue653"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "settings-filled",
			
 
				+    "unicode": "\ue6ce"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "shop",
			
 
				+    "unicode": "\ue62f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "shop-filled",
			
 
				+    "unicode": "\ue6cd"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "smallcircle",
			
 
				+    "unicode": "\ue67c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "smallcircle-filled",
			
 
				+    "unicode": "\ue665"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "sound",
			
 
				+    "unicode": "\ue684"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "sound-filled",
			
 
				+    "unicode": "\ue686"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "spinner-cycle",
			
 
				+    "unicode": "\ue68a"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "staff",
			
 
				+    "unicode": "\ue6a7"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "staff-filled",
			
 
				+    "unicode": "\ue6cb"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "star",
			
 
				+    "unicode": "\ue688"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "star-filled",
			
 
				+    "unicode": "\ue68f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "starhalf",
			
 
				+    "unicode": "\ue683"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "trash",
			
 
				+    "unicode": "\ue687"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "trash-filled",
			
 
				+    "unicode": "\ue685"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "tune",
			
 
				+    "unicode": "\ue6aa"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "tune-filled",
			
 
				+    "unicode": "\ue6ca"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "undo",
			
 
				+    "unicode": "\ue64f"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "undo-filled",
			
 
				+    "unicode": "\ue64c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "up",
			
 
				+    "unicode": "\ue6b6"
			
 
				+  },
			
 
				+	{
			
 
				+	  "font_class": "top",
			
 
				+	  "unicode": "\ue6b6"
			
 
				+	},
			
 
				+  {
			
 
				+    "font_class": "upload",
			
 
				+    "unicode": "\ue690"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "upload-filled",
			
 
				+    "unicode": "\ue68e"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "videocam",
			
 
				+    "unicode": "\ue68c"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "videocam-filled",
			
 
				+    "unicode": "\ue689"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "vip",
			
 
				+    "unicode": "\ue6a8"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "vip-filled",
			
 
				+    "unicode": "\ue6c6"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "wallet",
			
 
				+    "unicode": "\ue6b1"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "wallet-filled",
			
 
				+    "unicode": "\ue6c2"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "weibo",
			
 
				+    "unicode": "\ue68b"
			
 
				+  },
			
 
				+  {
			
 
				+    "font_class": "weixin",
			
 
				+    "unicode": "\ue691"
			
 
				+  }
			
 
				+]
			
 
				+
			
 
				+// export const fontData = JSON.parse<IconsDataItem>(fontDataJson)
			
--- a/uni_modules/uni-icons/package.json
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,88 @@
 
				+{
			
 
				+  "id": "uni-icons",
			
 
				+  "displayName": "uni-icons 图标",
			
 
				+  "version": "2.0.9",
			
 
				+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
			
 
				+  "keywords": [
			
 
				+    "uni-ui",
			
 
				+    "uniui",
			
 
				+    "icon",
			
 
				+    "图标"
			
 
				+],
			
 
				+  "repository": "https://github.com/dcloudio/uni-ui",
			
 
				+  "engines": {
			
 
				+    "HBuilderX": "^3.2.14"
			
 
				+  },
			
 
				+  "directories": {
			
 
				+    "example": "../../temps/example_temps"
			
 
				+  },
			
 
				+"dcloudext": {
			
 
				+    "sale": {
			
 
				+      "regular": {
			
 
				+        "price": "0.00"
			
 
				+      },
			
 
				+      "sourcecode": {
			
 
				+        "price": "0.00"
			
 
				+      }
			
 
				+    },
			
 
				+    "contact": {
			
 
				+      "qq": ""
			
 
				+    },
			
 
				+    "declaration": {
			
 
				+      "ads": "无",
			
 
				+      "data": "无",
			
 
				+      "permissions": "无"
			
 
				+    },
			
 
				+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
			
 
				+    "type": "component-vue"
			
 
				+  },
			
 
				+  "uni_modules": {
			
 
				+    "dependencies": ["uni-scss"],
			
 
				+    "encrypt": [],
			
 
				+    "platforms": {
			
 
				+      "cloud": {
			
 
				+        "tcb": "y",
			
 
				+        "aliyun": "y"
			
 
				+      },
			
 
				+      "client": {
			
 
				+        "App": {
			
 
				+          "app-vue": "y",
			
 
				+          "app-nvue": "y",
			
 
				+          "app-uvue": "y"
			
 
				+        },
			
 
				+        "H5-mobile": {
			
 
				+          "Safari": "y",
			
 
				+          "Android Browser": "y",
			
 
				+          "微信浏览器(Android)": "y",
			
 
				+          "QQ浏览器(Android)": "y"
			
 
				+        },
			
 
				+        "H5-pc": {
			
 
				+          "Chrome": "y",
			
 
				+          "IE": "y",
			
 
				+          "Edge": "y",
			
 
				+          "Firefox": "y",
			
 
				+          "Safari": "y"
			
 
				+        },
			
 
				+        "小程序": {
			
 
				+          "微信": "y",
			
 
				+          "阿里": "y",
			
 
				+          "百度": "y",
			
 
				+          "字节跳动": "y",
			
 
				+          "QQ": "y",
			
 
				+					"钉钉": "y",
			
 
				+					"快手": "y",
			
 
				+					"飞书": "y",
			
 
				+					"京东": "y"
			
 
				+        },
			
 
				+        "快应用": {
			
 
				+          "华为": "y",
			
 
				+          "联盟": "y"
			
 
				+        },
			
 
				+        "Vue": {
			
 
				+            "vue2": "y",
			
 
				+            "vue3": "y"
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
--- a/uni_modules/uni-icons/readme.md
+++ b/uni_modules/uni-icons/readme.md
@@ -0,0 +1,8 @@
 
				+## Icons 图标
			
 
				+> **组件名：uni-icons**
			
 
				+> 代码块： `uIcons`
			
 
				+
			
 
				+用于展示 icons 图标 。
			
 
				+
			
 
				+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
			
 
				+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
			
--- a/uni_modules/uni-load-more/changelog.md
+++ b/uni_modules/uni-load-more/changelog.md
@@ -0,0 +1,19 @@
 
				+## 1.3.3（2022-01-20）
			
 
				+- 新增 showText属性 ，是否显示文本
			
 
				+## 1.3.2（2022-01-19）
			
 
				+- 修复 nvue 平台下不显示文本的bug
			
 
				+## 1.3.1（2022-01-19）
			
 
				+- 修复 微信小程序平台样式选择器报警告的问题
			
 
				+## 1.3.0（2021-11-19）
			
 
				+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
			
 
				+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
			
 
				+## 1.2.1（2021-08-24）
			
 
				+- 新增 支持国际化
			
 
				+## 1.2.0（2021-07-30）
			
 
				+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
			
 
				+## 1.1.8（2021-05-12）
			
 
				+- 新增 组件示例地址
			
 
				+## 1.1.7（2021-03-30）
			
 
				+- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug
			
 
				+## 1.1.6（2021-02-05）
			
 
				+- 调整为uni_modules目录规范
			
--- a/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
@@ -0,0 +1,5 @@
 
				+{
			
 
				+	"uni-load-more.contentdown": "Pull up to show more",
			
 
				+	"uni-load-more.contentrefresh": "loading...",
			
 
				+	"uni-load-more.contentnomore": "No more data"
			
 
				+}
			
--- a/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
@@ -0,0 +1,8 @@
 
				+import en from './en.json'
			
 
				+import zhHans from './zh-Hans.json'
			
 
				+import zhHant from './zh-Hant.json'
			
 
				+export default {
			
 
				+	en,
			
 
				+	'zh-Hans': zhHans,
			
 
				+	'zh-Hant': zhHant
			
 
				+}
			
--- a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
@@ -0,0 +1,5 @@
 
				+{
			
 
				+	"uni-load-more.contentdown": "上拉显示更多",
			
 
				+	"uni-load-more.contentrefresh": "正在加载...",
			
 
				+	"uni-load-more.contentnomore": "没有更多数据了"
			
 
				+}
			
--- a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
@@ -0,0 +1,5 @@
 
				+{
			
 
				+	"uni-load-more.contentdown": "上拉顯示更多",
			
 
				+	"uni-load-more.contentrefresh": "正在加載...",
			
 
				+	"uni-load-more.contentnomore": "沒有更多數據了"
			
 
				+}
			
--- a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
--- a/uni_modules/uni-load-more/package.json
+++ b/uni_modules/uni-load-more/package.json
@@ -0,0 +1,86 @@
 
				+{
			
 
				+  "id": "uni-load-more",
			
 
				+  "displayName": "uni-load-more 加载更多",
			
 
				+  "version": "1.3.3",
			
 
				+  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
			
 
				+  "keywords": [
			
 
				+    "uni-ui",
			
 
				+    "uniui",
			
 
				+    "加载更多",
			
 
				+    "load-more"
			
 
				+],
			
 
				+  "repository": "https://github.com/dcloudio/uni-ui",
			
 
				+  "engines": {
			
 
				+    "HBuilderX": ""
			
 
				+  },
			
 
				+  "directories": {
			
 
				+    "example": "../../temps/example_temps"
			
 
				+  },
			
 
				+  "dcloudext": {
			
 
				+    "category": [
			
 
				+      "前端组件",
			
 
				+      "通用组件"
			
 
				+    ],
			
 
				+    "sale": {
			
 
				+      "regular": {
			
 
				+        "price": "0.00"
			
 
				+      },
			
 
				+      "sourcecode": {
			
 
				+        "price": "0.00"
			
 
				+      }
			
 
				+    },
			
 
				+    "contact": {
			
 
				+      "qq": ""
			
 
				+    },
			
 
				+    "declaration": {
			
 
				+      "ads": "无",
			
 
				+      "data": "无",
			
 
				+      "permissions": "无"
			
 
				+    },
			
 
				+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
			
 
				+  },
			
 
				+  "uni_modules": {
			
 
				+    "dependencies": ["uni-scss"],
			
 
				+    "encrypt": [],
			
 
				+    "platforms": {
			
 
				+      "cloud": {
			
 
				+        "tcb": "y",
			
 
				+        "aliyun": "y"
			
 
				+      },
			
 
				+      "client": {
			
 
				+        "App": {
			
 
				+          "app-vue": "y",
			
 
				+          "app-nvue": "y"
			
 
				+        },
			
 
				+        "H5-mobile": {
			
 
				+          "Safari": "y",
			
 
				+          "Android Browser": "y",
			
 
				+          "微信浏览器(Android)": "y",
			
 
				+          "QQ浏览器(Android)": "y"
			
 
				+        },
			
 
				+        "H5-pc": {
			
 
				+          "Chrome": "y",
			
 
				+          "IE": "y",
			
 
				+          "Edge": "y",
			
 
				+          "Firefox": "y",
			
 
				+          "Safari": "y"
			
 
				+        },
			
 
				+        "小程序": {
			
 
				+          "微信": "y",
			
 
				+          "阿里": "y",
			
 
				+          "百度": "y",
			
 
				+          "字节跳动": "y",
			
 
				+          "QQ": "y"
			
 
				+        },
			
 
				+        "快应用": {
			
 
				+          "华为": "u",
			
 
				+          "联盟": "u"
			
 
				+        },
			
 
				+        "Vue": {
			
 
				+            "vue2": "y",
			
 
				+            "vue3": "y"
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
--- a/uni_modules/uni-load-more/readme.md
+++ b/uni_modules/uni-load-more/readme.md
@@ -0,0 +1,14 @@
 
				+
			
 
				+
			
 
				+### LoadMore 加载更多
			
 
				+> **组件名：uni-load-more**
			
 
				+> 代码块： `uLoadMore`
			
 
				+
			
 
				+
			
 
				+用于列表中，做滚动加载使用，展示 loading 的各种状态。
			
 
				+
			
 
				+
			
 
				+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more)
			
 
				+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
			
 
				+
			
 
				+
			
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,84 @@
 
				+## 1.9.1（2024-04-02）
			
 
				+- 修复 uni-popup-dialog vue3下使用value无法进行绑定的bug(双向绑定兼容旧写法)
			
 
				+## 1.9.0（2024-03-28）
			
 
				+- 修复 uni-popup-dialog 双向绑定时初始化逻辑修正
			
 
				+## 1.8.9（2024-03-20）
			
 
				+- 修复 uni-popup-dialog 数据输入时修正为双向绑定
			
 
				+## 1.8.8（2024-02-20）
			
 
				+- 修复 uni-popup 在微信小程序下出现文字向上闪动的bug
			
 
				+## 1.8.7（2024-02-02）
			
 
				+- 新增 uni-popup-dialog 新增属性focus：input模式下，是否自动自动聚焦
			
 
				+## 1.8.6（2024-01-30）
			
 
				+- 新增 uni-popup-dialog 新增属性maxLength:限制输入框字数
			
 
				+## 1.8.5（2024-01-26）
			
 
				+- 新增 uni-popup-dialog 新增属性showClose:控制关闭按钮的显示
			
 
				+## 1.8.4（2023-11-15）
			
 
				+- 新增 uni-popup 支持uni-app-x 注意暂时仅支持 `maskClick` `@open` `@close`
			
 
				+## 1.8.3（2023-04-17）
			
 
				+- 修复 uni-popup 重复打开时的 bug
			
 
				+## 1.8.2（2023-02-02）
			
 
				+- uni-popup-dialog 组件新增 inputType 属性
			
 
				+## 1.8.1（2022-12-01）
			
 
				+- 修复 nvue 下 v-show 报错
			
 
				+## 1.8.0（2022-11-29）
			
 
				+- 优化 主题样式
			
 
				+## 1.7.9（2022-04-02）
			
 
				+- 修复 弹出层内部无法滚动的bug
			
 
				+## 1.7.8（2022-03-28）
			
 
				+- 修复 小程序中高度错误的bug
			
 
				+## 1.7.7（2022-03-17）
			
 
				+- 修复 快速调用open出现问题的Bug
			
 
				+## 1.7.6（2022-02-14）
			
 
				+- 修复 safeArea 属性不能设置为false的bug
			
 
				+## 1.7.5（2022-01-19）
			
 
				+- 修复 isMaskClick 失效的bug
			
 
				+## 1.7.4（2022-01-19）
			
 
				+- 新增 cancelText \ confirmText 属性 ，可自定义文本
			
 
				+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
			
 
				+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
			
 
				+## 1.7.3（2022-01-13）
			
 
				+- 修复 设置 safeArea 属性不生效的bug
			
 
				+## 1.7.2（2021-11-26）
			
 
				+- 优化 组件示例
			
 
				+## 1.7.1（2021-11-26）
			
 
				+- 修复 vuedoc 文字错误
			
 
				+## 1.7.0（2021-11-19）
			
 
				+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
			
 
				+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
			
 
				+## 1.6.2（2021-08-24）
			
 
				+- 新增 支持国际化
			
 
				+## 1.6.1（2021-07-30）
			
 
				+- 优化 vue3下事件警告的问题
			
 
				+## 1.6.0（2021-07-13）
			
 
				+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
			
 
				+## 1.5.0（2021-06-23）
			
 
				+- 新增 mask-click 遮罩层点击事件
			
 
				+## 1.4.5（2021-06-22）
			
 
				+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
			
 
				+## 1.4.4（2021-06-18）
			
 
				+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
			
 
				+## 1.4.3（2021-06-08）
			
 
				+- 修复 错误的 watch 字段
			
 
				+- 修复 safeArea 属性不生效的问题
			
 
				+- 修复 点击内容，再点击遮罩无法关闭的Bug
			
 
				+## 1.4.2（2021-05-12）
			
 
				+- 新增 组件示例地址
			
 
				+## 1.4.1（2021-04-29）
			
 
				+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
			
 
				+## 1.4.0 （2021-04-29）
			
 
				+- 新增 type 属性的 left\right 值，支持左右弹出
			
 
				+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
			
 
				+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
			
 
				+- 新增 safeArea 属性，是否适配底部安全区
			
 
				+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
			
 
				+- 修复 App 端弹出等待的Bug
			
 
				+- 优化 提升低配设备性能，优化动画卡顿问题
			
 
				+- 优化 更简单的组件自定义方式
			
 
				+## 1.2.9（2021-02-05）
			
 
				+- 优化 组件引用关系，通过uni_modules引用组件
			
 
				+## 1.2.8（2021-02-05）
			
 
				+- 调整为uni_modules目录规范
			
 
				+## 1.2.7（2021-02-05）
			
 
				+- 调整为uni_modules目录规范
			
 
				+- 新增 支持 PC 端
			
 
				+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端
			
--- a/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
@@ -0,0 +1,45 @@
 
				+// #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
			
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,316 @@
 
				+<template>
			
 
				+	<view class="uni-popup-dialog">
			
 
				+		<view class="uni-dialog-title">
			
 
				+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
			
 
				+		</view>
			
 
				+		<view v-if="mode === 'base'" class="uni-dialog-content">
			
 
				+			<slot>
			
 
				+				<text class="uni-dialog-content-text">{{content}}</text>
			
 
				+			</slot>
			
 
				+		</view>
			
 
				+		<view v-else class="uni-dialog-content">
			
 
				+			<slot>
			
 
				+				<input class="uni-dialog-input" :maxlength="maxlength" v-model="val" :type="inputType"
			
 
				+					:placeholder="placeholderText" :focus="focus">
			
 
				+			</slot>
			
 
				+		</view>
			
 
				+		<view class="uni-dialog-button-group">
			
 
				+			<view class="uni-dialog-button" v-if="showClose" @click="closeDialog">
			
 
				+				<text class="uni-dialog-button-text">{{closeText}}</text>
			
 
				+			</view>
			
 
				+			<view class="uni-dialog-button" :class="showClose?'uni-border-left':''" @click="onOk">
			
 
				+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import popup from '../uni-popup/popup.js'
			
 
				+	import {
			
 
				+		initVueI18n
			
 
				+	} from '@dcloudio/uni-i18n'
			
 
				+	import messages from '../uni-popup/i18n/index.js'
			
 
				+	const {
			
 
				+		t
			
 
				+	} = initVueI18n(messages)
			
 
				+	/**
			
 
				+	 * PopUp 弹出层-对话框样式
			
 
				+	 * @description 弹出层-对话框样式
			
 
				+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
			
 
				+	 * @property {String} value input 模式下的默认值
			
 
				+	 * @property {String} placeholder input 模式下输入提示
			
 
				+	 * @property {Boolean} focus input模式下是否自动聚焦，默认为true
			
 
				+	 * @property {String} type = [success|warning|info|error] 主题样式
			
 
				+	 *  @value success 成功
			
 
				+	 * 	@value warning 提示
			
 
				+	 * 	@value info 消息
			
 
				+	 * 	@value error 错误
			
 
				+	 * @property {String} mode = [base|input] 模式、
			
 
				+	 * 	@value base 基础对话框
			
 
				+	 * 	@value input 可输入对话框
			
 
				+	 * @showClose {Boolean} 是否显示关闭按钮
			
 
				+	 * @property {String} content 对话框内容
			
 
				+	 * @property {Boolean} beforeClose 是否拦截取消事件
			
 
				+	 * @property {Number} maxlength 输入
			
 
				+	 * @event {Function} confirm 点击确认按钮触发
			
 
				+	 * @event {Function} close 点击取消按钮触发
			
 
				+	 */
			
 
				+
			
 
				+	export default {
			
 
				+		name: "uniPopupDialog",
			
 
				+		mixins: [popup],
			
 
				+		emits: ['confirm', 'close', 'update:modelValue', 'input'],
			
 
				+		props: {
			
 
				+			inputType: {
			
 
				+				type: String,
			
 
				+				default: 'text'
			
 
				+			},
			
 
				+			showClose: {
			
 
				+				type: Boolean,
			
 
				+				default: true
			
 
				+			},
			
 
				+			// #ifdef VUE2
			
 
				+			value: {
			
 
				+				type: [String, Number],
			
 
				+				default: ''
			
 
				+			},
			
 
				+			// #endif
			
 
				+			// #ifdef VUE3
			
 
				+			modelValue: {
			
 
				+				type: [Number, String],
			
 
				+				default: ''
			
 
				+			},
			
 
				+			// #endif
			
 
				+
			
 
				+
			
 
				+			placeholder: {
			
 
				+				type: [String, Number],
			
 
				+				default: ''
			
 
				+			},
			
 
				+			type: {
			
 
				+				type: String,
			
 
				+				default: 'error'
			
 
				+			},
			
 
				+			mode: {
			
 
				+				type: String,
			
 
				+				default: 'base'
			
 
				+			},
			
 
				+			title: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			content: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			beforeClose: {
			
 
				+				type: Boolean,
			
 
				+				default: false
			
 
				+			},
			
 
				+			cancelText: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			confirmText: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			maxlength: {
			
 
				+				type: Number,
			
 
				+				default: -1,
			
 
				+			},
			
 
				+			focus: {
			
 
				+				type: Boolean,
			
 
				+				default: true,
			
 
				+			}
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {
			
 
				+				dialogType: 'error',
			
 
				+				val: ""
			
 
				+			}
			
 
				+		},
			
 
				+		computed: {
			
 
				+			okText() {
			
 
				+				return this.confirmText || t("uni-popup.ok")
			
 
				+			},
			
 
				+			closeText() {
			
 
				+				return this.cancelText || t("uni-popup.cancel")
			
 
				+			},
			
 
				+			placeholderText() {
			
 
				+				return this.placeholder || t("uni-popup.placeholder")
			
 
				+			},
			
 
				+			titleText() {
			
 
				+				return this.title || t("uni-popup.title")
			
 
				+			}
			
 
				+		},
			
 
				+		watch: {
			
 
				+			type(val) {
			
 
				+				this.dialogType = val
			
 
				+			},
			
 
				+			mode(val) {
			
 
				+				if (val === 'input') {
			
 
				+					this.dialogType = 'info'
			
 
				+				}
			
 
				+			},
			
 
				+			value(val) {
			
 
				+				if (this.maxlength != -1 && this.mode === 'input') {
			
 
				+					this.val = val.slice(0, this.maxlength);
			
 
				+				} else {
			
 
				+					this.val = val
			
 
				+				}
			
 
				+			},
			
 
				+			val(val) {
			
 
				+				// #ifdef VUE2
			
 
				+				// TODO 兼容 vue2
			
 
				+				this.$emit('input', val);
			
 
				+				// #endif
			
 
				+				// #ifdef VUE3
			
 
				+				// TODO　兼容　vue3
			
 
				+				this.$emit('update:modelValue', val);
			
 
				+				// #endif
			
 
				+			}
			
 
				+		},
			
 
				+		created() {
			
 
				+			// 对话框遮罩不可点击
			
 
				+			this.popup.disableMask()
			
 
				+			// this.popup.closeMask()
			
 
				+			if (this.mode === 'input') {
			
 
				+				this.dialogType = 'info'
			
 
				+				this.val = this.value;
			
 
				+				// #ifdef VUE3
			
 
				+				this.val = this.modelValue;
			
 
				+				// #endif
			
 
				+			} else {
			
 
				+				this.dialogType = this.type
			
 
				+			}
			
 
				+		},
			
 
				+		methods: {
			
 
				+			/**
			
 
				+			 * 点击确认按钮
			
 
				+			 */
			
 
				+			onOk() {
			
 
				+				if (this.mode === 'input') {
			
 
				+					this.$emit('confirm', this.val)
			
 
				+				} else {
			
 
				+					this.$emit('confirm')
			
 
				+				}
			
 
				+				if (this.beforeClose) return
			
 
				+				this.popup.close()
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 点击取消按钮
			
 
				+			 */
			
 
				+			closeDialog() {
			
 
				+				this.$emit('close')
			
 
				+				if (this.beforeClose) return
			
 
				+				this.popup.close()
			
 
				+			},
			
 
				+			close() {
			
 
				+				this.popup.close()
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss">
			
 
				+	.uni-popup-dialog {
			
 
				+		width: 300px;
			
 
				+		border-radius: 11px;
			
 
				+		background-color: #fff;
			
 
				+	}
			
 
				+
			
 
				+	.uni-dialog-title {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		/* #endif */
			
 
				+		flex-direction: row;
			
 
				+		justify-content: center;
			
 
				+		padding-top: 25px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-dialog-title-text {
			
 
				+		font-size: 16px;
			
 
				+		font-weight: 500;
			
 
				+	}
			
 
				+
			
 
				+	.uni-dialog-content {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		/* #endif */
			
 
				+		flex-direction: row;
			
 
				+		justify-content: center;
			
 
				+		align-items: center;
			
 
				+		padding: 20px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-dialog-content-text {
			
 
				+		font-size: 14px;
			
 
				+		color: #6C6C6C;
			
 
				+	}
			
 
				+
			
 
				+	.uni-dialog-button-group {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		/* #endif */
			
 
				+		flex-direction: row;
			
 
				+		border-top-color: #f5f5f5;
			
 
				+		border-top-style: solid;
			
 
				+		border-top-width: 1px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-dialog-button {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		/* #endif */
			
 
				+
			
 
				+		flex: 1;
			
 
				+		flex-direction: row;
			
 
				+		justify-content: center;
			
 
				+		align-items: center;
			
 
				+		height: 45px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-border-left {
			
 
				+		border-left-color: #f0f0f0;
			
 
				+		border-left-style: solid;
			
 
				+		border-left-width: 1px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-dialog-button-text {
			
 
				+		font-size: 16px;
			
 
				+		color: #333;
			
 
				+	}
			
 
				+
			
 
				+	.uni-button-color {
			
 
				+		color: #007aff;
			
 
				+	}
			
 
				+
			
 
				+	.uni-dialog-input {
			
 
				+		flex: 1;
			
 
				+		font-size: 14px;
			
 
				+		border: 1px #eee solid;
			
 
				+		height: 40px;
			
 
				+		padding: 0 10px;
			
 
				+		border-radius: 5px;
			
 
				+		color: #555;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup__success {
			
 
				+		color: #4cd964;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup__warn {
			
 
				+		color: #f0ad4e;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup__error {
			
 
				+		color: #dd524d;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup__info {
			
 
				+		color: #909399;
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
+++ b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
@@ -0,0 +1,143 @@
 
				+<template>
			
 
				+	<view class="uni-popup-message">
			
 
				+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
			
 
				+			<slot>
			
 
				+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
			
 
				+			</slot>
			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import popup from '../uni-popup/popup.js'
			
 
				+	/**
			
 
				+	 * PopUp 弹出层-消息提示
			
 
				+	 * @description 弹出层-消息提示
			
 
				+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
			
 
				+	 * @property {String} type = [success|warning|info|error] 主题样式
			
 
				+	 *  @value success 成功
			
 
				+	 * 	@value warning 提示
			
 
				+	 * 	@value info 消息
			
 
				+	 * 	@value error 错误
			
 
				+	 * @property {String} message 消息提示文字
			
 
				+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
			
 
				+	 */
			
 
				+
			
 
				+	export default {
			
 
				+		name: 'uniPopupMessage',
			
 
				+		mixins:[popup],
			
 
				+		props: {
			
 
				+			/**
			
 
				+			 * 主题 success/warning/info/error	  默认 success
			
 
				+			 */
			
 
				+			type: {
			
 
				+				type: String,
			
 
				+				default: 'success'
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 消息文字
			
 
				+			 */
			
 
				+			message: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 显示时间，设置为 0 则不会自动关闭
			
 
				+			 */
			
 
				+			duration: {
			
 
				+				type: Number,
			
 
				+				default: 3000
			
 
				+			},
			
 
				+			maskShow:{
			
 
				+				type:Boolean,
			
 
				+				default:false
			
 
				+			}
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {}
			
 
				+		},
			
 
				+		created() {
			
 
				+			this.popup.maskShow = this.maskShow
			
 
				+			this.popup.messageChild = this
			
 
				+		},
			
 
				+		methods: {
			
 
				+			timerClose(){
			
 
				+				if(this.duration === 0) return
			
 
				+				clearTimeout(this.timer) 
			
 
				+				this.timer = setTimeout(()=>{
			
 
				+					this.popup.close()
			
 
				+				},this.duration)
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+<style lang="scss" >
			
 
				+	.uni-popup-message {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		/* #endif */
			
 
				+		flex-direction: row;
			
 
				+		justify-content: center;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup-message__box {
			
 
				+		background-color: #e1f3d8;
			
 
				+		padding: 10px 15px;
			
 
				+		border-color: #eee;
			
 
				+		border-style: solid;
			
 
				+		border-width: 1px;
			
 
				+		flex: 1;
			
 
				+	}
			
 
				+
			
 
				+	@media screen and (min-width: 500px) {
			
 
				+		.fixforpc-width {
			
 
				+			margin-top: 20px;
			
 
				+			border-radius: 4px;
			
 
				+			flex: none;
			
 
				+			min-width: 380px;
			
 
				+			/* #ifndef APP-NVUE */
			
 
				+			max-width: 50%;
			
 
				+			/* #endif */
			
 
				+			/* #ifdef APP-NVUE */
			
 
				+			max-width: 500px;
			
 
				+			/* #endif */
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup-message-text {
			
 
				+		font-size: 14px;
			
 
				+		padding: 0;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup__success {
			
 
				+		background-color: #e1f3d8;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup__success-text {
			
 
				+		color: #67C23A;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup__warn {
			
 
				+		background-color: #faecd8;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup__warn-text {
			
 
				+		color: #E6A23C;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup__error {
			
 
				+		background-color: #fde2e2;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup__error-text {
			
 
				+		color: #F56C6C;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup__info {
			
 
				+		background-color: #F2F6FC;
			
 
				+	}
			
 
				+
			
 
				+	.uni-popup__info-text {
			
 
				+		color: #909399;
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,187 @@
 
				+<template>
			
 
				+	<view class="uni-popup-share">
			
 
				+		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
			
 
				+		<view class="uni-share-content">
			
 
				+			<view class="uni-share-content-box">
			
 
				+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
			
 
				+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
			
 
				+					<text class="uni-share-text">{{item.text}}</text>
			
 
				+				</view>
			
 
				+
			
 
				+			</view>
			
 
				+		</view>
			
 
				+		<view class="uni-share-button-box">
			
 
				+			<button class="uni-share-button" @click="close">{{cancelText}}</button>
			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import popup from '../uni-popup/popup.js'
			
 
				+	import {
			
 
				+	initVueI18n
			
 
				+	} from '@dcloudio/uni-i18n'
			
 
				+	import messages from '../uni-popup/i18n/index.js'
			
 
				+	const {	t	} = initVueI18n(messages)
			
 
				+	export default {
			
 
				+		name: 'UniPopupShare',
			
 
				+		mixins:[popup],
			
 
				+		emits:['select'],
			
 
				+		props: {
			
 
				+			title: {
			
 
				+				type: String,
			
 
				+				default: ''
			
 
				+			},
			
 
				+			beforeClose: {
			
 
				+				type: Boolean,
			
 
				+				default: false
			
 
				+			}
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {
			
 
				+				bottomData: [{
			
 
				+						text: '微信',
			
 
				+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
			
 
				+						name: 'wx'
			
 
				+					},
			
 
				+					{
			
 
				+						text: '支付宝',
			
 
				+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
			
 
				+						name: 'ali'
			
 
				+					},
			
 
				+					{
			
 
				+						text: 'QQ',
			
 
				+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
			
 
				+						name: 'qq'
			
 
				+					},
			
 
				+					{
			
 
				+						text: '新浪',
			
 
				+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
			
 
				+						name: 'sina'
			
 
				+					},
			
 
				+					// {
			
 
				+					// 	text: '百度',
			
 
				+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
			
 
				+					// 	name: 'copy'
			
 
				+					// },
			
 
				+					// {
			
 
				+					// 	text: '其他',
			
 
				+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
			
 
				+					// 	name: 'more'
			
 
				+					// }
			
 
				+				]
			
 
				+			}
			
 
				+		},
			
 
				+		created() {},
			
 
				+		computed: {
			
 
				+			cancelText() {
			
 
				+				return t("uni-popup.cancel")
			
 
				+			},
			
 
				+		shareTitleText() {
			
 
				+				return this.title || t("uni-popup.shareTitle")
			
 
				+			}
			
 
				+		},
			
 
				+		methods: {
			
 
				+			/**
			
 
				+			 * 选择内容
			
 
				+			 */
			
 
				+			select(item, index) {
			
 
				+				this.$emit('select', {
			
 
				+					item,
			
 
				+					index
			
 
				+				})
			
 
				+				this.close()
			
 
				+
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 关闭窗口
			
 
				+			 */
			
 
				+			close() {
			
 
				+				if(this.beforeClose) return
			
 
				+				this.popup.close()
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+<style lang="scss" >
			
 
				+	.uni-popup-share {
			
 
				+		background-color: #fff;
			
 
				+		border-top-left-radius: 11px;
			
 
				+		border-top-right-radius: 11px;
			
 
				+	}
			
 
				+	.uni-share-title {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		/* #endif */
			
 
				+		flex-direction: row;
			
 
				+		align-items: center;
			
 
				+		justify-content: center;
			
 
				+		height: 40px;
			
 
				+	}
			
 
				+	.uni-share-title-text {
			
 
				+		font-size: 14px;
			
 
				+		color: #666;
			
 
				+	}
			
 
				+	.uni-share-content {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		/* #endif */
			
 
				+		flex-direction: row;
			
 
				+		justify-content: center;
			
 
				+		padding-top: 10px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-share-content-box {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		/* #endif */
			
 
				+		flex-direction: row;
			
 
				+		flex-wrap: wrap;
			
 
				+		width: 360px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-share-content-item {
			
 
				+		width: 90px;
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		/* #endif */
			
 
				+		flex-direction: column;
			
 
				+		justify-content: center;
			
 
				+		padding: 10px 0;
			
 
				+		align-items: center;
			
 
				+	}
			
 
				+
			
 
				+	.uni-share-content-item:active {
			
 
				+		background-color: #f5f5f5;
			
 
				+	}
			
 
				+
			
 
				+	.uni-share-image {
			
 
				+		width: 30px;
			
 
				+		height: 30px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-share-text {
			
 
				+		margin-top: 10px;
			
 
				+		font-size: 14px;
			
 
				+		color: #3B4144;
			
 
				+	}
			
 
				+
			
 
				+	.uni-share-button-box {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		display: flex;
			
 
				+		/* #endif */
			
 
				+		flex-direction: row;
			
 
				+		padding: 10px 15px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-share-button {
			
 
				+		flex: 1;
			
 
				+		border-radius: 50px;
			
 
				+		color: #666;
			
 
				+		font-size: 16px;
			
 
				+	}
			
 
				+
			
 
				+	.uni-share-button::after {
			
 
				+		border-radius: 50px;
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uni-popup/components/uni-popup/i18n/en.json
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
@@ -0,0 +1,7 @@
 
				+{
			
 
				+	"uni-popup.cancel": "cancel",
			
 
				+	"uni-popup.ok": "ok",
			
 
				+	"uni-popup.placeholder": "pleace enter",
			
 
				+	"uni-popup.title": "Hint",
			
 
				+	"uni-popup.shareTitle": "Share to"
			
 
				+}
			
--- a/uni_modules/uni-popup/components/uni-popup/i18n/index.js
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
@@ -0,0 +1,8 @@
 
				+import en from './en.json'
			
 
				+import zhHans from './zh-Hans.json'
			
 
				+import zhHant from './zh-Hant.json'
			
 
				+export default {
			
 
				+	en,
			
 
				+	'zh-Hans': zhHans,
			
 
				+	'zh-Hant': zhHant
			
 
				+}
			
--- a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
@@ -0,0 +1,7 @@
 
				+{
			
 
				+	"uni-popup.cancel": "取消",
			
 
				+	"uni-popup.ok": "确定",
			
 
				+	"uni-popup.placeholder": "请输入",
			
 
				+		"uni-popup.title": "提示",
			
 
				+		"uni-popup.shareTitle": "分享到"
			
 
				+}
			
--- a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
@@ -0,0 +1,7 @@
 
				+{
			
 
				+	"uni-popup.cancel": "取消",
			
 
				+	"uni-popup.ok": "確定",
			
 
				+	"uni-popup.placeholder": "請輸入",
			
 
				+	"uni-popup.title": "提示",
			
 
				+	"uni-popup.shareTitle": "分享到"
			
 
				+}
			
--- a/uni_modules/uni-popup/components/uni-popup/keypress.js
+++ b/uni_modules/uni-popup/components/uni-popup/keypress.js
@@ -0,0 +1,45 @@
 
				+// #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
			
--- a/uni_modules/uni-popup/components/uni-popup/popup.js
+++ b/uni_modules/uni-popup/components/uni-popup/popup.js
@@ -0,0 +1,26 @@
 
				+
			
 
				+export default {
			
 
				+	data() {
			
 
				+		return {
			
 
				+			
			
 
				+		}
			
 
				+	},
			
 
				+	created(){
			
 
				+		this.popup = this.getParent()
			
 
				+	},
			
 
				+	methods:{
			
 
				+		/**
			
 
				+		 * 获取父元素实例
			
 
				+		 */
			
 
				+		getParent(name = 'uniPopup') {
			
 
				+			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;
			
 
				+		},
			
 
				+	}
			
 
				+}
			
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
@@ -0,0 +1,90 @@
 
				+<template>
			
 
				+  <view class="popup-root" v-if="isOpen" v-show="isShow" @click="clickMask">
			
 
				+    <view @click.stop>
			
 
				+      <slot></slot>
			
 
				+    </view>
			
 
				+  </view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+  type CloseCallBack = ()=> void;
			
 
				+  let closeCallBack:CloseCallBack = () :void => {};
			
 
				+  export default {
			
 
				+    emits:["close","clickMask"],
			
 
				+    data() {
			
 
				+      return {
			
 
				+        isShow:false,
			
 
				+        isOpen:false
			
 
				+      }
			
 
				+    },
			
 
				+    props: {
			
 
				+      maskClick: {
			
 
				+        type: Boolean,
			
 
				+        default: true
			
 
				+      },
			
 
				+    },
			
 
				+    watch: {
			
 
				+      // 设置show = true 时，如果没有 open 需要设置为 open
			
 
				+      isShow:{
			
 
				+        handler(isShow) {
			
 
				+          // console.log("isShow",isShow)
			
 
				+          if(isShow && this.isOpen == false){
			
 
				+            this.isOpen = true
			
 
				+          }
			
 
				+        },
			
 
				+        immediate:true
			
 
				+      },
			
 
				+      // 设置isOpen = true 时，如果没有 isShow 需要设置为 isShow
			
 
				+      isOpen:{
			
 
				+        handler(isOpen) {
			
 
				+          // console.log("isOpen",isOpen)
			
 
				+          if(isOpen && this.isShow == false){
			
 
				+            this.isShow = true
			
 
				+          }
			
 
				+        },
			
 
				+        immediate:true
			
 
				+      }
			
 
				+    },
			
 
				+    methods:{
			
 
				+      open(){
			
 
				+        // ...funs : CloseCallBack[]
			
 
				+        // if(funs.length > 0){
			
 
				+        //   closeCallBack = funs[0]
			
 
				+        // }
			
 
				+        this.isOpen = true;
			
 
				+      },
			
 
				+      clickMask(){
			
 
				+        if(this.maskClick == true){
			
 
				+          this.$emit('clickMask')
			
 
				+          this.close()
			
 
				+        }
			
 
				+      },
			
 
				+      close(): void{
			
 
				+        this.isOpen = false;
			
 
				+        this.$emit('close')
			
 
				+        closeCallBack()
			
 
				+      },
			
 
				+      hiden(){
			
 
				+        this.isShow = false
			
 
				+      },
			
 
				+      show(){
			
 
				+        this.isShow = true
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+</script>
			
 
				+
			
 
				+<style>
			
 
				+.popup-root {
			
 
				+  position: fixed;
			
 
				+  top: 0;
			
 
				+  left: 0;
			
 
				+  width: 750rpx;
			
 
				+  height: 100%;
			
 
				+  flex: 1;
			
 
				+  background-color: rgba(0, 0, 0, 0.3);
			
 
				+  justify-content: center;
			
 
				+  align-items: center;
			
 
				+  z-index: 99;
			
 
				+}
			
 
				+</style>
			
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,503 @@
 
				+<template>
			
 
				+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
			
 
				+		<view @touchstart="touchstart">
			
 
				+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
			
 
				+				:duration="duration" :show="showTrans" @click="onTap" />
			
 
				+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
			
 
				+				:show="showTrans" @click="onTap">
			
 
				+				<view class="uni-popup__wrapper" :style="getStyles" :class="[popupstyle]" @click="clear">
			
 
				+					<slot />
			
 
				+				</view>
			
 
				+			</uni-transition>
			
 
				+		</view>
			
 
				+		<!-- #ifdef H5 -->
			
 
				+		<keypress v-if="maskShow" @esc="onTap" />
			
 
				+		<!-- #endif -->
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	// #ifdef H5
			
 
				+	import keypress from './keypress.js'
			
 
				+	// #endif
			
 
				+
			
 
				+	/**
			
 
				+	 * PopUp 弹出层
			
 
				+	 * @description 弹出层组件，为了解决遮罩弹层的问题
			
 
				+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
			
 
				+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
			
 
				+	 * 	@value top 顶部弹出
			
 
				+	 * 	@value center 中间弹出
			
 
				+	 * 	@value bottom 底部弹出
			
 
				+	 * 	@value left		左侧弹出
			
 
				+	 * 	@value right  右侧弹出
			
 
				+	 * 	@value message 消息提示
			
 
				+	 * 	@value dialog 对话框
			
 
				+	 * 	@value share 底部分享示例
			
 
				+	 * @property {Boolean} animation = [true|false] 是否开启动画
			
 
				+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
			
 
				+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
			
 
				+	 * @property {String}  backgroundColor 主窗口背景色
			
 
				+	 * @property {String}  maskBackgroundColor 蒙版颜色
			
 
				+	 * @property {String}  borderRadius 设置圆角(左上、右上、右下和左下) 示例:"10px 10px 10px 10px"
			
 
				+	 * @property {Boolean} safeArea		   是否适配底部安全区
			
 
				+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
			
 
				+	 * @event {Function} maskClick 点击遮罩触发
			
 
				+	 */
			
 
				+
			
 
				+	export default {
			
 
				+		name: 'uniPopup',
			
 
				+		components: {
			
 
				+			// #ifdef H5
			
 
				+			keypress
			
 
				+			// #endif
			
 
				+		},
			
 
				+		emits: ['change', 'maskClick'],
			
 
				+		props: {
			
 
				+			// 开启动画
			
 
				+			animation: {
			
 
				+				type: Boolean,
			
 
				+				default: true
			
 
				+			},
			
 
				+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
			
 
				+			// message: 消息提示 ; dialog : 对话框
			
 
				+			type: {
			
 
				+				type: String,
			
 
				+				default: 'center'
			
 
				+			},
			
 
				+			// maskClick
			
 
				+			isMaskClick: {
			
 
				+				type: Boolean,
			
 
				+				default: null
			
 
				+			},
			
 
				+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
			
 
				+			maskClick: {
			
 
				+				type: Boolean,
			
 
				+				default: null
			
 
				+			},
			
 
				+			backgroundColor: {
			
 
				+				type: String,
			
 
				+				default: 'none'
			
 
				+			},
			
 
				+			safeArea: {
			
 
				+				type: Boolean,
			
 
				+				default: true
			
 
				+			},
			
 
				+			maskBackgroundColor: {
			
 
				+				type: String,
			
 
				+				default: 'rgba(0, 0, 0, 0.4)'
			
 
				+			},
			
 
				+			borderRadius:{
			
 
				+				type: String,
			
 
				+			}
			
 
				+		},
			
 
				+
			
 
				+		watch: {
			
 
				+			/**
			
 
				+			 * 监听type类型
			
 
				+			 */
			
 
				+			type: {
			
 
				+				handler: function(type) {
			
 
				+					if (!this.config[type]) return
			
 
				+					this[this.config[type]](true)
			
 
				+				},
			
 
				+				immediate: true
			
 
				+			},
			
 
				+			isDesktop: {
			
 
				+				handler: function(newVal) {
			
 
				+					if (!this.config[newVal]) return
			
 
				+					this[this.config[this.type]](true)
			
 
				+				},
			
 
				+				immediate: true
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 监听遮罩是否可点击
			
 
				+			 * @param {Object} val
			
 
				+			 */
			
 
				+			maskClick: {
			
 
				+				handler: function(val) {
			
 
				+					this.mkclick = val
			
 
				+				},
			
 
				+				immediate: true
			
 
				+			},
			
 
				+			isMaskClick: {
			
 
				+				handler: function(val) {
			
 
				+					this.mkclick = val
			
 
				+				},
			
 
				+				immediate: true
			
 
				+			},
			
 
				+			// H5 下禁止底部滚动
			
 
				+			showPopup(show) {
			
 
				+				// #ifdef H5
			
 
				+				// fix by mehaotian 处理 h5 滚动穿透的问题
			
 
				+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
			
 
				+				// #endif
			
 
				+			}
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {
			
 
				+				duration: 300,
			
 
				+				ani: [],
			
 
				+				showPopup: false,
			
 
				+				showTrans: false,
			
 
				+				popupWidth: 0,
			
 
				+				popupHeight: 0,
			
 
				+				config: {
			
 
				+					top: 'top',
			
 
				+					bottom: 'bottom',
			
 
				+					center: 'center',
			
 
				+					left: 'left',
			
 
				+					right: 'right',
			
 
				+					message: 'top',
			
 
				+					dialog: 'center',
			
 
				+					share: 'bottom'
			
 
				+				},
			
 
				+				maskClass: {
			
 
				+					position: 'fixed',
			
 
				+					bottom: 0,
			
 
				+					top: 0,
			
 
				+					left: 0,
			
 
				+					right: 0,
			
 
				+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
			
 
				+				},
			
 
				+				transClass: {
			
 
				+					backgroundColor: 'transparent',
			
 
				+					borderRadius: this.borderRadius || "0",
			
 
				+					position: 'fixed',
			
 
				+					left: 0,
			
 
				+					right: 0
			
 
				+				},
			
 
				+				maskShow: true,
			
 
				+				mkclick: true,
			
 
				+				popupstyle: 'top'
			
 
				+			}
			
 
				+		},
			
 
				+		computed: {
			
 
				+			getStyles() {
			
 
				+				let res = { backgroundColor: this.bg };
			
 
				+				if (this.borderRadius || "0") {
			
 
				+					res = Object.assign(res, { borderRadius: this.borderRadius })
			
 
				+				}
			
 
				+				return res;
			
 
				+			},
			
 
				+			isDesktop() {
			
 
				+				return this.popupWidth >= 500 && this.popupHeight >= 500
			
 
				+			},
			
 
				+			bg() {
			
 
				+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
			
 
				+					return 'transparent'
			
 
				+				}
			
 
				+				return this.backgroundColor
			
 
				+			}
			
 
				+		},
			
 
				+		mounted() {
			
 
				+			const fixSize = () => {
			
 
				+				const {
			
 
				+					windowWidth,
			
 
				+					windowHeight,
			
 
				+					windowTop,
			
 
				+					safeArea,
			
 
				+					screenHeight,
			
 
				+					safeAreaInsets
			
 
				+				} = uni.getSystemInfoSync()
			
 
				+				this.popupWidth = windowWidth
			
 
				+				this.popupHeight = windowHeight + (windowTop || 0)
			
 
				+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
			
 
				+				if (safeArea && this.safeArea) {
			
 
				+					// #ifdef MP-WEIXIN
			
 
				+					this.safeAreaInsets = screenHeight - safeArea.bottom
			
 
				+					// #endif
			
 
				+					// #ifndef MP-WEIXIN
			
 
				+					this.safeAreaInsets = safeAreaInsets.bottom
			
 
				+					// #endif
			
 
				+				} else {
			
 
				+					this.safeAreaInsets = 0
			
 
				+				}
			
 
				+			}
			
 
				+			fixSize()
			
 
				+			// #ifdef H5
			
 
				+			// window.addEventListener('resize', fixSize)
			
 
				+			// this.$once('hook:beforeDestroy', () => {
			
 
				+			// 	window.removeEventListener('resize', fixSize)
			
 
				+			// })
			
 
				+			// #endif
			
 
				+		},
			
 
				+		// #ifndef VUE3
			
 
				+		// TODO vue2
			
 
				+		destroyed() {
			
 
				+			this.setH5Visible()
			
 
				+		},
			
 
				+		// #endif
			
 
				+		// #ifdef VUE3
			
 
				+		// TODO vue3
			
 
				+		unmounted() {
			
 
				+			this.setH5Visible()
			
 
				+		},
			
 
				+		// #endif
			
 
				+		activated() {
			
 
				+   	  this.setH5Visible(!this.showPopup);
			
 
				+    },
			
 
				+    deactivated() {
			
 
				+      this.setH5Visible(true);
			
 
				+    },
			
 
				+		created() {
			
 
				+			// this.mkclick =  this.isMaskClick || this.maskClick
			
 
				+			if (this.isMaskClick === null && this.maskClick === null) {
			
 
				+				this.mkclick = true
			
 
				+			} else {
			
 
				+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
			
 
				+			}
			
 
				+			if (this.animation) {
			
 
				+				this.duration = 300
			
 
				+			} else {
			
 
				+				this.duration = 0
			
 
				+			}
			
 
				+			// TODO 处理 message 组件生命周期异常的问题
			
 
				+			this.messageChild = null
			
 
				+			// TODO 解决头条冒泡的问题
			
 
				+			this.clearPropagation = false
			
 
				+			this.maskClass.backgroundColor = this.maskBackgroundColor
			
 
				+		},
			
 
				+		methods: {
			
 
				+			setH5Visible(visible = true) {
			
 
				+				// #ifdef H5
			
 
				+				// fix by mehaotian 处理 h5 滚动穿透的问题
			
 
				+				document.getElementsByTagName('body')[0].style.overflow =  visible ? "visible" : "hidden";
			
 
				+				// #endif
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 公用方法，不显示遮罩层
			
 
				+			 */
			
 
				+			closeMask() {
			
 
				+				this.maskShow = false
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 公用方法，遮罩层禁止点击
			
 
				+			 */
			
 
				+			disableMask() {
			
 
				+				this.mkclick = false
			
 
				+			},
			
 
				+			// TODO nvue 取消冒泡
			
 
				+			clear(e) {
			
 
				+				// #ifndef APP-NVUE
			
 
				+				e.stopPropagation()
			
 
				+				// #endif
			
 
				+				this.clearPropagation = true
			
 
				+			},
			
 
				+
			
 
				+			open(direction) {
			
 
				+				// fix by mehaotian 处理快速打开关闭的情况
			
 
				+				if (this.showPopup) {
			
 
				+					return
			
 
				+				}
			
 
				+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
			
 
				+				if (!(direction && innerType.indexOf(direction) !== -1)) {
			
 
				+					direction = this.type
			
 
				+				}
			
 
				+				if (!this.config[direction]) {
			
 
				+					console.error('缺少类型：', direction)
			
 
				+					return
			
 
				+				}
			
 
				+				this[this.config[direction]]()
			
 
				+				this.$emit('change', {
			
 
				+					show: true,
			
 
				+					type: direction
			
 
				+				})
			
 
				+			},
			
 
				+			close(type) {
			
 
				+				this.showTrans = false
			
 
				+				this.$emit('change', {
			
 
				+					show: false,
			
 
				+					type: this.type
			
 
				+				})
			
 
				+				clearTimeout(this.timer)
			
 
				+				// // 自定义关闭事件
			
 
				+				// this.customOpen && this.customClose()
			
 
				+				this.timer = setTimeout(() => {
			
 
				+					this.showPopup = false
			
 
				+				}, 300)
			
 
				+			},
			
 
				+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
			
 
				+			touchstart() {
			
 
				+				this.clearPropagation = false
			
 
				+			},
			
 
				+
			
 
				+			onTap() {
			
 
				+				if (this.clearPropagation) {
			
 
				+					// fix by mehaotian 兼容 nvue
			
 
				+					this.clearPropagation = false
			
 
				+					return
			
 
				+				}
			
 
				+				this.$emit('maskClick')
			
 
				+				if (!this.mkclick) return
			
 
				+				this.close()
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 顶部弹出样式处理
			
 
				+			 */
			
 
				+			top(type) {
			
 
				+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
			
 
				+				this.ani = ['slide-top']
			
 
				+				this.transClass = {
			
 
				+					position: 'fixed',
			
 
				+					left: 0,
			
 
				+					right: 0,
			
 
				+					backgroundColor: this.bg,
			
 
				+					borderRadius:this.borderRadius || "0"
			
 
				+				}
			
 
				+				// TODO 兼容 type 属性 ，后续会废弃
			
 
				+				if (type) return
			
 
				+				this.showPopup = true
			
 
				+				this.showTrans = true
			
 
				+				this.$nextTick(() => {
			
 
				+					if (this.messageChild && this.type === 'message') {
			
 
				+						this.messageChild.timerClose()
			
 
				+					}
			
 
				+				})
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 底部弹出样式处理
			
 
				+			 */
			
 
				+			bottom(type) {
			
 
				+				this.popupstyle = 'bottom'
			
 
				+				this.ani = ['slide-bottom']
			
 
				+				this.transClass = {
			
 
				+					position: 'fixed',
			
 
				+					left: 0,
			
 
				+					right: 0,
			
 
				+					bottom: 0,
			
 
				+					paddingBottom: this.safeAreaInsets + 'px',
			
 
				+					backgroundColor: this.bg,
			
 
				+					borderRadius:this.borderRadius || "0",
			
 
				+				}
			
 
				+				// TODO 兼容 type 属性 ，后续会废弃
			
 
				+				if (type) return
			
 
				+				this.showPopup = true
			
 
				+				this.showTrans = true
			
 
				+			},
			
 
				+			/**
			
 
				+			 * 中间弹出样式处理
			
 
				+			 */
			
 
				+			center(type) {
			
 
				+				this.popupstyle = 'center'
			
 
				+				//微信小程序下，组合动画会出现文字向上闪动问题，再此做特殊处理
			
 
				+				// #ifdef MP-WEIXIN
			
 
				+					this.ani = ['fade']
			
 
				+				// #endif
			
 
				+				// #ifndef MP-WEIXIN
			
 
				+					this.ani = ['zoom-out', 'fade']
			
 
				+				// #endif
			
 
				+				this.transClass = {
			
 
				+					position: 'fixed',
			
 
				+					/* #ifndef APP-NVUE */
			
 
				+					display: 'flex',
			
 
				+					flexDirection: 'column',
			
 
				+					/* #endif */
			
 
				+					bottom: 0,
			
 
				+					left: 0,
			
 
				+					right: 0,
			
 
				+					top: 0,
			
 
				+					justifyContent: 'center',
			
 
				+					alignItems: 'center',
			
 
				+					borderRadius:this.borderRadius || "0"
			
 
				+				}
			
 
				+				// TODO 兼容 type 属性 ，后续会废弃
			
 
				+				if (type) return
			
 
				+				this.showPopup = true
			
 
				+				this.showTrans = true
			
 
				+			},
			
 
				+			left(type) {
			
 
				+				this.popupstyle = 'left'
			
 
				+				this.ani = ['slide-left']
			
 
				+				this.transClass = {
			
 
				+					position: 'fixed',
			
 
				+					left: 0,
			
 
				+					bottom: 0,
			
 
				+					top: 0,
			
 
				+					backgroundColor: this.bg,
			
 
				+					borderRadius:this.borderRadius || "0",
			
 
				+					/* #ifndef APP-NVUE */
			
 
				+					display: 'flex',
			
 
				+					flexDirection: 'column'
			
 
				+					/* #endif */
			
 
				+				}
			
 
				+				// TODO 兼容 type 属性 ，后续会废弃
			
 
				+				if (type) return
			
 
				+				this.showPopup = true
			
 
				+				this.showTrans = true
			
 
				+			},
			
 
				+			right(type) {
			
 
				+				this.popupstyle = 'right'
			
 
				+				this.ani = ['slide-right']
			
 
				+				this.transClass = {
			
 
				+					position: 'fixed',
			
 
				+					bottom: 0,
			
 
				+					right: 0,
			
 
				+					top: 0,
			
 
				+					backgroundColor: this.bg,
			
 
				+					borderRadius:this.borderRadius || "0",
			
 
				+					/* #ifndef APP-NVUE */
			
 
				+					display: 'flex',
			
 
				+					flexDirection: 'column'
			
 
				+					/* #endif */
			
 
				+				}
			
 
				+				// TODO 兼容 type 属性 ，后续会废弃
			
 
				+				if (type) return
			
 
				+				this.showPopup = true
			
 
				+				this.showTrans = true
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+<style lang="scss">
			
 
				+	.uni-popup {
			
 
				+		position: fixed;
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		z-index: 99;
			
 
				+
			
 
				+		/* #endif */
			
 
				+		&.top,
			
 
				+		&.left,
			
 
				+		&.right {
			
 
				+			/* #ifdef H5 */
			
 
				+			top: var(--window-top);
			
 
				+			/* #endif */
			
 
				+			/* #ifndef H5 */
			
 
				+			top: 0;
			
 
				+			/* #endif */
			
 
				+		}
			
 
				+
			
 
				+		.uni-popup__wrapper {
			
 
				+			/* #ifndef APP-NVUE */
			
 
				+			display: block;
			
 
				+			/* #endif */
			
 
				+			position: relative;
			
 
				+
			
 
				+			/* iphonex 等安全区设置，底部安全区适配 */
			
 
				+			/* #ifndef APP-NVUE */
			
 
				+			// padding-bottom: constant(safe-area-inset-bottom);
			
 
				+			// padding-bottom: env(safe-area-inset-bottom);
			
 
				+			/* #endif */
			
 
				+			&.left,
			
 
				+			&.right {
			
 
				+				/* #ifdef H5 */
			
 
				+				padding-top: var(--window-top);
			
 
				+				/* #endif */
			
 
				+				/* #ifndef H5 */
			
 
				+				padding-top: 0;
			
 
				+				/* #endif */
			
 
				+				flex: 1;
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	.fixforpc-z-index {
			
 
				+		/* #ifndef APP-NVUE */
			
 
				+		z-index: 999;
			
 
				+		/* #endif */
			
 
				+	}
			
 
				+
			
 
				+	.fixforpc-top {
			
 
				+		top: 0;
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,88 @@
 
				+{
			
 
				+	"id": "uni-popup",
			
 
				+	"displayName": "uni-popup 弹出层",
			
 
				+	"version": "1.9.1",
			
 
				+	"description": " Popup 组件，提供常用的弹层",
			
 
				+	"keywords": [
			
 
				+        "uni-ui",
			
 
				+        "弹出层",
			
 
				+        "弹窗",
			
 
				+        "popup",
			
 
				+        "弹框"
			
 
				+    ],
			
 
				+	"repository": "https://github.com/dcloudio/uni-ui",
			
 
				+	"engines": {
			
 
				+		"HBuilderX": ""
			
 
				+	},
			
 
				+	"directories": {
			
 
				+		"example": "../../temps/example_temps"
			
 
				+	},
			
 
				+    "dcloudext": {
			
 
				+        "sale": {
			
 
				+			"regular": {
			
 
				+				"price": "0.00"
			
 
				+			},
			
 
				+			"sourcecode": {
			
 
				+				"price": "0.00"
			
 
				+			}
			
 
				+		},
			
 
				+		"contact": {
			
 
				+			"qq": ""
			
 
				+		},
			
 
				+		"declaration": {
			
 
				+			"ads": "无",
			
 
				+			"data": "无",
			
 
				+			"permissions": "无"
			
 
				+		},
			
 
				+        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
			
 
				+        "type": "component-vue"
			
 
				+	},
			
 
				+	"uni_modules": {
			
 
				+		"dependencies": [
			
 
				+			"uni-scss",
			
 
				+			"uni-transition"
			
 
				+		],
			
 
				+		"encrypt": [],
			
 
				+		"platforms": {
			
 
				+			"cloud": {
			
 
				+				"tcb": "y",
			
 
				+                "aliyun": "y",
			
 
				+                "alipay": "n"
			
 
				+			},
			
 
				+			"client": {
			
 
				+				"App": {
			
 
				+					"app-vue": "y",
			
 
				+					"app-nvue": "y"
			
 
				+				},
			
 
				+				"H5-mobile": {
			
 
				+					"Safari": "y",
			
 
				+					"Android Browser": "y",
			
 
				+					"微信浏览器(Android)": "y",
			
 
				+					"QQ浏览器(Android)": "y"
			
 
				+				},
			
 
				+				"H5-pc": {
			
 
				+					"Chrome": "y",
			
 
				+					"IE": "y",
			
 
				+					"Edge": "y",
			
 
				+					"Firefox": "y",
			
 
				+					"Safari": "y"
			
 
				+				},
			
 
				+				"小程序": {
			
 
				+					"微信": "y",
			
 
				+					"阿里": "y",
			
 
				+					"百度": "y",
			
 
				+					"字节跳动": "y",
			
 
				+					"QQ": "y"
			
 
				+				},
			
 
				+				"快应用": {
			
 
				+					"华为": "u",
			
 
				+					"联盟": "u"
			
 
				+                },
			
 
				+                "Vue": {
			
 
				+                    "vue2": "y",
			
 
				+                    "vue3": "y"
			
 
				+                }
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+}
			
--- a/uni_modules/uni-popup/readme.md
+++ b/uni_modules/uni-popup/readme.md
@@ -0,0 +1,17 @@
 
				+
			
 
				+
			
 
				+## Popup 弹出层
			
 
				+> **组件名：uni-popup**
			
 
				+> 代码块： `uPopup`
			
 
				+> 关联组件：`uni-transition`
			
 
				+
			
 
				+
			
 
				+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
			
 
				+
			
 
				+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
			
 
				+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
--- a/uni_modules/uni-scss/changelog.md
+++ b/uni_modules/uni-scss/changelog.md
@@ -0,0 +1,8 @@
 
				+## 1.0.3（2022-01-21）
			
 
				+- 优化 组件示例
			
 
				+## 1.0.2（2021-11-22）
			
 
				+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
			
 
				+## 1.0.1（2021-11-22）
			
 
				+- 修复 vue3中scss语法兼容问题
			
 
				+## 1.0.0（2021-11-18）
			
 
				+- init
			
--- a/uni_modules/uni-scss/index.scss
+++ b/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
 
				+@import './styles/index.scss';
			
--- a/uni_modules/uni-scss/package.json
+++ b/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
 
				+{
			
 
				+  "id": "uni-scss",
			
 
				+  "displayName": "uni-scss 辅助样式",
			
 
				+  "version": "1.0.3",
			
 
				+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
			
 
				+  "keywords": [
			
 
				+    "uni-scss",
			
 
				+    "uni-ui",
			
 
				+    "辅助样式"
			
 
				+],
			
 
				+  "repository": "https://github.com/dcloudio/uni-ui",
			
 
				+  "engines": {
			
 
				+    "HBuilderX": "^3.1.0"
			
 
				+  },
			
 
				+  "dcloudext": {
			
 
				+    "category": [
			
 
				+        "JS SDK",
			
 
				+        "通用 SDK"
			
 
				+    ],
			
 
				+    "sale": {
			
 
				+      "regular": {
			
 
				+        "price": "0.00"
			
 
				+      },
			
 
				+      "sourcecode": {
			
 
				+        "price": "0.00"
			
 
				+      }
			
 
				+    },
			
 
				+    "contact": {
			
 
				+      "qq": ""
			
 
				+    },
			
 
				+    "declaration": {
			
 
				+      "ads": "无",
			
 
				+      "data": "无",
			
 
				+      "permissions": "无"
			
 
				+    },
			
 
				+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
			
 
				+  },
			
 
				+  "uni_modules": {
			
 
				+    "dependencies": [],
			
 
				+    "encrypt": [],
			
 
				+    "platforms": {
			
 
				+      "cloud": {
			
 
				+        "tcb": "y",
			
 
				+        "aliyun": "y"
			
 
				+      },
			
 
				+      "client": {
			
 
				+        "App": {
			
 
				+          "app-vue": "y",
			
 
				+          "app-nvue": "u"
			
 
				+        },
			
 
				+        "H5-mobile": {
			
 
				+          "Safari": "y",
			
 
				+          "Android Browser": "y",
			
 
				+          "微信浏览器(Android)": "y",
			
 
				+          "QQ浏览器(Android)": "y"
			
 
				+        },
			
 
				+        "H5-pc": {
			
 
				+          "Chrome": "y",
			
 
				+          "IE": "y",
			
 
				+          "Edge": "y",
			
 
				+          "Firefox": "y",
			
 
				+          "Safari": "y"
			
 
				+        },
			
 
				+        "小程序": {
			
 
				+          "微信": "y",
			
 
				+          "阿里": "y",
			
 
				+          "百度": "y",
			
 
				+          "字节跳动": "y",
			
 
				+          "QQ": "y"
			
 
				+        },
			
 
				+        "快应用": {
			
 
				+          "华为": "n",
			
 
				+          "联盟": "n"
			
 
				+        },
			
 
				+        "Vue": {
			
 
				+            "vue2": "y",
			
 
				+            "vue3": "y"
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
--- a/uni_modules/uni-scss/readme.md
+++ b/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
 
				+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
			
 
				+
			
 
				+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
			
 
				+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
			
--- a/uni_modules/uni-scss/styles/index.scss
+++ b/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +1,7 @@
 
				+@import './setting/_variables.scss';
			
 
				+@import './setting/_border.scss';
			
 
				+@import './setting/_color.scss';
			
 
				+@import './setting/_space.scss';
			
 
				+@import './setting/_radius.scss';
			
 
				+@import './setting/_text.scss';
			
 
				+@import './setting/_styles.scss';
			
--- a/uni_modules/uni-scss/styles/setting/_border.scss
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
 
				+.uni-border {
			
 
				+	border: 1px $uni-border-1 solid;
			
 
				+}
			
--- a/uni_modules/uni-scss/styles/setting/_color.scss
+++ b/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +1,66 @@
 
				+
			
 
				+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
			
 
				+// @mixin get-styles($k,$c) {
			
 
				+// 	@if $k == size or $k == weight{
			
 
				+// 		font-#{$k}:#{$c}
			
 
				+// 	}@else{
			
 
				+// 		#{$k}:#{$c}
			
 
				+// 	}
			
 
				+// }
			
 
				+$uni-ui-color:(
			
 
				+	// 主色
			
 
				+	primary: $uni-primary,
			
 
				+	primary-disable: $uni-primary-disable,
			
 
				+	primary-light: $uni-primary-light,
			
 
				+	// 辅助色
			
 
				+	success: $uni-success,
			
 
				+	success-disable: $uni-success-disable,
			
 
				+	success-light: $uni-success-light,
			
 
				+	warning: $uni-warning,
			
 
				+	warning-disable: $uni-warning-disable,
			
 
				+	warning-light: $uni-warning-light,
			
 
				+	error: $uni-error,
			
 
				+	error-disable: $uni-error-disable,
			
 
				+	error-light: $uni-error-light,
			
 
				+	info: $uni-info,
			
 
				+	info-disable: $uni-info-disable,
			
 
				+	info-light: $uni-info-light,
			
 
				+	// 中性色
			
 
				+	main-color: $uni-main-color,
			
 
				+	base-color: $uni-base-color,
			
 
				+	secondary-color: $uni-secondary-color,
			
 
				+	extra-color: $uni-extra-color,
			
 
				+	// 背景色
			
 
				+	bg-color: $uni-bg-color,
			
 
				+	// 边框颜色
			
 
				+	border-1: $uni-border-1,
			
 
				+	border-2: $uni-border-2,
			
 
				+	border-3: $uni-border-3,
			
 
				+	border-4: $uni-border-4,
			
 
				+	// 黑色
			
 
				+	black:$uni-black,
			
 
				+	// 白色
			
 
				+	white:$uni-white,
			
 
				+	// 透明
			
 
				+	transparent:$uni-transparent
			
 
				+) !default;
			
 
				+@each $key, $child in $uni-ui-color {
			
 
				+	.uni-#{"" + $key} {
			
 
				+		color: $child;
			
 
				+	}
			
 
				+	.uni-#{"" + $key}-bg {
			
 
				+		background-color: $child;
			
 
				+	}
			
 
				+}
			
 
				+.uni-shadow-sm {
			
 
				+	box-shadow: $uni-shadow-sm;
			
 
				+}
			
 
				+.uni-shadow-base {
			
 
				+	box-shadow: $uni-shadow-base;
			
 
				+}
			
 
				+.uni-shadow-lg {
			
 
				+	box-shadow: $uni-shadow-lg;
			
 
				+}
			
 
				+.uni-mask {
			
 
				+	background-color:$uni-mask;
			
 
				+}
			
--- a/uni_modules/uni-scss/styles/setting/_radius.scss
+++ b/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +1,55 @@
 
				+@mixin radius($r,$d:null ,$important: false){
			
 
				+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
			
 
				+  // Key exists within the $uni-radius variable
			
 
				+  @if (map-has-key($uni-radius, $r) and  $d){
			
 
				+		@if $d == t {
			
 
				+				border-top-left-radius:$radius-value;
			
 
				+				border-top-right-radius:$radius-value;
			
 
				+		}@else if $d == r {
			
 
				+				border-top-right-radius:$radius-value;
			
 
				+				border-bottom-right-radius:$radius-value;
			
 
				+		}@else if $d == b {
			
 
				+				border-bottom-left-radius:$radius-value;
			
 
				+				border-bottom-right-radius:$radius-value;
			
 
				+		}@else if $d == l {
			
 
				+				border-top-left-radius:$radius-value;
			
 
				+				border-bottom-left-radius:$radius-value;
			
 
				+		}@else if $d == tl {
			
 
				+				border-top-left-radius:$radius-value;
			
 
				+		}@else if $d == tr {
			
 
				+				border-top-right-radius:$radius-value;
			
 
				+		}@else if $d == br {
			
 
				+				border-bottom-right-radius:$radius-value;
			
 
				+		}@else if $d == bl {
			
 
				+				border-bottom-left-radius:$radius-value;
			
 
				+		}
			
 
				+  }@else{
			
 
				+		border-radius:$radius-value;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+@each $key, $child in $uni-radius {
			
 
				+	@if($key){
			
 
				+		.uni-radius-#{"" + $key} {
			
 
				+				@include radius($key)
			
 
				+		}
			
 
				+	}@else{
			
 
				+		.uni-radius {
			
 
				+				@include radius($key)
			
 
				+		}
			
 
				+	}
			
 
				+}
			
 
				+
			
 
				+@each $direction in t, r, b, l,tl, tr, br, bl {
			
 
				+	@each $key, $child in $uni-radius {
			
 
				+		@if($key){
			
 
				+			.uni-radius-#{"" + $direction}-#{"" + $key} {
			
 
				+				@include radius($key,$direction,false)
			
 
				+			}
			
 
				+		}@else{
			
 
				+			.uni-radius-#{$direction} {
			
 
				+				@include radius($key,$direction,false)
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+}
			
--- a/uni_modules/uni-scss/styles/setting/_space.scss
+++ b/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +1,56 @@
 
				+
			
 
				+@mixin fn($space,$direction,$size,$n) {
			
 
				+	@if $n {
			
 
				+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
			
 
				+	} @else {
			
 
				+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
			
 
				+	}
			
 
				+}
			
 
				+@mixin get-styles($direction,$i,$space,$n){
			
 
				+	@if $direction == t {
			
 
				+		@include fn($space, top,$i,$n);
			
 
				+	} 
			
 
				+	@if $direction == r {
			
 
				+		@include fn($space, right,$i,$n);
			
 
				+	} 
			
 
				+	@if $direction == b {
			
 
				+		@include fn($space, bottom,$i,$n);
			
 
				+	} 
			
 
				+	@if $direction == l {
			
 
				+	 @include fn($space, left,$i,$n);
			
 
				+	} 
			
 
				+	@if $direction == x {
			
 
				+		@include fn($space, left,$i,$n);
			
 
				+		@include fn($space, right,$i,$n);
			
 
				+	} 
			
 
				+	@if $direction == y {
			
 
				+		@include fn($space, top,$i,$n);
			
 
				+		@include fn($space, bottom,$i,$n);
			
 
				+	} 
			
 
				+	@if $direction == a {
			
 
				+		@if $n {
			
 
				+			#{$space}:#{$i*$uni-space-root}px;
			
 
				+		} @else {
			
 
				+			#{$space}:#{-$i*$uni-space-root}px;
			
 
				+		}
			
 
				+	} 
			
 
				+}
			
 
				+
			
 
				+@each $orientation in m,p {
			
 
				+	$space: margin;
			
 
				+	@if $orientation == m {
			
 
				+		$space: margin;
			
 
				+	} @else {
			
 
				+		$space: padding;
			
 
				+	}
			
 
				+	@for $i from 0 through 16 {
			
 
				+		@each $direction in t, r, b, l, x, y, a {
			
 
				+			.uni-#{$orientation}#{$direction}-#{$i} { 
			
 
				+				@include  get-styles($direction,$i,$space,true);
			
 
				+			} 
			
 
				+			.uni-#{$orientation}#{$direction}-n#{$i} { 
			
 
				+				@include  get-styles($direction,$i,$space,false);
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+}
			
--- a/uni_modules/uni-scss/styles/setting/_styles.scss
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +1,167 @@
 
				+/* #ifndef APP-NVUE */
			
 
				+
			
 
				+$-color-white:#fff;
			
 
				+$-color-black:#000;
			
 
				+@mixin base-style($color) {
			
 
				+	color: #fff;
			
 
				+	background-color: $color;
			
 
				+	border-color: mix($-color-black, $color, 8%);
			
 
				+	&:not([hover-class]):active {
			
 
				+		background: mix($-color-black, $color, 10%);
			
 
				+		border-color: mix($-color-black, $color, 20%);
			
 
				+		color: $-color-white;
			
 
				+		outline: none;
			
 
				+	}
			
 
				+}
			
 
				+@mixin is-color($color) {
			
 
				+	@include base-style($color);
			
 
				+	&[loading] {
			
 
				+		@include base-style($color);
			
 
				+		&::before {
			
 
				+			margin-right:5px;
			
 
				+		}
			
 
				+	}
			
 
				+	&[disabled] {
			
 
				+	  &,
			
 
				+		&[loading],
			
 
				+	  &:not([hover-class]):active {
			
 
				+	    color: $-color-white;
			
 
				+			border-color: mix(darken($color,10%), $-color-white);
			
 
				+	    background-color: mix($color, $-color-white);
			
 
				+	  }
			
 
				+	}
			
 
				+
			
 
				+}
			
 
				+@mixin base-plain-style($color) {
			
 
				+	color:$color;
			
 
				+	background-color: mix($-color-white, $color, 90%);
			
 
				+	border-color: mix($-color-white, $color, 70%);
			
 
				+	&:not([hover-class]):active {
			
 
				+	  background: mix($-color-white, $color, 80%);
			
 
				+	  color: $color;
			
 
				+	  outline: none;
			
 
				+		border-color: mix($-color-white, $color, 50%);
			
 
				+	}
			
 
				+}
			
 
				+@mixin is-plain($color){
			
 
				+	&[plain] {
			
 
				+		@include base-plain-style($color);
			
 
				+		&[loading] {
			
 
				+			@include base-plain-style($color);
			
 
				+			&::before {
			
 
				+				margin-right:5px;
			
 
				+			}
			
 
				+		}
			
 
				+		&[disabled] {
			
 
				+		  &,
			
 
				+		  &:active {
			
 
				+		    color: mix($-color-white, $color, 40%);
			
 
				+		    background-color: mix($-color-white, $color, 90%);
			
 
				+				border-color: mix($-color-white, $color, 80%);
			
 
				+		  }
			
 
				+		}
			
 
				+	}
			
 
				+}
			
 
				+
			
 
				+
			
 
				+.uni-btn {
			
 
				+	margin: 5px;
			
 
				+	color: #393939;
			
 
				+	border:1px solid #ccc;
			
 
				+	font-size: 16px;
			
 
				+	font-weight: 200;
			
 
				+	background-color: #F9F9F9;
			
 
				+	// TODO 暂时处理边框隐藏一边的问题
			
 
				+	overflow: visible;
			
 
				+	&::after{
			
 
				+		border: none;
			
 
				+	}
			
 
				+
			
 
				+	&:not([type]),&[type=default] {
			
 
				+		color: #999;
			
 
				+		&[loading] {
			
 
				+			background: none;
			
 
				+			&::before {
			
 
				+				margin-right:5px;
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+
			
 
				+
			
 
				+		&[disabled]{
			
 
				+			color: mix($-color-white, #999, 60%);
			
 
				+		  &,
			
 
				+			&[loading],
			
 
				+		  &:active {
			
 
				+				color: mix($-color-white, #999, 60%);
			
 
				+		    background-color: mix($-color-white,$-color-black , 98%);
			
 
				+				border-color: mix($-color-white,  #999, 85%);
			
 
				+		  }
			
 
				+		}
			
 
				+
			
 
				+		&[plain] {
			
 
				+			color: #999;
			
 
				+			background: none;
			
 
				+			border-color: $uni-border-1;
			
 
				+			&:not([hover-class]):active {
			
 
				+				background: none;
			
 
				+			  color: mix($-color-white, $-color-black, 80%);
			
 
				+				border-color: mix($-color-white, $-color-black, 90%);
			
 
				+			  outline: none;
			
 
				+			}
			
 
				+			&[disabled]{
			
 
				+			  &,
			
 
				+				&[loading],
			
 
				+			  &:active {
			
 
				+			    background: none;
			
 
				+					color: mix($-color-white, #999, 60%);
			
 
				+					border-color: mix($-color-white,  #999, 85%);
			
 
				+			  }
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+	&:not([hover-class]):active {
			
 
				+	  color: mix($-color-white, $-color-black, 50%);
			
 
				+	}
			
 
				+
			
 
				+	&[size=mini] {
			
 
				+		font-size: 16px;
			
 
				+		font-weight: 200;
			
 
				+		border-radius: 8px;
			
 
				+	}
			
 
				+
			
 
				+
			
 
				+
			
 
				+	&.uni-btn-small {
			
 
				+		font-size: 14px;
			
 
				+	}
			
 
				+	&.uni-btn-mini {
			
 
				+		font-size: 12px;
			
 
				+	}
			
 
				+
			
 
				+	&.uni-btn-radius {
			
 
				+		border-radius: 999px;
			
 
				+	}
			
 
				+	&[type=primary] {
			
 
				+		@include is-color($uni-primary);
			
 
				+		@include is-plain($uni-primary)
			
 
				+	}
			
 
				+	&[type=success] {
			
 
				+		@include is-color($uni-success);
			
 
				+		@include is-plain($uni-success)
			
 
				+	}
			
 
				+	&[type=error] {
			
 
				+		@include is-color($uni-error);
			
 
				+		@include is-plain($uni-error)
			
 
				+	}
			
 
				+	&[type=warning] {
			
 
				+		@include is-color($uni-warning);
			
 
				+		@include is-plain($uni-warning)
			
 
				+	}
			
 
				+	&[type=info] {
			
 
				+		@include is-color($uni-info);
			
 
				+		@include is-plain($uni-info)
			
 
				+	}
			
 
				+}
			
 
				+/* #endif */
			
--- a/uni_modules/uni-scss/styles/setting/_text.scss
+++ b/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +1,24 @@
 
				+@mixin get-styles($k,$c) {
			
 
				+	@if $k == size or $k == weight{
			
 
				+		font-#{$k}:#{$c}
			
 
				+	}@else{
			
 
				+		#{$k}:#{$c}
			
 
				+	}
			
 
				+}
			
 
				+
			
 
				+@each $key, $child in $uni-headings {
			
 
				+	/* #ifndef APP-NVUE */
			
 
				+	.uni-#{$key} {
			
 
				+		@each $k, $c in $child {
			
 
				+			@include get-styles($k,$c)
			
 
				+		}
			
 
				+	}
			
 
				+	/* #endif */
			
 
				+	/* #ifdef APP-NVUE */
			
 
				+	.container .uni-#{$key} {
			
 
				+		@each $k, $c in $child {
			
 
				+			@include get-styles($k,$c)
			
 
				+		}
			
 
				+	}
			
 
				+	/* #endif */
			
 
				+}
			
--- a/uni_modules/uni-scss/styles/setting/_variables.scss
+++ b/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
 
				+// @use "sass:math";
			
 
				+@import  '../tools/functions.scss';
			
 
				+// 间距基础倍数
			
 
				+$uni-space-root: 2 !default;
			
 
				+// 边框半径默认值
			
 
				+$uni-radius-root:5px !default;
			
 
				+$uni-radius: () !default;
			
 
				+// 边框半径断点
			
 
				+$uni-radius: map-deep-merge(
			
 
				+  (
			
 
				+    0: 0,
			
 
				+		// TODO 当前版本暂时不支持 sm 属性
			
 
				+    // 'sm': math.div($uni-radius-root, 2),
			
 
				+    null: $uni-radius-root,
			
 
				+    'lg': $uni-radius-root * 2,
			
 
				+    'xl': $uni-radius-root * 6,
			
 
				+    'pill': 9999px,
			
 
				+    'circle': 50%
			
 
				+  ),
			
 
				+  $uni-radius
			
 
				+);
			
 
				+// 字体家族
			
 
				+$body-font-family: 'Roboto', sans-serif !default;
			
 
				+// 文本
			
 
				+$heading-font-family: $body-font-family !default;
			
 
				+$uni-headings: () !default;
			
 
				+$letterSpacing: -0.01562em;
			
 
				+$uni-headings: map-deep-merge(
			
 
				+  (
			
 
				+    'h1': (
			
 
				+      size: 32px,
			
 
				+			weight: 300,
			
 
				+			line-height: 50px,
			
 
				+			// letter-spacing:-0.01562em
			
 
				+    ),
			
 
				+    'h2': (
			
 
				+      size: 28px,
			
 
				+      weight: 300,
			
 
				+      line-height: 40px,
			
 
				+      // letter-spacing: -0.00833em
			
 
				+    ),
			
 
				+    'h3': (
			
 
				+      size: 24px,
			
 
				+      weight: 400,
			
 
				+      line-height: 32px,
			
 
				+      // letter-spacing: normal
			
 
				+    ),
			
 
				+    'h4': (
			
 
				+      size: 20px,
			
 
				+      weight: 400,
			
 
				+      line-height: 30px,
			
 
				+      // letter-spacing: 0.00735em
			
 
				+    ),
			
 
				+    'h5': (
			
 
				+      size: 16px,
			
 
				+      weight: 400,
			
 
				+      line-height: 24px,
			
 
				+      // letter-spacing: normal
			
 
				+    ),
			
 
				+    'h6': (
			
 
				+      size: 14px,
			
 
				+      weight: 500,
			
 
				+      line-height: 18px,
			
 
				+      // letter-spacing: 0.0125em
			
 
				+    ),
			
 
				+    'subtitle': (
			
 
				+      size: 12px,
			
 
				+      weight: 400,
			
 
				+      line-height: 20px,
			
 
				+      // letter-spacing: 0.00937em
			
 
				+    ),
			
 
				+    'body': (
			
 
				+      font-size: 14px,
			
 
				+			font-weight: 400,
			
 
				+			line-height: 22px,
			
 
				+			// letter-spacing: 0.03125em
			
 
				+    ),
			
 
				+    'caption': (
			
 
				+      'size': 12px,
			
 
				+      'weight': 400,
			
 
				+      'line-height': 20px,
			
 
				+      // 'letter-spacing': 0.03333em,
			
 
				+      // 'text-transform': false
			
 
				+    )
			
 
				+  ),
			
 
				+  $uni-headings
			
 
				+);
			
 
				+
			
 
				+
			
 
				+
			
 
				+// 主色
			
 
				+$uni-primary: #2979ff !default;
			
 
				+$uni-primary-disable:lighten($uni-primary,20%) !default;
			
 
				+$uni-primary-light: lighten($uni-primary,25%) !default;
			
 
				+
			
 
				+// 辅助色
			
 
				+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
			
 
				+$uni-success: #18bc37 !default;
			
 
				+$uni-success-disable:lighten($uni-success,20%) !default;
			
 
				+$uni-success-light: lighten($uni-success,25%) !default;
			
 
				+
			
 
				+$uni-warning: #f3a73f !default;
			
 
				+$uni-warning-disable:lighten($uni-warning,20%) !default;
			
 
				+$uni-warning-light: lighten($uni-warning,25%) !default;
			
 
				+
			
 
				+$uni-error: #e43d33 !default;
			
 
				+$uni-error-disable:lighten($uni-error,20%) !default;
			
 
				+$uni-error-light: lighten($uni-error,25%) !default;
			
 
				+
			
 
				+$uni-info: #8f939c !default;
			
 
				+$uni-info-disable:lighten($uni-info,20%) !default;
			
 
				+$uni-info-light: lighten($uni-info,25%) !default;
			
 
				+
			
 
				+// 中性色
			
 
				+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
			
 
				+$uni-main-color: #3a3a3a !default; 			// 主要文字
			
 
				+$uni-base-color: #6a6a6a !default;			// 常规文字
			
 
				+$uni-secondary-color: #909399 !default;	// 次要文字
			
 
				+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
			
 
				+
			
 
				+// 边框颜色
			
 
				+$uni-border-1: #F0F0F0 !default;
			
 
				+$uni-border-2: #EDEDED !default;
			
 
				+$uni-border-3: #DCDCDC !default;
			
 
				+$uni-border-4: #B9B9B9 !default;
			
 
				+
			
 
				+// 常规色
			
 
				+$uni-black: #000000 !default;
			
 
				+$uni-white: #ffffff !default;
			
 
				+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
			
 
				+
			
 
				+// 背景色
			
 
				+$uni-bg-color: #f7f7f7 !default;
			
 
				+
			
 
				+/* 水平间距 */
			
 
				+$uni-spacing-sm: 8px !default;
			
 
				+$uni-spacing-base: 15px !default;
			
 
				+$uni-spacing-lg: 30px !default;
			
 
				+
			
 
				+// 阴影
			
 
				+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
			
 
				+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
			
 
				+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
			
 
				+
			
 
				+// 蒙版
			
 
				+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
			
--- a/uni_modules/uni-scss/styles/tools/functions.scss
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +1,19 @@
 
				+// 合并 map
			
 
				+@function map-deep-merge($parent-map, $child-map){
			
 
				+	$result: $parent-map;
			
 
				+	@each $key, $child in $child-map {
			
 
				+		$parent-has-key: map-has-key($result, $key);
			
 
				+		$parent-value: map-get($result, $key);
			
 
				+		$parent-type: type-of($parent-value);
			
 
				+		$child-type: type-of($child);
			
 
				+		$parent-is-map: $parent-type == map;
			
 
				+		$child-is-map: $child-type == map;
			
 
				+			
			
 
				+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
			
 
				+			$result: map-merge($result, ( $key: $child ));
			
 
				+		}@else {
			
 
				+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
			
 
				+		}
			
 
				+	}
			
 
				+	@return $result;
			
 
				+};
			
--- a/uni_modules/uni-scss/theme.scss
+++ b/uni_modules/uni-scss/theme.scss
@@ -0,0 +1,31 @@
 
				+// 间距基础倍数
			
 
				+$uni-space-root: 2;
			
 
				+// 边框半径默认值
			
 
				+$uni-radius-root:5px;
			
 
				+// 主色
			
 
				+$uni-primary: #2979ff;
			
 
				+// 辅助色
			
 
				+$uni-success: #4cd964;
			
 
				+// 警告色
			
 
				+$uni-warning: #f0ad4e;
			
 
				+// 错误色
			
 
				+$uni-error: #dd524d;
			
 
				+// 描述色
			
 
				+$uni-info: #909399;
			
 
				+// 中性色
			
 
				+$uni-main-color: #303133;
			
 
				+$uni-base-color: #606266;
			
 
				+$uni-secondary-color: #909399;
			
 
				+$uni-extra-color: #C0C4CC;
			
 
				+// 背景色
			
 
				+$uni-bg-color: #f5f5f5;
			
 
				+// 边框颜色
			
 
				+$uni-border-1: #DCDFE6;
			
 
				+$uni-border-2: #E4E7ED;
			
 
				+$uni-border-3: #EBEEF5;
			
 
				+$uni-border-4: #F2F6FC;
			
 
				+
			
 
				+// 常规色
			
 
				+$uni-black: #000000;
			
 
				+$uni-white: #ffffff;
			
 
				+$uni-transparent: rgba($color: #000000, $alpha: 0);
			
--- a/uni_modules/uni-scss/variables.scss
+++ b/uni_modules/uni-scss/variables.scss
@@ -0,0 +1,62 @@
 
				+@import './styles/setting/_variables.scss';
			
 
				+// 间距基础倍数
			
 
				+$uni-space-root: 2;
			
 
				+// 边框半径默认值
			
 
				+$uni-radius-root:5px;
			
 
				+
			
 
				+// 主色
			
 
				+$uni-primary: #2979ff;
			
 
				+$uni-primary-disable:mix(#fff,$uni-primary,50%);
			
 
				+$uni-primary-light: mix(#fff,$uni-primary,80%);
			
 
				+
			
 
				+// 辅助色
			
 
				+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
			
 
				+$uni-success: #18bc37;
			
 
				+$uni-success-disable:mix(#fff,$uni-success,50%);
			
 
				+$uni-success-light: mix(#fff,$uni-success,80%);
			
 
				+
			
 
				+$uni-warning: #f3a73f;
			
 
				+$uni-warning-disable:mix(#fff,$uni-warning,50%);
			
 
				+$uni-warning-light: mix(#fff,$uni-warning,80%);
			
 
				+
			
 
				+$uni-error: #e43d33;
			
 
				+$uni-error-disable:mix(#fff,$uni-error,50%);
			
 
				+$uni-error-light: mix(#fff,$uni-error,80%);
			
 
				+
			
 
				+$uni-info: #8f939c;
			
 
				+$uni-info-disable:mix(#fff,$uni-info,50%);
			
 
				+$uni-info-light: mix(#fff,$uni-info,80%);
			
 
				+
			
 
				+// 中性色
			
 
				+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
			
 
				+$uni-main-color: #3a3a3a; 			// 主要文字
			
 
				+$uni-base-color: #6a6a6a;			// 常规文字
			
 
				+$uni-secondary-color: #909399;	// 次要文字
			
 
				+$uni-extra-color: #c7c7c7;			// 辅助说明
			
 
				+
			
 
				+// 边框颜色
			
 
				+$uni-border-1: #F0F0F0;
			
 
				+$uni-border-2: #EDEDED;
			
 
				+$uni-border-3: #DCDCDC;
			
 
				+$uni-border-4: #B9B9B9;
			
 
				+
			
 
				+// 常规色
			
 
				+$uni-black: #000000;
			
 
				+$uni-white: #ffffff;
			
 
				+$uni-transparent: rgba($color: #000000, $alpha: 0);
			
 
				+
			
 
				+// 背景色
			
 
				+$uni-bg-color: #f7f7f7;
			
 
				+
			
 
				+/* 水平间距 */
			
 
				+$uni-spacing-sm: 8px;
			
 
				+$uni-spacing-base: 15px;
			
 
				+$uni-spacing-lg: 30px;
			
 
				+
			
 
				+// 阴影
			
 
				+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
			
 
				+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
			
 
				+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
			
 
				+
			
 
				+// 蒙版
			
 
				+$uni-mask: rgba($color: #000000, $alpha: 0.4);
			
--- a/uni_modules/uni-transition/changelog.md
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,24 @@
 
				+## 1.3.3（2024-04-23）
			
 
				+- 修复 当元素会受变量影响自动隐藏的bug
			
 
				+## 1.3.2（2023-05-04）
			
 
				+- 修复 NVUE 平台报错的问题
			
 
				+## 1.3.1（2021-11-23）
			
 
				+- 修复 init 方法初始化问题
			
 
				+## 1.3.0（2021-11-19）
			
 
				+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
			
 
				+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
			
 
				+## 1.2.1（2021-09-27）
			
 
				+- 修复 init 方法不生效的 Bug
			
 
				+## 1.2.0（2021-07-30）
			
 
				+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
			
 
				+## 1.1.1（2021-05-12）
			
 
				+- 新增 示例地址
			
 
				+- 修复 示例项目缺少组件的 Bug
			
 
				+## 1.1.0（2021-04-22）
			
 
				+- 新增 通过方法自定义动画
			
 
				+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
			
 
				+- 优化 动画触发逻辑，使动画更流畅
			
 
				+- 优化 支持单独的动画类型
			
 
				+- 优化 文档示例
			
 
				+## 1.0.2（2021-02-05）
			
 
				+- 调整为 uni_modules 目录规范