Merge branch 'develop'

Former-commit-id: 2d17e50a9fd07e8525d426bb54bcf9b8fbbbb257 [formerly 3144a2c265e4f9acc5d4de1a0a2b460c7e8fdf5b] [formerly 2d17e50a9fd07e8525d426bb54bcf9b8fbbbb257 [formerly 3144a2c265e4f9acc5d4de1a0a2b460c7e8fdf5b] [formerly 2d17e50a9fd07e8525d426bb54bcf9b8fbbbb257 [formerly 3144a2c265e4f9acc5d4de1a0a2b460c7e8fdf5b] [formerly 3144a2c265e4f9acc5d4de1a0a2b460c7e8fdf5b [formerly 69ab78c87c709ba7c2ee3f5df8c1a40654b1c585 [formerly 160d527f9cb9122beae5275db145c0088d5faa7e]]]]]
Former-commit-id: c58d0cebb3349615cf25c26b6874f24b9d909314
Former-commit-id: 9ed9bbe123809396fe1d708f4bddb38fdd7f653b
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
This commit is contained in:
liyang
2019-01-15 20:34:13 +08:00
5 changed files with 1 additions and 27 deletions

View File

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

View File

@@ -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>

View File

@@ -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>

View File

@@ -1 +0,0 @@
ad74810e21f5d982ae8d549334e05bd57d7378a6

View File

@@ -1,9 +0,0 @@
/* eslint-disable */
var parser = new UAParser()
var uaResult = parser.getResult()
if (uaResult.device.type === 'mobile') {
window.location.href = './is-mobile.html'
}