From e5c2eca5ec7f1911d7a5d8ceccecdd2afbc471e0 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 13 Oct 2022 14:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E7=AD=94=E8=AF=A6=E6=83=85=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=81=9A=E4=BA=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/authorInfo.vue |  7 ++--
 src/views/portal/qa/Answer.vue       | 55 ++++++++++++++++------------
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/components/Portal/authorInfo.vue b/src/components/Portal/authorInfo.vue
index 5883b550..1b3dceca 100644
--- a/src/components/Portal/authorInfo.vue
+++ b/src/components/Portal/authorInfo.vue
@@ -13,7 +13,7 @@
         </div>
     </div>
 		<div v-if="!onlyAvatar" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
-      <span style="color: #333333;font-weight: 600;">{{userName}}</span>
+      <span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
       <span class="author-text" v-if="userInfo && userInfo!=''">({{userInfo}})</span>
     </div>
 	</div>
@@ -117,12 +117,13 @@ import { userAvatarText } from "@/utils/tools.js";
 		display: flex;
     .author-text{
       font-size: 12px;
-      color: #666666;
+      color: #999999;
+      font-weight: 300;
       margin-left: 4px;
     }
     .uavatar{
       // border: 1px solid #73adfe;
-      width: 28px; 
+      width: 28px;
       height: 28px;
       // background: #d9e9ff;
       display: flex;
diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index befba8f2..f85a65ec 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/src/views/portal/qa/Answer.vue
@@ -48,24 +48,24 @@
               </div>
 
             </div>
-            <div v-if="answerList.length > 0">
-              <div :span="24">
+            <div style="background-color: #fff;">
+              <div class="wrt-answer" v-if="answerList.length > 0 || answerShow" style="margin-top: 30px;padding: 0px 40px;">
+                 <div class="answer-tit">
+                   写回答
+                 </div>
+                 <div class="answer-content">
+                    <input minlength="1" maxlength="800" v-model="content" placeholder="写下你的回答吧～" type="text">
+                   <el-button type="primary"  @click="publishAnswer">发布</el-button>
+                 </div>
+              </div>
+              <div v-if="answerList.length > 0" style="padding: 0px 40px;">
+                <div>
 
-                <el-card :body-style="{ padding: '0px' }" class="answer-reply-box">
-                   <div class="wrt-answer">
-                      <div class="answer-tit">
-                        写回答
-                      </div>
-                      <div class="answer-content">
-                         <input minlength="1" maxlength="800" v-model="content" placeholder="写下你的回答吧～" type="text">
-                        <el-button type="primary"  @click="publishAnswer">发布</el-button>
-                      </div>
-                   </div>
-                  <div class="answer" v-for="(item, index) of answerList" :key="item.id"
-                    :style="index === answerList.length - 1 ? 'border-bottom:none;' : ''">
+                  <div class="answer" v-for="(item, index) of answerList" :key="item.id" :style="index === answerList.length - 1 ? 'border-bottom:none;' : ''">
                     <div class="answer-top">
                       <div>
-                        <author :avatar="item.avatar" :name="item.sysCreateBy" :sex="item.sex"></author>
+                        <author :avatar="item.avatar" :name="item.sysCreateBy" :info="item.orgInfo" :sex="item.sex"></author>
+                        <div class="sign">{{item.sign}}</div>
                       </div>
                       <div>
                         <span v-if="detailData.isResolve && item.isBest" style="color: #ffb30f">最佳答案</span>
@@ -86,13 +86,12 @@
                           <div>
                           </div>
                           <div style="margin-right: 10px;">
-                            <interactBar :type="5" :data="item" :shares="false"
-                              :views="false"></interactBar>
+                            <interactBar :type="5" :data="item" :favorites="false" :comments="false" :shares="false" :views="false"></interactBar>
                           </div>
                         </div>
                         <div class="answer-boot">
                           <div class="answer-boot-btns">
-                            <div v-show="btnsShowRowId == item.id">
+                            <div v-show="btnsShowRowId != item.id">
                               <a @click="showRowInput(item, {})">
                                 <svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon>
                                 <span>回复</span>
@@ -216,7 +215,7 @@
                       </div>
                     </div>
                   </div>
-                </el-card>
+                </div>
                 <div class="pagination-div">
                   <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
                   <span class="pag-text-msg" style="font-size:14px;color: #444444;"
@@ -477,7 +476,7 @@ export default {
           let event = {
             key: "ReadQuestion",//后台的事件key  发布文章且审核通过
             title: "阅读问题",//事件的标题
-            parameters:"",//用户自定义参数 name:value,name:value
+            parameters:"author:"+res.result.sysCreateAid,//用户自定义参数 name:value,name:value
             content: '阅读了问题',//事件的内容
             objId: this.qid,//关联的id
             objType: "4",//关联的类型
@@ -511,6 +510,9 @@ export default {
         pageIndex: this.pageIndex
       }).then(res => {
         if (res.status == 200) {
+          if(res.result.length>0){
+            this.answerShow=true;
+          }
           let allList = [];
           let ids = [];
           let level3ParentIds = [];
@@ -595,6 +597,7 @@ export default {
                 item.avatar = author.avatar;
                 item.orgInfo = author.orgInfo;
                 item.sex = author.sex;
+                item.sign=author.sign;
                 return true;
               } else {
                 return false;
@@ -967,7 +970,11 @@ export default {
       border-radius: 50%;
       vertical-align: middle;
     }
-
+    .sign{
+      padding:5px 0px 10px 42px;
+      color:#666666;
+      font-weight: 400;
+    }
     .zuijia {
       width: 106px;
       height: 42px;
@@ -985,10 +992,10 @@ export default {
 
   .answer-body {
     padding-left: 40px;
-
     .answer-text {
       margin: 6px 0 0px;
       line-height: 24px;
+      height: 48px;
       white-space: pre-wrap;
       word-break: break-all;
 
@@ -1008,7 +1015,7 @@ export default {
     }
 
     .answer-boot {
-      // height: 35px;
+      height: 35px;
       line-height: 35px;
       display: flex;
       justify-content: space-between;
@@ -1090,7 +1097,7 @@ export default {
 
     .comment-btns {
       // padding: 5px 10px 10px 0px;
-      // height: 35px;
+      height: 35px;
       line-height: 35px;
 
       a {