update

Former-commit-id: b9930192fd2d0cf5eb4789461a2d8844e8ce7f04

projects/IoTCenter/wwwroot/pages/home.html

@@ -2,7 +2,7 @@
     <div class="page__bd" style="height: 100%;">
         <div class="weui-tab">
             <div class="weui-tab__panel">
-
+                <a href="/">首页</a>
             </div>
             <div class="weui-tabbar">
                 <a href="javascript:;" class="weui-tabbar__item weui-bar__item_on">

projects/UserCenter/Controllers/AccountController.cs

@@ -936,6 +936,13 @@ namespace UserCenter.Controllers
             return Json(new { Code = 1 });
         }
 
+        [AllowAnonymous]
+        public IActionResult HasLogin()
+        {
+            Response.Headers["Content-Type"] = "application/javascript";
+            return Content($"var hasLogin={(User.Identity.IsAuthenticated?"true":"false")}");
+        }
+
         #region tools
 
         private void SendCodeToEmail(string email, string code)

projects/gateway/src/main/resources/static/css/framework7-icons.css

@@ -1,28 +0,0 @@
-@font-face {
-    font-family: 'Framework7 Icons';
-    font-style: normal;
-    font-weight: 400;
-    src: url("../fonts/Framework7Icons-Regular.eot");
-    src: local('Framework7 Icons'), local('Framework7Icons-Regular'), url("../fonts/Framework7Icons-Regular.woff2") format("woff2"), url("../fonts/Framework7Icons-Regular.woff") format("woff"), url("../fonts/Framework7Icons-Regular.ttf") format("truetype");
-}
-
-.f7-icons, .framework7-icons {
-    font-family: 'Framework7 Icons';
-    font-weight: normal;
-    font-style: normal;
-    font-size: 28px;
-    line-height: 1;
-    letter-spacing: normal;
-    text-transform: none;
-    display: inline-block;
-    white-space: nowrap;
-    word-wrap: normal;
-    direction: ltr;
-    -webkit-font-smoothing: antialiased;
-    text-rendering: optimizeLegibility;
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-font-feature-settings: "liga";
-    -moz-font-feature-settings: "liga=1";
-    -moz-font-feature-settings: "liga";
-    font-feature-settings: "liga";
-}

projects/gateway/src/main/resources/static/css/site.css

