Skip to content

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

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

# Conflicts: # .env # components/Foot.vue # components/home/projectFeatures.vue # components/home/schoolRanking.vue # components/rightAside.vue
上级 7cf952fc a7f309a7
隐藏空白字符变更
内嵌 并排
正在显示 包含 85 行增加 和 103 行删除
.env
浏览文件 @ 370cc272
<<<<<<< HEAD
projectId=1001
=======
projectId=1000
>>>>>>> a7f309a7b3aa9b794f6eef1cdb5fba21303f24b5
newProjectId=6800243768751554560
......
.env.dev
浏览文件 @ 370cc272
projectId=1001
projectId=1000
newProjectId=6800243768751554560
......
components/Foot.vue
浏览文件 @ 370cc272
......@@ -14,13 +14,8 @@
</a>
</div>
<div>
<a href="http://www.pbcsf.tsinghua.edu.cn" target="_blank" >
{{ $t('foot.link3') }}
</a>
</div>
<div>
<a href="http://www.pbcsf.tsinghua.edu.cn" target="_blank" >
{{ $t('foot.link4') }}
<a href="https://www.sofia.edu/" target="_blank" >
索菲亚大学
</a>
</div>
<div>
......
components/Head.vue
浏览文件 @ 370cc272
......@@ -4,7 +4,8 @@
<div class="head-top-content">
<div class="max-width-content">
<app-link :item="{ path: '/' }">
<img src="https://zws-imgs-pub.ezijing.com/static/public/307f688850f8308a5c944bd129436fe0.png" />
<img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/ezijing-logo.png" />
<img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/sofia-logo.png" />
</app-link>
<div class="user" v-if="user.id">
<span>{{ user.realname || user.nickname }}</span
......@@ -89,10 +90,18 @@ li {
.max-width-content {
display: flex;
align-items: center;
img {
height: 55px;
cursor: pointer;
display: block;
::v-deep.link-content{
a{
display:flex;
img {
height: 55px;
cursor: pointer;
display: block;
}
img:first-child{
margin-right:30px;
}
}
}
.user {
margin-left: auto;
......
components/home/commonProblem.vue
浏览文件 @ 370cc272
......@@ -7,7 +7,7 @@
<ul>
<li>
<div class="icon"></div>
<div class="text">Kelley商学院毕业生颁发的学位证书与在美国颁发的证书有何不同？</div>
<div class="text">索菲亚大学给本项目毕业生颁发的学位证书与在美国颁发的证书有何不同？</div>
</li>
<li>
<div class="icon"></div>
......@@ -29,7 +29,7 @@
<ul>
<li>
<div class="icon"></div>
<div class="text">如何申请Kelley商学院金融学硕士？</div>
<div class="text">如何申请美国索菲亚大学FMBA？</div>
</li>
<li>
<div class="icon"></div>
......@@ -41,7 +41,7 @@
</li>
<li>
<div class="icon"></div>
<div class="text">美国印第安纳大学Kelley商学院金融学硕士的学费是多少？</div>
<div class="text">美国索菲亚大学金融方向工商管理硕士的学费是多少？</div>
</li>
<li>
<div class="icon"></div>
......
components/home/presence.vue
浏览文件 @ 370cc272
......@@ -194,7 +194,7 @@ export default {
width: 1200px;
height: 540px;
margin: 80px auto 0;
background: url(https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/kelley/home-ssfc-bg.png);
background: url(https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/home-apply-form-bg.png);
background-size: 100% 100%;
display: flex;
justify-content: space-between;
......
components/home/projectFeatures.vue
浏览文件 @ 370cc272
......@@ -26,29 +26,29 @@ export default {
},
data: [
{
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/kelley/home-icon1.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/kelley/home-icon-s1.png',
text: this.$t('home.project.itemT1'), path: '', pathType: 0
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/SOFIA_icon_global.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/SOFIA_icon_global_on.png',
text: '所获学位<br />全球通行，正规硕士学位', path: '', pathType: 0
},
{
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/kelley/home-icon2.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/kelley/home-icon-s2.png',
text: this.$t('home.project.itemT2'), path: '', pathType: 0
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/SOFIA_icon_double_cert.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/SOFIA_icon_double_cert_on.png',
text: '中美双认证大学', path: '', pathType: 0
},
{
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/kelley/home-icon3.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/kelley/home-icon-s3.png',
text: this.$t('home.project.itemT3'), path: '', pathType: 0
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/SOFIA_icon_trinity.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/SOFIA_icon_trinity_on.png',
text: '创新课程体系<br />融合金融、管理和心理学', path: '', pathType: 0
},
{
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/kelley/home-icon4.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/kelley/home-icon-s4.png',
text: this.$t('home.project.itemT4'), path: '', pathType: 0
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/SOFIA_icon_International.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/SOFIA_icon_International_on.png',
text: '国际化校友全球16<br />个国家国际校友', path: '', pathType: 0
},
{
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/kelley/home-icon5.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/kelley/home-icon-s5.png',
text: this.$t('home.project.itemT5'), path: '', pathType: 0
icon: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/SOFIA_icon_Authority.png',
iconActive: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/SOFIA_icon_Authority_on.png',
text: '中美权威师资<br />清华、北大、斯坦福权威师资', path: '', pathType: 0
}
]
}
......
components/home/schoolRanking.vue
浏览文件 @ 370cc272
......@@ -5,41 +5,38 @@
<div class="name">{{ $t('home.ranking.title') }}</div>
<div class="line"></div>
</div>
<div class="content-mian">
<div class="li">
<div class="li-tit" v-html="$t('home.ranking.item1Tit')"></div>
<div class="item">
<div class="tit"><span>No.</span>11</div>
<div class="p" v-html="$t('home.ranking.item1Txt1')"></div>
<ul class="content-mian">
<li>
<div class="img">
<img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/home-ranking-1.png">
</div>
<div class="item">
<div class="tit"><span>No.</span>21</div>
<div class="p" v-html="$t('home.ranking.item1Txt2')"></div>
<p>中国教育部<br/>教育涉外监管信息网<br/>认证大学</p>
</li>
<li>
<div class="img">
<img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/home-ranking-2.png">
</div>
</div>
<div class="li">
<div class="li-tit" v-html="$t('home.ranking.item2Tit')"></div>
<div class="item">
<div class="tit"><span>No.</span>21</div>
<div class="p" v-html="$t('home.ranking.item2Txt1')"></div>
<p>美国教育部<br/>西部院校联盟(WASC)<br/>认证大学</p>
</li>
<li>
<div class="img">
<img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/home-ranking-3.png">
</div>
<div class="item">
<div class="tit"><span>No.</span>1</div>
<div class="p" v-html="$t('home.ranking.item2Txt2')"></div>
<p>美国加州<br/>私立高等教育局(BPPE)<br/>认证大学</p>
</li>
<li>
<div class="img">
<img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/home-ranking-4.png">
</div>
</div>
<div class="li mar-t">
<div class="li-tit" v-html="$t('home.ranking.item3Tit')"></div>
<div class="item">
<div class="tit"><span>No.</span>11</div>
<div class="p" v-html="$t('home.ranking.item3Txt1')"></div>
<p>美国高等教育<br/>认证委员会(CHEA)<br/>认证大学</p>
</li>
<li>
<div class="img">
<img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/home-ranking-5.png">
</div>
<div class="item">
<div class="tit"><span>No.</span>21</div>
<div class="p" v-html="$t('home.ranking.item3Txt2')"></div>
</div>
</div>
</div>
<p>美国<br/>学位三级认证</p>
</li>
</ul>
</div>
</template>
<script>
......@@ -52,7 +49,7 @@ export default {
margin-top: 57px;
width: 100%;
height: 680px;
background: url(https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/kelley/home-ranking-bg.png) center;
background: url(https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/sofia/ranking-bg.png) center;
background-size: cover;
.title{
width: 996px;
......@@ -74,45 +71,22 @@ export default {
}
}
.content-mian{
width: 1000px;
width: 1120px;
margin: 0 auto;
display: flex;
justify-content: space-between;
.li{
width: 250px;
&.mar-t{
transform: translateY(-35px);
.li-tit{
line-height: 34px;
transform: translateY(20px);
}
}
.li-tit{
text-align: center;
font-size: 30px;
line-height: 100%;
color: #fff;
li{
width: 210px;
background:#fff;
text-align: center;
.img{
height:200px;
padding:80px 0 50px;
}
.item{
.tit{
padding-top: 46px;
font-size: 48px;
line-height: 100%;
color: #FFFFFF;
text-align: center;
margin-bottom: 15px;
line-height: 100%;
span{
font-size: 24px;
}
}
.p{
text-align: center;
font-size: 16px;
line-height: 30px;
color: #FFFFFF;
// margin-bottom: 11px;
}
p{
color:#333;
line-height:24px;
padding-bottom:60px;
}
}
}
......
components/rightAside.vue
浏览文件 @ 370cc272
......@@ -71,13 +71,13 @@ export default {
return {
tabBtnActive: false,
tabBtnTarget: '',
projectName: this.$t('aside.project4'),
projectName: '金融工商管理硕士',
sendCode: '',
isBtnDisabled: false,
formInfo: {
name: '',
phone: '',
newProjectId: '1001'
newProjectId: '1000'
},
projectList: [
{ label: '金融工商管理硕士', value: '1000' },
......
nuxt.config.js
浏览文件 @ 370cc272
......@@ -17,7 +17,7 @@ export default {
}),
// Global page headers: https://go.nuxtjs.dev/config-head
head: {
title: '紫荆教育-在线MBA课程-MBA在线课程-专业金融在线教育品牌',
title: '索菲亚大学金融方向工商管理硕士项目',
htmlAttrs: {
lang: 'en'
},
......@@ -28,12 +28,12 @@ export default {
{
name: 'keywords',
content:
'理财规划师,企业理财顾问师,投资理财顾问,金融理财师,理财培训,企业融资,国家理财规划师,财富管理,资产管理,个人财富管理,证券投资,信托投资,房地产投资'
'索非亚大学,金融方向工商管理硕士,心理学研究,个人心理学'
},
{
name: 'description',
content:
'紫荆教育依托清华大学和五道口金融学院丰富的教育资源,秉承其严谨务实的教学理念,紧密结合宏观经济转型过程中,企业和个人知识结构升级的需求,融理论大家、实践专家、顶尖专业机构集体智慧于一体,构建以金融为核心的商业实战知识体系,努力为中国社会商业素质提高贡献一己之力.课程分类：企业理财顾问(CFC),理财规划师,财富资产管理,金融创业投资项目.'
'美国索非亚大学创办于1975年，前身是超个人心理学研究所，由毕业于哈佛大学的罗伯特.弗雷格尔博士(Dr.Robert Frager)创办。作为全球第一所超个人心理学顶尖学府，在超个人心理学的研究、整体性及临床教育上，处于全球领导地位。'
}
],
link: [
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论