diff --git a/components/page-nav/page-nav.vue b/components/page-nav/page-nav.vue
index c1bb8d5a..a0522c09 100644
--- a/components/page-nav/page-nav.vue
+++ b/components/page-nav/page-nav.vue
@@ -1,99 +1,108 @@
-<template>
-	<view class="nav-wrap">
-		<view class="nav-title">
-			<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/common/logo.png" width="70px" height="70px"/>
-			<view class="nav-info">
-				<text class="nav-title__text" @tap="jumpToWx">
-					uView 2.0
+<template>
+	<view class="nav-wrap">
+		<view class="nav-title">
+			<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/common/logo.png" width="70px"
+				height="70px" />
+			<view class="nav-info">
+				<view class="nav-info__title">
+					<text class="nav-info__title__text" @tap="jumpToWx">uView 2.0</text>
 					<!-- #ifdef MP-WEIXIN -->
 					<!-- uni-app不支持text内部的text组件的tap事件，所以放到外部响应tap -->
-					<text class="nav-jump">查看1.x演示</text>
+					<text class="nav-info__title__jump">查看1.x演示</text>
 					<!-- #endif -->
-				</text>
-				<text class="nav-slogan">多平台快速开发的UI框架</text>
-			</view>
-		</view>
-		<text class="nav-desc">{{desc}}</text>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			desc: String,
-			title: String,
-		},
-		methods: {
-			jumpToWx() {
-				// #ifdef MP-WEIXIN
-				uni.navigateToMiniProgram({
-					appId: 'wx3be833c4a263e0c2'
-				})
-				// #endif
-			}
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	.nav-wrap {
-		padding: 15px;
-		position: relative;
-	}
-
-	.lang {
-		position: absolute;
-		top: 15px;
-		right: 15px;
-	}
-
-	.nav-title {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		justify-content: flex-start;
-	}
-
-	.nav-info {
+				</view>
+				<text class="nav-slogan">多平台快速开发的UI框架</text>
+			</view>
+		</view>
+		<text class="nav-desc">{{desc}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			desc: String,
+			title: String,
+		},
+		methods: {
+			jumpToWx() {
+				// #ifdef MP-WEIXIN
+				uni.navigateToMiniProgram({
+					appId: 'wx3be833c4a263e0c2'
+				})
+				// #endif
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.nav-wrap {
+		padding: 15px;
+		position: relative;
+	}
+
+	.lang {
+		position: absolute;
+		top: 15px;
+		right: 15px;
+	}
+
+	.nav-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: flex-start;
+	}
+
+	.nav-info {
 		margin-left: 15px;
-	}
-
-	.nav-title__text {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		color: $u-main-color;
-		font-size: 25px;
-		font-weight: bold;
-		align-items: flex-end;
-	}
-	
-	.nav-jump {
-		font-size: 12px;
-		color: $u-primary;
-		font-weight: normal;
-		margin-left: 20px;
-	}
-
-	.logo {
-		width: 70px;
-		height: 70px;
-		/* #ifndef APP-NVUE */
-		height: auto;
-		/* #endif */
-	}
-
-	.nav-slogan {
-		color: $u-tips-color;
-		font-size: 14px;
-	}
-
-	.nav-desc {
-		margin-top: 10px;
-		font-size: 14px;
-		color: $u-content-color;
-		line-height: 20px;
-	}
+		
+		&__title {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			/* #endif */
+			flex-direction: row;
+			align-items: center;
+			
+			&__text {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				/* #endif */
+				color: $u-main-color;
+				font-size: 25px;
+				font-weight: bold;
+				text-align: left;
+			}
+			
+			&__jump {
+				font-size: 12px;
+				color: $u-primary;
+				font-weight: normal;
+				margin-left: 20px;
+			}
+		}
+	}
+
+	.logo {
+		width: 70px;
+		height: 70px;
+		/* #ifndef APP-NVUE */
+		height: auto;
+		/* #endif */
+	}
+
+	.nav-slogan {
+		color: $u-tips-color;
+		font-size: 14px;
+	}
+
+	.nav-desc {
+		margin-top: 10px;
+		font-size: 14px;
+		color: $u-content-color;
+		line-height: 20px;
+	}
 </style>
diff --git a/manifest.json b/manifest.json
index 816d7547..42a5de16 100644
--- a/manifest.json
+++ b/manifest.json
@@ -99,10 +99,10 @@
     "mp-weixin" : {
         "appid" : "wxc256e348c4032ebd",
         "setting" : {
-            "urlCheck" : true,
+            "urlCheck" : false,
             "es6" : false,
             "minified" : false,
-            "postcss" : true
+            "postcss" : false
         },
         "optimization" : {
             "subPackages" : true
diff --git a/pages/componentsA/button/button.nvue b/pages/componentsA/button/button.nvue
index 6228e9ea..371d7204 100644
--- a/pages/componentsA/button/button.nvue
+++ b/pages/componentsA/button/button.nvue
@@ -257,7 +257,7 @@
 
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">自定义大小</text>
-			<view class="u-demo-block__content" style="padding-bottom: 15px; flex-direction: column;align-items: stretch;">
+			<view class="u-demo-block__content" style="padding-bottom: 15px; flex-direction: row;align-items: stretch;">
 				<u-button
 				    text="超大尺寸"
 				    size="large"
diff --git a/pages/componentsB/collapse/collapse.nvue b/pages/componentsB/collapse/collapse.nvue
index 2b48fcaa..270fc92e 100644
--- a/pages/componentsB/collapse/collapse.nvue
+++ b/pages/componentsB/collapse/collapse.nvue
@@ -10,7 +10,7 @@
 				<u-collapse-item
 				    title="文档指南"
 					name="Docs guide"
-				>
+				>
 					<text class="u-collapse-content">涵盖uniapp各个方面，给开发者方向指导和设计理念，让您茅塞顿开，一马平川</text>
 				</u-collapse-item>
 				<u-collapse-item
@@ -72,37 +72,40 @@
 					<text class="u-collapse-content">众多的贴心小工具，是您开发过程中召之即来的利器，让您飞镖在手，百步穿杨</text>
 				</u-collapse-item>
 			</u-collapse>
-		</view>
-		<view class="u-page__item">
-			<text class="u-page__item__title">自定义标题和内容</text>
-			<u-collapse
-				accordion
-			>
-				<u-collapse-item
-				>
-					<text slot="title" class="u-page__item__title__slot-title">文档指南</text>
-					<text class="u-collapse-content">涵盖uniapp各个方面，给开发者方向指导和设计理念，让您茅塞顿开，一马平川</text>
+		</view>
+		<!-- 微信小程序不支持，因为微信中不支持 <slot name="title" slot="title" />的写法 -->
+		<!-- #ifndef MP-WEIXIN -->
+		<view class="u-page__item">
+			<text class="u-page__item__title">自定义标题和内容</text>
+			<u-collapse
+				accordion
+			>
+				<u-collapse-item
+				>
+					<text slot="title" class="u-page__item__title__slot-title">文档指南</text>
+					<text class="u-collapse-content">涵盖uniapp各个方面，给开发者方向指导和设计理念，让您茅塞顿开，一马平川</text>
 				</u-collapse-item>
 				<!-- <u-collapse-item
 					:isLink="false"
 				>
 					<text slot="title" class="u-page__item__title__slot-title">文档指南</text>
 					<text class="u-collapse-content">涵盖uniapp各个方面，给开发者方向指导和设计理念，让您茅塞顿开，一马平川</text>
-				</u-collapse-item> -->
-				<u-collapse-item
-				    title="组件全面"
-				>
-					<u-icon name="tags-fill" size="20" slot="icon"></u-icon>
-					<text class="u-collapse-content">众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让您快速集成，开箱即用</text>
-				</u-collapse-item>
-				<u-collapse-item
-				    title="众多利器"
-				>
-					<text slot="value" class="u-page__item__title__slot-title">自定义内容</text>
-					<text class="u-collapse-content">众多的贴心小工具，是您开发过程中召之即来的利器，让您飞镖在手，百步穿杨</text>
-				</u-collapse-item>
-			</u-collapse>
-		</view>
+				</u-collapse-item> -->
+				<u-collapse-item
+				    title="组件全面"
+				>
+					<u-icon name="tags-fill" size="20" slot="icon"></u-icon>
+					<text class="u-collapse-content">众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让您快速集成，开箱即用</text>
+				</u-collapse-item>
+				<u-collapse-item
+				    title="众多利器"
+				>
+					<text slot="value" class="u-page__item__title__slot-title">自定义内容</text>
+					<text class="u-collapse-content">众多的贴心小工具，是您开发过程中召之即来的利器，让您飞镖在手，百步穿杨</text>
+				</u-collapse-item>
+			</u-collapse>
+		</view>
+		<!-- #endif -->
 		<u-gap height="50"></u-gap>
 	</view>
 </template>
@@ -115,13 +118,13 @@
 		},
 		methods: {
 			open(e) {
-				console.log('open', e)
+				// console.log('open', e)
 			},
 			close(e) {
-				console.log('close', e)
+				// console.log('close', e)
 			},
 			change(e) {
-				console.log('change', e)
+				// console.log('change', e)
 			}
 		}
 	}
diff --git a/pages/componentsC/steps/steps.nvue b/pages/componentsC/steps/steps.nvue
index 35452eec..41e6c171 100644
--- a/pages/componentsC/steps/steps.nvue
+++ b/pages/componentsC/steps/steps.nvue
@@ -1,216 +1,216 @@
-<template>
-	<view class="u-page">
-		<view class="u-demo-block">
-			<text class="u-demo-block__title">基础演示</text>
-			<view class="u-demo-block__content">
-				<u-steps :current="current1">
-					<u-steps-item
-					    title="已下单"
-					    desc="10:30"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="已出库"
-					    desc="10:35"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="运输中"
-					    desc="11:40"
-					>
-					</u-steps-item>
-				</u-steps>
-			</view>
-		</view>
-		<view class="u-demo-block">
-			<text class="u-demo-block__title">显示点类型</text>
-			<view class="u-demo-block__content">
-				<u-steps
-				    :current="1"
-				    dot
-				>
-					<u-steps-item
-					    title="已下单"
-					    desc="10:30"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="已出库"
-					    desc="10:35"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="运输中"
-					    desc="11:40"
-					>
-					</u-steps-item>
-				</u-steps>
-				<u-steps
-				    :current="1"
-				    dot
-					direction="column"
-				>
-					<u-steps-item
-					    title="已下单"
-					    desc="10:30"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="已出库"
-					    desc="10:35"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="运输中"
-					    desc="11:40"
-					>
-					</u-steps-item>
-				</u-steps>
-			</view>
-		</view>
-		<view class="u-demo-block">
-			<text class="u-demo-block__title">错误状态</text>
-			<view class="u-demo-block__content">
-				<u-steps :current="1">
-					<u-steps-item
-					    title="已下单"
-					    desc="10:30"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    error
-					    title="仓库着火"
-					    desc="10:35"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="破产清算"
-					    desc="11:40"
-					>
-					</u-steps-item>
-				</u-steps>
-			</view>
-		</view>
-		<view class="u-demo-block">
-			<text class="u-demo-block__title">自定义图标</text>
-			<view class="u-demo-block__content">
-				<u-steps
-				    :current="1"
-				    activeIcon="checkmark"
-				    inactiveIcon="arrow-right"
-				>
-					<u-steps-item
-					    title="已下单"
-					    desc="10:30"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="已出库"
-					    desc="10:35"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="运输中"
-					    desc="11:40"
-					>
-					</u-steps-item>
-				</u-steps>
-			</view>
-		</view>
-		<view class="u-demo-block">
-			<text class="u-demo-block__title">自定义插槽</text>
-			<view class="u-demo-block__content">
-				<u-steps :current="1">
-					<u-steps-item
-					    title="已下单"
-					    desc="10:30"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="已出库"
-					    desc="10:35"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="运输中"
-					    desc="11:40"
-					>
-						<text class="slot-icon" slot="icon">运</text>
-					</u-steps-item>
-				</u-steps>
-			</view>
-		</view>
-		<view class="u-demo-block">
-			<text class="u-demo-block__title">自定义颜色</text>
-			<view class="u-demo-block__content">
-				<u-steps :current="1" activeColor="#3c9cff">
-					<u-steps-item
-					    title="已下单"
-					    desc="10:30"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="已出库"
-					    desc="10:35"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="运输中"
-					    desc="11:40"
-					>
-					</u-steps-item>
-				</u-steps>
-			</view>
-		</view>
-		<view class="u-demo-block">
-			<text class="u-demo-block__title">竖向展示</text>
-			<view class="u-demo-block__content">
-				<u-steps
-				    :current="1"
-				    direction="column"
-				>
-					<u-steps-item
-					    title="已下单"
-					    desc="10:30"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="已出库"
-					    desc="10:35"
-					>
-					</u-steps-item>
-					<u-steps-item
-					    title="运输中"
-					    desc="11:40"
-					>
-					</u-steps-item>
-				</u-steps>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				current1: 1
-			}
-		},
-		onLoad() {
-		}
-	}
-</script>
-
-<style lang="scss">
-	.slot-icon {
-		width: 21px;
-		height: 21px;
-		background-color: $u-warning;
-		border-radius: 100px;
-		font-size: 12px;
-		color: #fff;
-		line-height: 21px;
-		text-align: center;
-	}
-</style>
+<template>
+	<view class="u-page">
+		<view class="u-demo-block">
+			<text class="u-demo-block__title">基础演示</text>
+			<view class="u-demo-block__content">
+				<u-steps :current="current1">
+					<u-steps-item
+					    title="已下单"
+					    desc="10:30"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="已出库"
+					    desc="10:35"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="运输中"
+					    desc="11:40"
+					>
+					</u-steps-item>
+				</u-steps>
+			</view>
+		</view>
+		<view class="u-demo-block">
+			<text class="u-demo-block__title">显示点类型</text>
+			<view class="u-demo-block__content">
+				<u-steps
+				    :current="1"
+				    dot
+				>
+					<u-steps-item
+					    title="已下单"
+					    desc="10:30"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="已出库"
+					    desc="10:35"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="运输中"
+					    desc="11:40"
+					>
+					</u-steps-item>
+				</u-steps>
+				<u-steps
+				    :current="1"
+				    dot
+					direction="column"
+				>
+					<u-steps-item
+					    title="已下单"
+					    desc="10:30"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="已出库"
+					    desc="10:35"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="运输中"
+					    desc="11:40"
+					>
+					</u-steps-item>
+				</u-steps>
+			</view>
+		</view>
+		<view class="u-demo-block">
+			<text class="u-demo-block__title">错误状态</text>
+			<view class="u-demo-block__content">
+				<u-steps :current="1">
+					<u-steps-item
+					    title="已下单"
+					    desc="10:30"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    error
+					    title="仓库着火"
+					    desc="10:35"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="破产清算"
+					    desc="11:40"
+					>
+					</u-steps-item>
+				</u-steps>
+			</view>
+		</view>
+		<view class="u-demo-block">
+			<text class="u-demo-block__title">自定义图标</text>
+			<view class="u-demo-block__content">
+				<u-steps
+				    :current="1"
+				    activeIcon="checkmark"
+				    inactiveIcon="arrow-right"
+				>
+					<u-steps-item
+					    title="已下单"
+					    desc="10:30"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="已出库"
+					    desc="10:35"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="运输中"
+					    desc="11:40"
+					>
+					</u-steps-item>
+				</u-steps>
+			</view>
+		</view>
+		<view class="u-demo-block">
+			<text class="u-demo-block__title">自定义插槽</text>
+			<view class="u-demo-block__content">
+				<u-steps :current="1">
+					<u-steps-item
+					    title="已下单"
+					    desc="10:30"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="已出库"
+					    desc="10:35"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="运输中"
+					    desc="11:40"
+					>
+						<text class="slot-icon" slot="icon">运</text>
+					</u-steps-item>
+				</u-steps>
+			</view>
+		</view>
+		<view class="u-demo-block">
+			<text class="u-demo-block__title">自定义颜色</text>
+			<view class="u-demo-block__content">
+				<u-steps :current="1" activeColor="#3c9cff">
+					<u-steps-item
+					    title="已下单"
+					    desc="10:30"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="已出库"
+					    desc="10:35"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="运输中"
+					    desc="11:40"
+					>
+					</u-steps-item>
+				</u-steps>
+			</view>
+		</view>
+		<view class="u-demo-block">
+			<text class="u-demo-block__title">竖向展示</text>
+			<view class="u-demo-block__content">
+				<u-steps
+				    :current="1"
+				    direction="column"
+				>
+					<u-steps-item
+					    title="已下单"
+					    desc="10:30"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="已出库"
+					    desc="10:35"
+					>
+					</u-steps-item>
+					<u-steps-item
+					    title="运输中"
+					    desc="11:40"
+					>
+					</u-steps-item>
+				</u-steps>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				current1: 1
+			}
+		},
+		onLoad() {
+		}
+	}
+</script>
+
+<style lang="scss">
+	.slot-icon {
+		width: 21px;
+		height: 21px;
+		background-color: $u-warning;
+		border-radius: 100px;
+		font-size: 12px;
+		color: #fff;
+		line-height: 21px;
+		text-align: center;
+	}
+</style>
diff --git a/uni_modules/uview-v2/components/u-button/u-button.vue b/uni_modules/uview-v2/components/u-button/u-button.vue
index b0552ccd..49f7b8f1 100644
--- a/uni_modules/uview-v2/components/u-button/u-button.vue
+++ b/uni_modules/uview-v2/components/u-button/u-button.vue
@@ -162,6 +162,12 @@ export default {
     // #ifndef MP
     mixins: [uni.$u.mixin, props],
     // #endif
+	// #ifdef MP-WEIXIN
+	// 将自定义节点设置成虚拟的，更加接近Vue组件的表现，能更好的使用flex属性
+	// options: {
+	// 	virtualHost: true
+	// },
+	// #endif
     data() {
         return {};
     },
@@ -362,6 +368,7 @@ $u-button-hairline-border-width: 0.5px !default;
     box-sizing: border-box;
     /* #endif */
     flex-direction: row;
+	flex: 1;
 
     &__text {
         font-size: $u-button-text-font-size;
diff --git a/uni_modules/uview-v2/components/u-code-input/u-code-input.vue b/uni_modules/uview-v2/components/u-code-input/u-code-input.vue
index e127f86e..d1efbacb 100644
--- a/uni_modules/uview-v2/components/u-code-input/u-code-input.vue
+++ b/uni_modules/uview-v2/components/u-code-input/u-code-input.vue
@@ -163,6 +163,7 @@
 	.u-code-input {
 		@include flex;
 		position: relative;
+		overflow: hidden;
 
 		&__item {
 			@include flex;
@@ -195,7 +196,7 @@
 			// 之所以需要input输入框，是因为有它才能唤起键盘
 			// 这里将它设置为两倍的屏幕宽度，再将左边的一半移出屏幕，为了不让用户看到输入的内容
 			position: absolute;
-			left: -750rpx;
+			left: -150rpx;
 			width: 1500rpx;
 			top: 0;
 			background-color: transparent;
diff --git a/uni_modules/uview-v2/components/u-collapse-item/u-collapse-item.vue b/uni_modules/uview-v2/components/u-collapse-item/u-collapse-item.vue
index 4d98c5e7..18eb463d 100644
--- a/uni_modules/uview-v2/components/u-collapse-item/u-collapse-item.vue
+++ b/uni_modules/uview-v2/components/u-collapse-item/u-collapse-item.vue
@@ -12,22 +12,39 @@
 			:arrowDirection="expanded ? 'up' : 'down'"
 			:disabled="disabled"
 		>
-			<slot
-				name="title"
-				slot="title"
-			/>
-			<slot
-				name="icon"
-				slot="icon"
-			/>
-			<slot
-				name="value"
-				slot="value"
-			/>
-			<slot
-				name="right-icon"
-				slot="right-icon"
-			/>
+			<!-- #ifndef MP-WEIXIN -->
+			<!-- 微信小程序不支持，因为微信中不支持 <slot name="title" slot="title" />的写法 -->
+			<slot
+				name="title"
+				slot="title"
+			/>
+			<slot
+				name="icon"
+				slot="icon"
+			/>
+			<slot
+				name="value"
+				slot="value"
+			/>
+			<slot
+				name="right-icon"
+				slot="right-icon"
+			/>
+			<!-- #endif -->
+			<!-- #ifdef MP-WEIXIN -->
+			<slot
+				name="title"
+			/>
+			<slot
+				name="icon"
+			/>
+			<slot
+				name="value"
+			/>
+			<slot
+				name="right-icon"
+			/>
+			<!-- #endif -->
 		</u-cell>
 		<view
 			class="u-collapse-item__content"
diff --git a/uni_modules/uview-v2/components/u-empty/u-empty.vue b/uni_modules/uview-v2/components/u-empty/u-empty.vue
index f256799f..5e3d0450 100644
--- a/uni_modules/uview-v2/components/u-empty/u-empty.vue
+++ b/uni_modules/uview-v2/components/u-empty/u-empty.vue
@@ -6,7 +6,7 @@
 	>
 		<u-icon
 		    v-if="!isSrc"
-		    :name="'empty-' + mode"
+		    :name="mode === 'message' ? 'chat' : `empty-${mode}`"
 		    :size="iconSize"
 		    :color="iconColor"
 		    margin-top="14"
@@ -56,7 +56,7 @@
 	 */
 	export default {
 		name: "u-empty",
-		mixins: [uni.$u.mixin,props],
+		mixins: [uni.$u.mixin, props],
 		data() {
 			return {
 				icons: {
diff --git a/uni_modules/uview-v2/components/u-steps-item/u-steps-item.vue b/uni_modules/uview-v2/components/u-steps-item/u-steps-item.vue
index d6c5ff6c..df33f00e 100644
--- a/uni_modules/uview-v2/components/u-steps-item/u-steps-item.vue
+++ b/uni_modules/uview-v2/components/u-steps-item/u-steps-item.vue
@@ -1,353 +1,320 @@
-<template>
-	<view
-		class="u-steps-item"
-		ref="u-steps-item"
-		:class="[`u-steps-item--${parentData.direction}`]"
-	>
-		<view
-			class="u-steps-item__line"
-			v-if="index + 1 < childLength"
-			:class="[`u-steps-item__line--${parentData.direction}`]"
-			:style="[lineStyle]"
-		></view>
-		<view
-			class="u-steps-item__wrapper"
-			:class="[`u-steps-item__wrapper--${parentData.direction}`, parentData.dot && `u-steps-item__wrapper--${parentData.direction}--dot`]"
-		>
-			<slot name="icon">
-				<view
-					class="u-steps-item__wrapper__dot"
-					v-if="parentData.dot"
-					:style="{
-						backgroundColor: statusColor
-					}"
-				>
-
-				</view>
-				<view
-					class="u-steps-item__wrapper__icon"
-					v-else-if="parentData.activeIcon || parentData.inactiveIcon"
-				>
-					<u-icon
-						:name="index <= parentData.current ? parentData.activeIcon : parentData.inactiveIcon"
-						:size="iconSize"
-						:color="index <= parentData.current ? parentData.activeColor : parentData.inactiveColor"
-					></u-icon>
-				</view>
-				<view
-					v-else
-					:style="{
-						backgroundColor: statusClass === 'process' ? parentData.activeColor : 'transparent',
-						borderColor: statusColor
-					}"
-					class="u-steps-item__wrapper__circle"
-				>
-					<text
-						v-if="statusClass === 'process' || statusClass === 'wait'"
-						class="u-steps-item__wrapper__circle__text"
-						:style="{
-							color: index == parentData.current ? '#ffffff' : parentData.inactiveColor
-						}"
-					>{{ index + 1}}</text>
-					<u-icon
-						v-else
-						:color="statusClass === 'error' ? 'error' : parentData.activeColor"
-						size="12"
-						:name="statusClass === 'error' ? 'close' : 'checkmark'"
-					></u-icon>
-				</view>
-			</slot>
-		</view>
-		<view
-			class="u-steps-item__content"
-			:class="[`u-steps-item__content--${parentData.direction}`]"
-			:style="[contentStyle]"
-		>
-			<u--text
-				:text="title"
-				:type="parentData.current == index ? 'main' : 'content'"
-				lineHeight="20px"
-				:size="parentData.current == index ? 14 : 13"
-			></u--text>
-			<slot name="desc">
-				<u--text
-					:text="desc"
-					type="tips"
-					size="12"
-				></u--text>
-			</slot>
-		</view>
-		<!-- <view
-		    class="u-steps-item__line"
-		    v-if="showLine && parentData.direction === 'column'"
-			:class="[`u-steps-item__line--${parentData.direction}`]"
-		    :style="[lineStyle]"
-		></view> -->
-	</view>
-</template>
-
-<script>
-	import props from './props.js';
-	// #ifdef APP-NVUE
-	const dom = uni.requireNativePlugin('dom')
-	// #endif
-	/**
-	 * StepsItem 步骤条的子组件
-	 * @description 本组件需要和u-steps配合使用
-	 * @tutorial https://uviewui.com/components/steps.html
-	 * @property {String}			title			标题文字
-	 * @property {String}			current			描述文本
-	 * @property {String | Number}	iconSize		图标大小  (默认 17 )
-	 * @property {Boolean}			error			当前步骤是否处于失败状态  (默认 false )
-	 * @example <u-steps current="0"><u-steps-item title="已出库" desc="10:35" ></u-steps-item></u-steps>
-	 */
-	export default {
-		name: 'u-steps-item',
+<template>
+	<view class="u-steps-item" ref="u-steps-item" :class="[`u-steps-item--${parentData.direction}`]">
+		<view class="u-steps-item__line" v-if="index + 1 < childLength"
+			:class="[`u-steps-item__line--${parentData.direction}`]" :style="[lineStyle]"></view>
+		<view class="u-steps-item__wrapper"
+			:class="[`u-steps-item__wrapper--${parentData.direction}`, parentData.dot && `u-steps-item__wrapper--${parentData.direction}--dot`]">
+			<slot name="icon">
+				<view class="u-steps-item__wrapper__dot" v-if="parentData.dot" :style="{
+						backgroundColor: statusColor
+					}">
+
+				</view>
+				<view class="u-steps-item__wrapper__icon" v-else-if="parentData.activeIcon || parentData.inactiveIcon">
+					<u-icon :name="index <= parentData.current ? parentData.activeIcon : parentData.inactiveIcon"
+						:size="iconSize"
+						:color="index <= parentData.current ? parentData.activeColor : parentData.inactiveColor">
+					</u-icon>
+				</view>
+				<view v-else :style="{
+						backgroundColor: statusClass === 'process' ? parentData.activeColor : 'transparent',
+						borderColor: statusColor
+					}" class="u-steps-item__wrapper__circle">
+					<text v-if="statusClass === 'process' || statusClass === 'wait'"
+						class="u-steps-item__wrapper__circle__text" :style="{
+							color: index == parentData.current ? '#ffffff' : parentData.inactiveColor
+						}">{{ index + 1}}</text>
+					<u-icon v-else :color="statusClass === 'error' ? 'error' : parentData.activeColor" size="12"
+						:name="statusClass === 'error' ? 'close' : 'checkmark'"></u-icon>
+				</view>
+			</slot>
+		</view>
+		<view class="u-steps-item__content" :class="[`u-steps-item__content--${parentData.direction}`]"
+			:style="[contentStyle]">
+			<u--text :text="title" :type="parentData.current == index ? 'main' : 'content'" lineHeight="20px"
+				:size="parentData.current == index ? 14 : 13"></u--text>
+			<slot name="desc">
+				<u--text :text="desc" type="tips" size="12"></u--text>
+			</slot>
+		</view>
+		<!-- <view
+		    class="u-steps-item__line"
+		    v-if="showLine && parentData.direction === 'column'"
+			:class="[`u-steps-item__line--${parentData.direction}`]"
+		    :style="[lineStyle]"
+		></view> -->
+	</view>
+</template>
+
+<script>
+	import props from './props.js';
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom')
+	// #endif
+	/**
+	 * StepsItem 步骤条的子组件
+	 * @description 本组件需要和u-steps配合使用
+	 * @tutorial https://uviewui.com/components/steps.html
+	 * @property {String}			title			标题文字
+	 * @property {String}			current			描述文本
+	 * @property {String | Number}	iconSize		图标大小  (默认 17 )
+	 * @property {Boolean}			error			当前步骤是否处于失败状态  (默认 false )
+	 * @example <u-steps current="0"><u-steps-item title="已出库" desc="10:35" ></u-steps-item></u-steps>
+	 */
+	export default {
+		name: 'u-steps-item',
 		mixins: [uni.$u.mixin, props],
-		data() {
-			return {
-				index: 0,
-				childLength: 0,
-				showLine: false,
-				size: {
-					height: 0,
-					width: 0
-				},
-				parentData: {
-					direction: 'row',
-					current: 0,
-					activeColor: '',
-					inactiveColor: '',
-					activeIcon: '',
-					inactiveIcon: '',
-					dot: false
-				}
-			}
+		// #ifdef MP-WEIXIN
+		// 将自定义节点设置成虚拟的，更加接近Vue组件的表现，能更好的使用flex属性
+		options: {
+			virtualHost: true
 		},
-		watch: {
-			'parentData'(newValue, oldValue) {
-				console.log(newValue, 33);
-			}
-		},
-		created() {
-			this.init()
-		},
-		computed: {
-			lineStyle() {
-				const style = {}
-				if (this.parentData.direction === 'row') {
-					style.width = this.size.width + 'px'
-					style.left = this.size.width / 2 + 'px'
-				} else {
-					style.height = this.size.height + 'px'
-					// style.top = this.size.height / 2 + 'px'
-				}
-				style.backgroundColor = this.parent.children[this.index + 1].error ? uni.$u.color.error : this.index < this
-					.parentData
-					.current ? this.parentData.activeColor : this.parentData.inactiveColor
-				return style
-			},
-			statusClass() {
-				const {
-					index,
-					error
-				} = this
-				const {
-					current
-				} = this.parentData
-				if (current == index) {
-					return error === true ? 'error' : 'process'
-				} else if (error) {
-					return 'error'
-				} else if (current > index) {
-					return 'finish'
-				} else {
-					return 'wait'
-				}
-			},
-			statusColor() {
-				let color = ''
-				switch (this.statusClass) {
-					case 'finish':
-						color = this.parentData.activeColor
-						break
-					case 'error':
-						color = uni.$u.color.error
-						break
-					case 'process':
-						color = this.parentData.dot ? this.parentData.activeColor : 'transparent'
-						break
-					default:
-						color = this.parentData.inactiveColor
-						break
-				}
-				return color
-			},
-			contentStyle() {
-				const style = {}
-				if(this.parentData.direction === 'column') {
-					style.marginLeft = this.parentData.dot ? '2px' : '6px'
-					style.marginTop = this.parentData.dot ? '0px' : '6px'
-				} else {
-					style.marginTop = this.parentData.dot ? '2px' : '6px'
-					style.marginLeft = this.parentData.dot ? '2px' : '6px'
-				}
-				
-				return style
-			}
-		},
-		mounted() {
-			this.parent && this.parent.updateFromChild()
-			uni.$u.sleep().then(() => {
-				this.getStepsItemRect()
-			})
-		},
-		methods: {
-			init() {
-				// 初始化数据
-				this.updateParentData()
-				if (!this.parent) {
-					return uni.$u.error('u-steps-item必须要搭配u-steps组件使用')
-				}
+		// #endif
+		data() {
+			return {
+				index: 0,
+				childLength: 0,
+				showLine: false,
+				size: {
+					height: 0,
+					width: 0
+				},
+				parentData: {
+					direction: 'row',
+					current: 0,
+					activeColor: '',
+					inactiveColor: '',
+					activeIcon: '',
+					inactiveIcon: '',
+					dot: false
+				}
+			}
+		},
+		watch: {
+			'parentData'(newValue, oldValue) {
+				console.log(newValue, 33);
+			}
+		},
+		created() {
+			this.init()
+		},
+		computed: {
+			lineStyle() {
+				const style = {}
+				if (this.parentData.direction === 'row') {
+					style.width = this.size.width + 'px'
+					style.left = this.size.width / 2 + 'px'
+				} else {
+					style.height = this.size.height + 'px'
+					// style.top = this.size.height / 2 + 'px'
+				}
+				style.backgroundColor = this.parent.children?.[this.index + 1]?.error ? uni.$u.color.error : this.index <
+					this
+					.parentData
+					.current ? this.parentData.activeColor : this.parentData.inactiveColor
+				return style
+			},
+			statusClass() {
+				const {
+					index,
+					error
+				} = this
+				const {
+					current
+				} = this.parentData
+				if (current == index) {
+					return error === true ? 'error' : 'process'
+				} else if (error) {
+					return 'error'
+				} else if (current > index) {
+					return 'finish'
+				} else {
+					return 'wait'
+				}
+			},
+			statusColor() {
+				let color = ''
+				switch (this.statusClass) {
+					case 'finish':
+						color = this.parentData.activeColor
+						break
+					case 'error':
+						color = uni.$u.color.error
+						break
+					case 'process':
+						color = this.parentData.dot ? this.parentData.activeColor : 'transparent'
+						break
+					default:
+						color = this.parentData.inactiveColor
+						break
+				}
+				return color
+			},
+			contentStyle() {
+				const style = {}
+				if (this.parentData.direction === 'column') {
+					style.marginLeft = this.parentData.dot ? '2px' : '6px'
+					style.marginTop = this.parentData.dot ? '0px' : '6px'
+				} else {
+					style.marginTop = this.parentData.dot ? '2px' : '6px'
+					style.marginLeft = this.parentData.dot ? '2px' : '6px'
+				}
+
+				return style
+			}
+		},
+		mounted() {
+			this.parent && this.parent.updateFromChild()
+			uni.$u.sleep().then(() => {
+				this.getStepsItemRect()
+			})
+		},
+		methods: {
+			init() {
+				// 初始化数据
+				this.updateParentData()
+				if (!this.parent) {
+					return uni.$u.error('u-steps-item必须要搭配u-steps组件使用')
+				}
 				this.index = this.parent.children.indexOf(this)
-				this.childLength = this.parent.children.length
-			},
-			updateParentData() {
-				// 此方法在mixin中
-				this.getParentData('u-steps')
-			},
-			// 父组件数据发生变化
-			updateFromParent() {
-				this.init()
-			},
-			// 获取组件的尺寸，用于设置横线的位置
-			getStepsItemRect() {
-				// #ifndef APP-NVUE
-				this.$uGetRect('.u-steps-item').then(size => {
-					this.size = size
-				})
-				// #endif
-
-				// #ifdef APP-NVUE
-				dom.getComponentRect(this.$refs['u-steps-item'], res => {
-					const {
-						size
-					} = res
-					this.size = size
-				})
-				// #endif
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "../../libs/css/components.scss";
-
-	.u-steps-item {
-		flex: 1;
-		@include flex;
-
-		&--row {
-			flex-direction: column;
-			align-items: center;
-		}
-
-		&--column {
-			flex-direction: row;
-			justify-content: flex-start;
-			padding-bottom: 5px;
-		}
-
-		&__wrapper {
-			@include flex;
-			justify-content: center;
-			align-items: center;
-			position: relative;
-			background-color: #fff;
-
-			&--column {
-				width: 20px;
-				height: 32px;
-				
-				&--dot {
-					height: 20px;
-					width: 20px;
-				}
-			}
-
-			&--row {
-				width: 32px;
-				height: 20px;
-				
-				&--dot {
-					width: 20px;
-					height: 20px;
-				}
-			}
-
-			&__circle {
-				width: 20px;
-				height: 20px;
-				/* #ifndef APP-NVUE */
-				box-sizing: border-box;
-				flex-shrink: 0;
-				/* #endif */
-				border-radius: 100px;
-				border-width: 1px;
-				border-color: $u-tips-color;
-				@include flex(row);
-				align-items: center;
-				justify-content: center;
-				transition: background-color 0.3s;
-
-				&__text {
-					color: $u-tips-color;
-					font-size: 11px;
-					@include flex(row);
-					align-items: center;
-					justify-content: center;
-					text-align: center;
-					line-height: 11px;
-				}
-			}
-
-			&__dot {
-				width: 10px;
-				height: 10px;
-				border-radius: 100px;
-				background-color: $u-content-color;
-			}
-		}
-
-		&__content {
-			@include flex;
-			flex: 1;
-
-			&--row {
-				flex-direction: column;
-				align-items: center;
-			}
-
-			&--column {
-				flex-direction: column;
-				margin-left: 6px;
-			}
-		}
-
-		&__line {
-			position: absolute;
-			background: $u-tips-color;
-
-			&--row {
-				top: 10px;
-				height: 1px;
-			}
-
-			&--column {
-				width: 1px;
-				left: 10px;
-			}
-		}
-	}
+				this.childLength = this.parent.children.length
+			},
+			updateParentData() {
+				// 此方法在mixin中
+				this.getParentData('u-steps')
+			},
+			// 父组件数据发生变化
+			updateFromParent() {
+				this.init()
+			},
+			// 获取组件的尺寸，用于设置横线的位置
+			getStepsItemRect() {
+				// #ifndef APP-NVUE
+				this.$uGetRect('.u-steps-item').then(size => {
+					this.size = size
+				})
+				// #endif
+
+				// #ifdef APP-NVUE
+				dom.getComponentRect(this.$refs['u-steps-item'], res => {
+					const {
+						size
+					} = res
+					this.size = size
+				})
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "../../libs/css/components.scss";
+
+	.u-steps-item {
+		flex: 1;
+		@include flex;
+
+		&--row {
+			flex-direction: column;
+			align-items: center;
+		}
+
+		&--column {
+			flex-direction: row;
+			justify-content: flex-start;
+			padding-bottom: 5px;
+		}
+
+		&__wrapper {
+			@include flex;
+			justify-content: center;
+			align-items: center;
+			position: relative;
+			background-color: #fff;
+
+			&--column {
+				width: 20px;
+				height: 32px;
+
+				&--dot {
+					height: 20px;
+					width: 20px;
+				}
+			}
+
+			&--row {
+				width: 32px;
+				height: 20px;
+
+				&--dot {
+					width: 20px;
+					height: 20px;
+				}
+			}
+
+			&__circle {
+				width: 20px;
+				height: 20px;
+				/* #ifndef APP-NVUE */
+				box-sizing: border-box;
+				flex-shrink: 0;
+				/* #endif */
+				border-radius: 100px;
+				border-width: 1px;
+				border-color: $u-tips-color;
+				@include flex(row);
+				align-items: center;
+				justify-content: center;
+				transition: background-color 0.3s;
+
+				&__text {
+					color: $u-tips-color;
+					font-size: 11px;
+					@include flex(row);
+					align-items: center;
+					justify-content: center;
+					text-align: center;
+					line-height: 11px;
+				}
+			}
+
+			&__dot {
+				width: 10px;
+				height: 10px;
+				border-radius: 100px;
+				background-color: $u-content-color;
+			}
+		}
+
+		&__content {
+			@include flex;
+			flex: 1;
+
+			&--row {
+				flex-direction: column;
+				align-items: center;
+			}
+
+			&--column {
+				flex-direction: column;
+				margin-left: 6px;
+			}
+		}
+
+		&__line {
+			position: absolute;
+			background: $u-tips-color;
+
+			&--row {
+				top: 10px;
+				height: 1px;
+			}
+
+			&--column {
+				width: 1px;
+				left: 10px;
+			}
+		}
+	}
 </style>
diff --git a/uni_modules/uview-v2/libs/mixin/mixin.js b/uni_modules/uview-v2/libs/mixin/mixin.js
index a6f8b456..875e9525 100644
--- a/uni_modules/uview-v2/libs/mixin/mixin.js
+++ b/uni_modules/uview-v2/libs/mixin/mixin.js
@@ -4,7 +4,9 @@ module.exports = {
 		// 每个组件都有的父组件传递的样式，可以为字符串或者对象形式
 		customStyle: {
 			type: [Object, String],
-			default: () => {}
+			default: () => {
+				return {}
+			}
 		},
 		customClass: {
 			type: String,