From 5c05145fe1815ae0816d784ef309ab2cd6a5a6e8 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 10:12:53 +0800
Subject: [PATCH] no message

Former-commit-id: 057377f96c5346a1e587c28c0bb547183c4b11b9 [formerly 057377f96c5346a1e587c28c0bb547183c4b11b9 [formerly 057377f96c5346a1e587c28c0bb547183c4b11b9 [formerly 057377f96c5346a1e587c28c0bb547183c4b11b9 [formerly da4a0e20c08e61357028360b6bf7089bf993e4cb [formerly 12b48ab460ac02f425b5387f10a8101af098043b]]]]]
Former-commit-id: b2a6a28fa5f30666249632d14555d15e02598113
Former-commit-id: cdb10cdb7b850965491c6696dc5deb44124d6a46
Former-commit-id: 512e4a19aaf79bd8cbd75bf72ba00ce759a50f1a [formerly 762ba74e5b7ca343da83694283f669dffad32308]
Former-commit-id: 2a0feaadbf3bc3dd381bcd513b767221095e07f0
Former-commit-id: 2e83cc4ef3c21767fcfd305ab01504223245528b
Former-commit-id: 276a5ebcbd0d2e25eae2d165c2bffce434cfea24
Former-commit-id: e13f9da9ccb136df2068abbe3fe6e744a0ec874e
Former-commit-id: e6423429e3b8c2625a128d4fad48bb73dd52378e
---
 .../components/d2-container-full-bs.vue       | 27 ++++++++++++++-----
 src/components/core/d2-container/index.vue    | 13 ++++++++-
 src/pages/demo/plugins/better-scroll/base.vue | 23 +++++++++++++---
 src/pages/demo/plugins/better-scroll/to.vue   | 23 +++++++++++++---
 4 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/src/components/core/d2-container/components/d2-container-full-bs.vue b/src/components/core/d2-container/components/d2-container-full-bs.vue
index 81019358..ee1235b1 100644
--- a/src/components/core/d2-container/components/d2-container-full-bs.vue
+++ b/src/components/core/d2-container/components/d2-container-full-bs.vue
@@ -15,7 +15,9 @@
 </template>
 
 <script>
+// 插件
 import BScroll from 'better-scroll'
+
 export default {
   name: 'd2-container-full',
   data () {
@@ -24,13 +26,26 @@ export default {
     }
   },
   mounted () {
-    this.BS = new BScroll(this.$refs.wrapper, {
-      mouseWheel: true,
-      scrollbar: {
-        fade: true,
-        interactive: false
+    this.scrollInit()
+  },
+  beforeDestroy () {
+    this.scrollDestroy()
+  },
+  methods: {
+    scrollInit () {
+      this.BS = new BScroll(this.$refs.wrapper, {
+        mouseWheel: true,
+        scrollbar: {
+          fade: true,
+          interactive: false
+        }
+      })
+    },
+    scrollDestroy () {
+      if (this.BS) {
+        this.BS.destroy()
       }
-    })
+    }
   }
 }
 </script>
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index 1dafcf6c..46ebf47c 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -65,7 +65,13 @@ export default {
     }
   },
   mounted () {
-    if (this.type !== 'full') {
+    this.scrollInit()
+  },
+  beforeDestroy () {
+    this.scrollDestroy()
+  },
+  methods: {
+    scrollInit () {
       this.BS = new BScroll(this.$refs.container, {
         mouseWheel: true,
         scrollbar: {
@@ -73,6 +79,11 @@ export default {
           interactive: false
         }
       })
+    },
+    scrollDestroy () {
+      if (this.BS) {
+        this.BS.destroy()
+      }
     }
   }
 }
diff --git a/src/pages/demo/plugins/better-scroll/base.vue b/src/pages/demo/plugins/better-scroll/base.vue
index 701c58ab..f9a77950 100644
--- a/src/pages/demo/plugins/better-scroll/base.vue
+++ b/src/pages/demo/plugins/better-scroll/base.vue
@@ -18,9 +18,26 @@ export default {
     }
   },
   mounted () {
-    this.BS = new BScroll(this.$refs.wrapper, {
-      mouseWheel: true
-    })
+    this.scrollInit()
+  },
+  beforeDestroy () {
+    this.scrollDestroy()
+  },
+  methods: {
+    scrollInit () {
+      this.BS = new BScroll(this.$refs.wrapper, {
+        mouseWheel: true,
+        scrollbar: {
+          fade: true,
+          interactive: false
+        }
+      })
+    },
+    scrollDestroy () {
+      if (this.BS) {
+        this.BS.destroy()
+      }
+    }
   }
 }
 </script>
diff --git a/src/pages/demo/plugins/better-scroll/to.vue b/src/pages/demo/plugins/better-scroll/to.vue
index 93e085d9..9077545b 100644
--- a/src/pages/demo/plugins/better-scroll/to.vue
+++ b/src/pages/demo/plugins/better-scroll/to.vue
@@ -42,7 +42,9 @@
 </template>
 
 <script>
+// 插件
 import BScroll from 'better-scroll'
+
 export default {
   data () {
     return {
@@ -51,9 +53,10 @@ export default {
     }
   },
   mounted () {
-    this.BS = new BScroll(this.$refs.wrapper, {
-      mouseWheel: true
-    })
+    this.scrollInit()
+  },
+  beforeDestroy () {
+    this.scrollDestroy()
   },
   methods: {
     handleScrollTo (y) {
@@ -64,6 +67,20 @@ export default {
     },
     handleScrollToElement (n) {
       this.BS.scrollToElement(`#demo-bs-item-${n}`, this.time)
+    },
+    scrollInit () {
+      this.BS = new BScroll(this.$refs.wrapper, {
+        mouseWheel: true,
+        scrollbar: {
+          fade: true,
+          interactive: false
+        }
+      })
+    },
+    scrollDestroy () {
+      if (this.BS) {
+        this.BS.destroy()
+      }
     }
   }
 }