From 5aeff72e9ca794335d6cb60d53d5766134804145 Mon Sep 17 00:00:00 2001 From: cxc Date: Wed, 19 Oct 2022 17:11:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=9C=AA=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=A6=81=E6=AD=A2=E7=94=A8=E6=88=B7=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E4=BC=9A=E8=AE=AE=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=9A=82?= =?UTF-8?q?=E5=AD=98=E4=BF=A1=E6=81=AF=E5=88=B0=E6=9C=AC=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/countDown.vue | 3 +++ src/store/index.js | 7 +++++++ src/views/meeting.vue | 35 ++++++++++++++++++++--------------- src/views/panelist-verify.vue | 25 +++++++++++++++++++++++-- src/views/verify.vue | 31 ++++++++++++++++++++++++------- 5 files changed, 77 insertions(+), 24 deletions(-) diff --git a/src/components/countDown.vue b/src/components/countDown.vue index 6dc8422..a576c94 100644 --- a/src/components/countDown.vue +++ b/src/components/countDown.vue @@ -10,6 +10,8 @@ import dayjs from "dayjs"; import duration from "dayjs/plugin/duration"; import { onMounted, onUnmounted, ref } from "vue"; dayjs.extend(duration); + +const emit = defineEmits(["timeup"]); const props = defineProps({ startTime: { type: String, @@ -25,6 +27,7 @@ onMounted(() => { durationTime.value = new Date(props.startTime).getTime() - new Date().getTime(); if (durationTime.value <= 0) { + emit("timeup"); clearInterval(timer); } const duraDayjs = dayjs.duration(durationTime.value); diff --git a/src/store/index.js b/src/store/index.js index a60272e..b7088df 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -6,6 +6,9 @@ const store = createStore({ joinUser: localStorage.getItem("JOIN_USER") ? JSON.parse(localStorage.getItem("JOIN_USER")) : {}, + tempUser: localStorage.getItem("TEMP_USER") + ? JSON.parse(localStorage.getItem("TEMP_USER")) + : {}, meeting: {}, meetingSetting: {}, messagesList: localStorage.getItem("MESSAGES") @@ -28,6 +31,10 @@ const store = createStore({ state.joinUser = data; localStorage.setItem("JOIN_USER", JSON.stringify(data)); }, + setTempUser(state, data) { + state.tempUser = data + localStorage.setItem("TEMP_USER", JSON.stringify(data)) + }, // 设置会议信息 setMeetingInfo(state, data) { state.meeting = data; diff --git a/src/views/meeting.vue b/src/views/meeting.vue index bce4364..a9fa5cf 100644 --- a/src/views/meeting.vue +++ b/src/views/meeting.vue @@ -930,11 +930,11 @@ $meetingComponentHeight: $meetingComponentWitdh * 9 / 16; $meetingBackgroundWidth: 80vw; //会议背景宽度 $meetingBackgroundHeight: 80vw * 9 / 16; -@media screen and (max-width: 900px) { - .like-row.isShare { - margin-top: 42px; - } +// @media screen and (max-width: 900px) { +.like-row.isShare { + margin-top: 42px; } +// } .isShare { .text-label-container { display: none !important; @@ -956,8 +956,13 @@ $meetingBackgroundHeight: 80vw * 9 / 16; > .zmwebsdk-MuiPaper-root > .zmwebsdk-MuiPaper-root:nth-child(2)) { // display: none !important; + // position: absolute; + // visibility: hidden; position: absolute; - visibility: hidden; + visibility: visible; + bottom: 0; + left: 50%; + transform: translate(-50%, 100%); } // 视频组件宽度 :deep(#video-element @@ -1012,16 +1017,16 @@ $meetingBackgroundHeight: 80vw * 9 / 16; height: calc(100vw * 1080 / 1920) !important; } // 底部操作条 - :deep(#video-element - > div - > .zmwebsdk-MuiPaper-root - > .zmwebsdk-MuiPaper-root:nth-child(2)) { - position: absolute; - visibility: visible; - bottom: 0; - left: 50%; - transform: translate(-50%, 100%); - } + // :deep(#video-element + // > div + // > .zmwebsdk-MuiPaper-root + // > .zmwebsdk-MuiPaper-root:nth-child(2)) { + // position: absolute; + // visibility: visible; + // bottom: 0; + // left: 50%; + // transform: translate(-50%, 100%); + // } } .verticalFullScreen { // background-color: saddlebrown !important; diff --git a/src/views/panelist-verify.vue b/src/views/panelist-verify.vue index 7695d77..56e3a89 100644 --- a/src/views/panelist-verify.vue +++ b/src/views/panelist-verify.vue @@ -8,7 +8,7 @@

会议开始时间 {{ meeting.startTime }} - +

- 加入会议 + 保存信息
{ store.commit("setJoinUser", newJoinUser.value); router.push(`/panelist/${meetingId.value}`); }; + +const saveTempUser = async (newJoinUserRef) => { + await newJoinUserRef.validate(); + store.commit("setTempUser", newJoinUser.value); + ElMessage.success("已将信息存储到本地"); +};