Merge branch 'develop'

Former-commit-id: bc86784dfabfd5e01e16c8a3a88713f199151868

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.6.10",
+  "version": "1.6.11",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",

public/index.html

@@ -21,9 +21,6 @@
       var hmid = "1dfa88d0c8571eef2d383070cb3e5ca1";
       (function() { var hm = document.createElement("script"); hm.src = "https://hm.baidu.com/hm.js?" + hmid; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(hm, s);})();
     </script>
-    <!-- ua -->
-    <script src="<%= BASE_URL %>script/ua-parser.min.js"></script>
-    <script src="<%= BASE_URL %>script/ua.js"></script>
   </head>
   <body>
     <noscript>

public/is-mobile.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>提示信息</title>
-</head>
-<body>
-  <h1>请不要使用手机浏览</h1>
-  <!-- 请自行完善此页面 -->
-</body>
-</html>

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,