Skip to content

B
beyond-clouds-front
Commit 64ec29f8 by yanju
Options

Merge branch 'fix-issue#15' into 'master' 

Fix issue#15

See merge request pigbigbig/beyond-clouds-front!134
parents 6cf02d73 54ed05ef
Showing with 44 additions and 9 deletions
components/pc/answerCard.vue
...@@ -14,6 +14,11 @@ ...@@ -14,6 +14,11 @@
<div class="answer-card__right"> <div class="answer-card__right">
<div class="title"> <div class="title">
<p class="title1">{{questionTitle}}</p> <p class="title1">{{questionTitle}}</p>
<div class="icon-box">
<p class="icon" style="background-color: #00AAE6" v-if="priority>0">
<yun-icon name="top" size="12px" color="#fff"></yun-icon>
</p>
</div>
<div class="label-box"> <div class="label-box">
<p v-if="isMy&&status===-1" class="label-box__err">被锁定</p> <p v-if="isMy&&status===-1" class="label-box__err">被锁定</p>
</div> </div>
...@@ -112,6 +117,7 @@ ...@@ -112,6 +117,7 @@
this.viewNumber = info.viewNumber; this.viewNumber = info.viewNumber;
this.status = info.status; this.status = info.status;
this.praiseNum = info.praiseNum; this.praiseNum = info.praiseNum;
this.priority = info.priority;
} }
if(this.info.itemId){ if(this.info.itemId){
this.questionTitle = info.title; this.questionTitle = info.title;
...@@ -292,6 +298,19 @@ ...@@ -292,6 +298,19 @@
@include fontStyle(18,25,500,#222,left); @include fontStyle(18,25,500,#222,left);
height: auto; height: auto;
} }
> .icon-box{
margin-right:15*$length;
@extend %flex-row-spb;
justify-content: flex-start;
> .icon{
margin-right:10*$length;
width:20*$length;
height:20*$length;
border-radius:2*$length;
@extend %flex-column-center;
background-color: #FF7474;
}
}
> .label-box{ > .label-box{
margin-top: 8*$length; margin-top: 8*$length;
margin-bottom: 8*$length; margin-bottom: 8*$length;
......
components/pc/projectCard.vue
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
<p class="icon1" v-if="cardView>=20"> <p class="icon1" v-if="cardView>=20">
<yun-icon name="hot" size="12px" color="#fff"></yun-icon> <yun-icon name="hot" size="12px" color="#fff"></yun-icon>
</p> </p>
<p class="icon1" style="background-color: #00AAE6" v-if="priority>0">
<yun-icon name="top" size="12px" color="#fff"></yun-icon>
</p>
<!-- <p class="icon2">--> <!-- <p class="icon2">-->
<!-- <yun-icon name="like2" size="12px" color="#fff"></yun-icon>--> <!-- <yun-icon name="like2" size="12px" color="#fff"></yun-icon>-->
...@@ -155,7 +158,8 @@ ...@@ -155,7 +158,8 @@
this.cardUser = info.userNick; this.cardUser = info.userNick;
this.cardType = 2; this.cardType = 2;
this.status = info.status; this.status = info.status;
this.praiseNum =info.praiseNum this.praiseNum =info.praiseNum;
this.priority = info.priority;
} }
if(this.info.projectId){ if(this.info.projectId){
...@@ -170,7 +174,9 @@ ...@@ -170,7 +174,9 @@
this.cardUser = info.author; this.cardUser = info.author;
this.cardType = 1; this.cardType = 1;
this.status = info.status; this.status = info.status;
this.praiseNum =info.praiseNum this.praiseNum =info.praiseNum;
this.priority = info.priority;
} }
if(this.info.contentId){ if(this.info.contentId){
...@@ -182,6 +188,8 @@ ...@@ -182,6 +188,8 @@
this.cardTime = dateConvert(info.createTime); this.cardTime = dateConvert(info.createTime);
this.cardUser = info.author; this.cardUser = info.author;
this.cardType = 3; this.cardType = 3;
this.priority = info.priority;
} }
if(this.info.itemId&&this.info.itemType==="BLOG"){ if(this.info.itemId&&this.info.itemType==="BLOG"){
this.cardName = info.title; this.cardName = info.title;
...@@ -192,6 +200,7 @@ ...@@ -192,6 +200,7 @@
this.cardTime = dateConvert(info.createTime); this.cardTime = dateConvert(info.createTime);
this.cardUser = info.author; this.cardUser = info.author;
this.cardType = 2; this.cardType = 2;
} }
if(this.info.itemId&&this.info.itemType==="PROJECT"){ if(this.info.itemId&&this.info.itemType==="PROJECT"){
this.cardName = info.title; this.cardName = info.title;
......
components/pc/socialContactCard.vue
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
import config from '../../action/config'; import config from '../../action/config';
import {globalBus} from '../common/globalBus' import {globalBus} from '../common/globalBus'
import CommentCon from './comment/commentCon'; import CommentCon from './comment/commentCon';
import YunVideo from "../common/video/src/main"; import YunVideo from "../common/video/src/main.vue";
export default { export default {
name:'socialContactCard', name:'socialContactCard',
components:{ components:{
......
components/pc/topicCard.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="square2" v-if="!topicIcon"></div> <div class="square2" v-if="!topicIcon"></div>
<div class="square3" v-if="!topicIcon"></div> <div class="square3" v-if="!topicIcon"></div>
<div class="square4" v-if="!topicIcon"></div> <div class="square4" v-if="!topicIcon"></div>
<img :src="src" v-if="topicIcon" alt=""> <img :src="topicIcon" v-if="topicIcon" alt="">
</div> </div>
<div class="topic-card-right"> <div class="topic-card-right">
<div class="right-header"> <div class="right-header">
...@@ -200,6 +200,7 @@ ...@@ -200,6 +200,7 @@
flex-wrap: wrap; flex-wrap: wrap;
flex-shrink:0; flex-shrink:0;
img{ img{
border-radius: 6*$length;
max-width: 100*$length; max-width: 100*$length;
max-height: 100*$length; max-height: 100*$length;
object-fit: contain; object-fit: contain;
......
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
pages/answer/detail/_id.vue
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
<p class="icon" v-if="articleDetail.viewNumber>20"> <p class="icon" v-if="articleDetail.viewNumber>20">
<yun-icon name="hot" size="12px" color="#fff"></yun-icon> <yun-icon name="hot" size="12px" color="#fff"></yun-icon>
</p> </p>
<p class="icon" style="background-color: #00AAE6" v-if="articleDetail.priority>0">
<yun-icon name="top" size="12px" color="#fff"></yun-icon>
</p>
<!-- <p class="icon">--> <!-- <p class="icon">-->
<!-- <yun-icon name="like2" size="12px" color="#fff"></yun-icon>--> <!-- <yun-icon name="like2" size="12px" color="#fff"></yun-icon>-->
......
pages/blog/detail/_id.vue
...@@ -12,7 +12,9 @@ ...@@ -12,7 +12,9 @@
<p class="icon" v-if="articleDetail.viewNumber>20"> <p class="icon" v-if="articleDetail.viewNumber>20">
<yun-icon name="hot" size="12px" color="#fff"></yun-icon> <yun-icon name="hot" size="12px" color="#fff"></yun-icon>
</p> </p>
<p class="icon" style="background-color: #00AAE6" v-if="articleDetail.priority>0">
<yun-icon name="top" size="12px" color="#fff"></yun-icon>
</p>
<!-- <p class="icon">--> <!-- <p class="icon">-->
<!-- <yun-icon name="like2" size="12px" color="#fff"></yun-icon>--> <!-- <yun-icon name="like2" size="12px" color="#fff"></yun-icon>-->
<!-- </p>--> <!-- </p>-->
...@@ -26,10 +28,8 @@ ...@@ -26,10 +28,8 @@
{{articleDetail.userNick}}<span>·</span>{{dataConvert2(articleDetail.createTime)}} {{articleDetail.userNick}}<span>·</span>{{dataConvert2(articleDetail.createTime)}}
</p> </p>
<div class="right"> <div class="right">
<!-- <div class="icon-box">-->
<!-- <yun-icon name="star" size="12px" pb="7px" color="#ccc"></yun-icon>-->
<!-- <span>4</span>-->
<!-- </div>-->
<div class="icon-box"> <div class="icon-box">
<yun-icon name="like1" size="12px" pb="7px" color="#ccc"></yun-icon> <yun-icon name="like1" size="12px" pb="7px" color="#ccc"></yun-icon>
<span>{{articleDetail.praiseNum}}</span> <span>{{articleDetail.praiseNum}}</span>
......
pages/project/detail/_id.vue
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<p class="icon" v-if="articleDetail.viewNumber>20"> <p class="icon" v-if="articleDetail.viewNumber>20">
<yun-icon name="hot" size="12px" color="#fff"></yun-icon> <yun-icon name="hot" size="12px" color="#fff"></yun-icon>
</p> </p>
<p class="icon" style="background-color: #00AAE6" v-if="articleDetail.priority>0">
<yun-icon name="top" size="12px" color="#fff"></yun-icon>
</p>
<!-- <p class="icon">--> <!-- <p class="icon">-->
<!-- <yun-icon name="like2" size="12px" color="#fff"></yun-icon>--> <!-- <yun-icon name="like2" size="12px" color="#fff"></yun-icon>-->
......
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