From 042b286583c9504088b713dfc5adcc8b264ee048 Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Fri, 24 Feb 2017 19:26:30 +0800
Subject: [PATCH] popup component

---
 packages/zanui-css/src/popup.css  | 18 +++++++++---------
 src/mixins/popup/index.js         |  2 --
 src/mixins/popup/popup-manager.js |  7 ++-----
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/packages/zanui-css/src/popup.css b/packages/zanui-css/src/popup.css
index 11338d2c4..cb42d8dcd 100644
--- a/packages/zanui-css/src/popup.css
+++ b/packages/zanui-css/src/popup.css
@@ -1,13 +1,13 @@
-.v-modal {
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  background-color: rgba(0, 0, 0, 0.701961);
-}
-
 @component-namespace z {
+  @b modal {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    background-color: rgba(0, 0, 0, 0.701961);
+  }
+
   @b popup {
     position: fixed;
     background-color: #fff;
diff --git a/src/mixins/popup/index.js b/src/mixins/popup/index.js
index b4dd89dda..91d86fed0 100644
--- a/src/mixins/popup/index.js
+++ b/src/mixins/popup/index.js
@@ -131,10 +131,8 @@ export default {
         setTimeout(() => {
           if (this.modal && this.bodyOverflow !== 'hidden') {
             document.body.style.overflow = this.bodyOverflow;
-            document.body.style.paddingRight = this.bodyPaddingRight;
           }
           this.bodyOverflow = null;
-          this.bodyPaddingRight = null;
         }, 200);
       }
 
diff --git a/src/mixins/popup/popup-manager.js b/src/mixins/popup/popup-manager.js
index 9ba799094..55270b741 100644
--- a/src/mixins/popup/popup-manager.js
+++ b/src/mixins/popup/popup-manager.js
@@ -70,7 +70,7 @@ const PopupManager = {
 
     const modalStack = this.modalStack;
 
-    for (let i = 0, j = modalStack.length; i < j; i++) {
+    for (let i = 0, len = modalStack.length; i < len; i++) {
       const item = modalStack[i];
       if (item.id === id) {
         return;
@@ -79,10 +79,7 @@ const PopupManager = {
 
     const modalDom = getModal();
 
-    addClass(modalDom, 'v-modal');
-    setTimeout(() => {
-      removeClass(modalDom, 'v-modal-enter');
-    }, 200);
+    addClass(modalDom, 'z-modal');
 
     if (dom && dom.parentNode && dom.parentNode.nodeType !== 11) {
       dom.parentNode.appendChild(modalDom);