diff --git a/components/uni-agree/uni-agree.vue b/components/uni-agree/uni-agree.vue
new file mode 100644
index 0000000000000000000000000000000000000000..71890ff1d3e79b72e043b25ddac132bd99728393
--- /dev/null
+++ b/components/uni-agree/uni-agree.vue
@@ -0,0 +1,34 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :maskClick="false" type="center">
+			<uni-popup-agree @cancel="cancel" @confirm="confirm"></uni-popup-agree>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"uni-agree",
+		mounted() {
+			if (uni.getSystemInfoSync().platform == "android") {
+				let iKnowAgree = uni.getStorageSync('iKnowAgree') || false;
+				if(!iKnowAgree){
+					this.$refs.popup.open();
+				}
+			}
+		},
+		methods:{
+			confirm(){
+				this.$refs.popup.close();
+				uni.setStorageSync('iKnowAgree', true);
+			},
+			cancel(){
+				plus.runtime.quit();
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/components/uni-popup-agree/uni-popup-agree.vue b/components/uni-popup-agree/uni-popup-agree.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f8cd7b10d201d35f6aafe1ea245d7ac62866bf20
--- /dev/null
+++ b/components/uni-popup-agree/uni-popup-agree.vue
@@ -0,0 +1,212 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{title}}</text>
+		</view>
+		<view class="uni-dialog-content">
+			<login-ikonw class="login-iknow" :link="link" :text="content"></login-ikonw>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" @click="close">
+				<text class="uni-dialog-button-text">不同意</text>
+			</view>
+			<view class="uni-dialog-button uni-border-left" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">同意</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+
+	export default {
+		name: "uniPopupAgree",
+		props: {
+			/**
+			 * 对话框主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'error'
+			},
+			/**
+			 * 对话框标题
+			 */
+			title: {
+				type: String,
+				default: '使用须知'
+			},
+			/**
+			 * 对话框内容
+			 */
+			content: {
+				type: String,
+				default: 'DCloud（以下简称我们）尊重并保护所有使用服务用户的个人权益。为了给您提供更准确、更有个性化的服务，我们会按照本隐私政策和服务协议的规定使用和披露您的个人信息。但我们将以高度的勤勉、审慎义务对待这些信息。除本隐私政策和服务协议另有规定外，在未征得您事先许可的情况下，我们不会将这些信息对外披露或向第三方提供。'
+			},
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				val: "",
+				link: [{
+					text: '服务协议',
+					to: '/pages/ucenter/agree-list/service/service'
+				}, {
+					text: '隐私政策',
+					to: '/pages/ucenter/agree-list/privacy/privacy'
+				}],
+			}
+		},
+		watch: {
+			type(val) {
+				this.dialogType = val
+			}
+		},
+		created() {
+			this.dialogType = this.type
+		},
+		methods: {
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				this.$emit('confirm');
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			close() {
+				this.$emit('cancel');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 5px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 15px;
+		padding-bottom: 5px;
+	}
+
+	.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: 5px 15px 15px 15px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6e6e6e;
+	}
+
+	.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;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 14px;
+	}
+
+	.uni-button-color {
+		color: $uni-color-primary;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+	}
+
+	.uni-popup__success {
+		color: $uni-color-success;
+	}
+
+	.uni-popup__warn {
+		color: $uni-color-warning;
+	}
+
+	.uni-popup__error {
+		color: $uni-color-error;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+
+	.uni-popup-dialog__close {
+		/* #ifndef APP-NVUE */
+		display: block;
+		cursor: pointer;
+		/* #endif */
+		position: absolute;
+		top: 9px;
+		right: 17px;
+	}
+
+	.uni-popup-dialog__close-icon {
+		/* #ifndef APP-NVUE */
+		display: inline-block;
+		/* #endif */
+		width: 13px;
+		height: 1px;
+		background: #909399;
+		transform: rotate(45deg);
+	}
+
+	.uni-popup-dialog__close-icon::after {
+		/* #ifndef APP-NVUE */
+		content: '';
+		display: block;
+		/* #endif */
+		width: 13px;
+		height: 1px;
+		background: #909399;
+		transform: rotate(-90deg);
+	}
+</style>
diff --git a/pages.json b/pages.json
index 48609cb9bc6d3d7b45b9d4a48dd834f6dda1ec1f..e839f5c9604c8a64fc4b5f7cee4c31dbbda50e76 100644
--- a/pages.json
+++ b/pages.json
@@ -19,12 +19,12 @@
 			}
 		}, {
 			"path": "uni_modules/uni-login-page/pages/index/index",
-			"style": {
+			"style": {
 				"navigationBarTitleText": "",
 				"app-plus": {
 					"animationType": "none",
-					"popGesture": "none",
-					"navigationStyle": "custom",
+					"popGesture": "none",
+					"navigationStyle": "custom",
 					"backgroundColor": "transparent"
 					// "titleNView": {
 					// 	"buttons": [{
@@ -67,17 +67,17 @@
 				"navigationStyle": "custom"
 			}
 		}, {
-			"path": "uni_modules/opendb-feedback/pages/opendb-feedback/list",
+			"path": "uni_modules/uni-feedback/pages/opendb-feedback/list",
 			"style": {
 				"navigationBarTitleText": "常见问题"
 			}
 		}, {
-			"path": "uni_modules/opendb-feedback/pages/opendb-feedback/add",
+			"path": "uni_modules/uni-feedback/pages/opendb-feedback/add",
 			"style": {
 				"navigationBarTitleText": "问题反馈"
 			}
 		}, {
-			"path": "uni_modules/opendb-feedback/pages/opendb-feedback/detail",
+			"path": "uni_modules/uni-feedback/pages/opendb-feedback/detail",
 			"style": {
 				"navigationBarTitleText": "问题反馈"
 			}
@@ -127,7 +127,8 @@
 			}
 
 		}, {
-			"path": "pages/ucenter/edit/edit",
+			"path": "uni_modules/uni-id-users/pages/uni-id-users/edit",
+			// "path": "pages/ucenter/edit/edit",
 			"style": {
 				"navigationBarTitleText": "编辑资料"
 			}
@@ -137,49 +138,19 @@
 				"navigationStyle": "custom"
 			}
 		}, {
-			"path": "uni_modules/uni-login-page/pages/index/pwd-login",
+			"path": "uni_modules/uni-login-page/pages/pwd-login/pwd-login",
 			"style": {
-				"navigationBarTitleText": "",
-				"app-plus": {
-					// "titleNView": {
-					// 	"buttons": [{
-					// 		"text": "帮助",
-					// 		"type": "none",
-					// 		"fontSize": "16px",
-					// 		"width": "60px"
-					// 	}]
-					// }
-				}
+				"navigationBarTitleText": ""
 			}
 		}, {
-			"path": "uni_modules/uni-login-page/pages/index/pwd-retrieve",
+			"path": "uni_modules/uni-login-page/pages/pwd-retrieve/pwd-retrieve",
 			"style": {
-				"navigationBarTitleText": "",
-				"app-plus": {
-					// "titleNView": {
-					// 	"buttons": [{
-					// 		"text": "帮助",
-					// 		"type": "none",
-					// 		"fontSize": "16px",
-					// 		"width": "60px"
-					// 	}]
-					// }
-				}
+				"navigationBarTitleText": ""
 			}
 		}, {
-			"path": "uni_modules/uni-login-page/pages/index/phone-code",
+			"path": "uni_modules/uni-login-page/pages/phone-code/phone-code",
 			"style": {
-				"navigationBarTitleText": "",
-				"app-plus": {
-					// "titleNView": {
-					// 	"buttons": [{
-					// 		"text": "帮助",
-					// 		"type": "none",
-					// 		"fontSize": "16px",
-					// 		"width": "60px"
-					// 	}]
-					// }
-				}
+				"navigationBarTitleText": ""
 			}
 
 		}, {
@@ -190,24 +161,24 @@
 			}
 
 		}
