From b6c2ed77a4650b911f1f343b9dc9fc3d99325a2b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 16 Nov 2018 10:52:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B0=E4=B8=89=E7=A7=8D?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E7=BB=84=E4=BB=B6=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: d4b6d9fe642f5e299251b0edc1715a94334aeac7 [formerly d4b6d9fe642f5e299251b0edc1715a94334aeac7 [formerly d4b6d9fe642f5e299251b0edc1715a94334aeac7 [formerly d4b6d9fe642f5e299251b0edc1715a94334aeac7 [formerly a9078cd702fc26aea4790714afe151ec37012a56 [formerly ef67c393100d7c969ae2b5724b1320df73b87d3a]]]]]
Former-commit-id: e198314fdd7311aca3be5ad7fbaf76e238e1cba0
Former-commit-id: f7cbb90136f1f26a8a63f09289cc690fa6f3b542
Former-commit-id: 7826bd1a8e815d8ae77e5bdf6b35b2d5ea6de4ba [formerly 5f6c26021ffd1a0491b7b1f656ef6c7d67547eaa]
Former-commit-id: 80dd044d5dbef9d01816b97485276e7ca58fbba8
Former-commit-id: c0ee83666c68615ed4f5803a9f2d46c26c9105a6
Former-commit-id: bb0e8c35b2095ce60d82127fa44ed9a2035b4d12
Former-commit-id: cf982060447f3887ac2a63b29925364c3139d213
Former-commit-id: ef4a29d1348fc52ef062a80fb640ddfe86c481bc
---
 .../d2-container/components/d2-container-card.vue    |  8 ++++++--
 .../d2-container/components/d2-container-full.vue    |  2 +-
 .../d2-container/components/d2-container-ghost.vue   | 12 +++++++++++-
 .../mixins/{scroll.normal.js => normal.js}           |  5 +++--
 4 files changed, 21 insertions(+), 6 deletions(-)
 rename src/components/d2-container/components/mixins/{scroll.normal.js => normal.js} (90%)

diff --git a/src/components/d2-container/components/d2-container-card.vue b/src/components/d2-container/components/d2-container-card.vue
index 8e7e5631..a8450e98 100644
--- a/src/components/d2-container/components/d2-container-card.vue
+++ b/src/components/d2-container/components/d2-container-card.vue
@@ -4,7 +4,7 @@
       <slot name="header"/>
     </div>
     <div class="d2-container-card__body">
-      <div class="d2-container-card__body-card">
+      <div class="d2-container-card__body-card" ref="body">
         <slot/>
       </div>
     </div>
@@ -15,7 +15,11 @@
 </template>
 
 <script>
+import scroll from './mixins/normal'
 export default {
-  name: 'd2-container-card'
+  name: 'd2-container-card',
+  mixins: [
+    scroll
+  ]
 }
 </script>
diff --git a/src/components/d2-container/components/d2-container-full.vue b/src/components/d2-container/components/d2-container-full.vue
index 0c8a719a..2a36d3ae 100644
--- a/src/components/d2-container/components/d2-container-full.vue
+++ b/src/components/d2-container/components/d2-container-full.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import scroll from './mixins/scroll.normal'
+import scroll from './mixins/normal'
 export default {
   name: 'd2-container-full',
   mixins: [
diff --git a/src/components/d2-container/components/d2-container-ghost.vue b/src/components/d2-container/components/d2-container-ghost.vue
index 64b37bf6..4527643f 100644
--- a/src/components/d2-container/components/d2-container-ghost.vue
+++ b/src/components/d2-container/components/d2-container-ghost.vue
@@ -3,7 +3,7 @@
     <div v-if="$slots.header" class="d2-container-ghost__header" ref="header">
       <slot name="header"/>
     </div>
-    <div class="d2-container-ghost__body">
+    <div class="d2-container-ghost__body" ref="body">
       <slot/>
     </div>
     <div v-if="$slots.footer" class="d2-container-ghost__footer" ref="footer">
@@ -11,3 +11,13 @@
     </div>
   </div>
 </template>
+
+<script>
+import scroll from './mixins/normal'
+export default {
+  name: 'd2-container-ghost',
+  mixins: [
+    scroll
+  ]
+}
+</script>
diff --git a/src/components/d2-container/components/mixins/scroll.normal.js b/src/components/d2-container/components/mixins/normal.js
similarity index 90%
rename from src/components/d2-container/components/mixins/scroll.normal.js
rename to src/components/d2-container/components/mixins/normal.js
index 8b118f44..317132c0 100644
--- a/src/components/d2-container/components/mixins/scroll.normal.js
+++ b/src/components/d2-container/components/mixins/normal.js
@@ -49,10 +49,11 @@ export default {
     // 外部调用的方法 返回顶部
     scrollToTop () {
       const smoothscroll = () => {
-        var currentScroll = this.$refs.body.scrollTop
+        const body = this.$refs.body
+        const currentScroll = body.scrollTop
         if (currentScroll > 0) {
           window.requestAnimationFrame(smoothscroll)
-          this.$refs.body.scrollTo(0, currentScroll - (currentScroll / 5))
+          body.scrollTo(0, currentScroll - (currentScroll / 5))
         }
       }
       smoothscroll()