@@ -1,195 +0,0 @@
-.content-header2 {
-    overflow: hidden;
-}
-
-select.form-control {
-    line-height: 24px !important;
-    padding: 2px 20px 2px 16px !important;
-}
-
-.form-control-display {
-    border: none;
-    padding-left: 0;
-    height: auto !important;
-    min-height: 34px;
-}
-/*form validate*/
-.validation-summary-errors ul {
-    color: red;
-    padding-left: 0;
-}
-
-.validation-summary-errors li {
-    list-style: none;
-}
-
-.field-validation-valid, .field-validation-error {
-    color: red;
-    padding-right: 1px;
-}
-
-    .field-validation-error:before {
-        font-family: FontAwesome;
-        content: "\f057";
-    }
-/*fancy box*/
-.fancybox img.thumbnail,td .fancybox img {
-    max-width: 20px;
-    max-height: 20px;
-}
-.ke-container {
-    width: 100% !important;
-}
-/*form search*/
-.checkboxfix {
-    height: 34px;
-    padding: 7px 0;
-    display: inline-block;
-    width: 100%;
-    overflow: hidden;
-}
-
-    .checkboxfix * {
-        display: inline-block;
-        vertical-align: middle;
-        height: 20px;
-        line-height: 20px;
-    }
-
-    .checkboxfix input {
-        position: relative;
-        top: -1px;
-    }
-
-.edit-multiSelect {
-    display: block !important;
-    position: absolute;
-    visibility: hidden;
-}
-/*table*/
-td, th {
-    word-wrap: break-word;
-    white-space: normal;
-    word-break: break-all;
-    vertical-align: middle !important;
-}
-form .panel {
-    margin-top: 5px;
-}
-.panel {
-    padding: 15px;
-}
-
-.form-horizontal .control-label {
-    white-space: nowrap;
-}
-/*backTop*/
-.btn-back-top {
-    display: none;
-    right: 40px;
-    bottom: 40px;
-    position: fixed;
-    width: 61px;
-    height: 48px;
-}
-
-    .btn-back-top::before {
-        content: "";
-        display: block;
-        position: relative;
-        left: 7px;
-        top: 12px;
-        width: 22px;
-        height: 22px;
-        border-right: 6px solid white;
-        border-top: 6px solid white;
-        transform: rotate(-45deg);
-        transition: all 0.2s;
-    }
-/*tree nav current*/
-.skin-blue-light .sidebar-menu li > a {
-    display: block;
-    height: 39px;
-    line-height: 17px;
-    padding: 12px 7px !important;
-    text-shadow: none !important;
-    font-size: 13px;
-}
-
-.skin-blue-light .sidebar-menu li li > a {
-    border-top: 1px dotted #E4E4E4;
-    background-color: #fff;
-}
-
-.skin-blue-light .sidebar-menu > li {
-    display: block;
-    position: relative;
-    float: none;
-    padding: 0;
-    border-style: solid;
-    border-width: 1px 0 0;
-    border-color: #E5E5E5;
-}
-
-    .skin-blue-light .sidebar-menu > li:last-child {
-        border-bottom-width: 1px;
-    }
-
-    .skin-blue-light .sidebar-menu > li > .treeview-menu {
-        background-color: #FFF;
-        border-color: #E5E5E5 !important;
-        border-top: 1px solid;
-    }
-
-    .skin-blue-light .sidebar-menu > li.active:after {
-        display: block;
-        content: "";
-        position: absolute;
-        right: 0;
-        top: -1px;
-        bottom: 0;
-        z-index: 1;
-        border: 2px solid #2B7DBC;
-        border-width: 0 2px 0 0;
-    }
-
-.skin-blue-light .sidebar-menu li.active > a:after {
-    display: block;
-    content: "";
-    position: absolute;
-    right: 0;
-    top: 4px;
-    border: 8px solid transparent;
-    border-width: 14px 10px;
-    border-right-color: #2B7DBC;
-}
-
-.skin-blue-light .sidebar-menu li.open > a:after {
-    display: none;
-}
-
-.skin-blue-light .sidebar-menu .treeview-menu li.active > a {
-    background-color: #F5F7FA;
-    color: #2B7DBC;
-}
-
-.select2-container--default .select2-selection--single {
-    border-radius: unset;
-    border-color: #ccc;
-    height: 34px;
-}
-.pagination select {
-    background-color: #fafafa;
-    display: inline-block;
-    box-sizing: border-box;
-    height: 34px;
-    border: 1px solid #ddd;
-    border-left:none;
-    border-top-right-radius:4px;
-    border-bottom-right-radius:4px;
-    padding: 6px 12px;
-}
-
-.ajax-file-upload-container {
-    display: none;
-}

projects/gateway/src/main/resources/static/index.html

@@ -1,15 +1,32 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
-<html>
+<html lang="zh-cmn-Hans">
 <head>
-    <meta charset="utf-8">
+    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui, viewport-fit=cover">
+    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0,viewport-fit=cover">
-    <meta name="apple-mobile-web-app-capable" content="yes">
+    <link rel="stylesheet" href="lib/weui/weui.min.css">
     <link rel="stylesheet" href="css/app.css">
+    <title>物联网中心</title>
 </head>
 <body>
