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

src/components/Course/courseForm.vue

@@ -149,7 +149,7 @@
                 show-word-limit
                 :rows="3"
                 v-model="courseInfo.summary"
-                placeholder="请尽量填写课程简介(限255字以内)，用于列表中显示，可以让用户更容易了解课程信息">
+                placeholder="请尽量填写课程简介，用于列表中显示，可以让用户更容易了解课程信息">
               </el-input>
             </el-form-item>
           </el-col>
@@ -258,9 +258,9 @@
             <el-form-item label="目标人群" required>
               <el-input maxlength="50" v-model="courseInfo.forUsers" show-word-limit placeholder="目标人群(限50字以内)"></el-input>
             </el-form-item>
-            <el-form-item label="受众">
+            <el-form-item label="受众"><!--:disabled="item.disabled"-->
               <el-select value-key="key" style="width: 100%;" v-model="courseCrowds" filterable multiple  placeholder="请选择">
-                  <el-option v-for="item in userGroupList" :key="item.key" :label="item.value" :value="item"></el-option>
+                  <el-option v-for="item in userGroupList" :key="item.key"  :label="item.value" :value="item"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="课程价值"><el-input maxlength="200" v-model="courseInfo.value" show-word-limit placeholder="课程价值(限200字以内)"></el-input></el-form-item>
@@ -303,10 +303,10 @@
               <el-input
                 type="textarea"
                 show-word-limit
-                maxlength="150"
+                maxlength="255"
                 :rows="5"
                 v-model="courseInfo.summary"
-                placeholder="请尽量填写课程简介(限255字以内)，用于列表中显示，可以让用户更容易了解课程信息">
+                placeholder="请尽量填写课程简介，用于列表中显示，可以让用户更容易了解课程信息">
               </el-input>
             </el-form-item>
             <!-- v-if="!weike.onlyRequired" -->
@@ -843,14 +843,25 @@ export default {
           let crowdList=[];
           if(result.crowds && result.crowds.length>0){
               result.crowds.forEach(crowd=>{
-                crowdList.push({
+                let newCrowd={
                   key:crowd.groupId,
                   value:crowd.groupName,
+                  disabled:false,
                   text:''
-                })
+                }
+                crowdList.push(newCrowd);
+                let hasUG=$this.userGroupList.some(ug=>{
+                     return ug.key==crowd.groupId;
+                });
+                if(!hasUG){
+                   newCrowd.disabled=true;
+                   $this.userGroupList.push(newCrowd);
+                }
               });
           }
           this.courseCrowds=crowdList;
+          //反向看userGroupList是否有
+
           //课程图片
           if (this.courseInfo.coverImg != '') {
             this.courseCoverurl = this.fileUrl+this.courseInfo.coverImg;

src/components/HomePage/answerList.vue

@@ -2,7 +2,7 @@
     <div class="answer-list">
         <ul v-if="list.length > 0">
             <li class="answer-list-index" v-for="item in list" :key="item.id">
-                <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px">
+                <p  class="portal-summary-text" style="margin-bottom:18px">
                     <span v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}<span style="margin-left:28px">{{item.eventTime}}</span>
                     <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">
                         <span v-if="item.hidden">已隐藏</span>

src/components/HomePage/articleList.vue

@@ -2,7 +2,7 @@
     <div class="article-list">
         <ul v-if="list.length > 0">
             <li class="article-list-index" v-for="item in list" :key="item.id">
-                <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px">
+                <p class="portal-summary-text" style="margin-bottom:18px">
                     <span v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}
                     <span style="margin-left:28px">{{item.eventTime}}</span>
                     <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right" >

src/components/HomePage/caseList.vue

@@ -3,7 +3,7 @@
       <div class="data-content" v-if="list.length >0">
               <div :span="24" v-for="item in list" :key="item.id" class="case-list">
                 <div class="case-info">
-                  <p v-if="isDynamic" class="portal-summary-text">
+                  <p  class="portal-summary-text">
                     <span v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}
                     <span style="margin-left:28px">{{item.eventTime}}</span>
                     <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">

src/components/HomePage/courseList.vue

@@ -2,7 +2,7 @@
     <div class="">
       <ul class="data-info-ul" v-if="list.length > 0">
         <li class="data-info" v-for="item in list" :key="item.id">
-          <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px">
+          <p  class="portal-summary-text" style="margin-bottom:18px">
             <span v-if="!personal || isFollow">{{item.aname}}</span>
             {{item.cusInfo}}  <span style="margin-left:28px">{{item.eventTime}}</span>
            <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right" >

