Merge branch 'master' of http://192.168.10.18:3000/limeng/zhsq_qk_2.0

zhsq_qk-ui/src/router/index.js

@@ -91,7 +91,7 @@ export const constantRoutes = [
   },
 
   {
-    path: '',
+    path: '/',
     component: Layout,
     redirect: 'index',
     children: [
@@ -103,19 +103,19 @@ export const constantRoutes = [
       }
     ]
   },
-  // {
-  //   path: '',
-  //   component: Layout,
-  //   redirect: 'index',
-  //   children: [
-  //     {
-  //       path: 'weather',
-  //       component: () => import('@/views/fusion/index'),
-  //       name: 'weather',
-  //       meta: {title: '首页', icon: 'dashboard', affix: true}
-  //     }
-  //   ]
-  // },
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'weather',
+    children: [
+      {
+        path: 'weather',
+        component: () => import('@/views/fusion/index'),
+        name: 'weather',
+        meta: {title: '首页', icon: 'dashboard', affix: true}
+      }
+    ]
+  },
   {
     path: '/user',
     component: Layout,

zhsq_qk-ui/src/views/login.vue

@@ -141,7 +141,7 @@ export default {
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({path: this.redirect || "/"}).catch(() => {
+            this.$router.push({path: this.redirect || "/weather"}).catch(() => {
             });
           }).catch(() => {
             this.loading = false;