diff --git a/ms-mcms.iml b/ms-mcms.iml
deleted file mode 100644
index 4279948c..00000000
--- a/ms-mcms.iml
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
index 935abb5a..6340a7c0 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
@@ -12,238 +12,250 @@
返回
-
-
+
-
-
-
-
-
-
-
-
- 文章标题
-
- {ms:field.title/}
- [field.title/]
+
+
+
+
+
+
+ 文章标题
+
+ {ms:field.title/}
+ [field.title/]
+
+
+
+
+
+
+
+
+
+ 所属栏目
+
+ {ms:field.typetitle/}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 发布时间
+
+ {ms:field.date?string("yyyy-MM-dd")/}
+ [field.date?string("yyyy-MM-dd")/]
+
+
+
+
+
+
+
+
+
+
+
+ 文章作者
+
+ {ms:field.author/}
+ [field.author/]
+
+
+
+
+
+
+
+
+
+ 文章来源
+
+ {ms:field.source/}
+ [field.source/]
+
+
+
+
+
+
+
+
+
+
+
+ 是否显示
+
+
+
+
+
+
+ {{true? item.label : item.value}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 文章缩略图
+
+ 文章缩略图,支持jpg格式
+ {ms:field.litpic/}
+ [field.litpic/]
-
-
-
-
-
-
- 所属栏目
-
- {ms:field.typetitle/}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 发布时间
-
- {ms:field.date?string("yyyy-MM-dd")/}
- [field.date?string("yyyy-MM-dd")/]
-
-
-
-
-
+ :data="{uploadPath:'/${appId}/cms/content','isRename':true}"
+ :on-success="contentImgSuccess"
+ accept="image/*"
+ list-type="picture-card">
+
+ 最多上传1张图片
+
-
-
-
-
-
- 文章作者
-
- {ms:field.author/}
- [field.author/]
+
+ 关键字
+
+ {{ms:field.keyword/}
+ [field.keyword/]
-
-
-
-
-
-
- 文章来源
-
- {ms:field.source/}
- [field.source/]
-
-
-
-
-
-
-
-
-
-
-
- 是否显示
-
-
-
-
-
-
- {{true? item.label : item.value}}
-
-
-
-
-
-
-
-
+ v-model="form.contentKeyword"
+ :style="{width: '100%'}"
+ placeholder="请输入文章关键字">
+
-
-
-
- 文章缩略图
-
- 文章缩略图,支持jpg格式
- {ms:field.litpic/}
- [field.litpic/]
-
-
-
-
-
- 最多上传1张图片
-
-
-
- 关键字
-
- {{ms:field.keyword/}
- [field.keyword/]
-
-
-
-
-
-
-
- 描述
-
- {ms:field.descrip/}
- [field.descrip/]
-
-
-
-
-
-
-
- 文章内容
-
- {ms:field.content/}
- [field.content/]
-
-
-
-
-
-
-
-
-
-
-
+
+ 描述
+
+ {ms:field.descrip/}
+ [field.descrip/]
+
+
+
+
+
+
+
+ 文章内容
+
+ {ms:field.content/}
+ [field.content/]
+
+
+
+
+
+
+
+
+
@@ -395,7 +407,7 @@
if (that.returnIsShow) {
javascript: history.go(-1);
- }else {
+ } else {
//如果是顶级封面或封面，则重新拿到当前封面id,避免重复保存
that.list(that.form.contentCategoryId);
}
@@ -488,7 +500,7 @@
"id": id
}).then(function (res) {
if (res.result && res.data) {
- if (res.data.contentType&&res.data.contentType!='') {
+ if (res.data.contentType && res.data.contentType != '') {
res.data.contentType = res.data.contentType.split(',');
} else {
res.data.contentType = [];
@@ -631,4 +643,7 @@
#form {
overflow: hidden;
}
+ .el-scrollbar__bar.is-vertical{
+ width: 6px!important;
+ }
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/index.ftl b/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
index a786f69d..3cbef7d9 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
@@ -9,7 +9,7 @@