Merge pull request 'dengjie commit : 部分修改样式' (#12) from dengjie into master

Reviewed-on: http://git.hchyun.com/feashow/sist_web/pulls/12
This commit is contained in:
clay
2022-10-04 16:43:19 +00:00
7 changed files with 33 additions and 39 deletions

View File

@@ -270,7 +270,6 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
vertical-align: middle; vertical-align: middle;
} }
.link_text_title { .link_text_title {

View File

@@ -137,7 +137,8 @@
</div> </div>
<div class="academy_content"> <div class="academy_content">
<div class="academy_content_icontime"> <div class="academy_content_icontime">
<div class="img"></div> <!-- <img :src="src" alt="">-->
<div class="img" v-bind:style="{backgroundImage:'url('+bgc+')'}"></div>
<span>2022-10-08</span> <span>2022-10-08</span>
</div> </div>
<div class="academy_content_title"> <div class="academy_content_title">
@@ -162,7 +163,12 @@
<script> <script>
export default { export default {
name: "academy_and_sciences" name: "academy_and_sciences",
data(){
return{
bgc:require('../../../assets/index/academy_and_sciences/shijian3.png')
}
}
}; };
</script> </script>
@@ -224,7 +230,7 @@ export default {
display: flex; display: flex;
height: 2.3rem; height: 2.3rem;
margin-top: 3.4rem; margin-top: 3.4rem;
cursor: pointer;
.more_text { .more_text {
font-size: 1.6rem; font-size: 1.6rem;
font-weight: 500; font-weight: 500;
@@ -244,34 +250,17 @@ export default {
&:hover { &:hover {
box-shadow: 0 8px 11px 0 rgba(0, 73, 174, 0.5); box-shadow: 0 8px 11px 0 rgba(0, 73, 174, 0.5);
background: #FFFFFF; background: #FFFFFF;
color: #0049AF;
&_icontime{
.img {
background-image: url('../../../assets/index/academy_and_sciences/shijian2.png');
}
span {
color: #0049AF;
}
}
&_title{
color: #0049AF;
}
&_text {
color: #575757;
}
} }
padding: 2.5rem 2.3rem; padding: 2.5rem 2.3rem;
background: rgba(10, 81, 174, 0.89); background: rgba(10, 81, 174, 0.89);
border-radius: 16px; border-radius: 16px;
margin-bottom: 1.9rem; margin-bottom: 1.9rem;
color: #FFFFFF;
&_icontime { &_icontime {
display: flex; display: flex;
margin-bottom: 1.1rem; margin-bottom: 1.1rem;
.img { .img {
background-image: url('../../../assets/index/academy_and_sciences/shijian3.png');
background-size: 1.5rem; background-size: 1.5rem;
width: 1.5rem; width: 1.5rem;
height: 1.5rem; height: 1.5rem;
@@ -283,7 +272,7 @@ export default {
//height: 18px; //height: 18px;
font-size: 1.3rem; font-size: 1.3rem;
font-weight: 500; font-weight: 500;
color: #FFFFFF;
line-height: 1.85rem; line-height: 1.85rem;
} }
} }
@@ -294,7 +283,7 @@ export default {
//height: 38px; //height: 38px;
font-size: 1.4rem; font-size: 1.4rem;
font-weight: 500; font-weight: 500;
color: #FFFFFF; //color: #FFFFFF;
line-height: 1.9rem; line-height: 1.9rem;
letter-spacing: .1rem; letter-spacing: .1rem;
margin-bottom: .6rem; margin-bottom: .6rem;
@@ -306,7 +295,7 @@ export default {
//height: 41px; //height: 41px;
font-size: 1rem; font-size: 1rem;
font-weight: 500; font-weight: 500;
color: #FFFFFF; //color: #FFFFFF;
line-height: 1.4rem; line-height: 1.4rem;
letter-spacing: .1rem; letter-spacing: .1rem;
} }

View File

@@ -177,11 +177,14 @@ export default {
margin-bottom: 2.3rem; margin-bottom: 2.3rem;
} }
&_title{ &_title{
&:hover{
color: #0049AF;
}
width: 100%; width: 100%;
height: 3.8rem; height: 3.8rem;
font-size: 1.4rem; font-size: 1.4rem;
font-weight: 500; font-weight: 500;
color: #0049AF; color: #000000;
line-height: 1.9rem; line-height: 1.9rem;
letter-spacing: .1rem; letter-spacing: .1rem;
margin-bottom: .6rem; margin-bottom: .6rem;
@@ -202,6 +205,7 @@ export default {
justify-content: center; justify-content: center;
height: 2.3rem; height: 2.3rem;
margin-top: 2.6rem; margin-top: 2.6rem;
cursor: pointer;
.more_text { .more_text {
font-size: 1.6rem; font-size: 1.6rem;
font-weight: 500; font-weight: 500;

View File

@@ -94,7 +94,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.bottom { .bottom {
margin-top: 2rem; //margin-top: 2rem;
background-image: url('../../../assets/index/bottom/sy_bj4.png'); background-image: url('../../../assets/index/bottom/sy_bj4.png');
padding-bottom: 4rem; padding-bottom: 4rem;

View File

@@ -36,7 +36,7 @@
<div class="news_context_img"> <div class="news_context_img">
<img src="../../../assets/index/news_center/t4.png" alt=""> <img src="../../../assets/index/news_center/t4.png" alt="">
</div> </div>
<div class="news_context_text"> <div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
<div class="news_context_text-title">信息引领勇于拼领勇于拼搏信息搏</div> <div class="news_context_text-title">信息引领勇于拼领勇于拼搏信息搏</div>
<div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业给予2021年转专业同学有针对性的帮助信息科学与技术学院于10月26日开展 <div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业给予2021年转专业同学有针对性的帮助信息科学与技术学院于10月26日开展
</div> </div>
@@ -52,7 +52,7 @@
<div class="news_context_img"> <div class="news_context_img">
<img src="../../../assets/index/news_center/t4.png" alt=""> <img src="../../../assets/index/news_center/t4.png" alt="">
</div> </div>
<div class="news_context_text"> <div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
<div class="news_context_text-title">信息引领勇于拼搏信息搏</div> <div class="news_context_text-title">信息引领勇于拼搏信息搏</div>
<div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业给予2021年转专业同学有针对性的帮助信息科学与技术学院于10月26日开展 <div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业给予2021年转专业同学有针对性的帮助信息科学与技术学院于10月26日开展
</div> </div>
@@ -68,7 +68,7 @@
<div class="news_context_img"> <div class="news_context_img">
<img src="../../../assets/index/news_center/t4.png" alt=""> <img src="../../../assets/index/news_center/t4.png" alt="">
</div> </div>
<div class="news_context_text"> <div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
<div class="news_context_text-title">信息引领勇于拼搏信息搏</div> <div class="news_context_text-title">信息引领勇于拼搏信息搏</div>
<div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业给予2021年转专业同学有针对性的帮助信息科学与技术学院于10月26日开展 <div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业给予2021年转专业同学有针对性的帮助信息科学与技术学院于10月26日开展
</div> </div>
@@ -219,6 +219,7 @@ export default {
display: flex; display: flex;
height: 3.7rem; height: 3.7rem;
margin-top: 9.8rem; margin-top: 9.8rem;
cursor: pointer;
.more_text { .more_text {
font-size: 1.6rem; font-size: 1.6rem;
@@ -269,16 +270,15 @@ export default {
transition: all 1s; transition: all 1s;
} }
} }
.news_context_text:last-child {
border-right: none; //.news_context_text-title:last-child{
} // border-right: 1px solid red;
//}
.news_context_text { .news_context_text {
margin: 4rem 0 4rem 2rem; margin: 4rem 0 4rem 2rem;
padding-right: 2rem; padding-right: 2rem;
border-right: 1px solid #CCCCCC; //border-right: 1px solid #CCCCCC;
.news_context_text-title { .news_context_text-title {
&:hover { &:hover {
color: #0040A4; color: #0040A4;
@@ -298,6 +298,7 @@ export default {
} }
.news_context_text-content { .news_context_text-content {
width: 100%; width: 100%;
height: 5.3rem; height: 5.3rem;
font-size: 1.3rem; font-size: 1.3rem;

View File

@@ -133,6 +133,7 @@ export default {
justify-content: center; justify-content: center;
height: 2.3rem; height: 2.3rem;
margin-top: 5.1rem; margin-top: 5.1rem;
cursor: pointer;
.more_text { .more_text {
font-size: 1.6rem; font-size: 1.6rem;
font-weight: 500; font-weight: 500;

View File

@@ -197,7 +197,7 @@ export default {
height: 2.3rem; height: 2.3rem;
margin-top: 3.1rem; margin-top: 3.1rem;
margin-left: 2.1rem; margin-left: 2.1rem;
cursor: pointer;
.more_text { .more_text {
font-size: 1.6rem; font-size: 1.6rem;
font-weight: 500; font-weight: 500;