Skip to content

P
project-www-pc
提交 82381f2f authored 作者: matian's avatar matian
浏览文件
操作

updates

上级 35b989ea
显示空白字符变更
内嵌 并排
正在显示 包含 101 行增加 和 62 行删除
components/home/alumniStories.vue
浏览文件 @ 82381f2f
...@@ -124,7 +124,6 @@ export default { ...@@ -124,7 +124,6 @@ export default {
.content_desc { .content_desc {
width: 568px; width: 568px;
height: 100%; height: 100%;
margin-left: 32px; margin-left: 32px;
.desc_tit { .desc_tit {
margin-top: 56px; margin-top: 56px;
......
components/home/openClass.vue
浏览文件 @ 82381f2f
...@@ -116,14 +116,14 @@ export default { ...@@ -116,14 +116,14 @@ export default {
left: 0; left: 0;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
line-height: 40px;
background: rgba(0, 0, 0, 0.5); background: rgba(0, 0, 0, 0.5);
padding: 0 20px; padding: 17px 0 14px 17px;
font-size: 20px; font-size: 18px;
color: #fefefe; color: #ffffff;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
box-sizing: border-box;
} }
} }
...@@ -172,7 +172,7 @@ export default { ...@@ -172,7 +172,7 @@ export default {
margin-left: 17px; margin-left: 17px;
.tit { .tit {
font-size: 18px; font-size: 18px;
font-weight: 500; font-weight: 400;
line-height: 24px; line-height: 24px;
color: #333333; color: #333333;
} }
......
components/home/projectNotice.vue
浏览文件 @ 82381f2f
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
delay: 3000, delay: 3000,
loop: true, loop: true,
direction: 'vertical', direction: 'vertical',
height: 82, height: 102,
loopAdditionalSlides: 1 loopAdditionalSlides: 1
}, },
activityList: [] activityList: []
...@@ -134,7 +134,7 @@ export default { ...@@ -134,7 +134,7 @@ export default {
// transform: translateY(-15px); // transform: translateY(-15px);
.li { .li {
display: flex; display: flex;
align-items: center; align-items: flex-start;
padding-top: 26px; padding-top: 26px;
padding-bottom: 26px; padding-bottom: 26px;
.txt { .txt {
...@@ -143,6 +143,12 @@ export default { ...@@ -143,6 +143,12 @@ export default {
font-weight: 400; font-weight: 400;
color: #424242; color: #424242;
text-align: center; text-align: center;
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2; //超出第几行，关键在这里
line-clamp: 2; //超出第几行，关键在这里
} }
.time { .time {
font-size: 30px; font-size: 30px;
......
components/home/projectService.vue
浏览文件 @ 82381f2f
...@@ -75,7 +75,7 @@ export default { components: { Goverment, School, Company, Personal } } ...@@ -75,7 +75,7 @@ export default { components: { Goverment, School, Company, Personal } }
height: 643px; height: 643px;
background: #ffffff; background: #ffffff;
margin-top: 18px; margin-top: 18px;
padding: 30px; padding: 32px 40px 57px 32px;
} }
} }
} }
......
components/home/projectService/company.vue
浏览文件 @ 82381f2f
...@@ -79,6 +79,7 @@ export default { ...@@ -79,6 +79,7 @@ export default {
} }
li:nth-child(2) { li:nth-child(2) {
margin-top: 40px; margin-top: 40px;
z-index: 10;
} }
} }
} }
......
components/home/projectService/personal.vue
浏览文件 @ 82381f2f
...@@ -4,58 +4,40 @@ ...@@ -4,58 +4,40 @@
<div class="content_top"> <div class="content_top">
<h6 class="top_title">国际学位</h6> <h6 class="top_title">国际学位</h6>
<div class="top_con"> <div class="top_con">
<div class="con_left"> <div class="con_left" v-for="(item, index) in degreeList" :key="index">
<div class="left_tit">— 硕士 —</div> <div class="left_tit">{{ item.title }}</div>
<div class="left_content">
<ul class="left_con"> <ul class="left_con">
<li v-for="(item, index) in masterList" :key="index"> <li v-for="(it, index) in item.children" :key="index">
<AppLink :data="item"> <AppLink :data="it">
<img :src="item.img" alt="" class="con_img" /> <img :src="it.img" alt="" class="con_img" />
<div class="con_desc" v-html="item.desc"></div> <div class="con_desc" v-html="it.desc"></div>
</AppLink> </AppLink>
</li> </li>
</ul> </ul>
<div class="line" v-if="item.isLine"></div>
</div> </div>
<div class="con_left">
<div class="left_tit">— MBA —</div>
<ul class="left_con left_con2">
<li v-for="(item, index) in mbaList" :key="index">
<AppLink :data="item">
<img :src="item.img" alt="" class="con_img" />
<div class="con_desc" v-html="item.desc"></div>
</AppLink>
</li>
</ul>
</div> </div>
</div> </div>
</div> </div>
<div class="content_top"> <div class="content_top">
<h6 class="top_title">留学深造</h6> <h6 class="top_title">留学深造</h6>
<div class="top_con"> <div class="top_con">
<div class="con_left"> <div class="con_left con_left1" v-for="(item, index) in abroadList" :key="index">
<div class="left_tit">— 硕士直通车 —</div> <div class="left_tit">{{ item.title }}</div>
<div class="left_content">
<ul class="left_con1"> <ul class="left_con1">
<li v-for="(item, index) in masterAbroadList" :key="index"> <li v-for="(it, index) in item.children" :key="index">
<AppLink :data="item"> <AppLink :data="it">
<div class="con"> <div class="con">
<img :src="item.img" alt="" class="con_img" /> <img :src="it.img" alt="" class="con_img" />
<div class="con_desc" v-html="item.desc"></div> <div class="con_desc" v-html="it.desc"></div>
</div> </div>
</AppLink> </AppLink>
</li> </li>
</ul> </ul>
<div class="line1" v-if="item.isLine"></div>
</div> </div>
<div class="con_left">
<div class="left_tit">— 博士 —</div>
<ul class="left_con1 left_con2">
<li v-for="(item, index) in doctorList" :key="index">
<AppLink :data="item">
<div class="con">
<img :src="item.img" alt="" class="con_img" />
<div class="con_desc" v-html="item.desc"></div>
</div>
</AppLink>
</li>
</ul>
</div> </div>
</div> </div>
</div> </div>
...@@ -68,7 +50,11 @@ export default { ...@@ -68,7 +50,11 @@ export default {
components: { AppLink }, components: { AppLink },
data() { data() {
return { return {
masterList: [ degreeList: [
{
title: '— 硕士 —',
isLine: true,
children: [
{ {
img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/master_med1.png', img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/master_med1.png',
desc: '教育学硕士(儿童)<br/>MED', desc: '教育学硕士(儿童)<br/>MED',
...@@ -89,8 +75,13 @@ export default { ...@@ -89,8 +75,13 @@ export default {
desc: '教育学硕士(家庭) <br/>MED', desc: '教育学硕士(家庭) <br/>MED',
href: 'https://cuw.ezijing.com/index' href: 'https://cuw.ezijing.com/index'
} }
], ]
mbaList: [ },
{
title: '— MBA —',
isLine: false,
children: [
{ {
img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/mba1.png', img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/mba1.png',
desc: '数字领导力方向<br/>MBA', desc: '数字领导力方向<br/>MBA',
...@@ -106,8 +97,15 @@ export default { ...@@ -106,8 +97,15 @@ export default {
desc: '餐饮管理方向<br/>MBA', desc: '餐饮管理方向<br/>MBA',
href: 'https://caas.ezijing.com/' href: 'https://caas.ezijing.com/'
} }
]
}
], ],
masterAbroadList: [
abroadList: [
{
title: '— 硕士直通车 —',
isLine: true,
children: [
{ {
img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/abroad1.png', img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/abroad1.png',
desc: '纽约州立大学石溪分校<br/>金融学硕士保研项目', desc: '纽约州立大学石溪分校<br/>金融学硕士保研项目',
...@@ -118,8 +116,12 @@ export default { ...@@ -118,8 +116,12 @@ export default {
desc: '斯蒂文斯理工学院<br/>工程管理硕士保研项目', desc: '斯蒂文斯理工学院<br/>工程管理硕士保研项目',
href: 'https://sit-plus.ezijing.com/' href: 'https://sit-plus.ezijing.com/'
} }
], ]
doctorList: [ },
{
title: '— 博士 —',
isLine: false,
children: [
{ {
img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/abroad3.png', img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/abroad3.png',
desc: '加州浸会大学<br/>工商管理博士项目DBA', desc: '加州浸会大学<br/>工商管理博士项目DBA',
...@@ -127,6 +129,8 @@ export default { ...@@ -127,6 +129,8 @@ export default {
} }
] ]
} }
]
}
} }
} }
</script> </script>
...@@ -155,27 +159,29 @@ export default { ...@@ -155,27 +159,29 @@ export default {
height: 192px; height: 192px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; // align-items: center;
.left_tit { .left_tit {
font-size: 16px; font-size: 16px;
color: #000000; color: #000000;
} }
.left_content {
display: flex;
.left_con { .left_con {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
margin-top: 10px; margin-top: 30px;
li { li {
width: 148px; width: 148px;
height: 156px;
opacity: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
padding-top: 10px;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
background: #aa1940; background: #aa1940;
padding-top: 10px;
padding-bottom: 14px;
margin-top: -10px;
.con_desc { .con_desc {
color: #f9f8f8; color: #f9f8f8;
} }
...@@ -192,10 +198,16 @@ export default { ...@@ -192,10 +198,16 @@ export default {
color: #333333; color: #333333;
} }
} }
li:last-child { li:not(:last-child) {
margin-right: 37px; margin-right: 10px;
} }
} }
.line {
width: 0px;
height: 129px;
border: 1px dashed #c4c4c4;
margin: 30px 25px 5px 25px;
}
.left_con1 { .left_con1 {
display: flex; display: flex;
...@@ -235,17 +247,38 @@ export default { ...@@ -235,17 +247,38 @@ export default {
} }
} }
li:nth-child(2) { li:nth-child(2) {
margin-left: 40px; margin-left: 30px;
}
}
.line1 {
width: 0px;
height: 129px;
border: 1px dashed #c4c4c4;
margin: 30px 35px;
} }
li:last-child {
margin-right: 37px;
} }
} }
.left_con2 { .con_left:nth-child(1) {
padding-left: 35px; .left_tit {
border-left: 1px dashed #c4c4c4; margin-left: 275px;
}
} }
.con_left1:nth-child(1) {
.left_tit {
margin-left: 296px;
}
}
.con_left:nth-child(2) {
align-items: center;
// .left_tit {
// margin-left: 188px;
// }
} }
// .con_left:nth-child(3) {
// .left_tit {
// margin-left: 296px;
// }
// }
} }
} }
</style> </style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论