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 102 additions and 67 deletions
components/pc/answerCard.vue
......@@ -14,6 +14,11 @@
<div class="answer-card__right">
<div class="title">
<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">
<p v-if="isMy&&status===-1" class="label-box__err">被锁定</p>
</div>
......@@ -112,6 +117,7 @@
this.viewNumber = info.viewNumber;
this.status = info.status;
this.praiseNum = info.praiseNum;
this.priority = info.priority;
}
if(this.info.itemId){
this.questionTitle = info.title;
......@@ -292,6 +298,19 @@
@include fontStyle(18,25,500,#222,left);
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{
margin-top: 8*$length;
margin-bottom: 8*$length;
......
components/pc/projectCard.vue
......@@ -10,6 +10,9 @@
<p class="icon1" v-if="cardView>=20">
<yun-icon name="hot" size="12px" color="#fff"></yun-icon>
</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">-->
<!-- <yun-icon name="like2" size="12px" color="#fff"></yun-icon>-->
......@@ -155,7 +158,8 @@
this.cardUser = info.userNick;
this.cardType = 2;
this.status = info.status;
this.praiseNum =info.praiseNum
this.praiseNum =info.praiseNum;
this.priority = info.priority;
}
if(this.info.projectId){
......@@ -170,7 +174,9 @@
this.cardUser = info.author;
this.cardType = 1;
this.status = info.status;
this.praiseNum =info.praiseNum
this.praiseNum =info.praiseNum;
this.priority = info.priority;
}
if(this.info.contentId){
......@@ -182,6 +188,8 @@
this.cardTime = dateConvert(info.createTime);
this.cardUser = info.author;
this.cardType = 3;
this.priority = info.priority;
}
if(this.info.itemId&&this.info.itemType==="BLOG"){
this.cardName = info.title;
......@@ -192,6 +200,7 @@
this.cardTime = dateConvert(info.createTime);
this.cardUser = info.author;
this.cardType = 2;
}
if(this.info.itemId&&this.info.itemType==="PROJECT"){
this.cardName = info.title;
......
components/pc/socialContactCard.vue
......@@ -114,7 +114,7 @@
import config from '../../action/config';
import {globalBus} from '../common/globalBus'
import CommentCon from './comment/commentCon';
import YunVideo from "../common/video/src/main";
import YunVideo from "../common/video/src/main.vue";
export default {
name:'socialContactCard',
components:{
......
components/pc/topicCard.vue
......@@ -6,7 +6,7 @@
<div class="square2" v-if="!topicIcon"></div>
<div class="square3" 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 class="topic-card-right">
<div class="right-header">
......@@ -200,6 +200,7 @@
flex-wrap: wrap;
flex-shrink:0;
img{
border-radius: 6*$length;
max-width: 100*$length;
max-height: 100*$length;
object-fit: contain;
......
package-lock.json
......@@ -2094,7 +2094,7 @@
},
"after": {
"version": "0.8.2",
"resolved": "https://registry.npm.taobao.org/after/download/after-0.8.2.tgz",
"resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
"integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
},
"aggregate-error": {
......@@ -2262,8 +2262,8 @@
},
"arraybuffer.slice": {
"version": "0.0.7",
"resolved": "https://registry.npm.taobao.org/arraybuffer.slice/download/arraybuffer.slice-0.0.7.tgz",
"integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU="
"resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
"integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="
},
"asn1": {
"version": "0.2.4",
......@@ -2578,7 +2578,7 @@
},
"backo2": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/backo2/download/backo2-1.0.2.tgz",
"resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
"integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
},
"balanced-match": {
......@@ -2638,7 +2638,7 @@
},
"base64-arraybuffer": {
"version": "0.1.5",
"resolved": "https://registry.npm.taobao.org/base64-arraybuffer/download/base64-arraybuffer-0.1.5.tgz",
"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
"integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
},
"base64-js": {
......@@ -2657,7 +2657,7 @@
},
"better-assert": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/better-assert/download/better-assert-1.0.2.tgz",
"resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
"integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
"requires": {
"callsite": "1.0.0"
......@@ -2686,8 +2686,8 @@
},
"blob": {
"version": "0.0.5",
"resolved": "https://registry.npm.taobao.org/blob/download/blob-0.0.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fblob%2Fdownload%2Fblob-0.0.5.tgz",
"integrity": "sha1-1oDu7yX4zZGtUz9bAe7UjmTK9oM="
"resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
"integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="
},
"block-stream": {
"version": "0.0.9",
......@@ -3130,7 +3130,7 @@
},
"callsite": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/callsite/download/callsite-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
"integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA="
},
"callsites": {
......@@ -3377,8 +3377,8 @@
},
"clone-deep": {
"version": "4.0.1",
"resolved": "https://registry.npm.taobao.org/clone-deep/download/clone-deep-4.0.1.tgz",
"integrity": "sha1-wZ/Zvbv4WUK0/ZechNz31fB8I4c=",
"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
"dev": true,
"requires": {
"is-plain-object": "^2.0.4",
......@@ -3475,7 +3475,7 @@
},
"component-bind": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/component-bind/download/component-bind-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
},
"component-emitter": {
......@@ -3485,7 +3485,7 @@
},
"component-inherit": {
"version": "0.0.3",
"resolved": "https://registry.npm.taobao.org/component-inherit/download/component-inherit-0.0.3.tgz",
"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
},
"compressible": {
......@@ -4394,8 +4394,8 @@
},
"engine.io-client": {
"version": "3.4.0",
"resolved": "https://registry.npm.taobao.org/engine.io-client/download/engine.io-client-3.4.0.tgz?cache=0&sync_timestamp=1581492667025&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fengine.io-client%2Fdownload%2Fengine.io-client-3.4.0.tgz",
"integrity": "sha1-gqZCtChiqbP3oYj0F3ay3qtkNwA=",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz",
"integrity": "sha512-a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA==",
"requires": {
"component-emitter": "1.2.1",
"component-inherit": "0.0.3",
......@@ -4412,26 +4412,26 @@
"dependencies": {
"component-emitter": {
"version": "1.2.1",
"resolved": "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.2.1.tgz",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
},
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz",
"integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": {
"ms": "^2.1.1"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
"ws": {
"version": "6.1.4",
"resolved": "https://registry.npm.taobao.org/ws/download/ws-6.1.4.tgz",
"integrity": "sha1-W1yIAK+rkl6UzLKdFTyNAsF3bvk=",
"resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
"integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
"requires": {
"async-limiter": "~1.0.0"
}
......@@ -4440,8 +4440,8 @@
},
"engine.io-parser": {
"version": "2.2.0",
"resolved": "https://registry.npm.taobao.org/engine.io-parser/download/engine.io-parser-2.2.0.tgz",
"integrity": "sha1-MSxIlPV9UqArQgho2ntcHISvgO0=",
"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz",
"integrity": "sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==",
"requires": {
"after": "0.8.2",
"arraybuffer.slice": "~0.0.7",
......@@ -5859,22 +5859,22 @@
},
"has-binary2": {
"version": "1.0.3",
"resolved": "https://registry.npm.taobao.org/has-binary2/download/has-binary2-1.0.3.tgz",
"integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
"requires": {
"isarray": "2.0.1"
},
"dependencies": {
"isarray": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/isarray/download/isarray-2.0.1.tgz",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
}
}
},
"has-cors": {
"version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/has-cors/download/has-cors-1.1.0.tgz",
"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
},
"has-flag": {
......@@ -6300,7 +6300,7 @@
},
"indexof": {
"version": "0.0.1",
"resolved": "https://registry.npm.taobao.org/indexof/download/indexof-0.0.1.tgz",
"resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
"integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
},
"infer-owner": {
......@@ -8407,7 +8407,7 @@
},
"object-component": {
"version": "0.0.3",
"resolved": "https://registry.npm.taobao.org/object-component/download/object-component-0.0.3.tgz",
"resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
"integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE="
},
"object-copy": {
......@@ -8726,7 +8726,7 @@
},
"parseqs": {
"version": "0.0.5",
"resolved": "https://registry.npm.taobao.org/parseqs/download/parseqs-0.0.5.tgz",
"resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
"integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
"requires": {
"better-assert": "~1.0.0"
......@@ -8734,7 +8734,7 @@
},
"parseuri": {
"version": "0.0.5",
"resolved": "https://registry.npm.taobao.org/parseuri/download/parseuri-0.0.5.tgz",
"resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
"integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
"requires": {
"better-assert": "~1.0.0"
......@@ -10732,8 +10732,8 @@
},
"sass-loader": {
"version": "7.3.1",
"resolved": "https://registry.npm.taobao.org/sass-loader/download/sass-loader-7.3.1.tgz?cache=0&sync_timestamp=1578923105424&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass-loader%2Fdownload%2Fsass-loader-7.3.1.tgz",
"integrity": "sha1-pb9ooEvOocE/+ELXRxUPerfQ0j8=",
"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
"integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
"dev": true,
"requires": {
"clone-deep": "^4.0.1",
......@@ -10745,8 +10745,8 @@
"dependencies": {
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz",
"integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
}
}
......@@ -10909,8 +10909,8 @@
},
"shallow-clone": {
"version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/shallow-clone/download/shallow-clone-3.0.1.tgz",
"integrity": "sha1-jymBrZJTH1UDWwH7IwdppA4C76M=",
"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
"dev": true,
"requires": {
"kind-of": "^6.0.2"
......@@ -11076,8 +11076,8 @@
},
"socket.io-client": {
"version": "2.3.0",
"resolved": "https://registry.npm.taobao.org/socket.io-client/download/socket.io-client-2.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsocket.io-client%2Fdownload%2Fsocket.io-client-2.3.0.tgz",
"integrity": "sha1-FNW6LgC5vNFFrkQ6uWs/hsvMG7Q=",
"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz",
"integrity": "sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==",
"requires": {
"backo2": "1.0.2",
"base64-arraybuffer": "0.1.5",
......@@ -11097,28 +11097,28 @@
"dependencies": {
"component-emitter": {
"version": "1.2.1",
"resolved": "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.2.1.tgz",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
},
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz",
"integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": {
"ms": "^2.1.1"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}
}
},
"socket.io-parser": {
"version": "3.3.0",
"resolved": "https://registry.npm.taobao.org/socket.io-parser/download/socket.io-parser-3.3.0.tgz",
"integrity": "sha1-K1KpalCf3zFEC6QP7WCUx9TxJi8=",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz",
"integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==",
"requires": {
"component-emitter": "1.2.1",
"debug": "~3.1.0",
......@@ -11127,20 +11127,20 @@
"dependencies": {
"component-emitter": {
"version": "1.2.1",
"resolved": "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.2.1.tgz",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
},
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz",
"integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"requires": {
"ms": "2.0.0"
}
},
"isarray": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/isarray/download/isarray-2.0.1.tgz",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
}
}
......@@ -11772,7 +11772,7 @@
},
"to-array": {
"version": "0.1.4",
"resolved": "https://registry.npm.taobao.org/to-array/download/to-array-0.1.4.tgz",
"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
},
"to-arraybuffer": {
......@@ -12393,8 +12393,8 @@
},
"vue-notification": {
"version": "1.3.20",
"resolved": "https://registry.npm.taobao.org/vue-notification/download/vue-notification-1.3.20.tgz",
"integrity": "sha1-2FYYEndjtG8+JbiWK4V5R9WpfL4="
"resolved": "https://registry.npmjs.org/vue-notification/-/vue-notification-1.3.20.tgz",
"integrity": "sha512-vPj67Ah72p8xvtyVE8emfadqVWguOScAjt6OJDEUdcW5hW189NsqvfkOrctxHUUO9UYl9cTbIkzAEcPnHu+zBQ=="
},
"vue-router": {
"version": "3.0.7",
......@@ -12452,8 +12452,8 @@
},
"vue-socket.io": {
"version": "3.0.7",
"resolved": "https://registry.npm.taobao.org/vue-socket.io/download/vue-socket.io-3.0.7.tgz",
"integrity": "sha1-+m2xIBQkMDny1jPURY5GEHXVLcg=",
"resolved": "https://registry.npmjs.org/vue-socket.io/-/vue-socket.io-3.0.7.tgz",
"integrity": "sha512-dTo0Vr6jIziIax5/m+mY+iwzSBdH9ZgcUR0FkyfFNklBYvb6bdNbo5tJTydMh0DTZ8f+gK4Xl6Ihtnv6YIsulQ==",
"requires": {
"socket.io-client": "^2.1.1"
}
......@@ -12950,7 +12950,7 @@
},
"xmlhttprequest-ssl": {
"version": "1.5.5",
"resolved": "https://registry.npm.taobao.org/xmlhttprequest-ssl/download/xmlhttprequest-ssl-1.5.5.tgz?cache=0&sync_timestamp=1564594177335&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxmlhttprequest-ssl%2Fdownload%2Fxmlhttprequest-ssl-1.5.5.tgz",
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
"integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4="
},
"xtend": {
......@@ -13057,7 +13057,7 @@
},
"yeast": {
"version": "0.1.2",
"resolved": "https://registry.npm.taobao.org/yeast/download/yeast-0.1.2.tgz",
"resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
"integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
},
"ylru": {
......
pages/answer/detail/_id.vue
......@@ -11,6 +11,9 @@
<p class="icon" v-if="articleDetail.viewNumber>20">
<yun-icon name="hot" size="12px" color="#fff"></yun-icon>
</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">-->
<!-- <yun-icon name="like2" size="12px" color="#fff"></yun-icon>-->
......
pages/blog/detail/_id.vue
......@@ -12,7 +12,9 @@
<p class="icon" v-if="articleDetail.viewNumber>20">
<yun-icon name="hot" size="12px" color="#fff"></yun-icon>
</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">-->
<!-- <yun-icon name="like2" size="12px" color="#fff"></yun-icon>-->
<!-- </p>-->
......@@ -26,10 +28,8 @@
{{articleDetail.userNick}}<span>·</span>{{dataConvert2(articleDetail.createTime)}}
</p>
<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">
<yun-icon name="like1" size="12px" pb="7px" color="#ccc"></yun-icon>
<span>{{articleDetail.praiseNum}}</span>
......
pages/project/detail/_id.vue
......@@ -12,6 +12,9 @@
<p class="icon" v-if="articleDetail.viewNumber>20">
<yun-icon name="hot" size="12px" color="#fff"></yun-icon>
</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">-->
<!-- <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