From 7c70802a8a704a06239694b1a05b13daf4007091 Mon Sep 17 00:00:00 2001
From: liuxiaohang <283700113@qq.com>
Date: Tue, 1 Dec 2020 17:50:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(h5=EF=BC=8Cmp)=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=9C=A8.nvue=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/webpack-uni-mp-loader/lib/style.js | 4 ++++
 src/core/view/index.css                     | 9 +++++++++
 src/platforms/app-plus/view/index.css       | 8 ++++++++
 src/platforms/h5/view/index.css             | 7 +++++++
 4 files changed, 28 insertions(+)

diff --git a/packages/webpack-uni-mp-loader/lib/style.js b/packages/webpack-uni-mp-loader/lib/style.js
index 171960400..b260948ba 100644
--- a/packages/webpack-uni-mp-loader/lib/style.js
+++ b/packages/webpack-uni-mp-loader/lib/style.js
@@ -36,6 +36,7 @@ module.exports = function (content, map) {
   this.callback(null,
     `<style>
   view,
+  label,
   swiper-item,
   scroll-view {
     display:flex;
@@ -62,6 +63,9 @@ module.exports = function (content, map) {
   swiper-item {
     position: absolute;
   }
+  button {
+    margin: 0;
+  }
 </style>
 ${content}`,
     map)
diff --git a/src/core/view/index.css b/src/core/view/index.css
index f8c629864..479d42cd8 100644
--- a/src/core/view/index.css
+++ b/src/core/view/index.css
@@ -122,6 +122,7 @@ uni-page {
 }
 
 [nvue] uni-view,
+[nvue] uni-label,
 [nvue] uni-swiper-item,
 [nvue] uni-scroll-view {
     display: flex;
@@ -132,22 +133,30 @@ uni-page {
     align-content: flex-start;
 }
 
+[nvue] uni-button{
+    margin: 0;
+}
+
 [nvue-dir-row] uni-view,
+[nvue-dir-row] uni-label,
 [nvue-dir-row] uni-swiper-item {
     flex-direction: row;
 }
 
 [nvue-dir-column] uni-view,
+[nvue-dir-column] uni-label,
 [nvue-dir-column] uni-swiper-item {
     flex-direction: column;
 }
 
 [nvue-dir-row-reverse] uni-view,
+[nvue-dir-row-reverse] uni-label,
 [nvue-dir-row-reverse] uni-swiper-item {
     flex-direction: row-reverse;
 }
 
 [nvue-dir-column-reverse] uni-view,
+[nvue-dir-column-reverse] uni-label,
 [nvue-dir-column-reverse] uni-swiper-item {
     flex-direction: column-reverse;
 }
diff --git a/src/platforms/app-plus/view/index.css b/src/platforms/app-plus/view/index.css
index 3a5a94096..ecfce5c14 100644
--- a/src/platforms/app-plus/view/index.css
+++ b/src/platforms/app-plus/view/index.css
@@ -108,22 +108,30 @@ uni-button[loading]:before {
   align-content: flex-start;
 }
 
+[nvue] uni-button{
+    margin: 0;
+}
+
 [nvue-dir-row] uni-view,
+[nvue-dir-row] uni-label,
 [nvue-dir-row] uni-swiper-item {
   flex-direction: row;
 }
 
 [nvue-dir-column] uni-view,
+[nvue-dir-column] uni-label,
 [nvue-dir-column] uni-swiper-item {
   flex-direction: column;
 }
 
 [nvue-dir-row-reverse] uni-view,
+[nvue-dir-row-reverse] uni-label,
 [nvue-dir-row-reverse] uni-swiper-item {
   flex-direction: row-reverse;
 }
 
 [nvue-dir-column-reverse] uni-view,
+[nvue-dir-column-reverse] uni-label,
 [nvue-dir-column-reverse] uni-swiper-item {
   flex-direction: column-reverse;
 }
diff --git a/src/platforms/h5/view/index.css b/src/platforms/h5/view/index.css
index 4278501c3..8b3d2f17c 100644
--- a/src/platforms/h5/view/index.css
+++ b/src/platforms/h5/view/index.css
@@ -132,22 +132,29 @@ uni-page {
     align-content: flex-start;
 }
 
+[nvue] uni-button{
+    margin: 0;
+}
+
 [nvue-dir-row] uni-view,
 [nvue-dir-row] uni-swiper-item {
     flex-direction: row;
 }
 
 [nvue-dir-column] uni-view,
+[nvue-dir-column] uni-label,
 [nvue-dir-column] uni-swiper-item {
     flex-direction: column;
 }
 
 [nvue-dir-row-reverse] uni-view,
+[nvue-dir-row-reverse] uni-label,
 [nvue-dir-row-reverse] uni-swiper-item {
     flex-direction: row-reverse;
 }
 
 [nvue-dir-column-reverse] uni-view,
+[nvue-dir-column-reverse] uni-label,
 [nvue-dir-column-reverse] uni-swiper-item {
     flex-direction: column-reverse;
 }
-- 
GitLab