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

修复博客置顶功能

See merge request pigbigbig/beyond-clouds-front!144

components/pc/projectCard.vue

@@ -123,7 +123,6 @@
     },
     },
     created(){
     created(){
       this.dateGet2Info();
       this.dateGet2Info();
-
     },
     },
     computed:{
     computed:{
       cardState(){
       cardState(){
@@ -159,8 +158,7 @@
           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||info.categoryPriority;
-
+          this.priority = this.$route.query.type==='all'?info.priority:info.categoryPriority;
         }
         }
         if(this.info.projectId){
         if(this.info.projectId){
           this.cardName = info.projectName;
           this.cardName = info.projectName;

pages/answer/index.vue

@@ -132,6 +132,9 @@ export default {
     },
     },
     getLabelTitle(){
     getLabelTitle(){
       let type = this.$route.query.type;
       let type = this.$route.query.type;
+      if(type!=='all'){
+        type = Number(type)
+      }
       this.list.map((val,index)=>{
       this.list.map((val,index)=>{
         if(val.type===type){
         if(val.type===type){
           this.labelTitle =  val.label
           this.labelTitle =  val.label

pages/blog/index.vue

@@ -122,6 +122,9 @@ export default {
     },
     },
     getLabelTitle(){
     getLabelTitle(){
       let type = this.$route.query.type;
       let type = this.$route.query.type;
+      if(type!=='all'){
+        type = Number(type)
+      }
       this.list.map((val,index)=>{
       this.list.map((val,index)=>{
         if(val.type===type){
         if(val.type===type){
           this.labelTitle = val.label
           this.labelTitle = val.label

pages/project/index.vue

@@ -130,6 +130,9 @@ export default {
     },
     },
     getLabelTitle(){
     getLabelTitle(){
       let type = this.$route.query.type;
       let type = this.$route.query.type;
+      if(type!=='all'){
+        type = Number(type)
+      }
       this.list.map((val,index)=>{
       this.list.map((val,index)=>{
         if(val.type===type){
         if(val.type===type){
           this.labelTitle =  val.label
           this.labelTitle =  val.label