-	    ,{
-	        "path" : "pages/test/test",
-	        "style" :                                                                                    
-	        {
-	            "navigationBarTitleText": "",
-	            "enablePullDownRefresh": false
-	        }
-	        
-	    }
-		,{
-		    "path" : "pages/common/webview/webview",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
+	    ,{
+	        "path" : "pages/test/test",
+	        "style" :                                                                                    
+	        {
+	            "navigationBarTitleText": "",
+	            "enablePullDownRefresh": false
+	        }
+	        
+	    }
+		,{
+		    "path" : "pages/common/webview/webview",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -215,6 +186,7 @@
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#F8F8F8"
 	},
+<<<<<<< HEAD
 	// "condition": {
 	// 	"list": [
 	// 		{
@@ -229,6 +201,22 @@
 	// 	],
 	// 	"current":1
 	// },
+=======
+	"condition": {
+		"list": [
+			{
+				"path": "uni_modules/uni-login-page/pages/index/index"
+			},
+			{
+				"path": "pages/test/test"
+			},
+			{
+				"path":"pages/ucenter/settings/settings"
+			}
+		],
+		"current":2
+	},
+>>>>>>> 82ef1c53dc0aebef37985e23752a43c7aab5b82e
 	"tabBar": {
 		"color": "#7A7E83",
 		"selectedColor": "#007AFF",
@@ -251,4 +239,4 @@
 			"text": "我的"
 		}]
 	}
-}
+}
diff --git a/pages/list/detail.vue b/pages/list/detail.vue
index a42a29e1e450db4143b096616eabdd8c4dd02581..1b77d90bc69fe58f0772088c8e71c6ee5c2ea039 100644
--- a/pages/list/detail.vue
+++ b/pages/list/detail.vue
@@ -7,6 +7,7 @@
 	 DB Schema 规范：https://uniapp.dcloud.net.cn/uniCloud/schema
 	 -->
 	<view class="article">
+		<uni-nav-bar :statusBar="true" :border="false"></uni-nav-bar>
 		<unicloud-db v-slot:default="{data, loading, error, options}" :options="formData" :collection="collection" :field="field"
 		 :getone="true" :where="where" :manual="true" ref="detail" foreignKey="opendb-news-articles.author" @load="loadData">
 			<template v-if="!loading && data">
diff --git a/pages/list/list.vue b/pages/list/list.vue
index b5e12ab80c9b95af67d0f8bec120d7d174f1a2a6..6c6cd7218eb65d45c9ade20b3269fc79638382a9 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -1,7 +1,9 @@
 <template>
 	<view style="overflow: hidden;">
 		<!-- 页面主列表 -->
-		<news-list ref="newsList" :canSearch="canSearch" :currentText="searchText"></news-list>
+		<news-list ref="newsList" :canSearch="canSearch" :currentText="searchText"></news-list>
+		
+		<uni-agree></uni-agree>
 	</view>
 </template>
 
diff --git a/pages/ucenter/edit/edit.vue b/pages/ucenter/edit/edit.vue
deleted file mode 100644
index e54d416f66ae31f06b2191f362a332b6e842884a..0000000000000000000000000000000000000000
--- a/pages/ucenter/edit/edit.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-	<view class="content">
-		<uni-list>
-			<uni-list-item>
-				<template v-slot:body>
-					<view class="avatar-box">
-						<image class="avatar-img" :src="(userInfo && userInfo.avatar) || '/static/uni-center/logo.png'" @click="chooseImg" mode="aspectFill"></image>
-					</view>
-				</template>
-			</uni-list-item>
-			<uni-list-item title="姓名" :right-text="userInfo && userInfo.name"></uni-list-item>
-		</uni-list>
-	</view>
-</template>
-
-<script>
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex';
-	
-	const db = uniCloud.database();
-	const userTable = db.collection('uni-id-users')
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		computed: {
-			...mapGetters({
-				userInfo: 'user/info'
-			})
-		},
-		onLoad() {
-			if(!this.userInfo)console.error('判断登录状态,如果没有登录则没有userinfo,页面报错');
-		},
-		methods: {
-			...mapMutations({
-				login:'user/login'
-			}),
-			// 选择图片
-			chooseImg(){
-				uni.chooseImage({
-					count:1,
-					success:(res)=> {
-						
-						uni.$on('uploadAvatarAfter', ({url})=>{
-							console.log(url);
-							this.uploadUserInfo({avatar:url});
-						})
-						let options = {
-							width:600,
-							height:600
-						}
-						uni.navigateTo({
-							url:'./uploadCutImageToUnicloud?path=' + res.tempFilePaths[0] + `&options=${JSON.stringify(options)}`,
-							animationType:"fade-in"
-						});
-					}
-				})
-			},
-			/**
-			 * @param {Object} data 更新用户信息
-			 * key 需要更新的用户字段
-			 * value 更新后的用户字段值
-			 */
-			uploadUserInfo(data){
-				console.log(this.userInfo._id)
-				userTable.doc(this.userInfo._id)
-				.update(data)
-				.then(res=>{
-					console.log(data)
-					this.login(data)
-				})
-				.catch(err=>{
-					console.log(err);
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-.content{
-		width: 750rpx;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		/* align-items: center; */
-		flex: 1;
-	}
-	.avatar-box{
-		width: 700rpx;
-		height: 200rpx;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-	}
-	.avatar-img{
-		width: 150rpx;
-		height: 150rpx;
-		border-radius: 75rpx;
-		border: #F8F8F8 solid 1px;
-	}
-</style>
diff --git a/pages/ucenter/edit/uploadCutImageToUnicloud.vue b/pages/ucenter/edit/uploadCutImageToUnicloud.vue
index 839b03d6058cff09e94400ba80a4d2b579e101ce..4b6b61ce106208be14e38066eabc974e1c1214e3 100644
--- a/pages/ucenter/edit/uploadCutImageToUnicloud.vue
+++ b/pages/ucenter/edit/uploadCutImageToUnicloud.vue
@@ -17,15 +17,15 @@ export default {
 	},
 	methods:{
 		successFn(e){
-			uni.getImageInfo({
-				src:e.url,
-				complete: (e) => {
-					console.log(e);
-				}
-			})
+			// uni.getImageInfo({
+			// 	src:e.url,
+			// 	complete: (e) => {
+			// 		console.log(e);
+			// 	}
+			// })
 			this.uploadImgToUnicloud(e.url,(url)=>{
 				//console.log(url);
-				uni.$emit('uploadAvatarAfter', {url});
+				this.getOpenerEventChannel().emit('uploadAvatarAfter', {url})
 				uni.navigateBack()
 			})
 		},
diff --git a/pages/ucenter/settings/settings.nvue b/pages/ucenter/settings/settings.nvue
index 6992458731c6b076544a3709f4a843e6e1454d57..0832405bc53daa325405094051448f8773be5f23 100644
--- a/pages/ucenter/settings/settings.nvue
+++ b/pages/ucenter/settings/settings.nvue
@@ -66,7 +66,7 @@
 			}),
 			toEdit(){
 				uni.navigateTo({
-					url: '/pages/ucenter/edit/edit'
+					url: '/uni_modules/uni-id-users/pages/uni-id-users/edit'
 				});
 			},
 			changePwd(){
@@ -142,8 +142,9 @@
 							});
 						},
 						fail:(err)=> {
+							console.log(`认证失败:${err.errCode}`);
 							uni.showToast({
-								title: `认证失败:${err.errCode}`,
+								title: `认证失败`,
 								icon: 'none'
 							});
 						}
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 7376e7637b3696042621b712bf007812310224ac..7200b164815563d51db7cf2374488511c4d18a6e 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -72,10 +72,14 @@
 							event: 'checkVersion',
 							showBadge: true
 						},
