Merge branch 'xuebaoxin' of pplokijuhyg/falvpingtai into master

This commit is contained in:
pplokijuhyg 2019-11-25 16:14:29 +08:00
commit d52d427820
6 changed files with 139 additions and 113 deletions

View File

@ -67,66 +67,66 @@ export default {};
<style lang="scss"> <style lang="scss">
.line { .line {
height: 0.2rem; height: 20px;
width: 100%; width: 100%;
background-color: #f6f6f6; background-color: #f6f6f6;
} }
.question { .question {
height: 1rem; height: 100px;
width: 100%; width: 100%;
color: #333333; color: #333333;
font-size: 0.36rem; font-size: 36px;
text-indent: 0.3rem; text-indent: 30px;
line-height: 1rem; line-height: 100px;
font-weight: 500; font-weight: 500;
} }
.title { .title {
color: #333333; color: #333333;
font-size: 0.34rem; font-size: 34px;
margin-top: 0.48rem; margin-top: 48px;
text-indent: 0.31rem; text-indent: 31px;
} }
.recommend { .recommend {
width: 6.9rem; width: 6.90px;
margin-top: 0.13rem; margin-top: 13px;
margin: 0 auto; margin: 0 auto;
border-bottom: 0.01rem solid #95998f; border-bottom: 1px solid #95998f;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.articlename { .articlename {
color: #333333; color: #333333;
font-size: 0.3rem; font-size: 30px;
line-height: 0.4rem; line-height: 40px;
width: 4.65rem; width: 465px;
margin-top: 0.4rem; margin-top: 40px;
} }
.articlecontent { .articlecontent {
color: #333333; color: #333333;
font-size: 0.26rem; font-size: 26px;
margin-top: 0.15rem; margin-top: 15px;
margin-bottom: 0.14rem; margin-bottom: 14px;
width: 6.74rem; width: 674px;
} }
.author { .author {
color: #999999; color: #999999;
font-size: 0.22rem; font-size: 22px;
margin: 0 auto; margin: 0 auto;
margin-top: 0.14rem; margin-top: 14px;
margin-bottom: 0.35rem; margin-bottom: 35px;
} }
.pic{ .pic{
width: 1.82rem; width: 182px;
height: 1.2rem; height: 120px;
margin: auto 0; margin: auto 0;
} }
.pics{ .pics{
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-bottom: 0.31rem; margin-bottom: 31px;
>img{ >img{
width: 2.23rem; width: 223px;
height: 1.47rem; height: 147px;
margin-right: 0.1rem margin-right: 10px;
} }
} }
} }

View File

