Skip to content

P
project-www-pc
提交 7756a15c authored 作者: lhh's avatar lhh
浏览文件
操作

Merge branch 'new' of https://gitlab-pro.ezijing.com/ezijing-web/project-www-pc into new

上级 0e1a341c a0d5578d
隐藏空白字符变更
内嵌 并排
正在显示 包含 168 行增加 和 106 行删除
components/FormSubmit.vue
浏览文件 @ 7756a15c
......@@ -141,8 +141,8 @@ export default {
{ label: '领航数字时代EMBA', value: '1026' },
{ label: this.$t('aside.project1'), value: '1012' },
{ label: this.$t('aside.project3'), value: '1008' },
{ label: this.$t('aside.project9'), value: '1015' },
{ label: this.$t('aside.project4'), value: '1001' }
// { label: this.$t('aside.project9'), value: '1015' },
// { label: this.$t('aside.project4'), value: '1001' }
]
} else {
return [
......
components/Head.vue
浏览文件 @ 7756a15c
......@@ -330,11 +330,11 @@ export default {
name: this.$t('menu.degreeChild.master'),
isShow: false,
children: [
{
name: this.$t('menu.degreeChild.masterChild.msf'),
path: 'https://kelley.ezijing.com',
pathType: 1
},
// {
// name: this.$t('menu.degreeChild.masterChild.msf'),
// path: 'https://kelley.ezijing.com',
// pathType: 1
// },
{
name: this.$t('menu.degreeChild.masterChild.med'),
path: 'https://cu.ezijing.com',
......@@ -377,11 +377,11 @@ export default {
path: 'https://shms.ezijing.com',
pathType: 1
},
{
name: this.$t('menu.degreeChild.mbaChild.caas'),
path: 'https://caas.ezijing.com',
pathType: 1
}
// {
// name: this.$t('menu.degreeChild.mbaChild.caas'),
// path: 'https://caas.ezijing.com',
// pathType: 1
// }
]
// },
......@@ -406,6 +406,17 @@ export default {
// pathType: 1
// }
// ]
},
{
name: 'DBA',
isShow: false,
children: [
{
name: '科创方向DBA',
path: 'https://ppai.ezijing.com/',
pathType: 1
}
]
}
]
},
......@@ -497,8 +508,8 @@ export default {
this.isEn = this.$cookies.get('lang') === 'en-US'
this.$store.dispatch('checkLogin')
if (this.isEn) {
this.navData.map((item) => {
item?.children?.map((it) => {
this.navData.map(item => {
item?.children?.map(it => {
if (it.isShowChild === false) {
it.children = ''
}
......@@ -556,9 +567,9 @@ export default {
}
},
navLeave() {
this.navData.map((item) => {
this.navData.map(item => {
if (item.children) {
item.children.map((cItem) => {
item.children.map(cItem => {
cItem.isShow = false
})
}
......@@ -576,14 +587,14 @@ export default {
},
computed: {
getNameActive() {
return (item) => {
return item => {
const currentPath = this.$route.path
if (currentPath.includes(item.path)) {
return 'name active'
} else {
let className = 'name'
if (item.children) {
item.children.map((cData) => {
item.children.map(cData => {
cData.path === currentPath && (className = 'name active')
})
}
......
components/ProjectCard.vue
浏览文件 @ 7756a15c
<template>
<AppCard :title="title" style="margin-top:50px;">
<AppCard :title="title" style="margin-top: 50px">
<template #header-aside><nuxt-link :to="baseUrl" v-if="baseUrl">查看更多+</nuxt-link></template>
<div class="project-list">
<div :class="className ? className : 'project-list'">
<div class="project-item" v-for="(item, index) in list" :key="index">
<!-- <AppLink :data="item"><img :src="item.imgUrl"/></AppLink> -->
<div
class="project-item-pic"
:style="
isEn
? `background:url(${item.imgUrlEn}) no-repeat center / 100% 100%;`
: `background:url(${item.imgUrl}) no-repeat center / 100% 100%; `
"
>
:style="isEn ? `background:url(${item.imgUrlEn}) no-repeat center / 100% 100%;` : `background:url(${item.imgUrl}) no-repeat center / 100% 100%; `">
<!-- <img :src="item.imgUrl" /> -->
<ul class="tools">
<li @click="handleSubmit(item)">{{ isEn ? 'Register' : '我要报名' }}</li>
......@@ -37,7 +32,7 @@ import AppLink from '@/components/Link.vue'
export default {
name: 'ProjectCard',
props: { list: { type: Array, default: () => [] }, title: String, baseUrl: String },
props: { list: { type: Array, default: () => [] }, title: String, baseUrl: String, className: String },
components: { AppCard, AppLink },
data() {
return {
......@@ -66,49 +61,96 @@ export default {
<style lang="scss" scoped>
.project-list {
display: grid;
grid-template-columns: repeat(3, 1fr);
row-gap: 20px;
column-gap: 20px;
.project-item {
background-color: #fff;
.project-item-pic {
height: 360px;
overflow: hidden;
position: relative;
}
img {
width: 100%;
}
&:hover {
box-shadow: 0px 3px 24px rgba(0, 0, 0, 0.3);
}
.tools {
position: absolute;
bottom: 20px;
left: 0;
display: flex;
justify-content: center;
width: 100%;
li {
flex: 1;
font-size: 16px;
font-weight: 400;
color: #4d4d4d;
text-align: center;
cursor: pointer;
// &:hover {
// font-weight: 500;
// color: #333333;
// }
}
li:first-child {
color: #af1c40;
}
li + li {
border-left: 1px solid #c9c9c9;
}
}
}
}
.project-list2 {
display: grid;
grid-template-columns: repeat(2, 1fr);
row-gap: 37px;
column-gap: 37px;
}
.project-item {
background-color: #fff;
.project-item-pic {
height: 230px;
overflow: hidden;
position: relative;
}
img {
width: 100%;
}
&:hover {
box-shadow: 0px 3px 24px rgba(0, 0, 0, 0.3);
}
.tools {
position: absolute;
bottom: 15px;
right: 0;
display: flex;
justify-content: center;
width: 350px;
li {
flex: 1;
font-size: 16px;
font-weight: 400;
color: #4d4d4d;
text-align: center;
cursor: pointer;
// &:hover {
// font-weight: 500;
// color: #333333;
// }
.project-item {
background-color: #fff;
.project-item-pic {
height: 230px;
overflow: hidden;
position: relative;
}
li:first-child {
color: #af1c40;
img {
width: 100%;
}
li + li {
border-left: 1px solid #c9c9c9;
&:hover {
box-shadow: 0px 3px 24px rgba(0, 0, 0, 0.3);
}
.tools {
position: absolute;
bottom: 15px;
right: 0;
display: flex;
justify-content: center;
width: 350px;
li {
flex: 1;
font-size: 16px;
font-weight: 400;
color: #4d4d4d;
text-align: center;
cursor: pointer;
// &:hover {
// font-weight: 500;
// color: #333333;
// }
}
li:first-child {
color: #af1c40;
}
li + li {
border-left: 1px solid #c9c9c9;
}
}
}
}
......
components/home/abroadStudy.vue
浏览文件 @ 7756a15c
<template>
<div
style="padding:100px 0 40px;background: url(https://webapp-pub.oss-cn-beijing.aliyuncs.com/www/pc/240531/lx-bg.png); background-size: cover;"
>
style="
padding: 100px 0 40px;
background: url(https://webapp-pub.oss-cn-beijing.aliyuncs.com/www/pc/240531/lx-bg.png);
background-size: cover;
">
<AppCard title="$t('home.abroad.title')" titleAlign="center" style="margin: 0 auto">
<template #title>
<nuxt-link to="/studyAbroad">{{ $t('home.abroad.title') }}</nuxt-link>
......@@ -13,13 +16,15 @@
<div class="box-col__title" style="margin-top: 35px">{{ item.title }}</div>
<div class="box-l_list">
<div class="box-l_item" v-for="cItem in item.children">
<div class="box-item_title">{{ cItem.title }}</div>
<img :src="cItem.img" class="box-item_logo" />
<div class="box-item_btns">
<a :href="btn.href" v-for="btn in cItem.btn" target="_blank">
<div class="box-item_btn" v-html="btn.name"></div>
</a>
</div>
<a :href="cItem.href">
<div class="box-item_title">{{ cItem.title }}</div>
<img :src="cItem.img" class="box-item_logo" />
<div class="box-item_btns">
<a :href="btn.href" v-for="btn in cItem.btn" target="_blank">
<div class="box-item_btn" v-html="btn.name"></div>
</a>
</div>
</a>
</div>
</div>
</div>
......@@ -28,11 +33,11 @@
<div class="box-red_title">非学历项目</div>
<div class="box-block" style="margin: 75px 0 30px">
<img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/www/pc/fxl-img1.png" />
<div style="margin-left: 10px;" class="btn">交换生项目</div>
<div style="margin-left: 10px" class="btn">交换生项目</div>
</div>
<div class="box-block">
<img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/www/pc/fxl-img2.png" />
<div style="margin-left: 10px;" class="btn">教师访学项目</div>
<div style="margin-left: 10px" class="btn">教师访学项目</div>
</div>
</div>
</div>
......@@ -67,6 +72,7 @@ export default {
children: [
{
title: '雪城大学',
href: 'https://syracuse-plus.ezijing.com/',
img: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/www/pc/918/m1.png',
btn: [
{ name: '计算机工程硕士', href: 'https://syracuse-plus.ezijing.com/' },
......@@ -76,16 +82,19 @@ export default {
},
{
title: '斯蒂文斯理工学院',
href: 'https://sit-plus.ezijing.com/',
img: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/www/pc/918/m3.png',
btn: [{ name: '工程管理硕士', href: 'https://sit-plus.ezijing.com/' }]
},
{
title: '纽约州立大学石溪分校',
href: 'https://sbu-plus.ezijing.com/',
img: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/www/pc/918/m2.png',
btn: [{ name: '金融学硕士', href: 'https://sbu-plus.ezijing.com/' }]
},
{
title: '德保罗大学',
href: 'https://depaul-plus.ezijing.com/',
img: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/www/pc/918/m4.png',
btn: [
{ name: '金融学硕士', href: 'https://depaul-plus.ezijing.com/' },
......@@ -93,16 +102,16 @@ export default {
]
}
]
// },
// {
// title: '博士',
// children: [
// {
// title: '加州浸会大学',
// img: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/www/pc/918/d1.png',
// btn: [{ name: '全日制<br />工商管理博士DBA', href: 'https://cbu-plus.ezijing.com/' }]
// }
// ]
// },
// {
// title: '博士',
// children: [
// {
// title: '加州浸会大学',
// img: 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/www/pc/918/d1.png',
// btn: [{ name: '全日制<br />工商管理博士DBA', href: 'https://cbu-plus.ezijing.com/' }]
// }
// ]
}
]
// abroadList: [
......@@ -181,7 +190,7 @@ export default {
}
&:hover {
background-color: #aa1941;
.btn{
.btn {
color: #fff;
}
}
......@@ -228,7 +237,7 @@ export default {
.box-item_title {
color: #fff;
}
.box-item_btn{
.box-item_btn {
color: #fff !important;
}
}
......
components/home/internationalDegree.vue
浏览文件 @ 7756a15c
......@@ -37,11 +37,11 @@ export default {
desc: this.$t('home.degree.med'),
href: 'https://cu.ezijing.com/'
},
{
img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/master_msf.png',
desc: this.$t('home.degree.msf'),
href: 'https://kelley.ezijing.com/'
},
// {
// img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/master_msf.png',
// desc: this.$t('home.degree.msf'),
// href: 'https://kelley.ezijing.com/'
// },
{
img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/master_map.png',
desc: this.$t('home.degree.map'),
......@@ -67,11 +67,11 @@ export default {
desc: this.$t('home.degree.international'),
href: 'https://shms.ezijing.com/'
},
{
img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/mba3.png',
desc: this.$t('home.degree.caas'),
href: 'https://caas.ezijing.com/'
}
// {
// img: 'https://webapp-pub.ezijing.com/www/pc/home/personal/mba3.png',
// desc: this.$t('home.degree.caas'),
// href: 'https://caas.ezijing.com/'
// }
]
},
// {
......
components/rightAside.vue
浏览文件 @ 7756a15c
......@@ -81,8 +81,8 @@ export default {
{ label: this.$t('aside.project6'), value: '1005' },
{ label: this.$t('aside.project8'), value: '1021' },
{ label: this.$t('aside.project3'), value: '1008' },
{ label: this.$t('aside.project9'), value: '1015' },
{ label: this.$t('aside.project4'), value: '1001' },
// { label: this.$t('aside.project9'), value: '1015' },
// { label: this.$t('aside.project4'), value: '1001' },
// { label: '工商管理硕士保研项目', value: '1016' },
// { label: '管理信息系统硕士保研项目', value: '9999' },
{ label: this.$t('aside.project10'), value: '1018' },
......
pages/internationalDegree/index.vue
浏览文件 @ 7756a15c
......@@ -193,12 +193,12 @@ export default {
imgUrlEn: 'https://webapp-pub.ezijing.com/www/pc/internationalDegree/project_shms_en.png',
href: 'https://shms.ezijing.com/'
},
{
project_id: '1015',
imgUrl: 'https://webapp-pub.ezijing.com/www/pc/internationalDegree/project_caas.png',
imgUrlEn: 'https://webapp-pub.ezijing.com/www/pc/internationalDegree/project_caas_en.png',
href: 'https://caas.ezijing.com/'
}
// {
// project_id: '1015',
// imgUrl: 'https://webapp-pub.ezijing.com/www/pc/internationalDegree/project_caas.png',
// imgUrlEn: 'https://webapp-pub.ezijing.com/www/pc/internationalDegree/project_caas_en.png',
// href: 'https://caas.ezijing.com/'
// }
],
// 常见问题
qaList,
......
pages/studyAbroad/index.vue
浏览文件 @ 7756a15c
......@@ -14,7 +14,7 @@
</div>
<FormSubmit :type="2" id="form" ref="formSubmit"></FormSubmit>
<div class="w1200">
<ProjectCard :title="isEn ? 'Popular Programs' : '热门专业'" :list="projectList"></ProjectCard>
<ProjectCard className="project-list2" :title="isEn ? 'Popular Programs' : '热门专业'" :list="projectList"></ProjectCard>
<!-- <div class="why">
<h1 class="why-title">为什么选择紫荆教育的国际留学课程？</h1>
<div class="why-list">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论