From f8f71f6bb4eceb25512bfa764c6989af8215e964 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 13 Oct 2022 17:25:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Index.vue | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/views/Index.vue b/src/views/Index.vue
index dc456b51..866e2d60 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -47,7 +47,7 @@
       <div class="modules xcontent2">
         <div class="xcontent2-main">
           <!--内容块-->
-          <div class="modules-title">
+          <div class="modules-title" >
             <span class="modules-text">推荐课程</span>
             <span class="quyer-tag">
               <a :class="courseList.orderType == 2 ? 'current' : ''" @click="orderTypeFilter(2)">最热</a>
@@ -180,15 +180,18 @@
                   </p>
                 </div>
                 <div class="case-inter">
-                  <div>
-                    <authorInfo :avatar="ca.authorInfo.avatar" :info="ca.authorInfo.orgInfo" :name="ca.authorInfo.name"
+                    <div class="case-inter-box">
+                      <div class="case-inter-left">
+                         <authorInfo :avatar="ca.authorInfo.avatar" :info="ca.authorInfo.orgInfo" :name="ca.authorInfo.name"
                       :sex="ca.authorInfo.sex"></authorInfo>
-                  </div>
-                  <div class="interact-bar-index"
+                      </div>
+                      <div class="interact-bar-index"
                     style="font-size: 12px;color: #6E7B84;display: flex;line-height: 30px;">
                     <interactBar :type="3" :readonly="true" :comments="false" :praises="false" :favorites="false"
                       :data="ca" :shares="false" :views="true"></interactBar>人观看
                   </div>
+                  </div>
+                 
                   <!-- -->
                 </div>
               </div>
@@ -212,7 +215,7 @@
       <!-- 推荐文章 -->
       <div class="modules xcontent2">
         <div class="xcontent2-main">
-          <div class="modules-title">
+          <div class="modules-title" style="margin-top:22px">
             <span class="modules-text">推荐文章</span>
             <span class="quyer-tag">
               <a :class="articleList.orderType == 2 ? 'current' : ''" @click="changeArticleOrder(2)">最热</a>
@@ -319,7 +322,7 @@
       <div class="modules xcontent2">
         <div class="xcontent2-main">
           <!--内容块-->
-          <div class="modules-title">
+          <div class="modules-title" style="margin-top:22px">
             <span class="modules-text">推荐问答</span>
             <span class="quyer-tag">
               <a :class="qaList.orderType == 'praises' ? 'current' : ''" @click="changeQaOrder('praises')">最热</a>
