Merge branch 'yoona' into 'master'

Yoona

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

action/config.js

@@ -43,7 +43,7 @@ export default  {
         otherFans: '/api/user/', //获取ta的粉丝(列表)   +{userId}/fans
         otherFans: '/api/user/', //获取ta的粉丝(列表)   +{userId}/fans
         otherFollowing: '/api/user/', //获取ta的关注（列表）  +{userId}/follower
         otherFollowing: '/api/user/', //获取ta的关注（列表）  +{userId}/follower
         blacklist: '/api/my/blacklist/', //获取黑名单  +{userId}
         blacklist: '/api/my/blacklist/', //获取黑名单  +{userId}
-
+        hotBloggers:'/api/user/hotBloggers',//热门博主
       },
       },
 
 
       Authentication:{
       Authentication:{

pages/blog/index.vue

@@ -24,14 +24,13 @@
       <div class="blog-container__right">
       <div class="blog-container__right">
         <div class="right__write-blog" @click="toRelease">写文章</div>
         <div class="right__write-blog" @click="toRelease">写文章</div>
         <card-container
         <card-container
-          v-if="false"
           title="热门博主"
           title="热门博主"
           label="换一换"
           label="换一换"
           more="更多"
           more="更多"
           width="302px"
           width="302px"
           style="margin-top: 16px;max-height: 446px;"
           style="margin-top: 16px;max-height: 446px;"
         >
         >
-          <user-card></user-card>
+          <user-card v-for="(item, index) in hotBloggerList" :key="item.userId" :info="item"></user-card>
         </card-container>
         </card-container>
         <card-container
         <card-container
           title="热门标签"
           title="热门标签"
@@ -73,12 +72,13 @@ export default {
       pages:1,
       pages:1,
       hotBlogList: [],
       hotBlogList: [],
       hotTagsList: [],
       hotTagsList: [],
+      hotBloggerList: [],
       labelTitle:'',
       labelTitle:'',
       showPagination:true,
       showPagination:true,
       showPaginationTimer:null,
       showPaginationTimer:null,
       list: [
       list: [
         {
         {
-          label: '全部项目',
+          label: '全部博客',
           address: '/blog',
           address: '/blog',
           type: 'all'
           type: 'all'
         },
         },
@@ -95,6 +95,7 @@ export default {
     this.dataGetBlogCategory();
     this.dataGetBlogCategory();
     this.getLabelTitle();
     this.getLabelTitle();
     this.dataGetHotTagsList();
     this.dataGetHotTagsList();
+    this.dataGetHotBloggersList();
   },
   },
   watch: {
   watch: {
     $route: function () {
     $route: function () {
@@ -152,6 +153,17 @@ export default {
         })
         })
 
 
     },
     },
+    dataGetHotBloggersList() {
+      let params={
+        page: 1,
+        size: 5
+      };
+      this.$axios.$get(config.api.get.User.hotBloggers,{params:params})
+        .then((response)=>{
+          console.log(response);
+          this.hotBloggerList = response.data.dataList;
+        });
+    },
 
 
     toRelease(){
     toRelease(){
       this.$router.push('/blog/release')
       this.$router.push('/blog/release')