From 4601f77c5c9cbd7bc3bf6b700099d69b7a4948da Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Wed, 18 Sep 2019 15:50:45 +0800
Subject: [PATCH] fix(Notify): incorrect safe area (#2044)

---
 example/pages/notify/index.js   | 4 ----
 example/pages/notify/index.json | 3 +--
 example/pages/notify/index.wxml | 7 -------
 packages/notify/index.less      | 4 ----
 packages/notify/index.ts        | 4 ++--
 packages/notify/index.wxml      | 2 +-
 packages/notify/notify.ts       | 1 +
 7 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/example/pages/notify/index.js b/example/pages/notify/index.js
index cf55e1f8..daf02e84 100644
--- a/example/pages/notify/index.js
+++ b/example/pages/notify/index.js
@@ -27,9 +27,5 @@ Page({
       type,
       message: '通知内容'
     });
-  },
-
-  onClickLeft() {
-    wx.navigateBack();
   }
 });
diff --git a/example/pages/notify/index.json b/example/pages/notify/index.json
index 531b376c..a0b1d0dc 100644
--- a/example/pages/notify/index.json
+++ b/example/pages/notify/index.json
@@ -1,4 +1,3 @@
 {
-  "navigationBarTitleText": "Notify 消息通知",
-  "navigationStyle": "custom"
+  "navigationBarTitleText": "Notify 消息通知"
 }
diff --git a/example/pages/notify/index.wxml b/example/pages/notify/index.wxml
index f01a9bcf..bac89cbf 100644
--- a/example/pages/notify/index.wxml
+++ b/example/pages/notify/index.wxml
@@ -1,10 +1,3 @@
-<van-nav-bar
-  title="Notify 消息通知"
-  left-text="返回"
-  left-arrow
-  bind:click-left="onClickLeft"
-/>
-
 <demo-block padding title="基础用法">
   <van-button type="danger" bind:click="showNotify">基础用法</van-button>
 </demo-block>
diff --git a/packages/notify/index.less b/packages/notify/index.less
index fee4b844..37f56885 100644
--- a/packages/notify/index.less
+++ b/packages/notify/index.less
@@ -11,10 +11,6 @@
   text-align: center;
   word-break: break-all;
 
-  &__safe-top {
-    height: @nav-bar-height;
-  }
-
   &--primary {
     background-color: @notify-primary-background-color;
   }
diff --git a/packages/notify/index.ts b/packages/notify/index.ts
index 64a2e038..8f4e11a8 100644
--- a/packages/notify/index.ts
+++ b/packages/notify/index.ts
@@ -8,16 +8,16 @@ VantComponent({
   mixins: [safeArea()],
 
   props: {
+    message: String,
+    background: String,
     type: {
       type: String,
       value: 'danger'
     },
-    message: String,
     color: {
       type: String,
       value: WHITE
     },
-    background: String,
     duration: {
       type: Number,
       value: 3000
diff --git a/packages/notify/index.wxml b/packages/notify/index.wxml
index 5a44673e..5cd0d15b 100644
--- a/packages/notify/index.wxml
+++ b/packages/notify/index.wxml
@@ -5,7 +5,7 @@
   custom-style="background:{{ background }}; color: {{ color }}; z-index: {{ zIndex }};"
 >
   <view bind:tap="onTap">
-    <view wx:if="{{ safeAreaInsetTop }}" class="van-notify__safe-top" style="padding-top: {{ statusBarHeight }}px"></view>
+    <view wx:if="{{ safeAreaInsetTop }}" style="padding-top: {{ statusBarHeight }}px"></view>
     {{ message }}
   </view>
 </van-transition>
diff --git a/packages/notify/notify.ts b/packages/notify/notify.ts
index 071fa2f8..7aad3f8f 100644
--- a/packages/notify/notify.ts
+++ b/packages/notify/notify.ts
@@ -23,6 +23,7 @@ const defaultOptions = {
   duration: 3000,
   zIndex: 110,
   color: WHITE,
+  safeAreaInsetTop: false,
   onClick: () => {},
   onOpened: () => {},
   onClose: () => {}