From d5254f40e88b0c2dc9da6b5b016341aa96dbe22d Mon Sep 17 00:00:00 2001
From: msgroup <dev@mingsoft.net>
Date: Fri, 13 Jan 2023 16:46:07 +0800
Subject: [PATCH] =?UTF-8?q?up:=205.3.0=20=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/resources/resources_zh_CN.properties  |  2 +-
 .../WEB-INF/manager/cms/category/form.ftl     | 21 ++++++++++---------
 .../WEB-INF/manager/cms/generate/index.ftl    |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties b/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties
index 3ac6a846..c60752be 100755
--- a/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties
+++ b/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties
@@ -35,5 +35,5 @@ category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5
 content.keyword=\u5173\u952E\u5B57
 template.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6
 category.pinyin=\u62FC\u97F3
-datetime.format=\u65f6\u95f4\u683c\u5f0f
+datetime.format=时间格式
 
diff --git a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
index 98aeac9c..e417b228 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
@@ -14,6 +14,7 @@
         <el-button size="mini" icon="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)">返回</el-button>
     </el-header>
     <el-main class="ms-container">
+
         <el-scrollbar class="ms-scrollbar" style="height: 100%;">
             <el-form ref="form" :model="form" :rules="rules" label-width="130px" size="mini">
                 <el-row
@@ -310,10 +311,10 @@
                         "required": true,
                         "message": "请选择栏目管理名称"
                     }],
-                    // categoryListUrl: [{
-                    //     "required": true,
-                    //     "message": "请选择列表模板"
-                    // }],
+                    categoryListUrl: [{
+                        "required": true,
+                        "message": "请选择列表模板"
+                    }],
                     categoryPinyin:[{
                         validator: validatorCategoryPinyin, trigger: 'blur'
                     }, {
@@ -321,10 +322,10 @@
                         "message": "拼音格式不匹配"
                     }],
                     // 内容模板
-                    // categoryUrl: [{
-                    //     "required": true,
-                    //     "message": "请选择内容模板"
-                    // }]
+                    categoryUrl: [{
+                        "required": true,
+                       "message": "请选择内容模板"
+                     }]
                 }
             };
         },
@@ -543,14 +544,14 @@
             //获取categoryListUrl数据源
             categoryListUrlOptionsGet: function () {
                 var that = this;
-                ms.http.get(ms.manager + "/template/queryTemplateFileForColumn.do", {}).then(function (data) {
+                ms.http.get(ms.manager + "/basic/template/queryTemplateFileForColumn.do", {}).then(function (data) {
                     that.categoryListUrlOptions = data.data;
                 });
             },
             //获取categoryUrl数据源
             categoryUrlOptionsGet: function () {
                 var that = this;
-                ms.http.get(ms.manager + "/template/queryTemplateFileForColumn.do", {}).then(function (data) {
+                ms.http.get(ms.manager + "/basic/template/queryTemplateFileForColumn.do", {}).then(function (data) {
                     that.categoryUrlOptions = data.data;
                 });
             },
diff --git a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
index 1078ca14..96fe6dbe 100644
--- a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
@@ -245,7 +245,7 @@
             //获取主题模板数据源
             templateOptionsGet: function () {
                 var that = this;
-                ms.http.get(ms.manager + '/template/queryTemplateFileForColumn.do', {
+                ms.http.get(ms.manager + '/basic/template/queryTemplateFileForColumn.do', {
                     pageSize: 99999
                 }).then(function (data) {
                     that.templateOptions = data.data; //寻找主页