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 b0ed23fb..ae738281 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
@@ -1,263 +1,273 @@
 <!DOCTYPE html>
 <html>
 <head>
-	 <title>分类</title>
-        <#include "../../include/head-file.ftl">
+    <title>分类</title>
+    <#include "../../include/head-file.ftl">
 </head>
 <body>
-	<div id="form" v-cloak>
-		<el-header class="ms-header ms-tr" height="50px">
-			<el-button type="primary" icon="iconfont icon-baocun" size="mini" @click="save()" :loading="saveDisabled">保存</el-button>
-			<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
-                                gutter="0"
-                                justify="start" align="top">
-                                <el-col span="12">
-            <el-form-item  label="栏目管理名称" prop="categoryTitle">
-                <template slot='label'>栏目管理名称
-                <el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
-                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.typetitle/}</a>
-                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typetitle/]</a>
-                    <i class="el-icon-question" slot="reference"></i>
-                </el-popover>
-                </template>
-                <el-input v-model="form.categoryTitle"
-                          :disabled="false"
-                          :style="{width:  '100%'}"
-                          :clearable="true"
-                          placeholder="请输入栏目管理名称">
-                </el-input>
-            </el-form-item>
-                                </el-col>
-                                <el-col span="12">
-            <el-form-item  label="所属栏目" prop="categoryId">
-            <tree-select ref="tree" :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
-                         :options="treeList" :style="{width:'100%'}"
-                         v-model="form.categoryId"></tree-select>
-            </el-form-item>
-                                </el-col>
-                        </el-row>
-                        <el-row
-                                gutter="0"
-                                justify="start" align="top">
-                                <el-col span="12">
-            <el-form-item prop="categoryType">
-                <template slot='label'>栏目类型
-                    <el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
-                        列表：常用于带列表、详情的业务，例如：新闻列表、图片列表<br>封面：常用单篇文章显示，例如：关于我们、公司介绍<br>修改栏目时如果该栏目存在文章则不能修改栏目类型
-                        <i class="el-icon-question" slot="reference"></i>
-                    </el-popover>
-                </template>
-                    <el-radio-group v-model="form.categoryType"
-                                    :style="{width: ''}"
-                                    :disabled="categoryTypeDisabled">
-                        <el-radio :style="{display: true ? 'inline-block' : 'block'}" :label="item.value"
-                                  v-for='(item, index) in categoryTypeOptions' :key="item.value + index">
-                            {{true? item.label : item.value}}
-                        </el-radio>
-                    </el-radio-group>
-            </el-form-item>
-                                </el-col>
-                                <el-col span="12">
-            <el-form-item  label="自定义顺序" prop="categorySort">
-                <el-input-number
-                        v-model="form.categorySort"
-                        :disabled="false"
-                        controls-position="">
-                </el-input-number>
-            </el-form-item>
-                                </el-col>
-                        </el-row>
-                        <el-row
-                                gutter="0"
-                                justify="start" align="top">
-                                <el-col span="12">
-                                    <el-form-item prop="categoryUrl" :label="form.categoryType =='1'? '内容模板' : '封面模板'">
-                                        <el-select v-model="form.categoryUrl"
-                                                   :style="{width: '100%'}"
-                                                   :filterable="true"
-                                                   :disabled="false"
-                                                   :multiple="false" :clearable="true"
-                                                   placeholder="请选择内容模板">
-                                            <el-option v-for='item in categoryUrlOptions' :key="item" :value="item"
-                                                       :label="item"></el-option>
-                                        </el-select>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col span="12">
-                                    <el-form-item prop="mdiyModelId">
-                                        <template slot='label'>自定义模型
-                                            <el-popover slot="label" placement="top-start" title="提示" width="400" trigger="hover" content="如果发布时候文章字段信息不够，可以采用铭飞代码生成器生成自定义模型，再通过“自定义管理->自定义模型->导入”功能导入模型，注意类型是cms">
-                                                <i class="el-icon-question" slot="reference"></i>
-                                            </el-popover>
-                                        </template>
-                                        <el-select v-model="form.mdiyModelId"
-                                                   :style="{width: '100%'}"
-                                                   :filterable="false"
-                                                   :disabled="false"
-                                                   :multiple="false" :clearable="true"
-                                                   placeholder="请选择栏目的自定义模型">
-                                            <el-option v-for='item in mdiyModelIdOptions' :key="item.id" :value="item.id"
-                                                       :label="item.modelName"></el-option>
-                                        </el-select>
-                                    </el-form-item>
-                                </el-col>
-                        </el-row>
-                    <el-row
-                            gutter="0"
-                            justify="start" align="top">
-                        <el-col span="12">
-                            <el-form-item prop="categoryListUrl" v-if="form.categoryType == '1'">
-                                <template slot='label'>列表模板
-                                    <el-popover slot="label" placement="top-start" title="提示" trigger="hover" content="当栏目类型为列表时有效">
-                                        <i class="el-icon-question" slot="reference"></i>
-                                    </el-popover>
-                                </template>
-                                <el-select v-model="form.categoryListUrl"
-                                           :style="{width: '100%'}"
-                                           :filterable="true"
-                                           :disabled="false"
-                                           :multiple="false" :clearable="true"
-                                           placeholder="请选择列表模板">
-                                    <el-option v-for='item in categoryListUrlOptions' :key="item" :value="item"
-                                               :label="item"></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-            <el-form-item  label="栏目管理关键字" prop="categoryKeyword">
-                <template slot='label'>栏目关键字
-                    <el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.typekeyword/}</a>
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typekeyword/]</a>
-                        <i class="el-icon-question" slot="reference"></i>
-                    </el-popover>
-                </template>
-                <el-input
-                        type="textarea" :rows="5"
-                        :disabled="false"
-
-                        v-model="form.categoryKeyword"
-                        :style="{width: '100%'}"
-                        placeholder="栏目管理关键字，有助于搜索">
-                </el-input>
-            </el-form-item>
-            <el-form-item  label="栏目管理描述" prop="categoryDescrip">
-                <template slot='label'>栏目描述
-                    <el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.typedescrip/}</a>
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typedescrip/]</a>
-                        <i class="el-icon-question" slot="reference"></i>
-                    </el-popover>
-                </template>
-                <el-input
-                        type="textarea" :rows="5"
-                        :disabled="false"
-
-                        v-model="form.categoryDescrip"
-                        :style="{width: '100%'}"
-                        placeholder="栏目管理描述，对栏目管理关键字的扩展">
-                </el-input>
-            </el-form-item>
-            <el-form-item  label="" prop="categoryImg">
-                <template slot='label'>缩略图
-                    <el-popover slot="label" placement="top-start" title="提示" width="200" trigger="hover" content="提示：栏目缩略图,最多可上传1张">
-                        <i class="el-icon-question" slot="reference"></i>
-                    </el-popover>
-                </template>
-            <el-upload
-                    :file-list="form.categoryImg"
-                    :action="ms.base+'/file/upload.do'"
-                    :on-remove="categoryImghandleRemove"
-                    :style="{width:''}"
-                    :limit="1"
-                    :on-exceed="categoryImghandleExceed"
-                    :disabled="false"
-                    :data="{uploadPath:'/cms/category','isRename':true}"
-                    :on-success="categoryImgSuccess"
-                    accept="image/*"
-                    list-type="picture-card">
-                <i class="el-icon-plus"></i>
-                <div slot="tip" class="el-upload__tip">最多上传1张图片</div>
-            </el-upload>
-            </el-form-item>
-            <el-form-item prop="categoryDiyUrl">
-                <template slot='label'>自定义链接
-                    <el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typeurl/]</a>
-                        <i class="el-icon-question" slot="reference"></i>
-                    </el-popover>
-                </template>
-                <el-input
-                        :disabled="false"
-
-                        v-model="form.categoryDiyUrl"
-                        :style="{width: '100%'}"
-                        placeholder="请输入自定义链接">
-                </el-input>
-            </el-form-item>
+<div id="form" v-cloak>
+    <el-header class="ms-header ms-tr" height="50px">
+        <el-button type="primary" icon="iconfont icon-baocun" size="mini" @click="save()" :loading="saveDisabled">保存
+        </el-button>
+        <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
+                        gutter="0"
+                        justify="start" align="top">
+                    <el-col span="12">
+                        <el-form-item label="栏目管理名称" prop="categoryTitle">
+                            <template slot='label'>栏目管理名称
+                                <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
+                                       target="_blank">{ms:field.typetitle/}</a>
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
+                                       target="_blank">[field.typetitle/]</a>
+                                    <i class="el-icon-question" slot="reference"></i>
+                                </el-popover>
+                            </template>
+                            <el-input v-model="form.categoryTitle"
+                                      :disabled="false"
+                                      :style="{width:  '100%'}"
+                                      :clearable="true"
+                                      placeholder="请输入栏目管理名称">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col span="12">
+                        <el-form-item label="所属栏目" prop="categoryId">
+                            <tree-select ref="tree" :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
+                                         :options="treeList" :style="{width:'100%'}"
+                                         v-model="form.categoryId"></tree-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row
+                        gutter="0"
+                        justify="start" align="top">
+                    <el-col span="12">
+                        <el-form-item prop="categoryType">
+                            <template slot='label'>栏目类型
+                                <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
+                                    列表：常用于带列表、详情的业务，例如：新闻列表、图片列表<br>封面：常用单篇文章显示，例如：关于我们、公司介绍<br>修改栏目时如果该栏目存在文章则不能修改栏目类型
+                                    <i class="el-icon-question" slot="reference"></i>
+                                </el-popover>
+                            </template>
+                            <el-radio-group v-model="form.categoryType"
+                                            :style="{width: ''}"
+                                            :disabled="categoryTypeDisabled">
+                                <el-radio :style="{display: true ? 'inline-block' : 'block'}" :label="item.value"
+                                          v-for='(item, index) in categoryTypeOptions' :key="item.value + index">
+                                    {{true? item.label : item.value}}
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col span="12">
+                        <el-form-item label="自定义顺序" prop="categorySort">
+                            <el-input-number
+                                    v-model="form.categorySort"
+                                    :disabled="false"
+                                    controls-position="">
+                            </el-input-number>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row
+                        gutter="0"
+                        justify="start" align="top">
+                    <el-col span="12">
+                        <el-form-item prop="categoryUrl" :label="form.categoryType =='1'? '内容模板' : '封面模板'">
+                            <el-select v-model="form.categoryUrl"
+                                       :style="{width: '100%'}"
+                                       :filterable="true"
+                                       :disabled="false"
+                                       :multiple="false" :clearable="true"
+                                       placeholder="请选择内容模板">
+                                <el-option v-for='item in categoryUrlOptions' :key="item" :value="item"
+                                           :label="item"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col span="12">
+                        <el-form-item prop="mdiyModelId">
+                            <template slot='label'>自定义模型
+                                <el-popover slot="label" placement="top-start" title="提示" width="400" trigger="hover"
+                                            content="如果发布时候文章字段信息不够，可以采用铭飞代码生成器生成自定义模型，再通过“自定义管理->自定义模型->导入”功能导入模型，注意类型是cms">
+                                    <i class="el-icon-question" slot="reference"></i>
+                                </el-popover>
+                            </template>
+                            <el-select v-model="form.mdiyModelId"
+                                       :style="{width: '100%'}"
+                                       :filterable="false"
+                                       :disabled="false"
+                                       :multiple="false" :clearable="true"
+                                       placeholder="请选择栏目的自定义模型">
+                                <el-option v-for='item in mdiyModelIdOptions' :key="item.id" :value="item.id"
+                                           :label="item.modelName"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row
+                        gutter="0"
+                        justify="start" align="top">
+                    <el-col span="12">
+                        <el-form-item prop="categoryListUrl" v-if="form.categoryType == '1'">
+                            <template slot='label'>列表模板
+                                <el-popover slot="label" placement="top-start" title="提示" trigger="hover"
+                                            content="当栏目类型为列表时有效">
+                                    <i class="el-icon-question" slot="reference"></i>
+                                </el-popover>
+                            </template>
+                            <el-select v-model="form.categoryListUrl"
+                                       :style="{width: '100%'}"
+                                       :filterable="true"
+                                       :disabled="false"
+                                       :multiple="false" :clearable="true"
+                                       placeholder="请选择列表模板">
+                                <el-option v-for='item in categoryListUrlOptions' :key="item" :value="item"
+                                           :label="item"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-form-item label="栏目管理关键字" prop="categoryKeyword">
+                    <template slot='label'>栏目关键字
+                        <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
+                               target="_blank">[field.typekeyword/]</a>
+                            <i class="el-icon-question" slot="reference"></i>
+                        </el-popover>
+                    </template>
+                    <el-input
+                            type="textarea" :rows="5"
+                            :disabled="false"
+                            v-model="form.categoryKeyword"
+                            :style="{width: '100%'}"
+                            placeholder="栏目管理关键字，有助于搜索">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="栏目管理描述" prop="categoryDescrip">
+                    <template slot='label'>栏目描述
+                        <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
+                               target="_blank">[field.typedescrip/]</a>
+                            <i class="el-icon-question" slot="reference"></i>
+                        </el-popover>
+                    </template>
+                    <el-input
+                            type="textarea" :rows="5"
+                            :disabled="false"
+                            v-model="form.categoryDescrip"
+                            :style="{width: '100%'}"
+                            placeholder="栏目管理描述，对栏目管理关键字的扩展">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="" prop="categoryImg">
+                    <template slot='label'>缩略图
+                        <el-popover slot="label" placement="top-start" title="提示"  trigger="hover">
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
+                               target="_blank">{ms:field.typelitpic/}</a>
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
+                               target="_blank">[field.typelitpic/]</a>
+                            <i class="el-icon-question" slot="reference"></i>
+                        </el-popover>
+                    </template>
+                    <el-upload
+                            :file-list="form.categoryImg"
+                            :action="ms.base+'/file/upload.do'"
+                            :on-remove="categoryImghandleRemove"
+                            :style="{width:''}"
+                            :limit="1"
+                            :on-exceed="categoryImghandleExceed"
+                            :disabled="false"
+                            :data="{uploadPath:'/cms/category','isRename':true}"
+                            :on-success="categoryImgSuccess"
+                            accept="image/*"
+                            list-type="picture-card">
+                        <i class="el-icon-plus"></i>
+                        <div slot="tip" class="el-upload__tip">最多上传1张图片</div>
+                    </el-upload>
+                </el-form-item>
+                <el-form-item prop="categoryDiyUrl">
+                    <template slot='label'>自定义链接
+                        <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
+                               target="_blank">[field.typeurl/]</a>
+                            <i class="el-icon-question" slot="reference"></i>
+                        </el-popover>
+                    </template>
+                    <el-input
+                            :disabled="false"
+                            v-model="form.categoryDiyUrl"
+                            :style="{width: '100%'}"
+                            placeholder="请输入自定义链接">
+                    </el-input>
+                </el-form-item>
             </el-form>
