Skip to content

P
project-online-pc
提交 243cc37f authored 作者: lihuihui's avatar lihuihui
浏览文件
操作

Merge branch 'marywood-plus' of https://gitlab.ezijing.com/webapp/project-pc into marywood-plus

上级 7562aa4e 34dec078
隐藏空白字符变更
内嵌 并排
正在显示 包含 300 行增加 和 207 行删除
components/home/Video.vue
浏览文件 @ 243cc37f
...@@ -95,7 +95,6 @@ export default { ...@@ -95,7 +95,6 @@ export default {
position: relative; position: relative;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
margin-top: 0.56rem;
.img1 { .img1 {
position: absolute; position: absolute;
top: 50%; top: 50%;
......
components/home/banners.vue
浏览文件 @ 243cc37f
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<div class="banner_navList"> <div class="banner_navList">
<div class="banner_nav" v-for="(item, index) in navList" :key="index" @click="navClick(item)"> <div class="banner_nav" v-for="(item, index) in navList" :key="index" @click="navClick(item)">
<div class="nav_top"> <div class="nav_top">
<img class="nav_img" :src="item.img" alt="" /> <img class="nav_img" :src="item.img" alt="" v-if="!isMobile" />
<img class="nav_img" :src="item.imgH5" alt="" v-else />
</div> </div>
<div class="nav_tit">{{ item.tit }}</div> <div class="nav_tit">{{ item.tit }}</div>
</div> </div>
...@@ -20,27 +21,36 @@ export default { ...@@ -20,27 +21,36 @@ export default {
return { return {
navList: [ navList: [
{ {
img: 'https://webapp-pub.ezijing.com/project/marywood/icon1.png', img: 'https://webapp-pub.ezijing.com/project/marywood/icicon1on1.png',
imgH5: 'https://webapp-pub.ezijing.com/project/marywood/h5/icon11.png',
tit: '报名申请', tit: '报名申请',
tag: '1' tag: '1'
}, },
{ {
img: 'https://webapp-pub.ezijing.com/project/marywood/icon4.png', img: 'https://webapp-pub.ezijing.com/project/marywood/icon4.png',
imgH5: 'https://webapp-pub.ezijing.com/project/marywood/h5/icon41.png',
tit: '招生简章', tit: '招生简章',
tag: '2' tag: '2'
}, },
{ {
img: 'https://webapp-pub.ezijing.com/project/marywood/icon5.png', img: 'https://webapp-pub.ezijing.com/project/marywood/icon5.png',
imgH5: 'https://webapp-pub.ezijing.com/project/marywood/h5/icon51.png',
tit: '项目介绍', tit: '项目介绍',
tag: '3' tag: '3'
}, },
{ {
img: 'https://webapp-pub.ezijing.com/project/marywood/icon2.png', img: 'https://webapp-pub.ezijing.com/project/marywood/icon2.png',
imgH5: 'https://webapp-pub.ezijing.com/project/marywood/h5/icon21.png',
tit: '资料下载', tit: '资料下载',
tag: '4' tag: '4'
}, },
{ {
img: 'https://webapp-pub.ezijing.com/project/marywood/icon3.png', img: 'https://webapp-pub.ezijing.com/project/marywood/icon3.png',
imgH5: 'https://webapp-pub.ezijing.com/project/marywood/h5/icon31.png',
tit: '常见问题', tit: '常见问题',
tag: '5' tag: '5'
} }
...@@ -146,39 +156,30 @@ export default { ...@@ -146,39 +156,30 @@ export default {
z-index: 1000; z-index: 1000;
} }
.banner_navList { .banner_navList {
position: absolute; padding: 0.43rem 0.33rem 0 0.35rem;
bottom: -0.2rem;
left: 50%;
transform: translateX(-50%);
display: flex; display: flex;
align-items: flex-end; justify-content: space-around;
margin: 0; align-items: center;
padding: 0;
.banner_nav { .banner_nav {
width: 0.69rem; text-align: center;
height: 0.44rem;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
background-color: #be0927;
border-right: 1px solid #e64b77;
opacity: 0.71;
.nav_top { .nav_top {
width: 0.2rem;
height: 0.2rem;
.nav_img { .nav_img {
width: 0.2rem; width: 0.45rem;
height: 100%; height: 100%;
margin-right: 0.2rem;
text-align: center;
} }
} }
.nav_tit { .nav_tit {
width: 100%; // width: 100%;
height: 0.24rem; // height: 0.24rem;
line-height: 0.24rem; // line-height: 0.24rem;
font-size: 0.08rem; width: 0.48rem;
margin-top: 0.08rem;
font-size: 0.12rem;
text-align: center; text-align: center;
color: #fefffe; color: #484848;
} }
} }
} }
......
components/home/news.vue
浏览文件 @ 243cc37f
<template> <template>
<div :class="isMobile ? 'is-h5' : 'is-pc'"> <div :class="isMobile ? 'is-h5' : 'is-pc'">
<div class="news-content-box"> <div class="news-content-box">
<card :title="$t('home.news.title')"> <card :title="$t('home.news.title')" v-if="!isMobile">
<template #header-aside <template #header-aside
><nuxt-link to="/news/hot">{{ $t('viewMore') }}</nuxt-link></template ><nuxt-link to="/news/hot">{{ $t('viewMore') }}</nuxt-link></template
> >
...@@ -26,6 +26,34 @@ ...@@ -26,6 +26,34 @@
</ul> </ul>
</div> </div>
</card> </card>
<div :title="$t('home.news.title')" v-else>
<div class="banner">
<div class="tit">最新动态</div>
<div class="more">
<nuxt-link to="/news/hot">{{ $t('viewMore') }}</nuxt-link>
</div>
</div>
<div class="content-box" v-if="Object.keys(listData.first).length">
<div class="news-left">
<app-link :data="listData.first" :to="`/news/hot/${listData.first.id}`">
<img :src="listData.first.web_img_uri" alt="" />
<div class="mantle-box">
<div class="tit" v-if="!isMobile">{{ listData.first.title }}</div>
<div class="con-txt">{{ listData.first.abstract }}</div>
</div>
</app-link>
</div>
<ul class="news-right">
<li v-for="(item, index) in listData.list" :key="index">
<app-link :data="item" :to="`/news/hot/${item.id}`">
<div class="time">{{ formatDate(item.start_time) }}</div>
<div class="news-r-title">{{ item.title }}</div>
<div class="del">{{ item.abstract }}</div>
</app-link>
</li>
</ul>
</div>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -163,6 +191,20 @@ export default { ...@@ -163,6 +191,20 @@ export default {
} }
.is-h5 { .is-h5 {
.news-content-box { .news-content-box {
padding: 0.2rem 0.3rem 0.2rem 0.3rem;
.banner {
display: flex;
justify-content: space-between;
}
.tit {
font-size: 0.14rem;
font-weight: bold;
line-height: 0.28rem;
color: #424242;
}
.more {
padding-top: 0.1rem;
}
.content-box { .content-box {
// height: 2.18rem; // height: 2.18rem;
position: relative; position: relative;
......
components/home/projectFeatures.vue
浏览文件 @ 243cc37f
<template> <template>
<div class="service-content max-width-center"> <div class="service-content max-width-center">
<div :class="isMobile ? 'is-h5' : 'is-pc'"> <div :class="isMobile ? 'is-h5' : 'is-pc'">
<card :title="$t('home.project.title')"> <card :title="$t('home.project.title')" v-if="!isMobile">
<ul class="nav-content"> <ul class="nav-content">
<li v-for="(item, index) in data" :key="index"> <li v-for="(item, index) in data" :key="index">
<img :src="item.icon" class="icon" /> <img :src="item.icon" class="icon" />
...@@ -10,6 +10,16 @@ ...@@ -10,6 +10,16 @@
</li> </li>
</ul> </ul>
</card> </card>
<div v-else>
<div class="tit">项目特色</div>
<ul class="nav-content">
<li v-for="(item, index) in data" :key="index">
<img :src="item.icon" class="icon" />
<img v-if="!isMobile" :src="item.iconActive" class="icon-active" />
<div class="text" v-html="item.text"></div>
</li>
</ul>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -135,13 +145,21 @@ export default { ...@@ -135,13 +145,21 @@ export default {
} }
.is-h5 { .is-h5 {
.service-content { .service-content {
padding-left: 0.32rem;
padding-right: 0.32rem;
.tit {
font-size: 0.14rem;
font-weight: bold;
line-height: 0.28rem;
color: #424242;
}
ul { ul {
display: flex; display: flex;
overflow-x: scroll; overflow-x: scroll;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
li { li {
min-width: 0.78rem; min-width: 1.15rem;
background: #ffffff; background: #ffffff;
margin-right: 0.1rem; margin-right: 0.1rem;
padding-top: 0.11rem; padding-top: 0.11rem;
......
components/home/projectPosition.vue
浏览文件 @ 243cc37f
<template> <template>
<div :class="isMobile ? 'is-h5' : 'is-pc'"> <div :class="isMobile ? 'is-h5' : 'is-pc'">
<div class="service-content max-width-center"> <div class="service-content max-width-center">
<card title="项目定位"> <card title="项目定位" v-if="!isMobile">
<p class="desc"> <p class="desc">
清控紫荆教育与玛丽伍德大学等美国知名院校联合推出国际硕士1+1项目，针对当下数字经济时代最需要的商业分析大数据、金融和数字领导力等方向打造国际领先的人才培养体系，志在培养立足中国本土实践、兼具国际视野的复合型新时代人才。 清控紫荆教育与玛丽伍德大学等美国知名院校联合推出国际硕士1+1项目，针对当下数字经济时代最需要的商业分析大数据、金融和数字领导力等方向打造国际领先的人才培养体系，志在培养立足中国本土实践、兼具国际视野的复合型新时代人才。
</p> </p>
</card> </card>
<div v-else>
<div class="tit">项目定位</div>
<p class="desc">
清控紫荆教育与玛丽伍德大学等美国知名院校联合推出国际硕士1+1项目，针对当下数字经济时代最需要的商业分析大数据、金融和数字领导力等方向打造国际领先的人才培养体系，志在培养立足中国本土实践、兼具国际视野的复合型新时代人才。
</p>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -96,14 +102,19 @@ export default { ...@@ -96,14 +102,19 @@ export default {
} }
.is-h5 { .is-h5 {
.max-width-center { .max-width-center {
margin: 0.8rem auto; // margin: 0.39rem auto;
padding: 0.2rem 0.3rem 0.2rem 0.3rem;
}
.tit {
font-size: 0.14rem;
font-weight: bold;
line-height: 0.28rem;
color: #424242;
} }
.desc { .desc {
text-align: center;
padding-top: 0.15rem;
font-size: 0.12rem; font-size: 0.12rem;
line-height: 1.5;
font-weight: 400; font-weight: 400;
line-height: 0.2rem;
color: #666666; color: #666666;
} }
} }
......
components/home/schoolSenery.vue
浏览文件 @ 243cc37f
<template> <template>
<div :class="isMobile ? 'is-h5' : 'is-pc'"> <div :class="isMobile ? 'is-h5' : 'is-pc'">
<div class="main-content"> <div class="main-content">
<div class="tit" v-if="isMobile">合作院校</div>
<img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/marwood_senery11.png" alt="" /> <img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/marwood_senery11.png" alt="" />
<div class="title"> <div class="title" v-if="!isMobile">
<div class="line1"></div> <div class="line1"></div>
<div class="name">合作院校</div> <div class="name">合作院校</div>
<div class="line2"></div> <div class="line2"></div>
</div> </div>
<!-- <div class="part"> -->
<!-- <img
src="https://webapp-pub.ezijing.com/project/marywood/marwood_senery1.png"
alt=""
@click="$router.push('/school/school2')"
/> -->
<!-- <img
src="https://webapp-pub.ezijing.com/project/marywood/marwood_senery2.png"
alt=""
@click="$router.push('/school/school1')"
/> -->
<img <img
class="part" class="part"
src="https://webapp-pub.ezijing.com/project/marywood/marwood_senery3.png" src="https://webapp-pub.ezijing.com/project/marywood/marwood_senery3.png"
alt="" alt=""
@click="$router.push('/school/school3')" @click="$router.push('/school/school3')"
/> />
<!-- </div> -->
</div> </div>
</div> </div>
</template> </template>
...@@ -88,45 +79,25 @@ export default { ...@@ -88,45 +79,25 @@ export default {
} }
.is-h5 { .is-h5 {
.main-content { .main-content {
margin-top: 65px;
position: relative; position: relative;
width: 100%; padding: 0.35rem 0.3rem 0 0.3rem;
.tit {
font-size: 0.14rem;
font-weight: bold;
line-height: 34px;
color: #424242;
}
.img1 { .img1 {
width: 100%; width: 100%;
height: 100%; height: 100%;
} margin-top: 0.2rem;
.title {
font-size: 0.18rem;
font-weight: bold;
color: #ffffff;
position: absolute;
top: 0.2rem;
left: 50%;
transform: translateX(-50%);
display: flex;
justify-content: center;
}
.line1 {
width: 0.5rem;
height: 0.01rem;
border: 0.01px solid #ffffff;
}
.name {
width: 1rem;
margin: -0.1rem 0.1rem 0 0.1rem;
text-align: center;
}
.line2 {
width: 0.5rem;
height: 0.01rem;
border: 0.01px solid #ffffff;
} }
} }
.part { .part {
width: 1.5rem; width: 1rem;
height: 0.8rem; height: 0.6rem;
position: absolute; position: absolute;
top: 30%; top: 55%;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
} }
......
pages/index.vue
浏览文件 @ 243cc37f
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<!-- 最新动态 --> <!-- 最新动态 -->
<news /> <news />
<!-- 视频 --> <!-- 视频 -->
<Video style="padding-bottom:87px" /> <Video style="margin-bottom:0.2rem" />
<!-- 右侧功能栏 --> <!-- 右侧功能栏 -->
<right-aside v-if="!isMobile" /> <right-aside v-if="!isMobile" />
</div> </div>
......
pages/question/question.vue
浏览文件 @ 243cc37f
<template> <template>
<app-frame :data="frameParams"> <app-frame :data="frameParams" :class="isMobile ? 'is-h5' : 'is-pc'">
<div class="main_content"> <div class="main_content">
<div class="title_mon"> <div class="title_mon">
常见问题 常见问题
...@@ -77,6 +77,11 @@ export default { ...@@ -77,6 +77,11 @@ export default {
] ]
} }
}, },
computed: {
isMobile() {
return this.$store.state.isMobile
}
},
methods: { methods: {
showApplyForm() { showApplyForm() {
this.popupVisible = true this.popupVisible = true
...@@ -91,37 +96,73 @@ export default { ...@@ -91,37 +96,73 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.main_content { .is-pc {
padding: 40px 50px 101px 50px; .main_content {
.title_mon { padding: 40px 50px 101px 50px;
font-size: 22px; .title_mon {
font-weight: bold; font-size: 22px;
line-height: 34px; font-weight: bold;
color: #333333; line-height: 34px;
margin-bottom: 37px; color: #333333;
} margin-bottom: 37px;
.title_mon1 {
margin-bottom: 74px;
.line {
width: 899px;
height: 1px;
background: #e6e6e6;
margin-top: 12px;
margin-bottom: 11px;
} }
.title_mon1 {
margin-bottom: 74px;
.title { .line {
font-size: 16px; width: 899px;
font-weight: bold; height: 1px;
line-height: 36px; background: #e6e6e6;
color: #666666; margin-top: 12px;
margin-bottom: 11px;
}
.title {
font-size: 16px;
font-weight: bold;
line-height: 36px;
color: #666666;
}
.desc {
font-size: 16px;
font-weight: 300;
line-height: 32px;
color: #424242;
}
}
}
}
.is-h5 {
.main_content {
padding: 0.2rem 0.3rem 0.24rem 0.3rem;
.title_mon {
font-size: 0.14rem;
font-weight: 500;
color: #333333;
} }
.desc { .title_mon1 {
font-size: 16px; margin-bottom: 0.38rem;
font-weight: 300;
line-height: 32px; .line {
color: #424242; width: 3.1rem;
height: 0.005rem;
background: #e6e6e6;
margin-top: 0.12rem;
margin-bottom: 0.11rem;
}
.title {
font-size: 0.12rem;
font-weight: 500;
color: #666666;
margin-top: 0.12rem;
}
.desc {
font-size: 0.1rem;
font-weight: 300;
color: #424242;
line-height: 0.15rem;
}
} }
} }
} }
......
pages/returnPolicy/returnPolicy.vue
浏览文件 @ 243cc37f
...@@ -5,31 +5,39 @@ ...@@ -5,31 +5,39 @@
src="https://webapp-pub.ezijing.com/project/marywood/return_banner.png" src="https://webapp-pub.ezijing.com/project/marywood/return_banner.png"
alt="" alt=""
/> />
<div class="com_top"> <div v-if="!isMobile">
<h1 class="com_title">留学回国人员福利政策</h1> <div class="com_top">
<h2 class="com_title_dec">中华人民共和国教育部：“鼓励留学，支持回国”</h2> <h1 class="com_title">留学回国人员福利政策</h1>
<div class="com_con"> <h2 class="com_title_dec">中华人民共和国教育部：“鼓励留学，支持回国”</h2>
中国教育部思想政治工作司司长魏士强在12月7日的新闻发布会中发表评论：“支持留学、鼓励回国、来去自由、发挥作用”<br />是我国多年来奉行的留学政策，即使是进入新时代，我们依然要一以贯之地实行。 <div class="com_con">
<br />我国各省市、地区针对留学生回国颁布了人才引流福利政策，留学已经成为越来越多学生的升学选择。 中国教育部思想政治工作司司长魏士强在12月7日的新闻发布会中发表评论：“支持留学、鼓励回国、来去自由、发挥作用”<br />是我国多年来奉行的留学政策，即使是进入新时代，我们依然要一以贯之地实行。
</div> <br />我国各省市、地区针对留学生回国颁布了人才引流福利政策，留学已经成为越来越多学生的升学选择。
</div> </div>
<div class="com_bottom">
<div class="left_part">
<div class="line"></div>
</div> </div>
<div class="right_part"> <div class="com_bottom">
<div class="right_part_item" v-for="(item, id) in policyData" :key="id"> <div class="left_part">
<div class="item_title"> <div class="line"></div>
<span class="item_id">{{ item.id }}</span> </div>
<span class="item_tit">{{ item.title }}</span> <div class="right_part">
</div> <div class="right_part_item" v-for="(item, id) in policyData" :key="id">
<div class="dash_line"></div> <div class="item_title">
<div class="item_desc"> <span class="item_id">{{ item.id }}</span>
{{ item.desc }} <span class="item_tit">{{ item.title }}</span>
</div>
<div class="dash_line"></div>
<div class="item_desc">
{{ item.desc }}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<img
class="bottom"
v-else
src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/h5/return_con.png"
alt=""
/>
</app-frame> </app-frame>
</template> </template>
<script> <script>
...@@ -185,86 +193,88 @@ export default { ...@@ -185,86 +193,88 @@ export default {
} }
} }
.is-h5 { .is-h5 {
.com_top { // .com_top {
padding: 82px 50px 0 50px;
box-sizing: border-box; .bottom {
.com_title { width: 100%;
font-size: 22px; height: 100%;
font-weight: 500; padding: 0.2rem 0.3rem 0.24rem 0.3rem;
color: #333333;
}
.com_title_dec {
font-size: 20px;
font-weight: 400;
color: #424242;
margin-top: 20px;
}
.com_con {
font-size: 16px;
font-weight: 300;
color: #424242;
line-height: 32px;
margin-top: 52px;
}
} }
// .com_title {
// font-size: 0.14rem;
// font-weight: 500;
// color: #333333;
// }
// .com_title_dec {
// font-size: 0.12rem;
// font-weight: 400;
// color: #424242;
// margin-top: 0.1rem;
// }
// .com_con {
// font-size: 0.1rem;
// font-weight: 300;
// color: #424242;
// margin-top: 0.21rem;
// }
// }
.com_bottom { // .com_bottom {
display: flex; // display: flex;
justify-content: center; // justify-content: center;
padding: 0.6rem 0.6rem 1.02rem 0.6rem; // padding: 0.6rem 0.6rem 1.02rem 0.6rem;
.left_part { // .left_part {
display: flex; // display: flex;
justify-content: center; // justify-content: center;
flex-direction: column; // flex-direction: column;
position: relative; // position: relative;
.line { // .line {
width: 0px; // width: 0px;
height: 16.3rem; // height: 5.7rem;
border: 1px dashed #aa1941; // border: 1px dashed #aa1941;
z-index: 10; // z-index: 10;
margin-top: -3rem; // margin-top: -0.8rem;
} // }
} // }
.right_part { // .right_part {
position: relative; // position: relative;
.item_title { // .item_title {
.item_id { // .item_id {
display: inline-block; // display: inline-block;
width: 0.24rem; // width: 0.12rem;
height: 0.24rem; // height: 0.12rem;
line-height: 0.24rem; // line-height: 0.12rem;
background: #aa1941; // background: #aa1941;
border-radius: 50%; // border-radius: 50%;
text-align: center; // text-align: center;
margin-left: -0.14rem; // margin-left: -0.07rem;
margin-top: 0.05rem; // margin-top: 0.05rem;
position: absolute; // position: absolute;
z-index: 1000000; // z-index: 1000000;
color: #fff; // color: #fff;
} // }
.item_tit { // .item_tit {
font-size: 0.16rem; // font-size: 0.12rem;
font-weight: bold; // font-weight: bold;
line-height: 0.36rem; // line-height: 0.24rem;
color: #666666; // color: #666666;
padding-left: 0.3rem; // padding-left: 0.26rem;
} // }
} // }
.dash_line { // .dash_line {
border-bottom: 1px dashed #d5d5d5; // border-bottom: 1px dashed #d5d5d5;
width: 2.5rem; // width: 2.5rem;
margin-left: 0.3rem; // margin-left: 0.26rem;
} // }
.item_desc { // .item_desc {
font-size: 0.16rem; // font-size: 0.09rem;
font-weight: 300; // font-weight: 300;
line-height: 0.32rem; // color: #424242;
color: #424242; // padding-left: 0.26rem;
padding-left: 0.49rem; // margin: 0.1rem 0 0.22rem 0px;
margin: 0.2rem 0 0.43rem 0px; // }
} // }
} // }
}
} }
</style> </style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论