Skip to content

P
project-online-old
提交 7a7b8730 authored 作者: 王鹏飞's avatar 王鹏飞
浏览文件
操作

bug fixes

上级 df9f5998
显示空白字符变更
内嵌 并排
正在显示 包含 129 行增加 和 107 行删除
src/api/report_api.js
浏览文件 @ 7a7b8730
......@@ -7,7 +7,7 @@ export default class ScoreAPI extends BaseAPI {
*/
getContent = name =>
this.get(
`zws/v1/cms/projects/1014/contents/${encodeURIComponent(decodeURIComponent(name))}?sites=seg-ajsa.ezijing.com`,
`zws/v1/cms/projects/1014/contents?sites=seg-ajsa.ezijing.com&tags=${name}`,
{}
)
/**
......
src/pages/project/index.vue
浏览文件 @ 7a7b8730
......@@ -7,10 +7,10 @@
</ul>
</div>
<div class="tap-item-box">
<div class="t-item2 con970">
<div class="t-item2 con970" v-show="showIndex === 1">
<news :data="newsData"></news>
</div>
<div class="t-item2 con970" v-show="false">
<div class="t-item2 con970" v-show="showIndex === 2">
<news :data="newsData2"></news>
</div>
</div>
......@@ -44,26 +44,30 @@ export default {
if (n === 1) {
requestType = [
{
name: '预科简介',
name: '本科-项目简介',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
},
{
name: '适用人群',
name: '本科-适用人群',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
},
{
name: '上课地点',
name: '本科-上课地点',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
}
]
} else {
requestType = [
{
name: '预科课程',
name: '硕士-项目简介',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
},
{
name: '课程内容',
name: '硕士-适用人群',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
},
{
name: '硕士-上课地点',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
}
]
......@@ -73,7 +77,9 @@ export default {
})
},
request(item, index, n) {
cAction.reportAction.getContent(item.name).then(json => {
cAction.reportAction
.getContent(item.name)
.then(json => {
if (n === 1) {
this.newsData.push({
id: index,
......@@ -91,82 +97,86 @@ export default {
})
this.newsData2 = this.newsData2.sort((a, b) => a.id - b.id)
}
}).catch(e => { this.$message.error(e.message) }).finally(() => {})
})
.catch(e => {
this.$message.error(e.message)
})
.finally(() => {})
}
}
}
</script>
<style lang="scss" scoped>
.con970{
.con970 {
width: 970px;
margin: 0 auto;
}
.modul1{
.modul1 {
position: relative;
width: 100%;
height: 190px;
background: url(https://zws-imgs-pub.ezijing.com/static/public/e5edeacd362ce7876f52c799f7e1a98d.png) center;
background-size: cover;
.tap-btn{
.tap-btn {
width: 970px;
position: absolute;
bottom: 0;
left: 50%;
-webkit-transform: translateX(-50%);
display: flex;
li{
li {
width: 128px;
height: 36px;
background: #BF0927;
background: #bf0927;
margin-right: 2px;
font-size: 16px;
line-height: 36px;
text-align: center;
color: #fff;
&.active{
color: #BF0927;
&.active {
color: #bf0927;
background: #fff;
}
}
}
}
.tap-item-box{
.t-item1{
li{
border-bottom: 1px solid #CCCCCC;
.tap-item-box {
.t-item1 {
li {
border-bottom: 1px solid #cccccc;
padding: 30px 0 40px;
display: flex;
.info{
.img{
background: #F5F7F8;
.info {
.img {
background: #f5f7f8;
padding: 21px;
img{
img {
width: 178px;
height: 248px;
display: block;
}
}
p{
p {
width: 100%;
color: #000;
font-size: 14px;
line-height: 30px;
margin: 0;
text-align: center;
&.name{
&.name {
font-size: 24px;
font-weight: bold;
}
}
}
.msg{
.msg {
margin-left: 30px;
.title{
.title {
font-size: 23px;
color: #000;
line-height: 32px;
}
p{
p {
margin-top: 28px;
line-height: 30px;
color: #000;
......@@ -175,47 +185,47 @@ export default {
}
}
}
.new-items{
.new-items {
display: flex;
}
.child-tabs{
.child-tabs {
width: 670px;
margin-bottom: 40px;
}
.t-item2{
.t-item2 {
// display: flex;
padding: 60px 0;
.article{
.article {
width: 670px;
.title{
.title {
line-height: 100%;
font-size: 23px;
font-weight: bold;
}
.t2{
.t2 {
line-height: 25px;
font-size: 18px;
font-weight: bold;
margin-top: 5px;
}
.txt{
.txt {
padding-top: 30px;
p{
p {
line-height: 30px;
font-size: 14px;
color: #000;
// text-indent: 2em;
&.martop{
&.martop {
margin-top: 30px;
}
}
}
}
.right-img{
.right-img {
position: relative;
margin-left: auto;
}
.photo{
.photo {
position: relative;
z-index: 9;
width: 235px;
......@@ -223,7 +233,7 @@ export default {
display: flex;
position: relative;
}
.line{
.line {
position: absolute;
top: 35px;
right: 35px;
......@@ -232,22 +242,22 @@ export default {
border: 1px solid #979797;
}
}
.t-item3{
.t-item3 {
padding-top: 60px;
position: relative;
.t1{
.t1 {
line-height: 32px;
font-size: 23px;
font-weight: bold;
}
.t2{
.t2 {
margin-top: 5px;
line-height: 25px;
font-size: 18px;
font-weight: bold;
padding-bottom: 30px;
}
.new-img{
.new-img {
width: 891px;
margin: 0 auto 60px auto;
display: block;
......@@ -256,49 +266,49 @@ export default {
// left: 50%;
// -webkit-transform: translateX(-50%);
}
ul{
li{
ul {
li {
padding: 40px 0;
.con970{
.con970 {
overflow: hidden;
}
img{
img {
display: block;
width: 140px;
height: 140px;
float: left;
}
.wenb{
.wenb {
float: left;
width: 510px;
.title{
.title {
font-size: 18px;
font-weight: bold;
color: #262626;
line-height: 25px;
margin-bottom: 25px;
}
p{
p {
margin-bottom: 10px;
font-size: 14px;
color: #2B2B2B;
color: #2b2b2b;
line-height: 20px;
}
}
&.type-l{
background: #F3F3F3;
img{
&.type-l {
background: #f3f3f3;
img {
margin-right: 60px;
}
}
&.type-r{
.con970{
&.type-r {
.con970 {
justify-content: right;
}
img{
img {
float: right;
}
.wenb{
.wenb {
text-align: right;
margin-right: 60px;
float: right;
......@@ -308,65 +318,65 @@ export default {
}
}
}
.new-style{
.new-style {
padding-bottom: 60px;
.top-cont{
.top-cont {
width: 970px;
margin: 0 auto;
display: flex;
.left{
.left {
width: 434px;
height: 496px;
background: url(https://zws-imgs-pub.ezijing.com/static/public/9ca050bb75b08a232433f570bcac652d.png);
background-size: 100% 100%;
.txt{
.txt {
font-size: 16px;
font-weight: bold;
color: #FFFFFF;
color: #ffffff;
line-height: 29px;
width: 353px;
margin: 180px auto 0;
text-indent: 2em;
}
}
ul{
ul {
margin-left: auto;
li{
transition: all .5s;
li {
transition: all 0.5s;
width: 464px;
height: 50px;
background: #F1F2F3;
background: #f1f2f3;
padding: 0;
margin-bottom: 14px;
&.br{
&:hover{
&.br {
&:hover {
height: 163px;
}
}
&:hover{
&:hover {
height: 143px;
background: #D83C56;
.dis-b{
background: #d83c56;
.dis-b {
display: none;
}
.dis-n{
.dis-n {
display: block;
}
}
.dis-b{
.dis-b {
display: flex;
align-items: center;
height: 100%;
.d{
.d {
width: 8px;
height: 8px;
background: #BF0927;
background: #bf0927;
margin-left: 30px;
border-radius: 50%;
}
.txt{
.txt {
font-size: 18px;
color: #BF0927;
color: #bf0927;
line-height: 25px;
margin-left: 10px;
}
......@@ -374,64 +384,64 @@ export default {
}
}
}
.dis-n{
.dis-n {
margin-left: 50px;
display: none;
.title{
.title {
font-size: 24px;
font-weight: bold;
color: #FFFFFF;
color: #ffffff;
line-height: 33px;
padding-top: 30px;
margin-bottom: 36px;
}
.txt{
.txt {
font-size: 14px;
font-weight: bold;
color: #FFFFFF;
color: #ffffff;
line-height: 20px;
}
}
}
.content{
.content {
position: relative;
width: 100%;
height: 350px;
background: url(https://zws-imgs-pub.ezijing.com/static/public/3ec70f7e95c722cc38d5b38749768b87.png);
background-size: 100% 100%;
.title{
.title {
font-size: 24px;
font-weight: bold;
color: #FFFFFF;
color: #ffffff;
line-height: 33px;
padding-top: 60px;
text-align: center;
}
.p1{
.p1 {
text-align: center;
font-size: 14px;
font-weight: bold;
color: #FFFFFF;
color: #ffffff;
line-height: 20px;
margin-top: 10px;
}
.box-cont{
.box-cont {
width: 1000px;
height: 155px;
border: 1px solid rgba(216,60,86,.5);
border: 1px solid rgba(216, 60, 86, 0.5);
// border: 1px solid #D83C56;
margin: 35px auto 0;
position: relative;
.le-tj{
.le-tj {
position: absolute;
top: 0;
left: 0;
width: 198px;
height: 155px;
background: rgba(255,255,255,.2);
background: rgba(255, 255, 255, 0.2);
font-size: 18px;
font-weight: bold;
color: #FFFFFF;
color: #ffffff;
line-height: 155px;
text-align: center;
}
......@@ -450,22 +460,22 @@ export default {
// }
// }
}
.txt-box{
.txt-box {
position: absolute;
top: 30%;
left: 50%;
-webkit-transform: translateX(-50%);
padding-top: 33px;
.pp1{
.pp1 {
font-size: 20px;
font-weight: bold;
color: #FFFFFF;
color: #ffffff;
line-height: 20px;
margin-bottom: 30px;
}
}
}
.zs-cont{
.zs-cont {
padding-top: 60px;
}
</style>
src/pages/recruitInfo/components/apply.vue
浏览文件 @ 7a7b8730
......@@ -32,15 +32,15 @@ export default {
getData() {
const requestType = [
{
name: '申请条件',
name: '本科-申请条件',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
},
{
name: '申请流程',
name: '本科-申请流程',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
},
{
name: '常见问题',
name: '本科-常见问题',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
}
]
......
src/pages/recruitInfo/components/support.vue
浏览文件 @ 7a7b8730
......@@ -44,7 +44,15 @@ export default {
getData() {
const requestType = [
{
name: '学费',
name: '硕士-申请条件',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
},
{
name: '硕士-申请流程',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
},
{
name: '硕士-常见问题',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
}
]
......
src/pages/recruitInfo/index.vue
浏览文件 @ 7a7b8730
......@@ -4,8 +4,8 @@
:data="bannerTabData"
@changeTab="changeTab"
></banner-tab>
<apply :data="content"></apply>
<support v-show="false" :data="content"></support>
<apply v-show="activeIndex == 0" :data="content"></apply>
<support v-show="activeIndex == 1" :data="content"></support>
</div>
</template>
<script>
......
src/pages/teaching/components/setCourse.vue
浏览文件 @ 7a7b8730
......@@ -22,7 +22,11 @@ export default {
getData() {
const requestType = [
{
name: '预科课程设置',
name: '本科1+2项目课程',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
},
{
name: '硕士直通车项目课程',
image: 'https://zws-imgs-pub.ezijing.com/static/public/b9045c3182307689d0371bece5b2bf3a.png'
}
]
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论