From 2c11ae31932e58c0b8ce068798006f89c1f9cf7c Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 19 Sep 2018 15:44:08 +0800
Subject: [PATCH] [improvement] Popup: support custom style (#598)

---
 packages/popup/README.md  | 9 +++++----
 packages/popup/index.js   | 1 +
 packages/popup/index.wxml | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/popup/README.md b/packages/popup/README.md
index 4de8a65d..6b0f5b27 100644
--- a/packages/popup/README.md
+++ b/packages/popup/README.md
@@ -46,13 +46,14 @@ Page({
 
 | 参数 | 说明 | 类型 | 默认值 |
 |-----------|-----------|-----------|-------------|
-| show | 当前组件是否显示 | `Boolean` | `false` |
+| show | 是否显示弹出层 | `Boolean` | `false` |
+| z-index | z-index 层级 | `Number` | `100` |
 | overlay | 是否显示背景蒙层 | `Boolean` | `true` |
 | position | 可选值为 `top` `bottom` `right` `left` | `String` | - |
-| overlay-style | 自定义蒙层样式 | `String` | `` |
-| close-on-click-overlay | 点击蒙层是否关闭 Popup | `Boolean` | `true` |
-| z-index | z-index 层级 | `Number` | `100` |
 | duration | 动画时长，单位为毫秒 | `Number` | `300` |
+| custom-style | 自定义弹出层样式 | `String` | `` |
+| overlay-style | 自定义背景蒙层样式 | `String` | `` |
+| close-on-click-overlay | 点击蒙层是否关闭 Popup | `Boolean` | `true` |
 
 ### Event
 
diff --git a/packages/popup/index.js b/packages/popup/index.js
index 0b13e7d5..f580f834 100644
--- a/packages/popup/index.js
+++ b/packages/popup/index.js
@@ -6,6 +6,7 @@ create({
 
   props: {
     transition: String,
+    customStyle: String,
     overlayStyle: String,
     zIndex: {
       type: Number,
diff --git a/packages/popup/index.wxml b/packages/popup/index.wxml
index afe55bf7..902cb59d 100644
--- a/packages/popup/index.wxml
+++ b/packages/popup/index.wxml
@@ -8,7 +8,7 @@
 <view
   wx:if="{{ inited }}"
   class="custom-class van-popup {{ position ? 'van-popup--' + position : '' }}"
-  style="z-index: {{ zIndex }}; animation-name: van-{{ transition || position }}-{{ type }}; animation-duration: {{ duration }}ms; {{ display ? '' : 'display: none;' }}"
+  style="z-index: {{ zIndex }}; animation-name: van-{{ transition || position }}-{{ type }}; animation-duration: {{ duration }}ms; {{ display ? '' : 'display: none;' }}{{ customStyle }}"
   bind:animationend="onAnimationEnd"
 >
   <slot />