Skip to content

P
project-online-pc
提交 912fda00 authored 作者: matian's avatar matian
浏览文件
操作

代码更新

上级 067762d0
隐藏空白字符变更
内嵌 并排
正在显示 包含 54 行增加 和 128 行删除
components/home/TopImage.vue deleted 100644 → 0
浏览文件 @ 067762d0
<template>
<div class="banner-content">
<img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/banner.png" alt="" />
<div class="btn">
<el-button class="btn1" @click="$router.push('/project-intro/introduce')">项目介绍</el-button>
<el-button class="btn1" @click="showApplyForm">报名申请</el-button>
</div>
<!-- <consultingForm :visible.sync="popupVisible" /> -->
</div>
</template>
<script>
// import consultingForm from '../consultingForm.vue'
export default {
props: {
popupVisible: {
default: false,
type: Boolean
}
},
components: {
// consultingForm
},
methods: {
showApplyForm() {
console.log('-----')
this.popupVisible = true
}
}
}
</script>
<style lang="scss" scoped>
.banner-content {
position: relative;
width: 100%;
img {
width: 100%;
height: 100%;
z-index: 1000;
}
.btn {
position: absolute;
top: 461px;
left: 850px;
}
.btn1 {
width: 104px;
height: 32px;
border: 1px solid #ffffff;
font-size: 14px;
font-weight: 400;
line-height: 8px;
background: none;
color: #fff;
}
.btn1:hover {
background-color: #aa1941;
opacity: 1;
}
}
</style>
components/home/projectFeatures.vue
浏览文件 @ 912fda00
...@@ -11,11 +11,6 @@ ...@@ -11,11 +11,6 @@
</ul> </ul>
</card> </card>
</div> </div>
<!-- <img
style="padding:56px 0 30px;position: relative;width: 1200px;margin: 0 auto;"
src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/school.png"
alt=""
/> -->
</div> </div>
</template> </template>
<script> <script>
...@@ -34,28 +29,28 @@ export default { ...@@ -34,28 +29,28 @@ export default {
}, },
data: [ data: [
{ {
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/img12.png', icon: 'https://webapp-pub.ezijing.com/project/marywood/img12.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/img11.png', iconActive: 'https://webapp-pub.ezijing.com/project/marywood/img11.png',
text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT1') : this.$t('home.project.pc.itemT5') text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT1') : this.$t('home.project.pc.itemT5')
}, },
{ {
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/img22.png', icon: 'https://webapp-pub.ezijing.com/project/marywood/img22.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/img21.png', iconActive: 'https://webapp-pub.ezijing.com/project/marywood/img21.png',
text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT1') : this.$t('home.project.pc.itemT6') text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT1') : this.$t('home.project.pc.itemT6')
}, },
{ {
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/img32.png', icon: 'https://webapp-pub.ezijing.com/project/marywood/img32.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/img31.png', iconActive: 'https://webapp-pub.ezijing.com/project/marywood/img31.png',
text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT1') : this.$t('home.project.pc.itemT7') text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT1') : this.$t('home.project.pc.itemT7')
}, },
{ {
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/img42.png', icon: 'https://webapp-pub.ezijing.com/project/marywood/img42.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/img411.png', iconActive: 'https://webapp-pub.ezijing.com/project/marywood/img411.png',
text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT2') : this.$t('home.project.pc.itemT8') text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT2') : this.$t('home.project.pc.itemT8')
}, },
{ {
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/img52.png', icon: 'https://webapp-pub.ezijing.com/project/marywood/img52.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/img51.png', iconActive: 'https://webapp-pub.ezijing.com/project/marywood/img51.png',
text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT3') : this.$t('home.project.pc.itemT9') text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT3') : this.$t('home.project.pc.itemT9')
} }
] ]
......
components/home/schoolRanking.vue
浏览文件 @ 912fda00
<template> <template>
<div> <div>
<img class="info" v-if="isMobile" src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/rzxx-mary.png"> <img class="info" v-if="isMobile" src="https://webapp-pub.ezijing.com/project/marywood/rzxx-mary.png" />
<div v-else class="info-content-box"> <div v-else class="info-content-box">
<div class="title"> <div class="title">
<div class="line"></div> <div class="line"></div>
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
<ul class="content-mian"> <ul class="content-mian">
<li v-for="(item, index) in data" :key="index"> <li v-for="(item, index) in data" :key="index">
<div class="logo"> <div class="logo">
<img :src="item.img" class="img"> <img :src="item.img" class="img" />
</div> </div>
<img :src="item.text" class="text"> <img :src="item.text" class="text" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -25,24 +25,24 @@ export default { ...@@ -25,24 +25,24 @@ export default {
return { return {
data: [ data: [
{ {
img: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_info_i1.png', img: 'https://webapp-pub.ezijing.com/project/marywood/mary_info_i1.png',
text: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_info_t1.png' text: 'https://webapp-pub.ezijing.com/project/marywood/mary_info_t1.png'
}, },
{ {
img: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_info_i2.png', img: 'https://webapp-pub.ezijing.com/project/marywood/mary_info_i2.png',
text: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_info_t2.png' text: 'https://webapp-pub.ezijing.com/project/marywood/mary_info_t2.png'
}, },
{ {
img: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_info_i3.png', img: 'https://webapp-pub.ezijing.com/project/marywood/mary_info_i3.png',
text: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_info_t3.png' text: 'https://webapp-pub.ezijing.com/project/marywood/mary_info_t3.png'
}, },
{ {
img: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_info_i4.png', img: 'https://webapp-pub.ezijing.com/project/marywood/mary_info_i4.png',
text: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_info_t4.png' text: 'https://webapp-pub.ezijing.com/project/marywood/mary_info_t4.png'
}, },
{ {
img: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_info_i5.png', img: 'https://webapp-pub.ezijing.com/project/marywood/mary_info_i5.png',
text: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_info_t5.png' text: 'https://webapp-pub.ezijing.com/project/marywood/mary_info_t5.png'
} }
] ]
} }
...@@ -55,113 +55,112 @@ export default { ...@@ -55,113 +55,112 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.info{ .info {
width: 100%; width: 100%;
display: block; display: block;
} }
.info-content-box{ .info-content-box {
min-width: 1200px; min-width: 1200px;
padding-bottom: 150px; padding-bottom: 150px;
margin-top: 100px; margin-top: 100px;
width: 100%; width: 100%;
background: rgb(163,0,22); background: rgb(163, 0, 22);
.title{ .title {
width: 996px; width: 996px;
display: flex; display: flex;
margin: 0 auto; margin: 0 auto;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 118px 0 119px; padding: 118px 0 119px;
.line{ .line {
width: 369px; width: 369px;
height: 1px; height: 1px;
background: #FFFFFF; background: #ffffff;
} }
.name{ .name {
font-size: 36px; font-size: 36px;
font-weight: bold; font-weight: bold;
line-height: 100%; line-height: 100%;
color: #FFFFFF; color: #ffffff;
} }
} }
.content-mian{ .content-mian {
width: 1014px; width: 1014px;
margin: 0 auto; margin: 0 auto;
display: flex; display: flex;
li{ li {
width: 190px; width: 190px;
height: 229px; height: 229px;
background: #fff; background: #fff;
border-radius: 20px; border-radius: 20px;
margin-left: 16px; margin-left: 16px;
&:nth-child(1){ &:nth-child(1) {
margin-left: 0; margin-left: 0;
} }
&:nth-child(1){ &:nth-child(1) {
.img{ .img {
width: 81px; width: 81px;
height: 66px; height: 66px;
} }
.text{ .text {
width: 148px; width: 148px;
height: 69px; height: 69px;
} }
} }
&:nth-child(2){ &:nth-child(2) {
.img{ .img {
width: 152px; width: 152px;
height: 61px; height: 61px;
} }
.text{ .text {
width: 184px; width: 184px;
height: 69px; height: 69px;
} }
} }
&:nth-child(3){ &:nth-child(3) {
.img{ .img {
width: 79px; width: 79px;
height: 82px; height: 82px;
} }
.text{ .text {
width: 172px; width: 172px;
height: 65px; height: 65px;
} }
} }
&:nth-child(4){ &:nth-child(4) {
.img{ .img {
width: 72px; width: 72px;
height: 91px; height: 91px;
} }
.text{ .text {
width: 166px; width: 166px;
height: 69px; height: 69px;
} }
} }
&:nth-child(5){ &:nth-child(5) {
.img{ .img {
width: 84px; width: 84px;
height: 84px; height: 84px;
} }
.text{ .text {
width: 134px; width: 134px;
height: 67px; height: 67px;
} }
} }
.logo{ .logo {
height: 91px; height: 91px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding-top: 22px; padding-top: 22px;
margin-bottom: 27px; margin-bottom: 27px;
.img{ .img {
display: block; display: block;
} }
} }
.text{ .text {
display: block; display: block;
margin: 0 auto; margin: 0 auto;
} }
} }
} }
......
pages/project-intro/introduce.vue
浏览文件 @ 912fda00
...@@ -9,11 +9,7 @@ ...@@ -9,11 +9,7 @@
<div class="part_item"> <div class="part_item">
项目采用中英双语授课，学制约16个月。共设有四大模块，分别为语言能力强化课、学术英语课、学术专业课、案例实践课。中方负责1/3的教学内容，美方负责2/3的教学内容。项目采用线上学习和线下面授的教学方式，项目学习结束后，满足毕业条件的学员将获得美国院校予的硕士学位证书，该证书与美国全日制两年就读学生所获得的学位证书具有完全相同的形式和效力。美国高排名优质院校与清华控股旗下紫荆教育紧密携手，依托清华大学五道口金融学院和美国院校优质教学资源，打造高效、高质的国际硕士课程。 项目采用中英双语授课，学制约16个月。共设有四大模块，分别为语言能力强化课、学术英语课、学术专业课、案例实践课。中方负责1/3的教学内容，美方负责2/3的教学内容。项目采用线上学习和线下面授的教学方式，项目学习结束后，满足毕业条件的学员将获得美国院校予的硕士学位证书，该证书与美国全日制两年就读学生所获得的学位证书具有完全相同的形式和效力。美国高排名优质院校与清华控股旗下紫荆教育紧密携手，依托清华大学五道口金融学院和美国院校优质教学资源，打造高效、高质的国际硕士课程。
</div> </div>
<img <img class="part_img" src="https://webapp-pub.ezijing.com/project/marywood/intro_bottom11.png" alt="" />
class="part_img"
src="https://webapp-pub.ezijing.com/project/marywood/intro_bottom11.png"
alt=""
/>
</div> </div>
</app-frame> </app-frame>
</template> </template>
...@@ -46,7 +42,6 @@ export default { ...@@ -46,7 +42,6 @@ export default {
{ num: 500, unit: this.$t('bg.unit3'), text: this.$t('bg.con1ItemT8') } { num: 500, unit: this.$t('bg.unit3'), text: this.$t('bg.con1ItemT8') }
], ],
frameParams: { frameParams: {
// banner: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/introduce_banner.png',
slider: [ slider: [
{ {
name: this.$t('menu.projectChild.bg'), name: this.$t('menu.projectChild.bg'),
......
pages/school/school3.vue
浏览文件 @ 912fda00
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</div> </div>
<img <img
style="margin-top:64px;width:100%;height:100%" style="margin-top:64px;width:100%;height:100%"
src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/marywood3611.png" src="https://webapp-pub.ezijing.com/project/marywood/marywood3611.png"
alt="" alt=""
/> />
<div class="content"> <div class="content">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论