+						{
+							title:'去评分',
+							event:'gotoMarket'
+						},
 						//#endif
 						{
-							title: '反馈',
-							to: '/uni_modules/opendb-feedback/pages/opendb-feedback/list' // /pages/ucenter/uni-feedback/uni-feedback uni_modules/opendb-feedback/pages/opendb-feedback/list
+							title: '问题与反馈',
+							to: '/uni_modules/uni-feedback/pages/opendb-feedback/list' // /pages/ucenter/uni-feedback/uni-feedback uni_modules/uni-feedback/pages/opendb-feedback/list
 						},{
 							title: '关于',
 							to: '/pages/ucenter/about/about'
@@ -96,11 +100,11 @@
 		methods: {
 			...mapMutations({
 				logout: 'user/logout'
-			}),
-			toSettings(){
-				uni.navigateTo({
-					url:"/pages/ucenter/settings/settings"
-				})
+			}),
+			toSettings(){
+				uni.navigateTo({
+					url:"/pages/ucenter/settings/settings"
+				})
 			},
 			/**
 			 * 个人中心项目列表点击事件
@@ -131,6 +135,26 @@
 					title: '你点击了，第' + (index+1) + '个',
 					icon: 'none'
 				});
+			},
+			/**
+			 * 去应用市场评分
+			 */
+			gotoMarket(){
+				// #ifdef APP-PLUS
+				if (uni.getSystemInfoSync().platform == "ios") {
+					// 这里填写appstore应用id
+					let appstoreid = 'id1417078253';
+					plus.runtime.openURL("itms-apps://" + 'itunes.apple.com/cn/app/wechat/'+appstoreid+'?mt=8');
+				}
+				if (uni.getSystemInfoSync().platform == "android") {
+					var Uri = plus.android.importClass("android.net.Uri");
+					var uri = Uri.parse("market://details?id=" + plus.runtime.appid );  
+					var Intent = plus.android.importClass('android.content.Intent');  
+					var intent = new Intent(Intent.ACTION_VIEW, uri);  
+					var main = plus.android.runtimeMainActivity();  
+					main.startActivity(intent);  
+				}
+				// #endif
 			}
 		}
 	}
@@ -275,4 +299,4 @@
 		/* #endif */
 		background-color: #DD524D;
 	}
-</style>
+</style>
diff --git a/uni_modules/uni-data-picker/changelog.md b/uni_modules/uni-data-picker/changelog.md
index 8ad6f35bc8c56e84b4b04af637302e6ef8040d2b..78243da877fb9cf8032380c9e1b82926a92da8c7 100644
--- a/uni_modules/uni-data-picker/changelog.md
+++ b/uni_modules/uni-data-picker/changelog.md
@@ -1,3 +1,8 @@
+## 0.3.1（2021-04-15）
+- 修复 本地数据概率无法回显时问题
+## 0.3.0（2021-04-07）
+- 新增 支持云端非树形表结构数据
+- 修复 根节点 parent_field 字段等于null时选择界面错乱问题
 ## 0.2.0（2021-03-15）
 - 修复 nodeclick、popupopened、popupclosed事件无法触发的问题
 ## 0.1.9（2021-03-09）
