From 5614414185377a319123a82b46b75a9707ff3529 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Thu, 11 Nov 2021 18:45:53 +0800
Subject: [PATCH] add logout

---
 buyer/src/api/account.js                          |  9 +++++++++
 buyer/src/components/header/Header.vue            | 15 +++++++++------
 manager/src/api/index.js                          |  6 ++++++
 manager/src/views/Main.vue                        | 14 ++++++++------
 .../src/views/page/article-manage/articleList.vue |  4 ++--
 seller/src/api/index.js                           |  6 ++++++
 seller/src/views/Main.vue                         | 15 +++++++++------
 7 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/buyer/src/api/account.js b/buyer/src/api/account.js
index dccbdec1..f42da5f5 100644
--- a/buyer/src/api/account.js
+++ b/buyer/src/api/account.js
@@ -57,3 +57,12 @@ export function editPwd (params) {
     data: params
   })
 }
+
+// 获取密码状态
+export function logout () {
+  return request({
+    url: '/buyer/members/logout',
+    method: Method.POST,
+    needToken: true
+  })
+}
diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue
index fbd21ebb..1ab86bef 100644
--- a/buyer/src/components/header/Header.vue
+++ b/buyer/src/components/header/Header.vue
@@ -86,6 +86,7 @@
 <script>
 import storage from '@/plugins/storage.js';
 import { cartGoodsAll } from '@/api/cart.js';
+import { logout } from '@/api/account.js';
 export default {
   name: 'M-Header',
   created () {
@@ -120,12 +121,14 @@ export default {
       window.open(url.href, '_blank');
     },
     signOutFun () { // 退出登录
-      storage.removeItem('accessToken');
-      storage.removeItem('refreshToken');
-      storage.removeItem('userInfo');
-      storage.removeItem('cartNum');
-      this.$store.commit('SET_CARTNUM', 0)
-      this.$router.push('/login');
+      logout().then(res => {
+        storage.removeItem('accessToken');
+        storage.removeItem('refreshToken');
+        storage.removeItem('userInfo');
+        storage.removeItem('cartNum');
+        this.$store.commit('SET_CARTNUM', 0)
+        this.$router.push('/login');
+      });
     },
     goUserCenter (path) {
       // 跳转我的订单，我的足迹、收藏等
diff --git a/manager/src/api/index.js b/manager/src/api/index.js
index b4cc38b1..012ee5b0 100644
--- a/manager/src/api/index.js
+++ b/manager/src/api/index.js
@@ -49,6 +49,12 @@ export const getNoticePage = (params) => {
 export const login = (params) => {
   return getRequestWithNoToken("/user/login", params);
 };
+
+// 登出
+export const logout = () => {
+  return postRequest("/user/logout");
+};
+
 // 刷新token
 export const handleRefreshToken = (token) => {
   return getRequestWithNoToken(`/user/refresh/${token}`);
diff --git a/manager/src/views/Main.vue b/manager/src/views/Main.vue
index 59bad6ff..6198d1df 100644
--- a/manager/src/views/Main.vue
+++ b/manager/src/views/Main.vue
@@ -60,7 +60,7 @@ import messageTip from "./main-components/message-tip.vue";
 import circleLoading from "@/views/my-components/lili/circle-loading.vue";
 import Cookies from "js-cookie";
 import util from "@/libs/util.js";
-import { getNoticePage } from "@/api/index";
+import { getNoticePage,logout } from "@/api/index";
 
 var client;
 export default {
@@ -131,11 +131,13 @@ export default {
       }
       // 退出登录
       else if (name === "loginOut") {
-        this.$store.commit("logout", this);
-        this.$store.commit('setAdded', false);
-        this.setStore("accessToken", "");
-        this.setStore("refreshToken", "");
-        this.$router.push({ path: "/login" });
+        logout().then(res => {
+          this.$store.commit("logout", this);
+          this.$store.commit('setAdded', false);
+          this.setStore("accessToken", "");
+          this.setStore("refreshToken", "");
+          this.$router.push({ path: "/login" });
+        })
       }
     },
     //切换标签
diff --git a/manager/src/views/page/article-manage/articleList.vue b/manager/src/views/page/article-manage/articleList.vue
index 0aee19c3..a932ceed 100644
--- a/manager/src/views/page/article-manage/articleList.vue
+++ b/manager/src/views/page/article-manage/articleList.vue
@@ -109,7 +109,7 @@ export default {
       modalType: 0, // 添加或编辑标识
       modalVisible: false, // 添加或编辑显示
       modalTitle: "", // 添加或编辑标题
-      treeDataDefault:"",
+      treeDataDefault: [],
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
@@ -352,7 +352,7 @@ export default {
           }
         }
       });
-      this.total = this.data.length;
+      this.total = this.data?.length;
       this.loading = false;
     },
     // 添加文章
diff --git a/seller/src/api/index.js b/seller/src/api/index.js
index 6df3af21..306b9b53 100644
--- a/seller/src/api/index.js
+++ b/seller/src/api/index.js
@@ -31,6 +31,12 @@ export const getSellerHomeData = params => {
 export const login = params => {
   return postRequestWithNoToken("/login/userLogin", params);
 };
+
+// 登出
+export const logout = () => {
+  return postRequest("/login/logout");
+};
+
 // 获取用户登录信息
 export const userInfo = params => {
   return getRequest("/user/info", params);
diff --git a/seller/src/views/Main.vue b/seller/src/views/Main.vue
index d114954d..70b06bae 100644
--- a/seller/src/views/Main.vue
+++ b/seller/src/views/Main.vue
@@ -58,6 +58,7 @@ import tagsPageOpened from "./main-components/tags-page-opened.vue";
 import circleLoading from "@/views/my-components/lili/circle-loading.vue";
 import Cookies from "js-cookie";
 import util from "@/libs/util.js";
+import { logout } from "@/api/index";
 
 export default {
   components: {
@@ -120,12 +121,14 @@ export default {
           name: "change_pass",
         });
       } else if (name == "loginOut") {
-        Cookies.set("accessToken", "");
-        this.$store.commit("logout", this);
-        this.$store.commit("clearOpenedSubmenu");
-        this.setStore("accessToken", "");
-        this.setStore("refreshToken", "");
-        this.$router.push({ path: "/login" });
+        logout().then(res => {
+          Cookies.set("accessToken", "");
+          this.$store.commit("logout", this);
+          this.$store.commit("clearOpenedSubmenu");
+          this.setStore("accessToken", "");
+          this.setStore("refreshToken", "");
+          this.$router.push({ path: "/login" });
+        })
       }
     },
     // 快捷页签选中状态