Skip to content

Commit

Permalink
feat: 添加客服视频, 关闭acm报名入口
Browse files Browse the repository at this point in the history
  • Loading branch information
FinleyGe committed Aug 7, 2022
1 parent 471a42b commit c26a170
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "join-us-vue",
"private": true,
"version": "2.5.1.1",
"version": "2.5.1.2",
"scripts": {
"dev": "vite",
"build": "vue-tsc --noEmit && vite build",
Expand Down
69 changes: 69 additions & 0 deletions src/components/Video.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<template>
<div class="video">
<div class="introduce" :class="pageStore.pageType">
<div class="title">客服视频</div>
<div class="content" :class="pageStore.pageType">
<iframe
src="//player.bilibili.com/player.html?aid=514039970&bvid=BV1cg41127UT&cid=791985606&page=1"
scrolling="no"
border="0"
frameborder="no"
framespacing="0"
allowfullscreen="true"
>
</iframe>
</div>
</div>
</div>
</template>
<script lang="ts" setup>
import { usePageStore } from "../stores/pages";
const pageStore = usePageStore();
</script>
<style lang="scss" scoped>
.introduce {
display: grid;
grid-template-rows: 20% 80%;
margin: auto;
margin-top: 50px;
margin-bottom: 100px;
align-items: center;
&.normal {
width: 40%;
}
&.middle,
&.mini {
width: 80%;
}
}
.title {
background-color: #d6d6d6;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
font-size: xx-large;
white-space: pre-line;
padding-block: 10px;
width: 100%;
}
.content {
background-color: white;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
box-shadow: 0 5px 10px #999;
width: 100%;
&.normal {
iframe {
width: 100%;
height: 500px;
}
}
&.middle,
&.mini {
iframe {
width: 100%;
height: 300px;
}
}
}
</style>
16 changes: 8 additions & 8 deletions src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ const routes = [
// navbar: () => import('../components/NavBarAdmin.vue'),
// },
// },
{
path: '/join/acm',
name: 'join/acm',
components: {
default: () => import('../views/join/acm.vue'),
navbar: () => import('../components/NavBar.vue'),
},
},
// {
// path: '/join/acm',
// name: 'join/acm',
// components: {
// default: () => import('../views/join/acm.vue'),
// navbar: () => import('../components/NavBar.vue'),
// },
// },
{
path: '/:pathMatch(.*)*',
redirect: '/index'
Expand Down
2 changes: 2 additions & 0 deletions src/views/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import Footer from "../components/Footer.vue";
import { onMounted, ref } from "vue";
import Contact from "../components/Contact.vue";
import PageTop from "../components/PageTop.vue";
import JHVideo from "../components/Video.vue";
const pageStore = usePageStore();
const router = useRouter();
Expand All @@ -34,6 +35,7 @@ var loaded = false;
<template>
<start />
<introduce />
<JHVideo />
<history v-if="pageStore.pageType == 'normal'" />
<timeline
v-if="pageStore.pageType == 'mini' || pageStore.pageType == 'middle'"
Expand Down
4 changes: 2 additions & 2 deletions src/views/join.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ function toLong() {
/>
<div class="detail-base" :class="pageStore.pageType">
<div class="btn">
<JHButton type="middle" @click="router.push('/join/acm')">
<!-- <JHButton type="middle" @click="router.push('/join/acm')">
ACM新生赛
</JHButton>
(点击报名)
(点击报名) -->
<JHButton type="middle-disabled" @click="toRecruit"
>招新季报名</JHButton
>
Expand Down

0 comments on commit c26a170

Please sign in to comment.