Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

src/api/modules/favorites.js

@@ -103,6 +103,16 @@ const isNoFavorite=function(date){
   return ajax.postJson('/xboe/m/favorite/isNoFavorite',data);
 }
 
+/**
+ * 我收藏的回答
+ * pageIndex 页数
+ * pageSize 条数
+ * keyword 关键词
+ * */
+const findAnswerPage=function(data){
+  return ajax.post('/xboe/m/favorite/favorite-answer',data);
+}
+
 export default{
     has,
     remove,
@@ -115,5 +125,6 @@ export default{
     coursePageList,
     findAll,
 	  queryAll,
-    isNoFavorite
+    isNoFavorite,
+  findAnswerPage
 }

src/components/Portal/noteComment.vue

@@ -69,7 +69,7 @@
                                       </div>
                                   </div>
                                   <!--发布回复-->
-                                  <div v-if="replyInfo.parentId==reply.id" class="comment-reply" style="padding-bottom: 5px;">
+                                  <div v-if="replyInfo.parentId==reply.id" class="comment-reply" style="padding-bottom: 5px;margin-top: 20px;">
                                        <div style="width:100%;display:flex;">
                                           <div style="flex: 1;">
                                            <el-input show-word-limit class="hideControl" type="textarea" v-model="replyInfo.content"  maxlength="100" placeholder="回复内容..."></el-input>
@@ -371,7 +371,7 @@
                      if(res.status == 200 && res.result.list.length > 0) {
                       let ids = [];
                       res.result.list.forEach(it=>{
-                        ids.push(item.sysCreateAid);
+                        ids.push(it.sysCreateAid);
                         it.replyList = [];
                         it.avatar='';
                         it.orgInfo='';
@@ -804,7 +804,7 @@
     .comment{
         margin-top: 20px;
         background-color: #FFFFFF;
-        margin-bottom: 20px;
+        margin-bottom: 30px;
       // border-bottom: 1px solid #dddddd;
         .comment-top{
             display: flex;