From ca9dea067f64b048e8ddcfd647520b6a9993f670 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 14 Oct 2022 15:04:41 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=88=91=E5=9B=9E=E7=AD=94=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Qa/replyList.vue | 82 +++++++++++++++++++--------------
 src/views/qa/MyReplys.vue       | 15 +++---
 2 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/src/components/Qa/replyList.vue b/src/components/Qa/replyList.vue
index 7e117007..e38cc67b 100644
--- a/src/components/Qa/replyList.vue
+++ b/src/components/Qa/replyList.vue
@@ -11,37 +11,38 @@
         <div class="article-info-title">
           <div style="line-height: 30px;font-size: 18px" >
             <div class="one-line-ellipsis art-tit" >
-            <span v-if="item.isResolve == true" class="qa-basic qa-solve">【已解决】</span>
-            <span v-if="item.isResolve == false" class="qa-basic qa-unSolve">【待解决】</span>
-             <span style="padding-left: 5px;cursor: pointer;" >
+            <!-- <span v-if="item.isResolve == true" class="qa-basic qa-solve">【已解决】</span>
+            <span v-if="item.isResolve == false" class="qa-basic qa-unSolve">【待解决】</span> -->
               <span v-html="$keywordActiveShow(item.title,keyWord)"></span>
-            </span>
           </div>
           </div>
         </div>
         <div class="article-info-summary">
-         <div style="height:28px;overflow: hidden;" class="one-line-ellipsis" v-html="$keywordActiveShow(item.content,keyWord)"></div>
+         <div style="overflow: hidden;" class="one-line-ellipsis titcontent" v-html="$keywordActiveShow(item.content,keyWord)"></div>
           <div class="article-Reply">
-          <div class="article-hd">
-             <span style="color: #171717;float:left;margin-top: 8px;" class="one-line-ellipsis">我的回答：<span v-if="item.isBest" class="isBest">最佳</span><span  v-html="$keywordActiveShow(item.answercontent,keyWord)"></span></span>
-          </div>
-            <!-- <div >
-              <el-button class="edit"  icon="el-icon-edit"  type="text" @click="editItem(item)" size="mini">编辑</el-button>
-              <el-button class="del" icon="el-icon-remove" type="text"  @click="delItem(item)" size="mini">删除</el-button>
-            </div> -->
-          </div>
-        </div>
-        <div class="article-info-tools">
-          <div class="article-info-tools-auth">
-            <!-- <span style="font-size: 13px; color: #7b7b7b;padding-right: 15px;">提问时间：{{ item.sysCreateTimeQ }}</span> -->
-            <span style="  font-size: 13px; color: #7b7b7b;padding-right: 15px;">回复时间：{{ item.sysCreateTimeA }}</span>
-             
-          </div>
-           <div class="article-info-date">
+          <div class="article-hd" style="margin-top: 8px;">
+            我的回答
+               <div class="article-info-date">
                   <!-- <el-button @click="shareItem(item)" type="text" icon="el-icon-share">分享</el-button> -->
                   <el-button class="edit" @click.stop="editItem(item)" type="text" icon="el-icon-edit" >编辑</el-button>
                   <el-button class="del" @click.stop="delItem(item)" type="text" icon="el-icon-delete">删除</el-button>
                 </div>
+            
+          </div>
+         
+          </div>
+          
+        </div>
+         <div class="reply-content two-line-ellipsis">
+               <span  v-html="$keywordActiveShow(item.answercontent,keyWord)"></span>
+          </div>
+        <div class="article-info-tools">
+          <div class="article-info-tools-auth">
+            <!-- <span style="font-size: 13px; color: #7b7b7b;padding-right: 15px;">提问时间：{{ item.sysCreateTimeQ }}</span> -->
+            <span style="  font-size: 13px; color: #7b7b7b;padding-right: 15px;">回复时间：{{ item.sysCreateTimeA }}</span>
+          </div>
+             <interactBar  :readonly="true"  :type="4" :data="item" :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar>
+          
         </div>
       </div>
     </div>
@@ -66,9 +67,10 @@
 <script>
 import apiQa from '@/api/modules/qa.js';
 import editQuestion from '@/components/Qa/editQuestion.vue';
