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

src/components/Article/editItems.vue

@@ -89,6 +89,8 @@ export default {
       apiArticle.detail(id,false).then(res => {
         if (res.status == 200) {
           this.addForm = res.result;
+          // this.addForm.content = res.result.content.trim();
+          // console.log(this.addForm.content)
           if(this.addForm.coverurl){
             this.converImage = this.fileBaseUrl + this.addForm.coverurl;
           }
@@ -137,6 +139,16 @@ export default {
       }
       this.loading=true;
       this.addForm.status = 2;
+       let content= this.addForm.content.replace(/<.*?>/ig,"");
+      console.log(content)
+      if(content.trim() == ''){
+         this.$message('您输入的内容为空，无法发布')
+          type: 'warning'
+          this.loading=false
+          return 
+      }
+      this.addForm.content=content.trim()
+      console.log(this.addForm.content,'iguighui')
         apiArticle.save(this.addForm).then(res => {
             if (res.status == 200) {
               if(res.message=='服务处理成功'){

src/components/UserCenter/menu.vue

@@ -54,7 +54,6 @@
             <span slot="title" class="textl">课件管理</span>
           </el-menu-item>
         </el-submenu>
-
         <el-submenu index="exam" v-show="curIdentity == 3">
           <template slot="title">
             <svg-icon icon-class="exam" style="font-size:14px"></svg-icon>
@@ -345,6 +344,10 @@ export default {
     activeMenu() {
       const route = this.$route;
       const { meta, path } = route;
+      console.log(meta)
+      if(meta.title == '添加受众'){
+        meta.activeMenu = '/manage/ugroups'
+      }
       if (meta.activeMenu) {
         return meta.activeMenu;
       }

src/views/portal/case/Index.vue

@@ -322,7 +322,6 @@ export default {
 
   mounted() {
     if(this.searchTags.length == 0){
-      console.log('gyigyu')
       this.queryCondition.majorType = null;
       this.queryCondition.orgDomain = null;
     };

src/views/portal/qa/Answer.vue

@@ -975,7 +975,8 @@ export default {
   		padding-left: 40px;
       .comment-content{
           padding-bottom: 0px;
-          word-break:break-all;
+          white-space: pre-wrap;
+          word-break: break-all;
           span{
             cursor: pointer;
             color: #409EFF