From d3b945e89a21e25aad82575f6b6a65a25f1e1e44 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 16 Nov 2018 11:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dghost=20card=20=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: c77cb48f0b40ce45be40edaf8319880e7eb3ec54 [formerly c77cb48f0b40ce45be40edaf8319880e7eb3ec54 [formerly c77cb48f0b40ce45be40edaf8319880e7eb3ec54 [formerly c77cb48f0b40ce45be40edaf8319880e7eb3ec54 [formerly f7d282d6c37c26e75dd9c9c3ceae6c4168f346ce [formerly 78dd6f78e40607c2c1dbea8d292268416df4ed4a]]]]]
Former-commit-id: 934abb79b910ad61e43f886b7f15087051fb829a
Former-commit-id: 61d65f9bed2fd579ca9606fa7a564474b8eec9de
Former-commit-id: 249e4111239064d7c5db13b621b94b6e12f6df02 [formerly c66b4111b574341e1b67c2dfacadbe7808fe4a55]
Former-commit-id: 042584a7af94300a07454010274be0f60bc30979
Former-commit-id: f3a80e0e2c55e8e9dddffa5934dfbf1e327c68fe
Former-commit-id: 54f669dcfb3f736449e1bcb530e9d6699b7f0755
Former-commit-id: f7f2e43621453125036ddf0b6a4ad341d532e787
Former-commit-id: fb6ca50b1484be06b4c2e6f7de5c19e0c41b6093
---
 .../d2-container/components/d2-container-card.vue  | 14 +++++++++++---
 .../d2-container/components/d2-container-ghost.vue | 10 +++++++++-
 src/pages/demo/components/container/api.vue        |  1 +
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/d2-container/components/d2-container-card.vue b/src/components/d2-container/components/d2-container-card.vue
index a8450e98..9b2a2cd2 100644
--- a/src/components/d2-container/components/d2-container-card.vue
+++ b/src/components/d2-container/components/d2-container-card.vue
@@ -3,8 +3,8 @@
     <div v-if="$slots.header" class="d2-container-card__header" ref="header">
       <slot name="header"/>
     </div>
-    <div class="d2-container-card__body">
-      <div class="d2-container-card__body-card" ref="body">
+    <div class="d2-container-card__body" ref="body">
+      <div class="d2-container-card__body-card">
         <slot/>
       </div>
     </div>
@@ -20,6 +20,14 @@ export default {
   name: 'd2-container-card',
   mixins: [
     scroll
-  ]
+  ],
+  mounted () {
+    // 增加滚动事件监听
+    this.addScrollListener()
+  },
+  beforeDestroy () {
+    // 移除滚动事件监听
+    this.removeScrollListener()
+  }
 }
 </script>
diff --git a/src/components/d2-container/components/d2-container-ghost.vue b/src/components/d2-container/components/d2-container-ghost.vue
index 4527643f..2e6f47b9 100644
--- a/src/components/d2-container/components/d2-container-ghost.vue
+++ b/src/components/d2-container/components/d2-container-ghost.vue
@@ -18,6 +18,14 @@ export default {
   name: 'd2-container-ghost',
   mixins: [
     scroll
-  ]
+  ],
+  mounted () {
+    // 增加滚动事件监听
+    this.addScrollListener()
+  },
+  beforeDestroy () {
+    // 移除滚动事件监听
+    this.removeScrollListener()
+  }
 }
 </script>
diff --git a/src/pages/demo/components/container/api.vue b/src/pages/demo/components/container/api.vue
index bd4a4d86..0f373d9d 100644
--- a/src/pages/demo/components/container/api.vue
+++ b/src/pages/demo/components/container/api.vue
@@ -1,6 +1,7 @@
 <template>
   <d2-container
     ref="container"
+    type="card"
     :scroll-delay="scrollDelay"
     @scroll="handleScroll">
     <template slot="header">