Merge branch 'master' of http://git.cc-lotus.info/count/webnew-count

src/store/login.js

@@ -52,9 +52,9 @@ const actions = {
     }
   },
   async logout({ commit }, payload) {
-    let key = localStorage.removeItem('token');
-    const res = await this.$axios.$post(api.logout, { key: key });
-    commit('deleteUser');
+    localStorage.removeItem('token');
+    // const res = await this.$axios.$post(api.logout, { key: key });
+    // commit('deleteUser');
   },
   async update({ commit }, payload) {
     let res = await this.$axios.$post(`${api.updatePassword}`, {

src/store/user/mutations.js

@@ -26,7 +26,6 @@ export const setUser = (state, payload) => {
   }
   return res;
 };
-
 export const deleteUser = (state, payload) => {
   state.user = {};
   localStorage.removeItem('user');

src/views/pcenter/index.vue

@@ -56,7 +56,7 @@
                   </el-menu-item>
                   <el-menu-item index="8">
                     <template slot="title">
-                      <span>退出登录</span>
+                      <span @click="logoutBtn()">退出登录</span>
                     </template>
                   </el-menu-item>
                 </el-menu>
@@ -108,6 +108,7 @@ import foot from '@/layout/common/foot.vue';
 import pinfo from '@/views/pcenter/pinfo.vue';
 import uppasswd from '@/views/pcenter/uppasswd.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: login } = createNamespacedHelpers('login');
 export default {
   name: 'detail',
   props: {},
@@ -127,11 +128,11 @@ export default {
     this.selectMenu();
   },
   methods: {
+    ...login({ logout: 'logout' }),
     // 选择栏目
     selectMenu(key) {
       if (key == 1) {
         this.columnName = '基本信息';
-        console.log(this.columnName);
       } else if (key == 2) {
         this.columnName = '需求管理';
       } else if (key == 3) {
@@ -154,6 +155,11 @@ export default {
       this.columnName = name;
       this.menuColor = 'rgb(5,73,130)';
     },
+    // 退出登录
+    logoutBtn() {
+      this.logout();
+      this.$router.push({ path: '/' });
+    },
   },
   computed: {
     ...mapState(['user']),