提交

src/components/Course/myNote.vue

@@ -439,13 +439,13 @@ export default {
     }
 
     .newcote-time {
-        width: 80px;
+        display: inline-block;
+        min-width: 80px;
         height: 30px;
         border-radius: 4px;
         border: 1px solid #3379FB;
         font-size: 14px;
-        color: #387DF7;
+        color: #387DF7;;
-        ;
         text-align: center;
         line-height: 28px;
         margin-bottom: 12px;

src/components/HomePage/caseList.vue

@@ -37,11 +37,12 @@
                         <div v-if="item.info.keyword5">{{ item.info.keyword5 }}</div>
                       </div>
                  </router-link>
-                    <div class="case-info-summary">
+                    <div class="case-info-summary two-line-ellipsis">
-                          {{displayAll(item)}}
+                      {{item.info.summary}}
+                          <!-- {{displayAll(item)}}
                           <span style="color:#588afc;cursor:pointer;" v-if="item.info.summary && item.info.summary.length>180" @click.stop="changeIsAll(item)">
                               {{item.isAll?'收起':'展开'}}
-                          </span>
+                          </span> -->
                     </div>
                     <div style="display: flex;justify-content: flex-end;">
                      <div style="margin:8px 0;">

src/components/HomePage/homePage.vue

@@ -19,8 +19,8 @@
                      <span style="color: #A3680A;margin-left:12px;line-height: 24px;">经验值：{{statData.evalue}}</span>
                  </div>
                  <el-button round plain class="btn-user" size="small" v-if="pageId != userInfo.aid && !isFollowHas" @click="toFollow()">关注TA</el-button>
-                 <el-button round plain class="btn-user" size="small" v-if="isFollowHas">已关注</el-button>
+                 <el-button round plain class="btn-user" size="small" @click="cancelFollow()" v-if="isFollowHas">已关注</el-button>
-                 <el-button round plain class="btn-user" size="small"><router-link :to="'/home/'+pageId+'/leaving'">去留言</router-link></el-button>
+                 <el-button round plain class="btn-user" size="small"><router-link :to="'/home/'+pageId+'/leaving'">{{pageId == userInfo.aid ? '留言板':'去留言'}}</router-link></el-button>
               </div>
               <div class="content-bottom">
                 <p class="portal-summary-text">{{userData.sign}}</p>
@@ -115,6 +115,15 @@
         }
       },
       methods:{
+        cancelFollow() {
+          apiFollow.remove(this.pageId).then(res=>{
+            if(res.status == 200) {
+               this.isFollowHas = false;
+            } else {
+              this.$message.error(res.message);
+            }
+          })
+        },
         loadUserStat(){//获取经验值和等级
             apiUser.getByIds([this.pageId]).then(res => {
                 if (res.status == 200) {

src/components/Portal/authorImg.vue

@@ -35,7 +35,7 @@
 	  	default:''
 	  },
     noJump:{
-      type:Number,
+      type:Boolean,
 			default: true
     }
 		},

src/components/Portal/comments.vue

@@ -12,7 +12,7 @@
           <div class="comments-top-left portal-title-tow" style="font-size: 18px;"> <span v-if="objType ==3">案例评论</span> <span v-if="objType ==2">文章评论</span>
               <el-checkbox v-if="objType ==2" class="btn" v-model="value" type="primary">只看作者</el-checkbox>
               <el-checkbox v-if="objType ==3" class="btn" v-model="value" type="primary">{{'只看案主'}}</el-checkbox>
-              <span v-if="objType ==3" class="anzhu"> @案主</span>
+              <span v-if="objType ==3" class="anzhu">@案主可以给他发私信哦</span>
           </div>
       </div>
       <div class="comments-input" v-if="!readonly">

src/components/Portal/noteComment.vue

@@ -63,7 +63,7 @@
                                       </div>
                                       <div class="comment-time portal-time">
                                        <showTime :time="reply.sysCreateTime"></showTime>
-                                       <interactBar :type="10" :shares="false"  :data="reply" @addAnswers="showReply(reply)" :views="false"  :comments="false" :answers="true"></interactBar>
+                                       <interactBar :type="60" :shares="false"  :data="reply" @addAnswers="showReply(reply)" :views="false"  :comments="false" :answers="true"></interactBar>
                                       </div>
                                   </div>
                                   <!--发布回复-->

src/views/study/coursenew.vue

@@ -196,8 +196,8 @@
                 <div class="teacher-remark" v-html="item.authorInfo.sign"></div>
               </div>
               <div style="padding-top:15px">
-                <el-button v-if="current_teacher_follow" type="primary" @click="toFollow(item)" size="small">已关注</el-button>
+                <el-button v-if="current_teacher_follow" v-loading="loading" type="primary" @click="cancelFollow(item)" size="small">已关注</el-button>
-                <el-button v-if="!current_teacher_follow" type="primary" @click="toFollow(item)" size="small">+ 关注</el-button>
+                <el-button v-if="!current_teacher_follow" v-loading="loading" type="primary" @click="toFollow(item)" size="small">+ 关注</el-button>
               </div>
             </div>
           </div>
@@ -268,6 +268,7 @@
     },
     data() {
       return {
+        loading:false,
         controlHeight:400,//左边控制区域的内容高度
         timer: '',
         notePlay: null,
@@ -422,9 +423,23 @@
           }, 1000*60);
 
       },
+      // 取消关注
+      cancelFollow(item) {
+        this.loading = true;
+          apiFollow.remove(item.teacherId).then(res=>{
+            this.loading = false;
+            if(res.status == 200) {
+              this.current_teacher_follow = false;
+            } else {
+              this.$message.error(res.message);
+            }
+          })
+        },
       //关注功能
       toFollow(item) {
+        this.loading = true;
         apiFollow.save(item.teacherId).then(res => {
+          this.loading = false;
           if (res.status == 200) {
             this.$message.success("关注成功！");
             this.current_teacher_follow = true;