Merge branch 'zz-test' into master

# Conflicts:
#	app/src/router/index.js

app/src/router/index.js

@@ -3,14 +3,15 @@ import VueRouter from "vue-router";
 import BasicLayout from "@/layouts/BasicLayout.vue";
 import HomePage from "../views/Home/index.vue";
 import DetailPage from "../views/Detail/index.vue";
-import Basic from '../views/Basic/index.vue'
-import Fire from '../views/Fire/index.vue'
-import Risk from '../views/Risk/index.vue'
-import PoliceSituation from '../views/PoliceSituation/index.vue'
-import FireCondition from '../views/FireCondition/index.vue'
-import Iot from '../views/Iot/index.vue'
-import H5 from '../views/H5/index.vue'
-import Test from '../views/Test/index.vue'
+import Basic from "../views/Basic/index.vue";
+import Fire from "../views/Fire/index.vue";
+import Risk from "../views/Risk/index.vue";
+import PoliceSituation from "../views/PoliceSituation/index.vue";
+import FireCondition from "../views/FireCondition/index.vue";
+import Iot from "../views/Iot/index.vue";
+import H5 from "../views/H5/index.vue";
+import Test from "../views/Test/index.vue";
+import Login from "../views/login/index.vue";
 Vue.use(VueRouter);
 const router = new VueRouter({
   mode: "history",
@@ -53,57 +54,68 @@ const router = new VueRouter({
           meta: {
             id: 3,
           },
-        }, 
+        },
         {
-          path: '/risk',
-          name: 'risk',
+          path: "/risk",
+          name: "risk",
           component: Risk,
           meta: {
             id: 4,
-          }
+          },
         },
         {
-          path: '/police',
-          name: 'police',
+          path: "/police",
+          name: "police",
           component: PoliceSituation,
           meta: {
             id: 5,
-          }
+          },
         },
         {
-          path: '/fire-condition',
-          name: 'fire-condition',
+          path: "/fire-condition",
+          name: "fire-condition",
           component: FireCondition,
           meta: {
             id: 6,
-          }
+          },
         },
         {
-          path: '/iot',
-          name: 'iot',
+          path: "/iot",
+          name: "iot",
           component: Iot,
           meta: {
-            id: 7
-          }
+            id: 7,
+          },
         },
         {
-          path: '/test',
-          name: 'test',
+          path: "/test",
+          name: "test",
           component: Test,
-          meta: {}
-        }
+          meta: {},
+        },
       ],
     },
     {
       path: "/h5",
       name: "h5",
-      component: H5
+      component: H5,
     },
     {
       path: "/test/map",
       name: "map",
-      component: () => import('@/views/Test/map.vue')
-    }
+      component: () => import("@/views/Test/map.vue"),
+    },
+    { path: "/login", name: "login", component: Login },
+    // {
+    //   path: "/test/three",
+    //   name: "three",
+    //   component: () => import('@/views/Test/three.vue')
+    // },
+    {
+      path: "/test/menu",
+      name: "menu",
+      component: () => import("@/views/Test/menu.vue"),
+    },
   ],
 });
 

app/src/views/login/index.vue

@@ -0,0 +1,20 @@
+<template>
+    <div>
+        <div class="bg">
+            <div></div>
+        </div>
+    </div>
+</template>
+
+<script >
+
+</script>
+
+<style lang="less" scoped>
+.bg{
+    width: 100%;
+    height: 100vh;
+    background: url('../../assets/images/login-bg.png') no-repeat;
+    background-size: 100% 100%;
+}
+</style>