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 @@ ...@@ -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
...@@ -2094,7 +2094,7 @@ ...@@ -2094,7 +2094,7 @@
}, },
"after": { "after": {
"version": "0.8.2", "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=" "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
}, },
"aggregate-error": { "aggregate-error": {
...@@ -2262,8 +2262,8 @@ ...@@ -2262,8 +2262,8 @@
}, },
"arraybuffer.slice": { "arraybuffer.slice": {
"version": "0.0.7", "version": "0.0.7",
"resolved": "https://registry.npm.taobao.org/arraybuffer.slice/download/arraybuffer.slice-0.0.7.tgz", "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
"integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=" "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="
}, },
"asn1": { "asn1": {
"version": "0.2.4", "version": "0.2.4",
...@@ -2578,7 +2578,7 @@ ...@@ -2578,7 +2578,7 @@
}, },
"backo2": { "backo2": {
"version": "1.0.2", "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=" "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
}, },
"balanced-match": { "balanced-match": {
...@@ -2638,7 +2638,7 @@ ...@@ -2638,7 +2638,7 @@
}, },
"base64-arraybuffer": { "base64-arraybuffer": {
"version": "0.1.5", "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=" "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
}, },
"base64-js": { "base64-js": {
...@@ -2657,7 +2657,7 @@ ...@@ -2657,7 +2657,7 @@
}, },
"better-assert": { "better-assert": {
"version": "1.0.2", "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=", "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
"requires": { "requires": {
"callsite": "1.0.0" "callsite": "1.0.0"
...@@ -2686,8 +2686,8 @@ ...@@ -2686,8 +2686,8 @@
}, },
"blob": { "blob": {
"version": "0.0.5", "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", "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
"integrity": "sha1-1oDu7yX4zZGtUz9bAe7UjmTK9oM=" "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="
}, },
"block-stream": { "block-stream": {
"version": "0.0.9", "version": "0.0.9",
...@@ -3130,7 +3130,7 @@ ...@@ -3130,7 +3130,7 @@
}, },
"callsite": { "callsite": {
"version": "1.0.0", "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=" "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA="
}, },
"callsites": { "callsites": {
...@@ -3377,8 +3377,8 @@ ...@@ -3377,8 +3377,8 @@
}, },
"clone-deep": { "clone-deep": {
"version": "4.0.1", "version": "4.0.1",
"resolved": "https://registry.npm.taobao.org/clone-deep/download/clone-deep-4.0.1.tgz", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
"integrity": "sha1-wZ/Zvbv4WUK0/ZechNz31fB8I4c=", "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"is-plain-object": "^2.0.4", "is-plain-object": "^2.0.4",
...@@ -3475,7 +3475,7 @@ ...@@ -3475,7 +3475,7 @@
}, },
"component-bind": { "component-bind": {
"version": "1.0.0", "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=" "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
}, },
"component-emitter": { "component-emitter": {
...@@ -3485,7 +3485,7 @@ ...@@ -3485,7 +3485,7 @@
}, },
"component-inherit": { "component-inherit": {
"version": "0.0.3", "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=" "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
}, },
"compressible": { "compressible": {
...@@ -4394,8 +4394,8 @@ ...@@ -4394,8 +4394,8 @@
}, },
"engine.io-client": { "engine.io-client": {
"version": "3.4.0", "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", "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz",
"integrity": "sha1-gqZCtChiqbP3oYj0F3ay3qtkNwA=", "integrity": "sha512-a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA==",
"requires": { "requires": {
"component-emitter": "1.2.1", "component-emitter": "1.2.1",
"component-inherit": "0.0.3", "component-inherit": "0.0.3",
...@@ -4412,26 +4412,26 @@ ...@@ -4412,26 +4412,26 @@
"dependencies": { "dependencies": {
"component-emitter": { "component-emitter": {
"version": "1.2.1", "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=" "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
}, },
"debug": { "debug": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": { "requires": {
"ms": "^2.1.1" "ms": "^2.1.1"
} }
}, },
"ms": { "ms": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"ws": { "ws": {
"version": "6.1.4", "version": "6.1.4",
"resolved": "https://registry.npm.taobao.org/ws/download/ws-6.1.4.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
"integrity": "sha1-W1yIAK+rkl6UzLKdFTyNAsF3bvk=", "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
"requires": { "requires": {
"async-limiter": "~1.0.0" "async-limiter": "~1.0.0"
} }
...@@ -4440,8 +4440,8 @@ ...@@ -4440,8 +4440,8 @@
}, },
"engine.io-parser": { "engine.io-parser": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npm.taobao.org/engine.io-parser/download/engine.io-parser-2.2.0.tgz", "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz",
"integrity": "sha1-MSxIlPV9UqArQgho2ntcHISvgO0=", "integrity": "sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==",
"requires": { "requires": {
"after": "0.8.2", "after": "0.8.2",
"arraybuffer.slice": "~0.0.7", "arraybuffer.slice": "~0.0.7",
...@@ -5859,22 +5859,22 @@ ...@@ -5859,22 +5859,22 @@
}, },
"has-binary2": { "has-binary2": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npm.taobao.org/has-binary2/download/has-binary2-1.0.3.tgz", "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
"integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=", "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
"requires": { "requires": {
"isarray": "2.0.1" "isarray": "2.0.1"
}, },
"dependencies": { "dependencies": {
"isarray": { "isarray": {
"version": "2.0.1", "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=" "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
} }
} }
}, },
"has-cors": { "has-cors": {
"version": "1.1.0", "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=" "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
}, },
"has-flag": { "has-flag": {
...@@ -6300,7 +6300,7 @@ ...@@ -6300,7 +6300,7 @@
}, },
"indexof": { "indexof": {
"version": "0.0.1", "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=" "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
}, },
"infer-owner": { "infer-owner": {
...@@ -8407,7 +8407,7 @@ ...@@ -8407,7 +8407,7 @@
}, },
"object-component": { "object-component": {
"version": "0.0.3", "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=" "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE="
}, },
"object-copy": { "object-copy": {
...@@ -8726,7 +8726,7 @@ ...@@ -8726,7 +8726,7 @@
}, },
"parseqs": { "parseqs": {
"version": "0.0.5", "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=", "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
"requires": { "requires": {
"better-assert": "~1.0.0" "better-assert": "~1.0.0"
...@@ -8734,7 +8734,7 @@ ...@@ -8734,7 +8734,7 @@
}, },
"parseuri": { "parseuri": {
"version": "0.0.5", "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=", "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
"requires": { "requires": {
"better-assert": "~1.0.0" "better-assert": "~1.0.0"
...@@ -10732,8 +10732,8 @@ ...@@ -10732,8 +10732,8 @@
}, },
"sass-loader": { "sass-loader": {
"version": "7.3.1", "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", "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
"integrity": "sha1-pb9ooEvOocE/+ELXRxUPerfQ0j8=", "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
"dev": true, "dev": true,
"requires": { "requires": {
"clone-deep": "^4.0.1", "clone-deep": "^4.0.1",
...@@ -10745,8 +10745,8 @@ ...@@ -10745,8 +10745,8 @@
"dependencies": { "dependencies": {
"semver": { "semver": {
"version": "6.3.0", "version": "6.3.0",
"resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true "dev": true
} }
} }
...@@ -10909,8 +10909,8 @@ ...@@ -10909,8 +10909,8 @@
}, },
"shallow-clone": { "shallow-clone": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/shallow-clone/download/shallow-clone-3.0.1.tgz", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
"integrity": "sha1-jymBrZJTH1UDWwH7IwdppA4C76M=", "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
"dev": true, "dev": true,
"requires": { "requires": {
"kind-of": "^6.0.2" "kind-of": "^6.0.2"
...@@ -11076,8 +11076,8 @@ ...@@ -11076,8 +11076,8 @@
}, },
"socket.io-client": { "socket.io-client": {
"version": "2.3.0", "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", "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz",
"integrity": "sha1-FNW6LgC5vNFFrkQ6uWs/hsvMG7Q=", "integrity": "sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==",
"requires": { "requires": {
"backo2": "1.0.2", "backo2": "1.0.2",
"base64-arraybuffer": "0.1.5", "base64-arraybuffer": "0.1.5",
...@@ -11097,28 +11097,28 @@ ...@@ -11097,28 +11097,28 @@
"dependencies": { "dependencies": {
"component-emitter": { "component-emitter": {
"version": "1.2.1", "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=" "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
}, },
"debug": { "debug": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": { "requires": {
"ms": "^2.1.1" "ms": "^2.1.1"
} }
}, },
"ms": { "ms": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
} }
} }
}, },
"socket.io-parser": { "socket.io-parser": {
"version": "3.3.0", "version": "3.3.0",
"resolved": "https://registry.npm.taobao.org/socket.io-parser/download/socket.io-parser-3.3.0.tgz", "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz",
"integrity": "sha1-K1KpalCf3zFEC6QP7WCUx9TxJi8=", "integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==",
"requires": { "requires": {
"component-emitter": "1.2.1", "component-emitter": "1.2.1",
"debug": "~3.1.0", "debug": "~3.1.0",
...@@ -11127,20 +11127,20 @@ ...@@ -11127,20 +11127,20 @@
"dependencies": { "dependencies": {
"component-emitter": { "component-emitter": {
"version": "1.2.1", "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=" "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
}, },
"debug": { "debug": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"requires": { "requires": {
"ms": "2.0.0" "ms": "2.0.0"
} }
}, },
"isarray": { "isarray": {
"version": "2.0.1", "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=" "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
} }
} }
...@@ -11772,7 +11772,7 @@ ...@@ -11772,7 +11772,7 @@
}, },
"to-array": { "to-array": {
"version": "0.1.4", "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=" "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
}, },
"to-arraybuffer": { "to-arraybuffer": {
...@@ -12393,8 +12393,8 @@ ...@@ -12393,8 +12393,8 @@
}, },
"vue-notification": { "vue-notification": {
"version": "1.3.20", "version": "1.3.20",
"resolved": "https://registry.npm.taobao.org/vue-notification/download/vue-notification-1.3.20.tgz", "resolved": "https://registry.npmjs.org/vue-notification/-/vue-notification-1.3.20.tgz",
"integrity": "sha1-2FYYEndjtG8+JbiWK4V5R9WpfL4=" "integrity": "sha512-vPj67Ah72p8xvtyVE8emfadqVWguOScAjt6OJDEUdcW5hW189NsqvfkOrctxHUUO9UYl9cTbIkzAEcPnHu+zBQ=="
}, },
"vue-router": { "vue-router": {
"version": "3.0.7", "version": "3.0.7",
...@@ -12452,8 +12452,8 @@ ...@@ -12452,8 +12452,8 @@
}, },
"vue-socket.io": { "vue-socket.io": {
"version": "3.0.7", "version": "3.0.7",
"resolved": "https://registry.npm.taobao.org/vue-socket.io/download/vue-socket.io-3.0.7.tgz", "resolved": "https://registry.npmjs.org/vue-socket.io/-/vue-socket.io-3.0.7.tgz",
"integrity": "sha1-+m2xIBQkMDny1jPURY5GEHXVLcg=", "integrity": "sha512-dTo0Vr6jIziIax5/m+mY+iwzSBdH9ZgcUR0FkyfFNklBYvb6bdNbo5tJTydMh0DTZ8f+gK4Xl6Ihtnv6YIsulQ==",
"requires": { "requires": {
"socket.io-client": "^2.1.1" "socket.io-client": "^2.1.1"
} }
...@@ -12950,7 +12950,7 @@ ...@@ -12950,7 +12950,7 @@
}, },
"xmlhttprequest-ssl": { "xmlhttprequest-ssl": {
"version": "1.5.5", "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=" "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4="
}, },
"xtend": { "xtend": {
...@@ -13057,7 +13057,7 @@ ...@@ -13057,7 +13057,7 @@
}, },
"yeast": { "yeast": {
"version": "0.1.2", "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=" "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
}, },
"ylru": { "ylru": {
......
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