From 5754f9cc0233c7b7c1e11eecdc0bfdd94a4e64d3 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 12 Aug 2018 23:27:41 +0800
Subject: [PATCH] fixed

Former-commit-id: be2ca061ff5aa476a589f08c038c7f0dccc58151 [formerly be2ca061ff5aa476a589f08c038c7f0dccc58151 [formerly be2ca061ff5aa476a589f08c038c7f0dccc58151 [formerly be2ca061ff5aa476a589f08c038c7f0dccc58151 [formerly bd874a049d98462b8723d202f26d6262771b8271 [formerly c08d7c84f79eee0e93d34d4b84b88c403d8b112e]]]]]
Former-commit-id: ddaf890553901b390016f01ff3ad2295f847b30c
Former-commit-id: d17c6bc612471555f5ace80e1a5f189b5d13f0e4
Former-commit-id: b2b28f6f7fb2be0ea576c965c99feae0cdcdec42 [formerly 847bf717999321ca85663d7b9e0dc46b0cd39040]
Former-commit-id: ca307155a6394b42e0d9bee8f021c797a4e0e891
Former-commit-id: 329e8b2dc1e1ac862f9fa1b70b1aed7c39219c3e
Former-commit-id: 7ebf12fa40704fc6f2418e766ecafc2e804c1e4c
Former-commit-id: f74bf45db03ed8a1ebe4009c5db4ca606979f17f
Former-commit-id: 59f8a783cde7f5ff28ceedf970055d5a5119f8ae
---
 src/components/d2-container/components/mixins/bs.js    | 6 +++++-
 src/layout/header-aside/components/menu-side/index.vue | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/d2-container/components/mixins/bs.js b/src/components/d2-container/components/mixins/bs.js
index 899bb398..707c21ac 100644
--- a/src/components/d2-container/components/mixins/bs.js
+++ b/src/components/d2-container/components/mixins/bs.js
@@ -29,8 +29,12 @@ export default {
       }, this.betterScrollOptions))
     },
     scrollDestroy () {
-      if (this.BS) {
+      // https://github.com/d2-projects/d2-admin/issues/75
+      try {
         this.BS.destroy()
+      } catch (e) {
+        delete this.BS
+        this.BS = null
       }
     }
   }
diff --git a/src/layout/header-aside/components/menu-side/index.vue b/src/layout/header-aside/components/menu-side/index.vue
index 428c998c..54276a72 100644
--- a/src/layout/header-aside/components/menu-side/index.vue
+++ b/src/layout/header-aside/components/menu-side/index.vue
@@ -85,8 +85,12 @@ export default {
       })
     },
     scrollDestroy () {
-      if (this.BS) {
+      // https://github.com/d2-projects/d2-admin/issues/75
+      try {
         this.BS.destroy()
+      } catch (e) {
+        delete this.BS
+        this.BS = null
       }
     }
   }