Merge branch 'develop'

Former-commit-id: 2d17e50a9fd07e8525d426bb54bcf9b8fbbbb257 [formerly 3144a2c265e4f9acc5d4de1a0a2b460c7e8fdf5b] [formerly 2d17e50a9fd07e8525d426bb54bcf9b8fbbbb257 [formerly 3144a2c265e4f9acc5d4de1a0a2b460c7e8fdf5b] [formerly 2d17e50a9fd07e8525d426bb54bcf9b8fbbbb257 [formerly 3144a2c265e4f9acc5d4de1a0a2b460c7e8fdf5b] [formerly 3144a2c265e4f9acc5d4de1a0a2b460c7e8fdf5b [formerly 69ab78c [formerly 160d527f9cb9122beae5275db145c0088d5faa7e]]]]] Former-commit-id: c58d0ce Former-commit-id: 9ed9bbe Former-commit-id: f4a2e9851be3589da1d6229f08def8344cda9572 [formerly ca0f434760c036e546f6e69d08f831f3157b2db2] Former-commit-id: c635e76efee9aaa505790bbdac1aeea2797dd84a Former-commit-id: e3c3908e9c91f9ae59706a2bbaf8b5a88ef43cea Former-commit-id: 8c605598bef7317ca9aac463afe93eb47f28e480 Former-commit-id: 82222b184697ffc949d7e492fac560b6fa7c732e Former-commit-id: c535cab29f9a474a35b74bc947e7b92f8c3cdc19
d2-projects · Jan 15, 2019 · 0ae6da2 · 0ae6da2
2 parents 54000e3 + 1517c71
commit 0ae6da2
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 27 deletions.
diff --git a/package.json b/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",

diff --git a/public/index.html b/public/index.html
@@ -21,9 +21,6 @@
       var hmid = "bc38887aa5588add05a38704342ad7e8";
       (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>

diff --git a/public/is-mobile.html b/public/is-mobile.html
diff --git a/public/script/ua-parser.min.js.REMOVED.git-id b/public/script/ua-parser.min.js.REMOVED.git-id
diff --git a/public/script/ua.js b/public/script/ua.js