From ec6df211be3061969fc2916dc5a80890b0f0cff5 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 31 Oct 2022 12:10:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A1=88=E4=BE=8B=EF=BC=8C?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=8C=E5=AF=B9=E9=BD=90=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E5=8D=95=E7=8B=AC=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/portal-index.scss   | 14 ++++---
 src/components/Portal/interactBar.vue | 10 +++--
 src/views/study/coursenew.vue         | 56 +++++++++++++++++++++++++--
 3 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss
index 2452d500..26c26f48 100644
--- a/src/assets/styles/portal-index.scss
+++ b/src/assets/styles/portal-index.scss
@@ -987,9 +987,10 @@
   .case-inter-orgin{
     width: 60%;
   }
-  .interact-bar-btns{
-    line-height: 30px;
-  }
+  //以下不是在这里加，应该是在首页加的
+  // .interact-bar-btns{
+  //   line-height: 30px;
+  // }
   .portal-input{
     width: 290px;
   }
@@ -1245,9 +1246,10 @@
   .case-inter-orgin{
     width: 60%;
   }
-  .interact-bar-btns{
-    line-height: 30px;
-  }
+  //不能在这里加
+  // .interact-bar-btns{
+  //   line-height: 30px;
+  // }
   .btn-user{
     width: 80px;
   }
diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue
index bbe2a4d7..992536f8 100644
--- a/src/components/Portal/interactBar.vue
+++ b/src/components/Portal/interactBar.vue
@@ -38,13 +38,13 @@
       <div v-if="favorites"  @click="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
-          <svg-icon v-else style="font-size: 14px;margin-right: 0;" :icon-class="isFavorite?'collected':'collection'"></svg-icon>
+          <svg-icon v-else style="margin-right: 0;" :style="{'font-size':size+'px'}" :icon-class="isFavorite?'collected':'collection'"></svg-icon>
         </el-tooltip>
         <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
       </div>
       <div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon icon-class="share" style="margin-right: 0;font-size: 16px;"></svg-icon>
+          <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{data.shares}}</span>
       </div>
@@ -108,6 +108,10 @@ export default {
           }
       }
     },
+    size:{
+      type:Number,
+      default:14
+    },
     nodeWidth:{
       type:String,
       default:'40px'
@@ -271,7 +275,7 @@ export default {
         } else {
           content=sendName+typeText+content+'-'+title
         }
-      
+
       let message={
         content,
         refId,
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 430f0a3a..e85c24bc 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -11,8 +11,10 @@
         <div class="bcourse-title">
           <span>{{courseInfo.name}}</span>
           <!-- <span>{{courseInfo.summary}}</span>  -->
+          <!--
           <span class="bcourse-score" v-if="courseInfo.score>0">{{toScore(courseInfo.score)}} 分</span>
           <span class="bcourse-score" v-else>无评分</span>
+          -->
         </div>
       </div>
     </div>
@@ -104,6 +106,52 @@
               </assess>
             </div>
           </div>
+          <!--交互部分-->
+          <div>
+            <div class="course-interact">
+              <div class="score" style="display: flex;">
+                <div v-if="!scoreInfo.has" style="margin-left:10px;cursor: pointer;padding-top:18px">
+                  <!-- <el-popover placement="top" width="300" trigger="hover"> -->
+                    <!-- <div style="text-align:center;line-height:50px;padding:20px 0px">
+
+                      <div style="padding-top:30px"><el-button @click="addScore">提交评分</el-button></div>
+                    </div> -->
+                      <el-rate v-model="scoreInfo.score" @change="addScore"></el-rate>
+                    <!-- <el-tag class="ref-score" slot="reference">去评分</el-tag> -->
+                  <!-- </el-popover> -->
+                </div>
+                <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
+                   <div style="padding-top: 16px;">
+                    <el-rate disabled v-model="courseInfo.score" :allow-half="true" ></el-rate>
+                  </div>
+                  <div>
+                        <span class="score-text">{{ toScore(courseInfo.score) }}</span>
+                        <span style="font-size: 18px;">分</span>
+                  </div>
+                </div>
+              </div>
+              <div style="display: flex;justify-content: flex-end;cursor: pointer;padding-top: 5px;">
+                <div @click="praiseContent">
+                  <el-tooltip class="item" effect="light" :content="isPraise?'取消点赞':'点赞'" placement="top-start" :visible-arrow="false" popper-class="text-tooltip">
+                    <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
+                    <img class="icon-small" v-else :src="require('@/assets/images/icon/praise.png')" />
+                  </el-tooltip>
+                  {{ courseInfo.praises }}
+                </div>
+                <div style="margin-left: 20px;" @click="treadContent">
+                 <el-tooltip class="item" effect="light" :content="isTrample?'取消踩':'踩'" placement="top-start" :visible-arrow="false" popper-class="text-tooltip">
+                  <img class="icon-small" v-if="isTrample" :src="require('@/assets/images/icon/trample-active.png')" />
+                  <img class="icon-small" v-else :src="require('@/assets/images/icon/trample.png')" />
+                 </el-tooltip>
+                  {{ courseInfo.trampleCount }}
+                </div>
+                <div style="margin-left: 6px;">
+                    <interactBar :size="16" :type="1" :aid="courseInfo.sysCreateAid" :data="courseInfo" :praises="false" :favorites="true" :shares="true" :comments="false" :views="false"></interactBar>
+                </div>
+              </div>
+            </div>
+
+          </div>
         </div>
         <div class="course-control">
             <div class="control-tab" v-if="contentList.length>0" >
@@ -1551,7 +1599,7 @@
   }
 
   .score-text {
-    font-size: 28px;
+    font-size: 18px;
     color: #ffb30f;
     font-family: 'Arial';
     margin-left: 23px;
@@ -1618,9 +1666,9 @@
   }
 
   .icon-small {
-    width: 20px;
-    height: 20px;
-    line-height: 20px;
+    width: 16px;
+    height: 16px;
+    line-height: 16px;
     vertical-align: middle;
   }