diff --git a/src/avatar/avatar.less b/src/avatar/avatar.less
index 9beb22278..59c9ef772 100644
--- a/src/avatar/avatar.less
+++ b/src/avatar/avatar.less
@@ -18,7 +18,9 @@
     border-radius: 999rpx;
 
     .@{prefix}-badge {
-      position: absolute;
+      &-host {
+        position: absolute;
+      }
 
       &__round {
         top: -10%;
diff --git a/src/avatar/avatar.wxml b/src/avatar/avatar.wxml
index 5d595468d..b0fa53239 100644
--- a/src/avatar/avatar.wxml
+++ b/src/avatar/avatar.wxml
@@ -29,7 +29,7 @@
     </view>
   </view>
   <t-badge
-    class="{{prefix}}-badge {{prefix}}-badge__{{shape === 'circle' ? 'circle' : 'round'}}"
+    class="{{prefix}}-badge-host {{prefix}}-badge__{{shape === 'circle' ? 'circle' : 'round'}}"
     wx:if="{{badgeProps.dot || badgeProps.count}}"
     color="{{badgeProps.color}}"
     count="{{badgeProps.count}}"
diff --git a/src/dialog/dialog.less b/src/dialog/dialog.less
index 9019c7297..13692d122 100644
--- a/src/dialog/dialog.less
+++ b/src/dialog/dialog.less
@@ -13,7 +13,7 @@
 @dialog-btn-border-color: #eee;
 @dialog-input-bg-color: #f0f0f0;
 
-.page {
+.@{dialog}__wrapper {
   .@{dialog} {
     overflow: hidden;
     width: @dialog-width;
diff --git a/src/dialog/dialog.wxml b/src/dialog/dialog.wxml
index d31afc370..6cc8cb219 100644
--- a/src/dialog/dialog.wxml
+++ b/src/dialog/dialog.wxml
@@ -2,7 +2,7 @@
 <wxs src="./dialog.wxs" module="_" />
 
 <t-popup
-  class="page"
+  class="{{classPrefix}}__wrapper"
   visible="{{visible}}"
   showOverlay="{{showOverlay}}"
   closeOnOverlayClick="{{closeOnOverlayClick}}"