Skip to content

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

代码提交

上级 412c5a33
隐藏空白字符变更
内嵌 并排
正在显示 包含 107 行增加 和 122 行删除
components/home/news.vue
浏览文件 @ 63fa4b73
...@@ -76,8 +76,6 @@ export default { ...@@ -76,8 +76,6 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.is-pc { .is-pc {
.news-content-box { .news-content-box {
position: relative;
transform: scale(0.78);
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;
padding-top: 65px; padding-top: 65px;
......
components/home/projectFeatures.vue
浏览文件 @ 63fa4b73
<template> <template>
<div class="service-content max-width-center"> <div class="service-content max-width-center">
<div class="is-pc"> <div :class="isMobile ? 'is-h5' : 'is-pc'">
<card :title="$t('home.project.title')"> <card :title="$t('home.project.title')">
<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">
...@@ -11,6 +11,11 @@ ...@@ -11,6 +11,11 @@
</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>
...@@ -43,6 +48,26 @@ export default { ...@@ -43,6 +48,26 @@ export default {
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/img31.png', iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.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/mary_features_icon2.png',
// iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon2_a.png',
// text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT2') : this.$t('home.project.pc.itemT2')
// },
// {
// icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon3.png',
// iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon3_a.png',
// text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT3') : this.$t('home.project.pc.itemT3')
// },
// {
// icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon4.png',
// iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon4_a.png',
// text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT4') : this.$t('home.project.pc.itemT4')
// },
// {
// icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon5.png',
// iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/marywood/mary_features_icon5_a.png',
// text: this.$store.state.isMobile ? this.$t('home.project.h5.itemT5') : this.$t('home.project.pc.itemT5')
// }
] ]
} }
}, },
...@@ -67,23 +92,12 @@ export default { ...@@ -67,23 +92,12 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .card-hd__title {
position: relative;
transform: scale(0.78);
left: -80px;
}
.is-pc { .is-pc {
display: flex;
justify-content: center;
margin-left: -80px;
margin-top: 81px;
.service-content { .service-content {
padding-top: 68px; padding-top: 168px;
width: 1200px;
.nav-content { .nav-content {
display: flex; display: flex;
justify-content: center; justify-content: flex-start;
padding-top: 15px; padding-top: 15px;
li { li {
width: 224px; width: 224px;
...@@ -134,4 +148,33 @@ export default { ...@@ -134,4 +148,33 @@ export default {
margin: 0 auto; margin: 0 auto;
} }
} }
.is-h5 {
.service-content {
ul {
display: flex;
overflow-x: scroll;
-webkit-overflow-scrolling: touch;
}
li {
min-width: 0.78rem;
background: #ffffff;
margin-right: 0.1rem;
padding-top: 0.11rem;
img {
width: 0.4rem;
height: 0.4rem;
display: block;
margin: 0 auto;
}
.text {
font-size: 0.1rem;
line-height: 0.16rem;
color: #666666;
padding-top: 0.05rem;
text-align: center;
padding-bottom: 0.1rem;
}
}
}
}
</style> </style>
components/home/schoolSenery.vue
浏览文件 @ 63fa4b73
...@@ -53,7 +53,7 @@ export default {} ...@@ -53,7 +53,7 @@ export default {}
.line1 { .line1 {
width: 369px; width: 369px;
height: 1px; height: 1px;
border: 3px solid #ffffff; border: 1px solid #ffffff;
} }
.name { .name {
width: 144px; width: 144px;
...@@ -64,7 +64,7 @@ export default {} ...@@ -64,7 +64,7 @@ export default {}
.line2 { .line2 {
width: 369px; width: 369px;
height: 1px; height: 1px;
border: 3px solid #ffffff; border: 1px solid #ffffff;
} }
} }
.part { .part {
......
components/rightAside.vue
浏览文件 @ 63fa4b73
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
@mouseout="handleMsOut" @mouseout="handleMsOut"
> >
<div class="enroll_cont" id="show-enroll-content" v-show="tabBtnTarget === 'enroll'"> <div class="enroll_cont" id="show-enroll-content" v-show="tabBtnTarget === 'enroll'">
<h5>{{ $t('aside.apply') }}</h5> <h5>{{ $t('aside.apply1') }}</h5>
<p><el-input v-model="formInfo.name" :placeholder="$t('aside.name')" size="small"></el-input></p> <p><el-input v-model="formInfo.name" :placeholder="$t('aside.name')" size="small"></el-input></p>
<p><el-input v-model="formInfo.phone" :placeholder="$t('aside.phone')" size="small"></el-input></p> <p><el-input v-model="formInfo.phone" :placeholder="$t('aside.phone')" size="small"></el-input></p>
<!-- <p><el-input v-model="projectName" size="small" :readonly="true"></el-input></p> --> <!-- <p><el-input v-model="projectName" size="small" :readonly="true"></el-input></p> -->
......
langs/zh-CN.js
浏览文件 @ 63fa4b73
...@@ -269,7 +269,8 @@ export default { ...@@ -269,7 +269,8 @@ export default {
viewMore: '查看更多+', viewMore: '查看更多+',
// 右侧弹窗 // 右侧弹窗
aside: { aside: {
apply: '报名咨询', apply: '报名申请',
apply1: '报名咨询',
apply2: '我要咨询', apply2: '我要咨询',
follow: '关注我们', follow: '关注我们',
name: '请输入您的名字', name: '请输入您的名字',
......
pages/index.vue
浏览文件 @ 63fa4b73
...@@ -92,7 +92,6 @@ export default { ...@@ -92,7 +92,6 @@ export default {
justify-content: center; justify-content: center;
position: absolute; position: absolute;
bottom: 109px; bottom: 109px;
// top: 461px;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
} }
...@@ -115,14 +114,11 @@ export default { ...@@ -115,14 +114,11 @@ export default {
width: 1200px; width: 1200px;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
line-height: 32px;
color: #666666; color: #666666;
position: absolute; position: absolute;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
margin-top: 79px; margin-top: 79px;
padding-left: 150px;
padding-right: 100px;
} }
} }
</style> </style>
pages/school/school1.vue
浏览文件 @ 63fa4b73
<template> <template>
<div> <div>
<div class="banner"> <div class="banner">
<img style="width:100%;height:100%" src="https://webapp-pub.ezijing.com/project/marywood/school11.png" /> <img style="width:100%;height:100%" src="https://webapp-pub.ezijing.com/project/marywood/school111.png" />
<div class="btn"> <div class="btn">
<el-button class="btn1" @click="showApplyForm">报名咨询</el-button> <el-button class="btn1" @click="$router.push('/my/account')">报名申请</el-button>
</div>
<div class="content">
<img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/school12.png" />
</div> </div>
</div> </div>
<div class="content">
<img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/school12.png" />
</div>
<img <img
style="width:1200px;height:100%;margin-top:68px" style="width:1200px;height:100%;margin-top:68px"
class="img2" class="img2"
...@@ -32,9 +33,7 @@ ...@@ -32,9 +33,7 @@
<div class="content"> <div class="content">
<img src="https://webapp-pub.ezijing.com/project/marywood/school17.png" /> <img src="https://webapp-pub.ezijing.com/project/marywood/school17.png" />
</div> </div>
<div <div style="width:1200px;margin:auto;text-align:center;display:flex;justify-content:flex-start;margin-top:64px;">
style="margin:auto;text-align:center;width:1200px;display:flex;justify-content:flex-start;margin-top:64px;margin-left:30px"
>
<div style="width: 6px;height: 34px;background: #AA1941;margin-right:9px;margin-top:6px"></div> <div style="width: 6px;height: 34px;background: #AA1941;margin-right:9px;margin-top:6px"></div>
<h1 style="color: #333333; font-size: 34px;font-weight: bold;">校园风光</h1> <h1 style="color: #333333; font-size: 34px;font-weight: bold;">校园风光</h1>
</div> </div>
...@@ -47,15 +46,11 @@ ...@@ -47,15 +46,11 @@
</div> </div>
</div> </div>
</div> </div>
<consultingForm :visible.sync="popupVisible" @success="hideApplyForm" @close="close" />
</div> </div>
</template> </template>
<script> <script>
import consultingForm from '../../components/consultingForm.vue'
export default { export default {
layout: 'normal', layout: 'normal',
components: { consultingForm },
data() { data() {
const _this = this const _this = this
...@@ -100,47 +95,36 @@ export default { ...@@ -100,47 +95,36 @@ export default {
}, },
swiperStart() { swiperStart() {
this.swiper.autoplay.start() this.swiper.autoplay.start()
},
showApplyForm() {
this.popupVisible = true
document.getElementsByTagName('body')[0].style.height = '100%'
document.getElementsByTagName('body')[0].style.overflow = 'hidden'
},
close() {
this.popupVisible = false
document.getElementsByTagName('body')[0].style.height = ''
document.getElementsByTagName('body')[0].style.overflow = ''
},
hideApplyForm() {
this.popupVisible = false
document.getElementsByTagName('body')[0].style.height = ''
document.getElementsByTagName('body')[0].style.overflow = ''
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.btn { .banner {
display: flex; position: relative;
justify-content: center; .btn {
position: absolute; display: flex;
bottom: 109px; justify-content: center;
left: 50%; position: absolute;
transform: translateX(-50%); bottom: 109px;
} left: 50%;
.btn1 { // top: 661px;
width: 104px; transform: translateX(-50%);
height: 32px; }
border: 1px solid #ffffff; .btn1 {
font-size: 14px; width: 104px;
font-weight: 400; height: 32px;
line-height: 8px; border: 1px solid #ffffff;
background: none; font-size: 14px;
color: #fff; font-weight: 400;
} line-height: 8px;
.btn1:hover { background: none;
background-color: #aa1941; color: #fff;
opacity: 1; }
.btn1:hover {
background-color: #aa1941;
opacity: 1;
}
} }
.content { .content {
......
pages/school/school2.vue
浏览文件 @ 63fa4b73
<template> <template>
<div> <div>
<div class="banner"> <div class="banner">
<img style="width:100%;height:100%" src="https://webapp-pub.ezijing.com/project/marywood/school21.png" /> <img style="width:100%;height:100%" src="https://webapp-pub.ezijing.com/project/marywood/school211.png" />
<div class="btn"> <div class="btn">
<el-button class="btn1" @click="showApplyForm">报名咨询</el-button> <el-button class="btn1" @click="$router.push('/my/account')">报名申请</el-button>
</div>
<div class="content">
<img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/school12.png" />
</div> </div>
</div> </div>
<div class="content">
<img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/school12.png" />
</div>
<img <img
style="width:1200px;height:100%;margin-top:68px" style="width:1200px;height:100%;margin-top:68px"
class="img2" class="img2"
...@@ -32,9 +33,7 @@ ...@@ -32,9 +33,7 @@
<div class="content"> <div class="content">
<img src="https://webapp-pub.ezijing.com/project/marywood/school27.png" /> <img src="https://webapp-pub.ezijing.com/project/marywood/school27.png" />
</div> </div>
<div <div style="width:1200px;margin:auto;text-align:center;display:flex;justify-content:flex-start;margin-top:64px;">
style="margin:auto;text-align:center;width:1200px;display:flex;justify-content:flex-start;margin-top:64px;margin-left:30px"
>
<div style="width: 6px;height: 34px;background: #AA1941;margin-right:9px;margin-top:6px"></div> <div style="width: 6px;height: 34px;background: #AA1941;margin-right:9px;margin-top:6px"></div>
<h1 style="color: #333333; font-size: 34px;font-weight: bold;">校园风光</h1> <h1 style="color: #333333; font-size: 34px;font-weight: bold;">校园风光</h1>
</div> </div>
...@@ -47,15 +46,11 @@ ...@@ -47,15 +46,11 @@
</div> </div>
</div> </div>
</div> </div>
<consultingForm :visible.sync="popupVisible" @success="hideApplyForm" @close="close" />
</div> </div>
</template> </template>
<script> <script>
import consultingForm from '../../components/consultingForm.vue'
export default { export default {
layout: 'normal', layout: 'normal',
components: { consultingForm },
data() { data() {
const _this = this const _this = this
...@@ -101,27 +96,13 @@ export default { ...@@ -101,27 +96,13 @@ export default {
}, },
swiperStart() { swiperStart() {
this.swiper.autoplay.start() this.swiper.autoplay.start()
},
showApplyForm() {
this.popupVisible = true
document.getElementsByTagName('body')[0].style.height = '100%'
document.getElementsByTagName('body')[0].style.overflow = 'hidden'
},
close() {
this.popupVisible = false
document.getElementsByTagName('body')[0].style.height = ''
document.getElementsByTagName('body')[0].style.overflow = ''
},
hideApplyForm() {
this.popupVisible = false
document.getElementsByTagName('body')[0].style.height = ''
document.getElementsByTagName('body')[0].style.overflow = ''
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.banner { .banner {
position: relative;
.btn { .btn {
display: flex; display: flex;
justify-content: center; justify-content: center;
......
pages/school/school3.vue
浏览文件 @ 63fa4b73
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<div class="banner"> <div class="banner">
<img style="width:100%;height:100%" src="https://webapp-pub.ezijing.com/project/marywood/marywoo_banner.png" /> <img style="width:100%;height:100%" src="https://webapp-pub.ezijing.com/project/marywood/marywoo_banner.png" />
<div class="btn"> <div class="btn">
<el-button class="btn1" @click="showApplyForm">报名咨询</el-button> <el-button class="btn1" @click="$router.push('/my/account')">报名申请</el-button>
</div>
<div class="content">
<img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/marywood31.png" />
</div> </div>
</div> </div>
<div class="content">
<img class="img1" src="https://webapp-pub.ezijing.com/project/marywood/marywood31.png" />
</div>
<img <img
style="width:1200px;height:100%;margin-top:68px" style="width:1200px;height:100%;margin-top:68px"
class="img2" class="img2"
...@@ -46,15 +46,11 @@ ...@@ -46,15 +46,11 @@
</div> </div>
</div> </div>
</div> </div>
<consultingForm :visible.sync="popupVisible" @success="hideApplyForm" @close="close" />
</div> </div>
</template> </template>
<script> <script>
import consultingForm from '../../components/consultingForm.vue'
export default { export default {
layout: 'normal', layout: 'normal',
components: { consultingForm },
data() { data() {
const _this = this const _this = this
...@@ -100,27 +96,13 @@ export default { ...@@ -100,27 +96,13 @@ export default {
}, },
swiperStart() { swiperStart() {
this.swiper.autoplay.start() this.swiper.autoplay.start()
},
showApplyForm() {
this.popupVisible = true
document.getElementsByTagName('body')[0].style.height = '100%'
document.getElementsByTagName('body')[0].style.overflow = 'hidden'
},
close() {
this.popupVisible = false
document.getElementsByTagName('body')[0].style.height = ''
document.getElementsByTagName('body')[0].style.overflow = ''
},
hideApplyForm() {
this.popupVisible = false
document.getElementsByTagName('body')[0].style.height = ''
document.getElementsByTagName('body')[0].style.overflow = ''
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.banner { .banner {
position: relative;
.btn { .btn {
display: flex; display: flex;
justify-content: center; justify-content: center;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论