-            </el-scrollbar>
-		</el-main>
-	</div>
-	</body>
-	</html>
+        </el-scrollbar>
+    </el-main>
+</div>
+</body>
+</html>
 <script>
-        var form = new Vue({
+    var form = new Vue({
         el: '#form',
         data() {
             return {
-                treeList:[{
-                    id:'0',
-                    categoryTitle:'顶级栏目',
-                    children:[],
+                treeList: [{
+                    id: '0',
+                    categoryTitle: '顶级栏目',
+                    children: [],
                 }],
-                categoryList:[],
+                categoryList: [],
                 saveDisabled: false,
-                categoryTypeDisabled:true,
+                categoryTypeDisabled: true,
                 //表单数据
                 form: {
                     // 栏目管理名称
-                    categoryTitle:'',
+                    categoryTitle: '',
                     // 所属栏目
-                    categoryId:'',
+                    categoryId: '',
                     // 栏目管理属性
-                    categoryType:'1',
+                    categoryType: '1',
                     // 自定义顺序
-                    categorySort:0,
+                    categorySort: 0,
                     // 列表模板
-                    categoryListUrl:'',
+                    categoryListUrl: '',
                     // 内容模板
-                    categoryUrl:'',
+                    categoryUrl: '',
                     // 栏目管理关键字
-                    categoryKeyword:'',
+                    categoryKeyword: '',
                     // 栏目管理描述
-                    categoryDescrip:'',
+                    categoryDescrip: '',
                     // 缩略图
                     categoryImg: [],
                     // 自定义链接
-                    categoryDiyUrl:'',
+                    categoryDiyUrl: '',
                     // 栏目管理的内容模型id
-                    mdiyModelId:'',
+                    mdiyModelId: '',
                 },
-                categoryTypeOptions:[{"value":"1","label":"列表"},{"value":"2","label":"封面"}],
-                categoryListUrlOptions:[],
-                categoryUrlOptions:[],
-                mdiyModelIdOptions:[],
-                rules:{
-                // 栏目管理名称
-                categoryTitle: [{"required":true,"message":"请选择栏目管理名称"},{"pattern":/^[^[!@#$%^&*()_+-/~?！@#￥%…&*（）——+—？》《：“‘’]+$/,"message":"栏目管理名称格式不匹配"}],
+                categoryTypeOptions: [{"value": "1", "label": "列表"}, {"value": "2", "label": "封面"}],
+                categoryListUrlOptions: [],
+                categoryUrlOptions: [],
+                mdiyModelIdOptions: [],
+                rules: {
+                    // 栏目管理名称
+                    categoryTitle: [{
+                        "required": true,
+                        "message": "请选择栏目管理名称"
+                    }, {"pattern": /^[^[!@#$%^&*()_+-/~?！@#￥%…&*（）——+—？》《：“‘’]+$/, "message": "栏目管理名称格式不匹配"}],
                 },
 
             }
         },
-        watch:{
-            'form.categoryId':function (n, o) {
-                if(n == this.form.id){
+        watch: {
+            'form.categoryId': function (n, o) {
+                if (n == this.form.id) {
                     this.$notify({
                         title: '提示',
                         message: '所属栏目不能为自身',
@@ -265,33 +275,32 @@
                     });
                     return;
                 }
-                this.categoryList.forEach(item=>{
-                   if(item.categoryParentId !=null && item.categoryParentId !="" && item.categoryParentId.indexOf(this.form.id) != -1){
-                       if(item.id == n){
-                           this.form.categoryId = null;
-                           this.$refs.tree.clearHandle();
-                           this.$notify({
-                               title: '提示',
-                               message: '不能选择子分类',
-                               type: 'warning'
-                           });
-                       }
-                   }
+                this.categoryList.forEach(item => {
+                    if (item.categoryParentId != null && item.categoryParentId != "" && item.categoryParentId.indexOf(this.form.id) != -1) {
+                        if (item.id == n) {
+                            this.form.categoryId = null;
+                            this.$refs.tree.clearHandle();
+                            this.$notify({
+                                title: '提示',
+                                message: '不能选择子分类',
+                                type: 'warning'
+                            });
+                        }
+                    }
                 });
             }
         },
-        computed:{
-        },
+        computed: {},
         methods: {
-            getTree(){
+            getTree() {
                 var that = this;
-                ms.http.get(ms.manager+"/cms/category/list.do",{pageSize:9999}).then(function(res){
-                    if(res.result){
+                ms.http.get(ms.manager + "/cms/category/list.do", {pageSize: 9999}).then(function (res) {
+                    if (res.result) {
                         //res.data.rows.push({id:0,categoryId: null,categoryTitle:'顶级栏目管理'});
                         that.categoryList = res.data.rows;
-                        that.treeList[0].children = ms.util.treeData(res.data.rows,'id','categoryId','children');
+                        that.treeList[0].children = ms.util.treeData(res.data.rows, 'id', 'categoryId', 'children');
                     }
-                }).catch(function(err){
+                }).catch(function (err) {
                     console.log(err);
                 });
             },
@@ -305,12 +314,12 @@
                     if (valid) {
 
                         //栏目属性为封面则不需要列表模板
-                        if(that.form.categoryType == '2'){
+                        if (that.form.categoryType == '2') {
                             that.form.categoryListUrl = '';
                         }
                         that.saveDisabled = true;
                         var data = JSON.parse(JSON.stringify(that.form));
-                        if(data.id&&data.id==data.categoryId){
+                        if (data.id && data.id == data.categoryId) {
                             that.$notify({
                                 title: '提示',
                                 message: '所属栏目不能为自身',
@@ -319,7 +328,7 @@
                             that.saveDisabled = false;
                             return
                         }
-                        if(data.categoryId == '0'){
+                        if (data.categoryId == '0') {
                             data.categoryId = '';
                         }
                         data.categoryImg = JSON.stringify(data.categoryImg);
@@ -348,7 +357,7 @@
             //获取分类内容模型
             getColumnContentModelId: function () {
                 var that = this;
-                ms.http.get(ms.manager + "/mdiy/model/list.do",{modelType:'zdymx_wz'}).then(
+                ms.http.get(ms.manager + "/mdiy/model/list.do", {modelType: 'zdymx_wz'}).then(
                     function (data) {
                         that.mdiyModelIdOptions = data.data.rows;
                     }).catch(function (err) {
@@ -358,19 +367,19 @@
             //获取当前分类
             get(id) {
                 var that = this;
-                ms.http.get(ms.manager + "/cms/category/get.do", {"id":id}).then(function (res) {
-                    if(res.result&&res.data){
-                    if(res.data.categoryImg){
-                        res.data.categoryImg = JSON.parse(res.data.categoryImg);
-                        res.data.categoryImg.forEach(function(value){
-                        value.url= ms.base + value.path
-                        })
-                    }else{
-                        res.data.categoryImg=[]
-                    }
-                    if(!res.data.categoryId){
-                        res.data.categoryId = '0';
-                    }
+                ms.http.get(ms.manager + "/cms/category/get.do", {"id": id}).then(function (res) {
+                    if (res.result && res.data) {
+                        if (res.data.categoryImg) {
+                            res.data.categoryImg = JSON.parse(res.data.categoryImg);
+                            res.data.categoryImg.forEach(function (value) {
+                                value.url = ms.base + value.path
+                            })
+                        } else {
+                            res.data.categoryImg = []
+                        }
+                        if (!res.data.categoryId) {
+                            res.data.categoryId = '0';
+                        }
                         that.form = res.data;
                         //判断该分类是否存在文章，存在则不能修改栏目属性
                         that.contentList(that.form.id);
@@ -379,12 +388,12 @@
                     console.log(err);
                 });
             },
-            contentList: function(id){
+            contentList: function (id) {
                 var that = this;
-                ms.http.post(ms.manager+"/cms/content/list.do",{
+                ms.http.post(ms.manager + "/cms/content/list.do", {
                     contentCategoryId: id,
                 }).then(function (data) {
-                    if(data.data.total>0){
+                    if (data.data.total > 0) {
                         that.categoryTypeDisabled = true;
                     } else {
                         that.categoryTypeDisabled = false;
@@ -396,7 +405,7 @@
             //获取categoryListUrl数据源
             categoryListUrlOptionsGet() {
                 var that = this;
-                ms.http.get(ms.manager+"/template/queryTemplateFileForColumn.do", {}).then(function (data) {
+                ms.http.get(ms.manager + "/template/queryTemplateFileForColumn.do", {}).then(function (data) {
                     that.categoryListUrlOptions = data.data;
                 }).catch(function (err) {
                     console.log(err);
@@ -405,17 +414,17 @@
             //获取categoryUrl数据源
             categoryUrlOptionsGet() {
                 var that = this;
-                ms.http.get(ms.manager+"/template/queryTemplateFileForColumn.do", {}).then(function (data) {
+                ms.http.get(ms.manager + "/template/queryTemplateFileForColumn.do", {}).then(function (data) {
                     that.categoryUrlOptions = data.data;
                 }).catch(function (err) {
                     console.log(err);
                 });
             },
             //categoryImg文件上传完成回调
-            categoryImgSuccess:function(response, file, fileList) {
-                this.form.categoryImg.push({url:file.url,name:file.name,path:response,uid:file.uid});
+            categoryImgSuccess: function (response, file, fileList) {
+                this.form.categoryImg.push({url: file.url, name: file.name, path: response, uid: file.uid});
             },
-            categoryImghandleRemove:function(file, files) {
+            categoryImghandleRemove: function (file, files) {
                 var index = -1;
                 index = this.form.categoryImg.findIndex(text => text == file);
                 if (index != -1) {
@@ -423,14 +432,14 @@
                 }
             },
             //categoryImg文件上传完成回调
-            categoryImgSuccess:function(response, file, fileList) {
-                this.form.categoryImg.push({url:file.url,name:file.name,path:response,uid:file.uid});
+            categoryImgSuccess: function (response, file, fileList) {
+                this.form.categoryImg.push({url: file.url, name: file.name, path: response, uid: file.uid});
             },
             //上传超过限制
-            categoryImghandleExceed:function(files, fileList) {
-                this.$notify({ title: '当前最多上传1个文件', type: 'warning' });
+            categoryImghandleExceed: function (files, fileList) {
+                this.$notify({title: '当前最多上传1个文件', type: 'warning'});
             },
-            categoryImghandleRemove:function(file, files) {
+            categoryImghandleRemove: function (file, files) {
                 var index = -1;
                 index = this.form.categoryImg.findIndex(text => text == file);
                 if (index != -1) {
@@ -453,7 +462,7 @@
     });
 </script>
 <style>
-    .el-select{
+    .el-select {
         width: 100%;
     }
 </style>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
index 501039bc..c5410dc6 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
@@ -34,38 +34,17 @@
 				<el-table-column label="编号" width="120" prop="id">
 					<template slot='header'>编号
 						<el-popover placement="top-start" title="提示" trigger="hover" >
-							<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typeid/}</a>
+							<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.typeid/}</a>
 							<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typeid/]</a>
 							<i class="el-icon-question" slot="reference"></i>
 						</el-popover>
 					</template>
 				</el-table-column>
                  <el-table-column label="标题" align="left" prop="categoryTitle">
-					 <template slot='header'>标题
-						 <el-popover placement="top-start" title="提示" trigger="hover" >
-							 <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typetitle/}</a>
-							 <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typetitle/]</a>
-							 <i class="el-icon-question" slot="reference"></i>
-						 </el-popover>
-					 </template>
                  </el-table-column>
             <el-table-column label="属性" align="center" prop="categoryType" :formatter="categoryTypeFormat" width="70">
-				<template slot='header'>属性
-					<el-popover placement="top-start" title="提示" trigger="hover" >
-						<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.flag/}</a>
-						<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.flag/]</a>
-						<i class="el-icon-question" slot="reference"></i>
-					</el-popover>
-				</template>
             </el-table-column>
                 <el-table-column label="链接地址" align="left" prop="categoryPath" show-overflow-tooltip>
-					<template slot='header'>链接地址
-						<el-popover placement="top-start" title="提示" trigger="hover" >
-							<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typelink/}</a>
-							<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typelink/]</a>
-							<i class="el-icon-question" slot="reference"></i>
-						</el-popover>
-					</template>
 					<template slot-scope="scope">
 						<span style="cursor: pointer" class="copyBtn" :data-clipboard-text="'{ms:global.url/}'+scope.row.categoryPath+'/index.html'" @click="copyUrl">{{"{ms:global.url/}"+scope.row.categoryPath+"/index.html"}}</span>
 					</template>
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 5a73a6c7..02ef92c0 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
@@ -27,7 +27,7 @@
                         <el-form-item label="文章标题" prop="contentTitle">
                             <template slot='label'>文章标题
                                 <el-popover placement="top-start" title="提示" trigger="hover" >
-                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.title/}</a>
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.title/}</a>
                                     <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.title/]</a>
                                     <i class="el-icon-question" slot="reference"></i>
                                 </el-popover>
@@ -44,8 +44,7 @@
                         <el-form-item label="所属栏目" prop="contentCategoryId">
                             <template slot='label'>所属栏目
                                 <el-popover placement="top-start" title="提示" trigger="hover" >
-                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typeid/}</a>
-                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.typeid/]</a>
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.typetitle/}</a>
                                     <i class="el-icon-question" slot="reference"></i>
                                 </el-popover>
                             </template>
@@ -75,6 +74,13 @@
                     </el-col>
                     <el-col span="12">
                         <el-form-item label="发布时间" prop="contentDatetime">
+                            <template slot='label'>发布时间
+                                <el-popover placement="top-start" title="提示" trigger="hover" >
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.date?string("yyyy-MM-dd")/}</a>
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.date?string("yyyy-MM-dd")/]</a>
+                                    <i class="el-icon-question" slot="reference"></i>
+                                </el-popover>
+                            </template>
                             <el-date-picker
                                     v-model="form.contentDatetime"
                                     placeholder="请选择发布时间"
@@ -99,7 +105,7 @@
                         <el-form-item label="文章作者" prop="contentAuthor">
                             <template slot='label'>文章作者
                                 <el-popover placement="top-start" title="提示" trigger="hover" >
-                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.author/}</a>
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.author/}</a>
                                     <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.author/]</a>
                                     <i class="el-icon-question" slot="reference"></i>
                                 </el-popover>
@@ -116,7 +122,7 @@
                         <el-form-item label="文章来源" prop="contentSource">
                             <template slot='label'>文章来源
                                 <el-popover placement="top-start" title="提示" trigger="hover" >
-                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.source/}</a>
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.source/}</a>
                                     <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.source/]</a>
                                     <i class="el-icon-question" slot="reference"></i>
                                 </el-popover>
@@ -165,7 +171,7 @@
                     <template slot='label'>文章缩略图
                         <el-popover placement="top-start" title="提示" trigger="hover" >
                             文章缩略图,支持jpg格式
-                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.litpic/}</a>
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.litpic/}</a>
                             <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.litpic/]</a>
                             <i class="el-icon-question" slot="reference"></i>
                         </el-popover>
@@ -186,20 +192,10 @@
                         <div slot="tip" class="el-upload__tip">最多上传1张图片</div>
                     </el-upload>
                 </el-form-item>
-                <el-form-item label="描述" prop="contentDescription">
-                    <el-input
-                            type="textarea" :rows="5"
-                            :disabled="false"
-
-                            v-model="form.contentDescription"
-                            :style="{width: '100%'}"
-                            placeholder="请输入对该文章的简短描述，以便用户查看文章简略">
-                    </el-input>
-                </el-form-item>
                 <el-form-item label="关键字" prop="contentKeyword">
                     <template slot='label'>关键字
                         <el-popover placement="top-start" title="提示" trigger="hover" >
-                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.keyword/}</a>
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{{ms:field.keyword/}</a>
                             <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.keyword/]</a>
                             <i class="el-icon-question" slot="reference"></i>
                         </el-popover>
@@ -207,16 +203,31 @@
                     <el-input
                             type="textarea" :rows="5"
                             :disabled="false"
-
                             v-model="form.contentKeyword"
                             :style="{width: '100%'}"
                             placeholder="请输入文章关键字">
                     </el-input>
                 </el-form-item>
+                <el-form-item label="描述" prop="contentDescription">
+                    <template slot='label'>描述
+                        <el-popover placement="top-start" title="提示" trigger="hover" >
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.descrip/}</a>
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.descrip/]</a>
+                            <i class="el-icon-question" slot="reference"></i>
+                        </el-popover>
+                    </template>
+                    <el-input
+                            type="textarea" :rows="5"
+                            :disabled="false"
+                            v-model="form.contentDescription"
+                            :style="{width: '100%'}"
+                            placeholder="请输入对该文章的简短描述，以便用户查看文章简略">
+                    </el-input>
+                </el-form-item>
                 <el-form-item label="文章内容" prop="contentDetails">
                     <template slot='label'>文章内容
                         <el-popover placement="top-start" title="提示" trigger="hover" >
-                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.content/}</a>
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.content/}</a>
                             <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.content/]</a>
                             <i class="el-icon-question" slot="reference"></i>
                         </el-popover>
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
index f847815e..eea84477 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
@@ -63,45 +63,24 @@
             <el-table-column label="编号" width="70" prop="id">
                 <template slot='header'>编号
                     <el-popover placement="top-start" title="提示" trigger="hover" >
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.id/}</a>
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.id/}</a>
                         <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.id/]</a>
                         <i class="el-icon-question" slot="reference"></i>
                     </el-popover>
                 </template>
             </el-table-column>
             <el-table-column label="栏目名" align="left" prop="contentCategoryId" :formatter="contentCategoryIdFormat" width="100">
-                <template slot='header'>栏目名
-                    <el-popover placement="top-start" title="提示" trigger="hover" >
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typename/}</a>
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.typename/]</a>
-                        <i class="el-icon-question" slot="reference"></i>
-                    </el-popover>
-                </template>
             </el-table-column>
             <el-table-column label="文章标题" align="left" prop="contentTitle" show-overflow-tooltip>
-                <template slot='header'>文章标题
-                    <el-popover placement="top-start" title="提示" trigger="hover" >
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.title/}</a>
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.title/]</a>
-                        <i class="el-icon-question" slot="reference"></i>
-                    </el-popover>
-                </template>
             </el-table-column>
             <el-table-column label="作者" align="left" prop="contentAuthor" width="100" show-overflow-tooltip>
-                <template slot='header'>作者
-                    <el-popover placement="top-start" title="提示" trigger="hover" >
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.author/}</a>
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.author/]</a>
-                        <i class="el-icon-question" slot="reference"></i>
-                    </el-popover>
-                </template>
             </el-table-column>
             <el-table-column label="排序" width="55" align="right" prop="contentSort">
             </el-table-column>
             <el-table-column label="点击量" width="90" align="right" prop="contentHit">
                 <template slot='header'>点击量
                     <el-popover placement="top-start" title="提示" trigger="hover" >
-                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.hit/}</a>
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.hit/}</a>
                         <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.hit/]</a>
                         <i class="el-icon-question" slot="reference"></i>
                     </el-popover>
