From 2ddfcf1a45e4c5f6586a71fa77a06a2abd2f0314 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 11 Oct 2022 17:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Case/collectList.vue   |  40 ++++++---
 src/components/Course/collectItem.vue | 121 ++++++++++++++++----------
 src/views/article/MyList.vue          |   6 +-
 3 files changed, 109 insertions(+), 58 deletions(-)

diff --git a/src/components/Case/collectList.vue b/src/components/Case/collectList.vue
index 72e9f238..830df179 100644
--- a/src/components/Case/collectList.vue
+++ b/src/components/Case/collectList.vue
@@ -3,23 +3,28 @@
     <div class="article-list" v-for="(item,idx) in items" :key="idx">
       <div class="article-info ">
         <div class="article-info-title " >
-          <div style="width:85%" class="title-line-ellipsis">
-          <router-link :to="'/case/detail?id='+item.cases.id"  >{{item.cases.title}}</router-link>
-            
+          <div style="width:85%" class=" ">
+          <router-link :to="'/case/detail?id='+item.cases.id"  ><div class="case-tit title-line-ellipsis">{{item.cases.title}} <span class="bq-case">#案例#</span> </div>  </router-link>
+          
           </div>
           <div class="article-info-date">
             <el-button @click="delItem(item)" type="text" style="color: #8590A6" icon="el-icon-remove">取消收藏</el-button>
           </div>
         </div>
+        <div class="article-info-tools">
+          <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"></authorInfo>
+          <!-- <span style="margin-top:2px">发布时间：{{ item.cases.sysCreateTime || item.publishTime | timeFilter }}</span> -->
+          <!-- <span style="margin-top:2px">收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span> -->
+          <!-- <interactBar :type="0" :data="item.cases" :shares="false" :views="false"></interactBar> -->
+        </div>
         <div class="article-info-summary three-line-ellipsis">
          <router-link :to="'/case/detail?id='+item.cases.id"  > {{item.cases.summary}}</router-link>
         </div>
-        <div class="article-info-tools">
-          <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"></authorInfo>
-          <span style="margin-top:2px">发布时间：{{ item.cases.sysCreateTime || item.publishTime | timeFilter }}</span>
-          <span style="margin-top:2px">收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span>
-          <!-- <interactBar :type="0" :data="item.cases" :shares="false" :views="false"></interactBar> -->
+        <div>
+            <interactBar   :type="3" :readonly="true" :data="items" :views="false" :shares="false"></interactBar>
+           
         </div>
+       
       </div>
     </div>
   </div>
@@ -27,7 +32,7 @@
 
 <script>
   import authorInfo from '@/components/Portal/authorInfo.vue';
