From fd36e37dc01217e2e5f7baae08f4878a23666dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 13 Sep 2017 13:35:10 +0800
Subject: [PATCH] Coupon: not contain popup by default

---
 docs/examples-docs/coupon.md          | 31 ++++++++++++++++++---------
 packages/coupon-list/index.vue        | 29 +++----------------------
 packages/vant-css/src/coupon-list.css |  8 ++++++-
 3 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/docs/examples-docs/coupon.md b/docs/examples-docs/coupon.md
index 0f30ee984..fba3aede9 100644
--- a/docs/examples-docs/coupon.md
+++ b/docs/examples-docs/coupon.md
@@ -1,5 +1,3 @@
-## Coupon 优惠券选择器
-
 <script>
 import { Toast } from 'packages';
 
@@ -49,6 +47,7 @@ export default {
 
   methods: {
     onChange(index) {
+      this.showList = false;      
       this.chosenCoupon = index;
     },
     onExchange(code) {
@@ -59,6 +58,16 @@ export default {
 }
 </script>
 
+<style>
+.demo-coupon {
+  .van-popup {
+    height: 100%;
+  }
+}
+</style>
+
+## Coupon 优惠券选择器
+
 ### 使用指南
 ``` javascript
 import { CouponCell, CouponList } from 'vant';
@@ -81,14 +90,15 @@ Vue.component(CouponList.name, CouponList);
 ></van-coupon-cell>
 
 <!-- 优惠券列表 -->
-<van-coupon-list
-  v-model="showList"
-  :coupons="coupons"
-  :chosen-coupon="chosenCoupon"
-  :disabled-coupons="disabledCoupons"
-  @change="onChange"
-  @exchange="onExchange"
-></van-coupon-list>
+<van-popup v-model="showList" position="bottom">
+  <van-coupon-list
+    :coupons="coupons"
+    :chosen-coupon="chosenCoupon"
+    :disabled-coupons="disabledCoupons"
+    @change="onChange"
+    @exchange="onExchange"
+  ></van-coupon-list>
+</van-popup>
 ```
 
 ```javascript
@@ -116,6 +126,7 @@ export default {
 
   methods: {
     onChange(index) {
+      this.showList = false;
       this.chosenCoupon = index;
     },
     onExchange(code) {
diff --git a/packages/coupon-list/index.vue b/packages/coupon-list/index.vue
index 2787e4de9..9a7ddaae9 100644
--- a/packages/coupon-list/index.vue
+++ b/packages/coupon-list/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <van-popup v-model="showPopup" position="bottom" class="van-coupon-list">
+  <div class="van-coupon-list">
     <van-cell-group class="van-coupon-list__top">
       <van-field v-model="exchangeCode" :placeholder="inputPlaceholder" :maxlength="20" />
       <van-button size="small" type="danger" class="van-coupon-list__exchange" :disabled="exchangeButtonDisabled || !exchangeCode.length" @click="onClickExchangeButton">{{ exchangeButtonText }}</van-button>
@@ -22,7 +22,7 @@
       />
     </div>
     <div class="van-coupon-list__close van-hairline--top" @click="onClickNotUse">{{ closeButtonText }}</div>
-  </van-popup>
+  </div>
 </template>
 
 <script>
@@ -45,15 +45,7 @@ export default {
     [Item.name]: Item
   },
 
-  model: {
-    prop: 'show'
-  },
-
   props: {
-    show: {
-      type: Boolean,
-      default: false
-    },
     chosenCoupon: {
       type: Number,
       default: -1
@@ -93,13 +85,6 @@ export default {
   },
 
   watch: {
-    show(val) {
-      this.showPopup = val;
-    },
-    showPopup(val) {
-      this.$emit('input', val);
-      this.scrollToTop();
-    },
     displayedCouponIndex(val) {
       this.scrollToShowCoupon(val);
     }
@@ -107,8 +92,7 @@ export default {
 
   data() {
     return {
-      exchangeCode: '',
-      showPopup: this.show
+      exchangeCode: ''
     };
   },
 
@@ -118,11 +102,9 @@ export default {
 
   methods: {
     onClickNotUse() {
-      this.showPopup = false;
       this.$emit('change', -1);
     },
     onClickCoupon(index) {
-      this.showPopup = false;
       this.$emit('change', index);
     },
     onClickExchangeButton() {
@@ -142,11 +124,6 @@ export default {
           list.scrollTop = card[index].$el.offsetTop - 100;
         }
       });
-    },
-    scrollToTop() {
-      const { list } = this.$refs;
-
-      list.scrollTop = 0;
     }
   }
 };
diff --git a/packages/vant-css/src/coupon-list.css b/packages/vant-css/src/coupon-list.css
index f13498e23..8c65692f6 100644
--- a/packages/vant-css/src/coupon-list.css
+++ b/packages/vant-css/src/coupon-list.css
@@ -4,6 +4,7 @@
 .van-coupon {
   &-list {
     height: 100%;
+    position: relative;
     background-color: $background-color;
 
     &__top {
@@ -33,6 +34,7 @@
         color: $gray-dark;
         margin: 15px 0;
         font-size: 14px;
+        font-weight: normal;
         position: relative;
         text-align: center;
 
@@ -105,7 +107,8 @@
 
       h2 {
         font-size: 22px;
-        margin-bottom: 10px;
+        font-weight: normal;
+        margin: 0 0 10px;
 
         span {
           font-size: 16px;
@@ -113,6 +116,7 @@
       }
 
       p {
+        margin: 0;
         font-size: 14px;
         font-weight: 300;
         @mixin multi-ellipsis 1;
@@ -132,8 +136,10 @@
       border-radius: 0 4px 4px 0;
 
       h2 {
+        margin: 0;
         opacity: .8;
         font-size: 16px;
+        font-weight: normal;
       }
 
       p,