-<div id="loading"></div>
+    <div class="weui-toptips weui-toptips_warn js_tooltips">错误提示</div>
-<div id="app"></div>
+    <div id="app" class="container">
-<script src="lib/axios/axios.min.js"></script>
+        <router-view class="view"></router-view>
-<script src="index.html.js"></script>
+    </div>
+    <div id="loadingToast">
+        <div class="weui-mask_transparent"></div>
+        <div class="weui-toast">
+            <i class="weui-loading weui-icon_toast"></i>
+            <p class="weui-toast__content">加载中</p>
+        </div>
+    </div>
+    <script src="lib/weui.js/weui.min.js"></script>
+    <script src="lib/jquery/jquery.min.js"></script>
+    <script src="lib/axios/axios.min.js"></script>
+    <script src="lib/vue/vue.min.js"></script>
+    <script src="lib/vue-router/vue-router.min.js"></script>
+    <script src="pages/home.html.js"></script>
+    <script src="pages/login.html.js"></script>
+    <script src="UserCenter/Account/HasLogin"></script>
+    <script src="js/app.js"></script>
 </body>
 </html>

projects/gateway/src/main/resources/static/index.html.js

@@ -1,12 +0,0 @@
-axios.get('http://localhost/index.html')
-  .then(function (response) {
-
-    console.log(response);
-  })
-  .catch(function (error) {
-
-    console.log(error);
-  })
-  .finally(function () {
-
-  });

projects/gateway/src/main/resources/static/js/app.js

@@ -0,0 +1,22 @@
+const routes = [
+    { path: '/', component: home },
+    { path: '/login', component: login },
+]
+
+const router = new VueRouter({
+    routes
+})
+
+const app = new Vue({
+    router,
+    data() {
+    },
+    mounted: function () {
+        $('#loadingToast').fadeOut(100);
+        if (!hasLogin) {
+            //Vue.nextTick(function(){
+                //router.go('/login');
+            //});
+        }
+    }
+}).$mount('#app');

projects/gateway/src/main/resources/static/pages/home.html

@@ -0,0 +1,23 @@
+<div class="page js_show">
+    <div class="page__bd" style="height: 100%;">
+        <div class="weui-tab">
+            <div class="weui-tab__panel">
+                <a href="/IoTCenter/index.html">物联网中心</a>
+            </div>
+            <div class="weui-tabbar">
+                <a href="javascript:;" class="weui-tabbar__item">
+                    <i class="weui-icon-success weui-icon_msg weui-tabbar__icon"></i>
+                    <p class="weui-tabbar__label">消息</p>
+                </a>
+                <a href="javascript:;" class="weui-tabbar__item weui-bar__item_on">
+                    <i class="weui-icon-success weui-icon_msg weui-tabbar__icon"></i>
+                    <p class="weui-tabbar__label">应用</p>
+                </a>
+                <a href="javascript:;" class="weui-tabbar__item">
+                    <i class="weui-icon-success weui-icon_msg weui-tabbar__icon"></i>
+                    <p class="weui-tabbar__label">我的</p>
+                </a>
+            </div>
+        </div>
+    </div>
+</div>

projects/gateway/src/main/resources/static/pages/home.html.js

@@ -0,0 +1,19 @@
+var home = Vue.component('home', function (resolve, reject) {
+    axios.get("/pages/home.html").then(function (response) {
+        resolve({
+            template: response.data,
+            data() {
+                return {
+                    name: 'home'
+                };
+            },
+            mounted: function () {
+                $('.weui-tabbar__item').on('click', function () {
+                    $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
+                });
+            },
+            methods: {
+            }
+        })
+    });
+});

projects/gateway/src/main/resources/static/pages/login.html

@@ -0,0 +1,11 @@
+<div class="page js_show">
+    <div class="page__bd" style="height: 100%;">
+        <div class="weui-tab">
+            <div class="weui-tab__panel">
+                <a href="http://localhost/IoTCenter/index.html">物联网中心</a>
+                <router-link to="/">Home</router-link>
+                <router-link to="/login">Login</router-link>
+            </div>
+        </div>
+    </div>
+</div>

projects/gateway/src/main/resources/static/pages/login.html.js

@@ -0,0 +1,16 @@
+var login = Vue.component('login', function (resolve, reject) {
+    axios.get("/pages/login.html").then(function (response) {
+        resolve({
+            template: response.data,
+            data() {
+                return {
+                    name: 'home'
+                };
+            },
+            mounted: function () {
+            },
+            methods: {
+            }
+        })
+    });
+});