@ -31,24 +31,24 @@ export default {};
<style lang="scss"> <style lang="scss">
.top { .top {
width: 100%; width: 100%;
height: 0.88rem; height: 88px;
box-shadow: 0rem 0.01rem 0.01rem 0rem rgba(237, 237, 237, 0.4); box-shadow: 0 1px 1px 0 rgba(237, 237, 237, 0.4);
.title { .title {
color: #333333; color: #333333;
font-size: 0.34rem; font-size: 34px;
text-indent: 0.155rem; text-indent: 15.5px;
line-height: 0.88rem; line-height: 88px;
} }
} }
.shuru { .shuru {
height: 0.85rem; height: 85px;
width: 6.9rem; width: 690px;
line-height: 0.85rem; line-height: 85px;
color: #999999; color: #999999;
font-size: 0.26rem; font-size: 26px;
margin: 0 auto; margin: 0 auto;
margin-top: 0.29rem; margin-top: 29px;
margin-bottom: 1.2rem; margin-bottom: 120px;
} }
@ -65,60 +65,60 @@ export default {};
-webkit-user-select: text ; -webkit-user-select: text ;
outline-color: transparent ; outline-color: transparent ;
box-shadow: none; box-shadow: none;
border-bottom: 0.01rem solid #DFDFDF; border-bottom: 1px solid #DFDFDF;
} }
.btn { .btn {
width: 6.9rem; width: 690px;
height: 0.88rem; height: 88px;
background-color: #6b9147; background-color: #6b9147;
line-height: 0.44rem; line-height: 44px;
text-align: center; text-align: center;
color: white; color: white;
font-size: 0.18rem; font-size: 18px;
margin-left: 0.3rem; margin-left: 30px;
border: none; border: none;
outline: none; outline: none;
-webkit-appearance: none; -webkit-appearance: none;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0); -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
} }
.ale { .ale {
margin-left: 0.31rem; margin-left: 31px;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
font-size: 0.13rem; font-size: 13px;
margin-top: 0.49rem; margin-top: 49px;
// font-weight: bold; // font-weight: bold;
.aletitle { .aletitle {
color: #666666; color: #666666;
font-size: 0.28rem; font-size: 28px;
} }
.alecontent { .alecontent {
color: #666666; color: #666666;
font-size: 0.26rem; font-size: 26px;
font-weight: 400; font-weight: 400;
color: rgba(102, 102, 102, 1); color: rgba(102, 102, 102, 1);
line-height: 0.42rem; line-height: 42px;
margin-top: 0.37rem; margin-top: 37px;
} }
} }
.serve{ .serve{
width: 6.57rem; width: 657px;
color: #666666; color: #666666;
font-size: 0.26rem; font-size: 26px;
margin-top: 0.57rem; margin-top: 57px;
line-height:0.42rem; line-height:42px;
margin-left: 0.3rem; margin-left: 30px;
// margin: 0 auto; // margin: 0 auto;
} }
.agreement{ .agreement{
color: #666666; color: #666666;
font-size: 0.26rem; font-size:26px;
width: 4.5rem; width: 450px;
margin: 0 auto; margin: 0 auto;
// text-align: center; // text-align: center;
margin-top: 3.77rem; margin-top: 377px;
line-height:0.42rem; line-height:42px;
// margin-bottom: 0.9rem; // margin-bottom: 90px;
>p{ >p{
text-align: center text-align: center
} }

View File

@ -37,43 +37,43 @@
min-height: 100vh; min-height: 100vh;
.header { .header {
width: 100%; width: 100%;
height: 2.27rem; height: 227px;
background-color: #fff; background-color: #fff;
box-sizing: border-box; box-sizing: border-box;
padding: 0.51rem 0.3rem; padding: 51px 30px;
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 0.2rem; margin-bottom: 20px;
.portrait { .portrait {
width: 1.26rem; width: 126px;
height: 1.26rem; height: 126px;
border-radius: 50%; border-radius: 50%;
margin-right: 0.31rem; margin-right: 31px;
} }
.introduce { .introduce {
height: 0.9rem; height: 90px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.name { .name {
margin: 0; margin: 0;
font-size: 0.36rem; font-size: 36px;
color: #333; color: #333;
font-weight: 400; font-weight: 400;
margin-bottom: 0.29rem; margin-bottom: 29px;
} }
.follow { .follow {
display: flex; display: flex;
color: #999; color: #999;
font-size: 0.28rem; font-size: 28px;
> p { > p {
display: flex; display: flex;
margin-right: 0.69rem; margin-right: 69px;
> span { > span {
color: #333; color: #333;
display: block; display: block;
min-width: 0.23rem; min-width: 23px;
} }
} }
} }
@ -82,22 +82,22 @@
.classification { .classification {
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
// min-height: 3rem; // min-height: 300px;
box-sizing: border-box; box-sizing: border-box;
padding: 0.3rem 0.3rem; padding: 30px 30px;
.page { .page {
width: 100%; width: 100%;
display: flex; display: flex;
height: 0.62rem; height: 62px;
border-bottom: 0.01rem solid #dfdfdf; border-bottom: 1px solid #dfdfdf;
> div { > div {
width: 100%; width: 100%;
font-size: 0.32rem; font-size: 32px;
text-align: center; text-align: center;
} }
.select{ .select{
border-bottom: 0.04rem solid #6B9147; border-bottom: 4px solid #6B9147;
} }
} }
.list{ .list{

View File

@ -38,58 +38,58 @@
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.PersonafFollow { .PersonafFollow {
padding: 0.49rem 0 0.39rem 0; padding: 49px 0 39px 0;
border-bottom: 1px solid #dfdfdf; border-bottom: 1px solid #dfdfdf;
.title { .title {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
font-size: 0.26rem; font-size: 26px;
color: #95998f; color: #95998f;
margin-bottom: 0.28rem; margin-bottom: 28px;
} }
.center { .center {
font-size: 0.3rem; font-size: 30px;
color: #000; color: #000;
line-height: 0.46rem; line-height: 46px;
} }
.answer { .answer {
.user { .user {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 0.34rem; margin-top: 34px;
> img { > img {
width: 0.58rem; width: 58px;
height: 0.58rem; height: 58px;
border-radius: 0.04rem; border-radius: 4px;
margin-right: 0.2rem; margin-right: 20px;
} }
> div { > div {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
> p { > p {
font-size: 0.24rem; font-size: 24px;
color: #000; color: #000;
} }
> p:last-child { > p:last-child {
margin-top: 0.1rem; margin-top: 10px;
font-size: 0.24rem; font-size: 24px;
color: #999; color: #999;
} }
} }
} }
.agree { .agree {
margin-top: 0.29rem; margin-top: 29px;
font-size: 0.26rem; font-size: 26px;
color: #95998f; color: #95998f;
} }
.content { .content {
> img { > img {
width: 6.9rem; width: 690px;
height: 3.74rem; height: 374px;
background-color: #000; background-color: #000;
display: block; display: block;
margin-top: 0.39rem; margin-top: 39px;
margin-bottom: 0.32rem; margin-bottom: 32px;
} }
> p { > p {
overflow: hidden; overflow: hidden;
@ -97,21 +97,21 @@
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 3; -webkit-line-clamp: 3;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
line-height: 0.4rem; line-height: 40px;
font-size: 0.26rem; font-size: 26px;
} }
} }
.operation{ .operation{
display: flex; display: flex;
margin-top: 0.3rem; margin-top: 30px;
>div{ >div{
margin-right: 0.6rem; margin-right: 60px;
font-size: 0.22rem; font-size: 22px;
color: #95998F; color: #95998F;
>img{ >img{
width: 0.17rem; width: 17px;
height: 0.17rem; height: 17px;
margin-right: 0.11rem; margin-right: 11px;
} }
} }

View File

@ -12,19 +12,19 @@
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.PersonalAnswer { .PersonalAnswer {
padding: 0.49rem 0 0.39rem 0; padding: 49px 0 39px 0;
border-bottom: 1px solid #dfdfdf; border-bottom: 1px solid #dfdfdf;
.title { .title {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
font-size: 0.26rem; font-size: 26px;
color: #95998f; color: #95998f;
margin-bottom: 0.28rem; margin-bottom: 28px;
} }
.center { .center {
font-size: 0.3rem; font-size: 30px;
color: #000; color: #000;
line-height: 0.46rem; line-height: 46px;
} }
} }
</style> </style>

View File

@ -1,10 +1,36 @@
<template> <template>
<div class="box"></div> <div class="box">
<div class="head">
<img class="logo" src="" alt="" srcset="">
<div class="search"></div>
</div>
</div>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.box { .box {
min-height: 100vh; min-height: 100vh;
background-color: #f6f6f6; background-color: #f6f6f6;
.head{
width: 100%;
height: 88px;
background-color: #fff;
display: flex;
align-items: center;
.logo{
width: 115px;
height: 37px;
background-color: #000;
display: block;
}
.search{
width: 485px;
height: 60px;
background-color: #F0F0F0;
box-sizing: border-box;
border:1px solid rgba(233,233,233,1);
border-radius: 30px;
}
}
} }
</style> </style>
<script> <script>