From 6376b0b1ab46c8f1a57aecb60f6b29d78644ef08 Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Wed, 8 Mar 2017 19:48:27 +0800
Subject: [PATCH] popup

---
 docs/examples-docs/popup.md       | 12 +++++---
 docs/examples/tab.vue             | 49 -------------------------------
 src/mixins/popup/popup-manager.js |  8 ++---
 3 files changed, 10 insertions(+), 59 deletions(-)
 delete mode 100644 docs/examples/tab.vue

diff --git a/docs/examples-docs/popup.md b/docs/examples-docs/popup.md
index fa486db41..2a1049078 100644
--- a/docs/examples-docs/popup.md
+++ b/docs/examples-docs/popup.md
@@ -1,6 +1,13 @@
 <style>
 @component-namespace demo {
   @b popup {
+    .zan-popup-1 {
+      width: 100%;
+      height: 200px;
+      box-sizing: border-box;
+      padding: 20px;
+    }
+
     .zan-popup-4 {
       width: 60%;
       height: 200px;
@@ -42,7 +49,7 @@ export default {
   <zan-button @click="popupShow1 = true">从下方弹出popup</zan-button>
 </div>
 <zan-popup v-model="popupShow1" position="bottom" class="zan-popup-1">
-  xxxx
+  <zan-button @click="popupShow4 = true" type="primary">从中间弹出popup</zan-button>
 </zan-popup>
 
 <div class="zan-row">
@@ -62,9 +69,6 @@ export default {
 <div class="zan-row">
   <zan-button @click="popupShow4 = true">从中间弹出popup</zan-button>
 </div>
-<zan-popup v-model="popupShow4" transition="popup-fade" class="zan-popup-4">
-  一些内容
-</zan-popup>
 
 <script>
 export default {
diff --git a/docs/examples/tab.vue b/docs/examples/tab.vue
deleted file mode 100644
index 789d1210d..000000000
--- a/docs/examples/tab.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-  <div class="page-tab">
-    <h1 class="page-title">Tab</h1>
-    
-    <h2 class="page-sub-title">基础用法line</h2>
-    <zan-tabs>
-      <zan-tab tab-key="0" title="选项一">内容一</zan-tab>
-      <zan-tab tab-key="1" title="选项二">内容二</zan-tab>
-      <zan-tab tab-key="2" title="选项三">内容三</zan-tab>
-      <zan-tab tab-key="3" title="选项四">内容四</zan-tab>
-      <zan-tab tab-key="4" title="选项五">内容五</zan-tab>
-    </zan-tabs>
-
-    <h2 class="page-sub-title" style="margin-top: 50px;">基础用法card</h2>
-    <zan-tabs class-type="card">
-      <zan-tab tab-key="0" title="选项一">内容一</zan-tab>
-      <zan-tab tab-key="1" title="选项二">内容二</zan-tab>
-      
-    </zan-tabs>
-    
-    <h2 class="page-sub-title" style="margin-top: 50px;">自定义样式用法</h2>
-    <zan-tabs active-tab-key="2" tabs-class-name="custom-tabwrap" tab-class-name="custom-tab">
-      <zan-tab tab-key="0" title="选项一" tab-pane-class-name="custom-pane"><div class="test">内容一</div></zan-tab>
-      <zan-tab tab-key="1" title="选项二" tab-pane-class-name="custom-pane">内容二</zan-tab>
-      <zan-tab tab-key="2" title="选项三" tab-pane-class-name="custom-pane">内容三</zan-tab>
-      <zan-tab tab-key="3" title="选项四" tab-pane-class-name="custom-pane">内容四</zan-tab>
-      <zan-tab tab-key="4" title="选项五" tab-pane-class-name="custom-pane">内容五</zan-tab>
-    </zan-tabs>
-  </div>
-</template>
-<style>
-  .page-tab {
-    padding: 0 15px;
-  }
-  .custom-tabwrap .zan-tab-active{
-    color: #20a0ff;
-  }
-  .custom-tabwrap .zan-tabs-nav-bar{
-    background: #20a0ff;
-  }
-  .custom-tab {
-    font-weight: bold;
-  }
-  .custom-pane {
-    text-align: center;
-    height: 50px;
-    line-height: 50px;
-  }
-</style>
\ No newline at end of file
diff --git a/src/mixins/popup/popup-manager.js b/src/mixins/popup/popup-manager.js
index 737b9b9f3..52c2d547e 100644
--- a/src/mixins/popup/popup-manager.js
+++ b/src/mixins/popup/popup-manager.js
@@ -81,13 +81,9 @@ const PopupManager = {
 
     addClass(modalDom, 'zan-modal');
 
-    if (dom && dom.parentNode && dom.parentNode.nodeType !== 11) {
-      dom.parentNode.appendChild(modalDom);
-    } else {
-      document.body.appendChild(modalDom);
-    }
+    document.body.appendChild(modalDom);
 
-    if (zIndex) {
+    if (zIndex && !hasModal) {
       modalDom.style.zIndex = zIndex;
     }
     modalDom.style.display = '';