diff --git a/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
index a3bd82182d39cda5a5c61efa5d29e29afcef7015..b6f730f2d0d0cb5fdf28d73d65cf755d53f9b5cc 100644
--- a/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
+++ b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
@@ -1,462 +1,466 @@
-<template>
-	<view class="uni-data-tree">
-		<view class="uni-data-tree-input" @click="handleInput">
-			<slot :options="options" :data="inputSelected" :error="errorMessage">
-				<view class="input-value" :class="{'input-value-border': border}">
-					<text v-if="errorMessage" class="selected-area error-text">{{errorMessage}}</text>
-					<view v-else-if="loading && !isOpened" class="selected-area">
-						<uni-load-more class="load-more" :contentText="loadMore" status="loading"></uni-load-more>
-					</view>
-					<scroll-view v-else-if="inputSelected.length" class="selected-area" scroll-x="true">
-						<view class="selected-list">
-							<view class="selected-item" v-for="(item,index) in inputSelected" :key="index">
-								<text>{{item.text}}</text><text v-if="index<inputSelected.length-1" class="input-split-line">{{split}}</text>
-							</view>
-						</view>
-					</scroll-view>
-					<text v-else class="selected-area placeholder">{{placeholder}}</text>
-					<view class="arrow-area" v-if="!readonly">
-						<view class="input-arrow"></view>
-					</view>
-				</view>
-			</slot>
-		</view>
-		<view class="uni-data-tree-cover" v-if="isOpened" @click="handleClose"></view>
-		<view class="uni-data-tree-dialog" v-if="isOpened">
-			<view class="dialog-caption">
-				<view class="title-area">
-					<text class="dialog-title">{{popupTitle}}</text>
-				</view>
-				<view class="dialog-close" @click="handleClose">
-					<view class="dialog-close-plus" data-id="close"></view>
-					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
-				</view>
-			</view>
-			<data-picker-view class="picker-view" ref="pickerView" v-model="value" :localdata="localdata" :preload="preload"
-			 :collection="collection" :field="field" :orderby="orderby" :where="where" :step-searh="stepSearh" :self-field="selfField"
-			 :parent-field="parentField" :managed-mode="true" @change="onchange" @datachange="ondatachange" @nodeclick="onnodeclick"></data-picker-view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import dataPicker from "../uni-data-pickerview/uni-data-picker.js"
-	import DataPickerView from "../uni-data-pickerview/uni-data-pickerview.vue"
-
-	/**
-	 * uni-data-picker
-	 * @description uni-data-picker
-	 * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-data-picker
-	 * @property {String} popup-title 弹出窗口标题
-	 * @property {Array} localdata 本地数据，参考
-	 * @property {Boolean} border = [true|false] 是否有边框
-	 * @property {Boolean} readonly = [true|false] 是否仅读
-	 * @property {Boolean} preload = [true|false] 是否预加载数据
-	 * @value true 开启预加载数据，点击弹出窗口后显示已加载数据
-	 * @value false 关闭预加载数据，点击弹出窗口后开始加载数据
-	 * @property {Boolean} step-searh = [true|false] 是否分布查询
-	 * @value true 启用分布查询，仅查询当前选中节点
-	 * @value false 关闭分布查询，一次查询出所有数据
-	 * @property {String|DBFieldString} self-field 分布查询当前字段名称
-	 * @property {String|DBFieldString} parent-field 分布查询父字段名称
-	 * @property {String|DBCollectionString} collection 表名
-	 * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
-	 * @property {String} orderby 排序字段及正序倒叙设置
-	 * @property {String|JQLString} where 查询条件
-	 * @event {Function} popupshow 弹出的选择窗口打开时触发此事件
-	 * @event {Function} popuphide 弹出的选择窗口关闭时触发此事件
-	 */
-	export default {
-		name: 'UniDataPicker',
-		mixins: [dataPicker],
-		components: {
-			DataPickerView
-		},
-		props: {
-			options: {
-				type: [Object, Array],
-				default () {
-					return {}
-				}
-			},
-			popupTitle: {
-				type: String,
-				default: '请选择'
-			},
-			placeholder: {
-				type: String,
-				default: '请选择'
-			},
-			heightMobile: {
-				type: String,
-				default: ''
-			},
-			readonly: {
-				type: Boolean,
-				default: false
-			},
-			border: {
-				type: Boolean,
-				default: true
-			},
-			split: {
-				type: String,
-				default: '/'
-			}
-		},
-		data() {
-			return {
-				isOpened: false,
-				inputSelected: []
-			}
-		},
-		created() {
-			this.form = this.getForm('uniForms')
-			this.formItem = this.getForm('uniFormsItem')
-			if (this.formItem) {
-				if (this.formItem.name) {
-					this.rename = this.formItem.name
-					this.form.inputChildrens.push(this)
-				}
-			}
-
-			this.$nextTick(() => {
-				this.load()
-			})
-		},
-		methods: {
-			onPropsChange() {
-				this._treeData = []
-				this.selectedIndex = 0
-				this.load()
-			},
-			load() {
-				if (this.readonly) {
-					this._processReadonly(this.localdata, this.value)
-					return
-				}
-
-				if (this.isLocaldata) {
-					this.loadData()
-					this.inputSelected = this.selected.slice(0)
-				} else if (this.value.length) {
-					this.getTreePath(() => {
-						this.inputSelected = this.selected.slice(0)
-					})
-				}
-			},
-			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;
-			},
-			show() {
-				this.isOpened = true
-				this.$nextTick(() => {
-					this.$refs.pickerView.updateData({
-						treeData: this._treeData,
-						selected: this.selected,
-						selectedIndex: this.selectedIndex
-					})
+<template>
+	<view class="uni-data-tree">
+		<view class="uni-data-tree-input" @click="handleInput">
+			<slot :options="options" :data="inputSelected" :error="errorMessage">
+				<view class="input-value" :class="{'input-value-border': border}">
+					<text v-if="errorMessage" class="selected-area error-text">{{errorMessage}}</text>
+					<view v-else-if="loading && !isOpened" class="selected-area">
+						<uni-load-more class="load-more" :contentText="loadMore" status="loading"></uni-load-more>
+					</view>
+					<scroll-view v-else-if="inputSelected.length" class="selected-area" scroll-x="true">
+						<view class="selected-list">
+							<view class="selected-item" v-for="(item,index) in inputSelected" :key="index">
+								<text>{{item.text}}</text><text v-if="index<inputSelected.length-1" class="input-split-line">{{split}}</text>
+							</view>
+						</view>
+					</scroll-view>
+					<text v-else class="selected-area placeholder">{{placeholder}}</text>
+					<view class="arrow-area" v-if="!readonly">
+						<view class="input-arrow"></view>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view class="uni-data-tree-cover" v-if="isOpened" @click="handleClose"></view>
+		<view class="uni-data-tree-dialog" v-if="isOpened">
+			<view class="dialog-caption">
+				<view class="title-area">
+					<text class="dialog-title">{{popupTitle}}</text>
+				</view>
+				<view class="dialog-close" @click="handleClose">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+			</view>
+			<data-picker-view class="picker-view" ref="pickerView" v-model="value" :localdata="localdata" :preload="preload"
+			 :collection="collection" :field="field" :orderby="orderby" :where="where" :step-searh="stepSearh" :self-field="selfField"
+			 :parent-field="parentField" :managed-mode="true" @change="onchange" @datachange="ondatachange" @nodeclick="onnodeclick"></data-picker-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import dataPicker from "../uni-data-pickerview/uni-data-picker.js"
+	import DataPickerView from "../uni-data-pickerview/uni-data-pickerview.vue"
+
+	/**
+	 * uni-data-picker
+	 * @description uni-data-picker
+	 * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-data-picker
+	 * @property {String} popup-title 弹出窗口标题
+	 * @property {Array} localdata 本地数据，参考
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} readonly = [true|false] 是否仅读
+	 * @property {Boolean} preload = [true|false] 是否预加载数据
+	 * @value true 开启预加载数据，点击弹出窗口后显示已加载数据
+	 * @value false 关闭预加载数据，点击弹出窗口后开始加载数据
+	 * @property {Boolean} step-searh = [true|false] 是否分布查询
+	 * @value true 启用分布查询，仅查询当前选中节点
+	 * @value false 关闭分布查询，一次查询出所有数据
+	 * @property {String|DBFieldString} self-field 分布查询当前字段名称
+	 * @property {String|DBFieldString} parent-field 分布查询父字段名称
+	 * @property {String|DBCollectionString} collection 表名
+	 * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
+	 * @property {String} orderby 排序字段及正序倒叙设置
+	 * @property {String|JQLString} where 查询条件
+	 * @event {Function} popupshow 弹出的选择窗口打开时触发此事件
+	 * @event {Function} popuphide 弹出的选择窗口关闭时触发此事件
+	 */
+	export default {
+		name: 'UniDataPicker',
+		mixins: [dataPicker],
+		components: {
+			DataPickerView
+		},
+		props: {
+			options: {
+				type: [Object, Array],
+				default () {
+					return {}
+				}
+			},
+			popupTitle: {
+				type: String,
+				default: '请选择'
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			heightMobile: {
+				type: String,
+				default: ''
+			},
+			readonly: {
+				type: Boolean,
+				default: false
+			},
+			border: {
+				type: Boolean,
+				default: true
+			},
+			split: {
+				type: String,
+				default: '/'
+			}
+		},
+		data() {
+			return {
+				isOpened: false,
+				inputSelected: []
+			}
+		},
+		created() {
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+			if (this.formItem) {
+				if (this.formItem.name) {
+					this.rename = this.formItem.name
+					this.form.inputChildrens.push(this)
+				}
+			}
+
+			this.$nextTick(() => {
+				this.load()
+			})
+		},
+		methods: {
+			onPropsChange() {
+				this._treeData = []
+				this.selectedIndex = 0
+				this.load()
+			},
+			load() {
+				if (this.readonly) {
+					this._processReadonly(this.localdata, this.value)
+					return
+				}
+
+				if (this.isLocaldata) {
+					this.loadData()
+					this.inputSelected = this.selected.slice(0)
+				} else if (!this.parentField && !this.selfField && this.value) {
+					this.getNodeData(() => {
+						this.inputSelected = this.selected.slice(0)
+					})
+				} else if (this.value.length) {
+					this.getTreePath(() => {
+						this.inputSelected = this.selected.slice(0)
+					})
+				}
+			},
+			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;
+			},
+			show() {
+				this.isOpened = true
+				this.$nextTick(() => {
+					this.$refs.pickerView.updateData({
+						treeData: this._treeData,
+						selected: this.selected,
+						selectedIndex: this.selectedIndex
+					})
 				})
-				this.$emit('popupopened')
-			},
-			hide() {
+				this.$emit('popupopened')
+			},
+			hide() {
 				this.isOpened = false
-				this.$emit('popupclosed')
-			},
-			handleInput() {
-				if (this.readonly) {
-					return
-				}
-				this.show()
-			},
-			handleClose(e) {
-				this.hide()
+				this.$emit('popupclosed')
+			},
+			handleInput() {
+				if (this.readonly) {
+					return
+				}
+				this.show()
+			},
+			handleClose(e) {
+				this.hide()
 			},
 			onnodeclick(e) {
 				this.$emit('nodeclick', e)
-			},
-			ondatachange(e) {
-				this._treeData = this.$refs.pickerView._treeData
-			},
-			onchange(e) {
-				this.hide()
-				this.inputSelected = e
-				this._dispatchEvent(e)
-			},
-			_processReadonly(dataList, valueArray) {
-				var isTree = dataList.findIndex((item) => {
-					return item.children
-				})
-				if (isTree > -1) {
-					if (Array.isArray(valueArray)) {
-						let inputValue = valueArray[valueArray.length - 1]
-						if (typeof inputValue === 'object' && inputValue.value) {
-							inputValue = inputValue.value
-						}
-					}
-					this.inputSelected = this._findNodePath(inputValue, this.localdata)
-					return
-				}
-
-				let result = []
-				for (let i = 0; i < valueArray.length; i++) {
-					var value = valueArray[i]
-					var item = dataList.find((v) => {
-						return v.value == value
-					})
-					if (item) {
-						result.push(item)
-					}
-				}
-				if (result.length) {
-					this.inputSelected = result
-				}
-			},
-			_filterForArray(data, valueArray) {
-				var result = []
-				for (let i = 0; i < valueArray.length; i++) {
-					var value = valueArray[i]
-					var found = data.find((item) => {
-						return item.value == value
-					})
-					if (found) {
-						result.push(found)
-					}
-				}
-				return result
-			},
-			_dispatchEvent(selected) {
-				var value = new Array(selected.length)
-				for (var i = 0; i < selected.length; i++) {
-					value[i] = selected[i].value
-				}
-
-				if (this.formItem) {
-					const item = selected[selected.length - 1]
-					this.formItem.setValue(item.value)
-				}
-
-				this.$emit('change', {
-					detail: {
-						value: selected
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.uni-data-tree {
-		position: relative;
-		font-size: 14px;
-	}
-
-	.error-text {
-		color: #DD524D;
-	}
-
+			},
+			ondatachange(e) {
+				this._treeData = this.$refs.pickerView._treeData
+			},
+			onchange(e) {
+				this.hide()
+				this.inputSelected = e
+				this._dispatchEvent(e)
+			},
+			_processReadonly(dataList, valueArray) {
+				var isTree = dataList.findIndex((item) => {
+					return item.children
+				})
+				if (isTree > -1) {
+					if (Array.isArray(valueArray)) {
+						let inputValue = valueArray[valueArray.length - 1]
+						if (typeof inputValue === 'object' && inputValue.value) {
+							inputValue = inputValue.value
+						}
+					}
+					this.inputSelected = this._findNodePath(inputValue, this.localdata)
+					return
+				}
+
+				let result = []
+				for (let i = 0; i < valueArray.length; i++) {
+					var value = valueArray[i]
+					var item = dataList.find((v) => {
+						return v.value == value
+					})
+					if (item) {
+						result.push(item)
+					}
+				}
+				if (result.length) {
+					this.inputSelected = result
+				}
+			},
+			_filterForArray(data, valueArray) {
+				var result = []
+				for (let i = 0; i < valueArray.length; i++) {
+					var value = valueArray[i]
+					var found = data.find((item) => {
+						return item.value == value
+					})
+					if (found) {
+						result.push(found)
+					}
+				}
+				return result
+			},
+			_dispatchEvent(selected) {
+				var value = new Array(selected.length)
+				for (var i = 0; i < selected.length; i++) {
+					value[i] = selected[i].value
+				}
+
+				if (this.formItem) {
+					const item = selected[selected.length - 1]
+					this.formItem.setValue(item.value)
+				}
+
+				this.$emit('change', {
+					detail: {
+						value: selected
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-data-tree {
+		position: relative;
+		font-size: 14px;
+	}
+
+	.error-text {
+		color: #DD524D;
+	}
+
 	.input-value {
-		/* #ifndef APP-NVUE */
+		/* #ifndef APP-NVUE */
 		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		flex-wrap: nowrap;
-		font-size: 14px;
-		line-height: 38px;
-		padding: 0 5px;
-		overflow: hidden;
-		/* #ifdef APP-NVUE */
-		height: 40px;
-		/* #endif */
-	}
-
-	.input-value-border {
-		border: 1px solid #e5e5e5;
-		border-radius: 5px;
-	}
-
-	.selected-area {
-		flex: 1;
-		overflow: hidden;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-	}
-
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		flex-wrap: nowrap;
+		font-size: 14px;
+		line-height: 38px;
+		padding: 0 5px;
+		overflow: hidden;
+		/* #ifdef APP-NVUE */
+		height: 40px;
+		/* #endif */
+	}
+
+	.input-value-border {
+		border: 1px solid #e5e5e5;
+		border-radius: 5px;
+	}
+
+	.selected-area {
+		flex: 1;
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
 	.load-more {
 		/* #ifndef APP-NVUE */
 		margin-right: auto;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		width: 40px;
-		/* #endif */
-	}
-
-	.selected-list {
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 40px;
+		/* #endif */
+	}
+
+	.selected-list {
 		/* #ifndef APP-NVUE */
 		display: flex;
-		/* #endif */
-		flex-direction: row;
-		flex-wrap: nowrap;
-		padding: 0 5px;
-	}
-
-	.selected-item {
-		flex-direction: row;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: nowrap;
+		padding: 0 5px;
+	}
+
+	.selected-item {
+		flex-direction: row;
 		padding: 0 1px;
 		/* #ifndef APP-NVUE */
 		white-space: nowrap;
-		/* #endif */
-	}
-
-	.placeholder {
-		color: grey;
-	}
-
-	.input-split-line {
-		opacity: .5;
-	}
-
-	.arrow-area {
-		position: relative;
+		/* #endif */
+	}
+
+	.placeholder {
+		color: grey;
+	}
+
+	.input-split-line {
+		opacity: .5;
+	}
+
+	.arrow-area {
+		position: relative;
 		width: 20px;
-		/* #ifndef APP-NVUE */
+		/* #ifndef APP-NVUE */
 		margin-left: auto;
 		display: flex;
-		/* #endif */
-		justify-content: center;
-		transform: rotate(-45deg);
-		transform-origin: center;
-	}
-
-	.input-arrow {
-		width: 7px;
-		height: 7px;
-		border-left: 1px solid #999;
-		border-bottom: 1px solid #999;
-	}
-
-	.uni-data-tree-cover {
-		position: fixed;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, .4);
+		/* #endif */
+		justify-content: center;
+		transform: rotate(-45deg);
+		transform-origin: center;
+	}
+
+	.input-arrow {
+		width: 7px;
+		height: 7px;
+		border-left: 1px solid #999;
+		border-bottom: 1px solid #999;
+	}
+
+	.uni-data-tree-cover {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, .4);
 		/* #ifndef APP-NVUE */
 		display: flex;
-		/* #endif */
-		flex-direction: column;
-		z-index: 100;
-	}
-
-	.uni-data-tree-dialog {
-		position: fixed;
-		left: 0;
-		top: 20%;
-		right: 0;
-		bottom: 0;
-		background-color: #FFFFFF;
-		border-top-left-radius: 10px;
-		border-top-right-radius: 10px;
+		/* #endif */
+		flex-direction: column;
+		z-index: 100;
+	}
+
+	.uni-data-tree-dialog {
+		position: fixed;
+		left: 0;
+		top: 20%;
+		right: 0;
+		bottom: 0;
+		background-color: #FFFFFF;
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
 		/* #ifndef APP-NVUE */
 		display: flex;
-		/* #endif */
-		flex-direction: column;
-		z-index: 102;
-		overflow: hidden;
-		/* #ifdef APP-NVUE */
-		width: 750rpx;
-		/* #endif */
-	}
-
-	.dialog-caption {
-		position: relative;
+		/* #endif */
+		flex-direction: column;
+		z-index: 102;
+		overflow: hidden;
+		/* #ifdef APP-NVUE */
+		width: 750rpx;
+		/* #endif */
+	}
+
+	.dialog-caption {
+		position: relative;
 		/* #ifndef APP-NVUE */
 		display: flex;
-		/* #endif */
-		flex-direction: row;
-		border-bottom: 1px solid #f0f0f0;
-	}
-
-	.title-area {
+		/* #endif */
+		flex-direction: row;
+		border-bottom: 1px solid #f0f0f0;
+	}
+
+	.title-area {
 		/* #ifndef APP-NVUE */
 		display: flex;
-		/* #endif */
+		/* #endif */
 		align-items: center;
 		/* #ifndef APP-NVUE */
 		margin: auto;
-		/* #endif */
-		padding: 0 10px;
-	}
-
-	.dialog-title {
-		font-weight: bold;
-		line-height: 44px;
-	}
-
-	.dialog-close {
-		position: absolute;
-		top: 0;
-		right: 0;
+		/* #endif */
+		padding: 0 10px;
+	}
+
+	.dialog-title {
+		font-weight: bold;
+		line-height: 44px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
 		bottom: 0;
 		/* #ifndef APP-NVUE */
 		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		padding: 0 15px;
-	}
-
-	.dialog-close-plus {
-		width: 16px;
-		height: 2px;
-		background-color: #666;
-		border-radius: 2px;
-		transform: rotate(45deg);
-	}
-
-	.dialog-close-rotate {
-		position: absolute;
-		transform: rotate(-45deg);
-	}
-
-	.picker-view {
-		flex: 1;
-		overflow: hidden;
-	}
-
-	/* #ifdef H5 */
-	@media all and (min-width: 768px) {
-		.uni-data-tree-cover {
-			background-color: transparent;
-		}
-
-		.uni-data-tree-dialog {
-			position: absolute;
-			top: 100%;
-			height: auto;
-			min-height: 400px;
-			max-height: 50vh;
-			background-color: #fff;
-			border-radius: 5px;
-			box-shadow: 0 0 20px 5px rgba(0, 0, 0, .3);
-		}
-
-		.dialog-caption {
-			display: none;
-		}
-	}
-
-	/* #endif */
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 15px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #666;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.picker-view {
+		flex: 1;
+		overflow: hidden;
+	}
+
+	/* #ifdef H5 */
+	@media all and (min-width: 768px) {
+		.uni-data-tree-cover {
+			background-color: transparent;
+		}
+
+		.uni-data-tree-dialog {
+			position: absolute;
+			top: 100%;
+			height: auto;
+			min-height: 400px;
+			max-height: 50vh;
+			background-color: #fff;
+			border-radius: 5px;
+			box-shadow: 0 0 20px 5px rgba(0, 0, 0, .3);
+		}
+
+		.dialog-caption {
+			display: none;
+		}
+	}
+
+	/* #endif */
 </style>
diff --git a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
index af69e741ae0172cac3e179096178ee9d1e93bd8b..84b51f3344366987d6b9bca6792477161b2ce894 100644
--- a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
@@ -105,7 +105,11 @@ export default {
       return this.localdata.length > 0
     },
     postField() {
-      return `${this.field}, ${this.parentField} as parent_value`
+			let fields = [this.field];
+			if (this.parentField) {
+				fields.push(`${this.parentField} as parent_value`);
+			}
+      return fields.join(',');
     }
   },
   created() {
@@ -192,6 +196,23 @@ export default {
 
       return db
     },
+		getNodeData(callback) {
+		  if (this.loading) {
+		    return
+		  }
+		  this.loading = true
+		  this.getCommand({
+		    field: this.postField,
+				where: this._pathWhere()
+		  }).then((res) => {
+		    this.loading = false
+		    this.selected = res.result.data
+		    callback && callback()
+		  }).catch((err) => {
+		    this.loading = false
+		    this.errorMessage = err
+		  })
+		},
     getTreePath(callback) {
       if (this.loading) {
         return
@@ -280,13 +301,29 @@ export default {
         this.errorMessage = err
       })
     },
+    _pathWhere() {
+      let result = []
+      let where_field = this._getParentNameByField();
+      if (where_field) {
+        result.push(`${where_field} == '${this.value}'`)
+      }
+
+      if (this.where) {
+        return `(${this.where}) && (${result.join(' || ')})`
+      }
+
+      return result.join(' || ')
+    },
     _postWhere() {
       let result = []
       let selected = this.selected
-      result.push(`${this.parentField} == null`)
+      let parentField = this.parentField
+      if (parentField) {
+        result.push(`${parentField} == null || ${parentField} == ""`)
+      }
       if (selected.length) {
         for (var i = 0; i < selected.length - 1; i++) {
-          result.push(`${this.parentField} == '${selected[i].value}'`)
+          result.push(`${parentField} == '${selected[i].value}'`)
         }
       }
 
@@ -309,6 +346,24 @@ export default {
 
       return result.join(' || ')
     },
+    _getParentNameByField() {
+      const fields = this.field.split(',');
+      let where_field = null;
+      for (let i = 0; i < fields.length; i++) {
+        const items = fields[i].split('as');
+        if (items.length < 2) {
+          continue;
+        }
+        if (items[1].trim() === 'value') {
+          where_field = items[0].trim();
+          break;
+        }
+      }
+      return where_field
+    },
+    _isTreeView() {
+      return (this.parentField && this.selfField)
+    },
     _updateSelected() {
       var dl = this.dataList
       var sl = this.selected
@@ -388,7 +443,7 @@ export default {
             child[key] = node[key]
           }
         }
-        if (parent_value !== null) {
+        if (parent_value !== undefined) {
           child.parent_value = parent_value
         }
         result.push(child)
diff --git a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
index 80075ac59bfcd0beac42bd3da19cde171e6d4314..ad0c275ae36c4475e00c6d4f3bc9de06d222a817 100644
--- a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
@@ -110,6 +110,11 @@
           hasNodes
         } = this._updateBindData()
 
+        if (!this._isTreeView()) {
+          this.onSelectedChange(node, true)
+          return
+        }
+
         if (this.isLocaldata && (!hasNodes || isleaf)) {
           this.onSelectedChange(node, true)
           return
diff --git a/uni_modules/uni-data-picker/package.json b/uni_modules/uni-data-picker/package.json
index 72cd4ce06afc80f196e6e098dda0589c9e380afb..ece35f4c959d95001608eb60daf20792d715111d 100644
--- a/uni_modules/uni-data-picker/package.json
+++ b/uni_modules/uni-data-picker/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-data-picker",
   "displayName": "DataPicker 数据驱动的picker选择器",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Picker选择器",
   "keywords": [
     "",
diff --git a/uni_modules/uni-data-picker/readme.md b/uni_modules/uni-data-picker/readme.md
index 350f5a53214ccff9a4b4f4868d7dd1e1f250aac1..9c64fe9680b5a80c4edd46c3821e2d59fff29a0b 100644
--- a/uni_modules/uni-data-picker/readme.md
+++ b/uni_modules/uni-data-picker/readme.md
@@ -1,4 +1,5 @@
 ## DataPicker 级联选择
+> **组件名：uni-data-picker**
 > 代码块： `uDataPicker`
 > 关联组件：`uni-data-pickerview`、`uni-load-more`。
 
@@ -18,6 +19,7 @@
 在uniCloud数据表中新建表“uni-id-address”和“opendb-city-china”，这2个表的schema自带foreignKey关联。在“uni-id-address”表的表结构页面使用schema2code生成前端页面，会自动生成地址管理的维护页面，自动从“opendb-city-china”表包含的中国所有省市区信息里选择地址。
 
 
+> **注意事项**
 > 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
 > - 组件需要依赖 `sass` 插件 ，请自行手动安装
 > - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
@@ -50,11 +52,12 @@
 |parent-field					|String					| 					 |							|分步查询时父字段名称|
 |collection						|String					| 					 |							|表名。支持输入多个表名，用 `,` 分割|
 |field								|String					| 					 |							|查询字段，多个字段用 `,` 分割|
-|where								|String					| 					 |							|查询条件，内容较多，另见jql文档：[详情](https://uniapp.dcloud.net.cn/uniCloud/unicloud-db?id=jsquery)|
+|where								|String					| 					 |							|查询条件，内容较多，另见jql文档：[详情](https://uniapp.dcloud.net.cn/uniCloud/uni-clientDB?id=jsquery)|
 |orderby							|String					| 					 |							|排序字段及正序倒叙设置|
 |popup-title					|String					| 					 |							|弹出层标题|
 
 
+> ****
 > `collection/where/orderby` 和 `<unicloud-db>` 的用法一致，[详情](https://uniapp.dcloud.net.cn/uniCloud/unicloud-db)
 
 
@@ -75,6 +78,7 @@
 
 #### 云端数据
 
+> **注意事项**
 > - 云端数据需要关联服务空间
 > - 下面示例中使用的表 `opendb-city-china`(中国城市省市区数据，含港澳台), 在[uniCloud控制台](https://unicloud.dcloud.net.cn/)使用opendb创建，[详情](https://gitee.com/dcloud/opendb)
 
@@ -82,12 +86,14 @@
 ```html
 <template>
   <view>
-    <uni-data-picker placeholder="请选择地址" popup-title="请选择城市" collection="opendb-city-china" field="code as value, name as text" orderby="value asc" :step-searh="true" :self-field="code" parent-field="parent_code"
+    <uni-data-picker placeholder="请选择地址" popup-title="请选择城市" collection="opendb-city-china" field="code as value, name as text" orderby="value asc" :step-searh="true" self-field="code" parent-field="parent_code"
  @change="onchange" @nodeclick="onnodeclick">
     </uni-data-picker>
   </view>
 </template>
+```
 
+```js
 <script>
   export default {
     data() {
@@ -117,7 +123,9 @@
     <uni-data-picker :localdata="items" popup-title="请选择班级" @change="onchange" @nodeclick="onnodeclick"></uni-data-picker>
   </view>
 </template>
+```
 
+```js
 <script>
   export default {
     data() {
@@ -178,6 +186,7 @@
 ```
 
 
+> **注意事项**
 > `localdata` 和 `collection` 同时配置时，`localdata` 优先
 
 
@@ -192,7 +201,9 @@
 		</uni-data-picker>
 	</view>
 </template>
+```
 
+```js
 <script>
 	export default {
 		data() {
diff --git a/uni_modules/opendb-feedback/changelog.md b/uni_modules/uni-feedback/changelog.md
similarity index 100%
rename from uni_modules/opendb-feedback/changelog.md
rename to uni_modules/uni-feedback/changelog.md
diff --git a/uni_modules/opendb-feedback/components/feedback-imgs.vue b/uni_modules/uni-feedback/components/feedback-imgs.vue
similarity index 93%
rename from uni_modules/opendb-feedback/components/feedback-imgs.vue
rename to uni_modules/uni-feedback/components/feedback-imgs.vue
index 1e39f4be16ace32c29f3712a53c650724c329ceb..c935945dc2a38a62fde9ee4f59295e1472a1ebaa 100644
--- a/uni_modules/opendb-feedback/components/feedback-imgs.vue
+++ b/uni_modules/uni-feedback/components/feedback-imgs.vue
@@ -221,7 +221,8 @@
 	}
 
 	.feedback-uploader {
-		padding: 22rpx 20rpx;
+		padding: 22rpx 20rpx;
+		padding-left: 0;
 	}
 
 	.feedback-star {
@@ -251,5 +252,11 @@
 		color: #FFFFFF;
 		margin: 20rpx;
 	}
-
+	
+	.uni-uploader-title{
+		text-align: right;
+		flex: 1;
+		color: #B2B2B2;
+		padding-right: 10rpx;
+	}
 </style>
diff --git a/uni_modules/opendb-feedback/js_sdk/validator/opendb-feedback.js b/uni_modules/uni-feedback/js_sdk/validator/opendb-feedback.js
similarity index 100%
rename from uni_modules/opendb-feedback/js_sdk/validator/opendb-feedback.js
rename to uni_modules/uni-feedback/js_sdk/validator/opendb-feedback.js
diff --git a/uni_modules/opendb-feedback/package.json b/uni_modules/uni-feedback/package.json
similarity index 100%
rename from uni_modules/opendb-feedback/package.json
rename to uni_modules/uni-feedback/package.json
diff --git a/uni_modules/opendb-feedback/pages/opendb-feedback/add.vue b/uni_modules/uni-feedback/pages/opendb-feedback/add.vue
similarity index 73%
rename from uni_modules/opendb-feedback/pages/opendb-feedback/add.vue
rename to uni_modules/uni-feedback/pages/opendb-feedback/add.vue
index 211e5045cf2d6ff3e208d446e576a0b972f0155a..aab5101e5deb139945556d5952e9a044e18ec238 100644
--- a/uni_modules/opendb-feedback/pages/opendb-feedback/add.vue
+++ b/uni_modules/uni-feedback/pages/opendb-feedback/add.vue
@@ -1,34 +1,18 @@
 <template>
 	<view class="uni-container">
 		<uni-forms ref="form" :value="formData" :rules="rules" validate-trigger="submit" err-show-type="toast">
-			<!-- <uni-forms-item name="user_id" label="">
-				<uni-easyinput placeholder="留言反馈用户ID/回复留言用户ID，参考uni-id-users表" v-model="formData.user_id" />
-			</uni-forms-item> -->
-			<!-- <uni-forms-item name="create_date" label="">
-				<uni-datetime-picker return-type="timestamp" :value="formData.create_date" />
-			</uni-forms-item> -->
-			<uni-forms-item name="content" label="反馈内容">
+			<uni-forms-item name="content" label="反馈内容" required>
 				<uni-easyinput placeholder="请输入反馈内容" type="textarea" v-model="formData.content" trim="right" />
 			</uni-forms-item>
 			<uni-forms-item name="imgs" label="反馈截图">
-				<!-- <uni-data-checkbox :multiple="true" v-model="formData.imgs" /> -->
 				<feedback-imgs :isChoose="true" :imgs="formData.imgs" @close="close" @chooseImg="chooseImg"></feedback-imgs>
 			</uni-forms-item>
-			<!-- <uni-forms-item name="is_reply" label="">
-				<switch @change="binddata('is_reply', $event.detail.value)" :checked="formData.is_reply" />
-			</uni-forms-item> -->
-			<!-- <uni-forms-item name="feedback_id" label="">
-				<uni-easyinput placeholder="被回复留言ID" v-model="formData.feedback_id" />
-			</uni-forms-item> -->
-			<uni-forms-item name="contact" label="联系人">
+			<uni-forms-item name="contact" label="联系人" required>
 				<uni-easyinput placeholder="请输入联系人" v-model="formData.contact" trim="both" />
 			</uni-forms-item>
-			<uni-forms-item name="mobile" label="联系方式">
+			<uni-forms-item name="mobile" label="联系方式" required>
 				<uni-easyinput placeholder="请输入手机号/邮箱" v-model="formData.mobile" trim="both" />
 			</uni-forms-item>
-			<!-- <uni-forms-item name="reply_count" label="">
-				<uni-easyinput placeholder="被回复条数" type="number" v-model="formData.reply_count" />
-			</uni-forms-item> -->
 
 			<view class="uni-button-group">
 				<button type="primary" class="uni-button" @click="submit">提交</button>
@@ -122,13 +106,14 @@
 			},
 			submitForm(value) {
 				// 使用 clientDB 提交数据
-				db.collection(dbCollectionName).add(value).then((res) => {
-					uni.showToast({
-						icon: 'none',
-						title: '反馈成功'
-					})
-					this.getOpenerEventChannel().emit('refreshData')
-					setTimeout(() => uni.navigateBack(), 500)
+				db.collection(dbCollectionName).add(value).then((res) => {
+					uni.showModal({
+						title: '您的反馈已经提交成功，请耐心等待。',
+						showCancel: false,
+						success: res => {
+							uni.navigateBack()
+						},
+					});
 				}).catch((err) => {
 					uni.showModal({
 						content: err.message || '反馈失败',
diff --git a/uni_modules/opendb-feedback/pages/opendb-feedback/detail.vue b/uni_modules/uni-feedback/pages/opendb-feedback/detail.vue
similarity index 100%
rename from uni_modules/opendb-feedback/pages/opendb-feedback/detail.vue
rename to uni_modules/uni-feedback/pages/opendb-feedback/detail.vue
diff --git a/uni_modules/opendb-feedback/pages/opendb-feedback/edit.vue b/uni_modules/uni-feedback/pages/opendb-feedback/edit.vue
similarity index 100%
rename from uni_modules/opendb-feedback/pages/opendb-feedback/edit.vue
rename to uni_modules/uni-feedback/pages/opendb-feedback/edit.vue
diff --git a/uni_modules/opendb-feedback/pages/opendb-feedback/list.vue b/uni_modules/uni-feedback/pages/opendb-feedback/list.vue
similarity index 100%
rename from uni_modules/opendb-feedback/pages/opendb-feedback/list.vue
rename to uni_modules/uni-feedback/pages/opendb-feedback/list.vue
diff --git a/uni_modules/opendb-feedback/readme.md b/uni_modules/uni-feedback/readme.md
similarity index 100%
rename from uni_modules/opendb-feedback/readme.md
rename to uni_modules/uni-feedback/readme.md
diff --git a/uni_modules/opendb-feedback/uniCloud/database/opendb-feedback.schema.json b/uni_modules/uni-feedback/uniCloud/database/opendb-feedback.schema.json
similarity index 100%
rename from uni_modules/opendb-feedback/uniCloud/database/opendb-feedback.schema.json
rename to uni_modules/uni-feedback/uniCloud/database/opendb-feedback.schema.json
diff --git a/uni_modules/uni-id-users/js_sdk/validator/uni-id-users.js b/uni_modules/uni-id-users/js_sdk/validator/uni-id-users.js
new file mode 100644
index 0000000000000000000000000000000000000000..ae8b1e3ba56cf59630fadefa4af63410ee1b1a6c
--- /dev/null
+++ b/uni_modules/uni-id-users/js_sdk/validator/uni-id-users.js
@@ -0,0 +1,73 @@
+// 表单校验规则由 schema2code 生成，不建议直接修改校验规则，而建议通过 schema2code 生成, 详情: https://uniapp.dcloud.net.cn/uniCloud/schema
+
+
+
+const validator = {
+	"avatar": {
+		"rules": [{
+			"format": "string"
+		}],
+		"label": "头像地址"
+	},
+	"gender": {
+		"rules": [{
+				"format": "int"
+			},
+			{
+				"range": [{
+						"text": "未知",
+						"value": 0
+					},
+					{
+						"text": "男",
+						"value": 1
+					},
+					{
+						"text": "女",
+						"value": 2
+					}
+				]
+			}
+		],
+		"defaultValue": 0,
+		"label": "性别"
+	},
+	"mobile": {
+		"rules": [{
+				"format": "string"
+			},
+			{
+				"pattern": "^\\+?[0-9-]{3,20}$"
+			}
+		],
+		"label": "手机号码"
+	},
+	"nickname": {
+		"rules": [{
+
+				required: true,
+				errorMessage: '请输入昵称',
+
+			},
+			{
+				minLength: 3,
+				maxLength: 10,
+				errorMessage: '昵称长度在 {minLength} 到 {maxLength} 个字符',
+			}
+		],
+		"label": "昵称"
+	}
+}
+
+const enumConverter = {
+	"gender_valuetotext": {
+		"0": "未知",
+		"1": "男",
+		"2": "女"
+	}
+}
+
+export {
+	validator,
+	enumConverter
+}
diff --git a/uni_modules/uni-id-users/package.json b/uni_modules/uni-id-users/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..11a384f51029595a28cacc946eac043442eb69f9
--- /dev/null
+++ b/uni_modules/uni-id-users/package.json
@@ -0,0 +1,91 @@
+{
+  "id": "uni-id-users",
+  "displayName": "uni-id-users",
+  "version": "1.0.0",
+  "description": "",
+  "keywords": [
+    "uni-id-users"
+  ],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+      "uniCloud",
+      "Admin插件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-dateformat",
+      "uni-badge",
+      "uni-icons",
+      "uni-load-more",
+      "uni-link",
+      "uni-forms",
+      "uni-group",
+      "uni-list",
+      "uni-fab",
+      "uni-datetime-picker",
+      "uni-data-picker",
+      "uni-file-picker",
+      "uni-easyinput",
+      "uni-data-checkbox"
+    ],
+    "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": "u",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-id-users/pages/uni-id-users/edit.vue b/uni_modules/uni-id-users/pages/uni-id-users/edit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..11fe6bc1191e04541834f31f71d39d2207bc6a9c
--- /dev/null
+++ b/uni_modules/uni-id-users/pages/uni-id-users/edit.vue
@@ -0,0 +1,233 @@
+<template>
+	<view class="uni-container">
+		<uni-forms ref="form" :value="formData" :rules="rules" validate-trigger="submit" err-show-type="toast">
+			<uni-list-item>
+				<template v-slot:body>
+					<view class="avatar-box">
+						<image class="avatar-img" :src="formData.avatar || '/static/uni-center/logo.png'" @click="chooseImg" mode="aspectFill"></image>
+					</view>
+				</template>
+			</uni-list-item>
+			<uni-forms-item name="gender" label="性别" required>
+				<uni-data-checkbox v-model="formData.gender" :localdata="formOptions.gender_localdata" />
+			</uni-forms-item>
+			<uni-forms-item name="mobile" label="手机号码" required>
+				<uni-easyinput placeholder="手机号码" :disabled="true" v-model="formData.mobile" trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="nickname" label="昵称" required>
+				<uni-easyinput placeholder="用户昵称" v-model="formData.nickname" trim="both" />
+			</uni-forms-item>
+			<view class="uni-button-group">
+				<button type="primary" class="uni-button" @click="submit">修改</button>
+			</view>
+		</uni-forms>
+	</view>
+</template>
+
+<script>
+	import {
+		validator
+	} from '../../js_sdk/validator/uni-id-users.js';
+	import {
+		mapMutations
+	} from 'vuex';
+	const db = uniCloud.database();
+	const dbCollectionName = 'uni-id-users';
+
+	function getValidator(fields) {
+		let reuslt = {}
+		for (let key in validator) {
+			if (fields.indexOf(key) > -1) {
+				reuslt[key] = validator[key]
+			}
+		}
+		return reuslt
+	}
+
+	export default {
+		data() {
+			return {
+				formData: {
+					"avatar": "",
+					"gender": 1,
+					"mobile": "",
+					"nickname": ""
+				},
+				formOptions: {
+					"gender_localdata": [{
+							"text": "男",
+							"value": 1
+						},
+						{
+							"text": "女",
+							"value": 2
+						}
+					]
+				},
+				rules: {
+					...getValidator(["avatar", "gender", "mobile", "nickname"])
+				}
+			}
+		},
+		onLoad(e) {
+			let id = "60795c140983f8000192f235";
+			id = uni.getStorageSync('uni_id_uid');
+			this.formDataId = id
+			this.getDetail(id)
+		},
+		onReady() {
+			this.$refs.form.setRules(this.rules)
+		},
+		methods: {
+			...mapMutations({
+				setUserInfo:'user/login'
+			}),
+			// 选择图片
+			chooseImg(){
+				uni.chooseImage({
+					count:1,
+					success:(res)=> {
+						// 头像剪裁尺寸
+						let options = {
+							width:600,
+							height:600
+						}
+						uni.navigateTo({
+							url: '/pages/ucenter/edit/uploadCutImageToUnicloud',
+							success: res => {},
+							fail: () => {},
+							complete: () => {}
+						});
+						// 剪裁并上传头像
+						uni.navigateTo({
+							url:'/pages/ucenter/edit/uploadCutImageToUnicloud?path=' + res.tempFilePaths[0] + `&options=${JSON.stringify(options)}`,
+							animationType:"fade-in",
+							events:{
+								uploadAvatarAfter:({url})=>{
+									this.formData.avatar = url;
+									this.submitForm({avatar:url});
+								}
+							}
+						});
+					}
+				})
+			},
+			/**
+			 * 触发表单提交
+			 */
+			submit() {
+				uni.showLoading({
+					mask: true
+				})
+				this.$refs.form.submit().then((res) => {
+					console.log(res);
+					this.submitForm(res)
+				}).catch((errors) => {
+					uni.hideLoading()
+				})
+			},
+
+			submitForm(value) {
+				// 使用 clientDB 提交数据
+				db.collection(dbCollectionName).doc(this.formDataId).update(value).then((res) => {
+					uni.showToast({
+						icon: 'none',
+						title: '修改成功'
+					})
+					this.setUserInfo(value);
+					// this.getOpenerEventChannel().emit('refreshData')
+					setTimeout(() => uni.navigateBack(), 500)
+				}).catch((err) => {
+					uni.showModal({
+						content: err.message || '请求服务失败',
+						showCancel: false
+					})
+				}).finally(() => {
+					uni.hideLoading()
+				})
+			},
+
+			/**
+			 * 获取表单数据
+			 * @param {Object} id
+			 */
+			getDetail(id) {
+				uni.showLoading({
+					mask: true
+				})
+				db.collection(dbCollectionName).doc(id).field('avatar,gender,mobile,nickname').get().then((res) => {
+					const data = res.result.data[0]
+					if (data) {
+						this.formData = data
+					}
+				}).catch((err) => {
+					uni.showModal({
+						content: err.message || '请求服务失败',
+						showCancel: false
+					})
+				}).finally(() => {
+					uni.hideLoading()
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-container {
+		padding: 15px;
+	}
+
+	.uni-input-border,
+	.uni-textarea-border {
+		width: 100%;
+		font-size: 14px;
+		color: #666;
+		border: 1px #e5e5e5 solid;
+		border-radius: 5px;
+		box-sizing: border-box;
+	}
+
+	.uni-input-border {
+		padding: 0 10px;
+		height: 35px;
+
+	}
+
+	.uni-textarea-border {
+		padding: 10px;
+		height: 80px;
+	}
+
+	.uni-button-group {
+		margin-top: 50px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-button {
+		width: 184px;
+		padding: 12px 20px;
+		font-size: 14px;
+		border-radius: 4px;
+		line-height: 1;
+		margin: 0;
+	}
+	
+	.avatar-box{
+		width: 700rpx;
+		height: 200rpx;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+	.avatar-img{
+		width: 150rpx;
+		height: 150rpx;
+		border-radius: 75rpx;
+		border: #F8F8F8 solid 3px;
+	}
+</style>
diff --git a/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
index f5d744a79f4f21aae60c1bd9a9345191b7d23d8a..7f1eced06f74880838557eaf162f6cc295d9a3ac 100644
--- a/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
+++ b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
@@ -370,7 +370,7 @@ $list-item-pd: $uni-spacing-col-lg $uni-spacing-row-lg;
 	/* #endif */
 	height: $uni-img-size-base;
 	width: $uni-img-size-base;
-	margin-right: 10px;
+	marin-right: 10px;
 }
 
 .uni-icon-wrapper {
diff --git a/uni_modules/uni-login-page/pages/index/phone-code.vue b/uni_modules/uni-login-page/pages/phone-code/phone-code.vue
similarity index 100%
rename from uni_modules/uni-login-page/pages/index/phone-code.vue
rename to uni_modules/uni-login-page/pages/phone-code/phone-code.vue
diff --git a/uni_modules/uni-login-page/pages/index/pwd-login.vue b/uni_modules/uni-login-page/pages/pwd-login/pwd-login.vue
similarity index 100%
rename from uni_modules/uni-login-page/pages/index/pwd-login.vue
rename to uni_modules/uni-login-page/pages/pwd-login/pwd-login.vue
diff --git a/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue b/uni_modules/uni-login-page/pages/pwd-retrieve/pwd-retrieve.vue
similarity index 100%
rename from uni_modules/uni-login-page/pages/index/pwd-retrieve.vue
rename to uni_modules/uni-login-page/pages/pwd-retrieve/pwd-retrieve.vue