From 6e117fef7935e99588a161ec8a35482fff0b2c37 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 28 Jun 2022 14:38:27 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=96=87=E7=AB=A0?=
=?UTF-8?q?=E7=A9=BA=E6=A0=BC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Article/editItems.vue | 11 +++++++++++
src/views/portal/case/Index.vue | 1 -
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/components/Article/editItems.vue b/src/components/Article/editItems.vue
index 24e4b068..a37adc9a 100644
--- a/src/components/Article/editItems.vue
+++ b/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,15 @@ 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'
+ 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=='服务处理成功'){
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index a36d8826..c9cc83b6 100644
--- a/src/views/portal/case/Index.vue
+++ b/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;
};
From ecc41ca380af6952a25da6fd21abb4daf63b1a51 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 28 Jun 2022 16:49:45 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=97=E4=BC=97?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E9=AB=98=E9=87=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/UserCenter/menu.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index 1d383b2a..7a8f30fe 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -54,7 +54,6 @@
课件管理
-
@@ -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;
}
From b9ca95ebc317112ba5685adaa2879b75556d2873 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 28 Jun 2022 17:43:39 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Article/editItems.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/Article/editItems.vue b/src/components/Article/editItems.vue
index a37adc9a..0407550f 100644
--- a/src/components/Article/editItems.vue
+++ b/src/components/Article/editItems.vue
@@ -144,6 +144,7 @@ export default {
if(content.trim() == ''){
this.$message('您输入的内容为空，无法发布')
type: 'warning'
+ this.loading=false
return
}
this.addForm.content=content.trim()
From f4617d6dbc7a65339bd5eaac92fda29557fd158f Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Tue, 28 Jun 2022 18:57:14 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/portal/qa/Answer.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index 6e12204a..41a90710 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/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