From 9d14f1391d8b001e94a900f7d03e01c086fc7ef1 Mon Sep 17 00:00:00 2001 From: zhengpengju Date: Tue, 28 Apr 2020 11:35:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=8C=96=E7=95=8C=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8A=A0=E8=BD=BDhtml=E5=A2=9E=E5=8A=A0versi?= =?UTF-8?q?on=E5=8F=82=E6=95=B0=E6=B8=85=E9=99=A4=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E8=87=AA=E8=BA=AB=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 841cad84ae5a65e3d41c67d926a2aca5fab75232 --- projects/WebSPA/wwwroot/images/avatar.svg | 14 ++++- projects/WebSPA/wwwroot/images/device.svg | 1 + projects/WebSPA/wwwroot/images/node.svg | 1 + projects/WebSPA/wwwroot/images/scene.svg | 1 + projects/WebSPA/wwwroot/index.html | 14 ++--- projects/WebSPA/wwwroot/js/app.js | 15 ++++- projects/WebSPA/wwwroot/pages/home.html | 77 +++++++++++++---------- 7 files changed, 79 insertions(+), 44 deletions(-) create mode 100644 projects/WebSPA/wwwroot/images/device.svg create mode 100644 projects/WebSPA/wwwroot/images/node.svg create mode 100644 projects/WebSPA/wwwroot/images/scene.svg diff --git a/projects/WebSPA/wwwroot/images/avatar.svg b/projects/WebSPA/wwwroot/images/avatar.svg index e80a3a22..824c373c 100644 --- a/projects/WebSPA/wwwroot/images/avatar.svg +++ b/projects/WebSPA/wwwroot/images/avatar.svg @@ -1 +1,13 @@ - \ No newline at end of file + + + + + + background + + + + Layer 1 + + + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/device.svg b/projects/WebSPA/wwwroot/images/device.svg new file mode 100644 index 00000000..fb4cdb40 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/device.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/node.svg b/projects/WebSPA/wwwroot/images/node.svg new file mode 100644 index 00000000..1ee2e2a5 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/node.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/scene.svg b/projects/WebSPA/wwwroot/images/scene.svg new file mode 100644 index 00000000..7de644e0 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/scene.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/index.html b/projects/WebSPA/wwwroot/index.html index 7871a2a3..f69b112a 100644 --- a/projects/WebSPA/wwwroot/index.html +++ b/projects/WebSPA/wwwroot/index.html @@ -22,9 +22,9 @@ - + @@ -37,10 +37,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/js/app.js b/projects/WebSPA/wwwroot/js/app.js index 5a857525..ef2ba7f6 100644 --- a/projects/WebSPA/wwwroot/js/app.js +++ b/projects/WebSPA/wwwroot/js/app.js @@ -24,6 +24,8 @@ axios.interceptors.request.use( } // 绝对路径替换为网关+路径 (防止多次请求重复拼接URL) config.url = config.url.indexOf('/') == 0 ? apigateway + config.url : config.url; + }else{ + config.url += `?v=${version}` } $('#loading').show(); return config; @@ -149,8 +151,17 @@ router.afterEach((route, redirect) => { }) }) -/// - +// 人人通原生返回键回调 +var onReturnBack = function (){ + if(window.api){ + window.api.execScript( + { + name: window.api.winName, + script: "api.closeWin()" + } + ) + } +} // indexedDB兼容 var indexedDB = window.indexedDB || window.webkitindexedDB || window.msIndexedDB || mozIndexedDB || null; diff --git a/projects/WebSPA/wwwroot/pages/home.html b/projects/WebSPA/wwwroot/pages/home.html index 1fa6e708..a9a184de 100644 --- a/projects/WebSPA/wwwroot/pages/home.html +++ b/projects/WebSPA/wwwroot/pages/home.html @@ -2,8 +2,8 @@
- -

+ +

消息({{store.state.messages.length}})

@@ -30,39 +30,48 @@
-
-
物联网
-
- -
- -
-

设备

-
- -
- -
-

智慧教室

-
- -
- -
-

平台场景

-
+
+ +

应用

+
+
+
+ +
+ +
+

设备管理

+
+ +
+ +
+

智慧教室

+
+ +
+ +
+

平台场景

+
+
+