From d67091c17c321550696959f7022c49fffa4ec450 Mon Sep 17 00:00:00 2001 From: cxc Date: Wed, 9 Nov 2022 17:26:49 +0800 Subject: [PATCH] redirect --- src/components/NyPlayer.vue | 1 + src/router/index.js | 29 +++++++++++++++++++++-------- src/style/appoint-desktop.css | 26 ++++++++++++++++++++++++++ src/style/appoint-desktop.min.css | 1 + src/style/appoint-desktop.scss | 6 ++++-- src/views/meeting-test.vue | 12 +++++++----- src/views/meeting.vue | 4 +++- src/views/panelist-verify.vue | 3 ++- vue.config.js | 7 +++++++ 9 files changed, 72 insertions(+), 17 deletions(-) create mode 100644 src/components/NyPlayer.vue create mode 100644 src/style/appoint-desktop.css create mode 100644 src/style/appoint-desktop.min.css diff --git a/src/components/NyPlayer.vue b/src/components/NyPlayer.vue new file mode 100644 index 0000000..cc43c8a --- /dev/null +++ b/src/components/NyPlayer.vue @@ -0,0 +1 @@ + diff --git a/src/router/index.js b/src/router/index.js index ce9106f..08478b1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -18,14 +18,7 @@ const router = createRouter({ path: '/meeting/56', redirect: '/meeting/90' }, - { - path: '/meeting-ny/:meetingId', - name: "MeetingNy", - meta: { - source: 'nuoyun' - }, - component: () => import("@/views/meeting-test.vue"), - }, + { path: "/appointment/56", redirect: "/appointment/90", @@ -62,21 +55,41 @@ const router = createRouter({ name: "Meeting", component: () => import("@/views/meeting-test.vue"), }, + { + path: '/meeting-ny/:meetingId', + name: "Meeting", + component: () => import("@/views/meeting-test.vue"), + }, { path: "/panelist/:meetingId", name: "Panelist", component: () => import("@/views/meeting-test.vue"), }, + { + path: "/panelist-ny/:meetingId", + name: "Panelist", + component: () => import("@/views/meeting-test.vue"), + }, { path: "/host/:meetingId/:createEmail/:pwd/:username/:nickname", name: "Host", component: () => import("@/views/meeting-test.vue"), }, + { + path: "/host-ny/:meetingId/:createEmail/:pwd/:username/:nickname", + name: "Host", + component: () => import("@/views/meeting-test.vue"), + }, { path: "/supervisor/:meetingId/:username", name: "Supervisor", component: () => import("@/views/meeting-test.vue"), }, + { + path: "/supervisor-ny/:meetingId/:username", + name: "Supervisor", + component: () => import("@/views/meeting-test.vue"), + }, { path: "/error", name: "Error", diff --git a/src/style/appoint-desktop.css b/src/style/appoint-desktop.css new file mode 100644 index 0000000..f1c40d6 --- /dev/null +++ b/src/style/appoint-desktop.css @@ -0,0 +1,26 @@ +@media only screen and (min-width: 768px) { + .meeting-title { + font-size: 24px; + } + .meeting-cover { + height: 47vh; + display: block; + margin: 0 auto; + } + .meeting-time { + font-size: 16px; + } + .form-container { + width: 80%; + margin: 0 auto; + } + .form-container .joinuser-wrap { + justify-content: space-between; + } + .form-container .joinuser-wrap .joinuser-item { + width: 36%; + } + .form-container .joinuser-wrap .joinuser-item :deep(.el-form-item__label) { + width: 150px; + } +} diff --git a/src/style/appoint-desktop.min.css b/src/style/appoint-desktop.min.css new file mode 100644 index 0000000..f36e220 --- /dev/null +++ b/src/style/appoint-desktop.min.css @@ -0,0 +1 @@ +@media only screen and (min-width: 768px){.meeting-title{font-size:24px}.meeting-cover{height:47vh;display:block;margin:0 auto}.meeting-time{font-size:16px}.form-container{width:80%;margin:0 auto}.form-container .joinuser-wrap{justify-content:space-between}.form-container .joinuser-wrap .joinuser-item{width:36%}.form-container .joinuser-wrap .joinuser-item :deep(.el-form-item__label){width:150px}} diff --git a/src/style/appoint-desktop.scss b/src/style/appoint-desktop.scss index a9f0f63..990eca7 100644 --- a/src/style/appoint-desktop.scss +++ b/src/style/appoint-desktop.scss @@ -12,11 +12,13 @@ font-size: 16px; } .form-container { - padding: 0 10px 0; + // padding: 0 10px 0; + width: 80%; + margin: 0 auto; .joinuser-wrap { justify-content: space-between; .joinuser-item { - width: 46%; + width: 36%; :deep(.el-form-item__label) { width: 150px; } diff --git a/src/views/meeting-test.vue b/src/views/meeting-test.vue index d08de20..0bcb821 100644 --- a/src/views/meeting-test.vue +++ b/src/views/meeting-test.vue @@ -2,13 +2,13 @@
-
{ store.commit("setPassword", ""); store.commit("setMessagesList", []); store.commit("setLiked", false); - router.push(`/verify/${store.getters.meetingId}`); + router.push( + `/verify/${store.getters.meetingId}?redirect=${route.path}` + ); }, 2000); } // 会议结束时 @@ -481,6 +483,7 @@ const submitQuestion = async (mode) => { width: var(--meeting-container-width); height: calc(var(--meeting-container-width) * 9 / 16); #nuoyun-iframe { + overflow: hidden; height: 100%; width: 100%; } @@ -548,7 +551,6 @@ const submitQuestion = async (mode) => { } .like-row { padding-right: 0; - // background-color: #f5f5f5; } .tabs { .chat-pane { diff --git a/src/views/meeting.vue b/src/views/meeting.vue index 75037fc..d14fe8e 100644 --- a/src/views/meeting.vue +++ b/src/views/meeting.vue @@ -741,7 +741,9 @@ const initWebSocket = () => { store.commit("setPassword", ""); store.commit("setMessagesList", []); store.commit("setLiked", false); - router.push(`/verify/${store.getters.meetingId}`); + router.push( + `/verify/${store.getters.meetingId}?redirect=${route.path}` + ); }, 2000); } // 会议结束时 diff --git a/src/views/panelist-verify.vue b/src/views/panelist-verify.vue index d3c3240..5d01135 100644 --- a/src/views/panelist-verify.vue +++ b/src/views/panelist-verify.vue @@ -133,7 +133,8 @@ const submitVerify = async (newJoinUserRef) => { } const valid = await newJoinUserRef.validate(); store.commit("setJoinUser", newJoinUser.value); - router.push(`/panelist/${meetingId.value}`); + // router.push(`/panelist/${meetingId.value}`); + router.push(route.query.redirect); }; const saveTempUser = async (newJoinUserRef) => { diff --git a/vue.config.js b/vue.config.js index 812860a..cb67bdf 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,6 +6,13 @@ module.exports = defineConfig({ devServer: { port: 3000, // proxy: { + // "/iframe-source": { + // // target: "https://console.nuoyun.tv", + // target: "http://127.0.0.1:9090/", + // changeOrigin: true + // } + // } + // proxy: { // "/api": { // target: "http://120.26.107.74:1618", // // ws: true,