diff --git a/packages/common/style/var.less b/packages/common/style/var.less
index b04694cd..a993f429 100644
--- a/packages/common/style/var.less
+++ b/packages/common/style/var.less
@@ -231,7 +231,7 @@
 @dialog-message-line-height: 20px;
 @dialog-message-max-height: 60vh;
 @dialog-has-title-message-text-color: @gray-7;
-@dialog-has-title-message-padding-top: @padding-sm;
+@dialog-has-title-message-padding-top: @padding-xs;
 
 // Field
 @field-label-color: @gray-7;
diff --git a/packages/dialog/index.less b/packages/dialog/index.less
index bcd9a57b..aef455e5 100644
--- a/packages/dialog/index.less
+++ b/packages/dialog/index.less
@@ -37,11 +37,16 @@
       word-wrap: break-word;
     }
 
-    &--has-title {
+    &--hasTitle {
       .theme(padding-top, '@dialog-has-title-message-padding-top');
       .theme(color, '@dialog-has-title-message-text-color');
     }
 
+    &--round-button {
+      padding-bottom: @padding-md;
+      color: @text-color;
+    }
+
     &--left {
       text-align: left;
     }
@@ -54,9 +59,9 @@
   &__footer {
     display: flex;
 
-    &--round {
+    &--round-button {
       position: relative !important;
-      padding: 0 @padding-lg - 5px @padding-md !important;
+      padding: @padding-xs @padding-lg @padding-md !important;
     }
   }
 
diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml
index bcec2742..fd13bc9a 100644
--- a/packages/dialog/index.wxml
+++ b/packages/dialog/index.wxml
@@ -5,7 +5,7 @@
   z-index="{{ zIndex }}"
   overlay="{{ overlay }}"
   transition="{{ transition }}"
-  custom-class="van-dialog {{ className }}"
+  custom-class="van-dialog van-dialog--{{ theme }} {{ className }}"
   custom-style="width: {{ utils.addUnit(width) }};{{ customStyle }}"
   overlay-style="{{ overlayStyle }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
@@ -13,7 +13,7 @@
 >
   <view
     wx:if="{{ title || useTitleSlot  }}"
-    class="van-dialog__header {{ message || useSlot ? '' : 'van-dialog--isolated' }}"
+    class="{{ utils.bem('dialog__header', { isolated: !(message || useSlot) }) }}"
   >
     <slot wx:if="{{ useTitleSlot }}" name="title" />
     <block wx:elif="{{ title }}">{{ title }}</block>
@@ -22,12 +22,12 @@
   <slot wx:if="{{ useSlot }}" />
   <view
     wx:elif="{{ message }}"
-    class="van-dialog__message {{ title ? 'van-dialog__message--has-title' : '' }} {{ messageAlign ? 'van-dialog__message--' + messageAlign : '' }}"
+    class="{{ utils.bem('dialog__message', [theme, messageAlign, { hasTitle: title }]) }}"
   >
     <text class="van-dialog__message-text">{{ message }}</text>
   </view>
 
-  <van-goods-action wx:if="{{ theme === 'round-button' }}" custom-class="van-dialog__footer--round">
+  <van-goods-action wx:if="{{ theme === 'round-button' }}" custom-class="van-dialog__footer--round-button">
     <van-goods-action-button
       wx:if="{{ showCancelButton }}"
       size="large"