-  import interactBar from '@/components/Portal/interactBar.vue'
+  import interactBar from '@/components/Portal/interactBar.vue';
   export default {
     name: 'articleItems',
     props: {
@@ -61,6 +66,17 @@
 </script>
 
 <style lang="scss" scoped>
+.case-tit{
+  color: #333333;
+  font-size: 18px;
+  font-weight: 600;
+}
+.bq-case{
+  font-size: 16px;
+  color: #333333;
+  font-weight: normal;
+  margin-left: 5px;
+}
 .title-line-ellipsis{
    display: -webkit-box;
    overflow: hidden;
@@ -99,6 +115,7 @@
     margin: 5px 0;
     border-bottom: 1px solid #dddddd;
     padding: 0px;
+    padding-bottom: 25px;
   }
 
   .article-info {
@@ -123,9 +140,10 @@
       }
     }
     .article-info-summary {
-     
+     color: #333330;
+     font-size: 14px;
      line-height: 25px;
-      color: #999999;
+     margin-bottom: 15px;
     }
     .article-info-tools {
       height: 45px;
diff --git a/src/components/Course/collectItem.vue b/src/components/Course/collectItem.vue
index 05c9af80..7d1acc29 100644
--- a/src/components/Course/collectItem.vue
+++ b/src/components/Course/collectItem.vue
@@ -2,23 +2,30 @@
   <div style="cursor: pointer;">
     <div class="uc-course" v-for="(item, idx) in items" :key="idx" @click="coudetail(item)">
 
-      <div class="uc-course-img" style="width: 212px;height: 119px;" @click="jump(item)">
+      <div class="uc-course-img" style="width: 212px;height: 119px;margin-right:23px;" @click="jump(item)">
         <course-image :course="item"></course-image>
-        <!-- <img :src="imageUrl(item)" /><span v-if="isShow" class="two-line-ellipsis">{{item.title}}</span> -->
+        <span class="course-type">{{ contentTypeFilter(item.contentType).text }}</span>
       </div>
       <div class="flex-between" @click="jump(item)">
-        <div class="uc-course-name one-line-ellipsis">
-          <span :class="contentTypeFilter(item.contentType).class">{{ contentTypeFilter(item.contentType).text }}</span>
-          <span>{{ item.title }}</span>
-        </div>
-        <div class="uc-course-text">讲师：{{ item.authorName}}</div>
-        <div class="uc-course-text">收藏时间：{{ item.time || item.favoritesTime}}</div>
-      </div>
-     <div class="flex-between">
-        <el-button v-if="remove" @click.stop="delItem(item)" type="text" icon="el-icon-remove" style="color:#8590A6;font-size:14px;">
+        <div class="uc-course-name ">
+          <div class="uc-coures-name-left  one-line-ellipsis">
+            <span >{{ item.title }} <span class="bq-coures">#课程#</span> </span>
+          </div>
+        <div class="canfavo">
+        <el-button v-if="remove" @click.stop="delItem(item)" type="text" icon="el-icon-star-on" style="color:#8590A6;">
           取消收藏
         </el-button>
       </div>
+        </div>
+        <div class="uc-bpttom">
+          <div class="uc-course-text"> <i class="el-icon-time"></i> 报名时间：{{ item.time || item.favoritesTime}}</div>
+        <div class="uc-coures-button">
+         <el-button type="primary">去上课</el-button>
+        </div>
+        </div>
+        
+      </div>
+    
       <!-- <div class="uc-course-info">
         <div style="display: flex;justify-content: space-between;">
           <router-link target="_blank" :to="'/course/detail?id='+item.objId" class="uc-course-name">
@@ -137,6 +144,46 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.bq-coures{
+  font-size: 16px;
+  color: #333333;
+  margin-left: 5px;
+}
+.uc-bpttom{
+  display: flex;
+  .uc-coures-button{
+    margin-left: auto;
+    margin-top: 55px;
+  }
+}
+.uc-course-text{
+  flex: 1;
+  font-size: 14px;
+  color: #666666;
+  margin-top: 70px;
+}
+  .course-type {
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        width: 60px;
+        height: 24px;
+        line-height: 24px;
+        text-align: center;
+        background-color: #f99000;
+        border-radius: 2px 4px 0px 14px;
+        font-size: 12px;
+        color: #ffffff;
+        -moz-user-select: none;
+        /*火狐*/
+        -webkit-user-select: none;
+        /*webkit浏览器*/
+        -ms-user-select: none;
+        /*IE10*/
+        -khtml-user-select: none;
+        /*早期浏览器*/
+        user-select: none;
+      }
 .one-line-ellipsis{
   display: -webkit-box;
 
@@ -157,26 +204,7 @@ export default {
   padding-left: 0px;
   padding-bottom: 20px;
   padding-top: 15px;
-  // margin-bottom: 10px;
-  // margin-left: 10px;
-  .flex-between {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    margin-left: 10px;
-    .uc-course-text {
-      color: #747474;
-      margin-right: 20px;
-    }
-    &:last-of-type{
-      margin-left: auto;
-      justify-content: flex-end;
-    }
-    // &:last-of-type {
-
-    //   align-items: flex-start;
-    // }
-  }
+  
   .uc-course-img {
     position: relative;
    ::v-deep img {
@@ -184,21 +212,26 @@ export default {
       height: 119px;
       border: 1px solid #f4f4f5;
     }
-    > span {
-      position: absolute;
-      top: 30px;
-      left: 10px;
-      width: 100%;
-      height: 100%;
-      color: #ffffff;
-      font-size: 16px;
-    }
+   
+  }
+  .flex-between{
+    flex: 1;
   }
   .uc-course-name {
-    font-size: 16px;
-    font-weight: 400;
-    > span:last-of-type {
-      margin-left: 8px;
+    display: flex;
+    width: 100%;
+    line-height: 30px;
+    height: 30px;
+    .uc-coures-name-left{
+     flex: 1;
+    }
+    .canfavo{
+      margin-left:auto;
+      width: 100px;
+      button{
+        font-size: 12px;
+
+      }
     }
   }
 }
diff --git a/src/views/article/MyList.vue b/src/views/article/MyList.vue
index ffc9fd6a..265f9638 100644
--- a/src/views/article/MyList.vue
+++ b/src/views/article/MyList.vue
@@ -15,6 +15,7 @@
         <div style="display: flex;justify-content:space-around;padding: 12px 22px 10px 17px;">
           <!-- <div style="padding: 0px 5px;"><el-cascader clearable v-model="params.type" :options="typeList"></el-cascader></div> -->
           <div style="padding: 0px 5px;">
+            <span style="font-size: 18px;color: #333333;font-weight: 600;margin-right:30px" >我的文章</span>
             <el-select v-model="pageData.status" placeholder="状态" style="width: 110px;" clearable>
               <el-option v-for="item in selectData" :label="item.label" :value="item.value" :key="item.value"></el-option>
               <!-- <el-option label="草稿" :value='0'></el-option>
@@ -28,10 +29,9 @@
            <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button></div>
         </div>
       </div>
-      <div style="padding:12px 20px; " class="write">
-        <!-- <a :href="`${webBaseUrl}/article/add`" target="_blank"><el-button type="primary" icon="el-icon-plus" >写文章</el-button></a> -->
+      <!-- <div style="padding:12px 20px; " class="write">
 		<el-button type="primary" @click="diagSync=true" icon="el-icon-plus" >写文章</el-button>
-      </div>
+      </div> -->
     </div>
     <div style="padding: 10px 19px 0px 22px;">
       <article-items @update="getArticleList" :items="pageData.list" v-if="pageData.list.length!=0"></article-items>