From 03048bba17966e13e864c4a3d29047986778d586 Mon Sep 17 00:00:00 2001
From: xuqingkai <xuqingkai@hd123.com>
Date: Fri, 15 Mar 2024 11:24:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8Dtabbar?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4shape=E5=9B=BA=E5=AE=9A=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=8C=BA=E6=97=A0=E9=81=AE=E6=8C=A1=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/wd-tabbar/index.scss           | 22 ++++++++++++++-----
 .../components/wd-tabbar/wd-tabbar.vue        |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/uni_modules/wot-design-uni/components/wd-tabbar/index.scss b/src/uni_modules/wot-design-uni/components/wd-tabbar/index.scss
index 497e6c47..164548f5 100644
--- a/src/uni_modules/wot-design-uni/components/wd-tabbar/index.scss
+++ b/src/uni_modules/wot-design-uni/components/wd-tabbar/index.scss
@@ -25,9 +25,26 @@
     margin-right: 32rpx;
     border-radius: 999px;
     box-shadow: $-tabbar-box-shadow;
+
+    @include when(fixed) {
+      @include when(safe) {
+        bottom: constant(safe-area-inset-bottom);
+        bottom: env(safe-area-inset-bottom);
+      }
+    }
+
   }
 
   @include m(default) {
+
+    @include when(fixed) {
+      @include when(safe) {
+        padding-bottom: constant(safe-area-inset-bottom);
+        padding-bottom: env(safe-area-inset-bottom);
+      }
+    }
+
+
     @include when(border) {
       @include halfPixelBorder('top');
     }
@@ -39,10 +56,5 @@
     bottom: 0;
     right: 0;
     z-index: 500;
-
-    @include when(safe) {
-      bottom: constant(safe-area-inset-bottom);
-      bottom: env(safe-area-inset-bottom);
-    }
   }
 }
\ No newline at end of file
diff --git a/src/uni_modules/wot-design-uni/components/wd-tabbar/wd-tabbar.vue b/src/uni_modules/wot-design-uni/components/wd-tabbar/wd-tabbar.vue
index 2a01a600..616ee6df 100644
--- a/src/uni_modules/wot-design-uni/components/wd-tabbar/wd-tabbar.vue
+++ b/src/uni_modules/wot-design-uni/components/wd-tabbar/wd-tabbar.vue
@@ -1,5 +1,5 @@
 <template>
-  <view :class="{ 'wd-tabbar__placeholder': fixed && placeholder && safeAreaInsetBottom }" :style="{ height: addUnit(height) }">
+  <view :class="{ 'wd-tabbar__placeholder': fixed && placeholder && safeAreaInsetBottom && shape === 'round' }" :style="{ height: addUnit(height) }">
     <view
       :class="`wd-tabbar wd-tabbar--${shape} ${customClass} ${fixed ? 'is-fixed' : ''} ${safeAreaInsetBottom ? 'is-safe' : ''} ${
         bordered ? 'is-border' : ''