浏览代码

主页面初版

Michael Wang 4 年之前
父节点
当前提交
83963c2bf4

+ 1 - 0
src/features/Login/Login.vue

@@ -123,6 +123,7 @@ export default {
               message: "登录成功",
               type: "success",
             });
+            this.$router.push("/home");
           } catch (error) {
             // console.log(error?.response?.data?.message);
             this.user.errorInfo = error?.response?.data?.message || "";

+ 10 - 3
src/router/index.js

@@ -2,7 +2,8 @@ import { getToken } from "@/auth/auth";
 import { isNil } from "lodash-es";
 import Vue from "vue";
 import VueRouter from "vue-router";
-import Home from "../views/Home.vue";
+import Home from "../views/Home/Home.vue";
+import Layout from "@/views/Layout/Layout.vue";
 
 // ignore NavigationDuplicated. https://github.com/vuejs/vue-router/issues/2881
 const originalPush = VueRouter.prototype.push;
@@ -32,9 +33,15 @@ Vue.use(VueRouter);
 
 const routes = [
   {
-    path: "/",
+    path: "/home",
     name: "Home",
-    component: Home,
+    component: Layout,
+    children: [
+      {
+        path: "",
+        component: Home,
+      },
+    ],
   },
   {
     path: "/about",

+ 1 - 9
src/store/modules/user.js

@@ -6,21 +6,13 @@ import { setToken } from "@/auth/auth";
 
 const user = {
   state: {
-    accountType: "LOGIN_NAME",
-    datasetId: null,
     loginName: "",
     name: "",
-    partitionId: null,
-    roleList: null,
-    smsSendDate: null,
   },
 
   mutations: {
     SET_USER: (state, user) => {
       // state.user = user;
-      if (user && user.datasetId === -1) {
-        user.datasetId = null;
-      }
       state = Object.assign(state, user);
     },
     SET_SMS_SEND_DATE: (state, date) => {
@@ -32,7 +24,7 @@ const user = {
     // 用户名登录
     [LOGIN_BY_USERNAME]({ commit }, userInfo) {
       return loginByUsername(userInfo).then((response) => {
-        const data = response.data;
+        const data = response.data.data;
         commit("SET_USER", omit(data.account, ["token", "uid"]));
         setToken(data.accessToken);
       });

+ 0 - 0
src/views/Home.vue → src/views/Home/Home.vue


+ 1 - 1
src/samples/Layout_01/Layout_01.vue → src/views/Layout/Layout.vue

@@ -14,7 +14,7 @@ import SideBar from "./components/SideBar.vue";
 import NavBar from "./components/NavBar.vue";
 
 export default {
-  name: "Layout_01",
+  name: "Layout",
   components: {
     NavBar,
     SideBar,

+ 0 - 0
src/samples/Layout_01/components/AppMain.vue → src/views/Layout/components/AppMain.vue


+ 7 - 1
src/samples/Layout_01/components/NavBar.vue → src/views/Layout/components/NavBar.vue

@@ -21,7 +21,7 @@
               class="user-avatar"
               src="https://img.alicdn.com/tfs/TB1ONhloamWBuNjy1XaXXXCbXXa-200-200.png"
             />
-            <span class="user-name">淘小宝</span>
+            <span class="user-name">{{ name }}</span>
           </div>
           <el-dropdown-menu slot="dropdown" class="user-dropdown">
             <router-link to="/">
@@ -43,9 +43,15 @@
 <script>
 export default {
   name: "NavBar",
+  computed: {
+    name() {
+      return this.$store.state.user.name;
+    },
+  },
   methods: {
     logout() {
       // console.log('Logout');
+      this.$router.push("/login");
     },
   },
 };

+ 0 - 0
src/samples/Layout_01/components/ScrollBar.vue → src/views/Layout/components/ScrollBar.vue


+ 0 - 0
src/samples/Layout_01/components/SideBar.vue → src/views/Layout/components/SideBar.vue


+ 0 - 0
src/samples/Layout_01/components/menu.js → src/views/Layout/components/menu.js