登录功能完成

src/components/public/Header.vue

@@ -1,5 +1,5 @@
 <template>
-  <header>
+  <header v-loading="loading">
     <div id="topnavbar">
        <div class="logo logo2 cursor">
         <img src="../../../static/images/logo.png" alt="">
@@ -7,7 +7,8 @@
       <div id="topnanv"  v-show="!collapse || navShow">
         <nav>
           <ul class="content clearfix">
-            <li class="dropdown" v-for="(item,index) in menu" :key="index">
+            <template v-if="userName">
+              <li class="dropdown" v-for="(item,index) in adminMenu" :key="index">
                 <a href="javascript:void(0);" @click="routerTurn(item.path)">{{item.name}}<img v-show="item.children.length" src="../../../static/images/arrow-down.png" alt=""></a>
                 <ul class="sub-menu" v-show="item.children.length">
                   <li v-for="(item1,index1) in item.children" :key="index1">
@@ -29,12 +30,25 @@
                     </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
+              </li>
+            </template>
+            <template v-else>
+              <li class="dropdown" v-for="(item,index) in menu" :key="index">
+                <a href="javascript:void(0);" @click="routerTurn(item.path)">{{item.name}}<img v-show="item.children.length" src="../../../static/images/arrow-down.png" alt=""></a>
+                <ul class="sub-menu" v-show="item.children.length">
+                  <li v-for="(item1,index1) in item.children" :key="index1">
+                    <a href="javascript:void(0);" @click="routerTurn(item1.path)">{{item1.name}}</a>
+                  </li>
+                </ul>
+              </li>
+              <li class="dropdown">
                 <el-dropdown  trigger="click">
                   <span class="el-dropdown-link userClass">
                     <a href="javascript:void(0);" @click="routerTurn('login')">登录</a>
                   </span>
                 </el-dropdown>
               </li>
+            </template>
           </ul>
         </nav>
       </div>
@@ -55,8 +69,63 @@ export default {
   },
   data(){
 	  return {
+      loading: false,
 		  collapse:true,
 		  menu:[
+			  {
+				  name:"首页",
+				  path:"home",
+				  children:[]
+			  },
+			  {
+				  name:"数据检索",
+				  path:"",
+				  children:[
+					  {
+						name:"数据检索",
+				 		path:"dataSearch",
+				  		children:[]
+					  },
+					   {
+						name:"航次详情",
+				 		path:"voyagedetail",
+				  		children:[]
+					  }
+				  ]
+			  },
+			  {
+				  name:"统计分析",
+				  path:"analyse",
+				  children:[]
+			  },
+			  {
+				  name:"数据资源",
+				  path:"",
+				  children:[
+					  {
+						name:"海洋地球物理与物理海洋信息库",
+				 		path:"physicalIndex",
+				  		children:[]
+					  },
+					   {
+						name:"海洋生物样品信息库",
+				 		path:"biologyIndex",
+				  		children:[]
+					  },
+					  {
+						name:"深海海洋视频音像信息库",
+				 		path:"phoneVideoIndex",
+				  		children:[]
+					  }
+				  ]
+			  },
+			  {
+				  name:"关于我们",
+				  path:"",
+				  children:[]
+			  }
+		  ],
+      adminMenu: [
         {
           name:"首页",
           path:"home",
@@ -173,24 +242,19 @@ export default {
           name:"关于我们",
           path:"",
           children:[]
-			  },
+        }
-			  //  {
-				//   name:"个人中心",
-				//   path:"personalCenter",
-				//   children:[]
-			  // },
-			  // {
-				//   name:"登录",
-				//   path:"login",
-				//   children:[]
-			  // },
-
       ],
       nowPathName: '',
       navShow:false
 	  }
   },
+  computed: {
+    userName() {
+      return sessionStorage.getItem('userName') || this.$store.state.user.name
+    }
+  },
   created() {
+    console.log(this.userName)
     this.getLoginInfo()
   },
   mounted(){
@@ -234,11 +298,14 @@ export default {
 	  },
     // 退出登录
     onLogout() {
+      this.loading = true
       loginOut().then(res => {
+        this.$store.commit('SET_NAME', '')
+        sessionStorage.setItem('userName', '')
         this.$router.push({
           path: 'login'
         })
-        this.getLoginInfo()
+        location.reload()
       })
     },
     // 获取登录信息

src/store/index.js

@@ -4,7 +4,7 @@ import getters from './getters'
 import app from './modules/app'
 import settings from './modules/settings'
 import sample from '@/store/modules/sample'
-// import user from './modules/user'
+import user from './modules/user'
 
 Vue.use(Vuex)
 
@@ -12,8 +12,8 @@ const store = new Vuex.Store({
   modules: {
     app,
     settings,
-    sample
+    sample,
-    // user
+    user
   },
   getters
 })

src/store/modules/user.js

@@ -0,0 +1,18 @@
+
+const user = {
+  state: {
+    name: ''
+  },
+
+  mutations: {
+    SET_NAME: (state, name) => {
+      state.name = name
+    }
+  },
+
+  actions: {
+
+  }
+}
+
+export default user

src/utils/request.js

@@ -53,11 +53,12 @@ service.interceptors.response.use(
         message: res.errorMsg,
         type: 'warning'
       })
+      sessionStorage.setItem('userName', '')
     } else if (res.errorCode === 0) {
       return res
     } else {
       Message({
-        message: '系统错误',
+        message: res.errorMsg,
         type: 'warning'
       })
     }

src/views/login.vue

@@ -55,6 +55,8 @@ export default {
       loginCode: '1234'
     }
   },
+  created() {
+  },
   methods: {
     onLogin() {
       if (!this.loginName) return this.$message.warning('请输入用户名')
@@ -67,6 +69,8 @@ export default {
       }).then(res => {
         if (res.success) {
           this.$router.back()
+          this.$store.commit('SET_NAME', this.loginName)
+          sessionStorage.setItem('userName', this.loginName)
         } else {
           this.$message.error(res.errorMsg)
         }