This commit is contained in:
cxc
2022-11-09 17:26:49 +08:00
parent e22463f589
commit d67091c17c
9 changed files with 72 additions and 17 deletions

View File

@ -0,0 +1 @@
<!-- <template></template> -->

View File

@ -18,14 +18,7 @@ const router = createRouter({
path: '/meeting/56', path: '/meeting/56',
redirect: '/meeting/90' redirect: '/meeting/90'
}, },
{
path: '/meeting-ny/:meetingId',
name: "MeetingNy",
meta: {
source: 'nuoyun'
},
component: () => import("@/views/meeting-test.vue"),
},
{ {
path: "/appointment/56", path: "/appointment/56",
redirect: "/appointment/90", redirect: "/appointment/90",
@ -62,21 +55,41 @@ const router = createRouter({
name: "Meeting", name: "Meeting",
component: () => import("@/views/meeting-test.vue"), component: () => import("@/views/meeting-test.vue"),
}, },
{
path: '/meeting-ny/:meetingId',
name: "Meeting",
component: () => import("@/views/meeting-test.vue"),
},
{ {
path: "/panelist/:meetingId", path: "/panelist/:meetingId",
name: "Panelist", name: "Panelist",
component: () => import("@/views/meeting-test.vue"), 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", path: "/host/:meetingId/:createEmail/:pwd/:username/:nickname",
name: "Host", name: "Host",
component: () => import("@/views/meeting-test.vue"), 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", path: "/supervisor/:meetingId/:username",
name: "Supervisor", name: "Supervisor",
component: () => import("@/views/meeting-test.vue"), component: () => import("@/views/meeting-test.vue"),
}, },
{
path: "/supervisor-ny/:meetingId/:username",
name: "Supervisor",
component: () => import("@/views/meeting-test.vue"),
},
{ {
path: "/error", path: "/error",
name: "Error", name: "Error",

View File

@ -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;
}
}

1
src/style/appoint-desktop.min.css vendored Normal file
View File

@ -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}}

View File

@ -12,11 +12,13 @@
font-size: 16px; font-size: 16px;
} }
.form-container { .form-container {
padding: 0 10px 0; // padding: 0 10px 0;
width: 80%;
margin: 0 auto;
.joinuser-wrap { .joinuser-wrap {
justify-content: space-between; justify-content: space-between;
.joinuser-item { .joinuser-item {
width: 46%; width: 36%;
:deep(.el-form-item__label) { :deep(.el-form-item__label) {
width: 150px; width: 150px;
} }

View File

@ -2,13 +2,13 @@
<div id="app-container" ref="appContainerRef"> <div id="app-container" ref="appContainerRef">
<div id="meeting-chat-row"> <div id="meeting-chat-row">
<div id="meeting-container" ref="meetingContainerRef"> <div id="meeting-container" ref="meetingContainerRef">
<!-- v-if="route.name === 'MeetingNy'" -->
<iframe <iframe
ref="nuoyunIfrRef" ref="nuoyunIfrRef"
id="nuoyun-iframe" id="nuoyun-iframe"
src="https://console.nuoyun.tv/PlayerEmbed/PlayerEmbed.html?type=1&appid=451264724" src="https://console.nuoyun.tv/PlayerEmbed/PlayerEmbed.html?type=1&appid=639920665"
scrolling="no"
frameborder="0" frameborder="0"
allowfullscreen allowFullScreen
></iframe> ></iframe>
<div id="text-label-wrap"> <div id="text-label-wrap">
<div <div
@ -313,7 +313,9 @@ const initWebSocket = () => {
store.commit("setPassword", ""); store.commit("setPassword", "");
store.commit("setMessagesList", []); store.commit("setMessagesList", []);
store.commit("setLiked", false); store.commit("setLiked", false);
router.push(`/verify/${store.getters.meetingId}`); router.push(
`/verify/${store.getters.meetingId}?redirect=${route.path}`
);
}, 2000); }, 2000);
} }
// 会议结束时 // 会议结束时
@ -481,6 +483,7 @@ const submitQuestion = async (mode) => {
width: var(--meeting-container-width); width: var(--meeting-container-width);
height: calc(var(--meeting-container-width) * 9 / 16); height: calc(var(--meeting-container-width) * 9 / 16);
#nuoyun-iframe { #nuoyun-iframe {
overflow: hidden;
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
@ -548,7 +551,6 @@ const submitQuestion = async (mode) => {
} }
.like-row { .like-row {
padding-right: 0; padding-right: 0;
// background-color: #f5f5f5;
} }
.tabs { .tabs {
.chat-pane { .chat-pane {

View File

@ -741,7 +741,9 @@ const initWebSocket = () => {
store.commit("setPassword", ""); store.commit("setPassword", "");
store.commit("setMessagesList", []); store.commit("setMessagesList", []);
store.commit("setLiked", false); store.commit("setLiked", false);
router.push(`/verify/${store.getters.meetingId}`); router.push(
`/verify/${store.getters.meetingId}?redirect=${route.path}`
);
}, 2000); }, 2000);
} }
// 会议结束时 // 会议结束时

View File

@ -133,7 +133,8 @@ const submitVerify = async (newJoinUserRef) => {
} }
const valid = await newJoinUserRef.validate(); const valid = await newJoinUserRef.validate();
store.commit("setJoinUser", newJoinUser.value); store.commit("setJoinUser", newJoinUser.value);
router.push(`/panelist/${meetingId.value}`); // router.push(`/panelist/${meetingId.value}`);
router.push(route.query.redirect);
}; };
const saveTempUser = async (newJoinUserRef) => { const saveTempUser = async (newJoinUserRef) => {

View File

@ -6,6 +6,13 @@ module.exports = defineConfig({
devServer: { devServer: {
port: 3000, port: 3000,
// proxy: { // proxy: {
// "/iframe-source": {
// // target: "https://console.nuoyun.tv",
// target: "http://127.0.0.1:9090/",
// changeOrigin: true
// }
// }
// proxy: {
// "/api": { // "/api": {
// target: "http://120.26.107.74:1618", // target: "http://120.26.107.74:1618",
// // ws: true, // // ws: true,