Merge branch 'dev' into dev_tides

Crunchy

2025-04-29 e5454b769d44a34af423bf87ac8a740bf8c20341

 src/store/modules/user.js

@@ -11,6 +11,8 @@
    name: "",
    avatar: "",
    nickName: "",
    nameEn: "",
    userName: "",
    roles: [],
    permissions: [],
  },
@@ -30,6 +32,12 @@
    },
    SET_NICKNAME: (state, nickName) => {
      state.nickName = nickName;
    },
    SET_NAMEEN: (state, nameEn) => {
      state.nameEn = nameEn;
    },
    SET_USERNAME: (state, userName) => {
      state.userName = userName;
    },
    SET_ROLES: (state, roles) => {
      state.roles = roles;
@@ -101,6 +109,8 @@
            commit("SET_NAME", user.userName);
            commit("SET_AVATAR", avatar);
            commit("SET_NICKNAME", user.nickName);
            commit("SET_NAMEEN", user.nameEn);
            commit("SET_USERNAME", user.userName);
            resolve(res);
          })
          .catch((error) => {
@@ -113,12 +123,16 @@
    LogOut({ commit, state }) {
      return new Promise((resolve, reject) => {
        logout(state.token)
          .then(() => {
            commit("SET_TOKEN", "");
            commit("SET_ROLES", []);
            commit("SET_PERMISSIONS", []);
            removeToken();
            resolve();
          .then((res) => {
            if (res.data) {
              window.location.href = res.data
            } else {
              commit("SET_TOKEN", "");
              commit("SET_ROLES", []);
              commit("SET_PERMISSIONS", []);
              removeToken();
              resolve();
            }
          })
          .catch((error) => {
            reject(error);