src/components/HomePage/noteList.vue

@@ -2,7 +2,7 @@
     <div class="note-list">
         <ul v-if="list.length > 0">
             <li class="note-list-index" v-for="item in list" :key="item.id">
-                <p v-if="isDynamic" style="word-break:break-all;word-wrap:break-word;margin-bottom:18px" class="portal-summary-text">
+                <p style="word-break:break-all;word-wrap:break-word;margin-bottom:18px" class="portal-summary-text">
                   <span style="word-break:break-all;word-wrap:break-word;margin-bottom:18px" v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}
                   <span style="margin-left:28px">{{item.eventTime}}</span>
                   <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">

src/components/HomePage/putTo.vue

@@ -2,7 +2,7 @@
     <div class="put-list">
         <ul v-if="list.length > 0">
             <li class="put-list-index" v-for="item in list" :key="item.id">
-                <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px;margin-top:10px">
+                <p class="portal-summary-text" style="margin-bottom:18px;margin-top:10px">
                     <span v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}
                     <span style="margin-left:28px">{{item.eventTime}}</span>
                     <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">

src/views/homepage/leavingMessage.vue

@@ -40,10 +40,15 @@
                             <p>{{rep.content}}</p>
                         </div>
                         <div class="li-right">
+                           <div class="replys-icon" @click="showReplyInput(rep, idx)"><svg-icon style="margin-right: 4px;font-size: 14px;" icon-class="comment"></svg-icon>回复</div>
                           <!-- <interactBar :type="7" :data="rep" :comments="false" :shares="false" :views="false" :favorites="false"></interactBar> -->
                           <div class="replys-icon" style="margin-right:0px;margin-left:10px"  v-if="userInfo.aid == item.sysCreateAid" @click="delReplySon(item,index)"><svg-icon icon-class="notedel" style="margin-right: 4px;font-size: 14px;"></svg-icon>删除</div>
                         </div>
                     </div>
+                    <div class="replys-input" style="padding-left: 60px;margin:10px 0" v-if="rep.isReplys">
+                      <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="replysContent" maxlength="200" show-word-limit></el-input>
+                      <el-button class="lea-btn" type="primary" @click="addReplys(item,rep)">回复</el-button>
+                    </div>
                 </div>
 
             </li>
@@ -137,7 +142,25 @@
           });
         },
         showReplyInput(item,idx) {
-          item.isReplys = true;
+          //关闭其它的
+          this.leavingList.forEach(top=>{
+            if(top.id!=item.id){
+              top.isReplys=false;
+            }
+            
+            top.replyList.forEach(reply=>{
+              if(reply.id!=item.id){
+                 reply.isReplys=false;
+              }
+             
+            })
+          })
+          if(item.isReplys){
+            item.isReplys =false;
+          }else{
+            item.isReplys =true;
+          }
+
           this.replysData.id = item.id;
           //this.replysData.reply = item.replyList;
         },
@@ -159,7 +182,7 @@
                this.$message.success('回复留言成功');
                p.isReplys = false;
                res.result.authorInfo=$this.userInfo;
-               p.replyList.push(res.result);
+               top.replyList.push(res.result);
                //直接追加到列表后面
                // this.leavingList.forEach(item=>{
                //    item.isReplys = false;
@@ -271,6 +294,7 @@
     position: relative;
     .lea-btn {
         float: right;
+        cursor: pointer;
         margin-top: 26px;
         width: 80px;
         height: 30px;
@@ -326,6 +350,7 @@
               margin-top: 40px;
               .replys-icon{
                 width: 50px;
+                cursor: pointer;
                 color: #6E7B84;
                 font-size: 12px;
                 margin-right: 22px;

src/views/portal/qa/Index.vue

@@ -55,7 +55,7 @@
 
                       <div style="display: flex;justify-content:space-between;">
                         <div style="width: 150px;">
-                          <author :avatar="qa.authorInfo.avatar" :name="qa.authorInfo.name" :sex="qa.authorInfo.sex"></author>
+                          <author :aid="qa.sysCreateAid" :avatar="qa.authorInfo.avatar" :name="qa.authorInfo.name" :sex="qa.authorInfo.sex"></author>
                         </div>
                         <div><interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="qa" @addAnswers="qaAnswer(qa)" :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar></div>
                       </div>