Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

src/assets/styles/index.scss

@@ -389,3 +389,4 @@ li{
       line-height: 50px;
     }
   }
+

src/assets/styles/portal-index.scss

@@ -351,7 +351,7 @@
 //   }
 .portal-images-title{
   vertical-align: top;
-  padding: 2px 12px;
+  // padding: 2px 12px;
   line-height: 24px;
   }
   /**滚动条的宽度*/
@@ -587,6 +587,8 @@
         }
       }
     .qa-top{
+        display: flex;
+        justify-content: space-between;
         & span:first-child{
         //   height: 24px;
           background: rgba($color: #387DF7, $alpha: 0.05);

src/assets/styles/uc.scss

@@ -97,3 +97,6 @@
 .uc-select{
    width: 125px;
 }
+.el-select-dropdown__item{
+  text-align: center;
+}

src/components/Portal/interactBar.vue

@@ -250,15 +250,21 @@ export default {
         if(this.type==5){
           content='回答'
         }
+        if(this.type==6){
+          content='课程笔记'
+        }
+        if(this.type==60){
+          content='课程笔记评论'
+        }
 // 点赞type
         if(this.type==10){
-          content='课程评论点赞'
+          content='课程评论'
         }
         if(this.type==20){
-          content='文章评论点赞'
+          content='文章评论'
         }
         if(this.type==30){
-          content='案例评论点赞'
+          content='案例评论'
         }
       content=sendName+typeText+content+'-'+title
       let message={

src/components/PortalHeader.vue

@@ -302,6 +302,14 @@ export default {
 </script>
 
 <style scoped rel="stylesheet/scss" lang="scss">
+::v-deep .el-dropdown-menu__item:not(.is-disabled):hover{
+    background-color: #fff !important;
+    color: #0059FF !important;
+}
+::v-deep.el-dropdown-menu {
+text-align: center;
+  border: none !important;
+}
   //定义消息的图标的样式，按ui，未完成
 .msg-icon{
   font-size:16px;

src/components/UcHeader/Index.vue

@@ -144,6 +144,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
 </script>
 
 <style lang="scss" scoped>
+
 .ranking-link{
   font-size: 16px;
   font-weight: 600;

src/layout/components/TopNav/Index.vue

@@ -251,6 +251,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-dropdown-menu__item:not(.is-disabled):hover{
+    background-color: #fff !important;
+    color: #0059FF !important;
+}
+::v-deep.el-dropdown-menu {
+text-align: center;
+  border: none !important;
+}
 ::v-deep .el-avatar{
       margin-right: 8px;
        img{

src/views/Index.vue

@@ -131,7 +131,7 @@
                 <span class="portal-right-text blue-one">
                   <img :src="getPic(index)" alt="">
                 </span>
-                <span class="portal-title-desc two-line-ellipsis title-line-ellipsis" style="font-size: 14px;">{{ item.name }}</span>
+                <span class="portal-title-desc two-line-ellipsis title-line-ellipsis" style="font-size: 14px;color: #04243C;">{{ item.name }}</span>
                   </a>
                 <div class="list-active">
                   <div class="list-content">
@@ -214,7 +214,7 @@
                 <span class="portal-right-text orange-one">
                   <img :src="getPic(index)" alt="">
                 </span>
-                <span class="portal-title-desc two-line-ellipsis" style="font-size: 14px;">{{ item.title }}</span>
+                <span class="portal-title-desc two-line-ellipsis" style="font-size: 14px;color: #04243C;line-height: 26px;">{{ item.title }}</span>
               </li>
             </ul>
           </div>

src/views/study/coursenew.vue

@@ -430,7 +430,7 @@
             this.current_teacher_follow = true;
           } else if(res.status == 400){
             this.$message.warning(res.message);
-            this.current_teacher_follow = true;
+            this.current_teacher_follow = false;
           }else{
             this.$message.error(res.message);
           }

src/views/user/Setting.vue

@@ -27,7 +27,7 @@
           <h4>个人签名</h4>
         </div>
         <div class="base-info">
-          <label class="label" style="width:70px;text-align: left;">我的签名</label>
+          <label class="label" style="min-width:70px;text-align: left;">我的签名</label>
           <p class="info-text" style="width:540px" v-show="!signData.isEdit">{{form.sign}}</p>
           <el-input v-show="signData.isEdit" style="width:40%;height:40px" type="textarea" v-model="signData.sign" :rows="1"></el-input>
           <el-button v-show="signData.isEdit" style="margin-left:110px" @click="signData.isEdit = false">取消</el-button>

src/views/user/ranking.vue

@@ -516,9 +516,9 @@ export default {
         background-color: #fff !important;
         color: #0059FF !important;
     }
-    ::v-deep.el-dropdown-menu {
+  ::v-deep.el-dropdown-menu {
-        border: none !important;
+      border: none !important;
-    }
+  }
   .page-ranking-col{
      min-width: 430px;
      //padding-right:30px;