Merge branch 'develop'

Former-commit-id: 86e54963ee0e06aac8432c40686f78d23195f823 [formerly 86e54963ee0e06aac8432c40686f78d23195f823 [formerly 86e54963ee0e06aac8432c40686f78d23195f823 [formerly 86e54963ee0e06aac8432c40686f78d23195f823 [formerly c0f98213677a3d00a3e9b0045c6f0a6293db2ecc [formerly 694bab97a58f54d649fea8d2d1ed3fb5916c320f]]]]]
Former-commit-id: c94d394f1f8cf1baf7edd0dec053f89383e7a23b
Former-commit-id: 718edb5d8a17a1d1b1cdda5edeb650c0d26b4f30
Former-commit-id: b7c3e3864cf0c07365202737cb0aaabbe6409bd9 [formerly 7aeeb1a18a57926cad6d145354b6a24b2334a1af]
Former-commit-id: 7e504e1c7432c34605f580bc2bf1bda97cd4fae5
Former-commit-id: 47904b69e52584dd9519efe517b5176deeb7b1ad
Former-commit-id: fa21dbbec186ad30b6e231b805571dc2f852f57f
Former-commit-id: 6d7a7fddc8ba526e2ebf18d3a8e78106b79ef03b
Former-commit-id: 18b6741885f40338d90973d67342dd1e754ce111

src/components/d2-container/components/mixins/bs.js

@@ -24,6 +24,7 @@ export default {
       // 初始化 bs
       this.BS = new BScroll(this.$refs.wrapper, Object.assign({
         mouseWheel: true,
+        click: true,
         scrollbar: {
           fade: true,
           interactive: false

src/layout/header-aside/components/menu-side/index.vue

@@ -76,7 +76,8 @@ export default {
   methods: {
     scrollInit () {
       this.BS = new BScroll(this.$el, {
-        mouseWheel: true
+        mouseWheel: true,
+        click: true
         // 如果你愿意可以打开显示滚动条
         // scrollbar: {
         //   fade: true,

src/pages/demo/plugins/better-scroll/base.vue

@@ -28,6 +28,7 @@ export default {
     scrollInit () {
       this.BS = new BScroll(this.$refs.wrapper, {
         mouseWheel: true,
+        click: true,
         scrollbar: {
           fade: true,
           interactive: false

src/pages/demo/plugins/better-scroll/to.vue

@@ -72,6 +72,7 @@ export default {
     scrollInit () {
       this.BS = new BScroll(this.$refs.wrapper, {
         mouseWheel: true,
+        click: true,
         scrollbar: {
           fade: true,
           interactive: false