From c8d047dc88ab72dca076f5ca876158e4685106a7 Mon Sep 17 00:00:00 2001
From: tianbj <1309855586@qq.com>
Date: Mon, 30 Dec 2019 12:03:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/manager/cms/category/form.ftl   | 14 ++++++++++----
 .../webapp/static/ms-admin/5.0.0/css/index.css     |  8 ++------
 2 files changed, 12 insertions(+), 10 deletions(-)

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 b6971d12..b0ed23fb 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
@@ -20,7 +20,7 @@
             <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">{field.typetitle/}</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>
                     <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>
@@ -132,7 +132,7 @@
             <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">{field.typekeyword/}</a>
+                        <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>
@@ -149,7 +149,7 @@
             <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">{field.typedescrip/}</a>
+                        <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>
@@ -185,7 +185,13 @@
                 <div slot="tip" class="el-upload__tip">最多上传1张图片</div>
             </el-upload>
             </el-form-item>
-            <el-form-item  label="自定义链接" prop="categoryDiyUrl">
+            <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"
 
diff --git a/src/main/webapp/static/ms-admin/5.0.0/css/index.css b/src/main/webapp/static/ms-admin/5.0.0/css/index.css
index 052ab59b..cdf16b1a 100644
--- a/src/main/webapp/static/ms-admin/5.0.0/css/index.css
+++ b/src/main/webapp/static/ms-admin/5.0.0/css/index.css
@@ -226,7 +226,7 @@ textarea::-webkit-input-placeholder {
   align-items: center;
   overflow: hidden;
 }
-.ms-admin-logo > img {
+.ms-admin-logo img {
   padding: 14px 0;
   width: 50px;
 }
@@ -234,10 +234,6 @@ textarea::-webkit-input-placeholder {
   display: flex;
   align-items: center;
 }
-.ms-admin-logo > div img {
-  margin-top: -10px;
-  margin-left: 3px;
-}
 .ms-admin-logo > div span {
   margin-top: -6px;
   position: absolute;
@@ -419,7 +415,7 @@ textarea::-webkit-input-placeholder {
   z-index: 0;
 }
 .ms-admin-container > .ms-admin-main .ms-admin-tabs {
-  height: 100%;
+  height: calc(100vh - 50px);
   display: flex;
   flex-direction: column;
 }