diff --git a/src/mixins/index.js b/src/mixins/index.js index 64aeac9..3a65ccf 100644 --- a/src/mixins/index.js +++ b/src/mixins/index.js @@ -23,7 +23,7 @@ export default { }) || {}; let date1 = this.$dayjs(token.datetime); let date2 = this.$dayjs(); - const date = date1.diff(date2, 'month'); + const date = date2.diff(date1, 'seconds'); if (validatenull(date)) return; if (date >= this.website.tokenTime && !this.refreshLock) { this.refreshLock = true; @@ -32,7 +32,8 @@ export default { .then(() => { this.refreshLock = false; }) - .catch(() => { + .catch((err) => { + console.log(err) this.refreshLock = false; }); } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index fe801ee..8e6ab89 100755 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -100,7 +100,7 @@ const user = { }) }, //刷新token - RefreshToken ({ state, commit }) { + RefreshToken ({ state, commit }, userInfo) { return new Promise((resolve, reject) => { refreshToken(state.refreshToken, state.tenantId, !validatenull(userInfo) ? userInfo.deptId : state.userInfo.dept_id,