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

src/components/Portal/comments.vue

@@ -195,7 +195,7 @@
                              <el-input show-word-limit class="hideControl" type="textarea" v-model="replyInfo.content"  maxlength="100" placeholder="回复内容..."></el-input>
                            </div>
                            <div style="width: 120px;display: flex;justify-content: flex-end;">
-                             <el-button @click="submitDlgReply(com)" type="primary">发布1回复</el-button>
+                             <el-button @click="submitDlgReply(com)" type="primary">发布回复</el-button>
                            </div>
                          </div>
                        </div>

src/components/Portal/interactBar.vue

@@ -7,7 +7,7 @@
     </div>
     <div v-show="theme==1" class="interact-bar-btns" :style="{'justify-content':showAlign}">
       <div v-if="answers" @click="addAnswers()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly || clickAnswer}">
-        <el-tooltip  effect="light" content="回答" placement="left" :visible-arrow="false" popper-class="text-tooltip">
+        <el-tooltip  effect="light" :content="type == 4 || type == 5 ?'回答':'回复'" placement="left" :visible-arrow="false" popper-class="text-tooltip">
           <!-- <svg-icon style="margin-right: 0;"  icon-class="comment"></svg-icon> -->
          <!-- <img style="width:16px;height:14px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')"> -->
          <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>

src/views/study/coursenew.vue

@@ -189,7 +189,7 @@
               <div class="teacher-info">
                 <div class="teacher-name">
                     <span> {{ item.teacherName }}</span>
-                    <span style="font-size: 12px; color:#666666 ;">( {{item.authorInfo.orgInfo}} )</span>
+                    <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span>
                 </div>
                 <div class="teacher-remark" v-html="item.authorInfo.sign"></div>
               </div>
@@ -235,6 +235,7 @@
     courseType,
     getType,
     toScore,
+    cutOrgNamePath,
     userAvatarText
   } from '@/utils/tools.js';
   import pdfPreview from '@/components/PdfPreview/index.vue';
@@ -266,6 +267,7 @@
     },
     data() {
       return {
+        cutOrgNamePath,
         loading:false,
         controlHeight:400,//左边控制区域的内容高度
         timer: '',

src/views/user/Setting.vue

@@ -5,7 +5,12 @@
       <el-avatar :src="avatar" :size="116" alt=""></el-avatar>
       <!-- <span>{{userInfo.name}}</span> -->
       <!-- <el-button type="primary" @click="openAvatar">修改头像</el-button> -->
+      <div @click="openAvatar" class="avatarhover">
+       <img :src="`${webBaseUrl}/images/phone.png`" alt="">
+       <h6>修改头像</h6>
     </div>
+    </div>
+    
     <!-- <el-form :model="form" label-position="right" label-width="80px"> -->
       <div class="informationItem">
         <div class="information-header">
@@ -410,7 +415,35 @@
 </script>
 
 <style lang="scss" scoped>
-
+.avatarhover{
+  width: 116px;
+   height: 116px;
+  background-color: rgba(0, 0, 0, 0.4);
+   border-radius: 50%;
+   position: absolute;
+   cursor:pointer;
+   display: none;
+   left: 0%;
+   top:0px;
+   text-align: center;
+  img{
+   width: 42px;
+   height: 38px;
+   vertical-align: bottom;
+   margin-top: 22px;
+   margin-bottom: 5px;
+  }
+  h6{
+  font-size: 18px;
+  font-weight: 400;
+  color: #FFFFFF;
+  margin: 0px;
+  }
+  
+}
+.avatar:hover .avatarhover{
+  display: block;
+}
 ::v-deep .el-checkbox-button--medium .el-checkbox-button__inner{
   // padding: 10px 40px !important;
   width: 146px;
@@ -506,6 +539,8 @@
     // margin: 0 auto;
     position: relative;
     .avatar{
+      width: 116px;
+      height: 116px;
       position: absolute;
       cursor:pointer;
       left: 5%;