From 15ecc4120a119af24ca7cd4ca7ec92ae533dd836 Mon Sep 17 00:00:00 2001
From: Yao <chenyao1102@gmail.com>
Date: Wed, 28 Mar 2018 19:36:09 +0800
Subject: [PATCH] =?UTF-8?q?[improvement]=20Dialog:=20=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=8C=BA=E6=94=AF=E6=8C=81=E6=8D=A2=E8=A1=8C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/pages/dialog/index.js |  2 +-
 packages/dialog/index.wxml    | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/example/pages/dialog/index.js b/example/pages/dialog/index.js
index c6553092..f768fa14 100644
--- a/example/pages/dialog/index.js
+++ b/example/pages/dialog/index.js
@@ -4,7 +4,7 @@ Page(Object.assign({}, Zan.Dialog, {
   toggleBaseDialog() {
     this.showZanDialog({
       title: '弹窗',
-      content: '这是一个模态弹窗',
+      content: '这是一个模态弹窗\n换行',
       showCancel: true
     }).then(() => {
       console.log('=== dialog ===', 'type: confirm');
diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml
index 5197c41c..cd103b1e 100644
--- a/packages/dialog/index.wxml
+++ b/packages/dialog/index.wxml
@@ -4,11 +4,16 @@
     <view class="zan-dialog--container">
       <view
         wx:if="{{ zanDialog.title }}"
-        class="zan-dialog__header">{{ zanDialog.title }}</view>
+        class="zan-dialog__header"
+      >{{ zanDialog.title }}</view>
       <view
-        class="zan-dialog__content {{ zanDialog.title ? 'zan-dialog__content--title' : '' }}">{{ zanDialog.content }}</view>
+        class="zan-dialog__content {{ zanDialog.title ? 'zan-dialog__content--title' : '' }}"
+      >
+        <text>{{ zanDialog.content }}</text>
+      </view>
       <view
-        class="zan-dialog__footer {{ zanDialog.buttonsShowVertical ? 'zan-dialog__footer--vertical' : 'zan-dialog__footer--horizon' }}">
+        class="zan-dialog__footer {{ zanDialog.buttonsShowVertical ? 'zan-dialog__footer--vertical' : 'zan-dialog__footer--horizon' }}"
+      >
         <block wx:for="{{ zanDialog.buttons }}" wx:key="{{ item.text }}-{{ item.type }}">
           <button
             class="zan-dialog__button zan-btn"