@@ -545,7 +548,7 @@
 
       },
       getAnkingData() { //  文章排行榜
-        apiIndex.articleViews(7).then(res => {
+        apiIndex.articleViews(10).then(res => {
           if (res.status == 200) {
             this.ankingList = res.result;
           }
@@ -1227,13 +1230,19 @@
 
       .case-inter {
         position: absolute;
-        // left: 30px;
-        // bottom: 30px;
-        display: flex;
-        // ::v-deep .el-avatar--small{
-        //    width: 32px;
-        //    height: 32px;
-        // }
+         width: 100%;
+        .case-inter-box{
+          display: flex;
+        margin-right: 35px;
+
+      .case-inter-left{
+          flex: 1;
+        }
+        .interact-bar-index{
+          margin-left: auto;
+        }
+        }
+
       }
 
       .case-top {

From d80acb4ca55ac994f01be049fc3f67eb7170a635 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 13 Oct 2022 17:27:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/article/Index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue
index 109e490b..55121590 100644
--- a/src/views/portal/article/Index.vue
+++ b/src/views/portal/article/Index.vue
@@ -48,7 +48,7 @@
                           <author :avatar="article.authorInfo.avatar" :name="article.sysCreateBy" :sex="article.authorInfo.sex" :aid="article.authorInfo.aid"></author>
                         </div>
                         <div style="">
-                          <interactBar nodeWidth="60px" :readonly="true" :type="2" :data="article" :views="false"></interactBar>
+                          <interactBar nodeWidth="60px" :readonly="true" :type="2" :data="article" :shares="false" :views="false"></interactBar>
                         </div>
                         <!-- <author :avatar="article.authorInfo.avatar" :name="article.sysCreateBy" :info="article.authorInfo.orgInfo"></author> -->
                     </div>

From fe59f104a5a1f6cea9a7a3dcda6bdaff97458d8a Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 13 Oct 2022 18:30:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4@=E6=88=91=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/article/contactMine.vue | 105 +++++++++++++++++++-----------
 1 file changed, 68 insertions(+), 37 deletions(-)

diff --git a/src/views/article/contactMine.vue b/src/views/article/contactMine.vue
index 65e14973..66cac92d 100644
--- a/src/views/article/contactMine.vue
+++ b/src/views/article/contactMine.vue
@@ -5,57 +5,63 @@
         <li>假如我回复了难道不该显示回复内容吗？</li>
       </ul>
     </Remark>
-
-    <div style="padding: 10px 22px 10px 23px;">
+     
+    <!-- <div style="padding: 10px 22px 10px 23px;">
       <el-select v-model="dataList.type" style="margin-right: 10px" placeholder="类型">
       <el-option label="全部" :value="null"></el-option>
       <el-option label="文章" :value="2"></el-option>
-      <!-- <el-option label="课程" :value="1"></el-option> -->
       <el-option label="案例" :value="3"></el-option>
       <el-option label="问答" :value="4"></el-option>
       </el-select>
-    <!-- <el-input style="width: 200px;margin-right: 10px" placeholder="请选择来源"></el-input> -->
-    <!-- 问题： -->
     <el-input style="width: 200px;margin-right: 10px" v-model="dataList.send" clearable placeholder="搜索人员姓名标题"></el-input>
-    <!-- 提问人：
-    <el-input style="width: 200px;margin-right: 10px"></el-input> -->
+    
     <el-button type="primary" @click="getList" icon="el-icon-search">搜索</el-button>
     <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
 
-    </div>
-
-
+    </div> -->
+   <div style="padding: 10px 22px 10px 23px;">
+      <span class="title">@我的</span>
+   </div>
     <div class="article-list" v-for="(item, idx) in dataList.list" :key="idx" @click="jump(item)">
       <div class="article-info">
+        <div class="hear">
+                <span class="hear-left">
+                   {{item.sysCreateBy}}@我
+                </span>
+                <span class="hear-right">
+                    {{item.sysCreateTime}}
+                </span>
+            </div>
         <div class="article-info-title">
-          <div style="line-height: 30px;" class="one-line-ellipsis">
+           
+            
+          <div  class="one-line-ellipsis tit-left">
+            
              <span class="article-type">【{{ filterObjType(item.objType) }}】</span>
             <!-- <span v-if="item.isread" style="padding: 3px;border: 1px dotted #1EA0FA;color: #1EA0FA;">已读</span>
             <span v-else style="padding: 3px;border: 1px dotted #ff0000;color: #ff0000;">未读</span> -->
             {{ item.title }}
           </div>
+           <div class="bj-post">
+             <img src="../../../public/images/replyimg.png" alt="">
+              <el-button class="bianji" type="text" style="color: #999999;font-size: 12px;" :disabled="item.disabled" @click.stop="replay(item)">回复</el-button>
+            </div>
         </div>
 
         <div class="article-info-tools">
           <div class="article-info-tools-auth">
            <div class="two-line-ellipsis">
-              <span style="font-size: 16px; color: #666666; line-height:30px">
-              <!-- <i class="el-icon-time"> -->
-               {{item.sysCreateBy}}@我
-            </span>
-             <span style="margin-left:5px; font-size: 16px; color: #666666; line-height:25px ">
+             <!-- <span style="margin-left:5px; font-size: 16px; color: #666666; line-height:25px ">
                 {{ item.content }}
-             </span>
+             </span> -->
            </div>
             <!-- <el-button type="primary" v-if="!item.isread" size="mini">标记已读</el-button> -->
           </div>
           <div style="margin-top:10px; position: relative;">
               <div>
-              <span style="font-size: 14px; color: #999; ">{{item.sysCreateTime}}</span>
-            </div>
-            <div class="bj-post" >
-              <el-button class="bianji" type="text" style="margin-left: auto" :disabled="item.disabled" icon="el-icon-chat-dot-round" @click.stop="replay(item)">回复</el-button>
+              <!-- <span style="font-size: 14px; color: #999; ">{{item.sysCreateTime}}</span> -->
             </div>
+           
           </div>
            
           <div class="article-info-tools-btns">
@@ -342,6 +348,29 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.hear{
+  width: 100%;
+  display: flex;
+  margin-bottom: 20px;
+  .hear-left{
+    flex: 1;
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+  }
+  .hear-right{
+    margin-left: auto;
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+
+  }
+}
+.title{
+  font-size: 18px;
+  font-weight: 600;
+  color: #333333;
+}
 .one-line-ellipsis{
   display: -webkit-box;
   white-space:pre-wrap;
@@ -363,20 +392,25 @@ export default {
 
 }
 .bj-post{
-  position: absolute;
-  right:0px;
-  top: -7px;
-  // top: 70%;
+  margin-left: auto;
+  img{
+    width: 18px;
+    height: 18px;
+    vertical-align: middle;
+    margin-right: 10px;
+  }
+}
+.tit-left{
+  flex: 1;
 }
 .bianji{
   color: #8590A6;
   font-size: 14px;
 }
 .article-type{
-   color: #3E7FFF;
-   font-size: 18px;
-
-
+   font-size: 16px;
+   font-weight: 600;
+   color: #333333;
 }
 .el-pagination {
   text-align: center;
@@ -397,24 +431,21 @@ export default {
   color: #ff0000;
 }
 .article-list {
-  // margin: 5px 0;
   cursor: pointer;
-  padding-bottom: 20px;
+  // padding-bottom: 20px;
   padding-top: 15px;
   border-bottom: 1px solid #E8E8E8;
-  margin: 0px 19px 0px 19px;
+  margin: 0px 20px 0px 20px;
  
 }
 
 .article-info {
-  // height: 110px;
   .article-info-title {
-    font-size: 18px;
-    font-weight: 400;
+    display: flex;
+    font-size: 16px;
+    font-weight: 600;
     margin-left: -7px;
-    // height: 40px;
     color: #333;
-
     line-height: 40px;
     .article-info-date {
       // height: 40px;

From cf85fe4402180dd9fe49210bf5e053f1c151386a Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 13 Oct 2022 18:30:53 +0800
Subject: [PATCH 4/4] =?UTF-8?q?@=E6=88=91=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/replyimg.png | Bin 0 -> 410 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 public/images/replyimg.png

diff --git a/public/images/replyimg.png b/public/images/replyimg.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc6569df98883761d766aa573258a1fed8eb63a4
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$R7pfZR5(wylfOy>K@i5jnQ(;!OoTi@Dhs&>P&g3OC-5PTG-q#@F4ltFpH~nq
zV`BuZOlKv*2aps2F@?hAZbmkLFoC$-p-#8E-~M*K*%<<WBuTbKq@$`w05;8Dffy6f
zEi<3`zW+i7lIQs&5p5Asf&1SQRfVd)RVtNTilXQWz;Ri~0%u?Vt|<(|cV;eXXKltJ
zGBzM(<`qG`UWem2R-2>I$k>`{L<DO=p68*_XjnnrZWn2q+Cil%Zp-M;K+R?o)oRts
z8w>`>^W1LDbzRhIH7ls!?<32y|EbXjGjEiw%d%cXKF#;{i0I%qovo^OW<>T>^`3~F
zvatEAO^9fJI;Bw*9jfX%Gw+!7Tu{XAGZCG%TCLv7xW{ok>-kxjmts}DSVv6LbQ}c1
z>*DMu(37g34Tr<acDpS_Qd<EfN%8=o<NN+ik;}`PFG}6B%wK_7mjD0&07*qoM6N<$
Eg3d&@6aWAK

literal 0
HcmV?d00001