+import interactBar from '@/components/Portal/interactBar.vue';
 export default {
   name: 'articleItems',
-  components: {editQuestion },
+  components: {editQuestion,interactBar },
   props: {
     items: {
       type: Array,
@@ -153,23 +155,34 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.reply-content{
+  font-size: 14px;
+  color: #333330;
+  font-weight: 400;
+  margin-bottom: 10px;
+}
+.titcontent{
+  font-size: 14px;
+  color: #999999;
+  font-weight: 400;
+}
+.el-button--medium{
+  padding-top: 0;
+}
 .art-tit{
-  margin-left: -12px;
+  font-size: 18px;
+  font-weight: 600;
+  color: #333333;
 }
 .artlist{
-  padding-left: 21px;
+  padding-left: 20px;
   padding-right: 32px;
   cursor: pointer;
 }
 .article-info-date {
-     
-      position: absolute;
-       top: -10px;
-       right:0px;
-      // height: 40px;
-      line-height: 30px;
+      // line-height: 30px;
       font-weight: 200;
-      // margin-left: 10%;
+      margin-left: auto;
       color: #999999;
       i {
         margin-right: 5px;
@@ -177,7 +190,7 @@ export default {
     }
 .article-hd{
   width: 100%;
-  // display: ;
+  display: flex;
   span{
     line-height: 30px;
   }
@@ -266,10 +279,10 @@ export default {
 
   }
   .article-info-summary {
-    height: 85px;
+    // height: 85px;
     line-height: 25px;
    overflow: hidden;
-   margin-top: 16px;
+   margin-top: 10px;
     color: #999999;
 
   }
@@ -285,7 +298,6 @@ export default {
       height: 30px;
       line-height: 30px;
       font-size: 13px;
-     
       color: #999999;
       img {
         margin-right: 10px;
diff --git a/src/views/qa/MyReplys.vue b/src/views/qa/MyReplys.vue
index ae3992b1..5fa7a0a3 100644
--- a/src/views/qa/MyReplys.vue
+++ b/src/views/qa/MyReplys.vue
@@ -5,15 +5,9 @@
       <br />
     </Remark>
     <div style="display: flex;height: 40px;">
-      <div style="padding-top: 5px;">
-        <!--
-        <el-tag type="primary" style="margin-right: 20px;">最新</el-tag>
-        <el-tag type="info">最热</el-tag>
-        -->
-      </div>
       <div>
         <div style="display: flex;justify-content:space-around;padding: 12px 0px 10px 18px;">
-          <!--<div style="padding: 0px 5px;"><el-cascader clearable v-model="params.type" :options="typeList"></el-cascader></div>-->
+          <span class="title">我回答的</span>
           <div style="padding: 0px 5px;">
             <el-select v-model="queryObj.isResolve" placeholder="状态" style="width: 110px;" clearable>
               <el-option label="全部" value=""></el-option>
@@ -141,6 +135,13 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.title{
+  font-size: 18px;
+  color: #333333;
+  font-weight: 600;
+  line-height: 35px;
+  margin-right: 30px;
+}
 .uc-badge {
   margin-top: 10px;
   margin-right: 40px;

From f163d329ccb378a471e4a12778946c350652c2ca Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 14 Oct 2022 15:12:32 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=AC=94=E8=AE=B0?=
 =?UTF-8?q?=E5=92=8C=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/MyFavorites.vue | 2 +-
 src/views/user/Mynotes.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/user/MyFavorites.vue b/src/views/user/MyFavorites.vue
index 7af80358..8b72e3cb 100644
--- a/src/views/user/MyFavorites.vue
+++ b/src/views/user/MyFavorites.vue
@@ -722,7 +722,7 @@ export default {
   color: #333333;
 }
 ::v-deep .el-tabs__active-bar {
-  background-color: #ffb30f;
+  // background-color: #ffb30f;
 }
 .tag-space {
   margin-right: 10px;
diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue
index b8e35b4b..93a202ff 100644
--- a/src/views/user/Mynotes.vue
+++ b/src/views/user/Mynotes.vue
@@ -643,7 +643,7 @@ export default {
                font-weight: 400;
                color: #3379FB;
                text-align:center;
-               margin-top: 5px;
+               margin-top: 2px;
                display: inline-block;
            }
            div{

From 3f6db732001c14b57f064e9ae3457b4823851a7c Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Fri, 14 Oct 2022 15:17:58 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=AC=94=E8=AE=B0=E5=86=85=E5=AE=B9=E5=9C=A8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=87=8C=E9=9D=A2=E7=9A=84=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Course/myNote.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Course/myNote.vue b/src/components/Course/myNote.vue
index fda3b964..5550ee6c 100644
--- a/src/components/Course/myNote.vue
+++ b/src/components/Course/myNote.vue
@@ -429,6 +429,7 @@ export default {
         font-size: 14px;
         color: #333333;
         height: 100%;
+        white-space: pre-line;
 
         ::v-deep .el-textarea__inner {
             background: #f5f5f5;

From c0ea2a0c67287750c8ae9d7bb4e3132e9c51bc1c Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 14 Oct 2022 15:24:14 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UserCenter/menu.vue |  2 +-
 src/icons/svg/message-active.svg   | 13 +++++++++++++
 src/icons/svg/messageicon.svg      | 23 +++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 src/icons/svg/message-active.svg
 create mode 100644 src/icons/svg/messageicon.svg

diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index 38fc9e0d..69d6b493 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -302,7 +302,7 @@
           <span slot="title">我的收藏</span>
         </el-menu-item>
         <el-menu-item index="/message/center/index" v-show="curIdentity == 1">
-          <svg-icon :icon-class="activeMenu == '/user/favorites'?'stra-active':'stra'"></svg-icon>
+          <svg-icon :icon-class="activeMenu == '/user/favorites'?'message-active':'messageicon'"></svg-icon>
           <span slot="title">消息中心</span>
         </el-menu-item>
        
diff --git a/src/icons/svg/message-active.svg b/src/icons/svg/message-active.svg
new file mode 100644
index 00000000..dc0adef3
--- /dev/null
+++ b/src/icons/svg/message-active.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="23px" height="22px" viewBox="0 0 23 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="20.通知中心-" transform="translate(-125.000000, -975.000000)" fill="#666666" stroke="#666666" stroke-width="0.4">
+            <g id="编组-19备份" transform="translate(80.000000, 310.000000)">
+                <g id="编组" transform="translate(45.433916, 665.000000)">
+                    <path d="M3.62116539,14.5535032 C3.24403496,14.7052236 2.99634676,15.0778984 3.00295312,15.4817627 L3.00295312,15.5665342 C2.9986317,16.1132077 3.43814117,16.5640276 3.98709958,16.570654 L17.0564226,16.570654 C17.3130221,16.5684833 17.5539697,16.4702306 17.7369939,16.2917762 C17.9288152,16.1042964 18.040569,15.8410705 18.0381499,15.5709899 L18.040569,15.4840476 C18.0471754,15.0800691 17.7994872,14.7052236 17.4245275,14.5557881 L16.3691106,14.1384426 L16.3691106,9.51725249 C16.3691106,6.3129577 13.7472487,3.70674768 10.5228464,3.70674768 C7.29855836,3.70674768 4.6765822,6.3129577 4.6765822,9.51725249 L4.6765822,14.1384426 L3.62116539,14.5535032 Z M3.99155522,17.9631004 C2.6526908,17.9631004 1.56608447,16.8875761 1.56608447,15.5665342 L1.56608447,15.4773071 C1.56608447,14.9952976 1.70889363,14.5312249 1.97886006,14.133987 C2.25111144,13.7368633 2.63041257,13.4355931 3.07894757,13.2614801 L3.23740862,13.1991011 L3.23740862,9.51725249 C3.23740862,7.73659365 3.90232806,6.02733939 5.11175027,4.70195614 C6.31226118,3.38536994 7.94565522,2.55524886 9.71511782,2.35897196 L9.93824285,2.33440878 L9.93824285,1.58905922 C9.93824285,1.26551079 10.2015829,1 10.5273021,1 C10.8508505,1 11.1163613,1.26334009 11.1163613,1.58905922 L11.1163613,2.33440878 L11.3396006,2.35897196 C13.1067782,2.55307817 14.7401723,3.38536994 15.9385125,4.70195614 C17.1456497,6.02733939 17.8105692,7.73659365 17.8105692,9.51725249 L17.8105692,13.2012718 L17.9690302,13.2637651 C18.4175652,13.4377638 18.7968664,13.739034 19.0691177,14.1362719 C19.3413691,14.5333956 19.4841783,14.9975825 19.4841783,15.4773071 L19.4841783,15.5665342 C19.4841783,16.2002641 19.2364901,16.7982347 18.7856701,17.2490546 C18.3260531,17.7086716 17.7146014,17.9631004 17.0630489,17.9631004 L3.99155522,17.9631004 Z M10.4715494,21.0000228 C9.27777905,21.0000228 8.10400201,20.799176 6.97718062,20.4019381 L6.97272498,20.3997674 C6.79415641,20.3349892 6.64917655,20.2056612 6.56886068,20.0338332 C6.48625986,19.8620052 6.47734857,19.667899 6.54201255,19.4893304 C6.6468916,19.2059971 6.92142793,19.0140616 7.22486883,19.0140616 C7.30746965,19.0140616 7.38995622,19.0274285 7.47027209,19.0564473 C8.43646173,19.3956476 9.44732209,19.5674756 10.4715494,19.5674756 C11.5247955,19.5674756 12.5623897,19.3867363 13.5531425,19.0274285 L13.5709651,19.0208022 C13.6535659,18.9894984 13.7383374,18.9761314 13.823109,18.9761314 C14.1220942,18.9761314 14.3965163,19.1636113 14.5036803,19.444774 L14.505851,19.4492296 C14.5706292,19.627684 14.5617179,19.8217902 14.4814021,19.9936181 C14.4009719,20.1677311 14.2581628,20.297059 14.0797085,20.364008 C12.9171277,20.7858091 11.7055348,21.0000228 10.4715494,21.0000228 L10.4715494,21.0000228 Z" id="Fill-1"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/messageicon.svg b/src/icons/svg/messageicon.svg
new file mode 100644
index 00000000..d2b935a2
--- /dev/null
+++ b/src/icons/svg/messageicon.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26px" height="26px" viewBox="0 0 26 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 2</title>
+    <defs>
+        <polygon id="path-1" points="5.0748738e-17 0 16 0 16 16 5.0748738e-17 16"></polygon>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="我的收藏" transform="translate(-1527.000000, -25.000000)">
+            <g id="编组-13" transform="translate(1527.000000, 25.000000)">
+                <g id="编组-2" fill="#F6F7FA" opacity="0.103236607">
+                    <rect id="矩形备份" x="0" y="0" width="26" height="26" rx="13"></rect>
+                </g>
+                <g id="编组-12" transform="translate(5.000000, 5.000000)">
+                    <mask id="mask-2" fill="white">
+                        <use xlink:href="#path-1"></use>
+                    </mask>
+                    <g id="Clip-2"></g>
+                    <path d="M12.8940698,6.91998844 C12.8940698,4.7096267 11.2903046,2.85915676 9.12938721,2.36963668 L9.12938721,1.88001156 C9.12938721,1.28239788 8.62492049,0.8 7.99996704,0.8 C7.37507951,0.8 6.87061279,1.28239788 6.87061279,1.88001156 L6.87061279,2.36963668 C4.7096075,2.85915676 3.10593017,4.7096267 3.10593017,6.91998844 L3.10593017,10.8800168 L1.6,12.3199832 L1.6,13.0399559 L14.4,13.0399559 L14.4,12.3199832 L12.8940698,10.8800168 L12.8940698,6.91998844 Z M7.99996704,15.2 C8.10542588,15.2 8.20326092,15.1927728 8.30120581,15.1711961 C8.79055677,15.077557 9.19718845,14.7536333 9.38538853,14.3216161 C9.46074765,14.1487924 9.50589722,13.9615982 9.50589722,13.7599496 L6.49412476,13.7599496 C6.49412476,14.5519847 7.17176367,15.2 7.99996704,15.2 Z" id="Fill-1" fill="#FFFFFF" mask="url(#mask-2)"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

From 895d54d8efafc61e93432678c4d26d6fc212883d Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Fri, 14 Oct 2022 15:34:23 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E7=AC=94=E8=AE=B0=E5=88=97=E8=A1=A8=E5=86=85=E5=AE=B9=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/Mynotes.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue
index 93a202ff..a7aeca6e 100644
--- a/src/views/user/Mynotes.vue
+++ b/src/views/user/Mynotes.vue
@@ -393,7 +393,7 @@ export default {
                   //删除事件
                   let event = {
                     key: "DeleteNote",//
-                    title: "删除笔记",// 
+                    title: "删除笔记",//
                     parameters:"author",//
                     content: "删除了笔记",//
                     source:'page',
@@ -699,6 +699,7 @@ export default {
        .all-content{
            font-size: 14px;
            font-weight: 400;
+           white-space: pre-line;
            color: #333333;
            img{
                width: 140px;

From 68d127c571e58ff93e6378905352eff13441dd17 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Fri, 14 Oct 2022 15:59:06 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B4=E8=B6=A3?=
 =?UTF-8?q?=E5=81=8F=E5=A5=BD=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/interestCollection.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/Portal/interestCollection.vue b/src/components/Portal/interestCollection.vue
index 43927093..62b0f423 100644
--- a/src/components/Portal/interestCollection.vue
+++ b/src/components/Portal/interestCollection.vue
@@ -43,14 +43,12 @@
     created() {
           // this.userAvatar=require("@/assets/images/user/default.png");
           apiUserhobby.has().then(res=>{
-            console.log("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
-            console.log(res);
-            console.log("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
             if(res.status != 200) {return;}
             // 1. 判断用户是否选择过兴趣偏好
             if(res.result == false){
               this.interestCollection = true;
             }
+            if(res.result == true){this.interestCollection = false;return;}
             // 2. 判断用户是否点击过"暂不选择"按钮，如果用户点击过"暂不选择"按钮则判断点击"暂不选择"按钮天数是否大于15天，如果大于则弹出兴趣偏好框，否则不弹
             let time = localStorage.getItem('notYet');
             if(time == '') {