bugfix
This commit is contained in:
@ -93,10 +93,15 @@ router.beforeEach(async (to) => {
|
||||
if (store.state.joinUser.icCard) {
|
||||
// 检测输入的IC卡号是否在白名单范围内,是则放行,否则返回原地址
|
||||
try {
|
||||
const { meetingPassword } = await whitelistJoinMeeting({
|
||||
const { meetingPassword, email } = await whitelistJoinMeeting({
|
||||
meetingId: to.params.meetingId,
|
||||
icCard: store.state.joinUser.icCard,
|
||||
});
|
||||
store.commit("setJoinUser", {
|
||||
...store.state.joinUser,
|
||||
email: email.email,
|
||||
token: email.token,
|
||||
});
|
||||
store.commit("setPassword", meetingPassword);
|
||||
return true;
|
||||
} catch (error) {
|
||||
@ -123,9 +128,14 @@ router.beforeEach(async (to) => {
|
||||
});
|
||||
store.commit("setPassword", meetingPassword);
|
||||
} else {
|
||||
const { meetingPassword } = await visitorJoinUser(
|
||||
const { meetingPassword, email } = await visitorJoinUser(
|
||||
store.state.joinUser
|
||||
);
|
||||
store.commit("setJoinUser", {
|
||||
...store.state.joinUser,
|
||||
email: email.email,
|
||||
token: email.token,
|
||||
});
|
||||
store.commit("setPassword", meetingPassword);
|
||||
}
|
||||
return true;
|
||||
@ -133,10 +143,8 @@ router.beforeEach(async (to) => {
|
||||
}
|
||||
}
|
||||
if (to.name === "Panelist") {
|
||||
console.log("Panelist");
|
||||
// 如果要去的页面会议号于 vuex中的不一样,则清除数据
|
||||
if (to.params.meetingId !== store.state.joinUser.meetingId) {
|
||||
console.log('dis');
|
||||
store.commit("setJoinUser", {});
|
||||
}
|
||||
if (store.state.joinUser.icCard) {
|
||||
|
Reference in New Issue
Block a user