Commit c8da3530 authored by anxixi's avatar anxixi

Merge remote-tracking branch 'origin/master'

parents d3744081 09c50fc4
...@@ -463,7 +463,7 @@ ...@@ -463,7 +463,7 @@
<div class="wechat"> <div class="wechat">
<img :src="freePublish.contactImg" alt=""> <img :src="freePublish.contactImg" alt="">
</div> </div>
<p>如果您的手机长按不识别二维码请保存图片到手机相册</p> <p>如果您的手机长按不识别二维码<br/>请保存图片到手机相册</p>
</div> </div>
<p @click="showWechatCode = false"><i class="iconfont icon-shanchuguanbicha"></i></p> <p @click="showWechatCode = false"><i class="iconfont icon-shanchuguanbicha"></i></p>
</div> </div>
...@@ -1345,7 +1345,7 @@ ...@@ -1345,7 +1345,7 @@
} }
.liveActivityItem { .liveActivityItem {
display: flex; display: flex;
padding: .25rem; padding: .2rem;
> div { > div {
flex: 1; flex: 1;
border-radius: .12rem; border-radius: .12rem;
...@@ -1385,6 +1385,9 @@ ...@@ -1385,6 +1385,9 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-around;
i:before{
font-size: .2rem;
}
&::after { &::after {
content: ""; content: "";
position: absolute; position: absolute;
...@@ -1658,6 +1661,7 @@ ...@@ -1658,6 +1661,7 @@
color: #7A7A7A; color: #7A7A7A;
i { i {
margin-left: .1rem; margin-left: .1rem;
margin-top: -.1rem;
} }
i:before { i:before {
color: #7A7A7A; color: #7A7A7A;
...@@ -1709,6 +1713,7 @@ ...@@ -1709,6 +1713,7 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding-left: .25rem; padding-left: .25rem;
padding-bottom: .15rem;
> div { > div {
width: 30.5%; width: 30.5%;
height: 1rem; height: 1rem;
...@@ -1735,7 +1740,20 @@ ...@@ -1735,7 +1740,20 @@
padding-top: .3rem; padding-top: .3rem;
width: 100%; width: 100%;
display: flex; display: flex;
border-top: 1px solid #E8E8E8; position: relative;
&::after {
content: "";
position: absolute;
top: 0;
left: 0;
right: 0;
border-top: 1px solid #E9EAF3;
-webkit-transform: scaleY(0.5);
transform: scaleY(0.5);
-webkit-transform-origin: 0 0;
transform-origin: 0 0;
}
.leftInfo { .leftInfo {
width: 1.8rem; width: 1.8rem;
height: 1.25rem; height: 1.25rem;
...@@ -1752,13 +1770,13 @@ ...@@ -1752,13 +1770,13 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
flex-direction: column; flex-direction: column;
justify-content: space-between;
width: calc(100% - 2rem); width: calc(100% - 2rem);
.topicTitle { .topicTitle {
width: 100%; width: 100%;
max-height: .5rem; max-height: .5rem;
display: flex; display: flex;
align-items: center; align-items: center;
padding-bottom: .1rem;
.articleTitle { .articleTitle {
font-size: .28rem; font-size: .28rem;
font-weight: bold; font-weight: bold;
...@@ -1768,6 +1786,7 @@ ...@@ -1768,6 +1786,7 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
color: #1A1A1E;
} }
.hongbao { .hongbao {
padding-left: .1rem; padding-left: .1rem;
...@@ -1780,6 +1799,7 @@ ...@@ -1780,6 +1799,7 @@
.introTitle { .introTitle {
color: #7A7A7A; color: #7A7A7A;
font-size: .22rem; font-size: .22rem;
line-height: .4rem;
} }
} }
} }
...@@ -1886,7 +1906,7 @@ ...@@ -1886,7 +1906,7 @@
.qrcodeWrap { .qrcodeWrap {
width: 330px; width: 330px;
height: 330px; min-height: 330px;
background-color: #fff; background-color: #fff;
padding: .2rem; padding: .2rem;
border-radius: .1rem; border-radius: .1rem;
...@@ -1902,12 +1922,18 @@ ...@@ -1902,12 +1922,18 @@
> p:first-of-type { > p:first-of-type {
color: #1A1A1E; color: #1A1A1E;
font-size: .3rem; font-size: .3rem;
padding-top: .4rem; text-align: center;
padding-bottom: .2rem; padding: .2rem .3rem;
line-height: .5rem;
padding-bottom: .3rem;
} }
> p:last-of-type { > p:last-of-type {
color: #7A7A7A; color: #7A7A7A;
font-size: .28rem; font-size: .28rem;
text-align: center;
padding-top: .3rem;
padding-bottom: .3rem;
line-height: .5rem;
} }
.wechat { .wechat {
width: 175px; width: 175px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment